Commit Graph
100 Commits
Author SHA1 Message Date
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
Eric Fischer 03d5c89742 These are version 2 tiles 2016-04-25 09:24:36 -07:00
Eric Fischer 9e9afb06d2 Fix signedness warnings, missing #includes, and code formatting. 2016-04-22 23:32:02 -07:00
Eric Fischer b15956b476 Oops, was still linking to -lprotobuf-lite 2016-04-22 19:30:37 -07:00
Eric Fischer 4cee508e95 Add missing #include 2016-04-22 17:51:35 -07:00
Eric Fischer 135aea8527 Use protozero for writing tiles 2016-04-22 17:45:24 -07:00
Eric Fischer 5ec41d7bbb Use protozero for tile decoding 2016-04-22 17:10:33 -07:00
Eric Fischer f9c4fb8374 Factor out tile reading and writing from tile-join 2016-04-22 15:47:06 -07:00
Eric Fischer f837577b38 Rename pb_ prefixes to mvt_ 2016-04-22 15:10:16 -07:00
Eric Fischer 358f019372 Factor out vector tile writing 2016-04-22 15:06:26 -07:00
Eric Fischer f902721dab Abstraction of tile decoding 2016-04-22 13:27:03 -07:00
Eric Fischer b91e8f6d3e Start factoring out protocol buffer handling code 2016-04-22 12:00:19 -07:00
Eric Fischer 2607a76c63 Merge pull request #215 from mapbox/no-clipping
Add an option not to clip features if they appear in the tile at all
2016-04-21 10:36:51 -07:00
Eric Fischer ea638914ce Add an option not to clip features and to include each exactly once per zoom 2016-04-20 15:06:43 -07:00
Eric Fischer 41099ed731 Don't add extra points at tile boundaries if not clipping
The extra points kept the features from being exactly the same
in each tile.
2016-04-19 16:13:02 -07:00
Eric Fischer 56d8178a7c Fix a mistake in the formatting of the Usage message 2016-04-19 15:35:58 -07:00
Eric Fischer 24f401da52 Add an option not to clip features if they appear in the tile at all 2016-04-19 15:32:58 -07:00
Eric Fischer 62a74afbdc Remember to do floating point division in pnpoly 2016-04-19 12:28:49 -07:00
Eric Fischer 694fa8ee97 Merge pull request #213 from mapbox/polygon-coalesce
Clean up polygon geometry again after coalescing
2016-04-18 16:15:13 -07:00
Eric Fischer 45cddc57bb Simplify coordinates to avoid cross-platform rounding errors 2016-04-18 16:10:08 -07:00
Eric Fischer 86b8567201 Clean up polygon geometry again after coalescing 2016-04-18 15:53:04 -07:00
Eric Fischer 04c56320d2 Merge branch 'master' into earcut-polygon
Conflicts:
	geometry.cc
2016-04-14 16:21:56 -07:00
Eric Fischer 2a6e41126f Merge pull request #212 from mapbox/limitfiles
Speculatively open files to avoid overrunning the system limits
2016-04-14 10:32:19 -07:00
Eric Fischer 81517a0cb4 Fix tracking of number of available file descriptors 2016-04-14 10:20:28 -07:00
Eric Fischer 732a51d684 Fix the option for testing radix sort
Add a check to make sure I don't make the same mistake again
2016-04-14 10:06:01 -07:00
Eric Fischer 222735004d Add a sanity check to make sure I remember to close all open files 2016-04-13 20:33:01 -07:00
Eric Fischer 137bb46db5 Clean up the maximum-files-open check a little 2016-04-13 20:20:25 -07:00
Eric Fischer cae20bb5e6 Speculatively open files to avoid overrunning the system limits 2016-04-13 18:05:24 -07:00
Eric Fischer 7c9bd5da2f Merge pull request #210 from mapbox/block-input
Don't let the input buffer for parallel streaming input get too big.
2016-04-13 13:31:51 -07:00
Eric Fischer fbcb00fee9 Add an option to set the tileset's attribution 2016-04-13 12:49:41 -07:00
Eric Fischer 4dba8b3f70 Update clipper to 381c817fd13e8 2016-04-13 10:18:32 -07:00
Eric Fischer cb4a83776e Fix log formatting 2016-04-12 16:52:46 -07:00
Eric Fischer e5461b1863 Additional debug output from polygon checking 2016-04-12 16:40:03 -07:00
Eric Fischer 3a46c05b46 Fix the progress indicator 2016-04-12 10:59:06 -07:00
Eric Fischer 968c94a409 Quiet warning about potentially uninitialized variable. 2016-04-11 16:43:46 -07:00
Eric Fischer efe66dcafe Use stdio instead of mmap for geometry while tiling to reduce thrashing 2016-04-11 15:59:02 -07:00
Eric Fischer c6d2988485 Logic may be clearer this way 2016-04-11 14:51:04 -07:00
Eric Fischer e846b11ce7 Don't let the input buffer for parallel streaming input get too big. 2016-04-11 13:51:28 -07:00
Eric Fischer 9d48d6a93d Merge pull request #208 from mapbox/simplify-crash
Fix a line simplification crash when a segment degenerates to a single point
2016-04-07 16:50:01 -07:00
Eric Fischer acb97361a0 Fix a line simplification crash when a segment degenerates to a single point 2016-04-07 16:45:45 -07:00
Eric Fischer 64faa1d79e Upgrade Clipper to 68c49e9a9a 2016-04-07 13:52:39 -07:00
Eric Fischer 1e6332bae8 Merge branch 'master' into earcut-polygon
Conflicts:
	geojson.c
	tile.h
