Commit Graph
100 Commits
Author SHA1 Message Date
Eric Fischer d18f93df4c Add libstdc++ packages 2016-06-06 17:27:32 -07:00
Eric Fischer cf4a51c819 Try to use Mason builds for clang 2016-06-06 17:21:29 -07:00
Eric Fischer 7c0c8e0434 Merge pull request #253 from mapbox/epsg-3857
Add minimal support for alternate input projections
2016-06-01 17:20:19 -07:00
Eric Fischer de46cfa798 Do the more common check first. Forgot to swap these max/min pairs. 2016-06-01 17:09:20 -07:00
Eric Fischer a504840bd5 Warn if the GeoJSON specifies a different projection 2016-06-01 16:55:52 -07:00
Eric Fischer 2578781a37 Forgot to check in the input file for the test 2016-06-01 16:08:51 -07:00
Eric Fischer e1427ab9e4 Fix the check for an unsupported projection 2016-06-01 15:51:55 -07:00
Eric Fischer af412e2038 Add minimal support for alternate input projections 2016-06-01 15:49:41 -07:00
Eric Fischer 5da636ba23 Merge pull request #252 from mapbox/glow-map2
Add an option to calculate feature density as a feature attribute
2016-05-27 17:34:27 -07:00
Eric Fischer 20b0fe1a52 Revert unneeded change 2016-05-27 16:35:46 -07:00
Eric Fischer 9d0a41521f Forgot to add the test 2016-05-27 16:33:56 -07:00
Eric Fischer 692112ec3a Add an option to calculate feature density as a feature attribute 2016-05-27 16:25:40 -07:00
Eric Fischer 4030cc7c58 Merge pull request #245 from mapbox/inline-meta2
Add the ability to inline metadata with geometry
2016-05-25 11:53:57 -07:00
Eric Fischer b5c5d9dad6 Merge pull request #249 from mapbox/decode-check-error
Fail gracefully if input to tippecanoe-decode isn't a vector tile
2016-05-25 11:53:41 -07:00
Eric Fischer 1d636e5c0d Consistently treat "prevent" and "additional" options as globals 2016-05-25 11:38:52 -07:00
Eric Fischer e253bbfe1d Round upward to catch narrow-but-tall or wide-but-short features 2016-05-25 11:08:04 -07:00
Eric Fischer fa7a52d032 Bump version number 2016-05-23 17:44:41 -07:00
Eric Fischer 4638c6f273 Merge branch 'master' into inline-meta2
Conflicts:
	tile.cpp
2016-05-23 15:57:28 -07:00
Eric Fischer 0f02e9fa95 Fix uninitialized variable 2016-05-23 15:45:55 -07:00
Eric Fischer bba1c13b07 Warn if a feature that won't be clipped covers several tiles 2016-05-20 17:50:20 -07:00
Eric Fischer f03fbdb5c1 Fail gracefully if input to tippecanoe-decode isn't a vector tile 2016-05-17 15:43:42 -07:00
Eric Fischer b80081ec38 Merge pull request #247 from mapbox/less-memory
Pack structures tighter to use a little less memory
2016-05-13 15:59:07 -07:00
Eric Fischer 331deca4b4 Use bitfields to further reduce data structure size 2016-05-13 15:45:33 -07:00
Eric Fischer f0e90620e4 A little more structure packing 2016-05-11 14:47:23 -07:00
Eric Fischer c0edefa721 Pack structures tighter to use a little less memory 2016-05-11 14:23:39 -07:00
Eric Fischer cc4a2736ea Merge pull request #243 from mapbox/z0-extent
Fix clipping extent at z0, and area calculation in tippecanoe-decode
2016-05-10 16:55:39 -07:00
Eric Fischer 3655a54d22 Add the ability to inline metadata with geometry 2016-05-10 16:46:45 -07:00
Eric Fischer 167f3c59ef Missed updating this test output 2016-05-10 16:39:54 -07:00
Eric Fischer 2a5e2091f3 Mention decoding fix in changelog 2016-05-10 13:29:14 -07:00
Eric Fischer 24327e195f Fix area calculation for polygon rings in tippecanoe-decode 2016-05-10 12:13:03 -07:00
Eric Fischer 4f01b13fe1 Let zoom level 0 have just as much extent and buffer as any other zoom 2016-05-09 16:01:10 -07:00
Eric Fischer f920c05c75 Merge pull request #241 from mapbox/save-polygons
Don't let polygons with nonzero area disappear during cleaning
2016-05-05 14:55:52 -07:00
Eric Fischer 5cc6d97d9f Don't let polygons with nonzero area disappear during cleaning
If they collapse, turn them into placeholder squares with the
appropriate area so that there aren't visible coverage gaps.
2016-05-05 13:42:32 -07:00
Eric Fischer fa523bff2b Merge pull request #235 from mapbox/malloc
Remove more uses of malloc; fix more warnings
2016-05-03 17:20:39 -07:00
Eric Fischer 0bd06c6d82 Merge branch 'master' into malloc 2016-05-03 17:06:52 -07:00
Eric Fischer 808de5378b Bump version number 2016-05-03 16:47:29 -07:00
Eric Fischer 0f1d2e4220 Fix additional g++ warnings 2016-05-03 16:39:26 -07:00
Eric Fischer 43ffd6fe11 Fix the warnings about the unused array of option names 2016-05-03 16:34:19 -07:00
Eric Fischer f1b3f6d231 Fix warnings about shadowed variables 2016-05-03 15:48:42 -07:00
Eric Fischer 5775d088eb Get rid of the strdup for attribution 2016-05-03 11:40:36 -07:00
Eric Fischer 9fcd079084 Add a test from the tile-join example 2016-05-03 11:30:53 -07:00
Eric Fischer d712edcdc9 Stop using strdup for tile-join matching 2016-05-03 11:14:09 -07:00
Eric Fischer 271ec3d154 Stop using malloc for layer names 2016-05-03 10:52:49 -07:00
Eric Fischer 68c3bafab0 Merge pull request #234 from mapbox/clipper-update
Update clipper to 9edc2924e39:
2016-05-02 16:31:10 -07:00
Eric Fischer 1aac686670 Update clipper to 9edc2924e39:
commit 9edc2924e39266d70774b0ed0e07329a95e76f10
Author: Blake Thompson <flippmoke@gmail.com>
Date:   Mon May 2 14:45:21 2016 -0400

	Updated to prevent segfault in case where specific iterator was being deleted
	and therefore, the range second no longer existed.
