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

Timestamp:

2017-04-24T01:13:54+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13665 - handle deleted nodes in way rendering

Location:

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

Files:

• AbstractMapRenderer.java (modified) (1 diff)
• OffsetIterator.java (modified) (2 diffs)

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

@@ -223 +223 @@
     public void visitVirtual(Path2D path, Way w) {
         Iterator<Node> it = w.getNodes().iterator();
-        if (it.hasNext()) {
-            MapViewPoint lastP = mapState.getPointFor(it.next());
-            while (it.hasNext()) {
-                MapViewPoint p = mapState.getPointFor(it.next());
-                if (isSegmentVisible(lastP, p) && isLargeSegment(lastP, p, virtualNodeSpace)) {
+        MapViewPoint lastP = null;
+        while (it.hasNext()) {
+            Node n = it.next();
+            if (n.isLatLonKnown()) {
+                MapViewPoint p = mapState.getPointFor(n);
+                if (lastP != null && isSegmentVisible(lastP, p) && isLargeSegment(lastP, p, virtualNodeSpace)) {
                     double x = (p.getInViewX()+lastP.getInViewX())/2;
                     double y = (p.getInViewY()+lastP.getInViewY())/2;

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

@@ -5 +5 @@
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -42 +43 @@
     public OffsetIterator(MapViewState mapState, List<Node> nodes, double offset) {
         this.mapState = mapState;
-        this.nodes = nodes;
+        this.nodes = nodes.stream().filter(Node::isLatLonKnown).collect(Collectors.toList());
         this.offset = offset;
         idx = 0;