2016-04-07 13:50:04 -07:00
Eric Fischer 1792a13e1a Merge pull request #207 from mapbox/checkspace
Keep an eye on free disk space and warn if tippecanoe is using it all
2016-04-07 12:23:05 -07:00
Eric Fischer 41ae22164c Mention the default location for temporary files 2016-04-07 11:39:32 -07:00
Eric Fischer 73fcdba02b Linux and Mac want different headers for file system stats 2016-04-07 11:23:33 -07:00
Eric Fischer 1eb0537302 Warn if temporary directory doesn't begin with / 2016-04-07 10:47:46 -07:00
Eric Fischer 39285c8102 Keep an eye on free disk space and warn if tippecanoe is using it all 2016-04-07 10:35:36 -07:00
Eric Fischer 22ede9ac8c Merge pull request #206 from mapbox/chatty-polygon
Add an option to drop a fraction of polygons by zoom.
2016-04-06 14:33:48 -07:00
Eric Fischer 574a2b79c8 Add an option to drop a fraction of polygons by zoom.
Only warn once about polygon cleaning failures.
2016-04-06 14:17:44 -07:00
Eric Fischer 1e31edbfb3 Merge branch 'master' into earcut-polygon
Conflicts:
	geojson.c
	tile.h
2016-04-05 15:22:43 -07:00
Eric Fischer d1456c0f66 Merge pull request #202 from mapbox/radix
Restructure geometry reordering to try to reduce virtual memory thrashing
2016-04-05 15:13:44 -07:00
Eric Fischer 4a572b810b Close some file descriptors that were left dangling before 2016-04-05 14:07:24 -07:00
Eric Fischer b10b436ac9 Add a way to test recursive radix sorting. Bump version number. 2016-04-05 13:32:44 -07:00
Eric Fischer e394501faa Check for errors when closing files 2016-04-05 11:13:31 -07:00
Eric Fischer c0a0aef060 Use large sort chunks, since that part can be parallelized 2016-04-05 10:08:46 -07:00
Eric Fischer 2a4be4f6d4 Parallel reading is effectively random order, not sequential 2016-04-04 17:00:11 -07:00
Eric Fischer c62762078a Can't tell Linux to free pages, so just say we don't need them 2016-04-04 16:18:55 -07:00
Eric Fischer 72e485f285 Also advise when unmapping pages 2016-04-04 16:14:26 -07:00
Eric Fischer b1d3849889 Sprinkle madvise calls to hint about how files should be paged in 2016-04-04 16:03:13 -07:00
Eric Fischer 2b0ac890c5 Fix the status message about how much geometry there is 2016-04-04 15:33:25 -07:00
Eric Fischer d4b9f79d3c Fix the progress indicator when there is an inner radix sort 2016-04-04 14:49:41 -07:00
Eric Fischer 31c4d4850c Remove dead code 2016-04-04 13:22:23 -07:00
Eric Fischer 2fe841c6dc Remove extra newline output from old progress format 2016-04-04 11:42:40 -07:00
Eric Fischer 7b6cd2d0f4 Fix the any-valid-geometries check again 2016-04-04 11:25:21 -07:00
Eric Fischer c9e542e688 Keep meta count inline to avoid thrash if no attributes 2016-04-04 11:18:37 -07:00
Eric Fischer 986719f2ff Rework sorting/merging progress indicator 2016-04-04 10:53:53 -07:00
Eric Fischer e2b36a8ee9 Restore mergesort for the intermediate sort. Tests pass. 2016-04-01 18:15:31 -07:00
Eric Fischer 55f93963be Stop recursing when the indices are exactly the same 2016-04-01 17:41:53 -07:00
Eric Fischer cf806baca2 Slow, but works for some cases now 2016-04-01 17:36:09 -07:00
Eric Fischer 60139532c8 Provide top-level output files for geometry and index 2016-04-01 17:01:10 -07:00
Eric Fischer 9793be1517 Split indices and geometries up by radix 2016-04-01 16:25:10 -07:00
Eric Fischer 851d7b576b Merge branch 'master' into radix 2016-04-01 15:32:15 -07:00
Eric Fischer 1e8c030b03 Make indent 2016-04-01 15:31:59 -07:00
Eric Fischer 560add2ccd More calculation about how many fds are available 2016-04-01 15:31:34 -07:00
Eric Fischer 24deae5a43 Reunify the string pool and metadata earlier to free up file descriptors 2016-04-01 12:38:32 -07:00
Eric Fischer 9acecdf93e OS-specific code to determine memory size 2016-03-31 15:29:43 -07:00
Eric Fischer 8cc844c9dd Merge pull request #201 from mapbox/llong_max
Fix where I used the wrong names for the max/min long long constants
2016-03-31 14:33:11 -07:00
Eric Fischer 389cdf2aa4 Bump version number 2016-03-31 11:44:04 -07:00
Eric Fischer e5157ec66b Fix where I used the wrong names for the max/min long long constants 2016-03-31 11:39:12 -07:00
Eric Fischer 4da5a1996b Merge branch 'master' into earcut-polygon
Conflicts:
	Makefile
2016-03-29 15:18:01 -07:00
Eric Fischer 5d701913ab Merge pull request #199 from mapbox/named-layers
Add an option to give specific layer names to specific input files
2016-03-29 15:08:06 -07:00
Eric Fischer 62fac4d6f4 Add a test for layer names 2016-03-29 15:01:03 -07:00
Eric Fischer bd3b9a5136 Add an option to give specific layer names to specific input files 2016-03-29 13:13:39 -07:00
Eric Fischer 10cd9c8875 Check the ring order manually and reorder them if they don't nest right 2016-03-29 11:05:39 -07:00
Eric Fischer c404082421 Factor out copied-and-pasted polygon area calculations 2016-03-28 17:01:17 -07:00