Changeset 7072 in josm for trunk/src

Timestamp:

2014-05-07T15:37:35+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9988 - NPE in Geometry.getCentroid()

File:

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

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

@@ -701 +701 @@
             EastNorth n1 = nodes.get((i+1) % nodes.size()).getEastNorth();
 
-            if (n0.isValid() && n1.isValid()) {
+            if (n0 != null && n1 != null && n0.isValid() && n1.isValid()) {
                 BigDecimal x0 = new BigDecimal(n0.east());
                 BigDecimal y0 = new BigDecimal(n0.north());
@@ -727 +727 @@
     /**
      * Compute center of the circle closest to different nodes.
-     * 
+     *
      * Ensure exact center computation in case nodes are already aligned in circle.
      * This is done by least square method.
@@ -788 +788 @@
         return new EastNorth(xC, yC);
     }
-    
+
     /**
      * Returns the coordinate of intersection of segment sp1-sp2 and an altitude