Changeset 26644 in osm for applications/editors

Timestamp:

2011-09-12T19:25:00+02:00 (13 years ago)

Author:

akks

Message:

'Utilsplugin2: select all inside (testing)'

Location:

applications/editors/josm/plugins/utilsplugin2

Files:

• build.xml (modified) (1 diff)
• images/selinside.png (added)
• src/utilsplugin2/ChooseURLAction.java (added)
• src/utilsplugin2/UtilsPlugin2.java (modified) (3 diffs)
• src/utilsplugin2/selection/IntersectedWaysAction.java (modified) (1 diff)
• src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java (modified) (1 diff)
• src/utilsplugin2/selection/NodeWayUtils.java (modified) (2 diffs)
• src/utilsplugin2/selection/SelectAllInsideAction.java (copied) (copied from applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java ) (2 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="Utilsplugin2: configuring custom URLs"/>
+    <property name="commit.message" value="Utilsplugin2: select all inside (testing)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="4395"/>

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

@@ -30 +30 @@
     JMenuItem intWays;
     JMenuItem intWaysR;
+    JMenuItem allInside;
     JMenuItem undoSelection;
     JMenuItem extractPoint;
@@ -73 +74 @@
         intWays = MainMenu.add(selectionMenu, new IntersectedWaysAction());
         intWaysR = MainMenu.add(selectionMenu, new IntersectedWaysRecursiveAction());
+        allInside = MainMenu.add(selectionMenu, new SelectAllInsideAction());
         selModifiedNodes = MainMenu.add(selectionMenu, new SelectModNodesAction());
         selModifiedWays = MainMenu.add(selectionMenu, new SelectModWaysAction());
@@ -110 +112 @@
         undoSelection.setEnabled(enabled);
         selectURL.setEnabled(enabled);
+        allInside.setEnabled(enabled);
     }
     @Override

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

@@ -30 +30 @@
 
     public void actionPerformed(ActionEvent e) {
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
-        Set<Node> selectedNodes = OsmPrimitive.getFilteredSet(selection, Node.class);
-        Set<Way> activeWays = new HashSet<Way>();
-
         Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);
 

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

@@ -32 +32 @@
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
-        Set<Node> selectedNodes = OsmPrimitive.getFilteredSet(selection, Node.class);
-        Set<Way> activeWays = new HashSet<Way>();
-
+        
         Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);
 

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

@@ -9 +9 @@
 import javax.swing.JOptionPane;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -263 +265 @@
     }
 
-
+    
+
+    static void addAllInsideWay(DataSet data, Way way, Set<Way> newWays, Set<Node> newNodes) {
+        if (!way.isClosed()) return;
+        BBox box = way.getBBox();
+        List<Node> polyNodes = way.getNodes();
+        List<Node> searchNodes = data.searchNodes(box);
+        Set<Node> newestNodes = new HashSet<Node>();
+        Set<Way> newestWays = new HashSet<Way>();
+        for (Node n : searchNodes) {
+            if (Geometry.nodeInsidePolygon(n, polyNodes)) {
+                newestNodes.add(n);
+            }
+        }
+        
+        List<Way> searchWays = data.searchWays(box);
+        for (Way w : searchWays) {
+            if (newestNodes.containsAll(w.getNodes())) {
+                newestWays.add(w);
+            }
+        }
+        for (Way w : newestWays) {
+            newestNodes.removeAll(w.getNodes());
+            // do not select nodes of already selected ways
+        }
+        
+        newNodes.addAll(newestNodes);
+        newWays.addAll(newestWays);
+    }
 }

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

@@ -20 +20 @@
  *    Extends current selection by selecting nodes on all touched ways
  */
-public class IntersectedWaysAction extends JosmAction {
+public class SelectAllInsideAction extends JosmAction {
 
-    public IntersectedWaysAction() {
-        super(tr("Intersecting ways"), "intway", tr("Select intersecting ways"),
-                Shortcut.registerShortcut("tools:intway", tr("Tool: {0}","Intersecting ways"),
-                KeyEvent.VK_I, Shortcut.GROUP_EDIT), true);
-        putValue("help", ht("/Action/SelectIntersectingWays"));
+    public SelectAllInsideAction() {
+        super(tr("All inside [testing]"), "selinside", tr("Select all inside selected polygons"),
+                Shortcut.registerShortcut("tools:selinside", tr("Tool: {0}","All inside"),
+                KeyEvent.VK_I, Shortcut.GROUP_EDIT ,KeyEvent.ALT_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK), true);
+        putValue("help", ht("/Action/SelectAllInside"));
     }
 
@@ -39 +39 @@
         if (!selectedWays.isEmpty()) {
             Set<Way> newWays = new HashSet<Way>();
-            NodeWayUtils.addWaysIntersectingWays(
-                    getCurrentDataSet().getWays(),
-                    selectedWays, newWays);
+            Set<Node> newNodes = new HashSet<Node>();
+            for (Way w: selectedWays) {
+                NodeWayUtils.addAllInsideWay(getCurrentDataSet(),w,newWays,newNodes);
+            }
             getCurrentDataSet().addSelected(newWays);
+            getCurrentDataSet().addSelected(newNodes);
             return;
         } else {