mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-02 16:35:40 +02:00
* Add a way to run tippecanoe single-threaded for profiling * Do less work when the tilestats sample values list is already full * Save a copy when retrieving the attribute key * Fewer atomic operations * Move string hashing from mbtiles to text * Only do approximate attribute deduplication when writing tiles * Feature dropping tests are sensitive to exact tile size * All tile creators now create a string pool for the tile * Features clipped away to nothing should not participate in that tile * Revert "Only do approximate attribute deduplication when writing tiles" This reverts commitc42b34b498. * Also revert the related test changes * Revert "Revert "Only do approximate attribute deduplication when writing tiles"" This reverts commit18509876c3. * Be more specific about the string hash function * Use fnv1a instead of std::hash for everything * Reduce the chance of hash collisions * Stick a hash search on the front of the tree search in addpool * Eliminate repeated hashing of the same string * Switch instead of ifs in json parsing * A few more cases to populate the hash in addpool * Store the hash in the tree instead of recalculating * Add explanatory comment for mysterious argument * Fewer copies in attribute stringification * Clean up ancient weirdness in JSON attribute stringification * More serial_val cleanup * Pass a serial_feature to rewrite instead of many broken-down arguments * Get rid of the multiple geometries within `partial` * Revert "Pass a serial_feature to rewrite instead of many broken-down arguments" This reverts commit6f4ab9b725. * Goodbye, struct coalesce * Revert "Features clipped away to nothing should not participate in that tile" This reverts commit124462fbdc. * Migrating fields from partial to serial_feature * Name reconciliation between serial_feature and partial * Replace struct partial with an augmented serial_feature * Fix some overzealous search-and-replace renaming * Don't say struct so often * Remove more of the former partial construction * Commenting and cleaning up * Trying again to avoid all these arguments to rewrite * I swear I did this same thing before and it didn't work. * More rewrite cleanup * Exile --detect-shared-borders to its own file * Add missing headers * More commenting and cleanup * More comments * Sprinkle consts around * Emplacing and std::moving * More cleanup * That shouldn't have worked after a std::move * Don't need to allocate memory to compare keys * Reduce use of the global string pool in tiling * Another avoidable mvt_value construction * Further reduction to explicit string pool passing * These reverses are no longer optimizations * These layernames can all be references * Don't drag an unused layername string around with every feature * Heed a compiler warning about potential buffer overflow * Fix my confusion about which feature's string pool is relevant * Avoid some unnecessary allocations in attribute accumulation * Maybe faster serialization? * Eliminate a comparison * Do the same here * Save a couple of allocations when parsing numbers in JSON * Immediately assign features to layers instead of subdividing later * Maintain tilestats for tippecanoe:retain_points_multiplier_sequence * Crunch out more duplicate attribute values when writing out the tile * Do tilestats for tippecanoe:retain_points_multiplier_first too * Shell filters need to be real threads, even if nothing else does * Simplify tippecanoe_minzoom/maxzoom representation * Update version and changelog
169 lines
4.4 KiB
C++
169 lines
4.4 KiB
C++
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <math.h>
|
|
#include <vector>
|
|
#include <string>
|
|
#include <map>
|
|
#include "jsonpull/jsonpull.h"
|
|
#include "geometry.hpp"
|
|
#include "projection.hpp"
|
|
#include "read_json.hpp"
|
|
#include "text.hpp"
|
|
#include "mvt.hpp"
|
|
#include "milo/dtoa_milo.h"
|
|
#include "errors.hpp"
|
|
#include "serial.hpp"
|
|
|
|
const char *geometry_names[GEOM_TYPES] = {
|
|
"Point",
|
|
"MultiPoint",
|
|
"LineString",
|
|
"MultiLineString",
|
|
"Polygon",
|
|
"MultiPolygon",
|
|
};
|
|
|
|
int geometry_within[GEOM_TYPES] = {
|
|
-1, /* point */
|
|
GEOM_POINT, /* multipoint */
|
|
GEOM_POINT, /* linestring */
|
|
GEOM_LINESTRING, /* multilinestring */
|
|
GEOM_LINESTRING, /* polygon */
|
|
GEOM_POLYGON, /* multipolygon */
|
|
};
|
|
|
|
int mb_geometry[GEOM_TYPES] = {
|
|
VT_POINT,
|
|
VT_POINT,
|
|
VT_LINE,
|
|
VT_LINE,
|
|
VT_POLYGON,
|
|
VT_POLYGON,
|
|
};
|
|
|
|
void json_context(json_object *j) {
|
|
char *s = json_stringify(j);
|
|
|
|
if (strlen(s) >= 500) {
|
|
snprintf(s + 497, strlen(s) + 1 - 497, "...");
|
|
}
|
|
|
|
fprintf(stderr, "in JSON object %s\n", s);
|
|
free(s); // stringify
|
|
}
|
|
|
|
void parse_geometry(int t, json_object *j, drawvec &out, int op, const char *fname, int line, json_object *feature) {
|
|
if (j == NULL || j->type != JSON_ARRAY) {
|
|
fprintf(stderr, "%s:%d: expected array for geometry type %d: ", fname, line, t);
|
|
json_context(feature);
|
|
return;
|
|
}
|
|
|
|
int within = geometry_within[t];
|
|
if (within >= 0) {
|
|
size_t i;
|
|
for (i = 0; i < j->value.array.length; i++) {
|
|
if (within == GEOM_POINT) {
|
|
if (i == 0 || mb_geometry[t] == VT_POINT) {
|
|
op = VT_MOVETO;
|
|
} else {
|
|
op = VT_LINETO;
|
|
}
|
|
}
|
|
|
|
parse_geometry(within, j->value.array.array[i], out, op, fname, line, feature);
|
|
}
|
|
} else {
|
|
if (j->value.array.length >= 2 && j->value.array.array[0]->type == JSON_NUMBER && j->value.array.array[1]->type == JSON_NUMBER) {
|
|
long long x, y;
|
|
double lon = j->value.array.array[0]->value.number.number;
|
|
double lat = j->value.array.array[1]->value.number.number;
|
|
projection->project(lon, lat, 32, &x, &y);
|
|
|
|
if (j->value.array.length > 2) {
|
|
static int warned = 0;
|
|
|
|
if (!warned) {
|
|
fprintf(stderr, "%s:%d: ignoring dimensions beyond two: ", fname, line);
|
|
json_context(j);
|
|
fprintf(stderr, "%s:%d: ignoring dimensions beyond two: ", fname, line);
|
|
json_context(feature);
|
|
warned = 1;
|
|
}
|
|
}
|
|
|
|
out.push_back(draw(op, x, y));
|
|
} else {
|
|
fprintf(stderr, "%s:%d: malformed point: ", fname, line);
|
|
json_context(j);
|
|
fprintf(stderr, "%s:%d: malformed point: ", fname, line);
|
|
json_context(feature);
|
|
exit(EXIT_JSON);
|
|
}
|
|
}
|
|
|
|
if (t == GEOM_POLYGON) {
|
|
// Note that this is not using the correct meaning of closepath.
|
|
//
|
|
// We are using it here to close an entire Polygon, to distinguish
|
|
// the Polygons within a MultiPolygon from each other.
|
|
//
|
|
// This will be undone in fix_polygon(), which needs to know which
|
|
// rings come from which Polygons so that it can make the winding order
|
|
// of the outer ring be the opposite of the order of the inner rings.
|
|
|
|
out.push_back(draw(VT_CLOSEPATH, 0, 0));
|
|
}
|
|
}
|
|
|
|
// This is used to convert a JSON attribute value into a serial_val-style
|
|
// type and stringified value. All numeric values, even if they are integers,
|
|
// even integers that are too large to fit in a double but will still be
|
|
// stringified with their original precision, are recorded here as mvt_double.
|
|
serial_val stringify_value(json_object *value, const char *reading, int line, json_object *feature) {
|
|
serial_val sv;
|
|
|
|
if (value != NULL) {
|
|
int vt = value->type;
|
|
|
|
if (vt == JSON_STRING) {
|
|
sv.type = mvt_string;
|
|
sv.s = value->value.string.string;
|
|
|
|
std::string err = check_utf8(sv.s);
|
|
if (err.size() > 0) {
|
|
fprintf(stderr, "%s:%d: %s: ", reading, line, err.c_str());
|
|
json_context(feature);
|
|
exit(EXIT_UTF8);
|
|
}
|
|
} else if (vt == JSON_NUMBER) {
|
|
sv.type = mvt_double;
|
|
|
|
if (value->value.number.large_unsigned != 0) {
|
|
sv.s = std::to_string(value->value.number.large_unsigned);
|
|
} else if (value->value.number.large_signed != 0) {
|
|
sv.s = std::to_string(value->value.number.large_signed);
|
|
} else {
|
|
sv.s = milo::dtoa_milo(value->value.number.number);
|
|
}
|
|
} else if (vt == JSON_TRUE) {
|
|
sv.type = mvt_bool;
|
|
sv.s = "true";
|
|
} else if (vt == JSON_FALSE) {
|
|
sv.type = mvt_bool;
|
|
sv.s = "false";
|
|
} else if (vt == JSON_NULL) {
|
|
sv.type = mvt_null;
|
|
sv.s = "null";
|
|
} else {
|
|
sv.type = mvt_string;
|
|
const char *v = json_stringify(value);
|
|
sv.s = std::string(v);
|
|
free((void *) v); // stringify
|
|
}
|
|
}
|
|
|
|
return sv;
|
|
}
|