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

felt · Dec 20, 2024 · b87d8e4 · b87d8e4
1 parent 632d031
commit b87d8e4
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 33 deletions.
diff --git a/tests/feature-filter/out/filtered.json.standard b/tests/feature-filter/out/filtered.json.standard
@@ -1,6 +1,6 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "-180.000000,0.000000,0.966797,85.051129",
-"bounds": "-180.000000,0.000000,0.966797,85.051129",
+"antimeridian_adjusted_bounds": "-100.019531,0.000000,0.966797,0.966751",
+"bounds": "-100.019531,0.000000,0.966797,0.966751",
 "center": "0.000000,0.000000,0",
 "description": "tests/feature-filter/out/all.mbtiles",
 "format": "pbf",

diff --git a/tests/join-population/joined-i.mbtiles.json b/tests/join-population/joined-i.mbtiles.json
@@ -1,6 +1,6 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "-135.000000,37.881357,-122.280579,40.979898",
-"bounds": "-135.000000,37.881357,-122.280579,40.979898",
+"antimeridian_adjusted_bounds": "-122.309418,37.881357,-122.280579,37.900865",
+"bounds": "-122.309418,37.881357,-122.280579,37.900865",
 "center": "-122.299805,37.892187,12",
 "description": "tests/join-population/tabblock_06001420.mbtiles",
 "format": "pbf",

diff --git a/tests/join-population/joined-no-tile-stats.mbtiles.json b/tests/join-population/joined-no-tile-stats.mbtiles.json
@@ -1,6 +1,6 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
-"bounds": "-135.000000,37.874853,-122.280579,40.979898",
+"antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
+"bounds": "-122.343750,37.874853,-122.280579,37.900865",
 "center": "-122.299805,37.892187,12",
 "description": "tests/join-population/tabblock_06001420.mbtiles",
 "format": "pbf",

diff --git a/tests/join-population/joined-null.mbtiles.json b/tests/join-population/joined-null.mbtiles.json
@@ -1,6 +1,6 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
-"bounds": "-135.000000,37.874853,-122.280579,40.979898",
+"antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
+"bounds": "-122.343750,37.874853,-122.280579,37.900865",
 "center": "-122.299805,37.892187,12",
 "description": "tests/join-population/tabblock_06001420.mbtiles",
 "format": "pbf",

diff --git a/tests/join-population/joined-tile-stats-attributes-limit.mbtiles.json b/tests/join-population/joined-tile-stats-attributes-limit.mbtiles.json
@@ -1,6 +1,6 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
-"bounds": "-135.000000,37.874853,-122.280579,40.979898",
+"antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
+"bounds": "-122.343750,37.874853,-122.280579,37.900865",
 "center": "-122.299805,37.892187,12",
 "description": "tests/join-population/tabblock_06001420.mbtiles",
 "format": "pbf",

diff --git a/tests/join-population/joined-tile-stats-sample-values-limit.mbtiles.json b/tests/join-population/joined-tile-stats-sample-values-limit.mbtiles.json
@@ -1,6 +1,6 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
-"bounds": "-135.000000,37.874853,-122.280579,40.979898",
+"antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
+"bounds": "-122.343750,37.874853,-122.280579,37.900865",
 "center": "-122.299805,37.892187,12",
 "description": "tests/join-population/tabblock_06001420.mbtiles",
 "format": "pbf",

diff --git a/tests/join-population/joined-tile-stats-values-limit.mbtiles.json b/tests/join-population/joined-tile-stats-values-limit.mbtiles.json
@@ -1,6 +1,6 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
-"bounds": "-135.000000,37.874853,-122.280579,40.979898",
+"antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
+"bounds": "-122.343750,37.874853,-122.280579,37.900865",
 "center": "-122.299805,37.892187,12",
 "description": "tests/join-population/tabblock_06001420.mbtiles",
 "format": "pbf",

diff --git a/tests/join-population/joined.mbtiles.json b/tests/join-population/joined.mbtiles.json
@@ -1,6 +1,6 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
-"bounds": "-135.000000,37.874853,-122.280579,40.979898",
+"antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
+"bounds": "-122.343750,37.874853,-122.280579,37.900865",
 "center": "-122.299805,37.892187,12",
 "description": "tests/join-population/tabblock_06001420.mbtiles",
 "format": "pbf",

diff --git a/tests/join-population/merged-folder.mbtiles.json b/tests/join-population/merged-folder.mbtiles.json
@@ -1,6 +1,6 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "-135.000000,37.694688,-122.103424,40.979898",
-"bounds": "-135.000000,37.694688,-122.103424,40.979898",
+"antimeridian_adjusted_bounds": "-122.343750,37.694688,-122.103424,37.900865",
+"bounds": "-122.343750,37.694688,-122.103424,37.900865",
 "center": "-122.299805,37.892187,12",
 "description": "tests/join-population/tabblock_06001420-folder",
 "format": "pbf",

diff --git a/tests/join-population/merged.mbtiles.json b/tests/join-population/merged.mbtiles.json
@@ -1,6 +1,6 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "-135.000000,37.694688,-122.103424,40.979898",
-"bounds": "-135.000000,37.694688,-122.103424,40.979898",
+"antimeridian_adjusted_bounds": "-122.343750,37.694688,-122.103424,37.900865",
+"bounds": "-122.343750,37.694688,-122.103424,37.900865",
 "center": "-122.299805,37.892187,12",
 "description": "tests/join-population/tabblock_06001420.mbtiles",
 "format": "pbf",

diff --git a/tests/join-population/no-macarthur.mbtiles.json b/tests/join-population/no-macarthur.mbtiles.json
@@ -1,6 +1,6 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "-135.000000,37.874853,-122.280579,40.979898",
-"bounds": "-135.000000,37.874853,-122.280579,40.979898",
+"antimeridian_adjusted_bounds": "-122.343750,37.874853,-122.280579,37.900865",
+"bounds": "-122.343750,37.874853,-122.280579,37.900865",
 "center": "-122.299805,37.892187,12",
 "description": "tests/join-population/tabblock_06001420.mbtiles",
 "format": "pbf",

diff --git a/tests/join-population/raw-merged-folder.json b/tests/join-population/raw-merged-folder.json
@@ -1,6 +1,6 @@
 { "type": "FeatureCollection", "properties": {
-"antimeridian_adjusted_bounds": "-135.000000,37.694688,-122.103424,40.979898",
-"bounds": "-135.000000,37.694688,-122.103424,40.979898",
+"antimeridian_adjusted_bounds": "-122.343750,37.694688,-122.103424,37.900865",
+"bounds": "-122.343750,37.694688,-122.103424,37.900865",
 "center": "-122.299805,37.892187,12",
 "description": "tests/join-population/tabblock_06001420.mbtiles",
 "format": "pbf",

diff --git a/tile-join.cpp b/tile-join.cpp
@@ -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) {
-					// pin to the tile extent, since we don't want bounds bigger than the earth
-					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
-					minx = std::min(minx, gx);
-					miny = std::min(miny, gy);
-					maxx = std::max(maxx, gx);
-					maxy = std::max(maxy, gy);
+					if (g.op == mvt_moveto || g.op == mvt_lineto) {
+						// pin to the tile extent, since we don't want bounds bigger than the earth
+						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
+						minx = std::min(minx, gx);
+						miny = std::min(miny, gy);
+						maxx = std::max(maxx, gx);
+						maxy = std::max(maxy, gy);
+					}
 				}
 
 				features_added++;