Eric Fischer
a076c5619d
Merge remote-tracking branch 'origin/master' into multilayer
2015-03-25 13:54:29 -07:00
Eric Fischer
86925eea4c
Write out geometries for all layers
2015-03-24 17:07:51 -07:00
Eric Fischer
73b63133e2
Multiple layers make it into JSON metadata now
2015-03-24 16:28:31 -07:00
Eric Fischer
2198bcc2a6
Handle multiple reading. Multiple writing still crashes.
2015-03-23 17:44:23 -07:00
Eric Fischer
f5135ebc63
Writing out the JSON metadata for multiple layers
2015-03-23 16:12:12 -07:00
Eric Fischer
eb24c6e21e
Include the layer number in the serialized geometry
2015-03-23 15:37:49 -07:00
Eric Fischer
a880f44a91
Clean up the gamma semantics a little.
...
0 (default) means unchanged: maxzoom contains all the dots.
Positive number, even very small, means that it still checks
the gap size and thins out dots if they are close together.
Negative number means no gamma, and the old random instead of
uniform dropping at low zooms.
2015-03-23 14:44:21 -07:00
Eric Fischer
8002609f0c
More scaffolding for multiple layers
2015-03-23 13:44:35 -07:00
Eric Fischer
b59a251924
Write metadata even when tiling fails so you can look at the partial map
2015-03-06 16:33:32 -08:00
Eric Fischer
f0a8e5b192
Progress indicator for reordering geometry
2015-03-06 15:32:52 -08:00
Eric Fischer
9343c5fcc1
Less wordy message about sorting
2015-03-06 14:35:39 -08:00
Eric Fischer
41b28b2a1b
Add dot gamma processing
2015-03-06 13:12:32 -08:00
Eric Fischer
558a7a412c
Restore old code for uniform instead of random dot-dropping
...
From ffe4c95376
2015-03-06 10:56:02 -08:00
Eric Fischer
572df8ad39
Reorder the geometries by index
2015-03-05 16:18:01 -08:00
Eric Fischer
a8b2db8d5a
Fix double-close of top level geometry file
2015-03-05 15:22:58 -08:00
Eric Fischer
97d65e6b7d
Bring back the index: now just a file position and a point
2015-03-05 15:15:56 -08:00
Eric Fischer
290e39f80c
Improve function name
2014-12-19 11:56:40 -08:00
Eric Fischer
5a2003cb2c
Fix failure to release temporary memory
2014-12-17 17:41:57 -08:00
Eric Fischer
48b5db6ae5
Keep the progress indicator progressing while working through big tiles
2014-12-17 16:01:33 -08:00
Eric Fischer
7f3551070e
Remove unneeded debug output
2014-12-17 14:01:20 -08:00
Eric Fischer
92bbf27f72
Merge branch 'master' into topdown
...
Conflicts:
geojson.c
2014-12-17 11:18:47 -08:00
Eric Fischer
cba1b8ae7f
Remove unneeded old indexing code
2014-12-17 11:16:43 -08:00
Eric Fischer
0d0a546b1e
No need to split features into child tiles when processing the final zoom.
2014-12-17 11:10:46 -08:00
Eric Fischer
ad17f1f282
Make -Z0 work again for file minimum zoom
2014-12-17 11:05:14 -08:00
Eric Fischer
a40192bcde
Allow features to have null properties
2014-12-16 22:46:00 -08:00
Eric Fischer
c90ba8511f
Fix compiler warning
2014-12-12 14:52:12 -08:00
Eric Fischer
34a6422c42
Merge branch 'master' into topdown
2014-12-12 11:36:20 -08:00
Eric Fischer
3f2818a814
More useful progress indicator
2014-12-11 17:59:22 -08:00
Eric Fischer
d69431e16b
Partition each tile into children instead of repeatedly clipping the parent.
2014-12-11 15:46:54 -08:00
Eric Fischer
b068635acf
Elevation in geometry is a warning, not an error.
...
Only complain about the first null geometry, not ever one.
2014-12-09 15:23:22 -08:00
Eric Fischer
40ecfc0668
Add missing newline to error message.
2014-12-09 15:17:20 -08:00
Eric Fischer
028fef470e
Fix the major bug: forgetting to offset back to world coordinates
2014-12-04 14:08:36 -08:00
Eric Fischer
08ff40e42f
Trying to follow Vlad's suggestion and work from the top down.
...
Doesn't quite work yet, but seems like the right thing to do.
From the bottom up, indexing is a mess because of the buffering,
and includes unneeded areas in the bounding boxes of big features.
2014-12-03 16:18:43 -08:00
Eric Fischer
eaeb55bf71
Distinguish between signed and unsigned in the temporary file
2014-12-02 18:03:07 -08:00
Eric Fischer
a1e7426956
Sprinkle consts and casts to make it valid C++ as well as C
2014-12-02 14:17:49 -08:00
Eric Fischer
cc58588724
More sensible error message when there are no valid geometries
2014-11-24 22:50:12 -08:00
Eric Fischer
ffe4c95376
Calculate point dropping during encoding instead of tiling
...
so it is consistent across tile boundaries, and so every point
that exists at zoom x always also exists at zoom x+1.
2014-11-14 12:42:50 -08:00
Eric Fischer
8210f83912
Make the progress indicator less chatty
2014-11-13 10:48:59 -08:00
Eric Fischer
5595a087c7
Quick reject by bounding box of linear features too small to draw
2014-11-12 15:57:45 -08:00
Eric Fischer
2b6ad9968f
Add a flag to exclude all properties except ones explicitly named
2014-11-12 12:41:56 -08:00
Eric Fischer
b05c5a9583
Skip over properties with null values instead of considering it an error
2014-11-12 12:19:39 -08:00
Eric Fischer
ea292def47
Make duplicate trimming less bad: only trim features indexed >1 time
2014-11-06 11:27:10 -08:00
Eric Fischer
7f6a5dc005
The maxzoom=0 case couldn't have worked
2014-11-06 11:05:09 -08:00
Eric Fischer
241d96e57c
Save a few more bytes per geometry in the temporary file
...
by using bytes instead of ints for the drawing operations
2014-11-05 14:37:54 -08:00
Eric Fischer
c24cfada61
Move feature type to index so point skipping can avoid looking up geometry
...
Which should avoid having to page the geometry in if there is
more data than will fit in memory
2014-11-05 12:18:03 -08:00
Eric Fischer
bc4527b25d
Add an option to set the directory for the temporary files
2014-11-05 10:34:44 -08:00
Eric Fischer
a039aca860
Read-only memory map for merging, since there's no reason to write
2014-11-04 10:08:30 -08:00
Eric Fischer
3e3fdcbab4
Bring over the multistage sort from datamaps to avoid Mac crashes
2014-11-03 22:47:41 -08:00
Eric Fischer
984ac17d6c
Use the same default ground precision whatever the base zoom is.
2014-10-27 14:36:13 -07:00
Eric Fischer
3cd6fcfbe0
Add option to set buffer size. Pass it through to clipping functions.
2014-10-27 13:20:17 -07:00
