Commit Graph
100 Commits
Author SHA1 Message Date
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 3b9f4691c1 Merge pull request #16 from mapbox/nullprop
Allow features to have null properties
2014-12-16 22:49:23 -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 c177b8bed2 No need to remove no-ops here unless we clipped 2014-12-11 16:08:53 -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 105dfa73d7 Use bounding box for quick accept/reject before detailed clipping. 2014-12-11 13:34:50 -08:00
Eric Fischer a867646dfd Don't introduce bogus geometries in clipped-away features. 2014-12-10 12:07: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 380550ce85 Remember to remove the closepath after clipping away a polygon 2014-12-04 14:54:11 -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 b7b476b36c Don't introduce bogus geometries in clipped-away features. 2014-12-03 16:30:35 -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 77c4ce4171 Make the bin directory on install if it doesn't already exist 2014-12-02 11:38:48 -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 2bd0cb9f43 Don't override PREFIX if it is set in the environment 2014-11-24 10:35:06 -08:00
Eric Fischer bb13dc03e5 Gzip -9 tiles. Don't bother writing tiles whose features all got clipped away. 2014-11-20 14:33:45 -08:00
Eric Fischer 82c0f67813 Explicitly use /usr/local, as Yosemite apparently needs 2014-11-15 23:46:39 -08:00
Eric Fischer a1769416d1 Fix operator precedence warning 2014-11-14 15:26:59 -08:00
Eric Fischer 896f05aea6 Use gzip tile compression to match current tile server 2014-11-14 14:21: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 428be06442 Accept gzip compression as well as zlib 2014-11-13 22:47:54 -08:00
Eric Fischer 8210f83912 Make the progress indicator less chatty 2014-11-13 10:48:59 -08:00
Eric Fischer e7aa05e7e4 Don't immediately fail when a very low tile resolution is specified manually 2014-11-12 17:06:58 -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 1aea522ef5 Fix another overflow that broke line clipping at zoom level 1. 2014-11-07 12:51:26 -08:00
Eric Fischer 575a24b095 Use a set instead of a map to reduce needless memory overhead 2014-11-06 11:29:11 -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 097d6ccf7d Use a bitfield to make the index 2/3 the size, to save some disk churn 2014-11-05 10:07:05 -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 3f9f50258c Just use a standard C++ type for deduplicating instead of reinventing the wheel 2014-10-31 16:50:28 -07:00
Eric Fischer 8e84a8ffda I forgot how bad sorted data is in binary trees.
Swizzle the bits so deduplicating features isn't so terrible.
2014-10-31 16:41:11 -07:00
Eric Fischer ea7216641b If the requested tile doesn't exist, try climbing up to a lower zoom 2014-10-27 16:00:16 -07: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 a09bf3469d Fix line clipping overflow bug 2014-10-27 14:24:11 -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
Eric Fischer 4cb56a6b11 The indexing side of buffering features at the edges of tiles 2014-10-27 12:56:51 -07:00
Eric Fischer e0826a12c6 Much faster at low zooms to check for duplicates before simplifying 2014-10-27 10:00:46 -07:00
Eric Fischer be94bd0dd5 Remove an unused field from the index structure 2014-10-27 09:52:25 -07:00
Eric Fischer 4b171c74b7 Constrain calculated center point to be within the bounding box
It could come out bigger because it is calculated from the center
of the densest tile, not actually the centroid.
2014-10-26 13:12:29 -07:00
Eric Fischer 9bb4a549ca Silence warnings about unused variables 2014-10-24 17:24:04 -07:00
Eric Fischer 46100c34df Move projection and tile arithmetic to its own file 2014-10-24 17:22:14 -07:00
Eric Fischer 754dbf152a Remove dead code 2014-10-24 15:23:35 -07:00
Eric Fischer 17384d5da7 Move geometric transformations into their own file 2014-10-24 15:12:02 -07:00
Eric Fischer 75b7af8f79 Minimal tile decoder, only geometry for the moment 2014-10-23 15:40:27 -07:00
Eric Fischer 4e1eacc5b2 Simple enumerate command like the datamaps one 2014-10-23 14:04:57 -07:00
Eric Fischer ac00c84fb2 Save a little more space by sub-ordering within the same index
to put the lowest-numbered endpoint last
within lines that start at the same point,
since that is the one that might come next.
2014-10-21 17:59:42 -07:00
Eric Fischer 1cae0e85b3 Reindex features by their first coordinates so they coalesce better 2014-10-21 16:16:09 -07:00
Eric Fischer 9dab4b9fb6 Reverse lines that point the "wrong" direction so they coalesce better 2014-10-21 16:09:51 -07:00
Eric Fischer 4bb441ce41 Speed up reading further by reading buffers instead of characters 2014-10-19 15:35:28 -07:00
Eric Fischer 84b9dea51e Buffer the next character internally to make reading faster 2014-10-19 15:15:36 -07:00
Eric Fischer 043b35eede Take another opportunity to simplify lines after coalescing features 2014-10-18 11:40:09 -07:00
Eric Fischer 151f0c116c Fix clipping of polygons with multiple rings. 2014-10-16 15:17:18 -07:00
Eric Fischer 3bdcc3ca90 Heavy-handedly fix clipping errors at the edges of z0 and z1 tiles 2014-10-15 17:03:30 -07:00
Eric Fischer 8fec4ef9fc Return immediately instead of failing to clip polygons to the z0 tile 2014-10-15 16:34:49 -07:00
Eric Fischer 43b27e2dfd Don't closepath twice in multipolygons 2014-10-15 16:30:33 -07:00
Eric Fischer dc3c6138d1 Fix failure to close polygons. 2014-10-15 16:15:24 -07:00
Eric Fischer e561931d53 Fix bug that would always index for z14 regardless of actual max zoom 2014-10-15 15:49:03 -07:00
Eric Fischer 1502e5832c More option documentation cleanup 2014-10-09 17:26:16 -07:00
Eric Fischer ea99ae8db3 Document -X and improve option formatting in general 2014-10-09 17:22:22 -07:00
Eric Fischer ac34a292e9 Add an flag to remove all properties and use only geometry 2014-10-09 15:11:43 -07:00
Eric Fischer dea4335162 Less accurate but much faster estimate of size savings from excluding metadata 2014-10-09 14:02:20 -07:00
Eric Fischer 65ec829de6 Report every 10000 features on input, since parsing GeoJSON is slow. 2014-10-09 12:23:43 -07:00
Eric Fischer 389c89bdf9 Put the suggestions in order 2014-10-08 16:59:00 -07:00
Eric Fischer 67b8b984e5 Suggest properties you could drop to make the tiles smaller 2014-10-08 16:39:44 -07:00
Eric Fischer e1c5bfe3e1 Factor out aspects of tile creation 2014-10-08 14:01:47 -07:00
Eric Fischer 376bab74a5 Larger minimum polygon size looks better than dropping to larger pixels 2014-10-07 16:19:18 -07:00
Eric Fischer 49b36e09cc Tiny polygons (smaller than a pixel) decay into probabilities. 2014-10-07 15:38:06 -07:00
Eric Fischer adbd9f6edb Add a flag to select the rate at which points are dropped at low zooms. 2014-10-07 13:54:13 -07:00
Eric Fischer 8f71604fe6 If reading from standard input, use the .mbtiles as default layer name 2014-10-07 12:02:12 -07:00
Eric Fischer 8594dbe56b If a tile is too big, try backing off to lower resolutions before failing 2014-10-07 10:27:17 -07:00
Eric Fischer bda20fe8a6 Improve error reporting 2014-10-06 10:55:40 -07:00
Eric Fischer 41447a4678 Be clearer about error reporting 2014-10-04 14:11:59 -07:00
Eric Fischer 3433d17a96 Clip polygons to just outside the tile boundary 2014-10-03 16:33:22 -07:00
Eric Fischer 722e5f16eb Dashing: better than shortening, but still too visible 2014-10-01 14:01:58 -07:00
Eric Fischer 6922a57aea Still looks terrible, but make segment shortening work again 2014-10-01 11:09:35 -07:00
Eric Fischer b292b66a7c Fix more (small) memory leaks 2014-10-01 10:33:22 -07:00
Eric Fischer 7df269219c Fix memory leak of field names 2014-10-01 10:20:04 -07:00
Eric Fischer 6a64cf1b04 Convert metadata to use a vector too. 2014-09-30 17:24:34 -07:00
Eric Fischer 6bbe023187 Return to sorting features before coalescing 2014-09-30 17:18:23 -07:00
Eric Fischer 3ad8a919d9 Crash if the geometry is corrupted 2014-09-30 16:37:09 -07:00
Eric Fischer c32b0207f2 Use a constructor, and fix an encoding bug for lines clipped away entirely 2014-09-30 16:27:00 -07:00
Eric Fischer 1b3620dabc Start converting C arrays to C++ vectors 2014-09-30 15:53:45 -07:00