Changeset 7828 in josm for trunk/src/org/openstreetmap/josm/tools/Geometry.java

Timestamp:

2014-12-19T01:52:29+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10855 - fix NPE - better handling of nodes without coordinates

File:

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

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

@@ -314 +314 @@
     /**
      * Finds the intersection of two lines of infinite length.
-     * 
+     *
      * @param p1 first point on first line
      * @param p2 second point on first line
@@ -328 +328 @@
         CheckParameterUtil.ensureValidCoordinates(p3, "p3");
         CheckParameterUtil.ensureValidCoordinates(p4, "p4");
-        
+
         if (!p1.isValid()) throw new IllegalArgumentException();
 
@@ -575 +575 @@
         Node oldPoint = polygonNodes.get(polygonNodes.size() - 1);
 
+        if (!oldPoint.isLatLonKnown()) {
+            return false;
+        }
+
         for (Node newPoint : polygonNodes) {
             //skip duplicate points
             if (newPoint.equals(oldPoint)) {
                 continue;
+            }
+
+            if (!newPoint.isLatLonKnown()) {
+                return false;
             }
 
@@ -733 +741 @@
             result -= 2 * Math.PI;
         }
-        
+
         return result;
     }