Changeset 6219 in josm for trunk

Timestamp:

2013-09-06T22:33:35+02:00 (11 years ago)

Author:

Don-vip

Message:

fix NoSuchElementException when purging a way member of a multipolygon

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -5 +5 @@
 import java.awt.geom.Path2D.Double;
 import java.awt.geom.PathIterator;
-import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
@@ -297 +296 @@
                     Way w = (Way) ds.getPrimitiveById(wayIds.iterator().next(), OsmPrimitiveType.WAY);
                     nodes.addAll(w.getNodes());
-                } else {
+                } else if (!wayIds.isEmpty()) {
                     List<Way> waysToJoin = new ArrayList<Way>();
                     for (Long wayId : wayIds) {
@@ -305 +304 @@
                         }
                     }
-                    nodes.addAll(joinWays(waysToJoin).iterator().next().getNodes());
+                    if (!waysToJoin.isEmpty()) {
+                        nodes.addAll(joinWays(waysToJoin).iterator().next().getNodes());
+                    }
                 }
                 resetPoly();