Ticket #2602: josm.child-parent-search.2.patch

src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -11 +11 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import org.openstreetmap.josm.tools.DateUtils;
 
 /**
@@ -319 +322 @@
         }
         @Override public String toString() {return "untagged";}
     }
+        
+    private static class Parent extends Match {
+        private final Match child;
+        public Parent(Match m) { child = m; }
+        @Override public boolean match(OsmPrimitive osm) throws ParseError {
+            boolean isParent = false;
+            if (osm instanceof Way) {
+                for (Node n : ((Way)osm).nodes)
+                    isParent |= child.match(n);
+            } else if (osm instanceof Relation) {
+                for (RelationMember member : ((Relation)osm).members) {
+                    if (member.member != null)
+                        isParent |= child.match(member.member);
+                }
+            }
+            return isParent;
+        }
+        @Override public String toString() {return "parentof(" + child + ")";}
+    }
 
+    private static class Child extends Match {
+        private final Match parent;
+        public Child(Match m) { parent = m; }
+        @Override public boolean match(OsmPrimitive osm) throws ParseError {
+            boolean isChild = false;
+            CollectBackReferencesVisitor backRefs = new CollectBackReferencesVisitor(Main.ds);
+            osm.visit(backRefs);
+            for (OsmPrimitive p : backRefs.data) {
+                isChild |= parent.match(p);
+            }
+            return isChild;
+        }
+        @Override public String toString() {return "childof(" + parent + ")";}
+    }
+
     public static class ParseError extends Exception {
         public ParseError(String msg) {
             super(msg);
@@ -387 +424 @@
         return parsePat();
     }
 
-    private Match parsePat() {
+    private Match parsePat() throws ParseError {
         String tok = tokenizer.readText();
 
         if (tokenizer.readIfEqual(":")) {
@@ -407 +444 @@
             return new Untagged();
         } else if (tok.equals("selected")) {
             return new Selected();
+        } else if (tok.equals("child")) {
+            return new Child(parseParens());
+        } else if (tok.equals("parent")) {
+            return new Parent(parseParens());
         } else {
             return new Any(tok);
         }

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

@@ -93 +93 @@
                 + "<li>"+tr("<b>selected</b> - all selected objects")+"</li>"
                 + "<li>"+tr("<b>incomplete</b> - all incomplete objects")+"</li>"
                 + "<li>"+tr("<b>untagged</b> - all untagged objects")+"</li>"
+                + "<li>"+tr("<b>child <i>expr</i></b> - all children of objects matching the expression")+"</li>"
+                + "<li>"+tr("<b>parent <i>expr</i></b> - all parents of objects matching the expression")+"</li>"
                 + "<li>"+tr("Use <b>|</b> or <b>OR</b> to combine with logical or")+"</li>"
                 + "<li>"+tr("Use <b>\"</b> to quote operators (e.g. if key contains :)")+"</li>"
                 + "<li>"+tr("Use <b>(</b> and <b>)</b> to group expressions")+"</li>"