diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-02 08:25:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

First stages of geobuf support

Browse Source
This commit is contained in:
Eric Fischer
2017-08-08 10:31:26 -07:00
parent e982b2f6a7
commit fa0e38da2b
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.cpp
+7 -1
View File
@@ -45,6 +45,7 @@
#include "memfile.hpp"
#include "main.hpp"
#include "geojson.hpp"
#include "geobuf.hpp"
#include "geometry.hpp"
#include "serial.hpp"
#include "options.hpp"
@@ -1376,7 +1377,7 @@ int read_input(std::vector<source> &sources, char *fname, int &maxzoom, int minz
overall_offset += ahead;
checkdisk(reader, CPUS);
}
} else {
} else if (c == '{') {
// Plain serial reading
long long layer_seq = overall_offset;
@@ -1385,6 +1386,11 @@ int read_input(std::vector<source> &sources, char *fname, int &maxzoom, int minz
json_end(jp);
overall_offset = layer_seq;
checkdisk(reader, CPUS);
} else {
long long layer_seq = overall_offset;
parse_geobuf(fp, reading.c_str(), &layer_seq, &progress_seq, &reader[0].metapos, &reader[0].geompos, &reader[0].indexpos, exclude, include, exclude_all, reader[0].metafile, reader[0].geomfile, reader[0].indexfile, reader[0].poolfile, reader[0].treefile, fname, basezoom, layer, droprate, reader[0].file_bbox, 0, &initialized[0], &initial_x[0], &initial_y[0], reader, maxzoom, &layermaps[0], sources[layer].layer, uses_gamma, attribute_types, &dist_sum, &dist_count, guess_maxzoom);
overall_offset = layer_seq;
checkdisk(reader, CPUS);
}
if (fclose(fp) != 0) {