mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-04 17:35:42 +02:00
Merge branch 'master' into plugins
This commit is contained in:
@@ -309,6 +309,17 @@ and perhaps
|
|||||||
|
|
||||||
make install
|
make install
|
||||||
|
|
||||||
|
Tippecanoe now requires features from the 2014 C++ standard. If your compiler is older than
|
||||||
|
that, you will need to install a newer one. On MacOS, updating to the lastest XCode should
|
||||||
|
get you a new enough version of `clang++`. On Linux, you should be able to upgrade `g++` with
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
||||||
|
sudo apt-get update -y
|
||||||
|
sudo apt-get install -y g++-5
|
||||||
|
export CXX=g++-5
|
||||||
|
```
|
||||||
|
|
||||||
Examples
|
Examples
|
||||||
------
|
------
|
||||||
|
|
||||||
|
|||||||
+20
-5
@@ -155,17 +155,32 @@ int serialize_geometry(json_object *geometry, json_object *properties, json_obje
|
|||||||
id_value = strtoull(id->string, &err, 10);
|
id_value = strtoull(id->string, &err, 10);
|
||||||
|
|
||||||
if (err != NULL && *err != '\0') {
|
if (err != NULL && *err != '\0') {
|
||||||
fprintf(stderr, "Warning: Can't represent non-integer feature ID %s\n", id->string);
|
static bool warned_frac = false;
|
||||||
|
|
||||||
|
if (!warned_frac) {
|
||||||
|
fprintf(stderr, "Warning: Can't represent non-integer feature ID %s\n", id->string);
|
||||||
|
warned_frac = true;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
has_id = true;
|
has_id = true;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "Warning: Can't represent negative feature ID %s\n", id->string);
|
static bool warned_neg = false;
|
||||||
|
|
||||||
|
if (!warned_neg) {
|
||||||
|
fprintf(stderr, "Warning: Can't represent negative feature ID %s\n", id->string);
|
||||||
|
warned_neg = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
char *s = json_stringify(id);
|
static bool warned_nan = false;
|
||||||
fprintf(stderr, "Warning: Can't represent non-numeric feature ID %s\n", s);
|
|
||||||
free(s); // stringify
|
if (!warned_nan) {
|
||||||
|
char *s = json_stringify(id);
|
||||||
|
fprintf(stderr, "Warning: Can't represent non-numeric feature ID %s\n", s);
|
||||||
|
free(s); // stringify
|
||||||
|
warned_nan = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -369,6 +369,19 @@ and perhaps
|
|||||||
make install
|
make install
|
||||||
.fi
|
.fi
|
||||||
.RE
|
.RE
|
||||||
|
.PP
|
||||||
|
Tippecanoe now requires features from the 2014 C++ standard. If your compiler is older than
|
||||||
|
that, you will need to install a newer one. On MacOS, updating to the lastest XCode should
|
||||||
|
get you a new enough version of \fB\fCclang++\fR\&. On Linux, you should be able to upgrade \fB\fCg++\fR with
|
||||||
|
.PP
|
||||||
|
.RS
|
||||||
|
.nf
|
||||||
|
sudo add\-apt\-repository \-y ppa:ubuntu\-toolchain\-r/test
|
||||||
|
sudo apt\-get update \-y
|
||||||
|
sudo apt\-get install \-y g++\-5
|
||||||
|
export CXX=g++\-5
|
||||||
|
.fi
|
||||||
|
.RE
|
||||||
.SH Examples
|
.SH Examples
|
||||||
.PP
|
.PP
|
||||||
Check out some examples of maps made with tippecanoe \[la]MADE_WITH.md\[ra]
|
Check out some examples of maps made with tippecanoe \[la]MADE_WITH.md\[ra]
|
||||||
|
|||||||
Reference in New Issue
Block a user