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
228 lines
5.1 KiB
C++
228 lines
5.1 KiB
C++
#include "text.hpp"
|
|
#include <stdio.h>
|
|
#include <math.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "milo/dtoa_milo.h"
|
|
#include "milo/milo.h"
|
|
#include "errors.hpp"
|
|
|
|
/**
|
|
* Returns an empty string if `s` is valid utf8;
|
|
* otherwise returns an error message.
|
|
*/
|
|
std::string check_utf8(std::string s) {
|
|
for (size_t i = 0; i < s.size(); i++) {
|
|
size_t fail = 0;
|
|
|
|
if ((s[i] & 0x80) == 0x80) {
|
|
if ((s[i] & 0xE0) == 0xC0) {
|
|
if (i + 1 >= s.size() || (s[i + 1] & 0xC0) != 0x80) {
|
|
fail = 2;
|
|
} else {
|
|
i += 1;
|
|
}
|
|
} else if ((s[i] & 0xF0) == 0xE0) {
|
|
if (i + 2 >= s.size() || (s[i + 1] & 0xC0) != 0x80 || (s[i + 2] & 0xC0) != 0x80) {
|
|
fail = 3;
|
|
} else {
|
|
i += 2;
|
|
}
|
|
} else if ((s[i] & 0xF8) == 0xF0) {
|
|
if (i + 3 >= s.size() || (s[i + 1] & 0xC0) != 0x80 || (s[i + 2] & 0xC0) != 0x80 || (s[i + 3] & 0xC0) != 0x80) {
|
|
fail = 4;
|
|
} else {
|
|
i += 3;
|
|
}
|
|
} else {
|
|
fail = 1;
|
|
}
|
|
}
|
|
|
|
if (fail != 0) {
|
|
std::string out = "\"" + s + "\" is not valid UTF-8 (";
|
|
for (size_t j = 0; j < fail && i + j < s.size(); j++) {
|
|
if (j != 0) {
|
|
out += " ";
|
|
}
|
|
char tmp[6];
|
|
snprintf(tmp, sizeof(tmp), "0x%02X", s[i + j] & 0xFF);
|
|
out += std::string(tmp);
|
|
}
|
|
out += ")";
|
|
return out;
|
|
}
|
|
}
|
|
|
|
return "";
|
|
}
|
|
|
|
const char *utf8_next(const char *s, long *c) {
|
|
if (s == NULL) {
|
|
*c = -1;
|
|
return NULL;
|
|
}
|
|
|
|
if (*s == '\0') {
|
|
*c = -1;
|
|
return NULL;
|
|
}
|
|
|
|
if ((s[0] & 0x80) == 0x80) {
|
|
if ((s[0] & 0xE0) == 0xC0) {
|
|
if ((s[1] & 0xC0) != 0x80) {
|
|
*c = 0xFFFD;
|
|
s++;
|
|
} else {
|
|
*c = ((long) (s[0] & 0x1F) << 6) | ((long) (s[1] & 0x7F));
|
|
s += 2;
|
|
}
|
|
} else if ((s[0] & 0xF0) == 0xE0) {
|
|
if ((s[1] & 0xC0) != 0x80 || (s[2] & 0xC0) != 0x80) {
|
|
*c = 0xFFFD;
|
|
s++;
|
|
} else {
|
|
*c = ((long) (s[0] & 0x0F) << 12) | ((long) (s[1] & 0x7F) << 6) | ((long) (s[2] & 0x7F));
|
|
s += 3;
|
|
}
|
|
} else if ((s[0] & 0xF8) == 0xF0) {
|
|
if ((s[1] & 0xC0) != 0x80 || (s[2] & 0xC0) != 0x80 || (s[3] & 0xC0) != 0x80) {
|
|
*c = 0xFFFD;
|
|
s++;
|
|
} else {
|
|
*c = ((long) (s[0] & 0x0F) << 18) | ((long) (s[1] & 0x7F) << 12) | ((long) (s[2] & 0x7F) << 6) | ((long) (s[3] & 0x7F));
|
|
s += 4;
|
|
}
|
|
} else {
|
|
*c = 0xFFFD;
|
|
s++;
|
|
}
|
|
} else {
|
|
*c = s[0];
|
|
s++;
|
|
}
|
|
|
|
return s;
|
|
}
|
|
|
|
std::string truncate16(std::string const &s, size_t runes) {
|
|
const char *cp = s.c_str();
|
|
const char *start = cp;
|
|
const char *lastgood = cp;
|
|
size_t len = 0;
|
|
long c;
|
|
|
|
while ((cp = utf8_next(cp, &c)) != NULL) {
|
|
if (c <= 0xFFFF) {
|
|
len++;
|
|
} else {
|
|
len += 2;
|
|
}
|
|
|
|
if (len <= runes) {
|
|
lastgood = cp;
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
return std::string(s, 0, lastgood - start);
|
|
}
|
|
|
|
int integer_zoom(std::string where, std::string text) {
|
|
double d = atof(text.c_str());
|
|
if (!std::isfinite(d) || d != floor(d) || d < 0 || d > 32) {
|
|
fprintf(stderr, "%s: Expected integer zoom level in \"tippecanoe\" GeoJSON extension, not %s\n", where.c_str(), text.c_str());
|
|
exit(EXIT_JSON);
|
|
}
|
|
return d;
|
|
}
|
|
|
|
std::string format_commandline(int argc, char **argv) {
|
|
std::string out;
|
|
|
|
for (int i = 0; i < argc; i++) {
|
|
bool need_quote = false;
|
|
for (char *cp = argv[i]; *cp != '\0'; cp++) {
|
|
if (!isalpha(*cp) && !isdigit(*cp) &&
|
|
*cp != '/' && *cp != '-' && *cp != '_' && *cp != '@' && *cp != ':' &&
|
|
*cp != '.' && *cp != '%' && *cp != ',') {
|
|
need_quote = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (need_quote) {
|
|
out.push_back('\'');
|
|
for (char *cp = argv[i]; *cp != '\0'; cp++) {
|
|
if (*cp == '\'') {
|
|
out.append("'\"'\"'");
|
|
} else {
|
|
out.push_back(*cp);
|
|
}
|
|
}
|
|
out.push_back('\'');
|
|
} else {
|
|
out.append(argv[i]);
|
|
}
|
|
|
|
if (i + 1 < argc) {
|
|
out.push_back(' ');
|
|
}
|
|
}
|
|
|
|
return out;
|
|
}
|
|
|
|
// for jsonpull to call from C
|
|
char *dtoa_milo(double val) {
|
|
std::string s = milo::dtoa_milo(val);
|
|
char *dup = strdup(s.c_str());
|
|
if (dup == NULL) {
|
|
perror("strdup");
|
|
exit(EXIT_MEMORY);
|
|
}
|
|
return dup;
|
|
}
|
|
|
|
unsigned long long fnv1a(std::string const &s) {
|
|
// Store tiles by a hash of their contents (fnv1a 64-bit)
|
|
// http://www.isthe.com/chongo/tech/comp/fnv/
|
|
const unsigned long long fnv_offset_basis = 14695981039346656037u;
|
|
const unsigned long long fnv_prime = 1099511628211u;
|
|
unsigned long long h = fnv_offset_basis;
|
|
for (size_t i = 0; i < s.size(); i++) {
|
|
h ^= (unsigned char) s[i];
|
|
h *= fnv_prime;
|
|
}
|
|
return h;
|
|
}
|
|
|
|
// The "additional" is to make it easier to hash a serial_val attribute value and type together
|
|
unsigned long long fnv1a(const char *s, char additional) {
|
|
// http://www.isthe.com/chongo/tech/comp/fnv/
|
|
const unsigned long long fnv_offset_basis = 14695981039346656037u;
|
|
const unsigned long long fnv_prime = 1099511628211u;
|
|
unsigned long long h = fnv_offset_basis;
|
|
for (size_t i = 0; s[i] != '\0'; i++) {
|
|
h ^= (unsigned char) s[i];
|
|
h *= fnv_prime;
|
|
}
|
|
h ^= (unsigned char) additional;
|
|
h *= fnv_prime;
|
|
return h;
|
|
}
|
|
|
|
unsigned long long fnv1a(size_t size, void *p) {
|
|
// http://www.isthe.com/chongo/tech/comp/fnv/
|
|
unsigned char *s = (unsigned char *) p;
|
|
const unsigned long long fnv_offset_basis = 14695981039346656037u;
|
|
const unsigned long long fnv_prime = 1099511628211u;
|
|
unsigned long long h = fnv_offset_basis;
|
|
for (size_t i = 0; i < size; i++) {
|
|
h ^= (unsigned char) s[i];
|
|
h *= fnv_prime;
|
|
}
|
|
return h;
|
|
}
|