Rename isRing flag

locationtech · Dec 4, 2023 · 81fca4c · 81fca4c
1 parent a47fbdd
commit 81fca4c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineString.java b/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineString.java
@@ -34,21 +34,17 @@ class TaggedLineString
   private TaggedLineSegment[] segs;
   private List<LineSegment> resultSegs = new ArrayList<LineSegment>();
   private int minimumSize;
-  private boolean isKeepEndpoint = true;
+  private boolean isRing = true;
 
-  public TaggedLineString(LineString parentLine) {
-    this(parentLine, 2, true);
-  }
-
-  public TaggedLineString(LineString parentLine, int minimumSize, boolean isKeepEndpoint) {
+  public TaggedLineString(LineString parentLine, int minimumSize, boolean isRing) {
     this.parentLine = parentLine;
     this.minimumSize = minimumSize;
-    this.isKeepEndpoint = isKeepEndpoint;
+    this.isRing = isRing;
     init();
   }
 
-  public boolean isKeepEndpoint() {
-    return isKeepEndpoint;
+  public boolean isRing() {
+    return isRing;
   }
 
   public int getMinimumSize()  {    return minimumSize;  }

diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineStringSimplifier.java b/modules/core/src/main/java/org/locationtech/jts/simplify/TaggedLineStringSimplifier.java
@@ -72,7 +72,7 @@ void simplify(TaggedLineString line)
     linePts = line.getParentCoordinates();
     simplifySection(0, linePts.length - 1, 0);
 
-    if (! line.isKeepEndpoint() && CoordinateArrays.isRing(linePts)) {
+    if (line.isRing() && CoordinateArrays.isRing(linePts)) {
       simplifyRingEndpoint();
     }
   }

diff --git a/modules/core/src/main/java/org/locationtech/jts/simplify/TopologyPreservingSimplifier.java b/modules/core/src/main/java/org/locationtech/jts/simplify/TopologyPreservingSimplifier.java
@@ -164,8 +164,8 @@ public void filter(Geometry geom)
         if (line.isEmpty()) return;
 
         int minSize = ((LineString) line).isClosed() ? 4 : 2;
-        boolean isKeepEndpoint = (line instanceof LinearRing) ? false : true;
-        TaggedLineString taggedLine = new TaggedLineString((LineString) line, minSize, isKeepEndpoint);
+        boolean isRing = (line instanceof LinearRing) ? false : true;
+        TaggedLineString taggedLine = new TaggedLineString((LineString) line, minSize, isRing);
         tps.linestringMap.put(line, taggedLine);
       }
     }