Changeset 6580 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2013-12-31T14:35:34+01:00 (10 years ago)

Author:

simon04

Message:

see #6536 - Refactor crossing way test in order to decrease memory footprint

Drop data structure ExtendedSegment and obtain needed values on demand
from the way tags.

File:

• trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/WaySegment.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
+
+import java.awt.geom.Line2D;
 
 /**
@@ -63 +65 @@
         return equals(o) ? 0 : toWay().compareTo(o.toWay());
     }
+
+    /**
+     * Checks whether this segment crosses other segment
+     *
+     * @param s2 The other segment
+     * @return true if both segments crosses
+     */
+    public boolean intersects(WaySegment s2) {
+        if (getFirstNode().equals(s2.getFirstNode()) || getSecondNode().equals(s2.getSecondNode()) ||
+                getFirstNode().equals(s2.getSecondNode()) || getSecondNode().equals(s2.getFirstNode()))
+            return false;
+
+        return Line2D.linesIntersect(
+                getFirstNode().getEastNorth().east(), getFirstNode().getEastNorth().north(),
+                getSecondNode().getEastNorth().east(), getSecondNode().getEastNorth().north(),
+                s2.getFirstNode().getEastNorth().east(), s2.getFirstNode().getEastNorth().north(),
+                s2.getSecondNode().getEastNorth().east(), s2.getSecondNode().getEastNorth().north());
+    }
 }