mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-02 08:25: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
140 lines
3.3 KiB
C++
140 lines
3.3 KiB
C++
#include <stdlib.h>
|
|
#include <algorithm>
|
|
#include "geocsv.hpp"
|
|
#include "mvt.hpp"
|
|
#include "serial.hpp"
|
|
#include "projection.hpp"
|
|
#include "main.hpp"
|
|
#include "text.hpp"
|
|
#include "csv.hpp"
|
|
#include "milo/dtoa_milo.h"
|
|
#include "options.hpp"
|
|
#include "errors.hpp"
|
|
|
|
void parse_geocsv(std::vector<struct serialization_state> &sst, std::string fname, int layer, std::string layername) {
|
|
FILE *f;
|
|
|
|
if (fname.size() == 0) {
|
|
f = stdin;
|
|
} else {
|
|
f = fopen(fname.c_str(), "r");
|
|
if (f == NULL) {
|
|
perror(fname.c_str());
|
|
exit(EXIT_OPEN);
|
|
}
|
|
}
|
|
|
|
std::string s;
|
|
std::vector<std::string> header;
|
|
ssize_t latcol = -1, loncol = -1;
|
|
|
|
if ((s = csv_getline(f)).size() > 0) {
|
|
std::string err = check_utf8(s);
|
|
if (err != "") {
|
|
fprintf(stderr, "%s: %s\n", fname.c_str(), err.c_str());
|
|
exit(EXIT_UTF8);
|
|
}
|
|
|
|
header = csv_split(s.c_str());
|
|
|
|
for (size_t i = 0; i < header.size(); i++) {
|
|
header[i] = csv_dequote(header[i]);
|
|
|
|
std::string lower(header[i]);
|
|
std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
|
|
|
|
if (lower == "y" || lower == "lat" || (lower.find("latitude") != std::string::npos)) {
|
|
latcol = i;
|
|
}
|
|
if (lower == "x" || lower == "lon" || lower == "lng" || lower == "long" || (lower.find("longitude") != std::string::npos)) {
|
|
loncol = i;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (latcol < 0 || loncol < 0) {
|
|
fprintf(stderr, "%s: Can't find \"lat\" and \"lon\" columns\n", fname.c_str());
|
|
exit(EXIT_CSV);
|
|
}
|
|
|
|
size_t seq = 0;
|
|
while ((s = csv_getline(f)).size() > 0) {
|
|
std::string err = check_utf8(s);
|
|
if (err != "") {
|
|
fprintf(stderr, "%s: %s\n", fname.c_str(), err.c_str());
|
|
exit(EXIT_UTF8);
|
|
}
|
|
|
|
seq++;
|
|
std::vector<std::string> line = csv_split(s.c_str());
|
|
|
|
if (line.size() != header.size()) {
|
|
fprintf(stderr, "%s:%zu: Mismatched column count: %zu in line, %zu in header\n", fname.c_str(), seq + 1, line.size(), header.size());
|
|
exit(EXIT_CSV);
|
|
}
|
|
|
|
if (line[loncol].empty() || line[latcol].empty()) {
|
|
static int warned = 0;
|
|
if (!warned) {
|
|
fprintf(stderr, "%s:%zu: null geometry (additional not reported)\n", fname.c_str(), seq + 1);
|
|
warned = 1;
|
|
}
|
|
continue;
|
|
}
|
|
double lon = atof(line[loncol].c_str());
|
|
double lat = atof(line[latcol].c_str());
|
|
|
|
long long x, y;
|
|
projection->project(lon, lat, 32, &x, &y);
|
|
drawvec dv;
|
|
dv.push_back(draw(VT_MOVETO, x, y));
|
|
|
|
std::vector<std::string> full_keys;
|
|
std::vector<serial_val> full_values;
|
|
|
|
for (size_t i = 0; i < line.size(); i++) {
|
|
if (i != (size_t) latcol && i != (size_t) loncol) {
|
|
line[i] = csv_dequote(line[i]);
|
|
|
|
serial_val sv;
|
|
if (is_number(line[i])) {
|
|
sv.type = mvt_double;
|
|
} else if (line[i].size() == 0 && prevent[P_EMPTY_CSV_COLUMNS]) {
|
|
sv.type = mvt_null;
|
|
line[i] = "null";
|
|
} else {
|
|
sv.type = mvt_string;
|
|
}
|
|
sv.s = line[i];
|
|
|
|
full_keys.push_back(header[i]);
|
|
full_values.push_back(sv);
|
|
}
|
|
}
|
|
|
|
serial_feature sf;
|
|
|
|
sf.layer = layer;
|
|
sf.segment = sst[0].segment;
|
|
sf.has_id = false;
|
|
sf.id = 0;
|
|
sf.tippecanoe_minzoom = -1;
|
|
sf.tippecanoe_maxzoom = -1;
|
|
sf.feature_minzoom = false;
|
|
sf.seq = *(sst[0].layer_seq);
|
|
sf.geometry = dv;
|
|
sf.t = 1; // POINT
|
|
sf.full_keys = full_keys;
|
|
sf.full_values = full_values;
|
|
|
|
serialize_feature(&sst[0], sf, layername);
|
|
}
|
|
|
|
if (fname.size() != 0) {
|
|
if (fclose(f) != 0) {
|
|
perror("fclose");
|
|
exit(EXIT_CLOSE);
|
|
}
|
|
}
|
|
}
|