Changeset 26792 in osm for applications/editors

Timestamp:

2011-10-07T07:56:35+02:00 (13 years ago)

Author:

zverik

Message:

У меня не компилируется — ну и нефиг потому что.

Location:

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2

Files:

• UtilsPlugin2.java (modified) (3 diffs)
• selection/SelectHighwayAction.java (copied) (copied from applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java ) (2 diffs)

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java

@@ -10 +10 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -43 +42 @@
     JMenuItem selModifiedNodes;
     JMenuItem selModifiedWays;
+    JMenuItem selectHighway;
     
     JMenuItem selectURL;
@@ -78 +78 @@
         selModifiedWays = MainMenu.add(selectionMenu, new SelectModWaysAction());
         undoSelection = MainMenu.add(selectionMenu, new UndoSelectionAction());
+        selectHighway = MainMenu.add(selectionMenu, new SelectHighwayAction());
         
         selectURL = MainMenu.add(toolsMenu, new ChooseURLAction());

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectHighwayAction.java

@@ -1 @@
-// License: GPL. Copyright 2011 by Alexei Kasatkin
+// License: PD
 package utilsplugin2.selection;
 
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
+import javax.swing.JOptionPane;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.*;
-
 import org.openstreetmap.josm.tools.Shortcut;
 
 /**
- *    Extends current selection by selecting nodes on all touched ways
+ * Select all connected ways for a street if one way is selected (determine by name/ref),
+ * select highway ways between two selected ways.
+ * 
+ * @author zverik
  */
-public class ConnectedWaysAction extends JosmAction {
+public class SelectHighwayAction extends JosmAction {
 
-    public ConnectedWaysAction() {
-        super(tr("All connected ways"), "adjwaysall", tr("Select all connected ways"),
-                Shortcut.registerShortcut("tools:adjwaysall", tr("Tool: {0}","All connected ways"),
-                KeyEvent.VK_E, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
-        putValue("help", ht("/Action/SelectConnectedWays"));
+    public SelectHighwayAction() {
+        super(tr("Select Highway"), "selecthighway", tr("Select highway for the name/ref given"),
+                Shortcut.registerShortcut("tools:selecthighway", tr("Tool: {0}","Select Highway"),
+                KeyEvent.VK_W, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
-        Set<Node> selectedNodes = OsmPrimitive.getFilteredSet(selection, Node.class);
-        Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);
-
+        List<Way> selectedWays = OsmPrimitive.getFilteredList(getCurrentDataSet().getSelected(), Way.class);
         Set<Way> newWays = new HashSet<Way>();
 
-        // selecting ways attached to selected nodes
-        if(!selectedNodes.isEmpty()) {
-            NodeWayUtils.addWaysConnectedToNodes(selectedNodes, newWays);
+        if( selectedWays.size() == 1 ) {
+            Way firstWay = selectedWays.get(0);
+            String key = firstWay.hasKey("name") ? "name" : "ref";
+            if( !firstWay.hasKey(key) ) {
+                JOptionPane.showMessageDialog(Main.parent, "The selected way should have either name or ref tag.", "Select Highway", JOptionPane.ERROR_MESSAGE);
+                return;
+            }
+            String value = firstWay.get(key);
+
+            Queue<Node> nodeQueue = new LinkedList<Node>();
+            nodeQueue.add(firstWay.firstNode());
+
+            while( !nodeQueue.isEmpty() ) {
+                Node node = nodeQueue.remove();
+                for( Way p : OsmPrimitive.getFilteredList(node.getReferrers(), Way.class) ) {
+                    if( !newWays.contains(p) && p.hasKey(key) && p.get(key).equals(value) ) {
+                        newWays.add(p);
+                        nodeQueue.add(p.firstNode().equals(node) ? p.lastNode() : p.firstNode());
+                    }
+                }
+            }
+        } else if( selectedWays.size() == 2 ) {
+            JOptionPane.showMessageDialog(Main.parent, "Sorry, two ways are not supported yet", "Select Highway", JOptionPane.ERROR_MESSAGE);
+            return;
+        } else {
+            JOptionPane.showMessageDialog(Main.parent, "Please select exactly one way for this action", "Select Highway", JOptionPane.ERROR_MESSAGE);
+            return;
         }
 
-        // select ways attached to already selected ways
-        newWays.addAll(selectedWays);
-        NodeWayUtils.addWaysConnectedToWaysRecursively(selectedWays, newWays);
-        
-//        System.out.printf("%d ways added to selection\n",newWays.size()-selectedWays.size());
         getCurrentDataSet().setSelected(newWays);
-
     }
 
     @Override
     protected void updateEnabledState() {
-        if (getCurrentDataSet() == null) {
+        if (getCurrentDataSet() == null)
             setEnabled(false);
-        } else {
+        else
             updateEnabledState(getCurrentDataSet().getSelected());
-        }
     }
 
@@ -63 +79 @@
             return;
         }
-        setEnabled(!selection.isEmpty());
+        int count = 0;
+        for( OsmPrimitive p : selection )
+            if( p instanceof Way )
+                count++;
+        setEnabled(count == 1); // todo: or 2
     }
-
-
 }