Commit Graph
100 Commits
Author SHA1 Message Date
Eric Fischer 021d792d33 Getting ready for multithreaded tile-joining 2016-09-20 11:04:24 -07:00
Eric Fischer 6c74f4a1cd Keep tile data in a string instead of a pointer into the query 2016-09-20 10:17:02 -07:00
Eric Fischer 437152e02b Track the minzoom and maxzoom for each layer separately 2016-09-19 17:53:31 -07:00
Eric Fischer d7037f3d3a Add tile-join -pk option not to care about byte limit. Update docs. 2016-09-19 17:20:44 -07:00
Eric Fischer 232056c0da Make the global per-layer list of attribute types 2016-09-19 16:53:41 -07:00
Eric Fischer 470c0e2b5c Remove debug output 2016-09-19 16:36:38 -07:00
Eric Fischer 7a30aeaa6b Fix memory leak 2016-09-19 16:34:06 -07:00
Eric Fischer 8d57f031ee Rescale geometry if layer extents don't match 2016-09-19 16:25:30 -07:00
Eric Fischer a37fc361c2 Merge tiles and layers. Differing extents not handled yet. 2016-09-19 16:02:14 -07:00
Eric Fischer 47288ec05f The query-merge part of multi-source tile joining 2016-09-19 15:29:13 -07:00
Eric Fischer c20eab972b Merge pull request #296 from esamelson/patch-1
Fix typo in README.md for --drop-rate option
2016-09-06 12:53:14 -07:00
Eric Fischer b84b2b066d Merge pull request #294 from mapbox/named-layer
Add the ability to specify layer names within the GeoJSON input
2016-08-30 16:56:19 -07:00
Eric Fischer 965f4c225c Bump version number 2016-08-30 15:36:22 -07:00
Eric Fischer 4dd3411c64 Merge branch 'master' into named-layer 2016-08-30 15:33:51 -07:00
Eric Fischer 76739fd27b Fix a typo so it actually works, and add a test and documentation 2016-08-30 15:32:09 -07:00
Eric Fischer d8ba9db386 Remove unused layer count and layer name list 2016-08-30 15:09:18 -07:00
Eric Fischer 1bed572350 Rename variables for clarity 2016-08-30 15:05:33 -07:00
Eric Fischer 1f53491009 Tile by layer names instead of by layer numbers 2016-08-30 14:59:53 -07:00
Eric Fischer 3e881a428c Make a reverse-mapping table from layer IDs to names 2016-08-30 14:38:30 -07:00
Eric Fischer d490d8475e Remove unused layer count and layer name list 2016-08-30 14:17:28 -07:00
Eric Fischer d4e1ee0627 Replace malloc/free with new/delete to fix parallel-reading crash 2016-08-30 14:02:51 -07:00
Eric Fischer 31d2a3738a Get rid of the old file_keys 2016-08-30 13:46:37 -07:00
Eric Fischer 531c238c5b Pass the layer maps through into tiling 2016-08-29 17:42:46 -07:00
Eric Fischer 7f49ce5caa Merge per-thread layer names and file keys 2016-08-29 16:38:57 -07:00
Eric Fischer c26fa23564 Per-thread layermap will contain the file keys, not just a layer ID 2016-08-29 14:59:28 -07:00
Eric Fischer 5a8a7216cb Merge pull request #293 from mapbox/simplification-readme
Fix spelling of --simplification in documentation
2016-08-29 12:12:32 -07:00
Eric Fischer 7f4ef43113 Fix spelling of --simplification in documentation 2016-08-29 11:56:30 -07:00
Eric Fischer 6a7a139170 Merge pull request #288 from mapbox/bad-polygon-revival
Don't try to revive a placeholder for a degenerate polygon with negative area
2016-08-25 13:45:12 -07:00
Eric Fischer 0d1931319c Use simpler calculation to intersect polygon edges with tile edges.
Add the polygon that produced a bad tile with the previous version
as a test.
2016-08-24 15:32:48 -07:00
Eric Fischer 9161b74d99 Don't try to revive a placeholder for a degenerate polygon with negative area 2016-08-24 12:34:28 -07:00
Eric Fischer f7e64dca5f Work in progress on being able to specify per-feature layer names 2016-08-23 15:33:53 -07:00
Eric Fischer 85fd49f28c Merge pull request #284 from mapbox/join-id
Pass feature IDs through in tile-join
2016-08-16 17:07:14 -07:00
Eric Fischer c85303aada Pass feature IDs through in tile-join 2016-08-16 13:21:15 -07:00
Eric Fischer 938e6a9eea Merge pull request #280 from mapbox/fragment-geometry
Move polygon winding fixup out of tiling and into parsing
2016-08-15 14:04:06 -07:00
Eric Fischer b2aa6de898 Provide some JSON context when reporting parsing errors 2016-08-15 13:11:35 -07:00
Eric Fischer be6e3c88d4 Merge pull request #281 from mapbox/dataset
Don't say "dataset"
2016-08-10 14:17:36 -07:00
Eric Fischer 9ef9954d20 Don't say "dataset" 2016-08-10 12:08:15 -07:00
Eric Fischer 475ce9dd23 Fix g++ compiler warnings 2016-08-08 17:14:48 -07:00
Eric Fischer 8b339abd40 Use the same serialization in both places, and add sanity checks 2016-08-08 17:08:36 -07:00
Eric Fischer bf571571a9 Factor out (initial) feature serialization 2016-08-08 15:36:49 -07:00
Eric Fischer 6de7920c9e Separate data gathering from serialization a little better 2016-08-02 14:53:30 -07:00
Eric Fischer 84370c59b8 Get rid of some more explicit memory management 2016-08-02 14:07:56 -07:00
Eric Fischer 67272bfe4a Move polygon winding fixup out of tiling and into parsing 2016-08-01 17:35:37 -07:00
Eric Fischer 6d6c1abc64 Parse GeoJSON geometry into memory instead of straight to a file 2016-08-01 14:29:30 -07:00
Eric Fischer 6f58d31bc8 Merge pull request #279 from mapbox/fix-preserve
Fix the spelling of the --preserve-input-order option
2016-08-01 11:04:08 -07:00
Eric Fischer e760521382 Fix the spelling of the --preserve-input-order option 2016-08-01 11:03:35 -07:00
Eric Fischer 1b1b745419 Merge pull request #276 from mapbox/feature-id
Fix wrongly-nested parentheses
2016-07-15 15:40:46 -07:00
Eric Fischer 10b9af81d3 Fix wrongly-nested parentheses 2016-07-15 15:32:37 -07:00
Eric Fischer 7c664dad09 Merge pull request #275 from mapbox/feature-id
Encode the "id" field of GeoJSON objects as vector tile feature ID
2016-07-15 15:25:42 -07:00
Eric Fischer 488dff0efb Encode the "id" field of GeoJSON objects as vector tile feature ID 2016-07-15 15:00:56 -07:00
Eric Fischer 2bc1b9bd91 Support feature IDs for decoding 2016-07-15 13:58:15 -07:00
Eric Fischer a1f8564631 Merge pull request #273 from mapbox/empty-parallel
Fix error checking when reading empty files with parallel input
2016-07-13 16:00:45 -07:00
Eric Fischer f9609302a9 Bump version number 2016-07-13 13:50:45 -07:00
Eric Fischer 92e323435e Fix error checking when reading empty files with parallel input 2016-07-13 13:00:38 -07:00
Eric Fischer 26e21b0bee Merge pull request #271 from mapbox/empty-features
Test that an empty feature is no longer generated (here in tile 11/328/791)
2016-07-12 17:48:43 -07:00
Eric Fischer 9908db5e56 Add an option to vary the level of line and polygon simplification 2016-07-12 16:51:56 -07:00
Eric Fischer cb45f1c3bd That's still not right. Don't generate a tile with no layers. 2016-07-12 15:56:57 -07:00
Eric Fischer 666729e344 Test that an empty feature is no longer generated (here in tile 11/328/791) 2016-07-12 15:52:02 -07:00
Eric Fischer 09ab013461 Merge pull request #270 from mapbox/empty-features
Be even more careful not to produce features with empty geometry
2016-07-11 20:46:24 -07:00
Eric Fischer d127c43566 Be even more careful not to produce features with empty geometry 2016-07-11 17:45:12 -07:00
Eric Fischer 85b27d3a49 Merge pull request #269 from mapbox/fix-progress
Fix double-counted progress in the progress indicator
2016-07-08 16:13:19 -07:00
Eric Fischer 40f2f61d98 Fix double-counted progress in the progress indicator 2016-07-08 15:49:59 -07:00
Eric Fischer 6bc9c5c18a Merge pull request #265 from mapbox/decode-projection
Add the ability to tippecanoe-decode into EPSG:3857 instead of WGS84
2016-06-28 16:32:10 -07:00
Eric Fischer 32fed3b78a Add the CRS to the tippecanoe-decode output if nonstandard 2016-06-28 15:29:37 -07:00
Eric Fischer 5d06f01e28 Add the ability to tippecanoe-decode into EPSG:3857 instead of WGS84 2016-06-28 15:18:27 -07:00
Eric Fischer e48e2152cc Merge pull request #263 from andrewharvey/master
add new line to end of Usage information
2016-06-20 10:00:15 -07:00
Eric Fischer d352cd0fee Merge pull request #262 from mapbox/tile-join-version
Fix the tile layer version number in tile-join output
2016-06-16 13:12:33 -07:00
Eric Fischer f552e6951d Missed one test 2016-06-16 13:00:55 -07:00
Eric Fischer ae50abefc4 Add layer version and extent to tippecanoe-decode output and test standards 2016-06-16 12:50:08 -07:00
Eric Fischer 0975c91670 Rebuild documentation 2016-06-16 12:37:46 -07:00
Eric Fischer 850a36b2f6 Update clang-format options for clang-format 3.9.0 2016-06-16 12:33:38 -07:00
Eric Fischer c40ec6c194 Fix the tile layer version number in tile-join output 2016-06-16 12:31:48 -07:00
Eric Fischer d170ebc312 Merge pull request #259 from mapbox/tile-join-x
Fix a tile-join bug that would retain fields that were supposed to be…
2016-06-10 16:13:12 -07:00
Eric Fischer 8cae9971e8 Forgot to fix this test output 2016-06-10 15:59:37 -07:00
Eric Fischer 3d023f34d3 Fix a tile-join bug that would retain fields that were supposed to be excluded 2016-06-10 15:53:59 -07:00
Eric Fischer 864440e9a9 Merge pull request #255 from mapbox/clang-mason
Try to use Mason builds for clang
2016-06-06 17:35:19 -07:00
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