Commit Graph
100 Commits
Author SHA1 Message Date
Eric Fischer 7aa27b7f4c Make calculation of child tile overlap match clipping behavior.
Coordinates that are right on the tile boundary appear in both
adjacent tiles.

Make tippecanoe-decode also use exact edge coordinates instead of
half-pixel locations.
2016-01-20 13:58:17 -08:00
Eric Fischer 45043922e7 Merge pull request #150 from mapbox/stream-parallel
Chunked parallel reading of input streams
2016-01-12 14:29:39 -08:00
Eric Fischer 872df4bd9f Bump version number 2016-01-12 14:27:05 -08:00
Eric Fischer 83322d8e35 Guard against unlikely overflow 2016-01-12 14:16:17 -08:00
Eric Fischer ecae14e2d4 Stabilize feature order between the different reading methods 2016-01-12 14:12:56 -08:00
Eric Fischer ca97c5ec6d Update docs 2016-01-12 12:36:12 -08:00
Eric Fischer e4afaa7a27 Renaming in the hope of clarity 2016-01-12 12:31:17 -08:00
Eric Fischer 0680236e46 Fix warning 2016-01-12 12:18:05 -08:00
Eric Fischer 9d6ece5bbc Buffered reading makes it faster than the single-threaded version 2016-01-12 11:47:46 -08:00
Eric Fischer 333956ce42 Fix crashes 2016-01-11 17:29:06 -08:00
Eric Fischer 2d16577945 Starts but crashes 2016-01-11 16:52:45 -08:00
Eric Fischer 132b7ecd12 Factor out parallel reading; start to set up semi-parallel reading 2016-01-11 16:06:55 -08:00
Eric Fischer 29db0e8988 Merge pull request #149 from mapbox/fix-progress
Progress indicator improvements
2016-01-11 13:27:36 -08:00
Eric Fischer ffbddef756 Accurate feature count, more chatty base zoom determination, less chatty tiling 2016-01-11 13:11:21 -08:00
Eric Fischer 20bd661693 Merge pull request #148 from mapbox/option-check
Give an error if -p or -a is used with an undefined option letter
2016-01-11 12:25:30 -08:00
Eric Fischer a597733a01 Fix the build 2016-01-11 11:00:23 -08:00
Eric Fischer 404bf69847 Give an error if -p or -a is used with an undefined option letter 2016-01-11 10:47:06 -08:00
Eric Fischer 502d269143 Merge pull request #145 from mapbox/fix-layer-merge
Fix the layer number for layers being merged together
2016-01-08 13:28:31 -08:00
Eric Fischer 43c9bb705d Fix the layer number for layers being merged together 2016-01-08 13:26:56 -08:00
Eric Fischer 581728f157 Merge pull request #143 from mapbox/limit-simplify
Add an option to do line simplification only at zooms below maxzoom
2016-01-08 11:55:23 -08:00
Eric Fischer b05478787b Bump version number 2016-01-08 11:54:14 -08:00
Eric Fischer 93d0767829 Add an option to do line simplification only at zooms below maxzoom 2016-01-08 11:31:10 -08:00
Eric Fischer 5e02bdd90a Merge pull request #142 from mapbox/consistent-clip
Simplify lines consistently on opposite sides of tile boundaries
2016-01-07 11:51:58 -08:00
Eric Fischer 1f8b6faec8 Simplify lines consistently on opposite sides of tile boundaries 2016-01-07 11:35:11 -08:00
Eric Fischer e1e028b865 Merge pull request #141 from mapbox/multithread-low-zooms
Multithread line simplification and polygon cleaning at low zooms
2016-01-06 14:41:00 -08:00
Eric Fischer 22293ca6e8 Bump version number 2016-01-06 13:29:59 -08:00
Eric Fischer c8573634e1 Track how many threads are active to calculate how many sub-threads to use 2016-01-05 13:56:36 -08:00
Eric Fischer 977533e449 Use multiple threads within a single tile for geometric simplification 2016-01-05 12:29:40 -08:00
Eric Fischer f43d18eb73 Bring back the old simple polygon clipping algorithm 2016-01-04 17:31:33 -08:00
Eric Fischer 32111af79d Merge pull request #136 from mapbox/multithread-input2
Multithreaded input
2016-01-04 17:29:25 -08:00
Eric Fischer 1d77261509 Bump version number 2016-01-04 17:20:38 -08:00
Eric Fischer 2b378ceb9f Use multiple threads to sort the features 2016-01-04 14:45:34 -08:00
Eric Fischer b39a1714c0 Merge remote-tracking branch 'origin/master' into multithread-input2 2015-12-22 17:04:32 -08:00
Eric Fischer 228a4d6bb9 Make the geometric origin a per-reader property for thread safety 2015-12-22 16:58:27 -08:00
Eric Fischer 2fd00413cf Clean up progress indicator and feature sequence 2015-12-22 16:29:45 -08:00
Eric Fischer 02cf4d46ad Close files that were being left open 2015-12-22 15:42:51 -08:00
Eric Fischer fde3aa45de Make parallel reading a command-line option 2015-12-22 14:58:19 -08:00
Eric Fischer ca4d1beb7c Guard against trying to map an empty string pool into memory 2015-12-22 14:27:38 -08:00
Eric Fischer a8b39aa2ff Merge branch 'master' into multithread-input2 2015-12-22 14:10:21 -08:00
Eric Fischer 40ec317c36 Launch a separate thread to read each segment 2015-12-22 14:02:31 -08:00
Eric Fischer f290794f22 Bump version number 2015-12-22 10:40:13 -08:00
Eric Fischer a9ad1d99df Merge pull request #134 from mapbox/fixshards
Round the number of threads to use down to a power of 2
2015-12-22 10:35:22 -08:00
Eric Fischer edd325e338 Round the number of threads to use down to a power of 2
Since other calculations depend on this being true
2015-12-22 10:33:08 -08:00
Eric Fischer bd081c864e It tiles again! 2015-12-21 18:00:07 -08:00
Eric Fischer aaf9e87bce Reassemble the combined string pool and metadata files 2015-12-21 17:46:04 -08:00
Eric Fischer de60545da8 Include the segment number in the serialized geometry 2015-12-21 17:21:18 -08:00
Eric Fischer 1f335eec44 Get rid of a global I had forgotten about 2015-12-21 17:00:07 -08:00
Eric Fischer 2dc99698d2 Stub out enough to get it to compile 2015-12-21 16:17:47 -08:00
Eric Fischer f6dfe0ace0 WIP on splitting geometry-reading state into per-thread structures 2015-12-18 17:10:20 -08:00
Eric Fischer 2159d464d0 Segment the file into input chunks. Allow commas at the top level. 2015-12-18 15:59:07 -08:00
Eric Fischer ed90c7b53a Use memory-mapped I/O for GeoJSON reading if possible
Conflicts:
	geojson.c
