Changeset 12876 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2017-09-19T15:04:04+02:00 (7 years ago)

Author:

bastiK

Message:

fixed #15315 - NPE in eastNorth

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• Way.java (modified) (2 diffs)
• visitor/paint/StyledMapRenderer.java (modified) (1 diff)

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

@@ -667 +667 @@
         return false;
     }
+    
+    /**
+     * Replies true if all nodes of the way are drawable, false otherwise.
+     * @return true if all nodes of the way are drawable, false otherwise.
+     * @since 12876
+     */
+    public boolean hasOnlyDrawableNodes() {
+        Node[] nodes = this.nodes;
+        for (Node node : nodes) {
+            if (!node.isDrawable())
+                return false;
+        }
+        return true;
+    }
 
     @Override
@@ -675 +689 @@
     @Override
     public boolean isDrawable() {
-        return super.isDrawable() && !hasIncompleteNodes();
+        return super.isDrawable() && hasOnlyDrawableNodes();
     }
 

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

@@ -1662 +1662 @@
         try {
             record.paintPrimitive(paintSettings, this);
-        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
+        } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException | NullPointerException e) {
             throw BugReport.intercept(e).put("record", record);
         }