Fixed issue with GeometryUtils.geometrySegmentList not performing nor…

…malization on geometry, which breaks compatibility with older versions
Urban-Research-Lab · Aug 10, 2024 · 87dbe7c · 87dbe7c
1 parent 0596159
commit 87dbe7c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 
 group 'ru.itmo.idu'
-version '3.8.2'
+version '3.8.3'
 
 repositories {
     maven {

diff --git a/src/main/java/ru/itmo/idu/geometry/GeometryUtils.java b/src/main/java/ru/itmo/idu/geometry/GeometryUtils.java
@@ -428,15 +428,15 @@ public static List<LineSegment> geometrySegmentList(Geometry geometry) {
                 continue;
             }
 
-            Geometry normalized = geometry.norm();
-            if (part instanceof Polygon) {
-                final Polygon polygonPart = (Polygon) part;
+            Geometry normalizedPart = part.norm();
+            if (normalizedPart instanceof Polygon) {
+                final Polygon polygonPart = (Polygon) normalizedPart;
                 segmentList.addAll(coordinateSegmentList(polygonPart.getExteriorRing().getCoordinates()));
                 for (int interiorIdx = 0; interiorIdx < polygonPart.getNumInteriorRing(); ++interiorIdx) {
                     segmentList.addAll(coordinateSegmentList(polygonPart.getInteriorRingN(interiorIdx).getCoordinates()));
                 }
             } else {
-                segmentList.addAll(coordinateSegmentList(part.getCoordinates()));
+                segmentList.addAll(coordinateSegmentList(normalizedPart.getCoordinates()));
             }
 
         }

diff --git a/src/test/java/ru/itmo/idu/geometry/GeometryUtilsTest.java b/src/test/java/ru/itmo/idu/geometry/GeometryUtilsTest.java
@@ -289,4 +289,16 @@ public void testGeometrySegmentList() {
         List<LineSegment> polygonWithHoleList = GeometryUtils.geometrySegmentList(polygonWithHole);
         Assertions.assertEquals(8, polygonWithHoleList.size());
     }
+
+    @Test
+    public void testGeometrySegmentListNormalizes() {
+        Geometry polygon = GeometryUtils.makePolygon(
+                new Coordinate(0.0, 0.0),
+                new Coordinate(1.0, 0.0),
+                new Coordinate(0.5, 0.5)
+        );
+
+        List<LineSegment> segments = GeometryUtils.geometrySegmentList(polygon);
+        Assertions.assertEquals(new LineSegment(0.0, 0.0, 0.5, 0.5), segments.get(0));
+    }
 }