format, always orient MVT geom after processing

Author: Maxxen

src/spatial/modules/geos/geos_module.cpp

@@ -327,9 +327,6 @@ struct ST_AsMVTGeom {
 			const auto &blob = geom_data[geom_idx];
 			auto geom = lstate.Deserialize(blob);
 
-			// Orient polygons in place
-			geom.orient_polygons(true);
-
 			// Compute bounds
 			const auto extent = bind_data.extent;
 
@@ -363,10 +360,14 @@ struct ST_AsMVTGeom {
 			const auto transformed = geom.get_transformed(affine_matrix);
 
 			// Snap to grid (round coordinates to integers)
-			const auto snapped = transformed.get_gridded(1.0);
+			auto snapped = transformed.get_gridded(1.0);
 
 			// Should we clip? if not, return the snapped geometry
 			if (!bind_data.clip) {
+
+				// But first orient in place
+				snapped.orient_polygons(true);
+
 				res_data[out_idx] = lstate.Serialize(result, snapped);
 				continue;
 			}
@@ -385,7 +386,10 @@ struct ST_AsMVTGeom {
 			}
 
 			// Snap again to clean up any potential issues from clipping
-			const auto cleaned_clipped = clipped.get_gridded(1.0);
+			auto cleaned_clipped = clipped.get_gridded(1.0);
+
+			// Also orient the polygons in place
+			cleaned_clipped.orient_polygons(true);
 
 			res_data[out_idx] = lstate.Serialize(result, cleaned_clipped);
 		}

src/spatial/modules/mvt/mvt_module.cpp

@@ -609,15 +609,15 @@ class MVTFeatureBuilder {
 					const auto y = CastDouble(cursor.Read<double>());
 					cursor.Skip(vertex_space); // Skip z and m if present
 
-				if (vertex_idx == 0) {
-					geometry.push_back((1 & 0x7) | (1 << 3)); // MoveTo, 1 part
-					geometry.push_back(protozero::encode_zigzag32(x - cursor_x));
-					geometry.push_back(protozero::encode_zigzag32(y - cursor_y));
-					geometry.push_back((2 & 0x7) | ((vertex_count - 1) << 3)); // LineTo, part count
-				} else {
-					geometry.push_back(protozero::encode_zigzag32(x - cursor_x));
-					geometry.push_back(protozero::encode_zigzag32(y - cursor_y));
-				}
+					if (vertex_idx == 0) {
+						geometry.push_back((1 & 0x7) | (1 << 3)); // MoveTo, 1 part
+						geometry.push_back(protozero::encode_zigzag32(x - cursor_x));
+						geometry.push_back(protozero::encode_zigzag32(y - cursor_y));
+						geometry.push_back((2 & 0x7) | ((vertex_count - 1) << 3)); // LineTo, part count
+					} else {
+						geometry.push_back(protozero::encode_zigzag32(x - cursor_x));
+						geometry.push_back(protozero::encode_zigzag32(y - cursor_y));
+					}
 
 					cursor_x = x;
 					cursor_y = y;