Changeset 26318 in osm for applications/editors

Timestamp:

2011-07-13T12:15:18+02:00 (13 years ago)

Author:

akks

Message:

'Utilsplugin2: added ExtractNode tool Alt-J'

Location:

applications/editors/josm/plugins/utilsplugin2

Files:

• build.xml (modified) (1 diff)
• images/extnode.png (added)
• src/utilsplugin2/ExtractPointAction.java (copied) (copied from applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java ) (4 diffs)
• src/utilsplugin2/UtilsPlugin2.java (modified) (3 diffs)

applications/editors/josm/plugins/utilsplugin2/build.xml

@@ -30 +30 @@
 <project name="utilsplugin2" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="extend selection"/>
+    <property name="commit.message" value="Utilsplugin2: added ExtractNode tool Alt-J"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4064"/>
+    <property name="plugin.main.version" value="4201"/>
     <!--
       ************************************************

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

@@ -1 +1 @@
 // License: GPL. Copyright 2011 by Alexei Kasatkin and Martin Ždila
-package utilsplugin2.selection;
+package utilsplugin2;
 
+import java.awt.MouseInfo;
+import java.awt.Point;
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -8 +10 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
-import java.util.Set;
+import java.util.LinkedList;
+import java.util.List;
+import javax.swing.JOptionPane;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.command.ChangeNodesCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.MoveCommand;
+import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.*;
 
@@ -17 +27 @@
  *    Unselects all nodes
  */
-public class UnselectNodesAction extends JosmAction {
+public class ExtractPointAction extends JosmAction {
 
     
-    public UnselectNodesAction() {
-        super(tr("Unselect nodes"), "unsnodes",
-                tr("Removes all nodes from selection"),
-                Shortcut.registerShortcut("tools:unsnodes", tr("Tool: {0}","Unselect nodes"),
-                KeyEvent.VK_U, Shortcut.GROUP_MNEMONIC,KeyEvent.ALT_MASK  ), true);
-        putValue("help", ht("/Action/UnselectNodes"));
+    public ExtractPointAction() {
+        super(tr("Extract node"), "extpoint",
+                tr("Extracts node from a way"),
+                Shortcut.registerShortcut("tools:extnode", tr("Tool: {0}","Extract node"),
+                KeyEvent.VK_J, Shortcut.GROUP_MNEMONIC,KeyEvent.ALT_MASK  ), true);
+        putValue("help", ht("/Action/ExtractNode"));
     }
 
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
-        Set<Node> selectedNodes = OsmPrimitive.getFilteredSet(selection, Node.class);
-        getCurrentDataSet().clearSelection(selectedNodes);
+        List<Node> selectedNodes = OsmPrimitive.getFilteredList(selection, Node.class);
+        if (selectedNodes.size()!=1) {
+             JOptionPane.showMessageDialog(Main.parent,
+                    tr("This tool extracts node from its ways and requires single node to be selected."),
+                    tr("Extract node"), JOptionPane.INFORMATION_MESSAGE);
+            return;
+        }
+        Node nd = selectedNodes.get(0);
+        Node ndCopy = new Node(nd.getCoor());
+        List<Command> cmds = new LinkedList<Command>();
+        
+        Point p = Main.map.mapView.getMousePosition();
+        if (p!=null) cmds.add(new MoveCommand(nd,Main.map.mapView.getLatLon(p.x, p.y)));
+        List<OsmPrimitive> refs = nd.getReferrers();
+        cmds.add(new AddCommand(ndCopy));
+        
+        for (OsmPrimitive pr: refs) {
+            if (pr instanceof Way) {
+                Way w=(Way)pr;
+                List<Node> nodes = w.getNodes();
+                int idx=nodes.indexOf(nd);
+                nodes.set(idx, ndCopy); // replace node with its copy
+                cmds.add(new ChangeNodesCommand(w, nodes));
+            }
+        }
+        if (cmds.size()>1) Main.main.undoRedo.add(new SequenceCommand(tr("Extract node from line"),cmds));
     }
 
@@ -49 +83 @@
             return;
         }
-        setEnabled(!selection.isEmpty());
+        setEnabled(selection.size()==1);
     }
 }

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

@@ -28 +28 @@
     JMenuItem intWaysR;
     JMenuItem undoSelection;
+    JMenuItem extractPoint;
 
     JMenuItem replaceGeometry;
@@ -37 +38 @@
     JMenuItem selModifiedNodes;
     JMenuItem selModifiedWays;
-
+    
     public UtilsPlugin2(PluginInformation info) {
         super(info);
@@ -53 +54 @@
         alignWayNodes = MainMenu.add(toolsMenu, new AlignWayNodesAction());
         splitOnIntersections = MainMenu.add(toolsMenu, new SplitOnIntersectionsAction());
+        extractPoint = MainMenu.add(toolsMenu, new ExtractPointAction());
 
         JMenu selectionMenu = Main.main.menu.addMenu(marktr("Selection"), KeyEvent.VK_N, Main.main.menu.defaultMenuPos, "help");