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

Merge branch 'master' into plugins

Browse Source
This commit is contained in:
Eric Fischer
2017-08-08 11:08:10 -07:00
parent 6a505cdba7 e982b2f6a7
commit c79f19e3ca
111 changed files with 971 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
geojson.cpp
+23 -8
View File
@@ -24,11 +24,7 @@
#include <set>
#include <map>
#include <string>
extern "C" {
#include "jsonpull/jsonpull.h"
}
#include "pool.hpp"
#include "projection.hpp"
#include "memfile.hpp"
@@ -213,10 +209,29 @@ int serialize_geometry(json_object *geometry, json_object *properties, json_obje
if (ai != layermap->end()) {
layer = ai->second.id;
layername = tippecanoe_layername;
if (mb_geometry[t] == VT_POINT) {
ai->second.points++;
} else if (mb_geometry[t] == VT_LINE) {
ai->second.lines++;
} else if (mb_geometry[t] == VT_POLYGON) {
ai->second.polygons++;
}
} else {
fprintf(stderr, "Internal error: can't find layer name %s\n", tippecanoe_layername.c_str());
exit(EXIT_FAILURE);
}
} else {
auto fk = layermap->find(layername);
if (fk != layermap->end()) {
if (mb_geometry[t] == VT_POINT) {
fk->second.points++;
} else if (mb_geometry[t] == VT_LINE) {
fk->second.lines++;
} else if (mb_geometry[t] == VT_POLYGON) {
fk->second.polygons++;
}
}
}
size_t nprop = 0;
@@ -252,12 +267,12 @@ int serialize_geometry(json_object *geometry, json_object *properties, json_obje
metaval[m] = val;
m++;
type_and_string tas;
tas.string = s;
tas.type = type;
type_and_string attrib;
attrib.type = metatype[m - 1];
attrib.string = metaval[m - 1];
auto fk = layermap->find(layername);
fk->second.file_keys.insert(tas);
add_to_file_keys(fk->second.file_keys, metakey[m - 1], attrib);
}
}
}