Changeset 16119 in josm for trunk/src/org

Timestamp:

2020-03-14T13:26:33+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18928 - fix various crashes with empty ways

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AlignInLineAction.java (modified) (1 diff)
• actions/OrthogonalizeAction.java (modified) (1 diff)
• actions/ReverseWayAction.java (modified) (3 diffs)
• actions/mapmode/ParallelWayAction.java (modified) (1 diff)
• command/ChangeCommand.java (modified) (3 diffs)
• data/osm/DataSet.java (modified) (1 diff)
• data/osm/DatasetConsistencyTest.java (modified) (1 diff)
• data/osm/IRelation.java (modified) (1 diff)
• data/osm/IWay.java (modified) (1 diff)
• data/osm/visitor/paint/relations/Multipolygon.java (modified) (2 diffs)
• data/validation/tests/MultipolygonTest.java (modified) (1 diff)
• data/validation/tests/UntaggedWay.java (modified) (1 diff)
• data/validation/util/ValUtil.java (modified) (1 diff)
• gui/SelectionManager.java (modified) (1 diff)
• gui/dialogs/relation/actions/SavingAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

@@ -256 +256 @@
             if (w.isClosed())
                 throw new InvalidSelection(tr("Can not align a polygon. Abort."));
-            nodes.addAll(w.getNodes());
-            lines.put(w, new Line(w));
+            if (!w.isEmpty()) {
+                nodes.addAll(w.getNodes());
+                lines.put(w, new Line(w));
+            }
         }
         if (nodes.isEmpty()) {

trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

@@ -200 +200 @@
                 nodeList.add((Node) p);
             } else if (p instanceof Way) {
-                if (!p.isIncomplete()) {
-                    wayDataList.add(new WayData(((Way) p).getNodes()));
+                Way w = (Way) p;
+                if (!w.isIncomplete() && !w.isEmpty()) {
+                    wayDataList.add(new WayData(w.getNodes()));
                 }
             } else {

trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

@@ -117 +117 @@
 
         final Collection<Way> sel = new LinkedHashSet<>(ds.getSelectedWays());
-        sel.removeIf(Way::isIncomplete);
+        sel.removeIf(w -> w.isIncomplete() || w.isEmpty());
         if (sel.isEmpty()) {
             new Notification(
@@ -129 +129 @@
         Collection<Command> c = new LinkedList<>();
         for (Way w : sel) {
-            ReverseWayResult revResult;
             try {
-                revResult = reverseWay(w);
+                c.addAll(reverseWay(w).getCommands());
+            } catch (IllegalArgumentException ex) {
+                Logging.error(ex);
             } catch (UserCancelException ex) {
                 Logging.trace(ex);
                 return;
             }
-            c.addAll(revResult.getCommands());
         }
         UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Reverse Ways"), c));
@@ -145 +145 @@
      * @param w the way
      * @return the reverse command and the tag correction commands
+     * @throws IllegalArgumentException if sanity checks fail
      * @throws UserCancelException if user cancels a reverse warning dialog
      */

trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

@@ -504 +504 @@
             return false;
 
-        sourceWays.removeIf(w -> w.isIncomplete() || w.getNodesCount() == 0);
+        sourceWays.removeIf(w -> w.isIncomplete() || w.isEmpty());
 
         if (!sourceWays.contains(referenceSegment.way)) {

trunk/src/org/openstreetmap/josm/command/ChangeCommand.java

@@ -32 +32 @@
      * @param osm The existing primitive to modify. It must belong to a data set
      * @param newOsm The new primitive
+     * @throws IllegalArgumentException if sanity checks fail
      */
     public ChangeCommand(OsmPrimitive osm, OsmPrimitive newOsm) {
@@ -42 +43 @@
      * @param osm The existing primitive to modify
      * @param newOsm The new primitive
+     * @throws IllegalArgumentException if sanity checks fail
      * @since 11240
      */
@@ -54 +56 @@
         CheckParameterUtil.ensureParameterNotNull(osm, "osm");
         CheckParameterUtil.ensureParameterNotNull(newOsm, "newOsm");
-        if (newOsm instanceof Way && ((Way) newOsm).getNodesCount() == 0) {
+        if (newOsm instanceof Way && ((Way) newOsm).isEmpty()) {
             // Do not allow to create empty ways (see #7465)
             throw new IllegalArgumentException(tr("New way {0} has 0 nodes", newOsm));

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

@@ -1017 +1017 @@
 
     void fireWayNodesChanged(Way way) {
-        if (way.getNodesCount() > 0) {
+        if (!way.isEmpty()) {
             store.reindexWay(way, Way::updatePosition, Relation::updatePosition);
         }

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

@@ -174 +174 @@
         final Stopwatch stopwatch = Stopwatch.createStarted();
         for (Way way : dataSet.getWays()) {
-            if (way.isUsable() && way.getNodesCount() == 0) {
+            if (way.isUsable() && way.isEmpty()) {
                 printError("WARN - ZERO NODES", "Way %s has zero nodes", way);
             } else if (way.isUsable() && way.getNodesCount() == 1) {

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

@@ -22 +22 @@
      */
     int getMembersCount();
+
+    /**
+     * Determines if this relation is empty, i.e. it has no members.
+     * @return {@code true} if this relation is empty, i.e. it has no members
+     * @since 16119
+     */
+    default boolean isEmpty() {
+        return getMembersCount() == 0;
+    }
 
     /**

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

@@ -17 +17 @@
      */
     int getNodesCount();
+
+    /**
+     * Determines if this way is empty, i.e. it has no nodes.
+     * @return {@code true} if this way is empty, i.e. it has no nodes
+     * @since 16119
+     */
+    default boolean isEmpty() {
+        return getNodesCount() == 0;
+    }
 
     /**

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

@@ -424 +424 @@
                     for (Long wayId : wayIds) {
                         Way w = (Way) ds.getPrimitiveById(wayId, OsmPrimitiveType.WAY);
-                        if (w != null && w.getNodesCount() > 0) { // fix #7173 (empty ways on purge)
+                        if (w != null && !w.isEmpty()) { // fix #7173 (empty ways on purge)
                             waysToJoin.add(w);
                         }
@@ -599 +599 @@
                 for (int i = 0; i < joinArray.length && left != 0; ++i) {
                     Way c = joinArray[i];
-                    if (c != null && c.getNodesCount() > 0) {
+                    if (c != null && !c.isEmpty()) {
                         if (nodes == null) {
                             // new ring

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

@@ -93 +93 @@
     @Override
     public void visit(Relation r) {
-        if (r.isMultipolygon() && r.getMembersCount() > 0) {
+        if (r.isMultipolygon() && !r.isEmpty()) {
             List<TestError> tmpErrors = new ArrayList<>(30);
             boolean hasUnexpectedWayRoles = checkMembersAndRoles(r, tmpErrors);

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

@@ -126 +126 @@
         }
 
-        if (w.getNodesCount() == 0) {
+        if (w.isEmpty()) {
             errors.add(TestError.builder(this, Severity.ERROR, EMPTY_WAY)
                     .message(tr("Empty ways"))

trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java

@@ -34 +34 @@
      */
     public static List<List<Way>> getWaysInCell(Way w, Map<Point2D, List<Way>> cellWays) {
-        if (w.getNodesCount() == 0)
+        if (w.isEmpty())
             return Collections.emptyList();
 

trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -391 +391 @@
             // ways
             for (Way w : ds.getWays()) {
-                if (!w.isSelectable() || w.getNodesCount() == 0) {
+                if (!w.isSelectable() || w.isEmpty()) {
                     continue;
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java

@@ -65 +65 @@
         // If the user wanted to create a new relation, but hasn't added any members or
         // tags, don't add an empty relation
-        if (newRelation.getMembersCount() == 0 && !newRelation.hasKeys())
+        if (newRelation.isEmpty() && !newRelation.hasKeys())
             return;
         UndoRedoHandler.getInstance().add(new AddCommand(getLayer().getDataSet(), newRelation));