Skip to content

Commit

Permalink
Fix DistanceOp for empty elements (#1010)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dr-jts
dr-jts authored Oct 31, 2023
1 parent 70817f5 commit 001500a
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 1 deletion.
6 changes: 6 additions & 0 deletions modules/core/src/main/java/org/locationtech/jts/operation/distance/DistanceOp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,12 @@ private void computeMinDistancePoints(List points0, List points1, GeometryLocati
{
for (int i = 0; i < points0.size(); i++) {
Point pt0 = (Point) points0.get(i);
if (pt0.isEmpty())
continue;
for (int j = 0; j < points1.size(); j++) {
Point pt1 = (Point) points1.get(j);
if (pt1.isEmpty())
continue;
double dist = pt0.getCoordinate().distance(pt1.getCoordinate());
if (dist < minDistance) {
minDistance = dist;
Expand All @@ -368,6 +372,8 @@ private void computeMinDistanceLinesPoints(List lines, List points,
LineString line = (LineString) lines.get(i);
for (int j = 0; j < points.size(); j++) {
Point pt = (Point) points.get(j);
if (pt.isEmpty())
continue;
computeMinDistance(line, pt, locGeom);
if (minDistance <= terminateDistance) return;
}
Expand Down
67 changes: 66 additions & 1 deletion modules/tests/src/test/resources/testxml/general/TestDistance.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,62 +6,127 @@
<a> POINT(10 10) </a>
<b> POINT EMPTY </b>
<test><op name="distance" arg1="A" arg2="B"> 0.0 </op></test>
<test><op name="distance" arg1="B" arg2="A"> 0.0 </op></test>
</case>

<case>
<desc>PP - point to point</desc>
<a> POINT(10 10) </a>
<b> POINT (10 0) </b>
<test><op name="distance" arg1="A" arg2="B"> 10.0 </op></test>
<test><op name="distance" arg1="B" arg2="A"> 10.0 </op></test>
</case>

<case>
<desc>PP - point to multipoint</desc>
<a> POINT(10 10) </a>
<b> MULTIPOINT ((10 0), (30 30)) </b>
<test><op name="distance" arg1="A" arg2="B"> 10.0 </op></test>
<test><op name="distance" arg1="B" arg2="A"> 10.0 </op></test>
</case>

<case>
<desc>PP - point to multipoint with empty element</desc>
<a> POINT(10 10) </a>
<b> MULTIPOINT ((10 0), EMPTY) </b>
<test><op name="distance" arg1="A" arg2="B"> 10.0 </op></test>
<test><op name="distance" arg1="B" arg2="A"> 10.0 </op></test>
</case>

<case>
<desc>LL - line to empty line</desc>
<a> LINESTRING (0 0, 0 10) </a>
<b> LINESTRING EMPTY </b>
<test><op name="distance" arg1="A" arg2="B"> 0.0 </op></test>
<test><op name="distance" arg1="B" arg2="A"> 0.0 </op></test>
</case>

<case>
<desc>LL - line to line</desc>
<a> LINESTRING (0 0, 0 10) </a>
<b> LINESTRING (10 0, 10 10) </b>
<test><op name="distance" arg1="A" arg2="B"> 10.0 </op></test>
<test><op name="distance" arg1="B" arg2="A"> 10.0 </op></test>
</case>

<case>
<desc>LL - line to multiline</desc>
<a> LINESTRING (0 0, 0 10) </a>
<b> MULTILINESTRING ((10 0, 10 10), (50 50, 60 60)) </b>
<test><op name="distance" arg1="A" arg2="B"> 10.0 </op></test>
<test><op name="distance" arg1="B" arg2="A"> 10.0 </op></test>
</case>

<case>
<desc>LL - line to multiline with empty element</desc>
<a> LINESTRING (0 0, 0 10) </a>
<b> MULTILINESTRING ((10 0, 10 10), EMPTY) </b>
<test><op name="distance" arg1="A" arg2="B"> 10.0 </op></test>
<test><op name="distance" arg1="B" arg2="A"> 10.0 </op></test>
</case>

<case>
<desc>PA - point to empty polygon</desc>
<a> POINT (240 160) </a>
<b> POLYGON EMPTY </b>
<test><op name="distance" arg1="A" arg2="B" > 0.0 </op></test>
<test><op name="distance" arg1="B" arg2="A" > 0.0 </op></test>
</case>

<case>
<desc>PA - point inside polygon</desc>
<a> POINT (240 160) </a>
<b> POLYGON ((100 260, 340 180, 100 60, 180 160, 100 260)) </b>
<test><op name="distance" arg1="A" arg2="B" > 0.0 </op></test>
<test><op name="distance" arg1="B" arg2="A" > 0.0 </op></test>
</case>

<case>
<desc>LL - crossing linestrings</desc>
<a> LINESTRING (40 300, 280 220, 60 160, 140 60) </a>
<b> LINESTRING (140 360, 260 280, 240 120, 120 160) </b>
<test><op name="distance" arg1="A" arg2="B" > 0.0 </op></test>
<test><op name="distance" arg1="B" arg2="A" > 0.0 </op></test>
</case>

<case>
<desc>AA - overlapping polygons</desc>
<a> POLYGON ((60 260, 260 180, 100 60, 60 160, 60 260)) </a>
<b> POLYGON ((220 280, 120 160, 300 60, 360 220, 220 280)) </b>
<test><op name="distance" arg1="A" arg2="B" > 0.0 </op></test>
<test><op name="distance" arg1="B" arg2="A" > 0.0 </op></test>
</case>

<case>
<desc>AA - disjoint polygons</desc>
<a> POLYGON ((100 320, 60 120, 240 180, 200 260, 100 320)) </a>
<b> POLYGON ((420 320, 280 260, 400 100, 420 320)) </b>
<test><op name="distance" arg1="A" arg2="B" > 71.55417527999327 </op></test>
<test><op name="distance" arg1="B" arg2="A" > 71.55417527999327 </op></test>
</case>

<case>
<desc>mAmA - overlapping multipolygons</desc>
<a> MULTIPOLYGON (((40 240, 160 320, 40 380, 40 240)), ((100 240, 240 60, 40 40, 100 240))) </a>
<b> MULTIPOLYGON (((220 280, 120 160, 300 60, 360 220, 220 280)), ((240 380, 280 300, 420 340, 240 380))) </b>
<test><op name="distance" arg1="A" arg2="B" > 0.0 </op></test>
<test><op name="distance" arg1="B" arg2="A" > 0.0 </op></test>
</case>

<case>
<desc>mAmA - multipolygon with empty component</desc>
<desc>mAmA - multipolygon with empty element</desc>
<a> MULTIPOLYGON (EMPTY, ((98 200, 200 200, 200 99, 98 99, 98 200))) </a>
<b> POLYGON ((300 200, 400 200, 400 100, 300 100, 300 200)) </b>
<test><op name="distance" arg1="A" arg2="B" > 100.0 </op></test>
<test><op name="distance" arg1="B" arg2="A" > 100.0 </op></test>
</case>

<case>
<desc>GCGC - geometry collections with mixed dimensions</desc>
<a> GEOMETRYCOLLECTION (LINESTRING (10 10, 50 10), POINT (90 10)) </a>
<b> GEOMETRYCOLLECTION (POLYGON ((90 20, 60 20, 60 50, 90 50, 90 20)), LINESTRING (10 50, 30 70)) </b>
<test><op name="distance" arg1="A" arg2="B" > 10.0 </op></test>
<test><op name="distance" arg1="B" arg2="A" > 10.0 </op></test>
</case>

</run>

0 comments on commit 001500a

Please sign in to comment.