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

Fewer copies in attribute stringification

Browse Source
This commit is contained in:
Erica Fischer
2024-02-02 16:13:07 -08:00
parent 6026ff0285
commit 66f4ed57b6
1 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
read_json.cpp
+20 -30
View File
@@ -123,51 +123,41 @@ void parse_geometry(int t, json_object *j, drawvec &out, int op, const char *fna
void stringify_value(json_object *value, int &type, std::string &stringified, const char *reading, int line, json_object *feature) { void stringify_value(json_object *value, int &type, std::string &stringified, const char *reading, int line, json_object *feature) {
if (value != NULL) { if (value != NULL) {
int vt = value->type; int vt = value->type;
std::string val;
if (vt == JSON_STRING) {
val = value->value.string.string;
} else if (vt == JSON_NUMBER) {
if (value->value.number.large_unsigned != 0) {
val = std::to_string(value->value.number.large_unsigned);
} else if (value->value.number.large_signed != 0) {
val = std::to_string(value->value.number.large_signed);
} else {
val = milo::dtoa_milo(value->value.number.number);
}
} else if (vt == JSON_TRUE) {
val = "true";
} else if (vt == JSON_FALSE) {
val = "false";
} else if (vt == JSON_NULL) {
val = "null";
} else {
const char *v = json_stringify(value);
val = std::string(v);
free((void *) v); // stringify
}
if (vt == JSON_STRING) { if (vt == JSON_STRING) {
type = mvt_string; type = mvt_string;
stringified = val; stringified = value->value.string.string;
std::string err = check_utf8(val);
if (err != "") { std::string err = check_utf8(stringified);
if (err.size() > 0) {
fprintf(stderr, "%s:%d: %s: ", reading, line, err.c_str()); fprintf(stderr, "%s:%d: %s: ", reading, line, err.c_str());
json_context(feature); json_context(feature);
exit(EXIT_UTF8); exit(EXIT_UTF8);
} }
} else if (vt == JSON_NUMBER) { } else if (vt == JSON_NUMBER) {
type = mvt_double; type = mvt_double;
stringified = val;
} else if (vt == JSON_TRUE || vt == JSON_FALSE) { if (value->value.number.large_unsigned != 0) {
stringified = std::to_string(value->value.number.large_unsigned);
} else if (value->value.number.large_signed != 0) {
stringified = std::to_string(value->value.number.large_signed);
} else {
stringified = milo::dtoa_milo(value->value.number.number);
}
} else if (vt == JSON_TRUE) {
type = mvt_bool; type = mvt_bool;
stringified = val; stringified = "true";
} else if (vt == JSON_FALSE) {
type = mvt_bool;
stringified = "false";
} else if (vt == JSON_NULL) { } else if (vt == JSON_NULL) {
type = mvt_null; type = mvt_null;
stringified = "null"; stringified = "null";
} else { } else {
type = mvt_string; type = mvt_string;
stringified = val; const char *v = json_stringify(value);
stringified = std::string(v);
free((void *) v); // stringify
} }
} }
} }