Commit Graph

174 Commits

Author SHA1 Message Date
Eric Fischer
eaff7b93c5 Merge branch 'master' into plugins 2017-03-15 16:19:33 -07:00
Eric Fischer
ea77e3db6f Add --detect-longitude-wraparound option 2017-03-15 13:37:50 -07:00
Eric Fischer
9cbbc4c68d Merge branch 'master' into plugins-merge 2017-03-02 10:45:25 -08:00
Eric Fischer
218a2fc75e Clean up layer name handling to fix layer merging crash 2017-02-20 16:19:34 -08:00
Eric Fischer
55e7e20a73 Add a check for environmental variable TIPPECANOE_MAX_THREADS 2017-02-17 16:47:21 -08:00
Eric Fischer
9c1f2b2123 Guard against potentially rounding to 0 when choosing sorting unit 2017-02-17 14:14:55 -08:00
Eric Fischer
71ac6596af Warn about broken pipes in filters instead of exiting abruptly 2016-12-21 10:10:22 -08:00
Eric Fischer
854dc2bca5 Merge branch 'master' into plugins 2016-12-20 14:15:06 -08:00
Eric Fischer
6a2e80769e Choose a deeper initial tile than 0/0/0 if one contains all the features 2016-12-16 12:22:38 -08:00
Eric Fischer
c2fa8e3633 Switch the segment and layer ID based on prefilter output 2016-12-12 17:00:45 -08:00
Eric Fischer
d1dc310bbc The GeoJSON-producing part of prefiltering 2016-12-08 15:13:38 -08:00
Eric Fischer
5960a15fcd Add magic #defines to avoid default small Mac stdio limits 2016-12-08 12:33:02 -08:00
Eric Fischer
5554b9cbba Add the command-line option to specify the filter 2016-12-07 12:15:57 -08:00
Eric Fischer
87d86ecfc9 Set close-on-exec flag for most file descriptors 2016-12-07 10:57:56 -08:00
Eric Fischer
72478ae13e Be more consistent about checking for errors from close() 2016-12-06 17:19:22 -08:00
Eric Fischer
0db8d9ed8b Option to snap low zooms to a stairstep grid 2016-11-28 15:45:38 -08:00
Eric Fischer
bedace67e7 Remove --merge-polygons-as-needed until it works well. Bump version. 2016-11-21 13:36:31 -08:00
Eric Fischer
e9aa8c1b7d Add an option to prevent tiny polygon reduction 2016-11-21 11:26:37 -08:00
Eric Fischer
dc9e68b128 Make feature-dropping option names a little more consistent 2016-11-17 12:40:11 -08:00
Eric Fischer
32aa653082 Don't spend geometry space on index or extent unless it is needed 2016-11-11 17:37:46 -08:00
Eric Fischer
013e6512b4 Add an option to drop the smallest features to make tiles small enough 2016-11-09 17:09:05 -08:00
Eric Fischer
38ce49d2d4 Another option for plain fractional dropping, but across the whole zoom 2016-11-04 12:26:13 -07:00
Eric Fischer
ee48be26e0 Rename -k to -M before I regret that the unit for it is not kilobytes 2016-11-04 11:15:53 -07:00
Eric Fischer
10fc9254d1 Add an option to discover the minimum workable gap between features 2016-10-25 16:28:32 -07:00
Eric Fischer
2798bf7b6f Add an option to merge adjacent polygons together to reduce tile size 2016-10-24 17:22:07 -07:00
Eric Fischer
f32916c472 Tests of the three current strategies for reducing tile size 2016-10-24 15:33:14 -07:00
Eric Fischer
83e73e8840 Add an option to dynamically increase gamma until tiles are small enough 2016-10-24 12:29:36 -07:00
Eric Fischer
92cc08a554 Fix some compiler warnings about signed comparisons 2016-10-14 17:11:57 -07:00
Eric Fischer
82377944ee Merge branch 'master' into consistent-dropping 2016-10-14 15:35:35 -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
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
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
021d792d33 Getting ready for multithreaded tile-joining 2016-09-20 11:04:24 -07:00
Eric Fischer
437152e02b Track the minzoom and maxzoom for each layer separately 2016-09-19 17:53:31 -07:00
Eric Fischer
d8ba9db386 Remove unused layer count and layer name list 2016-08-30 15:09:18 -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
f7e64dca5f Work in progress on being able to specify per-feature layer names 2016-08-23 15:33:53 -07:00
Eric Fischer
bf571571a9 Factor out (initial) feature serialization 2016-08-08 15:36:49 -07:00
Eric Fischer
e760521382 Fix the spelling of the --preserve-input-order option 2016-08-01 11:03:35 -07:00
Eric Fischer
92e323435e Fix error checking when reading empty files with parallel input 2016-07-13 13:00:38 -07:00
Eric Fischer
9908db5e56 Add an option to vary the level of line and polygon simplification 2016-07-12 16:51:56 -07:00
Eric Fischer
5d06f01e28 Add the ability to tippecanoe-decode into EPSG:3857 instead of WGS84 2016-06-28 15:18:27 -07:00
Andrew Harvey
e31908bfb4 add new line to end of Usage information 2016-06-20 16:52:12 +10:00
Eric Fischer
de46cfa798 Do the more common check first. Forgot to swap these max/min pairs. 2016-06-01 17:09:20 -07:00
Eric Fischer
a504840bd5 Warn if the GeoJSON specifies a different projection 2016-06-01 16:55:52 -07:00
Eric Fischer
e1427ab9e4 Fix the check for an unsupported projection 2016-06-01 15:51:55 -07:00
Eric Fischer
af412e2038 Add minimal support for alternate input projections 2016-06-01 15:49:41 -07:00
Eric Fischer
692112ec3a Add an option to calculate feature density as a feature attribute 2016-05-27 16:25:40 -07:00
Eric Fischer
1d636e5c0d Consistently treat "prevent" and "additional" options as globals 2016-05-25 11:38:52 -07:00
Eric Fischer
fa7a52d032 Bump version number 2016-05-23 17:44:41 -07:00
Eric Fischer
0f02e9fa95 Fix uninitialized variable 2016-05-23 15:45:55 -07:00
Eric Fischer
bba1c13b07 Warn if a feature that won't be clipped covers several tiles 2016-05-20 17:50:20 -07:00
Eric Fischer
3655a54d22 Add the ability to inline metadata with geometry 2016-05-10 16:46:45 -07:00
Eric Fischer
0f1d2e4220 Fix additional g++ warnings 2016-05-03 16:39:26 -07:00
Eric Fischer
43ffd6fe11 Fix the warnings about the unused array of option names 2016-05-03 16:34:19 -07:00
Eric Fischer
f1b3f6d231 Fix warnings about shadowed variables 2016-05-03 15:48:42 -07:00
Eric Fischer
271ec3d154 Stop using malloc for layer names 2016-05-03 10:52:49 -07:00
Eric Fischer
023ce03672 Fix indentation and bump version number 2016-04-28 15:11:57 -07:00
Eric Fischer
adc70341ad Use std::set to track the layer-wide feature attribute types.
Track them during parsing, not tiling.  Remove the old string pool code.
2016-04-28 14:59:58 -07:00
Eric Fischer
87b90a5033 Use std::set to track included and excluded feature properties 2016-04-28 12:57:03 -07:00
Eric Fischer
444de1f086 Get rid of malloc around layer names 2016-04-28 12:20:51 -07:00
Eric Fischer
2b393ad8e5 Move jsonpull into a subdirectory like other included libraries 2016-04-27 15:33:30 -07:00
Eric Fischer
48a82039ce Oops, I didn't check main.cpp in. 2016-04-27 15:14:09 -07:00