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

Timestamp:

2017-07-27T23:24:45+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #10838 - add robustness if incomplete ways are selected

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AlignInLineAction.java (modified) (1 diff)
• CombineWayAction.java (modified) (2 diffs)
• OrthogonalizeAction.java (modified) (1 diff)
• ReverseWayAction.java (modified) (3 diffs)
• SimplifyWayAction.java (modified) (1 diff)

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

@@ -173 +173 @@
         List<Node> selectedNodes = new ArrayList<>(ds.getSelectedNodes());
         List<Way> selectedWays = new ArrayList<>(ds.getSelectedWays());
+        selectedWays.removeIf(OsmPrimitive::isIncomplete);
 
         try {

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

@@ -107 +107 @@
         // remove duplicates, preserving order
         ways = new LinkedHashSet<>(ways);
+        // remove incomplete ways
+        ways.removeIf(OsmPrimitive::isIncomplete);
+        // we need at least two ways
+        if (ways.size() < 2)
+            return null;
 
         List<DataSet> dataSets = ways.stream().map(Way::getDataSet).distinct().collect(Collectors.toList());
@@ -245 +250 @@
         int numWays = 0;
         for (OsmPrimitive osm : selection) {
-            if (osm instanceof Way) {
-                numWays++;
+            if (osm instanceof Way && !osm.isIncomplete() && ++numWays >= 2) {
+                break;
             }
         }

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

@@ -194 +194 @@
                 nodeList.add((Node) p);
             } else if (p instanceof Way) {
-                wayDataList.add(new WayData(((Way) p).getNodes()));
+                if (!p.isIncomplete()) {
+                    wayDataList.add(new WayData(((Way) p).getNodes()));
+                }
             } else {
                 throw new InvalidUserInputException(tr("Selection must consist only of ways and nodes."));

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

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -113 +114 @@
             return;
 
-        final Collection<Way> sel = ds.getSelectedWays();
+        final Collection<Way> sel = new LinkedHashSet<>(ds.getSelectedWays());
+        sel.removeIf(w -> w.isIncomplete());
         if (sel.isEmpty()) {
             new Notification(
@@ -163 +165 @@
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        setEnabled(selection.stream().anyMatch(Way.class::isInstance));
+        setEnabled(selection.stream().anyMatch(o -> o instanceof Way && !o.isIncomplete()));
     }
 }

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

@@ -102 +102 @@
         try {
             List<Way> ways = OsmPrimitive.getFilteredList(ds.getSelected(), Way.class);
+            ways.removeIf(OsmPrimitive::isIncomplete);
             if (ways.isEmpty()) {
                 alertSelectAtLeastOneWay();