Changeset 17986 in josm for trunk/src

Timestamp:

2021-07-10T22:12:33+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20994 - OOBE when removing node of highlighted way (patch by Bjoeni)

Location:

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

Files:

• IWaySegment.java (modified) (5 diffs)
• visitor/paint/StyledMapRenderer.java (modified) (1 diff)

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

@@ -23 +23 @@
 
     /**
-     * The way.
+     * Returns the way.
+     * @return the way
      */
     public W getWay() {
@@ -30 +31 @@
 
     /**
-     * The index of the first of the 2 nodes in the way.
+     * Returns the index of the first of the 2 nodes in the way.
+     * @return index of the first of the 2 nodes in the way
      * @see #getUpperIndex()
      * @see #getFirstNode()
@@ -39 +41 @@
 
     /**
-     * The index of the second of the 2 nodes in the way.
+     * Returns the index of the second of the 2 nodes in the way.
+     * @return the index of the second of the 2 nodes in the way
      * @see #getLowerIndex()
      * @see #getSecondNode()
@@ -62 +65 @@
 
     /**
+     * Determines if the segment is usable (node not deleted).
+     * @return {@code true} if the segment is usable
+     * @since 17986
+     */
+    public boolean isUsable() {
+        return getUpperIndex() < way.getNodesCount();
+    }
+
+    /**
      * Returns the first node of the way segment.
      * @return the first node
@@ -79 +91 @@
     /**
      * Determines and returns the way segment for the given way and node pair.
+     * @param <N> type of node
+     * @param <W> type of way
      * @param way way
      * @param first first node

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

@@ -1291 +1291 @@
             MapViewPath highlightSegs = null;
             for (WaySegment ws : highlightWaySegments) {
-                if (ws.getWay() != way || ws.getLowerIndex() < offset) {
+                if (ws.getWay() != way || ws.getLowerIndex() < offset || !ws.isUsable()) {
                     continue;
                 }