Commit Graph

1094 Commits

Author SHA1 Message Date
Eric Fischer
4fb54eaeeb A test of layer merging, tile merging, and extent scaling 2016-09-20 15:53:10 -07:00
Eric Fischer
4ba98062d6 Recover memory from the pre-joined tiles after joining 2016-09-20 14:19:40 -07:00
Eric Fischer
87e4a338f6 Essentials of multithreaded tile-joining 2016-09-20 12:59:04 -07:00
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 Samelson
d130ca5d55 Fix typo in README.md for --drop-rate option 2016-09-06 12:00:35 -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