Skip to content

Commit 8981019

Browse files
committed
Use new API functions in DistanceFunctions
1 parent 16a47d2 commit 8981019

File tree

1 file changed

+18
-20
lines changed

1 file changed

+18
-20
lines changed

modules/app/src/main/java/org/locationtech/jtstest/function/DistanceFunctions.java

+18-20
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.locationtech.jts.geom.LineString;
1919
import org.locationtech.jts.operation.distance.DistanceOp;
2020
import org.locationtech.jts.operation.distance.IndexedFacetDistance;
21+
import org.locationtech.jtstest.geomfunction.Metadata;
2122

2223
public class DistanceFunctions {
2324
public static double distance(Geometry a, Geometry b) {
@@ -46,44 +47,41 @@ public static Geometry frechetDistanceLine(Geometry a, Geometry b)
4647

4748
public static double hausdorffDistance(Geometry a, Geometry b)
4849
{
49-
DiscreteHausdorffDistance dist = new DiscreteHausdorffDistance(a, b);
50-
return dist.distance();
50+
return DiscreteHausdorffDistance.distance(a, b);
5151
}
5252

53+
@Metadata(description="Hausdorff distance between A and B")
5354
public static Geometry hausdorffDistanceLine(Geometry a, Geometry b)
5455
{
55-
DiscreteHausdorffDistance dist = new DiscreteHausdorffDistance(a, b);
56-
dist.distance();
57-
return a.getFactory().createLineString(dist.getCoordinates());
56+
return DiscreteHausdorffDistance.distanceLine(a, b);
5857
}
5958

60-
public static Geometry hausdorffDistanceLineDensified(Geometry a, Geometry b, double frac)
59+
@Metadata(description="Hausdorff distance between A and B, densified")
60+
public static Geometry hausdorffDistanceLineDensify(Geometry a, Geometry b,
61+
@Metadata(title="Densify fraction")
62+
double frac)
6163
{
62-
DiscreteHausdorffDistance dist = new DiscreteHausdorffDistance(a, b);
63-
dist.setDensifyFraction(frac);
64-
dist.distance();
65-
return a.getFactory().createLineString(dist.getCoordinates());
64+
return DiscreteHausdorffDistance.distanceLine(a, b, frac);
6665
}
6766

67+
@Metadata(description="Oriented Hausdorff distance from A to B")
6868
public static Geometry orientedHausdorffDistanceLine(Geometry a, Geometry b)
6969
{
70-
DiscreteHausdorffDistance dist = new DiscreteHausdorffDistance(a, b);
71-
dist.orientedDistance();
72-
return a.getFactory().createLineString(dist.getCoordinates());
70+
return DiscreteHausdorffDistance.orientedDistanceLine(a, b);
7371
}
7472

73+
@Metadata(description="Oriented Hausdorff distance from A to B")
7574
public static double orientedHausdorffDistance(Geometry a, Geometry b)
7675
{
77-
DiscreteHausdorffDistance dist = new DiscreteHausdorffDistance(a, b);
78-
return dist.orientedDistance();
76+
return DiscreteHausdorffDistance.orientedDistance(a, b);
7977
}
8078

81-
public static Geometry orientedHausdorffDistanceLineDensified(Geometry a, Geometry b, double frac)
79+
@Metadata(description="Oriented Hausdorff distance from A to B, densified")
80+
public static Geometry orientedHausdorffDistanceLineDensify(Geometry a, Geometry b,
81+
@Metadata(title="Densify fraction")
82+
double frac)
8283
{
83-
DiscreteHausdorffDistance dist = new DiscreteHausdorffDistance(a, b);
84-
dist.setDensifyFraction(frac);
85-
dist.orientedDistance();
86-
return a.getFactory().createLineString(dist.getCoordinates());
84+
return DiscreteHausdorffDistance.orientedDistanceLine(a, b, frac);
8785
}
8886

8987
public static double distanceIndexed(Geometry a, Geometry b) {

0 commit comments

Comments
 (0)