diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-02 08:25:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pass through any non-ASCII characters from file names into layer names

Browse Source 
The Docker build doesn't include proper locale support
This commit is contained in:
Eric Fischer
2018-02-07 13:15:36 -08:00
parent 2b7d64736f
commit 2d625d5807
4 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+4
View File
@@ -1,6 +1,10 @@
## 1.27.7 ## 1.27.7
* Add an option to produce only a single tile * Add an option to produce only a single tile
* Retain non-ASCII characters in layernames generated from filenames
* Remember to close input files after reading them
* Add --coalesce-fraction-as-needed and --coalesce-densest-as-needed
* Report distances in both feet and meters
## 1.27.6 ## 1.27.6
Dockerfile
+1 -1
View File
@@ -16,4 +16,4 @@ RUN make \
&& make install && make install
# Run the tests # Run the tests
CMD LC_ALL=en_US.UTF-8 make test CMD make test
main.cpp
+9 -27
View File
@@ -16,7 +16,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <wctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <sqlite3.h> #include <sqlite3.h>
@@ -31,7 +31,6 @@
#include <set> #include <set>
#include <map> #include <map>
#include <cmath> #include <cmath>
#include <locale.h>
#ifdef __APPLE__ #ifdef __APPLE__
#include <sys/types.h> #include <sys/types.h>
@@ -59,6 +58,7 @@
#include "mvt.hpp" #include "mvt.hpp"
#include "dirtiles.hpp" #include "dirtiles.hpp"
#include "evaluator.hpp" #include "evaluator.hpp"
#include "text.hpp"
static int low_detail = 12; static int low_detail = 12;
static int full_detail = -1; static int full_detail = -1;
@@ -1171,31 +1171,16 @@ int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzo
} }
// Trim out characters that can't be part of selector // Trim out characters that can't be part of selector
wchar_t tmp[trunc.size() + 1]; std::string out;
size_t n = mbstowcs(tmp, trunc.c_str(), trunc.size() + 1); for (size_t p = 0; p < trunc.size(); p++) {
if (n == (size_t) -1) { if (isalpha(trunc[p]) || isdigit(trunc[p]) || trunc[p] == '_' || (trunc[p] & 0x80) != 0) {
perror("charset conversion"); out.append(trunc, p, 1);
exit(EXIT_FAILURE);
}
size_t out = 0;
for (size_t p = 0; p < n; p++) {
if (tmp[p] == L'_' || !(iswcntrl(tmp[p]) || iswspace(tmp[p]) || iswpunct(tmp[p]))) {
tmp[out++] = tmp[p];
} }
} }
tmp[out] = L'\0';
char tmp2[(out + 1) * MB_CUR_MAX]; sources[l].layer = out;
n = wcstombs(tmp2, tmp, (out + 1) * MB_CUR_MAX); if (sources[l].layer.size() == 0 || check_utf8(out).size() != 0) {
if (n == (size_t) -1) { sources[l].layer = "unknown" + std::to_string(l);
perror("charset conversion");
exit(EXIT_FAILURE);
}
sources[l].layer = tmp2;
if (sources[l].layer.size() == 0) {
sources[l].layer = "unknown";
} }
if (!quiet) { if (!quiet) {
@@ -2250,9 +2235,6 @@ int main(int argc, char **argv) {
mtrace(); mtrace();
#endif #endif
setlocale(LC_ALL, "C");
setlocale(LC_CTYPE, "");
init_cpus(); init_cpus();
extern int optind; extern int optind;
tests/nonascii/out/-z0.json
+2 -2
View File
@@ -3,7 +3,7 @@
"center": "0.000000,0.000000,0", "center": "0.000000,0.000000,0",
"description": "tests/nonascii/out/-z0.json.check.mbtiles", "description": "tests/nonascii/out/-z0.json.check.mbtiles",
"format": "pbf", "format": "pbf",
"json": "{\"vector_layers\": [ { \"id\": \"unknown\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 0, \"fields\": {} }, { \"id\": \"堤防\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 0, \"fields\": {} } ],\"tilestats\": {\"layerCount\": 2,\"layers\": [{\"layer\": \"unknown\",\"count\": 1,\"geometry\": \"LineString\",\"attributeCount\": 0,\"attributes\": []},{\"layer\": \"堤防\",\"count\": 1,\"geometry\": \"LineString\",\"attributeCount\": 0,\"attributes\": []}]}}", "json": "{\"vector_layers\": [ { \"id\": \"unknown0\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 0, \"fields\": {} }, { \"id\": \"堤防\", \"description\": \"\", \"minzoom\": 0, \"maxzoom\": 0, \"fields\": {} } ],\"tilestats\": {\"layerCount\": 2,\"layers\": [{\"layer\": \"unknown0\",\"count\": 1,\"geometry\": \"LineString\",\"attributeCount\": 0,\"attributes\": []},{\"layer\": \"堤防\",\"count\": 1,\"geometry\": \"LineString\",\"attributeCount\": 0,\"attributes\": []}]}}",
"maxzoom": "0", "maxzoom": "0",
"minzoom": "0", "minzoom": "0",
"name": "tests/nonascii/out/-z0.json.check.mbtiles", "name": "tests/nonascii/out/-z0.json.check.mbtiles",
@@ -11,7 +11,7 @@
"version": "2" "version": "2"
}, "features": [ }, "features": [
{ "type": "FeatureCollection", "properties": { "zoom": 0, "x": 0, "y": 0 }, "features": [ { "type": "FeatureCollection", "properties": { "zoom": 0, "x": 0, "y": 0 }, "features": [
{ "type": "FeatureCollection", "properties": { "layer": "unknown", "version": 2, "extent": 4096 }, "features": [ { "type": "FeatureCollection", "properties": { "layer": "unknown0", "version": 2, "extent": 4096 }, "features": [
{ "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -77.080078, 38.959409 ], [ 0.000000, 0.000000 ] ] } } { "type": "Feature", "properties": { }, "geometry": { "type": "LineString", "coordinates": [ [ -77.080078, 38.959409 ], [ 0.000000, 0.000000 ] ] } }
] } ] }
, ,