Changeset 329 in josm for branch/0.5/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java

Timestamp:

2007-09-24T01:36:24+02:00 (17 years ago)

Author:

framm

Message:

This commit is a manual merge of all changes that have been made to
the intermediate "core_0.5" branch on the main OSM repository,
bevore JOSM was moved to openstreetmap.de.

Changes incorporated here:

r4464@svn.openstreetmap.org
r4466@svn.openstreetmap.org
r4468@svn.openstreetmap.org
r4469@svn.openstreetmap.org
r4479@svn.openstreetmap.org

File:

• branch/0.5/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java (modified) (6 diffs)

branch/0.5/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.SelectionManager;
@@ -55 +54 @@
  * pixel are considered "only click". If that happens, the nearest Node will
  * be selected if there is any within 10 pixel range. If there is no Node within
- * 10 pixel, the nearest Segment (or Street, if user hold down the Alt-Key)
- * within 10 pixel range is selected. If there is no Segment within 10 pixel
- * and the user clicked in or 10 pixel away from an area, this area is selected.
- * If there is even no area, nothing is selected. Shift and Ctrl key applies to
- * this as usual. For more, @see MapView#getNearest(Point, boolean)
+ * 10 pixel, the nearest Way within 10 pixel range is selected. If there is no
+ * Way within 10 pixel and the user clicked in or 10 pixel away from an area,
+ * this area is selected.  If there is even no area, nothing is selected.
+ * Shift and Ctrl key applies to this as usual. For more,
+ * @see MapView#getNearest(Point)
  *
  * @author imi
@@ -65 +64 @@
 public class SelectionAction extends MapMode implements SelectionEnded {
 
-        enum Mode {select, straight}
-        private final Mode mode;
-
         public static class Group extends GroupAction {
                 public Group(MapFrame mf) {
                         super(KeyEvent.VK_S,0);
                         putValue("help", "Action/Selection");
-                        actions.add(new SelectionAction(mf, tr("Selection"), Mode.select, tr("Select objects by dragging or clicking.")));
-                        actions.add(new SelectionAction(mf, tr("Straight line"), Mode.straight, tr("Select objects in a straight line.")));
+                        actions.add(new SelectionAction(mf, tr("Selection"), tr("Select objects by dragging or clicking.")));
                         setCurrent(0);
                 }
@@ -84 +79 @@
         private SelectionManager selectionManager;
 
-        private Node straightStart = null;
-        private Node lastEnd = null;
-        private Collection<OsmPrimitive> oldSelection = null;
-
-        //TODO: Implement reverse references into data objects and remove this
-        private final Map<Node, Collection<Segment>> reverseSegmentMap = new HashMap<Node, Collection<Segment>>();
-
         /**
          * Create a new SelectionAction in the given frame.
          * @param mapFrame The frame this action belongs to
          */
-        public SelectionAction(MapFrame mapFrame, String name, Mode mode, String desc) {
-                super(name, "selection/"+mode, desc, mapFrame, ImageProvider.getCursor("normal", "selection"));
-                this.mode = mode;
-                putValue("help", "Action/Selection/"+Character.toUpperCase(mode.toString().charAt(0))+mode.toString().substring(1));
+        public SelectionAction(MapFrame mapFrame, String name, String desc) {
+                super(name, "selection/select", desc, mapFrame, ImageProvider.getCursor("normal", "selection"));
+                putValue("help", "Action/Selection");
                 this.selectionManager = new SelectionManager(this, false, mapFrame.mapView);
         }
@@ -104 +91 @@
         @Override public void enterMode() {
                 super.enterMode();
-                if (mode == Mode.select)
                         selectionManager.register(Main.map.mapView);
-                else {
-                        Main.map.mapView.addMouseMotionListener(this);
-                        Main.map.mapView.addMouseListener(this);
-                        for (Segment s : Main.ds.segments) {
-                                addBackReference(s.from, s);
-                                addBackReference(s.to, s);
-                        }
-                }
-        }
-
-        private void addBackReference(Node n, Segment s) {
-                Collection<Segment> c = reverseSegmentMap.get(n);
-                if (c == null) {
-                        c = new HashSet<Segment>();
-                        reverseSegmentMap.put(n, c);
-                }
-                c.add(s);
         }
 
         @Override public void exitMode() {
                 super.exitMode();
-                if (mode == Mode.select)
                         selectionManager.unregister(Main.map.mapView);
-                else {
-                        Main.map.mapView.removeMouseMotionListener(this);
-                        Main.map.mapView.removeMouseListener(this);
-                        reverseSegmentMap.clear();
-                }
         }
 
@@ -163 +126 @@
                 Main.map.mapView.repaint();
     }
-
-        @Override public void mouseDragged(MouseEvent e) {
-                Node old = lastEnd;
-                lastEnd = Main.map.mapView.getNearestNode(e.getPoint());
-                if (straightStart == null)
-                        straightStart = lastEnd;
-                if (straightStart != null && lastEnd != null && straightStart != lastEnd && old != lastEnd) {
-                        Collection<OsmPrimitive> path = new HashSet<OsmPrimitive>();
-                        Collection<OsmPrimitive> sel = new HashSet<OsmPrimitive>();
-                        path.add(straightStart);
-                        calculateShortestPath(path, straightStart, lastEnd);
-                        if ((e.getModifiers() & MouseEvent.CTRL_MASK) != 0) {
-                                sel.addAll(oldSelection);
-                                sel.removeAll(path);
-                        } else if ((e.getModifiers() & MouseEvent.SHIFT_MASK) != 0) {
-                                sel = path;
-                                sel.addAll(oldSelection);
-                        } else
-                                sel = path;
-                        Main.ds.setSelected(sel);
-                }
-        }
-
-        @Override public void mousePressed(MouseEvent e) {
-                straightStart = Main.map.mapView.getNearestNode(e.getPoint());
-                lastEnd = null;
-                oldSelection = Main.ds.getSelected();
-        }
-
-        @Override public void mouseReleased(MouseEvent e) {
-                straightStart = null;
-                lastEnd = null;
-                oldSelection = null;
-        }
-
-        /**
-         * Get the shortest path by stepping through the node with a common segment with start
-         * and nearest to the end (greedy algorithm).
-         */
-        private void calculateShortestPath(Collection<OsmPrimitive> path, Node start, Node end) {
-                for (Node pivot = start; pivot != null;)
-                        pivot = addNearest(path, pivot, end);
-        }
-
-        private Node addNearest(Collection<OsmPrimitive> path, Node start, Node end) {
-                Collection<Segment> c = reverseSegmentMap.get(start);
-                if (c == null)
-                        return null; // start may be a waypoint without segments
-                double min = Double.MAX_VALUE;
-                Node next = null;
-                Segment seg = null;
-                for (Segment s : c) {
-                        Node other = s.from == start ? s.to : s.from;
-                        if (other == end) {
-                                next = other;
-                                seg = s;
-                                min = 0;
-                                break;
-                        }
-                        double distance = other.eastNorth.distance(end.eastNorth);
-                        if (distance < min) {
-                                min = distance;
-                                next = other;
-                                seg = s;
-                        }
-                }
-                if (min < start.eastNorth.distance(end.eastNorth) && next != null) {
-                        path.add(next);
-                        path.add(seg);
-                        return next;
-                }
-                return null;
-        }
 }