Changeset 6007 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-06-15T11:12:46+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8794 - NumberFormatException in Geometry.getCentroid()

File:

• trunk/src/org/openstreetmap/josm/tools/Geometry.java (modified) (1 diff)

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

@@ -651 +651 @@
             EastNorth n1 = nodes.get((i+1) % nodes.size()).getEastNorth();
 
-            BigDecimal x0 = new BigDecimal(n0.east());
-            BigDecimal y0 = new BigDecimal(n0.north());
-            BigDecimal x1 = new BigDecimal(n1.east());
-            BigDecimal y1 = new BigDecimal(n1.north());
-
-            BigDecimal k = x0.multiply(y1, MathContext.DECIMAL128).subtract(y0.multiply(x1, MathContext.DECIMAL128));
-
-            area = area.add(k, MathContext.DECIMAL128);
-            east = east.add(k.multiply(x0.add(x1, MathContext.DECIMAL128), MathContext.DECIMAL128));
-            north = north.add(k.multiply(y0.add(y1, MathContext.DECIMAL128), MathContext.DECIMAL128));
+            if (n0.isValid() && n1.isValid()) {
+                BigDecimal x0 = new BigDecimal(n0.east());
+                BigDecimal y0 = new BigDecimal(n0.north());
+                BigDecimal x1 = new BigDecimal(n1.east());
+                BigDecimal y1 = new BigDecimal(n1.north());
+    
+                BigDecimal k = x0.multiply(y1, MathContext.DECIMAL128).subtract(y0.multiply(x1, MathContext.DECIMAL128));
+    
+                area = area.add(k, MathContext.DECIMAL128);
+                east = east.add(k.multiply(x0.add(x1, MathContext.DECIMAL128), MathContext.DECIMAL128));
+                north = north.add(k.multiply(y0.add(y1, MathContext.DECIMAL128), MathContext.DECIMAL128));
+            }
         }