Commit Graph

265 Commits

Author SHA1 Message Date
Eric Fischer
c62762078a Can't tell Linux to free pages, so just say we don't need them 2016-04-04 16:18:55 -07:00
Eric Fischer
72e485f285 Also advise when unmapping pages 2016-04-04 16:14:26 -07:00
Eric Fischer
b1d3849889 Sprinkle madvise calls to hint about how files should be paged in 2016-04-04 16:03:13 -07:00
Eric Fischer
2b0ac890c5 Fix the status message about how much geometry there is 2016-04-04 15:33:25 -07:00
Eric Fischer
d4b9f79d3c Fix the progress indicator when there is an inner radix sort 2016-04-04 14:49:41 -07:00
Eric Fischer
31c4d4850c Remove dead code 2016-04-04 13:22:23 -07:00
Eric Fischer
2fe841c6dc Remove extra newline output from old progress format 2016-04-04 11:42:40 -07:00
Eric Fischer
7b6cd2d0f4 Fix the any-valid-geometries check again 2016-04-04 11:25:21 -07:00
Eric Fischer
c9e542e688 Keep meta count inline to avoid thrash if no attributes 2016-04-04 11:18:37 -07:00
Eric Fischer
986719f2ff Rework sorting/merging progress indicator 2016-04-04 10:53:53 -07:00
Eric Fischer
e2b36a8ee9 Restore mergesort for the intermediate sort. Tests pass. 2016-04-01 18:15:31 -07:00
Eric Fischer
55f93963be Stop recursing when the indices are exactly the same 2016-04-01 17:41:53 -07:00
Eric Fischer
cf806baca2 Slow, but works for some cases now 2016-04-01 17:36:09 -07:00
Eric Fischer
60139532c8 Provide top-level output files for geometry and index 2016-04-01 17:01:10 -07:00
Eric Fischer
9793be1517 Split indices and geometries up by radix 2016-04-01 16:25:10 -07:00
Eric Fischer
560add2ccd More calculation about how many fds are available 2016-04-01 15:31:34 -07:00
Eric Fischer
24deae5a43 Reunify the string pool and metadata earlier to free up file descriptors 2016-04-01 12:38:32 -07:00
Eric Fischer
9acecdf93e OS-specific code to determine memory size 2016-03-31 15:29:43 -07:00
Eric Fischer
bd3b9a5136 Add an option to give specific layer names to specific input files 2016-03-29 13:13:39 -07:00
Eric Fischer
448d1a124e Handle case of options that aren't processed individually 2016-03-28 15:10:04 -07:00
Eric Fischer
edce0f088d Add GNU-style long options 2016-03-28 15:03:28 -07:00
Eric Fischer
b47653e2e6 Remove temporary files that were accidentally left in place 2016-03-28 14:00:01 -07:00
Eric Fischer
5a2a1b793a Exit cleanly if there was no valid input instead of giving an mmap error 2016-03-28 13:22:03 -07:00
Eric Fischer
1e5d420b66 Fix warnings about unused arguments 2016-03-25 13:45:28 -07:00
Eric Fischer
52dbed8132 Fix a few warnings about globals 2016-03-25 13:03:57 -07:00
Eric Fischer
eee596d5f5 Check return values from memory allocation 2016-03-25 11:57:33 -07:00
Eric Fischer
bc5a7b251f Check return values after allocating memory 2016-03-25 11:20:56 -07:00
Eric Fischer
16ca5cfeec Clarify maximum resolution in README and warning 2016-03-17 11:23:54 -07:00
Eric Fischer
cf5082122a Close original geometry temp files as soon as they are no longer needed 2016-03-07 16:45:35 -08:00
Eric Fischer
bf585a5849 Add newline to clean up progress messages 2016-03-07 16:38:21 -08:00
Eric Fischer
11e737ff29 Reorder geometry as part of the merge 2016-03-07 16:34:12 -08:00
Eric Fischer
f17cec5c44 Factor out gap logic instead of duplicating it 2016-03-03 17:03:47 -08:00
Eric Fischer
d38b5a999e Make base zoom and drop rate guessing more testable, and test them 2016-03-03 17:03:03 -08:00
Eric Fischer
a847db8c5f Remove dead code 2016-03-02 14:58:07 -08:00
Eric Fischer
bcdb40b41e Limit maxzoom to the max that actually works 2016-02-03 17:12:17 -08:00
Eric Fischer
e7f571c9c3 Even if the maxzoom is very high, don't use more bits of precision than exist 2016-02-03 16:52:23 -08:00
Eric Fischer
b649e99b32 Preserve input sequence across multiple input files 2016-02-02 15:43:27 -08:00
Eric Fischer
59c5d51e25 Don't allow the initial coordinate pair to be out of bounds 2016-02-02 13:33:49 -08:00
Eric Fischer
2015ba21bf Merge branch 'master' into ignore-error
Conflicts:
	mbtiles.c
2016-02-01 10:10:05 -08:00
Eric Fischer
6ec211ea4c Better message about layer name, and put it on stderr with the rest. 2016-01-29 11:05:51 -08:00
Eric Fischer
a84061cf87 Add an option to ignore sqlite errors on existing mbtiles files 2016-01-28 14:18:31 -08:00
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