Commit Graph
100 Commits
Author SHA1 Message Date
Eric Fischer bf619a315c Merge branch 'master' into plugins 2017-01-03 13:25:05 -08:00
Eric Fischer e53c8ed7e6 Merge pull request #343 from mapbox/attributes-for-named-layers
Associate attributes with the right layer when explicitly tagged (#342)
2017-01-03 13:24:37 -08:00
Eric Fischer c87d6eadfc Associate attributes with the right layer when explicitly tagged (#342) 2017-01-03 12:20:52 -08:00
Eric Fischer 8e17c3aa09 Update the layer list outside of the property loop 2017-01-02 16:33:44 -08:00
Eric Fischer cf6a2d3a67 Provide layer names to postfilter and read layer names back in 2016-12-21 11:47:49 -08:00
Eric Fischer 71ac6596af Warn about broken pipes in filters instead of exiting abruptly 2016-12-21 10:10:22 -08:00
Eric Fischer 6a5461763c Fix reordering of attributes and failure to update layer name table 2016-12-20 16:41:23 -08:00
Eric Fischer a2060299c9 Fix arithmetic overflow that was breaking some prefilter polygons 2016-12-20 15:59:10 -08:00
Eric Fischer 854dc2bca5 Merge branch 'master' into plugins 2016-12-20 14:15:06 -08:00
Eric Fischer 8ab5bb4809 Merge pull request #341 from mapbox/choose-first-tile
Choose a deeper initial tile than 0/0/0 if one contains all the features
2016-12-16 14:15:42 -08:00
Eric Fischer 6a2e80769e Choose a deeper initial tile than 0/0/0 if one contains all the features 2016-12-16 12:22:38 -08:00
Eric Fischer 78d91b3fde Merge pull request #333 from mapbox/wagyu-clean
Switch polygon topology correction from Clipper to Wagyu
2016-12-14 16:13:31 -08:00
Eric Fischer 275d25739d Update to wagyu-0.2.1 (eec53a6) 2016-12-14 14:14:55 -08:00
Eric Fischer 4fc671f1d1 Merge branch 'master' into plugins 2016-12-14 11:29:58 -08:00
Eric Fischer b3c116b989 Merge branch 'master' into wagyu-clean 2016-12-14 11:12:07 -08:00
Eric Fischer 5549789da5 Merge pull request #338 from mapbox/warnings
Fix warnings identified by g++
2016-12-14 11:11:29 -08:00
Eric Fischer 56e1f55bb6 Fix warnings identified by g++ 2016-12-13 17:54:55 -08:00
Eric Fischer 3e4fcd22ec Merge pull request #337 from mapbox/sanitize-integer
Fix integer overflow identified by -fsanitize=integer
2016-12-13 17:28:27 -08:00
Eric Fischer d7d5bed781 Remove duplicate vertices before calling wagyu 2016-12-13 16:55:33 -08:00
Eric Fischer af3d48e5b3 Fix integer overflow identified by -fsanitize=integer 2016-12-13 16:19:38 -08:00
Eric Fischer ce3ffee8ff Merge pull request #336 from mapbox/tile-join-fixes
Don't allow two attributes with the same name, and strip \r from CSV.
2016-12-13 15:24:15 -08:00
Eric Fischer f928133993 Don't allow two attributes with the same name, and strip \r from CSV. 2016-12-13 14:35:51 -08:00
Eric Fischer c2fa8e3633 Switch the segment and layer ID based on prefilter output 2016-12-12 17:00:45 -08:00
Eric Fischer ad4060eced Fix coordinate rounding error in the prefilter 2016-12-12 16:12:22 -08:00
Eric Fischer 9c0e2cdfa7 Fill out layermaps when reading the output of the prefilter 2016-12-12 16:08:08 -08:00
Eric Fischer 5e7f718afc Fill out layermaps when reading the output of the postfilter 2016-12-12 15:21:05 -08:00
Eric Fischer 57ff54e683 Fix coordinate overflow by increasing integer size 2016-12-09 16:35:41 -08:00
Eric Fischer 5dc773ffae Carry attribute keys and values through from the prefilter 2016-12-09 15:54:47 -08:00
Eric Fischer 0e5b513637 Start getting features (just geometry so far) back from the prefilter 2016-12-09 15:35:57 -08:00
Eric Fischer a338f5390f Fix where I was closing the prefilter pipe in the wrong thread 2016-12-09 14:15:17 -08:00
Eric Fischer c8a8915064 Push prefilter writing into a thread (but something is crashing) 2016-12-09 14:01:07 -08:00
Eric Fischer 9f10f48bfb Pull feature deserialization and rewriting out of the loop 2016-12-09 11:53:50 -08:00
Eric Fischer 5194a39c16 Factor out clipping to tile boundaries; test random attributes & layers 2016-12-09 10:47:03 -08:00
Eric Fischer daf1941ba9 Add missing #include 2016-12-08 17:22:07 -08:00
Eric Fischer 569825324a Factor out feature deserialization 2016-12-08 17:11:37 -08:00
Eric Fischer 16df86c26e Set up and tear down the prefilter pipeline 2016-12-08 16:13:02 -08:00
Eric Fischer d940eb1cef Factor out filter setup from the reading and writing loops 2016-12-08 15:46:12 -08:00
Eric Fischer d1dc310bbc The GeoJSON-producing part of prefiltering 2016-12-08 15:13:38 -08:00
Eric Fischer e3823c966c Use more idiomatic C++ to quote JSON strings 2016-12-08 14:02:06 -08:00
Eric Fischer 5960a15fcd Add magic #defines to avoid default small Mac stdio limits 2016-12-08 12:33:02 -08:00
Eric Fischer 6530e155eb Don't put a comma between features in filter output 2016-12-08 11:14:06 -08:00
Eric Fischer 8cf81483b1 Add missing #include 2016-12-08 10:31:27 -08:00
Eric Fischer 3f14a0dd55 Factor out conversion from JSON types to vector tile attribute types 2016-12-07 16:17:17 -08:00
Eric Fischer a4f5406cfb Switch polygon topology correction from Clipper to Wagyu 2016-12-07 14:29:09 -08:00
Eric Fischer 22cb5186d7 Copy of wagyu-0.2.0 (b3fa127) 2016-12-07 14:14:56 -08:00
Eric Fischer c0d5171f1d Copy of geometry.hpp-0.9.0 (e3acceb) 2016-12-07 14:11:53 -08:00
Eric Fischer 89bfd27a8b Copy of variant-1.1.4 (02bd1ac) 2016-12-07 14:09:51 -08:00
Eric Fischer 5554b9cbba Add the command-line option to specify the filter 2016-12-07 12:15:57 -08:00
Eric Fischer a114a890d8 Keep from leaking other pipe file descriptors to unrelated children 2016-12-07 11:26:03 -08:00
Eric Fischer 58e268777c Missed a file for the close-on-exec flag 2016-12-07 11:19:29 -08:00
Eric Fischer 3d1ceac96a Lock around setup of pipeline and filter process 2016-12-07 11:16:34 -08:00
Eric Fischer 87d86ecfc9 Set close-on-exec flag for most file descriptors 2016-12-07 10:57:56 -08:00
Eric Fischer 7514797c4c Add missing #includes 2016-12-06 17:25:23 -08:00
Eric Fischer d8fe69a99e Round coordinates instead of truncating to avoid projection error 2016-12-06 17:19:22 -08:00
Eric Fischer 679189e5a2 Parse JSON coming back in and turn it back into features 2016-12-06 17:19:22 -08:00
Eric Fischer c82e3e98c3 Factor out parsing the geometry coordinate array 2016-12-06 17:19:22 -08:00
Eric Fischer 4256473283 More reorganization to reuse JSON parsing 2016-12-06 17:19:22 -08:00
Eric Fischer 112f451c66 Move JSON-writing again to keep it from requiring all plugin code 2016-12-06 17:19:22 -08:00
Eric Fischer 72478ae13e Be more consistent about checking for errors from close() 2016-12-06 17:19:22 -08:00
Eric Fischer 94bebbd276 Write GeoJSON to the filter and read (but don't parse) what comes back 2016-12-06 17:19:22 -08:00
Eric Fischer adfceed554 Factor out conversion from vector tile to GeoJSON 2016-12-06 17:19:22 -08:00
Eric Fischer 785d341cde Merge pull request #331 from mapbox/no-dropping-if-zoom-tagged
Dot-dropping doesn't apply if there is a per-feature minzoom tag
2016-12-06 16:03:00 -08:00
Eric Fischer e8c5759f70 Dot-dropping doesn't apply if there is a per-feature minzoom tag 2016-12-06 15:36:10 -08:00
Eric Fischer afa782fb7f Merge pull request #328 from mapbox/grid-snap-rounding
Round coordinates in low-zoom grid instead of truncating
2016-11-30 14:31:23 -08:00
Eric Fischer f6d5d1803b Round coordinates in low-zoom grid instead of truncating
To avoid rounding error if features are already tile-grid-aligned
2016-11-29 15:18:44 -08:00
Eric Fischer ab9eafa0b7 Merge pull request #325 from mapbox/gridded
Option to snap low zooms to a stairstep grid
2016-11-29 13:59:15 -08:00
Eric Fischer f1ff7301c1 Add a test for grid snapping 2016-11-28 16:32:54 -08:00
Eric Fischer 0db8d9ed8b Option to snap low zooms to a stairstep grid 2016-11-28 15:45:38 -08:00
Eric Fischer c68d553e94 Merge pull request #323 from mapbox/point-area
Stop --drop-smallest-as-needed from always dropping all points
2016-11-23 15:10:25 -08:00
Eric Fischer c867ce5f32 Stop --drop-smallest-as-needed from always dropping all points 2016-11-23 13:57:32 -08:00
Eric Fischer 2d022c6c57 Merge pull request #312 from mapbox/dynamic-gamma
Add an option to dynamically increase gamma until tiles are small enough
2016-11-21 14:33:23 -08:00
Eric Fischer bedace67e7 Remove --merge-polygons-as-needed until it works well. Bump version. 2016-11-21 13:36:31 -08:00
Eric Fischer e9aa8c1b7d Add an option to prevent tiny polygon reduction 2016-11-21 11:26:37 -08:00
Eric Fischer dc9e68b128 Make feature-dropping option names a little more consistent 2016-11-17 12:40:11 -08:00
Eric Fischer 5479e59aa9 Save another byte in features that have no metadata 2016-11-17 10:11:59 -08:00
Eric Fischer 439b544c8c Don't serialize the feature sequence number unless needed for -pi 2016-11-16 17:35:25 -08:00
Eric Fischer a69a087b08 Merge pull request #319 from jingsam/patch-1
Create .gitignore
2016-11-16 10:25:26 -08:00
Eric Fischer 9ea29601ab Don't let line simplification reduce a polygon ring to below 3 points 2016-11-14 11:22:21 -08:00
Eric Fischer 32aa653082 Don't spend geometry space on index or extent unless it is needed 2016-11-11 17:37:46 -08:00
Eric Fischer 013e6512b4 Add an option to drop the smallest features to make tiles small enough 2016-11-09 17:09:05 -08:00
Eric Fischer 38ce49d2d4 Another option for plain fractional dropping, but across the whole zoom 2016-11-04 12:26:13 -07:00
Eric Fischer ee48be26e0 Rename -k to -M before I regret that the unit for it is not kilobytes 2016-11-04 11:15:53 -07:00
Eric Fischer 700ca489c7 Fix flakiness: don't decrease the global feature gap 2016-11-03 17:49:32 -07:00
Eric Fischer a8bdbe8012 Fix the progress indicator when doing two passes over each zoom level 2016-11-03 17:13:11 -07:00
Eric Fischer 689f2ef7e9 Make better guesses about what gap will make a tile small enough 2016-11-02 16:57:35 -07:00
Eric Fischer 2e3ba8f374 Retain original feature index rather than recalculating
For better density calculation of clipped features
2016-11-02 15:11:22 -07:00
Eric Fischer d0db3323fb Binary search to find gap that leaves the desired fraction of features 2016-11-02 14:25:04 -07:00
Eric Fischer faa5720e3b Remove dead code 2016-11-01 16:31:45 -07:00
Eric Fischer 2e026f9b3b Use float instead of double in tiles if the value comes out the same 2016-10-27 14:37:46 -07:00
Eric Fischer 0834626d63 More careful JSON parsing thanks to http://seriot.ch/parsing_json.html 2016-10-27 11:39:50 -07:00
Eric Fischer 80e5159144 Remove dead code 2016-10-26 16:00:59 -07:00
Eric Fischer 7e6aa19d42 Make sure memfile growth gets tested 2016-10-26 15:57:24 -07:00
Eric Fischer 8296190487 Remove leftovers from early versions of --detect-shared-borders 2016-10-26 15:47:26 -07:00
Eric Fischer 93d3c40593 Remove dead code 2016-10-26 15:43:46 -07:00
Eric Fischer 9fbc7b9a55 Add an ignored third coordinate to improve code coverage 2016-10-26 15:33:46 -07:00
Eric Fischer 7727b3a92c Start each tile's gamma/mingap at the same point to help flaky tests 2016-10-26 10:40:53 -07:00
Eric Fischer 565b5dc6b4 Add a test of discovering the minimum workable feature spacing 2016-10-25 16:39:41 -07:00
Eric Fischer 10fc9254d1 Add an option to discover the minimum workable gap between features 2016-10-25 16:28:32 -07:00
Eric Fischer db859e8801 Reorder which tile-shrinking strategy to try first 2016-10-25 15:21:00 -07:00
Eric Fischer 667e8f7a29 Use the same discovered gamma across all tiles of a zoom level 2016-10-25 14:13:55 -07:00