Commit Graph
680 Commits
Author SHA1 Message Date
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
Dane Springmeyer 88d02915d7 remove vector_tile.pb.o 2015-12-22 17:23:56 -08:00
Dane Springmeyer 2460b5712f add coverage badge and a few excludes 2015-12-22 17:20:59 -08:00
Dane Springmeyer 71463c1325 avoid travis overwriting CC 2015-12-22 17:16:55 -08:00
Dane Springmeyer ee43ab5fc8 fix syntax error 2015-12-22 17:12:58 -08:00
Dane Springmeyer 1f971bdfbd travis: run coverage first, build in debug 2015-12-22 17:08:41 -08:00
Dane Springmeyer 893604ca94 fix hardcoded cc 2015-12-22 17:07:59 -08:00
Eric Fischer b39a1714c0 Merge remote-tracking branch 'origin/master' into multithread-input2 2015-12-22 17:04:32 -08:00
Dane Springmeyer 28b83cbe47 ensure we use upgraded gcc as well as g++ 2015-12-22 17:02:49 -08:00
Eric Fischer 228a4d6bb9 Make the geometric origin a per-reader property for thread safety 2015-12-22 16:58:27 -08:00
Dane Springmeyer 01caa22bfc enable coverage 2015-12-22 16:55:21 -08:00
Dane Springmeyer 2e22034a77 Merge branch 'master' of github.com:mapbox/tippecanoe into travis-improvements 2015-12-22 16:33:30 -08:00
Dane Springmeyer 76cf1f8951 Merge pull request #135 from mapbox/build-inherit
Inherit CXX,CC,CFLAGS,CXXFLAGS,LDFLAGS from env
2015-12-22 16:33:22 -08:00
Dane Springmeyer f1ce176e75 also build on OS X 2015-12-22 16:30:28 -08:00
Eric Fischer 2fd00413cf Clean up progress indicator and feature sequence 2015-12-22 16:29:45 -08:00
Dane Springmeyer 8e3f8b8dc3 inherit CXX,CC,CFLAGS,CXXFLAGS,LDFLAGS from env 2015-12-22 16:26:24 -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
Dane Springmeyer fee18cc31e Add errno.h - refs #131 2015-12-20 15:13:33 -08:00
Dane Springmeyer ee35b9f7c9 fix matrix 2015-12-20 15:11:15 -08:00
Dane Springmeyer 255960b48d Add travis 2015-12-20 15:09:35 -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