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

Fix accidental inclusion of the top left of the tile in the bbox

Browse Source
This commit is contained in:
Erica Fischer
2024-12-20 10:41:53 -08:00
parent 632d031caa
commit b87d8e4560
13 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/feature-filter/out/filtered.json.standard
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-180.000000,0.000000,0.966797,85.051129", "antimeridian_adjusted_bounds": "-100.019531,0.000000,0.966797,0.966751",
"bounds": "-180.000000,0.000000,0.966797,85.051129", "bounds": "-100.019531,0.000000,0.966797,0.966751",
"center": "0.000000,0.000000,0", "center": "0.000000,0.000000,0",
"description": "tests/feature-filter/out/all.mbtiles", "description": "tests/feature-filter/out/all.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/joined-i.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.881357,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-122.309418,37.881357,-122.280579,37.900865",
"bounds": "-135.000000,37.881357,-122.280579,40.979898", "bounds": "-122.309418,37.881357,-122.280579,37.900865",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/joined-no-tile-stats.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
"bounds": "-135.000000,37.874853,-122.280579,40.979898", "bounds": "-122.343750,37.874853,-122.280579,37.900865",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/joined-null.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
"bounds": "-135.000000,37.874853,-122.280579,40.979898", "bounds": "-122.343750,37.874853,-122.280579,37.900865",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/joined-tile-stats-attributes-limit.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
"bounds": "-135.000000,37.874853,-122.280579,40.979898", "bounds": "-122.343750,37.874853,-122.280579,37.900865",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/joined-tile-stats-sample-values-limit.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
"bounds": "-135.000000,37.874853,-122.280579,40.979898", "bounds": "-122.343750,37.874853,-122.280579,37.900865",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/joined-tile-stats-values-limit.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
"bounds": "-135.000000,37.874853,-122.280579,40.979898", "bounds": "-122.343750,37.874853,-122.280579,37.900865",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/joined.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
"bounds": "-135.000000,37.874853,-122.280579,40.979898", "bounds": "-122.343750,37.874853,-122.280579,37.900865",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/merged-folder.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.694688,-122.103424,40.979898", "antimeridian_adjusted_bounds": "-122.343750,37.694688,-122.103424,37.900865",
"bounds": "-135.000000,37.694688,-122.103424,40.979898", "bounds": "-122.343750,37.694688,-122.103424,37.900865",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420-folder", "description": "tests/join-population/tabblock_06001420-folder",
"format": "pbf", "format": "pbf",
tests/join-population/merged.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.694688,-122.103424,40.979898", "antimeridian_adjusted_bounds": "-122.343750,37.694688,-122.103424,37.900865",
"bounds": "-135.000000,37.694688,-122.103424,40.979898", "bounds": "-122.343750,37.694688,-122.103424,37.900865",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/no-macarthur.mbtiles.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898", "antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
"bounds": "-135.000000,37.874853,-122.280579,40.979898", "bounds": "-122.343750,37.874853,-122.280579,37.900865",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tests/join-population/raw-merged-folder.json
+2 -2
View File
@@ -1,6 +1,6 @@
{ "type": "FeatureCollection", "properties": { { "type": "FeatureCollection", "properties": {
"antimeridian_adjusted_bounds": "-135.000000,37.694688,-122.103424,40.979898", "antimeridian_adjusted_bounds": "-122.343750,37.694688,-122.103424,37.900865",
"bounds": "-135.000000,37.694688,-122.103424,40.979898", "bounds": "-122.343750,37.694688,-122.103424,37.900865",
"center": "-122.299805,37.892187,12", "center": "-122.299805,37.892187,12",
"description": "tests/join-population/tabblock_06001420.mbtiles", "description": "tests/join-population/tabblock_06001420.mbtiles",
"format": "pbf", "format": "pbf",
tile-join.cpp
+10 -8
View File
@@ -411,15 +411,17 @@ void append_tile(std::string message, int z, unsigned x, unsigned y, std::map<st
} }
for (auto const &g : outfeature.geometry) { for (auto const &g : outfeature.geometry) {
// pin to the tile extent, since we don't want bounds bigger than the earth if (g.op == mvt_moveto || g.op == mvt_lineto) {
long long gx = std::min((long long) outlayer.extent, std::max(0LL, g.x)); // pin to the tile extent, since we don't want bounds bigger than the earth
long long gy = std::min((long long) outlayer.extent, std::max(0LL, g.y)); long long gx = std::min((long long) outlayer.extent, std::max(0LL, g.x));
long long gy = std::min((long long) outlayer.extent, std::max(0LL, g.y));
// initially keep bounds in tile coordinates // initially keep bounds in tile coordinates
minx = std::min(minx, gx); minx = std::min(minx, gx);
miny = std::min(miny, gy); miny = std::min(miny, gy);
maxx = std::max(maxx, gx); maxx = std::max(maxx, gx);
maxy = std::max(maxy, gy); maxy = std::max(maxy, gy);
}
} }
features_added++; features_added++;