 Eric Fischer
|
167beae307
|
Stringify feature properties that are arrays or hashes
|
2016-01-27 14:29:34 -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
|
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
|
ffbddef756
|
Accurate feature count, more chatty base zoom determination, less chatty tiling
|
2016-01-11 13:11:21 -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
|
43c9bb705d
|
Fix the layer number for layers being merged together
|
2016-01-08 13:26:56 -08:00 |
|
|
Eric Fischer
|
2b378ceb9f
|
Use multiple threads to sort the features
|
2016-01-04 14:45:34 -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
|
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
|
dfcdd03b19
|
Factor out the JSON token reading loop
Conflicts:
geojson.c
|
2015-12-18 12:04:52 -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
|
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
|
a6be746163
|
Unrelated code formatting correction
|
2015-12-09 15:24:07 -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
|
e1f4bdd36c
|
Check how many CPUs and filehandles there are instead of guessing
|
2015-11-11 16:10:39 -08: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 |
|