diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-06 18:35:41 +02:00
Code Issues Packages Projects Releases Wiki Activity
540 Commits 72 Branches 190 Tags
40ec317c3626b560c97fee801702d9a29a7dea53
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer 40ec317c36 Launch a separate thread to read each segment 2015-12-22 14:02:31 -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
Eric Fischer 0b6f6436a6 Factor out the JSON token reading loop 2015-10-30 15:53:31 -07:00
Eric Fischer fd5ced6902 Pay attention to $PREFIX when installing the man page 2015-10-29 16:46:57 -07:00
Eric Fischer 9a09e92357 Update man page and put it in /usr/local 2015-10-29 11:30:12 -07:00
Eric Fischer 0ff0bf1ad9 Merge pull request #105 from mapbox/polygon-close 
Use closepath for each polygon ring to match the vector tile spec
 2015-10-28 14:38:32 -07:00
Eric Fischer 358e9cad5b Use closepath for each polygon ring to match the vector tile spec 2015-10-28 14:34:57 -07:00
Eric Fischer b07a40ed5a Merge branch 'master' of https://github.com/mapbox/tippecanoe 2015-10-27 12:56:08 -07:00
Eric Fischer c9d661597d Add tile resolution change to CHANGELOG 2015-10-27 12:55:42 -07:00
Eric Fischer 8993f01db1 Merge pull request #104 from mapbox/always-4096 
Use 4096-unit tiles as much as possible to keep GL happy
 2015-10-27 12:23:12 -07:00
Eric Fischer 0058360cde Use 4096-unit tiles as much as possible to keep GL happy 2015-10-27 12:22:18 -07:00
Eric Fischer 3fbd0d6546 Merge pull request #100 from mapbox/multithread 
Multithreaded tile generation
 2015-10-20 15:21:46 -07:00
Eric Fischer e554a121fb Fix formatting 2015-10-20 12:03:49 -07:00
Eric Fischer eb5c78482a Bump version number and add changelog details 2015-10-20 12:01:10 -07:00
Eric Fischer a38668a6da Add volatile declaration to shared global variables 2015-10-20 10:15:02 -07:00
Eric Fischer e4e14b2078 Link with -lpthread 2015-10-19 15:43:06 -07:00
Eric Fischer 965176f254 Make the progress indicator more aware of progress in other threads 2015-10-19 14:19:32 -07:00
Eric Fischer 56910fd016 Restore the error message when a tile can't be made small enough 2015-10-19 13:39:44 -07:00
Eric Fischer 3bb87227ec Locking for map center 2015-10-19 13:32:02 -07:00
Eric Fischer ef5fdf4036 Locking around the file keys 2015-10-19 13:26:47 -07:00
Eric Fischer 3da692250d Remove unused argument 2015-10-19 13:11:00 -07:00
Eric Fischer 5d014e040f Actually create threads and hand the tiling tasks off to them 2015-10-19 12:32:40 -07:00
Eric Fischer 10bd608b9e Merge branch 'master' into multithread 2015-10-19 11:58:01 -07:00
Eric Fischer 89e1640496 Add a decode option to translate the entire tileset into GeoJSON 2015-10-19 11:12:11 -07:00
Eric Fischer 3ad499fa44 Merge branch 'master' into multithread 
Conflicts:
	tile.cc
 2015-10-19 10:31:13 -07:00
Eric Fischer f64e2c94e2 Let Clipper clean up polygons again after scaling and simplification 2015-10-15 17:11:29 -07:00
Eric Fischer 6a1895547d Reduce minimum polygon size for less blocky appearance 2015-10-14 15:51:11 -07:00
Eric Fischer 37ffacdeb9 Merge pull request #98 from mapbox/polygon-ring2 
Clean up polygon encoding, and use Clipper for polygon clipping
 2015-10-14 12:49:21 -07:00
Eric Fischer 592c47c549 Fix signedness warnings 2015-10-14 12:24:18 -07:00
Eric Fischer 2b25c2fe3e Use Clipper for polygon clipping instead of my own implementation 2015-10-13 17:25:01 -07:00
Eric Fischer 77b451f2c8 Fix some rounding error just by staying in double precision 2015-10-12 12:51:55 -07:00
Eric Fischer 8c5681a582 Still not quite a round trip from GeoJSON to GeoJSON, but getting closer 2015-10-09 16:45:34 -07:00
Eric Fischer 0b47471777 Most of the way to making decode output GeoJSON 2015-10-09 12:41:28 -07:00
Eric Fischer 329f041bf2 Remove closepath expectation in polygon thinning 2015-10-07 17:11:58 -07:00
Eric Fischer 5dc9f50345 Clean up polygon generation and clipping. Make sure winding order is correct. 2015-10-07 16:52:52 -07:00
Eric Fischer 7154c29459 Merge pull request #96 from mapbox/featurezooms 
Support per-feature zoom level specification
 2015-10-07 14:00:53 -07:00
Eric Fischer a8e2b2d55a More formatting correction 2015-10-07 13:59:06 -07:00
Eric Fischer 9bd2f70516 Fix formatting 2015-10-07 13:57:41 -07:00
Eric Fischer 6767aa7a5c Add documentation. Be lenient about zooms as numbers vs strings. 2015-10-07 13:54:31 -07:00
Eric Fischer c0480673c5 Add a tippecanoe-specific GeoJSON extension for feature minzoom and maxzoom. 2015-10-06 16:51:23 -07:00
Eric Fischer c4f517fbdc Merge pull request #94 from mapbox/bare-geometry 
Detect and parse bare GeoJSON geometries that aren't part of a Feature
 2015-10-06 10:59:55 -07:00
Eric Fischer 3a94106283 Don't write out tiles that have no features. 2015-09-30 11:56:22 -07:00
Eric Fischer 5ef4ea4b27 Detect and parse bare GeoJSON geometries that aren't part of a Feature 2015-09-25 17:28:15 -07:00
Eric Fischer 18647d18dd Merge pull request #84 from mapbox/tile-join-docs 
Forgot to update manpage
 2015-09-17 12:55:27 -07:00