2015-12-18 15:20:43 -08:00
Eric Fischer dd2a4b0fc8 Pass the input line number around instead of the JSON parser itself 2015-12-18 15:12:27 -08:00
Eric Fischer c6dfae26cb Add a function to disconnect a JSON object from the parse tree 2015-12-18 12:05:22 -08:00
Eric Fischer dfcdd03b19 Factor out the JSON token reading loop
Conflicts:
	geojson.c
2015-12-18 12:04:52 -08:00
Eric Fischer 08a6607b0b Merge pull request #127 from mapbox/maxzoom
Separate the concept of basezoom for dot-dropping from maxzoom for tiling
2015-12-18 11:29:00 -08:00
Eric Fischer fd682b66a8 Mention base zoom and drop rate calculation in changelog 2015-12-18 11:28:00 -08:00
Eric Fischer 4fe1a950f5 Calculate effective basezoom and droprate, taking gamma into account 2015-12-17 17:16:04 -08:00
Eric Fischer acd4444439 Allow specifying a marker width for automatic basezoom guessing 2015-12-17 12:33:52 -08:00
Eric Fischer f9d1e87360 Heuristics for basezoom and droprate if no tiles are naturally small enough 2015-12-16 16:18:16 -08:00
Eric Fischer 38fe00c7ab Replicate the dot-gamma logic in the base/rate guessing code 2015-12-16 13:09:31 -08:00
Eric Fischer b7a411769a Don't allow <0 gamma (randomized) if basezoom or droprate not known 2015-12-16 12:33:07 -08:00
Eric Fischer 6681817243 Add an option to guess the drop rate 2015-12-16 12:13:24 -08:00
Eric Fischer eb906dfc72 Write spaces over the reading progress message at the end 2015-12-15 16:21:07 -08:00
Eric Fischer 966bee8919 Fix bounding box calculation 2015-12-15 15:55:54 -08:00
Eric Fischer 7f8eb4de83 Add an option to guess an appropriately dense base zoom level 2015-12-15 15:52:08 -08:00
Eric Fischer 8e2c20265f Try to clarify documentation 2015-12-15 12:22:19 -08:00
Eric Fischer fee8b33bc8 Fix a place where it was still passing around maxzoom as basezoom 2015-12-15 12:08:07 -08:00
Eric Fischer 76de0c82d2 Further cleanup of minzoom- and maxzoom-related variable names 2015-12-15 12:00:05 -08:00
Eric Fischer 7372a2c4bc Add basezoom parameter for dot-dropping, independent of maxzoom 2015-12-15 11:56:49 -08:00
Eric Fischer 3b8a5d42dd Merge pull request #125 from mapbox/integers
Encode numeric attributes as integers instead of floating point if possible
2015-12-14 16:17:21 -08:00
Eric Fischer 9391c82216 Print floating point attributes as integers if they are exact integers 2015-12-14 16:10:34 -08:00
Eric Fischer a60a9238e5 Use integers instead of floating point for numeric attributes if possible 2015-12-14 15:45:57 -08:00
Eric Fischer 9de2ddd23c Merge pull request #124 from mapbox/pointclip
Don't simplify "unused" movetos from points. Don't write empty geometries.
2015-12-11 12:39:33 -08:00
Eric Fischer cf279940da Don't simplify "unused" movetos from points. Don't write empty geometries. 2015-12-11 12:34:55 -08:00
Eric Fischer 25e261aa35 Merge pull request #122 from mapbox/dateline2
More fixes for large polygons and clipping at the antimeridian
2015-12-09 15:25:12 -08:00
Eric Fischer a6be746163 Unrelated code formatting correction 2015-12-09 15:24:07 -08:00
Eric Fischer f04c5e153a Avoid arithmetic overflow in area calculation 2015-12-09 15:02:59 -08:00
Eric Fischer 4bde17f8ff Remove unnecessary coordinate offsetting. Negative coordinates are OK. 2015-12-08 17:21:59 -08:00
Eric Fischer 256139b385 Clipping is faster with only one duplicate/shifted geometry copy 2015-12-08 16:57:04 -08:00
Eric Fischer dace304182 Offset coordinates for Clipper to keep them positive.
Limit very high or low latitudes and longitudes.
2015-12-08 16:24:17 -08:00
Eric Fischer bbcf9e1b3c Merge pull request #120 from mapbox/dateline
Handle features that cross the antimeridian
2015-12-03 15:21:19 -08:00
Eric Fischer 5506288273 Bump version number 2015-12-03 15:19:54 -08:00
Eric Fischer 9faa625e75 Calculate bounding boxes better for features that cross the antimeridian 2015-12-03 14:42:59 -08:00
Eric Fischer c832b34160 Better handling of features that cross the antimeridian 2015-12-03 13:12:34 -08:00
Eric Fischer 53471521f3 Merge pull request #119 from wilsaj/make-install-dependencies
include all CLI tools as dependencies for `make install`
2015-11-30 11:19:59 -08:00
Eric Fischer 024c685759 Merge pull request #118 from mapbox/tile-join-multi
Let tile-join combine non-conflicting tilesets together
2015-11-24 13:40:12 -08:00
Eric Fischer 368916b7a1 Bump version number 2015-11-11 17:05:41 -08:00
Eric Fischer c854fd5481 Merge pull request #112 from mapbox/checkcpu
Check how many CPUs and filehandles there are instead of guessing
2015-11-11 16:16:27 -08:00
Eric Fischer e1f4bdd36c Check how many CPUs and filehandles there are instead of guessing 2015-11-11 16:10:39 -08:00
Eric Fischer 666a56d84a Merge pull request #110 from mapbox/more-docs
Document and install tippecanoe-enumerate and tippecanoe-decode
2015-11-03 14:11:39 -08:00
Eric Fischer 539979811d Spell out what tippecanoe-enumerate does 2015-11-03 14:10:02 -08:00
Eric Fischer 2e155b3bb4 Document and install tippecanoe-enumerate and tippecanoe-decode 2015-11-03 14:04:28 -08:00
Eric Fischer 71e00fc8fe Calculate the min and max lat, lon, and zoom when merging tilesets 2015-11-02 14:34:01 -08:00
Eric Fischer 321c12da5e Merge pull request #108 from mapbox/layer-name
Merge input files into one layer if a layer name is specified
2015-11-02 14:07:20 -08:00
Eric Fischer 7f24cd6767 Don't produce layers with no features. Say "layer" instead of "name" in decode. 2015-11-02 14:03:45 -08:00
Eric Fischer 84173e24a5 Produce JSON with proper nesting even if polygon rings go the wrong way 2015-11-02 13:52:52 -08:00
Eric Fischer 36f4f77640 Another polygon fix: if the outer ring was dropped, drop its inner rings too 2015-11-02 11:43:44 -08:00
Eric Fischer 4c4ba693b1 Remove debugging output accidentally left in 2015-11-02 10:46:13 -08:00
Eric Fischer 4df95df637 Fix tile-join crash when no CSV is specified. Accept multiple input files. 2015-10-30 17:59:15 -07:00
Eric Fischer d13f60e9c4 Merge files into one layer if a name is specified with -l 2015-10-30 17:30:18 -07:00