Eric Fischer
|
4a572b810b
|
Close some file descriptors that were left dangling before
|
2016-04-05 14:07:24 -07:00 |
|
Eric Fischer
|
b10b436ac9
|
Add a way to test recursive radix sorting. Bump version number.
|
2016-04-05 13:32:44 -07:00 |
|
Eric Fischer
|
e394501faa
|
Check for errors when closing files
|
2016-04-05 11:13:31 -07:00 |
|
Eric Fischer
|
c0a0aef060
|
Use large sort chunks, since that part can be parallelized
|
2016-04-05 10:08:46 -07:00 |
|
Eric Fischer
|
2a4be4f6d4
|
Parallel reading is effectively random order, not sequential
|
2016-04-04 17:00:11 -07:00 |
|
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
|
851d7b576b
|
Merge branch 'master' into radix
|
2016-04-01 15:32:15 -07:00 |
|
Eric Fischer
|
1e8c030b03
|
Make indent
|
2016-04-01 15:31:59 -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
|
8cc844c9dd
|
Merge pull request #201 from mapbox/llong_max
Fix where I used the wrong names for the max/min long long constants
|
2016-03-31 14:33:11 -07:00 |
|
Eric Fischer
|
389cdf2aa4
|
Bump version number
|
2016-03-31 11:44:04 -07:00 |
|
Eric Fischer
|
e5157ec66b
|
Fix where I used the wrong names for the max/min long long constants
|
2016-03-31 11:39:12 -07:00 |
|
Eric Fischer
|
4da5a1996b
|
Merge branch 'master' into earcut-polygon
Conflicts:
Makefile
|
2016-03-29 15:18:01 -07:00 |
|
Eric Fischer
|
5d701913ab
|
Merge pull request #199 from mapbox/named-layers
Add an option to give specific layer names to specific input files
|
2016-03-29 15:08:06 -07:00 |
|
Eric Fischer
|
62fac4d6f4
|
Add a test for layer names
|
2016-03-29 15:01:03 -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
|
10cd9c8875
|
Check the ring order manually and reorder them if they don't nest right
|
2016-03-29 11:05:39 -07:00 |
|
Eric Fischer
|
c404082421
|
Factor out copied-and-pasted polygon area calculations
|
2016-03-28 17:01:17 -07:00 |
|
Eric Fischer
|
6f5199adc7
|
Check whether polygon inner rings are inside the outer ring
|
2016-03-28 16:52:33 -07:00 |
|
Eric Fischer
|
c6051d876f
|
Merge branch 'master' into earcut-polygon
Conflicts:
geometry.cc
|
2016-03-28 15:45:16 -07:00 |
|
Eric Fischer
|
72b7dc977a
|
Merge pull request #196 from mapbox/stray-geom
Remove temporary files that were accidentally left in place
|
2016-03-28 15:31:31 -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
|
9f2e221338
|
Merge pull request #193 from mapbox/malloc
Check return values after allocating memory
|
2016-03-28 13:46:45 -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
|
cf2abf67d2
|
Oops: need to check array size in bytes, not number of objects
|
2016-03-28 13:08:54 -07:00 |
|
Eric Fischer
|
356575d0e0
|
Check for JSON array and hash overflows
|
2016-03-28 12:25:33 -07:00 |
|
Eric Fischer
|
7d602987e7
|
Merge pull request #194 from stevage/patch-2
Warn of spurious errors (as per #191)
|
2016-03-28 12:07:41 -07:00 |
|
Eric Fischer
|
21a635fb7a
|
Check for string length overflow
|
2016-03-28 12:00:55 -07:00 |
|
Eric Fischer
|
a92bdce12e
|
Upgrade clipper to f9c1344a09
|
2016-03-28 10:31:17 -07:00 |
|
Steve Bennett
|
8c9aa53bb5
|
Warn of spurious errors (as per #191)
|
2016-03-26 12:28:23 +11:00 |
|
Eric Fischer
|
1e5d420b66
|
Fix warnings about unused arguments
|
2016-03-25 13:45:28 -07:00 |
|
Eric Fischer
|
12be3e5a32
|
This one really is an int upstream
|
2016-03-25 13:21:32 -07:00 |
|