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

Call a function that will eventually preserve the attributes

Browse Source
This commit is contained in:
Eric Fischer 2018-02-20 17:24:15 -08:00
parent b73e710855
commit bc0edec753
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tile.cpp
View File

@ -1414,6 +1414,28 @@ void add_tilestats(std::string const &layername, int z, std::vector<std::map<std
add_to_file_keys(fk->second.file_keys, key, attrib); add_to_file_keys(fk->second.file_keys, key, attrib);
} }
void preserve_attributes(std::map<std::string, int> const *attribute_accum, std::map<std::string, serial_val> &attribute_accum_state, serial_feature &sf, char *stringpool) {
for (size_t i = 0; i < sf.m; i++) {
std::string key = stringpool + sf.keys[i] + 1;
serial_val sv;
sv.type = stringpool[sf.values[i]];
sv.s = stringpool + sf.values[i] + 1;
if (attribute_accum->count(key) != 0) {
printf("%s %s\n", key.c_str(), sv.s.c_str());
}
}
for (size_t i = 0; i < sf.full_keys.size(); i++) {
std::string key = sf.full_keys[i];
serial_val sv = sf.full_values[i];
if (attribute_accum->count(key) != 0) {
printf("%s %s\n", key.c_str(), sv.s.c_str());
}
}
}
long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *stringpool, int z, unsigned tx, unsigned ty, int detail, int min_detail, sqlite3 *outdb, const char *outdir, int buffer, const char *fname, FILE **geomfile, int minzoom, int maxzoom, double todo, volatile long long *along, long long alongminus, double gamma, int child_shards, long long *meta_off, long long *pool_off, unsigned *initial_x, unsigned *initial_y, volatile int *running, double simplification, std::vector<std::map<std::string, layermap_entry>> *layermaps, std::vector<std::vector<std::string>> *layer_unmaps, size_t tiling_seg, size_t pass, size_t passes, unsigned long long mingap, long long minextent, double fraction, const char *prefilter, const char *postfilter, write_tile_args *arg) { long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *stringpool, int z, unsigned tx, unsigned ty, int detail, int min_detail, sqlite3 *outdb, const char *outdir, int buffer, const char *fname, FILE **geomfile, int minzoom, int maxzoom, double todo, volatile long long *along, long long alongminus, double gamma, int child_shards, long long *meta_off, long long *pool_off, unsigned *initial_x, unsigned *initial_y, volatile int *running, double simplification, std::vector<std::map<std::string, layermap_entry>> *layermaps, std::vector<std::vector<std::string>> *layer_unmaps, size_t tiling_seg, size_t pass, size_t passes, unsigned long long mingap, long long minextent, double fraction, const char *prefilter, const char *postfilter, write_tile_args *arg) {
int line_detail; int line_detail;
double merge_fraction = 1; double merge_fraction = 1;
@ -1468,6 +1490,7 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
std::vector<unsigned long long> indices; std::vector<unsigned long long> indices;
std::vector<long long> extents; std::vector<long long> extents;
std::vector<serial_feature> coalesced_geometry; std::vector<serial_feature> coalesced_geometry;
std::map<std::string, serial_val> attribute_accum_state;
int within[child_shards]; int within[child_shards];
long long geompos[child_shards]; long long geompos[child_shards];
@ -1559,6 +1582,7 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
if (gamma > 0) { if (gamma > 0) {
if (manage_gap(sf.index, &previndex, scale, gamma, &gap)) { if (manage_gap(sf.index, &previndex, scale, gamma, &gap)) {
preserve_attributes(arg->attribute_accum, attribute_accum_state, sf, stringpool);
continue; continue;
} }
} }
@ -1574,6 +1598,7 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
indices.push_back(sf.index); indices.push_back(sf.index);
if (sf.index - merge_previndex < mingap) { if (sf.index - merge_previndex < mingap) {
clustered++; clustered++;
preserve_attributes(arg->attribute_accum, attribute_accum_state, sf, stringpool);
continue; continue;
} else { } else {
if (clustered > 0) { if (clustered > 0) {
@ -1600,23 +1625,27 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
} else if (additional[A_DROP_DENSEST_AS_NEEDED]) { } else if (additional[A_DROP_DENSEST_AS_NEEDED]) {
indices.push_back(sf.index); indices.push_back(sf.index);
if (sf.index - merge_previndex < mingap) { if (sf.index - merge_previndex < mingap) {
preserve_attributes(arg->attribute_accum, attribute_accum_state, sf, stringpool);
continue; continue;
} }
} else if (additional[A_COALESCE_DENSEST_AS_NEEDED]) { } else if (additional[A_COALESCE_DENSEST_AS_NEEDED]) {
indices.push_back(sf.index); indices.push_back(sf.index);
if (sf.index - merge_previndex < mingap) { if (sf.index - merge_previndex < mingap) {
coalesced_geometry.push_back(sf); coalesced_geometry.push_back(sf);
preserve_attributes(arg->attribute_accum, attribute_accum_state, sf, stringpool);
continue; continue;
} }
} else if (additional[A_DROP_SMALLEST_AS_NEEDED]) { } else if (additional[A_DROP_SMALLEST_AS_NEEDED]) {
extents.push_back(sf.extent); extents.push_back(sf.extent);
if (sf.extent + coalesced_area <= minextent && sf.t != VT_POINT) { if (sf.extent + coalesced_area <= minextent && sf.t != VT_POINT) {
preserve_attributes(arg->attribute_accum, attribute_accum_state, sf, stringpool);
continue; continue;
} }
} else if (additional[A_COALESCE_SMALLEST_AS_NEEDED]) { } else if (additional[A_COALESCE_SMALLEST_AS_NEEDED]) {
extents.push_back(sf.extent); extents.push_back(sf.extent);
if (sf.extent + coalesced_area <= minextent) { if (sf.extent + coalesced_area <= minextent) {
coalesced_geometry.push_back(sf); coalesced_geometry.push_back(sf);
preserve_attributes(arg->attribute_accum, attribute_accum_state, sf, stringpool);
continue; continue;
} }
} }
@ -1638,6 +1667,7 @@ long long write_tile(FILE *geoms, long long *geompos_in, char *metabase, char *s
if (additional[A_COALESCE_FRACTION_AS_NEEDED]) { if (additional[A_COALESCE_FRACTION_AS_NEEDED]) {
coalesced_geometry.push_back(sf); coalesced_geometry.push_back(sf);
} }
preserve_attributes(arg->attribute_accum, attribute_accum_state, sf, stringpool);
continue; continue;
} }
fraction_accum -= 1; fraction_accum -= 1;