Rename CoordinateSequenceLocation

Author: dr-jts

modules/core/src/main/java/org/locationtech/jts/algorithm/distance/DirectedHausdorffDistance.java

@@ -26,7 +26,7 @@
 import org.locationtech.jts.geom.Location;
 import org.locationtech.jts.geom.Point;
 import org.locationtech.jts.io.WKTWriter;
-import org.locationtech.jts.operation.distance.FacetLocation;
+import org.locationtech.jts.operation.distance.CoordinateSequenceLocation;
 import org.locationtech.jts.operation.distance.IndexedFacetDistance;
 
 /**
@@ -367,8 +367,8 @@ private Coordinate[] computeAtEdges(Geometry geomA, double tolerance, double max
   }
 
   private boolean isSameOrCollinear(DHDSegment seg) {
-    FacetLocation f0 = distanceToB.nearestLocation(seg.p0);
-    FacetLocation f1 = distanceToB.nearestLocation(seg.p1);
+    CoordinateSequenceLocation f0 = distanceToB.nearestLocation(seg.p0);
+    CoordinateSequenceLocation f1 = distanceToB.nearestLocation(seg.p1);
     return f0.isSameSegment(f1);
   }
 
@@ -520,7 +520,7 @@ public TargetDistance(Geometry geom) {
       }
     }
 
-    public FacetLocation nearestLocation(Coordinate p) {
+    public CoordinateSequenceLocation nearestLocation(Coordinate p) {
       return distanceToFacets.nearestLocation(p);
     }
 

…ts/operation/distance/FacetLocation.java …distance/CoordinateSequenceLocation.javamodules/core/src/main/java/org/locationtech/jts/operation/distance/FacetLocation.java renamed to modules/core/src/main/java/org/locationtech/jts/operation/distance/CoordinateSequenceLocation.java modules/core/src/main/java/org/locationtech/jts/operation/distance/FacetLocation.java renamed to modules/core/src/main/java/org/locationtech/jts/operation/distance/CoordinateSequenceLocation.java

@@ -16,31 +16,36 @@
 import org.locationtech.jts.geom.CoordinateSequences;
 
 /**
+ * A location on a {@link FacetSequence}.
  * 
  * Location indexes are always the index of a sequence segment.  
- * This means they are always less than the number of vertices
+ * Thus they are always less than the number of vertices
  * in the sequence. The endpoint in a sequence 
  * has the index of the final segment in the sequence.
- * if the sequence is a ring, the imdex of the final endpoint is
+ * if the sequence is a ring, the index of the final endpoint is
  * normalized to 0.
  * 
  * @author mdavis
  *
  */
-public class FacetLocation {
+public class CoordinateSequenceLocation {
   private CoordinateSequence seq;
   private int index;
   private Coordinate pt;
 
-  public FacetLocation(CoordinateSequence seq, int index, Coordinate pt) {
+  public CoordinateSequenceLocation(CoordinateSequence seq, int index, Coordinate pt) {
     this.seq = seq;
     this.pt = pt;
     this.index = index;
     if (index >= seq.size())
       this.index = seq.size() - 1;
   }
 
-  public boolean isSameSegment(FacetLocation f) {
+  public Coordinate getCoordinate() {
+    return pt;
+  }
+  
+  public boolean isSameSegment(CoordinateSequenceLocation f) {
     if (seq != f.seq)
       return false;
     if (index == f.index)

modules/core/src/main/java/org/locationtech/jts/operation/distance/FacetSequence.java

@@ -152,15 +152,15 @@ else if (isPointOther) {
     return locs;    
   }
 
-  public FacetLocation nearestLocation(Coordinate p)
+  public CoordinateSequenceLocation nearestLocation(Coordinate p)
   {
     if (isPoint()) {
-      return new FacetLocation(pts, 0, pts.getCoordinate(0));
+      return new CoordinateSequenceLocation(pts, 0, pts.getCoordinate(0));
     }
     return nearestLocationOnLine(p);
   }
 
-  private FacetLocation nearestLocationOnLine(Coordinate pt) 
+  private CoordinateSequenceLocation nearestLocationOnLine(Coordinate pt) 
   {
     double minDistance = Double.MAX_VALUE;
     int index = -1;
@@ -187,7 +187,7 @@ private FacetLocation nearestLocationOnLine(Coordinate pt)
           break;
       }
     }
-    return new FacetLocation(pts, index, nearestPt);
+    return new CoordinateSequenceLocation(pts, index, nearestPt);
   }
 
   private static int normalize(CoordinateSequence pts, int index) {

modules/core/src/main/java/org/locationtech/jts/operation/distance/IndexedFacetDistance.java

@@ -139,7 +139,7 @@ public Coordinate[] nearestPoints(Geometry g)
     return fs1.nearestLocations(fs2);
   }
 
-  public FacetLocation nearestLocation(Coordinate p) {
+  public CoordinateSequenceLocation nearestLocation(Coordinate p) {
     CoordinateSequence seq = new CoordinateArraySequence(new Coordinate[] { p });
     FacetSequence fs = new FacetSequence(seq, 0);
     Object nearest = cachedTree.nearestNeighbour(fs.getEnvelope(), fs, FACET_SEQ_DIST);
@@ -161,7 +161,7 @@ public Coordinate nearestPoint(Coordinate p)
     FacetSequence fs = new FacetSequence(seq, 0);
     Object nearest = cachedTree.nearestNeighbour(fs.getEnvelope(), fs, FACET_SEQ_DIST);
     FacetSequence fsN = (FacetSequence) nearest;
-    return fsN.nearestLocations(fs)[0];
+    return fsN.nearestLocation(p).getCoordinate();
   }
 
   /**