Changeset 13805 in josm

Timestamp:

2018-05-21T17:23:10+02:00 (6 years ago)

Author:

Don-vip

Message:

use INode interface in Geometry class

File:

• trunk/src/org/openstreetmap/josm/tools/Geometry.java (modified) (14 diffs)

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -26 +26 @@
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
@@ -252 +253 @@
      * lineP1, lineP2, lineP3.)
      *
+     * @param <N> type of node
      * @param lineP1 first point in path
      * @param lineP2 second point in path
@@ -258 +260 @@
      * @return true if to the right side, false otherwise
      */
-    public static boolean isToTheRightSideOfLine(Node lineP1, Node lineP2, Node lineP3, Node testPoint) {
+    public static <N extends INode> boolean isToTheRightSideOfLine(N lineP1, N lineP2, N lineP3, N testPoint) {
         boolean pathBendToRight = angleIsClockwise(lineP1, lineP2, lineP3);
         boolean rightOfSeg1 = angleIsClockwise(lineP1, lineP2, testPoint);
@@ -271 +273 @@
     /**
      * This method tests if secondNode is clockwise to first node.
+     * @param <N> type of node
      * @param commonNode starting point for both vectors
      * @param firstNode first vector end node
@@ -276 +279 @@
      * @return true if first vector is clockwise before second vector.
      */
-    public static boolean angleIsClockwise(Node commonNode, Node firstNode, Node secondNode) {
+    public static <N extends INode> boolean angleIsClockwise(N commonNode, N firstNode, N secondNode) {
         return angleIsClockwise(commonNode.getEastNorth(), firstNode.getEastNorth(), secondNode.getEastNorth());
     }
@@ -502 +505 @@
      * @since 6841
      */
-    public static Area getArea(List<Node> polygon) {
+    public static Area getArea(List<? extends INode> polygon) {
         Path2D path = new Path2D.Double();
 
         boolean begin = true;
-        for (Node n : polygon) {
+        for (INode n : polygon) {
             EastNorth en = n.getEastNorth();
             if (en != null) {
@@ -568 +571 @@
     /**
      * Tests if two polygons intersect.
+     * @param <N> type of node
      * @param first List of nodes forming first polygon
      * @param second List of nodes forming second polygon
      * @return intersection kind
      */
-    public static PolygonIntersection polygonIntersection(List<Node> first, List<Node> second) {
+    public static <N extends INode> PolygonIntersection polygonIntersection(List<N> first, List<N> second) {
         Area a1 = getArea(first);
         Area a2 = getArea(second);
@@ -616 +620 @@
     /**
      * Tests if point is inside a polygon. The polygon can be self-intersecting. In such case the contains function works in xor-like manner.
+     * @param <N> type of node
      * @param polygonNodes list of nodes from polygon path.
      * @param point the point to test
      * @return true if the point is inside polygon.
      */
-    public static boolean nodeInsidePolygon(Node point, List<Node> polygonNodes) {
+    public static <N extends INode> boolean nodeInsidePolygon(N point, List<N> polygonNodes) {
         if (polygonNodes.size() < 2)
             return false;
 
         //iterate each side of the polygon, start with the last segment
-        Node oldPoint = polygonNodes.get(polygonNodes.size() - 1);
+        N oldPoint = polygonNodes.get(polygonNodes.size() - 1);
 
         if (!oldPoint.isLatLonKnown()) {
@@ -632 +637 @@
 
         boolean inside = false;
-        Node p1, p2;
-
-        for (Node newPoint : polygonNodes) {
+        N p1, p2;
+
+        for (N newPoint : polygonNodes) {
             //skip duplicate points
             if (newPoint.equals(oldPoint)) {
@@ -740 +745 @@
      * @see #isClockwise(Way)
      */
-    public static boolean isClockwise(List<Node> nodes) {
+    public static boolean isClockwise(List<? extends INode> nodes) {
         int nodesCount = nodes.size();
         if (nodesCount < 3 || nodes.get(0) != nodes.get(nodesCount - 1)) {
@@ -748 +753 @@
 
         for (int node = 1; node <= /*sic! consider last-first as well*/ nodesCount; node++) {
-            Node coorPrev = nodes.get(node - 1);
-            Node coorCurr = nodes.get(node % nodesCount);
+            INode coorPrev = nodes.get(node - 1);
+            INode coorCurr = nodes.get(node % nodesCount);
             area2 += coorPrev.lon() * coorCurr.lat();
             area2 -= coorCurr.lon() * coorPrev.lat();
@@ -814 +819 @@
      * @see Geometry#getCenter
      */
-    public static EastNorth getCentroid(List<Node> nodes) {
-        return getCentroidEN(nodes.stream().map(Node::getEastNorth).collect(Collectors.toList()));
+    public static EastNorth getCentroid(List<? extends INode> nodes) {
+        return getCentroidEN(nodes.stream().map(INode::getEastNorth).collect(Collectors.toList()));
     }
 
@@ -884 +889 @@
      * @since 6934
      */
-    public static EastNorth getCenter(List<Node> nodes) {
+    public static EastNorth getCenter(List<? extends INode> nodes) {
         int nc = nodes.size();
         if (nc < 3) return null;
@@ -1034 +1039 @@
      * @return area and perimeter
      */
-    public static AreaAndPerimeter getAreaAndPerimeter(List<Node> nodes) {
+    public static AreaAndPerimeter getAreaAndPerimeter(List<? extends ILatLon> nodes) {
         return getAreaAndPerimeter(nodes, null);
     }