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

Canonicalize numbers in stringified attributes so geobuf can match

Browse Source
This commit is contained in:
Eric Fischer
2017-08-29 17:40:57 -07:00
parent caac717b17
commit 15a48e67d6
3 changed files with 87 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
read_json.cpp
+17
View File
@@ -103,6 +103,22 @@ void parse_geometry(int t, json_object *j, drawvec &out, int op, const char *fna
}
}
void canonicalize(json_object *o) {
if (o->type == JSON_NUMBER) {
std::string s = milo::dtoa_milo(o->number);
free(o->string);
o->string = strdup(s.c_str());
} else if (o->type == JSON_HASH) {
for (size_t i = 0; i < o->length; i++) {
canonicalize(o->values[i]);
}
} else if (o->type == JSON_ARRAY) {
for (size_t i = 0; i < o->length; i++) {
canonicalize(o->array[i]);
}
}
}
void stringify_value(json_object *value, int &type, std::string &stringified, const char *reading, int line, json_object *feature, std::string const &key) {
if (value != NULL) {
int vt = value->type;
@@ -117,6 +133,7 @@ void stringify_value(json_object *value, int &type, std::string &stringified, co
} else if (vt == JSON_NULL) {
val = "null";
} else {
canonicalize(value);
const char *v = json_stringify(value);
val = std::string(v);
free((void *) v); // stringify