ExternalVendorCode/tippecanoe
1
0
Fork 0
mirror of https://github.com/mapbox/tippecanoe.git synced 2025-02-02 01:08:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clearer names

Browse Source
This commit is contained in:
Eric Fischer 2016-04-25 16:52:20 -07:00
parent 52f2804122
commit aaec2c98b6
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tile.cc
View File

@ -65,7 +65,6 @@ static int is_integer(const char *s, long long *v);
struct coalesce { struct coalesce {
int type; int type;
drawvec geom; drawvec geom;
int segment;
int m; int m;
char *meta; char *meta;
char *stringpool; char *stringpool;
@ -838,9 +837,8 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
c.coalesced = false; c.coalesced = false;
c.original_seq = original_seq; c.original_seq = original_seq;
c.m = partials[i].m; c.m = partials[i].m;
c.segment = partials[i].segment;
c.meta = partials[i].meta; c.meta = partials[i].meta;
c.stringpool = stringpool + pool_off[c.segment]; c.stringpool = stringpool + pool_off[partials[i].segment];
features[layer].push_back(c); features[layer].push_back(c);
} }
@ -912,29 +910,29 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
mvt_tile tile; mvt_tile tile;
for (size_t j = 0; j < features.size(); j++) { for (size_t j = 0; j < features.size(); j++) {
mvt_layer mvtl; mvt_layer layer;
mvtl.name = layernames[j]; layer.name = layernames[j];
mvtl.version = 2; layer.version = 2;
mvtl.extent = 1 << line_detail; layer.extent = 1 << line_detail;
for (size_t x = 0; x < features[j].size(); x++) { for (size_t x = 0; x < features[j].size(); x++) {
mvt_feature mvtf; mvt_feature feature;
if (features[j][x].type == VT_LINE || features[j][x].type == VT_POLYGON) { if (features[j][x].type == VT_LINE || features[j][x].type == VT_POLYGON) {
features[j][x].geom = remove_noop(features[j][x].geom, features[j][x].type, 0); features[j][x].geom = remove_noop(features[j][x].geom, features[j][x].type, 0);
} }
mvtf.type = features[j][x].type; feature.type = features[j][x].type;
mvtf.geometry = to_feature(features[j][x].geom); feature.geometry = to_feature(features[j][x].geom);
count += features[j][x].geom.size(); count += features[j][x].geom.size();
decode_meta(features[j][x].m, &features[j][x].meta, stringpool + pool_off[features[j][x].segment], mvtl, mvtf, file_keys[j]); decode_meta(features[j][x].m, &features[j][x].meta, features[j][x].stringpool, layer, feature, file_keys[j]);
mvtl.features.push_back(mvtf); layer.features.push_back(feature);
} }
if (mvtl.features.size() > 0) { if (layer.features.size() > 0) {
tile.layers.push_back(mvtl); tile.layers.push_back(layer);
} }
} }