Commit Graph

1036 Commits

Author SHA1 Message Date
Eric Fischer
82377944ee Merge branch 'master' into consistent-dropping 2016-10-14 15:35:35 -07:00
Eric Fischer
2a856b49bd Merge pull request #302 from mapbox/simplify-polygons-together
Find edges shared between polygons and simplify them individually
2016-10-14 15:34:25 -07:00
Eric Fischer
71bf20b205 Remove debug output 2016-10-14 12:30:54 -07:00
Eric Fischer
feb9b4481a Stabilize edge list order by also comparing ring IDs 2016-10-14 12:27:24 -07:00
Eric Fischer
9160e6add5 Guard against uninitialized variables 2016-10-14 12:19:56 -07:00
Eric Fischer
a5d803aa9a Lots of debug output to try to track down Mac/Linux differences 2016-10-14 12:15:23 -07:00
Eric Fischer
6aee0d39df Merge pull request #309 from mapbox/enumerate-test
There should be a test of tippecanoe-enumerate
2016-10-13 10:25:00 -07:00
Eric Fischer
bbfc7c677e There should be a test of tippecanoe-enumerate 2016-10-12 16:27:05 -07:00
Eric Fischer
abac4f2b85 Merge pull request #308 from mapbox/deps
Autogenerate header dependencies
2016-10-12 16:09:19 -07:00
Eric Fischer
b26e6a5a4e This should have been linking as C++, not C 2016-10-12 14:07:41 -07:00
Eric Fischer
c4ee5d3e69 Autogenerate header dependencies
Following http://scottmcpeak.com/autodepend/autodepend.html
2016-10-12 13:21:29 -07:00
Eric Fischer
2e9971c6d5 Remake test standards after inspection 2016-10-12 10:41:01 -07:00
Eric Fischer
081e330845 Reset counter with each tile, to match old low-zoom feature density 2016-10-12 09:49:25 -07:00
Eric Fischer
81d8fe21f8 Fix structure packing to fix polygon dropping 2016-10-11 17:47:53 -07:00
Eric Fischer
948ea138bb Do a fixup pass on the feature minzooms after base/rate calculation 2016-10-11 17:24:22 -07:00
Eric Fischer
9d37bd104a Keep start/end in tue merged index pointing to final geometry offsets 2016-10-11 15:13:27 -07:00
Eric Fischer
08310d9564 Forgot this other place where final geometry can be written out 2016-10-11 12:42:20 -07:00
Eric Fischer
d381f5a9e1 Make the feature counter global, not reset with each merge phase 2016-10-11 12:05:50 -07:00
Eric Fischer
5ab41417fc Calculate feature-dropping (except gamma) during geometry reordering 2016-10-10 17:15:33 -07:00
Eric Fischer
c8a1b082e0 Don't serialize the per-feature minzoom until geometry merging time 2016-10-10 15:31:09 -07:00
Eric Fischer
896c9d8398 Rename option to --detect-shared-borders and add a test 2016-10-06 16:16:51 -07:00
Eric Fischer
7258643d5a A sorted list is smaller and faster than a map of sets 2016-10-05 17:16:18 -07:00
Eric Fischer
4c1b135848 Save a little time by only looking up each segment once 2016-10-05 17:16:18 -07:00
Eric Fischer
46b634ce46 Remember to close the polygon 2016-10-05 17:16:18 -07:00
Eric Fischer
6455b6633e Remember to honor --no-line-simplification if it was requested 2016-10-05 17:16:18 -07:00
Eric Fischer
938274aa91 Remove more debugging code 2016-10-05 17:16:18 -07:00
Eric Fischer
2b4280695f Extract common edges, simplify, then reassemble polygon rings 2016-10-05 17:16:18 -07:00
Eric Fischer
d35dc4936a If a point divides one border, it divides any that touch there 2016-10-05 17:16:18 -07:00
Eric Fischer
57cc343855 Most of the way toward TopoJSON-style factoring out of edges 2016-10-05 17:16:18 -07:00
Eric Fischer
91bfc2ca89 Choose a consistent starting point for rings with no shared edges 2016-10-05 17:16:18 -07:00
Eric Fischer
59619fb6cd Crunch out zero-length linetos to improve the match 2016-10-05 17:16:18 -07:00
Eric Fischer
6b4076684c Find a common-edge transition if it's the first point of the ring 2016-10-05 17:16:18 -07:00
Eric Fischer
2bc9e15975 Roll rings around so they start at an intersection transition, if any 2016-10-05 17:16:18 -07:00
Eric Fischer
f7daa05515 Add a critical point where the set of rings using a polygon edge changes 2016-10-05 17:16:18 -07:00
Eric Fischer
04157e7728 Merge pull request #304 from mapbox/utf8-check
Enforce that string feature attributes must be encoded as UTF-8
2016-10-05 15:54:58 -07:00
Eric Fischer
d4d966893c Forgot to test the emoji case 2016-10-05 15:01:47 -07:00
Eric Fischer
9806db3c0a Make UTF-8 checking into a unit test with Catch 2016-10-05 14:55:32 -07:00
Eric Fischer
ef38318a6d Enforce that string feature attributes must be encoded as UTF-8 2016-10-04 16:43:31 -07:00
Eric Fischer
dc86eb6b5a Merge pull request #299 from mapbox/tile-join-whitespace
Trim whitespace after commas in tile-join .csv input
2016-09-21 13:30:28 -07:00
Eric Fischer
32f32e45b6 Trim whitespace after commas in tile-join .csv input 2016-09-21 12:32:03 -07:00
Eric Fischer
4912f4ad08 Merge pull request #298 from mapbox/tile-join-merge
Give tile-join the ability to merge multiple tilesets
2016-09-20 16:53:46 -07:00
Eric Fischer
083a280659 Fix build errors on Linux (pthread library, signed comparison) 2016-09-20 16:01:10 -07:00
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