Commit Graph
100 Commits
Author SHA1 Message Date
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
Eric Fischer 6f5199adc7 Check whether polygon inner rings are inside the outer ring 2016-03-28 16:52:33 -07:00
Eric Fischer c6051d876f Merge branch 'master' into earcut-polygon
Conflicts:
	geometry.cc
2016-03-28 15:45:16 -07:00
Eric Fischer 72b7dc977a Merge pull request #196 from mapbox/stray-geom
Remove temporary files that were accidentally left in place
2016-03-28 15:31:31 -07:00
Eric Fischer 448d1a124e Handle case of options that aren't processed individually 2016-03-28 15:10:04 -07:00
Eric Fischer edce0f088d Add GNU-style long options 2016-03-28 15:03:28 -07:00
Eric Fischer b47653e2e6 Remove temporary files that were accidentally left in place 2016-03-28 14:00:01 -07:00
Eric Fischer 9f2e221338 Merge pull request #193 from mapbox/malloc
Check return values after allocating memory
2016-03-28 13:46:45 -07:00
Eric Fischer 5a2a1b793a Exit cleanly if there was no valid input instead of giving an mmap error 2016-03-28 13:22:03 -07:00
Eric Fischer cf2abf67d2 Oops: need to check array size in bytes, not number of objects 2016-03-28 13:08:54 -07:00
Eric Fischer 356575d0e0 Check for JSON array and hash overflows 2016-03-28 12:25:33 -07:00
Eric Fischer 7d602987e7 Merge pull request #194 from stevage/patch-2
Warn of spurious errors (as per #191)
2016-03-28 12:07:41 -07:00
Eric Fischer 21a635fb7a Check for string length overflow 2016-03-28 12:00:55 -07:00
Eric Fischer a92bdce12e Upgrade clipper to f9c1344a09 2016-03-28 10:31:17 -07:00
Eric Fischer 1e5d420b66 Fix warnings about unused arguments 2016-03-25 13:45:28 -07:00
Eric Fischer 12be3e5a32 This one really is an int upstream 2016-03-25 13:21:32 -07:00
Eric Fischer 52dbed8132 Fix a few warnings about globals 2016-03-25 13:03:57 -07:00
Eric Fischer c2231318bd Many places where I used unsigned array indices but meant size_t 2016-03-25 12:20:32 -07:00
Eric Fischer eee596d5f5 Check return values from memory allocation 2016-03-25 11:57:33 -07:00
Eric Fischer bc5a7b251f Check return values after allocating memory 2016-03-25 11:20:56 -07:00
Eric Fischer 91ffb084a7 Install libc++-dev in another attempt to fix the build 2016-03-24 17:26:29 -07:00
Eric Fischer 052c0a55df Try forcing libc++ on Linux to fix the build 2016-03-24 17:17:11 -07:00
Eric Fischer 76ab63c1d0 Another attempt at fixing Travis on Linux 2016-03-24 15:31:44 -07:00
Eric Fischer a03b461aa5 Try to fix Travis on Linux 2016-03-24 15:18:51 -07:00
Eric Fischer 64c98b38b4 Add Clipper header dependency 2016-03-24 14:39:38 -07:00
Eric Fischer 05ff656aba Upgrade to Clipper 9dfe779ed7a 2016-03-24 14:36:36 -07:00
Eric Fischer f37eccafe6 Merge branch 'master' into earcut-polygon 2016-03-24 14:32:49 -07:00
Eric Fischer d4776c8bfb Warn when splitting up a 700-sided polygon for the first time 2016-03-23 17:35:19 -07:00
Eric Fischer 705a58d255 Reverse polygon rings if they come out of Clipper with the wrong polarity 2016-03-23 17:10:10 -07:00
Eric Fischer 54c7cfff4c Upgrade to Clipper 296c37e3206bfa 2016-03-23 16:46:55 -07:00
Eric Fischer eebba7b75b Merge pull request #189 from mapbox/decode-pbf
Add the ability to tippecanoe-decode a standalone .pbf tile
2016-03-22 17:35:42 -07:00
Eric Fischer 962f82d44e Add a test for decoding standalone PBFs 2016-03-22 17:12:09 -07:00
Eric Fischer d960963623 Add the ability to tippecanoe-decode a standalone .pbf tile 2016-03-22 16:51:29 -07:00
Eric Fischer 4fc6ca3c3b Keep from getting stuck in an infinite loop 2016-03-21 17:23:34 -07:00
Eric Fischer a989611515 Upgrade to Clipper 3eb6a85910aff 2016-03-21 16:13:47 -07:00
Eric Fischer 707036fe79 Upgrade Clipper to 07b828b1 to fix self-intersecting polygons 2016-03-18 16:35:29 -07:00
Eric Fischer 7140a3dd91 Merge pull request #186 from mapbox/resolution-doc
Clarify maximum resolution in README and warning
2016-03-17 11:54:24 -07:00
Eric Fischer 16ca5cfeec Clarify maximum resolution in README and warning 2016-03-17 11:23:54 -07:00
Eric Fischer c66fd315e1 Merge pull request #185 from mapbox/line-polygons
Silently drop zero-area polygons instead of showing Clipper errors
2016-03-10 17:31:47 -08:00
Eric Fischer 7896c3c2c9 Don't get stuck in a loop if subdividing a complex polygon fails 2016-03-10 17:07:22 -08:00
Eric Fischer 7eccc7a758 Silently drop zero-area polygons instead of showing Clipper errors 2016-03-10 16:03:02 -08:00
Eric Fischer 652abc9a62 Put all the apt-get instructions on one line 2016-03-10 12:15:49 -08:00
Eric Fischer c387af48cc Merge pull request #182 from mapbox/thrashing
Reorder geometry as part of index merging, to reduce thrashing in low memory
2016-03-08 13:41:47 -08:00
Eric Fischer cf5082122a Close original geometry temp files as soon as they are no longer needed 2016-03-07 16:45:35 -08:00
Eric Fischer bf585a5849 Add newline to clean up progress messages 2016-03-07 16:38:21 -08:00
Eric Fischer 11e737ff29 Reorder geometry as part of the merge 2016-03-07 16:34:12 -08:00
Eric Fischer 310887e019 Fix duplicated variable name 2016-03-07 13:40:32 -08:00
Eric Fischer 81d2a8bfed Encourage -B, not -z, to set the base zoom level 2016-03-07 13:21:53 -08:00
Eric Fischer b7f3fcfc7f Merge pull request #180 from mapbox/coverage
Add a gamma-reduction test and base zoom/drop rate guessing tests
2016-03-03 17:34:56 -08:00
Eric Fischer f17cec5c44 Factor out gap logic instead of duplicating it 2016-03-03 17:03:47 -08:00
Eric Fischer d38b5a999e Make base zoom and drop rate guessing more testable, and test them 2016-03-03 17:03:03 -08:00
Eric Fischer e4ab47b3d6 Add a gamma-reduction test 2016-03-03 15:44:07 -08:00
Eric Fischer b3aa32b9a3 Merge pull request #179 from mapbox/coverage
More tests for higher code coverage
2016-03-02 17:25:54 -08:00
Eric Fischer c9fdd62c91 Try to add zoom skipping to code coverage 2016-03-02 16:37:55 -08:00
Eric Fischer 739f2dbc75 Test stability of feature ordering 2016-03-02 16:19:38 -08:00
Eric Fischer fb9525cf4f Add a MultiPoint test 2016-03-02 15:23:22 -08:00