Changeset 4321 in josm for trunk/src/org

Timestamp:

2011-08-19T10:52:06+02:00 (13 years ago)

Author:

bastiK

Message:

applied #6659 - NPE in way length computation (patch by Don-vip)

File:

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

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
@@ -539 +540 @@
         Node lastN = null;
         for (Node n:nodes) {
-            if(lastN != null)
-                length += n.getCoor().greatCircleDistance(lastN.getCoor());
+            if (lastN != null) {
+                LatLon coor = n.getCoor();
+                if (coor != null) {
+                    length += coor.greatCircleDistance(lastN.getCoor());
+                }
+            }
             lastN = n;
         }