Changeset 4503 in josm for trunk

Timestamp:

2011-10-08T00:24:18+02:00 (13 years ago)

Author:

simon04

Message:

fix #6935 - Ability to auto-find based on key/value pairs (patch by ij)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchAction.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -585 +585 @@
         return Collections.<ActionParameter<?>>singletonList(new SearchSettingsActionParameter(SEARCH_EXPRESSION));
     }
+
+    public static String escapeStringForSearch(String s) {
+        return s.replace("\\", "\\\\").replace("\"", "\\\"");
+    }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -102 +102 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
+import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
 
 /**
@@ -182 +184 @@
     private CopyKeyValueAction copyKeyValueAction = new CopyKeyValueAction();
     private CopyAllKeyValueAction copyAllKeyValueAction = new CopyAllKeyValueAction();
+    private SearchAction searchActionSame = new SearchAction(true);
+    private SearchAction searchActionAny = new SearchAction(false);
     private AddAction addAction = new AddAction();
 
@@ -616 +620 @@
         propertyMenu.add(copyAllKeyValueAction);
         propertyMenu.addSeparator();
+        propertyMenu.add(searchActionAny);
+        propertyMenu.add(searchActionSame);
+        propertyMenu.addSeparator();
         propertyMenu.add(helpAction);
         
@@ -1412 +1419 @@
         }
     }
+
+    class SearchAction extends AbstractAction {
+        final boolean sameType;
+
+        public SearchAction(boolean sameType) {
+            this.sameType = sameType;
+            if (sameType) {
+                putValue(NAME, tr("Search Key/Value/Type"));
+                putValue(SHORT_DESCRIPTION, tr("Search with the key and value of the selected tag, restrict to type (i.e., node/way/relation)"));
+            } else {
+                putValue(NAME, tr("Search Key/Value"));
+                putValue(SHORT_DESCRIPTION, tr("Search with the key and value of the selected tag"));
+            }
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            if (propertyTable.getSelectedRowCount() != 1) {
+                return;
+            }
+            String key = propertyData.getValueAt(propertyTable.getSelectedRow(), 0).toString();
+            Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
+            if (sel.isEmpty()) {
+                return;
+            }
+            String sep = "";
+            String s = "";
+            for (OsmPrimitive p : sel) {
+                String val = p.get(key);
+                if (val == null) {
+                    continue;
+                }
+                String t = "";
+                if (!sameType) {
+                    t = "";
+                } else if (p instanceof Node) {
+                    t = "type:node ";
+                } else if (p instanceof Way) {
+                    t = "type:way ";
+                } else if (p instanceof Relation) {
+                    t = "type:relation ";
+                }
+                s += sep + "(" + t + "\"" +
+                        org.openstreetmap.josm.actions.search.SearchAction.escapeStringForSearch(key) + "\"=\"" +
+                        org.openstreetmap.josm.actions.search.SearchAction.escapeStringForSearch(val) + "\")";
+                sep = " OR ";
+            }
+
+            SearchSetting ss = new SearchSetting(s, SearchMode.replace, true, false, false);
+            org.openstreetmap.josm.actions.search.SearchAction.searchWithoutHistory(ss);
+        }
+    }
 }