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

Look up layers by name because the source mbtiles might be inconsistent

Browse Source
This commit is contained in:
Eric Fischer 2015-08-20 13:42:24 -07:00
parent caafe2fe5c
commit 224321f6c8
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tile-join.cc
View File

@ -52,7 +52,7 @@ int dezig(unsigned n) {
return (n >> 1) ^ (-(n & 1)); return (n >> 1) ^ (-(n & 1));
} }
void handle(std::string message, int z, unsigned x, unsigned y, struct pool *file_keys) { void handle(std::string message, int z, unsigned x, unsigned y, struct pool **file_keys, char ***layernames, int *nlayers) {
GOOGLE_PROTOBUF_VERIFY_VERSION; GOOGLE_PROTOBUF_VERIFY_VERSION;
// https://github.com/mapbox/mapnik-vector-tile/blob/master/examples/c%2B%2B/tileinfo.cpp // https://github.com/mapbox/mapnik-vector-tile/blob/master/examples/c%2B%2B/tileinfo.cpp
@ -79,6 +79,23 @@ void handle(std::string message, int z, unsigned x, unsigned y, struct pool *fil
outlayer->set_version(layer.version()); outlayer->set_version(layer.version());
outlayer->set_extent(layer.extent()); outlayer->set_extent(layer.extent());
const char *ln = layer.name().c_str();
int ll;
for (ll = 0; ll < *nlayers; ll++) {
if (strcmp((*layernames)[ll], ln) == 0) {
break;
}
}
if (ll == *nlayers) {
*file_keys = (struct pool *) realloc(*file_keys, (ll + 1) * sizeof(struct pool));
*layernames = (char **) realloc(*layernames, (ll + 1) * sizeof(char *));
pool_init(file_keys[ll], 0);
(*layernames)[ll] = strdup(ln);
*nlayers = ll + 1;
}
for (int f = 0; f < layer.features_size(); f++) { for (int f = 0; f < layer.features_size(); f++) {
mapnik::vector::tile_feature feat = layer.features(f); mapnik::vector::tile_feature feat = layer.features(f);
mapnik::vector::tile_feature *outfeature = outlayer->add_features(); mapnik::vector::tile_feature *outfeature = outlayer->add_features();
@ -92,7 +109,7 @@ void handle(std::string message, int z, unsigned x, unsigned y, struct pool *fil
} }
} }
void decode(char *fname, char *map, struct pool *file_keys) { void decode(char *fname, char *map, struct pool **file_keys, char ***layernames, int *nlayers) {
sqlite3 *db; sqlite3 *db;
if (sqlite3_open(fname, &db) != SQLITE_OK) { if (sqlite3_open(fname, &db) != SQLITE_OK) {
@ -118,7 +135,7 @@ void decode(char *fname, char *map, struct pool *file_keys) {
printf("found %lld/%lld/%lld\n", zoom, x, y); printf("found %lld/%lld/%lld\n", zoom, x, y);
handle(std::string(s, len), zoom, x, y, file_keys); handle(std::string(s, len), zoom, x, y, file_keys, layernames, nlayers);
} }
sqlite3_finalize(stmt); sqlite3_finalize(stmt);
@ -161,12 +178,15 @@ int main(int argc, char **argv) {
usage(argv); usage(argv);
} }
struct pool file_keys; struct pool *file_keys = NULL;
pool_init(&file_keys, 0); char **layernames = NULL;
int nlayers = 0;
decode(argv[optind], argv[optind + 1], &file_keys); decode(argv[optind], argv[optind + 1], &file_keys, &layernames, &nlayers);
pool_free(&file_keys); for (i = 0; i < nlayers; i++) {
printf("%s\n", layernames[i]);
}
return 0; return 0;
} }