Improve TestBuilder vertex/segment info

Author: dr-jts

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/geom/FacetLocater.java

@@ -14,7 +14,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Stack;
 import java.util.Vector;
@@ -46,39 +45,38 @@ public class FacetLocater
 	 * @param locations the source collection
 	 * @return a list of the vertex locations, if any
 	 */
-	public static List filterVertexLocations(Collection locations)
+	public static List<GeometryLocation> filterVertexLocations(Collection<GeometryLocation> locations)
 	{
-		ArrayList vertexLocs = new ArrayList();
-		for (Iterator i = locations.iterator(); i.hasNext(); ) {
-			GeometryLocation loc = (GeometryLocation) i.next();
+		ArrayList<GeometryLocation> vertexLocs = new ArrayList<GeometryLocation>();
+		for (GeometryLocation loc : locations) {
 			if (loc.isVertex()) vertexLocs.add(loc);
 		}
 		return vertexLocs;
 	}
 
   private Geometry parentGeom;
-  private List locations = new ArrayList();
+  private List<GeometryLocation> locations = new ArrayList<GeometryLocation>();
   private Coordinate queryPt;
   private double tolerance = 0.0; 
 
   public FacetLocater(Geometry parentGeom) {
     this.parentGeom = parentGeom;
   }
 
-  public List getLocations(Coordinate queryPt, double tolerance)
+  public List<GeometryLocation> getLocations(Coordinate queryPt, double tolerance)
   {
   	this.queryPt = queryPt;
   	this.tolerance = tolerance;
     findLocations(parentGeom, locations);
     return locations;
   }
 
-  private void findLocations(Geometry geom, List locations)
+  private void findLocations(Geometry geom, List<GeometryLocation> locations)
   {
-    findLocations(new Stack(), parentGeom, locations);
+    findLocations(new Stack<Integer>(), parentGeom, locations);
   }
 
-  private void findLocations(Stack path, Geometry geom, List locations)
+  private void findLocations(Stack<Integer> path, Geometry geom, List<GeometryLocation> locations)
   {
   	if (geom instanceof GeometryCollection) {
   		for (int i = 0; i < geom.getNumGeometries(); i++ ) {
@@ -108,7 +106,7 @@ else if (geom instanceof Point) {
   	}
   }
 
-  private void findLocations(Stack path, Polygon poly, List locations)
+  private void findLocations(Stack<Integer> path, Polygon poly, List<GeometryLocation> locations)
   {
 		path.push(0);
 		findLocations(path, 
@@ -125,40 +123,38 @@ private void findLocations(Stack path, Polygon poly, List locations)
 		}
   }
 
-  private void findLocations(Stack path, Geometry compGeom, CoordinateSequence seq, List locations)
+  private void findLocations(Stack<Integer> path, Geometry compGeom, CoordinateSequence seq, List<GeometryLocation> locations)
   {
-  	findVertexLocations(path, compGeom, seq, locations);
-  	findSegmentLocations(path, compGeom, seq, locations);
-  }
-
-  private void findVertexLocations(Stack path, Geometry compGeom, CoordinateSequence seq, List locations)
-  {
-  	for (int i = 0; i < seq.size(); i++) {
-      Coordinate p = seq.getCoordinate(i);
-      double dist = p.distance(queryPt);
-      if (dist <= tolerance) 
-      	locations.add(new GeometryLocation(parentGeom, compGeom, toIntArray(path), i, true, p));
-  	}
-  }
-
-  private void findSegmentLocations(Stack path, Geometry compGeom, CoordinateSequence seq, List locations)
-  {
-  	LineSegment seg = new LineSegment();
-  	for (int i = 0; i < seq.size() - 1; i++) {
+    int lastVertexIndexAdded = -1;
+    Coordinate p0 = seq.getCoordinate(0);
+    if (p0.distance(queryPt) <= tolerance) {
+      locations.add(new GeometryLocation(parentGeom, compGeom, toIntArray(path), 0, true, p0));
+      lastVertexIndexAdded = 0;
+    }
+        
+    LineSegment seg = new LineSegment();
+    for (int i = 0; i < seq.size() - 1; i++) {
       seg.p0 = seq.getCoordinate(i);
       seg.p1 = seq.getCoordinate(i+1);
-      double dist = seg.distance(queryPt);
-      if (dist <= tolerance) 
-      	locations.add(new GeometryLocation(parentGeom, compGeom, toIntArray(path), i, false, seg.p0));
-  	}
+      
+      if (seg.p1.distance(queryPt) <= tolerance) {
+        locations.add(new GeometryLocation(parentGeom, compGeom, toIntArray(path), i+1, true, seg.p1));
+        lastVertexIndexAdded = i+1;
+      }
+      else {
+        //-- to avoid redundancy only add segment location if vertex was NOT added 
+        double dist = seg.distance(queryPt);
+        if (dist <= tolerance && i > lastVertexIndexAdded) 
+          locations.add(new GeometryLocation(parentGeom, compGeom, toIntArray(path), i, false, seg.p0));
+        }
+    }
   }
 
-	public static int[] toIntArray(Vector path)
+	public static int[] toIntArray(Vector<Integer> path)
 	{
 		int[] index = new int[path.size()];
 		int i = 0;
-		for (Iterator it = path.iterator(); it.hasNext(); ) {
-			Integer pathIndex = (Integer) it.next();
+		for (Integer pathIndex : path ) {
 			index[i++] = pathIndex.intValue();
 		}
 		return index;

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/GeometryLocationsWriter.java

@@ -172,26 +172,26 @@ public String writeComponentLocation(Geometry geom, Coordinate p, double toleran
   public String writeFacetLocation(Geometry geom, Coordinate p, double tolerance)
   {
     FacetLocater locater = new FacetLocater(geom);
-    List locs = locater.getLocations(p, tolerance);
-    List vertexLocs = FacetLocater.filterVertexLocations(locs);
+    List<GeometryLocation> locs = locater.getLocations(p, tolerance);
+    /*
+    List<GeometryLocation> vertexLocs = FacetLocater.filterVertexLocations(locs);
     
     // only show vertices if some are present, to avoid confusing with segments
     if (! vertexLocs.isEmpty()) 
       return writeFacetLocations(vertexLocs);
-    
+    */
     // write 'em all
     return writeFacetLocations(locs);
   }
 
-  private String writeFacetLocations(List locs)
+  private String writeFacetLocations(List<GeometryLocation> locs)
   {
     if (locs.size() <= 0) return null;
 
     StringBuffer buf = new StringBuffer();
     boolean isFirst = true;
     int count = 0;
-    for (Iterator i = locs.iterator(); i.hasNext(); ) {
-    	GeometryLocation loc = (GeometryLocation) i.next();
+    for (GeometryLocation loc : locs) {
 
     	if (! isFirst) {
     		buf.append(eol);