Adding check in closedLoop method to ensure no duplicate locations. (#…

…224) * Adding check in closedLoop method to ensure no duplicate locations. * Updating equals statement.
osmlab · Sep 25, 2018 · e2508ab · e2508ab
1 parent 2b343dc
commit e2508ab
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/main/java/org/openstreetmap/atlas/geography/Polygon.java b/src/main/java/org/openstreetmap/atlas/geography/Polygon.java
@@ -152,7 +152,11 @@ public Location center()
      */
     public Iterable<Location> closedLoop()
     {
-        return new MultiIterable<>(this, Iterables.from(this.first()));
+        if (!this.first().equals(this.last()))
+        {
+            return new MultiIterable<>(this, Iterables.from(this.first()));
+        }
+        return this;
     }
 
     /**

diff --git a/src/test/java/org/openstreetmap/atlas/geography/PolygonTest.java b/src/test/java/org/openstreetmap/atlas/geography/PolygonTest.java
@@ -730,4 +730,17 @@ public void testTriangulate()
             Assert.assertEquals(3, triangle.size());
         }
     }
+
+    @Test
+    public void testClosedLoop()
+    {
+        final Polygon polygon = Polygon.SILICON_VALLEY;
+        final Polygon initialClosedLoop = new Polygon(polygon.closedLoop());
+        Assert.assertNotEquals(
+                "Last and Last - 1 locations for the polygon should not be duplicate.",
+                initialClosedLoop.last(), initialClosedLoop.get(initialClosedLoop.size() - 2));
+        final Polygon doubleClosedLoop = new Polygon(initialClosedLoop.closedLoop());
+        Assert.assertNotEquals("Last and Last - 1 locations for polygon should not be duplicate.",
+                doubleClosedLoop.last(), doubleClosedLoop.get(doubleClosedLoop.size() - 2));
+    }
 }