Only detect longitude wraparound within each ring. (#150)

* Only detect longitude wraparound within each ring. Between rings it's OK to jump around from one side of the world to the other. * Add test * Update changelog
felt · Oct 17, 2023 · e1c665b · e1c665b
1 parent 0ca1408
commit e1c665b
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.35.0
+
+* Fix a bug in --detect-longitude-wraparound when there are multiple rings
+
 # 2.34.1
 
 * Further improvements to tile-join speed

diff --git a/serial.cpp b/serial.cpp
@@ -325,19 +325,24 @@ static long long scale_geometry(struct serialization_state *sst, long long *bbox
 			long long y = geom[i].y;
 
 			if (additional[A_DETECT_WRAPAROUND]) {
-				x += offset;
-				if (has_prev) {
-					if (x - prev > (1LL << 31)) {
-						offset -= 1LL << 32;
-						x -= 1LL << 32;
-					} else if (prev - x > (1LL << 31)) {
-						offset += 1LL << 32;
-						x += 1LL << 32;
+				if (geom[i].op == VT_LINETO) {
+					x += offset;
+					if (has_prev) {
+						if (x - prev > (1LL << 31)) {
+							offset -= 1LL << 32;
+							x -= 1LL << 32;
+						} else if (prev - x > (1LL << 31)) {
+							offset += 1LL << 32;
+							x += 1LL << 32;
+						}
 					}
-				}
 
-				has_prev = true;
-				prev = x;
+					has_prev = true;
+					prev = x;
+				} else {
+					offset = 0;
+					prev = x;
+				}
 			}
 
 			if (x < bbox[0]) {

diff --git a/tests/bathymetry-6000/in.json b/tests/bathymetry-6000/in.json
diff --git a/tests/bathymetry-6000/out/-z0_--detect-longitude-wraparound.json b/tests/bathymetry-6000/out/-z0_--detect-longitude-wraparound.json
diff --git a/version.hpp b/version.hpp
@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VERSION "v2.34.1"
+#define VERSION "v2.35.0"
 
 #endif