mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-02 16:35:40 +02:00
Tippecanoe formatted every double it wrote through milo::dtoa_milo, a vendored Grisu2. Grisu2 is fast, but it guarantees neither the shortest digit string nor the correctly rounded one: it only guarantees that what it prints parses back to the value it came from. In practice it prints a digit more than necessary about 0.16% of the time, and picks a neighbor of the correctly rounded digits about 32% of the time. This ports Russ Cox's fpfmt (https://github.com/rsc/fpfmt) to C++ in fpfmt/ and formats through it instead. fpfmt is both shortest and correctly rounded, and it is faster: full std::string formatting Grisu2 fpfmt speedup random bit patterns 156.62 ns 66.83 ns 2.34x geo coordinates 124.07 ns 58.62 ns 2.12x short decimals 69.37 ns 49.16 ns 1.41x small integers 44.18 ns 38.06 ns 1.16x digit generation only Grisu2 fpfmt speedup random bit patterns 90.07 ns 20.81 ns 4.33x geo coordinates 80.64 ns 20.18 ns 4.00x short decimals 55.61 ns 21.90 ns 2.54x small integers 40.23 ns 22.50 ns 1.79x (Intel Xeon @ 2.80GHz, g++ 13.3 -O3. `make fpfmt-bench` reproduces this, and `./fpfmt-bench -check` reruns the correctness sweep, which is why milo/dtoa_milo.h is kept even though nothing links it any more.) The port is deliberately literal, so it can be diffed against fpfmt.go. Its Short() agrees bit for bit with the Go original's on 445,640 values covering powers of ten, small integers and reciprocals, subnormals, and random bit patterns. Over 38.5 million values, fpfmt::dtoa always round trips, is never longer than Grisu2's output, and is shorter 61,329 times. Output is otherwise formatted exactly as before, including the choice between plain and exponential notation, so 26 expected test outputs change: some numbers lose digits (-26.170044999999999 becomes -26.170045), and some have a corrected final digit (9.823748927348929e+55 becomes 9.823748927348928e+55). Every changed token was checked to parse back to the identical double; none of the values themselves moved. milo/milo.h, whose only job was to declare the C shim jsonpull calls, is replaced by fpfmt/fpfmt.h, and the shim is renamed dtoa_shortest. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014wJRAuhMninQE4wK2TUfuZ
646 lines
14 KiB
C++
646 lines
14 KiB
C++
// for vasprintf() on Linux
|
|
#ifndef _GNU_SOURCE
|
|
#define _GNU_SOURCE
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <vector>
|
|
#include <map>
|
|
#include <string>
|
|
#include "projection.hpp"
|
|
#include "geometry.hpp"
|
|
#include "mvt.hpp"
|
|
#include "write_json.hpp"
|
|
#include "fpfmt/fpfmt.hpp"
|
|
#include "errors.hpp"
|
|
#include "serial.hpp"
|
|
|
|
void json_writer::json_adjust() {
|
|
if (state.size() == 0) {
|
|
state.push_back(JSON_WRITE_TOP);
|
|
} else if (state[state.size() - 1] == JSON_WRITE_TOP) {
|
|
addc('\n');
|
|
state[state.size() - 1] = JSON_WRITE_TOP;
|
|
} else if (state[state.size() - 1] == JSON_WRITE_HASH) {
|
|
if (!nospace) {
|
|
addc(' ');
|
|
}
|
|
nospace = false;
|
|
state[state.size() - 1] = JSON_WRITE_HASH_KEY;
|
|
} else if (state[state.size() - 1] == JSON_WRITE_HASH_KEY) {
|
|
adds(":");
|
|
if (!nospace) {
|
|
addc(' ');
|
|
nospace = false;
|
|
}
|
|
state[state.size() - 1] = JSON_WRITE_HASH_VALUE;
|
|
} else if (state[state.size() - 1] == JSON_WRITE_HASH_VALUE) {
|
|
if (wantnl) {
|
|
adds(",\n");
|
|
nospace = false;
|
|
} else if (nospace) {
|
|
addc(',');
|
|
nospace = false;
|
|
} else {
|
|
adds(", ");
|
|
}
|
|
wantnl = false;
|
|
state[state.size() - 1] = JSON_WRITE_HASH_KEY;
|
|
} else if (state[state.size() - 1] == JSON_WRITE_ARRAY) {
|
|
if (!nospace) {
|
|
addc(' ');
|
|
}
|
|
nospace = false;
|
|
state[state.size() - 1] = JSON_WRITE_ARRAY_ELEMENT;
|
|
} else if (state[state.size() - 1] == JSON_WRITE_ARRAY_ELEMENT) {
|
|
if (wantnl) {
|
|
adds(",\n");
|
|
nospace = false;
|
|
} else if (nospace) {
|
|
addc(',');
|
|
nospace = false;
|
|
} else {
|
|
adds(", ");
|
|
}
|
|
wantnl = false;
|
|
state[state.size() - 1] = JSON_WRITE_ARRAY_ELEMENT;
|
|
} else {
|
|
fprintf(stderr, "Impossible JSON state\n");
|
|
exit(EXIT_JSON);
|
|
}
|
|
}
|
|
|
|
void json_writer::json_write_array() {
|
|
json_adjust();
|
|
addc('[');
|
|
|
|
state.push_back(JSON_WRITE_ARRAY);
|
|
}
|
|
|
|
void json_writer::json_end_array() {
|
|
if (state.size() == 0) {
|
|
fprintf(stderr, "End JSON array at top level\n");
|
|
exit(EXIT_JSON);
|
|
}
|
|
|
|
json_write_tok tok = state[state.size() - 1];
|
|
state.pop_back();
|
|
|
|
if (tok == JSON_WRITE_ARRAY || tok == JSON_WRITE_ARRAY_ELEMENT) {
|
|
if (!nospace) {
|
|
addc(' ');
|
|
}
|
|
nospace = false;
|
|
addc(']');
|
|
} else {
|
|
fprintf(stderr, "End JSON array with unexpected state\n");
|
|
exit(EXIT_JSON);
|
|
}
|
|
}
|
|
|
|
void json_writer::json_write_hash() {
|
|
json_adjust();
|
|
addc('{');
|
|
|
|
state.push_back(JSON_WRITE_HASH);
|
|
}
|
|
|
|
void json_writer::json_end_hash() {
|
|
if (state.size() == 0) {
|
|
fprintf(stderr, "End JSON hash at top level\n");
|
|
exit(EXIT_JSON);
|
|
}
|
|
|
|
json_write_tok tok = state[state.size() - 1];
|
|
state.pop_back();
|
|
|
|
if (tok == JSON_WRITE_HASH) {
|
|
if (!nospace) {
|
|
adds(" "); // Preserve accidental extra space from before
|
|
}
|
|
nospace = false;
|
|
addc('}');
|
|
} else if (tok == JSON_WRITE_HASH_VALUE) {
|
|
if (!nospace) {
|
|
addc(' ');
|
|
}
|
|
nospace = false;
|
|
addc('}');
|
|
} else {
|
|
fprintf(stderr, "End JSON hash with unexpected state\n");
|
|
exit(EXIT_JSON);
|
|
}
|
|
}
|
|
|
|
void json_writer::json_write_string(std::string const &str) {
|
|
json_adjust();
|
|
|
|
addc('"');
|
|
for (size_t i = 0; i < str.size(); i++) {
|
|
if (str[i] == '\\' || str[i] == '"') {
|
|
aprintf("\\%c", str[i]);
|
|
} else if ((unsigned char) str[i] < ' ') {
|
|
aprintf("\\u%04x", str[i]);
|
|
} else {
|
|
addc(str[i]);
|
|
}
|
|
}
|
|
addc('"');
|
|
}
|
|
|
|
void json_writer::json_write_json(std::string const &str) {
|
|
json_adjust();
|
|
adds(str);
|
|
}
|
|
|
|
void json_writer::json_write_number(double d) {
|
|
json_adjust();
|
|
|
|
adds(fpfmt::dtoa(d).c_str());
|
|
}
|
|
|
|
// Just to avoid json_writer:: changing expected output format
|
|
void json_writer::json_write_float(double d) {
|
|
json_adjust();
|
|
|
|
aprintf("%f", d);
|
|
}
|
|
|
|
void json_writer::json_write_unsigned(unsigned long long v) {
|
|
json_adjust();
|
|
|
|
aprintf("%llu", v);
|
|
}
|
|
|
|
void json_writer::json_write_signed(long long v) {
|
|
json_adjust();
|
|
|
|
aprintf("%lld", v);
|
|
}
|
|
|
|
void json_writer::json_write_stringified(std::string const &str) {
|
|
json_adjust();
|
|
|
|
adds(str);
|
|
}
|
|
|
|
void json_writer::json_write_bool(bool b) {
|
|
json_adjust();
|
|
|
|
if (b) {
|
|
adds("true");
|
|
} else {
|
|
adds("false");
|
|
}
|
|
}
|
|
|
|
void json_writer::json_write_null() {
|
|
json_adjust();
|
|
|
|
adds("null");
|
|
}
|
|
|
|
void json_writer::json_write_newline() {
|
|
addc('\n');
|
|
nospace = true;
|
|
}
|
|
|
|
void json_writer::json_comma_newline() {
|
|
wantnl = true;
|
|
}
|
|
|
|
void json_writer::aprintf(const char *format, ...) {
|
|
va_list ap;
|
|
char *tmp;
|
|
|
|
va_start(ap, format);
|
|
if (vasprintf(&tmp, format, ap) < 0) {
|
|
fprintf(stderr, "memory allocation failure\n");
|
|
exit(EXIT_MEMORY);
|
|
}
|
|
va_end(ap);
|
|
|
|
adds(std::string(tmp, strlen(tmp)));
|
|
free(tmp);
|
|
}
|
|
|
|
void json_writer::addc(char c) {
|
|
if (f != NULL) {
|
|
putc(c, f);
|
|
} else if (s != NULL) {
|
|
s->push_back(c);
|
|
}
|
|
}
|
|
|
|
void json_writer::adds(std::string const &str) {
|
|
if (f != NULL) {
|
|
fputs(str.c_str(), f);
|
|
} else if (s != NULL) {
|
|
s->append(str);
|
|
}
|
|
}
|
|
|
|
struct lonlat {
|
|
int op;
|
|
double lon;
|
|
double lat;
|
|
long long x;
|
|
long long y;
|
|
|
|
lonlat(int nop, double nlon, double nlat, long long nx, long long ny)
|
|
: op(nop),
|
|
lon(nlon),
|
|
lat(nlat),
|
|
x(nx),
|
|
y(ny) {
|
|
}
|
|
};
|
|
|
|
void write_coords(json_writer &state, lonlat const &ll, double scale) {
|
|
if (scale == 0) {
|
|
state.json_write_float(ll.lon);
|
|
state.json_write_float(ll.lat);
|
|
} else {
|
|
state.json_write_number(ll.x / scale);
|
|
state.json_write_number(ll.y / scale);
|
|
}
|
|
}
|
|
|
|
void layer_to_geojson(mvt_layer const &layer, unsigned z, unsigned x, unsigned y, bool comma, bool name, bool zoom, bool write_dropped, unsigned long long index, long long sequence, long long extent, bool complain, json_writer &state, double scale, std::set<std::string> const &include_attr) {
|
|
for (size_t f = 0; f < layer.features.size(); f++) {
|
|
mvt_feature const &feat = layer.features[f];
|
|
|
|
state.json_write_hash();
|
|
state.json_write_string("type");
|
|
state.json_write_string("Feature");
|
|
|
|
if (feat.has_id) {
|
|
state.json_write_string("id");
|
|
state.json_write_unsigned(feat.id);
|
|
}
|
|
|
|
if (name || zoom || index != 0 || sequence != 0 || extent != 0) {
|
|
state.json_write_string("tippecanoe");
|
|
state.json_write_hash();
|
|
|
|
if (name) {
|
|
state.json_write_string("layer");
|
|
state.json_write_string(layer.name);
|
|
}
|
|
|
|
if (zoom) {
|
|
state.json_write_string("minzoom");
|
|
state.json_write_unsigned(z);
|
|
|
|
state.json_write_string("maxzoom");
|
|
state.json_write_unsigned(z);
|
|
}
|
|
|
|
if (write_dropped) {
|
|
state.json_write_string("dropped");
|
|
state.json_write_bool(feat.dropped == FEATURE_DROPPED);
|
|
}
|
|
|
|
if (index != 0) {
|
|
state.json_write_string("index");
|
|
state.json_write_unsigned(index);
|
|
}
|
|
|
|
if (sequence != 0) {
|
|
state.json_write_string("sequence");
|
|
state.json_write_signed(sequence);
|
|
}
|
|
|
|
if (extent != 0) {
|
|
state.json_write_string("extent");
|
|
state.json_write_signed(extent);
|
|
}
|
|
|
|
state.json_end_hash();
|
|
}
|
|
|
|
state.json_write_string("properties");
|
|
state.json_write_hash();
|
|
|
|
for (size_t t = 0; t + 1 < feat.tags.size(); t += 2) {
|
|
if (feat.tags[t] >= layer.keys.size()) {
|
|
fprintf(stderr, "Error: out of bounds feature key (%u in %zu)\n", feat.tags[t], layer.keys.size());
|
|
exit(EXIT_IMPOSSIBLE);
|
|
}
|
|
if (feat.tags[t + 1] >= layer.values.size()) {
|
|
fprintf(stderr, "Error: out of bounds feature value (%u in %zu)\n", feat.tags[t + 1], layer.values.size());
|
|
exit(EXIT_IMPOSSIBLE);
|
|
}
|
|
|
|
if (include_attr.size() > 0 && include_attr.find(layer.keys[feat.tags[t]]) == include_attr.end()) {
|
|
continue;
|
|
}
|
|
|
|
const char *key = layer.keys[feat.tags[t]].c_str();
|
|
mvt_value const &val = layer.values[feat.tags[t + 1]];
|
|
|
|
switch (val.type) {
|
|
case mvt_string:
|
|
state.json_write_string(key);
|
|
state.json_write_string(val.get_string_value());
|
|
break;
|
|
case mvt_int:
|
|
state.json_write_string(key);
|
|
state.json_write_signed(val.numeric_value.int_value);
|
|
break;
|
|
case mvt_double:
|
|
state.json_write_string(key);
|
|
state.json_write_number(val.numeric_value.double_value);
|
|
break;
|
|
case mvt_float:
|
|
state.json_write_string(key);
|
|
state.json_write_number(val.numeric_value.float_value);
|
|
break;
|
|
case mvt_sint:
|
|
state.json_write_string(key);
|
|
state.json_write_signed(val.numeric_value.sint_value);
|
|
break;
|
|
case mvt_uint:
|
|
state.json_write_string(key);
|
|
state.json_write_unsigned(val.numeric_value.uint_value);
|
|
break;
|
|
case mvt_bool:
|
|
state.json_write_string(key);
|
|
state.json_write_bool(val.numeric_value.bool_value);
|
|
break;
|
|
case mvt_null:
|
|
state.json_write_string(key);
|
|
state.json_write_null();
|
|
break;
|
|
default:
|
|
fprintf(stderr, "Internal error: property with unknown type\n");
|
|
exit(EXIT_IMPOSSIBLE);
|
|
}
|
|
}
|
|
|
|
state.json_end_hash();
|
|
|
|
state.json_write_string("geometry");
|
|
state.json_write_hash();
|
|
|
|
std::vector<lonlat> ops;
|
|
|
|
for (size_t g = 0; g < feat.geometry.size(); g++) {
|
|
int op = feat.geometry[g].op;
|
|
long long px = feat.geometry[g].x;
|
|
long long py = feat.geometry[g].y;
|
|
|
|
if (op == VT_MOVETO || op == VT_LINETO) {
|
|
long long wscale = 1LL << (32 - z);
|
|
long long wx = wscale * x + (wscale / layer.extent) * px;
|
|
long long wy = wscale * y + (wscale / layer.extent) * py;
|
|
|
|
double lat, lon;
|
|
projection->unproject(wx, wy, 32, &lon, &lat);
|
|
|
|
ops.push_back(lonlat(op, lon, lat, px, py));
|
|
} else {
|
|
ops.push_back(lonlat(op, 0, 0, 0, 0));
|
|
}
|
|
}
|
|
|
|
if (feat.type == VT_POINT) {
|
|
if (ops.size() == 1) {
|
|
state.json_write_string("type");
|
|
state.json_write_string("Point");
|
|
|
|
state.json_write_string("coordinates");
|
|
|
|
state.json_write_array();
|
|
write_coords(state, ops[0], scale);
|
|
state.json_end_array();
|
|
} else {
|
|
state.json_write_string("type");
|
|
state.json_write_string("MultiPoint");
|
|
|
|
state.json_write_string("coordinates");
|
|
state.json_write_array();
|
|
|
|
for (size_t i = 0; i < ops.size(); i++) {
|
|
state.json_write_array();
|
|
write_coords(state, ops[i], scale);
|
|
state.json_end_array();
|
|
}
|
|
|
|
state.json_end_array();
|
|
}
|
|
} else if (feat.type == VT_LINE) {
|
|
int movetos = 0;
|
|
for (size_t i = 0; i < ops.size(); i++) {
|
|
if (ops[i].op == VT_MOVETO) {
|
|
movetos++;
|
|
}
|
|
}
|
|
|
|
if (movetos < 2) {
|
|
state.json_write_string("type");
|
|
state.json_write_string("LineString");
|
|
|
|
state.json_write_string("coordinates");
|
|
state.json_write_array();
|
|
|
|
for (size_t i = 0; i < ops.size(); i++) {
|
|
state.json_write_array();
|
|
write_coords(state, ops[i], scale);
|
|
state.json_end_array();
|
|
}
|
|
|
|
state.json_end_array();
|
|
} else {
|
|
state.json_write_string("type");
|
|
state.json_write_string("MultiLineString");
|
|
|
|
state.json_write_string("coordinates");
|
|
state.json_write_array();
|
|
state.json_write_array();
|
|
|
|
int sstate = 0;
|
|
for (size_t i = 0; i < ops.size(); i++) {
|
|
if (ops[i].op == VT_MOVETO) {
|
|
if (sstate == 0) {
|
|
state.json_write_array();
|
|
write_coords(state, ops[i], scale);
|
|
state.json_end_array();
|
|
|
|
sstate = 1;
|
|
} else {
|
|
state.json_end_array();
|
|
state.json_write_array();
|
|
|
|
state.json_write_array();
|
|
write_coords(state, ops[i], scale);
|
|
state.json_end_array();
|
|
|
|
sstate = 1;
|
|
}
|
|
} else {
|
|
state.json_write_array();
|
|
write_coords(state, ops[i], scale);
|
|
state.json_end_array();
|
|
}
|
|
}
|
|
|
|
state.json_end_array();
|
|
state.json_end_array();
|
|
}
|
|
} else if (feat.type == VT_POLYGON) {
|
|
std::vector<std::vector<lonlat> > rings;
|
|
std::vector<double> areas;
|
|
|
|
for (size_t i = 0; i < ops.size(); i++) {
|
|
if (ops[i].op == VT_MOVETO) {
|
|
rings.push_back(std::vector<lonlat>());
|
|
areas.push_back(0);
|
|
}
|
|
|
|
int n = rings.size() - 1;
|
|
if (n >= 0) {
|
|
if (ops[i].op == VT_CLOSEPATH) {
|
|
rings[n].push_back(rings[n][0]);
|
|
} else {
|
|
rings[n].push_back(ops[i]);
|
|
}
|
|
}
|
|
|
|
if (i + 1 >= ops.size() || ops[i + 1].op == VT_MOVETO) {
|
|
if (ops[i].op != VT_CLOSEPATH) {
|
|
static bool warned = false;
|
|
|
|
if (!warned) {
|
|
fprintf(stderr, "Ring does not end with closepath (ends with %d)\n", ops[i].op);
|
|
if (complain) {
|
|
exit(EXIT_IMPOSSIBLE);
|
|
}
|
|
|
|
warned = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
int outer = 0;
|
|
|
|
for (size_t i = 0; i < rings.size(); i++) {
|
|
double area = 0;
|
|
for (size_t k = 0; k < rings[i].size(); k++) {
|
|
if (rings[i][k].op != VT_CLOSEPATH) {
|
|
area += (double) rings[i][k].x * (double) rings[i][(k + 1) % rings[i].size()].y;
|
|
area -= (double) rings[i][k].y * (double) rings[i][(k + 1) % rings[i].size()].x;
|
|
}
|
|
}
|
|
area /= 2;
|
|
|
|
areas[i] = area;
|
|
if (areas[i] >= 0 || i == 0) {
|
|
outer++;
|
|
}
|
|
|
|
// fprintf("\"area\": %Lf,", area);
|
|
}
|
|
|
|
if (outer > 1) {
|
|
state.json_write_string("type");
|
|
state.json_write_string("MultiPolygon");
|
|
|
|
state.json_write_string("coordinates");
|
|
state.json_write_array();
|
|
state.json_write_array();
|
|
state.json_write_array();
|
|
} else {
|
|
state.json_write_string("type");
|
|
state.json_write_string("Polygon");
|
|
|
|
state.json_write_string("coordinates");
|
|
state.json_write_array();
|
|
state.json_write_array();
|
|
}
|
|
|
|
int sstate = 0;
|
|
for (size_t i = 0; i < rings.size(); i++) {
|
|
if (i == 0 && areas[i] < 0) {
|
|
static bool warned = false;
|
|
|
|
if (!warned) {
|
|
fprintf(stderr, "Polygon begins with an inner ring\n");
|
|
if (complain) {
|
|
exit(EXIT_IMPOSSIBLE);
|
|
}
|
|
|
|
warned = true;
|
|
}
|
|
}
|
|
|
|
if (areas[i] >= 0) {
|
|
if (sstate != 0) {
|
|
// new multipolygon
|
|
state.json_end_array();
|
|
state.json_end_array();
|
|
|
|
state.json_write_array();
|
|
state.json_write_array();
|
|
}
|
|
sstate = 1;
|
|
}
|
|
|
|
if (sstate == 2) {
|
|
// new ring in the same polygon
|
|
state.json_end_array();
|
|
state.json_write_array();
|
|
}
|
|
|
|
for (size_t j = 0; j < rings[i].size(); j++) {
|
|
if (rings[i][j].op != VT_CLOSEPATH) {
|
|
state.json_write_array();
|
|
write_coords(state, rings[i][j], scale);
|
|
state.json_end_array();
|
|
} else {
|
|
state.json_write_array();
|
|
write_coords(state, rings[i][j], scale);
|
|
state.json_end_array();
|
|
}
|
|
}
|
|
|
|
sstate = 2;
|
|
}
|
|
|
|
if (outer > 1) {
|
|
state.json_end_array();
|
|
state.json_end_array();
|
|
state.json_end_array();
|
|
} else {
|
|
state.json_end_array();
|
|
state.json_end_array();
|
|
}
|
|
}
|
|
|
|
state.json_end_hash();
|
|
state.json_end_hash();
|
|
|
|
if (comma) {
|
|
state.json_write_newline();
|
|
state.json_comma_newline();
|
|
}
|
|
}
|
|
}
|
|
|
|
void fprintq(FILE *fp, const char *s) {
|
|
fputc('"', fp);
|
|
for (; *s; s++) {
|
|
if (*s == '\\' || *s == '"') {
|
|
fprintf(fp, "\\%c", *s);
|
|
} else if (*s >= 0 && *s < ' ') {
|
|
fprintf(fp, "\\u%04x", *s);
|
|
} else {
|
|
fputc(*s, fp);
|
|
}
|
|
}
|
|
fputc('"', fp);
|
|
}
|