Changeset 18675 in josm for trunk/src/org

Timestamp:

2023-02-22T19:14:00+01:00 (17 months ago)

Author:

taylor.smock

Message:

Fix #22684: IAE: Parameter 'en1' must not be null in PowerLines.addWaterWaySegments (patch by gaben, modified)

PowerLines.addWaterWaySegments now only adds segments where all nodes have
position data.

This additionally fixes a similar issue caused by inspecting an incomplete
way in InspectPrimitiveDataText. In this case, the centroid is still
calculated, but does not account for how nodes without positional data
will affect the centroid.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/PowerLines.java (modified) (1 diff)
• tools/Geometry.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java

@@ -131 +131 @@
         for (int i = 0; i < w.getNodesCount() - 1; i++) {
             final WaySegment es1 = new WaySegment(w, i);
-            CrossingWays.getSegments(this.cellSegmentsWater, es1.getFirstNode(), es1.getSecondNode()).forEach(list -> list.add(es1));
+            final Node first = es1.getFirstNode();
+            final Node second = es1.getSecondNode();
+
+            if (first.isLatLonKnown() && second.isLatLonKnown()) {
+                CrossingWays.getSegments(this.cellSegmentsWater, first, second).forEach(list -> list.add(es1));
+            }
         }
     }

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

@@ -939 +939 @@
      */
     public static EastNorth getCentroid(List<? extends INode> nodes) {
-        return getCentroidEN(nodes.stream().map(INode::getEastNorth).collect(Collectors.toList()));
+        return getCentroidEN(nodes.stream().filter(INode::isLatLonKnown).map(INode::getEastNorth).collect(Collectors.toList()));
     }
 
@@ -955 +955 @@
         } else if (size == 2) {
             return nodes.get(0).getCenter(nodes.get(1));
+        } else if (size == 0) {
+            return null;
         }