Changeset 25898 in osm for applications

Timestamp:

2011-04-25T20:21:45+02:00 (14 years ago)

Author:

akks

Message:

AddNodesAt intersections now selects added nodes. Two new actions - Alt-Z,Shift-Z - select ways/nodes from mofdification history

Location:

applications/editors/josm

Files:

• dist/utilsplugin2.jar (modified) ( previous)
• plugins/utilsplugin2/images/selmodnodes.png (added)
• plugins/utilsplugin2/images/selmodways.png (added)
• plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java (modified) (3 diffs)
• plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java (modified) (3 diffs)

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

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.JOptionPane;
@@ -15 +17 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
@@ -48 +52 @@
         if (!cmds.isEmpty()) {
             Main.main.undoRedo.add(new SequenceCommand(tr("Add nodes at intersections"),cmds));
+            Set<Node> nodes = new HashSet<Node>(10);
+            // find and select newly added nodes
+            for (Command cmd: cmds) if (cmd instanceof AddCommand){
+                Collection<? extends OsmPrimitive> pp = cmd.getParticipatingPrimitives();
+                for ( OsmPrimitive p : pp) { // find all affected nodes
+                    if (p instanceof Node && p.isNew()) nodes.add((Node)p);
+                }
+                if (!nodes.isEmpty()) {
+                    getCurrentDataSet().setSelected(nodes);
+                    }
+                }
         }
     }

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

@@ -32 +32 @@
     JMenuItem pasteRelations;
     JMenuItem alignWayNodes;
+    JMenuItem selModifiedNodes;
+    JMenuItem selModifiedWays;
 
     public UtilsPlugin2(PluginInformation info) {
@@ -56 +58 @@
         intWays = MainMenu.add(selectionMenu, new IntersectedWaysAction());
         intWaysR = MainMenu.add(selectionMenu, new IntersectedWaysRecursiveAction());
+        selModifiedNodes = MainMenu.add(selectionMenu, new SelectModNodesAction());
+        selModifiedWays = MainMenu.add(selectionMenu, new SelectModWaysAction());
     }
 
@@ -79 +83 @@
         intWays.setEnabled(enabled);
         intWaysR.setEnabled(enabled);
+        selModifiedNodes.setEnabled(enabled);
+        selModifiedWays.setEnabled(enabled);
     }
 }