Changeset 16581 in josm for trunk

Timestamp:

2020-06-08T22:54:33+02:00 (4 years ago)

Author:

simon04

Message:

fix #13082 - SearchCompiler: add members: keyword to search for relations with the specified number of members (patch by naoliv, modified)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/search/SearchCompiler.java (modified) (3 diffs)
• gui/dialogs/SearchDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -127 +127 @@
     public static class CoreSimpleMatchFactory implements SimpleMatchFactory {
         private final Collection<String> keywords = Arrays.asList("id", "version", "type", "user", "role",
-                "changeset", "nodes", "ways", "tags", "areasize", "waylength", "modified", "deleted", "selected",
+                "changeset", "nodes", "ways", "members", "tags", "areasize", "waylength", "modified", "deleted", "selected",
                 "incomplete", "untagged", "closed", "new", "indownloadedarea",
                 "allindownloadedarea", "timestamp", "nth", "nth%", "hasRole", "preset");
@@ -173 +173 @@
                     case "ways":
                         return new WayCountRange(tokenizer);
+                    case "members":
+                        return new MemberCountRange(tokenizer);
                     case "tags":
                         return new TagCountRange(tokenizer);
@@ -1435 +1437 @@
     }
 
+    /*
+     * Matches relations with a certain number of members
+     */
+    private static class MemberCountRange extends RangeMatch {
+        MemberCountRange(Range range) {
+            super(range);
+        }
+
+        MemberCountRange(PushbackTokenizer tokenizer) throws SearchParseError {
+            this(tokenizer.readRange(tr("Range of numbers expected")));
+        }
+
+        @Override
+        protected Long getNumber(OsmPrimitive osm) {
+            if (osm instanceof Relation) {
+                Relation r = (Relation) osm;
+                return (long) r.getMembersCount();
+            } else {
+                return null;
+            }
+        }
+
+        @Override
+        protected String getString() {
+            return "members";
+        }
+    }
+
     /**
      * Matches objects with a number of tags in given range

trunk/src/org/openstreetmap/josm/gui/dialogs/SearchDialog.java

@@ -383 +383 @@
                 .addKeyword("ways:<i>3-</i>", "ways:", tr("nodes with at least 3 referring ways, or relations containing at least 3 ways"))
                 .addKeyword("tags:<i>5-10</i>", "tags:", tr("objects having 5 to 10 tags"))
-                .addKeyword("role:", "role:", tr("objects with given role in a relation"))
+                .addKeyword("members:<i>2</i>", "members:", tr("relations with 2 members"))
                 .addKeyword("areasize:<i>-100</i>", "areasize:", tr("closed ways with an area of 100 m\u00b2"))
                 .addKeyword("waylength:<i>200-</i>", "waylength:", tr("ways with a length of 200 m or more")),
@@ -399 +399 @@
                 .addKeyword("child <i>expr</i>", "child ", tr("all children of objects matching the expression"), "child building")
                 .addKeyword("parent <i>expr</i>", "parent ", tr("all parents of objects matching the expression"), "parent bus_stop")
+                .addKeyword("role:", "role:", tr("objects with given role in a relation"))
                 .addKeyword("hasRole:<i>stop</i>", "hasRole:", tr("relation containing a member of role <i>stop</i>"))
                 .addKeyword("role:<i>stop</i>", "role:", tr("objects being part of a relation as role <i>stop</i>"))