Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java (revision 34931) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java (revision 34932) @@ -40,4 +40,16 @@ } + private static void filteredAdd(Collection collection, T element) { + if (!element.isDisabled()) { + collection.add(element); + } + } + + private static void filteredAddAll(Collection out, Collection in) { + for (T element: in) { + filteredAdd(out, element); + } + } + /** * Find the neighbours of node n on the way w and put them in given collection @@ -56,17 +68,17 @@ // add previous element if (idx > 0) { - nodes.add(nodeList.get(idx - 1)); + filteredAdd(nodes, nodeList.get(idx - 1)); } // add next element if (idx < nodeList.size() - 1) { - nodes.add(nodeList.get(idx + 1)); + filteredAdd(nodes, nodeList.get(idx + 1)); } if (w.isClosed()) { // cyclic neighbours detection if (idx == 0) { - nodes.add(nodeList.get(nodeList.size() - 2)); + filteredAdd(nodes, nodeList.get(nodeList.size() - 2)); } if (idx == nodeList.size() - 1) { - nodes.add(nodeList.get(1)); + filteredAdd(nodes, nodeList.get(1)); } } @@ -84,5 +96,5 @@ boolean flag = ways.contains(w); for (Node n: nodes) { - ways.addAll(n.getParentWays()); + filteredAddAll(ways, n.getParentWays()); } if (!flag) ways.remove(w); @@ -98,5 +110,5 @@ static int addWaysConnectedToNode(Node n, Set ways) { int s = ways.size(); - ways.addAll(n.getParentWays()); + filteredAddAll(ways, n.getParentWays()); return ways.size() - s; } @@ -107,4 +119,5 @@ * @param w way to check intersections * @param newWays set to place the ways we found + * @param excludeWays set of excluded ways * @return number of ways possibly added added to newWays */ @@ -113,4 +126,5 @@ int count = 0; for (Way anyway: ways) { + if (anyway.isDisabled()) continue; if (Objects.equals(anyway, w)) continue; if (newWays.contains(anyway) || excludeWays.contains(anyway)) continue; @@ -133,23 +147,6 @@ static int addWaysIntersectingWay(Collection ways, Way w, Set newWays) { - List> nodePairs = w.getNodePairs(false); - int count = 0; - for (Way anyway: ways) { - if (Objects.equals(anyway, w)) continue; - if (newWays.contains(anyway)) continue; - List> nodePairs2 = anyway.getNodePairs(false); - loop: for (Pair p1 : nodePairs) { - for (Pair p2 : nodePairs2) { - if (null != Geometry.getSegmentSegmentIntersection( - p1.a.getEastNorth(), p1.b.getEastNorth(), - p2.a.getEastNorth(), p2.b.getEastNorth())) { - newWays.add(anyway); - count++; - break loop; - } - } - } - } - return count; + Set excludeWays = new HashSet(); + return addWaysIntersectingWay(ways, w, newWays, excludeWays); } @@ -162,7 +159,10 @@ */ public static int addWaysIntersectingWays(Collection allWays, Collection initWays, Set newWays) { + // performance improvement - filter everything ahead of time + Set filteredWays = new HashSet<>(); + filteredAddAll(filteredWays, allWays); int count = 0; for (Way w : initWays) { - count += addWaysIntersectingWay(allWays, w, newWays); + count += addWaysIntersectingWay(filteredWays, w, newWays); } return count; @@ -196,4 +196,8 @@ newWays.addAll(initWays); Set newFoundWays; + // performance improvement - apply filters ahead of time + Set filteredWays = new HashSet<>(); + filteredAddAll(filteredWays, allWays); + filteredWays.removeAll(initWays); int level = 0, c; @@ -202,5 +206,5 @@ newFoundWays = new HashSet<>(); for (Way w : foundWays) { - c += addWaysIntersectingWay(allWays, w, newFoundWays, newWays); + c += addWaysIntersectingWay(filteredWays, w, newFoundWays); } foundWays = newFoundWays; @@ -213,5 +217,11 @@ return; } - } while (c > 0 && level < maxLevel); + if (level >= maxLevel) { + new Notification( + tr("Reached max recursion depth: {0}", level) + ).setIcon(JOptionPane.WARNING_MESSAGE).show(); + return; + } + } while (c > 0); } @@ -233,5 +243,11 @@ return; } - } while (c > 0 && level < maxLevel); + if (level >= maxLevel) { + new Notification( + tr("Reached max recursion depth: {0}", level) + ).setIcon(JOptionPane.WARNING_MESSAGE).show(); + return; + } + } while (c > 0); } @@ -256,14 +272,14 @@ if ((i2-i1)*2 <= n) { // i1 ... i2 for (int i = i1+1; i != i2; i++) { - newNodes.add(nodes.get(i)); + filteredAdd(newNodes, nodes.get(i)); } } else { // i2 ... n-1 0 1 ... i1 for (int i = i2+1; i != i1; i = (i+1) % n) { - newNodes.add(nodes.get(i)); + filteredAdd(newNodes, nodes.get(i)); } } } else { for (int i = i1+1; i < i2; i++) { - newNodes.add(nodes.get(i)); + filteredAdd(newNodes, nodes.get(i)); } } @@ -331,5 +347,5 @@ //we came to starting way, but not not the right end if (Objects.equals(otherEnd, firstWay.firstNode())) return false; - newWays.addAll(newestWays); + filteredAddAll(newWays, newestWays); return true; // correct loop found } @@ -362,4 +378,5 @@ //if (Geometry.nodeInsidePolygon(n, polyNodes)) { if (NodeWayUtils.isPointInsidePolygon(n.getEastNorth(), polyPoints)) { + // can't filter nodes here, would prevent selecting ways that have filtered nodes newestNodes.add(n); } @@ -369,5 +386,5 @@ for (Way w : searchWays) { if (newestNodes.containsAll(w.getNodes())) { - newestWays.add(w); + filteredAdd(newestWays, w); } } @@ -377,6 +394,6 @@ } - newNodes.addAll(newestNodes); - newWays.addAll(newestWays); + filteredAddAll(newNodes, newestNodes); + newWays.addAll(newestWays); // already filtered } @@ -392,4 +409,5 @@ //if (Geometry.nodeInsidePolygon(n, polyNodes)) { if (NodeWayUtils.isPointInsidePolygon(n.getEastNorth(), polyPoints)) { + // can't filter nodes here, would prevent selecting ways that have filtered nodes newestNodes.add(n); } @@ -399,10 +417,10 @@ for (Way w : searchWays) { if (newestNodes.containsAll(w.getNodes())) { - newestWays.add(w); - } - } - - newNodes.addAll(newestNodes); - newWays.addAll(newestWays); + filteredAdd(newestWays, w); + } + } + + filteredAddAll(newNodes, newestNodes); + newWays.addAll(newestWays); // already filtered } Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java (revision 34931) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java (revision 34932) @@ -65,5 +65,5 @@ Node node = nodeQueue.remove(); for (Way p : node.getParentWays()) { - if (!newWays.contains(p) && p.hasKey(key) && p.get(key).equals(value)) { + if (!p.isDisabled() && !newWays.contains(p) && p.hasKey(key) && p.get(key).equals(value)) { newWays.add(p); nodeQueue.add(p.firstNode().equals(node) ? p.lastNode() : p.firstNode()); Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java (revision 34931) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java (revision 34932) @@ -60,5 +60,6 @@ nodes.clear(); for (OsmPrimitive p : pp) { // find all affected ways - if (p instanceof Node && !p.isDeleted()) nodes.add((Node) p); + if (p instanceof Node && !p.isDeleted() && !p.isDisabled()) + nodes.add((Node) p); } if (!nodes.isEmpty() && !ds.getSelectedNodes().containsAll(nodes)) { Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java (revision 34931) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java (revision 34932) @@ -60,5 +60,6 @@ for (OsmPrimitive p : pp) { // find all affected ways - if (p instanceof Way && !p.isDeleted()) ways.add((Way) p); + if (p instanceof Way && !p.isDeleted() && !p.isDisabled()) + ways.add((Way) p); } if (!ways.isEmpty() && !ds.getSelectedWays().containsAll(ways)) { Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java (revision 34931) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java (revision 34932) @@ -68,5 +68,5 @@ selectedNodes = new ArrayList<>(); } - selectedNodes.add(n); + if (!n.isDisabled()) selectedNodes.add(n); } } Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java (revision 34931) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java (revision 34932) @@ -58,5 +58,5 @@ newSel.clear(); newSel.addAll(histsel); - newSel.removeIf(p -> p == null || p.isDeleted()); + newSel.removeIf(p -> p == null || p.isDeleted() || p.isDisabled()); k++; if (!newSel.isEmpty()) {