mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-02 08:25:40 +02:00
- geojson.cpp and attribute.cpp passed key_pool::pool() and set_attribute_accum() a c_str() from a std::string, forcing a needless reconstruction (and truncating at an embedded NUL). Both overloads take std::string, so pass it directly. The geojson.cpp one is the hottest loop in the program. - Replace the hand-maintained counters beside range-for loops in attribute.cpp, main.cpp and tile-join.cpp with indexed loops, since the index is only wanted for error messages. - parse_json_args took json_pull_ptr by value and then copied it, costing two refcount bumps per construction. Move it. - Assert that the parser is still attached where geojson.cpp reads geometry->parser->line. Only json_read results reach it today, but json_read_tree and json_disconnect now clear every parser pointer, so a detached tree would null-deref there instead of tripping an assert. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017KNxyHKasyWrWcvre2yK4r
186 lines
4.9 KiB
C++
186 lines
4.9 KiB
C++
#include <string>
|
|
#include <unordered_map>
|
|
#include "attribute.hpp"
|
|
#include "errors.hpp"
|
|
#include "serial.hpp"
|
|
#include "jsonpull/jsonpull.h"
|
|
#include "milo/dtoa_milo.h"
|
|
|
|
std::map<std::string, attribute_op> numeric_operations = {
|
|
{"sum", op_sum},
|
|
{"min", op_min},
|
|
{"max", op_max},
|
|
{"count", op_count},
|
|
};
|
|
|
|
void set_attribute_accum(std::unordered_map<std::string, attribute_op> &attribute_accum, std::string name, std::string type) {
|
|
attribute_op t;
|
|
|
|
if (type == "sum") {
|
|
t = op_sum;
|
|
} else if (type == "product") {
|
|
t = op_product;
|
|
} else if (type == "mean") {
|
|
t = op_mean;
|
|
} else if (type == "max") {
|
|
t = op_max;
|
|
} else if (type == "min") {
|
|
t = op_min;
|
|
} else if (type == "concat") {
|
|
t = op_concat;
|
|
} else if (type == "comma") {
|
|
t = op_comma;
|
|
} else if (type == "count") {
|
|
t = op_count;
|
|
} else {
|
|
fprintf(stderr, "Attribute method (%s) must be sum, product, mean, max, min, concat, comma, or count\n", type.c_str());
|
|
exit(EXIT_ARGS);
|
|
}
|
|
|
|
attribute_accum.insert(std::pair<std::string, attribute_op>(name, t));
|
|
}
|
|
|
|
void set_attribute_accum(std::unordered_map<std::string, attribute_op> &attribute_accum, const char *arg, char **argv) {
|
|
if (*arg == '{') {
|
|
json_pull_ptr jp = json_begin_string(arg);
|
|
json_object_ptr o = json_read_tree(jp);
|
|
|
|
if (o == nullptr) {
|
|
fprintf(stderr, "%s: -E%s: %s\n", *argv, arg, jp->error);
|
|
exit(EXIT_JSON);
|
|
}
|
|
|
|
if (o->type != JSON_HASH) {
|
|
fprintf(stderr, "%s: -E%s: not a JSON object\n", *argv, arg);
|
|
exit(EXIT_JSON);
|
|
}
|
|
|
|
for (size_t i = 0; i < o->entries().size(); i++) {
|
|
const auto &e = o->entries()[i];
|
|
|
|
if (e.key->type != JSON_STRING) {
|
|
fprintf(stderr, "%s: -E%s: key %zu not a string\n", *argv, arg, i);
|
|
exit(EXIT_JSON);
|
|
}
|
|
if (e.value->type != JSON_STRING) {
|
|
fprintf(stderr, "%s: -E%s: value %zu not a string\n", *argv, arg, i);
|
|
exit(EXIT_JSON);
|
|
}
|
|
|
|
set_attribute_accum(attribute_accum, e.key->string(), e.value->string());
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
const char *s = strchr(arg, ':');
|
|
if (s == NULL) {
|
|
fprintf(stderr, "-E%s option must be in the form -Ename:method\n", arg);
|
|
exit(EXIT_ARGS);
|
|
}
|
|
|
|
std::string name = std::string(arg, s - arg);
|
|
std::string type = std::string(s + 1);
|
|
|
|
set_attribute_accum(attribute_accum, name, type);
|
|
}
|
|
|
|
template <class T>
|
|
static void preserve_attribute1(attribute_op const &op, std::string const &key, T const &val, std::vector<std::shared_ptr<std::string>> &full_keys, std::vector<T> &full_values, key_pool &key_pool) {
|
|
for (size_t i = 0; i < full_keys.size(); i++) {
|
|
if (key == *full_keys[i]) {
|
|
switch (op) {
|
|
case op_sum:
|
|
full_values[i] = (full_values[i].to_double() + val.to_double());
|
|
return;
|
|
|
|
case op_product:
|
|
full_values[i] = (full_values[i].to_double() * val.to_double());
|
|
return;
|
|
|
|
case op_max: {
|
|
double existing = full_values[i].to_double();
|
|
double maybe = val.to_double();
|
|
if (maybe > existing) {
|
|
full_values[i] = val;
|
|
}
|
|
return;
|
|
}
|
|
|
|
case op_min: {
|
|
double existing = full_values[i].to_double();
|
|
double maybe = val.to_double();
|
|
if (maybe < existing) {
|
|
full_values[i] = val;
|
|
}
|
|
return;
|
|
}
|
|
|
|
case op_mean: {
|
|
size_t count = full_values[i].get_count();
|
|
if (count <= 1) {
|
|
full_values[i].set_double_count((full_values[i].to_double() + val.to_double()) / 2, 2);
|
|
} else {
|
|
double sum = full_values[i].to_double() * count + val.to_double();
|
|
count++;
|
|
full_values[i].set_double_count(sum / count, count);
|
|
}
|
|
return;
|
|
}
|
|
|
|
case op_concat:
|
|
full_values[i].set_string_value(full_values[i].get_string_value() + val.get_string_value());
|
|
return;
|
|
|
|
case op_comma:
|
|
full_values[i].set_string_value(full_values[i].get_string_value() + "," + val.get_string_value());
|
|
return;
|
|
|
|
case op_count: {
|
|
size_t count = full_values[i].get_count();
|
|
if (count <= 1) {
|
|
full_values[i].set_double_count(2, 2);
|
|
} else {
|
|
full_values[i].set_double_count(count + 1, count + 1);
|
|
}
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// not found, so we are making a new value
|
|
|
|
T v;
|
|
switch (op) {
|
|
case op_sum:
|
|
case op_max:
|
|
case op_min:
|
|
v = val;
|
|
break;
|
|
|
|
case op_count:
|
|
v.set_double_count(1, 1);
|
|
break;
|
|
|
|
case op_mean:
|
|
v.set_double_count(val.to_double(), 1);
|
|
break;
|
|
|
|
default:
|
|
fprintf(stderr, "can't happen: operation that isn't used by --accumulate-numeric-attributes\n");
|
|
exit(EXIT_IMPOSSIBLE);
|
|
}
|
|
|
|
full_keys.push_back(key_pool.pool(key));
|
|
full_values.push_back(v);
|
|
}
|
|
|
|
void preserve_attribute(attribute_op const &op, std::string const &key, mvt_value const &val, std::vector<std::shared_ptr<std::string>> &full_keys, std::vector<mvt_value> &full_values, key_pool &key_pool) {
|
|
preserve_attribute1(op, key, val, full_keys, full_values, key_pool);
|
|
}
|
|
|
|
void preserve_attribute(attribute_op const &op, std::string const &key, serial_val const &val, std::vector<std::shared_ptr<std::string>> &full_keys, std::vector<serial_val> &full_values, key_pool &key_pool) {
|
|
preserve_attribute1(op, key, val, full_keys, full_values, key_pool);
|
|
}
|