2016-05-02 16:23:08 -07:00
Eric Fischer 364450ad4c Merge pull request #233 from mapbox/overflow
Make better use of the C++ standard library
2016-04-28 16:41:18 -07:00
Eric Fischer 023ce03672 Fix indentation and bump version number 2016-04-28 15:11:57 -07:00
Eric Fischer adc70341ad Use std::set to track the layer-wide feature attribute types.
Track them during parsing, not tiling.  Remove the old string pool code.
2016-04-28 14:59:58 -07:00
Eric Fischer 87b90a5033 Use std::set to track included and excluded feature properties 2016-04-28 12:57:03 -07:00
Eric Fischer f75d9e0dd4 Avoid needlessly constructing a temporary string 2016-04-28 12:46:40 -07:00
Eric Fischer 444de1f086 Get rid of malloc around layer names 2016-04-28 12:20:51 -07:00
Eric Fischer 3f0904cce8 Use std::string instead of malloc strings to make mbtiles metadata 2016-04-28 11:56:30 -07:00
Eric Fischer 40a6b7b37a Another attempt to ensure that string hashing can't overflow 2016-04-28 11:52:16 -07:00
Eric Fischer 5490f3e15f Fix numeric overflow 2016-04-28 11:52:09 -07:00
Eric Fischer 666565e820 Merge pull request #232 from mapbox/cplusplus
Convert everything to C++
2016-04-27 15:52:05 -07:00
Eric Fischer 744915025d Restore dependency on headers in subdirectories 2016-04-27 15:41:40 -07:00
Eric Fischer 2b393ad8e5 Move jsonpull into a subdirectory like other included libraries 2016-04-27 15:33:30 -07:00
Eric Fischer 48a82039ce Oops, I didn't check main.cpp in. 2016-04-27 15:14:09 -07:00
Eric Fischer 24db559f0b Fix complaint about duplicate #define 2016-04-27 15:12:03 -07:00
Eric Fischer c4274303ea Fix indentation 2016-04-27 15:10:26 -07:00
Eric Fischer ee97e6c307 Whittle down tile.hpp to the things that actually related to tile.cpp 2016-04-27 15:09:06 -07:00
Eric Fischer 3662f1a66b Split main program functions apart from GeoJSON parsing 2016-04-27 14:59:20 -07:00
Eric Fischer a52733eb07 Use protozero functions for zigzag encoding and decoding 2016-04-27 14:22:44 -07:00
Eric Fischer f3b9e15267 Move serialization code to its own file 2016-04-27 14:19:10 -07:00
Eric Fischer 65253cba50 Drag header files into C++ 2016-04-27 14:00:14 -07:00
Eric Fischer a57c247508 Don't try to reindent Clipper and Protozero 2016-04-27 13:55:28 -07:00
Eric Fischer 7b0bb9a443 Drag the main function and GeoJSON parsing into C++ 2016-04-27 13:54:00 -07:00
Eric Fischer 3f3a341c0a Drag constant pool handling into C++ 2016-04-27 12:44:46 -07:00
Eric Fischer 3d56a56464 Drag memory-mapped file handling into C++ 2016-04-27 12:41:49 -07:00
Eric Fischer fb9f3b6068 Drag tileset enumeration into C++ 2016-04-27 12:40:19 -07:00
Eric Fischer 575072bb2f Drag projection math into C++ 2016-04-27 12:39:21 -07:00
Eric Fischer 94db232a89 Drag mbtiles handling into C++ 2016-04-27 12:38:04 -07:00
Eric Fischer d32d4bb35f No need for line clipping to have its own source file 2016-04-27 12:36:51 -07:00
Eric Fischer b12413eddb Rename everything from .cc to .cpp to match other projects 2016-04-27 12:22:47 -07:00
Eric Fischer 8c7ac58ba1 Fix memory leaks and questionable arithmetic
Fix memory leaks and questionable arithmetic
2016-04-27 12:11:24 -07:00
Eric Fischer 737ae44dd7 Fix warnings about questionable numeric operations 2016-04-27 11:57:46 -07:00
Eric Fischer d4504da2f5 Rationalize the highest allowed maxzoom in terms of detail 2016-04-27 11:46:24 -07:00
Eric Fischer 87fea8082f Make indent, and finish writing a comment that I started 2016-04-27 10:51:54 -07:00
Eric Fischer 5cfd7cf68f Don't leak layer names 2016-04-27 10:46:01 -07:00
Eric Fischer 1e16eb9294 Don't leak whatever is left of one parse tree when starting another 2016-04-27 10:45:55 -07:00
Eric Fischer 39c180a673 Don't leak the non-GeoJSON objects in the JSON parse tree 2016-04-27 10:45:41 -07:00
Eric Fischer 60318e664e Fix leak of pools for -x and -y options 2016-04-27 10:45:33 -07:00
Eric Fischer 6a37ea4e54 Fix leaks of input source lists and bounding boxes 2016-04-27 10:45:25 -07:00
Eric Fischer 0205086886 Fix memory leak of temporary filenames 2016-04-27 10:45:17 -07:00
Eric Fischer bd5dc4ad18 Merge pull request #187 from mapbox/earcut-polygon
Upgrade Clipper to 07b828b1 to fix self-intersecting polygons
2016-04-26 14:26:10 -07:00
Eric Fischer 77bc24d743 Bump version number 2016-04-26 14:16:19 -07:00
Eric Fischer bebb0dda90 Add missing #include 2016-04-26 14:01:59 -07:00
Eric Fischer 49d29ad368 But no, I still left a few more dependencies 2016-04-26 13:54:08 -07:00
Eric Fischer 33f9d91a4c Remove protobuf prerequisites again 2016-04-26 13:50:08 -07:00
Eric Fischer a9a14b33e0 Merge remote-tracking branch 'origin/master' into earcut-polygon 2016-04-26 13:48:03 -07:00
Eric Fischer 8c82ee4c5f Merge branch 'master' into earcut-polygon
Conflicts:
	tile.cc
2016-04-26 12:09:56 -07:00
Eric Fischer d72639b8f7 Merge pull request #219 from mapbox/protozero
Use protozero for reading and writing vector tile protocol buffers
2016-04-25 17:00:32 -07:00
Eric Fischer aaec2c98b6 Clearer names 2016-04-25 16:52:20 -07:00
Eric Fischer 52f2804122 Make lexical feature ordering work again, and add a test for it 2016-04-25 16:47:30 -07:00
Eric Fischer e10a71e152 Use the mvt constant pool when tiling 2016-04-25 16:19:52 -07:00
Eric Fischer 7bb4c7dbe9 Add a helper method to manage the tile layer's key-value constant pool 2016-04-25 14:20:21 -07:00
Eric Fischer 2dea1d1564 Fix hardwired layer version number 2016-04-25 12:23:40 -07:00
Eric Fischer 23934166b1 Methods instead of functions 2016-04-25 12:13:52 -07:00
Eric Fischer 2afd0bf31b Try with clang++ instead 2016-04-25 10:22:14 -07:00
Eric Fischer 4e71c40f54 Try backing off to older C++ standard for older g++ 2016-04-25 09:58:36 -07:00