Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 3589) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 3590) @@ -16,6 +16,6 @@ import java.util.Collections; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedList; +import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -203,5 +203,5 @@ virtualWays.size()); Main.main.undoRedo.add(new SequenceCommand(text, virtualCmds)); - getCurrentDataSet().setSelected(Collections.singleton((OsmPrimitive)virtualNode)); + selectPrims(Collections.singleton((OsmPrimitive)virtualNode), false, false, false, false); virtualWays.clear(); virtualNode = null; @@ -269,44 +269,31 @@ } - private Collection getNearestCollectionVirtual(Point p) { + private Collection getNearestCollectionVirtual(Point p, boolean allSegements) { + MapView c = Main.map.mapView; int snapDistance = Main.pref.getInteger("mappaint.node.virtual-snap-distance", 8); - int virtualSpace = Main.pref.getInteger("mappaint.node.virtual-space", 70); snapDistance *= snapDistance; - - MapView c = Main.map.mapView; - Collection sel = getCurrentDataSet().getSelected(); - - // take nearest node OsmPrimitive osm = c.getNearestNode(p, OsmPrimitive.isSelectablePredicate); - - if (osm != null) { - for (Node n : c.getNearestNodes(p, OsmPrimitive.isSelectablePredicate)) { - if (sel.contains(n)) { - // take nearest selected node - osm = n; - break; - } - } - } else { - Node virtualWayNode = null; - Way w = null; - - Collection virtualWaysInSel = new ArrayList(); - Collection wss = c.getNearestWaySegments(p, OsmPrimitive.isSelectablePredicate); - for(WaySegment nearestWS : wss) { + virtualWays.clear(); + virtualNode = null; + Node virtualWayNode = null; + + if (osm == null) + { + Collection nearestWaySegs = allSegements + ? c.getNearestWaySegments(p, OsmPrimitive.isSelectablePredicate) + : Collections.singleton(c.getNearestWaySegment(p, OsmPrimitive.isSelectablePredicate)); + + for(WaySegment nearestWS : nearestWaySegs) { if (nearestWS == null) { continue; } - w = nearestWS.way; - if (osm == null && sel.contains(w)) { - // take nearest selected way - osm = w; - } - - if (Main.pref.getInteger("mappaint.node.virtual-size", 8) > 0) { + osm = nearestWS.way; + if(Main.pref.getInteger("mappaint.node.virtual-size", 8) > 0) + { + Way w = (Way)osm; Point p1 = c.getPoint(w.getNode(nearestWS.lowerIndex)); Point p2 = c.getPoint(w.getNode(nearestWS.lowerIndex+1)); - if(SimplePaintVisitor.isLargeSegment(p1, p2, virtualSpace)) + if(SimplePaintVisitor.isLargeSegment(p1, p2, Main.pref.getInteger("mappaint.node.virtual-space", 70))) { Point pc = new Point((p1.x+p2.x)/2, (p1.y+p2.y)/2); @@ -317,5 +304,5 @@ // virtual node at the same spot will be joined which is likely unwanted if(virtualWayNode != null) { - if(!w.getNode(nearestWS.lowerIndex+1).equals(virtualWayNode) + if( !w.getNode(nearestWS.lowerIndex+1).equals(virtualWayNode) && !w.getNode(nearestWS.lowerIndex).equals(virtualWayNode)) { continue; @@ -325,5 +312,5 @@ } - (!sel.contains(w) ? virtualWays : virtualWaysInSel).add(nearestWS); + virtualWays.add(nearestWS); if(virtualNode == null) { virtualNode = new Node(Main.map.mapView.getLatLon(pc.x, pc.y)); @@ -333,17 +320,5 @@ } } - - if (virtualNode != null) { - // insert virtualNode into all segments if nothing was selected, - // else only into the (previously) selected segments - virtualWays = virtualWaysInSel.isEmpty() ? virtualWays : virtualWaysInSel; - } - - if (osm == null && !wss.isEmpty()) { - // take nearest way - osm = wss.iterator().next().way; - } - } - + } if (osm == null) return Collections.emptySet(); @@ -363,6 +338,6 @@ if(!Main.map.mapView.isActiveLayerVisible()) return; - // request focus in order to enable the expected keyboard shortcuts + // Main.map.mapView.requestFocus(); @@ -372,4 +347,5 @@ return; boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; + boolean alt = (e.getModifiers() & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0; boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; @@ -384,5 +360,5 @@ initialMoveThresholdExceeded = false; - Collection osmColl = getNearestCollectionVirtual(e.getPoint()); + Collection osmColl = getNearestCollectionVirtual(e.getPoint(), alt); if (ctrl && shift) { @@ -407,6 +383,6 @@ selectionManager.mousePressed(e); } - - if(mode != Mode.move || shift || ctrl) { + if(mode != Mode.move || shift || ctrl) + { virtualNode = null; virtualWays.clear(); @@ -445,26 +421,12 @@ boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0; - boolean alt = (e.getModifiers() & (ActionEvent.ALT_MASK|InputEvent.ALT_GRAPH_MASK)) != 0 - || Main.pref.getBoolean("selectaction.cycles.multiple.matches", false); - - virtualWays.clear(); - virtualNode = null; - if (!didMove) { - Collection c = Main.map.mapView.getNearestCollection(e.getPoint(), OsmPrimitive.isSelectablePredicate); - if (!c.isEmpty() && alt) { - if (c.iterator().next() instanceof Node) { - // consider all nearest nodes - c = new ArrayList(Main.map.mapView.getNearestNodes(e.getPoint(), OsmPrimitive.isSelectablePredicate)); - } else { - // consider all nearest primitives (should be only ways at this point..) - c = Main.map.mapView.getAllNearest(e.getPoint(), OsmPrimitive.isSelectablePredicate); - } - } - selectPrims(c, shift, ctrl, true, false); + selectPrims( + Main.map.mapView.getNearestCollection(e.getPoint(), OsmPrimitive.isSelectablePredicate), + shift, ctrl, true, false); // If the user double-clicked a node, change to draw mode - c = getCurrentDataSet().getSelected(); - if(e.getClickCount() >=2 && c.size() == 1 && c.iterator().next() instanceof Node) { + List sel = new ArrayList(getCurrentDataSet().getSelected()); + if(e.getClickCount() >=2 && sel.size() == 1 && sel.get(0) instanceof Node) { // We need to do it like this as otherwise drawAction will see a double // click and switch back to SelectMode @@ -539,69 +501,9 @@ } - private boolean selMorePrims = false; - private OsmPrimitive selCycleStart = null; - public void selectPrims(Collection selectionList, boolean shift, boolean ctrl, boolean released, boolean area) { DataSet ds = getCurrentDataSet(); - - // decides on mousePressed whether - // to cycle on mouseReleased (selList already selected) - // or not (selList is a new selection) - selMorePrims = (released || area) ? selMorePrims : ds.getSelected().containsAll(selectionList); - - // not allowed together: do not change dataset selection, return early - if ((shift && ctrl) || (ctrl && !released) || (!virtualWays.isEmpty())) - return; - - // toggle through possible objects on mouse release - if (released && !area) { - if (selectionList.size() > 1) { - Collection coll = ds.getSelected(); - - OsmPrimitive first, foundInDS, node, nxt; - first = nxt = selectionList.iterator().next(); - foundInDS = node = null; - - for (Iterator i = selectionList.iterator(); i.hasNext(); ) { - if (selMorePrims && shift) { - if (!coll.contains(nxt = i.next())) { - break; // take first primitive not in dsSel or last if all contained - } - } else { - if (coll.contains(nxt = i.next())) { - foundInDS = nxt; - if (selMorePrims || ctrl) { - ds.clearSelection(nxt); - nxt = i.hasNext() ? i.next() : first; - } - break; // take next primitive of selList - } else if (nxt instanceof Node && node == null) { - node = nxt; - } - } - } - - if (ctrl) { - if (foundInDS != null) { - // a member of selList was foundInDS - if (!selectionList.contains(selCycleStart)) { - selCycleStart = foundInDS; - } - // check if selCycleStart == prim (equals next(foundInDS)) - if (selCycleStart.equals(nxt)) { - ds.addSelected(nxt); // cycle complete, prim toggled below - selCycleStart = null; // check: might do w/out ?? - } - } else { - // no member of selList was foundInDS (sets were disjunct), setup for new cycle - selCycleStart = nxt = (node != null) ? node : first; - } - } - - selectionList = new ArrayList(1); // do not modify the passed object.. - selectionList.add(nxt); - } - } + if ((shift && ctrl) || (ctrl && !released)) + return; // not allowed together if (ctrl) {