Skip to content

Commit

Permalink
Fix EdgeSegmentIntersector deduplication
Browse files Browse the repository at this point in the history
  • Loading branch information
@dr-jts
dr-jts committed May 13, 2024
1 parent c9d6c0e commit 01ebd17
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 26 deletions.
22 changes: 19 additions & 3 deletions ...es/core/src/main/java/org/locationtech/jts/operation/relateng/EdgeSegmentIntersector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@
import org.locationtech.jts.noding.SegmentIntersector;
import org.locationtech.jts.noding.SegmentString;

/**
* Tests segments of {@link RelateSegmentString}s
* and if they intersect adds the intersection(s)
* to the {@link TopologyComputer}.
*
* @author Martin Davis
*
*/
class EdgeSegmentIntersector implements SegmentIntersector
{
private RobustLineIntersector li = new RobustLineIntersector();
Expand Down Expand Up @@ -55,14 +63,22 @@ private void addIntersections(RelateSegmentString ssA, int segIndexA,
Coordinate b1 = ssB.getCoordinate(segIndexB + 1);

li.computeIntersection(a0, a1, b0, b1);

if (! li.hasIntersection())
return;

for (int i = 0; i < li.getIntersectionNum(); i++) {
Coordinate intPt = li.getIntersection(i);
//-- ensure intersections are only added once, for their canonical segments
if (ssA.isAssignedToSegment(segIndexA, intPt)
&& ssB.isAssignedToSegment(segIndexB, intPt)) {
/**
* Ensure endpoint intersections are added once only, for their canonical segments.
* Proper intersections lie on a unique segment so do not need to be checked.
* And it is important that the Containing Segment check not be used,
* since due to intersection computation roundoff,
* it is not reliable in that situation.
*/
if (li.isProper()
|| (ssA.isContainingSegment(segIndexA, intPt)
&& ssB.isContainingSegment(segIndexB, intPt))) {
NodeSection nsa = ssA.createNodeSection(segIndexA, intPt);
NodeSection nsb = ssB.createNodeSection(segIndexB, intPt);
topoComputer.addIntersection(nsa, nsb);
Expand Down
11 changes: 8 additions & 3 deletions modules/core/src/main/java/org/locationtech/jts/operation/relateng/RelateSegmentString.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,20 @@ private Coordinate nextVertex(int segIndex, Coordinate pt) {
}

/**
* Tests if a point lying on a segment has that segment as its
* Tests if a segment intersection point has that segment as its
* canonical containing segment.
* Segments are half-closed, and contain their start point but not the endpoint,
* except for the final segment in a non-closed segment string, which contains
* its endpoint as well.
* This test ensures that vertices are assigned to a unique segment in a segment string.
* In particular, this avoids double-counting intersections which lie exactly
* at segment endpoints.
*
* @param segIndex the segment the point lies on
* @param segIndex the segment the point may lie on
* @param pt the point
* @return true if the segment contains the point
*/
public boolean isAssignedToSegment(int segIndex, Coordinate pt) {
public boolean isContainingSegment(int segIndex, Coordinate pt) {
//-- intersection is at segment start vertex - process it
if (pt.equals2D(getCoordinate(segIndex)))
return true;
Expand Down
51 changes: 31 additions & 20 deletions ...es/core/src/test/java/org/locationtech/jts/operation/relateng/RelateNGRobustnessTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,43 +34,43 @@ public RelateNGRobustnessTest(String name) {
//--------------------------------------------------------

// see https://github.com/libgeos/geos/issues/1033
public void testGEOS1033() {
public void testGEOS_1033() {
checkContainsWithin("POLYGON((1 0,0 4,2 2,1 0))",
"GEOMETRYCOLLECTION(POINT(2 2),POINT(1 0),LINESTRING(1 2,1 1))",
true);
}

// https://github.com/libgeos/geos/issues/1027
public void testGEOS1027() {
public void testGEOS_1027() {
checkCoversCoveredBy("MULTIPOLYGON (((0 0, 3 0, 3 3, 0 3, 0 0)))",
"GEOMETRYCOLLECTION ( LINESTRING (1 2, 1 1), POINT (0 0))",
true);
}

// https://github.com/libgeos/geos/issues/1022
public void testGEOS1022() {
public void testGEOS_1022() {
checkCrosses("GEOMETRYCOLLECTION (POINT (7 1), LINESTRING (6 5, 6 4))",
"POLYGON ((7 1, 1 3, 3 9, 7 1))",
false);
}

// https://github.com/libgeos/geos/issues/1011
public void testGEOS1011() {
public void testGEOS_1011() {
String a = "LINESTRING(75 15,55 43)";
String b = "GEOMETRYCOLLECTION(POLYGON EMPTY,LINESTRING(75 15,55 43))";
checkCoversCoveredBy(a, b, true);
checkEquals(a, b, true);
}

// https://github.com/libgeos/geos/issues/983
public void testGEOS983() {
public void testGEOS_983() {
String a = "POINT(0 0)";
String b = "GEOMETRYCOLLECTION(POINT (1 1), LINESTRING (1 1, 2 2))";
checkIntersectsDisjoint(a, b, false);
}

// https://github.com/libgeos/geos/issues/982
public void testGEOS982() {
public void testGEOS_982() {
String a = "POINT(0 0)";
String b1 = "GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0, 1 0))";
checkContainsWithin(b1, a, false);
Expand All @@ -82,7 +82,7 @@ public void testGEOS982() {
}

// https://github.com/libgeos/geos/issues/981
public void testGEOS981() {
public void testGEOS_981() {
String a = "POINT(0 0)";
String b = "GEOMETRYCOLLECTION(LINESTRING(0 1, 0 0), POINT(0 0))";
checkRelateMatches(b, a, IntersectionMatrixPattern.CONTAINS_PROPERLY, false);
Expand All @@ -94,86 +94,97 @@ public void testGEOS981() {
//--------------------------------------------------------

// https://github.com/libgeos/geos/issues/1053
public void testGEOS1053() {
public void testGEOS_1053() {
String a = "MULTILINESTRING((2 4, 10 10),(15 10,10 5,5 10))";
String b = "MULTILINESTRING((2 4, 10 10))";
checkRelate(a, b, "1F1F00FF2");
}

// https://github.com/libgeos/geos/issues/968
public void testGEOS968() {
public void testGEOS_968() {
String a2 = "LINESTRING(10 0, 0 20)";
String b2 = "POINT (9 2)";
checkCoversCoveredBy(a2, b2, true);

}

public void xtestGEOS_968_2() {
String a = "LINESTRING(1 0, 0 2)";
String b = "POINT (0.9 0.2)";
//-- this case doesn't work due to numeric rounding for Orientation test
//checkCoversCoveredBy(a, b,true);
checkCoversCoveredBy(a, b,true);
}

// https://github.com/libgeos/geos/issues/933
public void testGEOS933() {
public void testGEOS_933() {
String a = "LINESTRING (0 0, 1 1)";
String b = "LINESTRING (0.2 0.2, 0.5 0.5)";
checkCoversCoveredBy(a, b, true);
}

// https://github.com/libgeos/geos/issues/740
public void testGEOS740() {
public void testGEOS_740() {
String a = "POLYGON ((1454700 -331500, 1455100 -330700, 1455466.6191038645 -331281.94727476506, 1455467.8182005754 -331293.26796732045, 1454700 -331500))";
String b = "LINESTRING (1455389.376551584 -331255.3803222172, 1455467.2422460222 -331287.83037053316)";
checkContainsWithin(a, b, false);
}

//--------------------------------------------------------
// Topology robustness problems (TopologyException in old code)
// Robustness failures (TopologyException in old code)
//--------------------------------------------------------

// https://github.com/libgeos/geos/issues/766
public void testGEOS766() {
public void testGEOS_766() {
String a = "POLYGON ((26639.240191093646 6039.3615818717535, 26639.240191093646 5889.361620883223, 28000.000095100608 5889.362081553552, 28000.000095100608 6039.361620882992, 28700.00019021402 6039.361620882992, 28700.00019021402 5889.361822800367, 29899.538842431968 5889.362160452064, 32465.59665091549 5889.362882757903, 32969.2837182586 -1313.697771558439, 31715.832811969216 -1489.87008918589, 31681.039836323587 -1242.3030298361555, 32279.3890331618 -1158.210534269224, 32237.63710287376 -861.1301136466199, 32682.89764107368 -802.0828534499739, 32247.445200905553 5439.292852892075, 31797.06861513178 5439.292852892075, 31797.06861513178 5639.36178850523, 29899.538849750803 5639.361268079038, 26167.69458275995 5639.3602445643955, 26379.03654594742 2617.0293071870683, 26778.062167926924 2644.9318977193907, 26792.01346261031 2445.419086759444, 26193.472956813417 2403.5650586598513, 25939.238114175267 6039.361685403233, 26639.240191093646 6039.3615818717535), (32682.89764107368 -802.0828534499738, 32682.89764107378 -802.0828534499669, 32247.445200905655 5439.292852892082, 32247.445200905553 5439.292852892075, 32682.89764107368 -802.0828534499738))";
String b = "POLYGON ((32450.100392347143 5889.362314133216, 32050.104955691 5891.272957209961, 32100.021071878822 16341.272221116333, 32500.016508656867 16339.361578039587, 32450.100392347143 5889.362314133216))";
checkIntersectsDisjoint(a, b, true);
}

// https://github.com/libgeos/geos/issues/1026
public void testGEOS1026() {
public void testGEOS_1026() {
String a = "POLYGON((335645.7810000004 5677846.65,335648.6579999998 5677845.801999999,335650.8630842535 5677845.143617179,335650.77673334075 5677844.7250704905,335642.90299999993 5677847.498,335645.7810000004 5677846.65))";
String b = "POLYGON((335642.903 5677847.498,335642.894 5677847.459,335645.92 5677846.69,335647.378 5677852.523,335644.403 5677853.285,335644.374 5677853.293,335642.903 5677847.498))";
checkTouches(a, b, false);
}

// https://github.com/libgeos/geos/issues/1069 =- too large to reproduce here

// https://trac.osgeo.org/postgis/ticket/5583 =- too large to reproduce here

// https://github.com/locationtech/jts/issues/1051
public void testJTS1051() {
public void testJTS_1051() {
String a = "POLYGON ((414188.5999999999 6422867.1, 414193.7 6422866.5, 414205.1 6422859.4, 414223.7 6422846.8, 414229.6 6422843.2, 414235.2 6422835.4, 414224.7 6422837.9, 414219.4 6422842.1, 414210.9 6422849, 414199.2 6422857.6, 414191.1 6422863.4, 414188.5999999999 6422867.1))";
String b = "LINESTRING (414187.2 6422831.6, 414179 6422836.1, 414182.2 6422841.8, 414176.7 6422844, 414184.5 6422859.5, 414188.6 6422867.1)";
checkIntersectsDisjoint(a, b, true);
}

// https://trac.osgeo.org/postgis/ticket/5362
public void testPostGIS_5362() {
String a = "POLYGON ((-707259.66 -1121493.36, -707205.9 -1121605.808, -707310.5388 -1121540.5446, -707318.8200000001 -1121533.21, -707259.66 -1121493.36))";
String b = "POLYGON ((-707356.18 -1121550.69, -707332.82 -1121536.63, -707318.82 -1121533.21, -707321.72 -1121535.08, -707327.4 -1121539.21, -707356.18 -1121550.69))";
checkIntersectsDisjoint(a, b, true);
}

//--------------------------------------------------------
// Topological Inconsistency
//--------------------------------------------------------

// https://github.com/libgeos/geos/issues/1064
public void testGEOS1064() {
public void testGEOS_1064() {
String a = "LINESTRING (16.330791631988802 68.75635661578073, 16.332533372319826 68.75496886016562)";
String b = "LINESTRING (16.30641253121884 68.75189557630306, 16.33167771310482 68.75565061843871)";
checkRelate(a, b, "F01FF0102");
}

// https://github.com/locationtech/jts/issues/396
public void testJTS396() {
public void testJTS_396() {
String a = "LINESTRING (1 0, 0 2, 0 0, 2 2)";
String b = "LINESTRING (0 0, 2 2)";
checkRelate(a, b, "101F00FF2");
checkCoversCoveredBy(a, b, true);
}

//https://github.com/locationtech/jts/issues/270
public void testJTS270() {
public void testJTS_270() {
String a = "LINESTRING(0.0 0.0, -10.0 1.2246467991473533E-15)";
String b = "LINESTRING(-9.999143275740073 -0.13089595571333978, -10.0 1.0535676356486768E-13)";
checkRelate(a, b, "FF10F0102");
Expand Down

0 comments on commit 01ebd17

Please sign in to comment.