Skip to content

Commit

Permalink
Use SegmentString.getCoordinate where appropriate (#744)
Browse files Browse the repository at this point in the history 
Signed-off-by: Martin Davis <mtnclimb@gmail.com>
  • Loading branch information
@dr-jts
dr-jts committed Jun 17, 2021
1 parent 9ac0c57 commit 9c10c99
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 34 deletions.
10 changes: 5 additions & 5 deletions modules/core/src/main/java/org/locationtech/jts/geomgraph/index/SegmentIntersector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ public void addIntersections(
)
{
if (e0 == e1 && segIndex0 == segIndex1) return;
numTests++;
Coordinate p00 = e0.getCoordinates()[segIndex0];
Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
Coordinate p10 = e1.getCoordinates()[segIndex1];
Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
numTests++;
Coordinate p00 = e0.getCoordinate(segIndex0);
Coordinate p01 = e0.getCoordinate(segIndex0 + 1);
Coordinate p10 = e1.getCoordinate(segIndex1);
Coordinate p11 = e1.getCoordinate(segIndex1 + 1);

li.computeIntersection(p00, p01, p10, p11);
//if (li.hasIntersection() && li.isProper()) Debug.println(li);
Expand Down
8 changes: 4 additions & 4 deletions modules/core/src/main/java/org/locationtech/jts/noding/InteriorIntersectionFinderAdder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ public void processIntersections(
// don't bother intersecting a segment with itself
if (e0 == e1 && segIndex0 == segIndex1) return;

Coordinate p00 = e0.getCoordinates()[segIndex0];
Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
Coordinate p10 = e1.getCoordinates()[segIndex1];
Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
Coordinate p00 = e0.getCoordinate(segIndex0);
Coordinate p01 = e0.getCoordinate(segIndex0 + 1);
Coordinate p10 = e1.getCoordinate(segIndex1);
Coordinate p11 = e1.getCoordinate(segIndex1 + 1);

li.computeIntersection(p00, p01, p10, p11);
//if (li.hasIntersection() && li.isProper()) Debug.println(li);
Expand Down
10 changes: 5 additions & 5 deletions modules/core/src/main/java/org/locationtech/jts/noding/IntersectionAdder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@ public void processIntersections(
)
{
if (e0 == e1 && segIndex0 == segIndex1) return;
numTests++;
Coordinate p00 = e0.getCoordinates()[segIndex0];
Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
Coordinate p10 = e1.getCoordinates()[segIndex1];
Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
numTests++;
Coordinate p00 = e0.getCoordinate(segIndex0);
Coordinate p01 = e0.getCoordinate(segIndex0 + 1);
Coordinate p10 = e1.getCoordinate(segIndex1);
Coordinate p11 = e1.getCoordinate(segIndex1 + 1);

li.computeIntersection(p00, p01, p10, p11);
//if (li.hasIntersection() && li.isProper()) Debug.println(li);
Expand Down
8 changes: 4 additions & 4 deletions modules/core/src/main/java/org/locationtech/jts/noding/IntersectionFinderAdder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ public void processIntersections(
// don't bother intersecting a segment with itself
if (e0 == e1 && segIndex0 == segIndex1) return;

Coordinate p00 = e0.getCoordinates()[segIndex0];
Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
Coordinate p10 = e1.getCoordinates()[segIndex1];
Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
Coordinate p00 = e0.getCoordinate(segIndex0);
Coordinate p01 = e0.getCoordinate(segIndex0 + 1);
Coordinate p10 = e1.getCoordinate(segIndex1);
Coordinate p11 = e1.getCoordinate(segIndex1 + 1);

li.computeIntersection(p00, p01, p10, p11);
//if (li.hasIntersection() && li.isProper()) Debug.println(li);
Expand Down
8 changes: 4 additions & 4 deletions modules/core/src/main/java/org/locationtech/jts/noding/NodingValidator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ private void checkInteriorIntersections(SegmentString e0, int segIndex0, Segment
{
if (e0 == e1 && segIndex0 == segIndex1) return;
//numTests++;
Coordinate p00 = e0.getCoordinates()[segIndex0];
Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
Coordinate p10 = e1.getCoordinates()[segIndex1];
Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
Coordinate p00 = e0.getCoordinate(segIndex0);
Coordinate p01 = e0.getCoordinate(segIndex0 + 1);
Coordinate p10 = e1.getCoordinate(segIndex1);
Coordinate p11 = e1.getCoordinate(segIndex1 + 1);

li.computeIntersection(p00, p01, p10, p11);
if (li.hasIntersection()) {
Expand Down
8 changes: 4 additions & 4 deletions modules/core/src/main/java/org/locationtech/jts/noding/SegmentIntersectionDetector.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,10 @@ public void processIntersections(
// don't bother intersecting a segment with itself
if (e0 == e1 && segIndex0 == segIndex1) return;

Coordinate p00 = e0.getCoordinates()[segIndex0];
Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
Coordinate p10 = e1.getCoordinates()[segIndex1];
Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
Coordinate p00 = e0.getCoordinate(segIndex0);
Coordinate p01 = e0.getCoordinate(segIndex0 + 1);
Coordinate p10 = e1.getCoordinate(segIndex1);
Coordinate p11 = e1.getCoordinate(segIndex1 + 1);

li.computeIntersection(p00, p01, p10, p11);
// if (li.hasIntersection() && li.isProper()) Debug.println(li);
Expand Down
8 changes: 4 additions & 4 deletions modules/core/src/main/java/org/locationtech/jts/noding/snap/SnappingIntersectionAdder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ public void processIntersections(
// don't bother intersecting a segment with itself
if (seg0 == seg1 && segIndex0 == segIndex1) return;

Coordinate p00 = seg0.getCoordinates()[segIndex0];
Coordinate p01 = seg0.getCoordinates()[segIndex0 + 1];
Coordinate p10 = seg1.getCoordinates()[segIndex1];
Coordinate p11 = seg1.getCoordinates()[segIndex1 + 1];
Coordinate p00 = seg0.getCoordinate(segIndex0);
Coordinate p01 = seg0.getCoordinate(segIndex0 + 1);
Coordinate p10 = seg1.getCoordinate(segIndex1);
Coordinate p11 = seg1.getCoordinate(segIndex1 + 1);

/**
* Don't node intersections which are just
Expand Down
8 changes: 4 additions & 4 deletions ...re/src/main/java/org/locationtech/jts/noding/snapround/SnapRoundingIntersectionAdder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ public void processIntersections(
// don't bother intersecting a segment with itself
if (e0 == e1 && segIndex0 == segIndex1) return;

Coordinate p00 = e0.getCoordinates()[segIndex0];
Coordinate p01 = e0.getCoordinates()[segIndex0 + 1];
Coordinate p10 = e1.getCoordinates()[segIndex1];
Coordinate p11 = e1.getCoordinates()[segIndex1 + 1];
Coordinate p00 = e0.getCoordinate(segIndex0);
Coordinate p01 = e0.getCoordinate(segIndex0 + 1);
Coordinate p10 = e1.getCoordinate(segIndex1);
Coordinate p11 = e1.getCoordinate(segIndex1 + 1);

li.computeIntersection(p00, p01, p10, p11);
//if (li.hasIntersection() && li.isProper()) Debug.println(li);
Expand Down

0 comments on commit 9c10c99

Please sign in to comment.