Changeset 16262 in josm for trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

Timestamp:

2020-04-11T18:00:31+02:00 (6 years ago)

Author:

simon04

Message:

fix #18164 - Migrate OverpassTurboQueryWizard to Java

The new OverpassTurboQueryWizard first invokes SearchCompiler, and then turns the AST into an Overpass QL.

File:

• trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (modified) (10 diffs)

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

@@ -505 +505 @@
      * Matches if the value of the corresponding key is ''yes'', ''true'', ''1'' or ''on''.
      */
-    private static class BooleanMatch extends TaggedMatch {
+    public static class BooleanMatch extends TaggedMatch {
         private final String key;
         private final boolean defaultValue;
@@ -512 +512 @@
             this.key = key;
             this.defaultValue = defaultValue;
+        }
+
+        public String getKey() {
+            return key;
         }
 
@@ -710 +714 @@
      * Matches objects with the given key-value pair.
      */
-    private static class KeyValue extends TaggedMatch {
+    public static class KeyValue extends TaggedMatch {
         private final String key;
         private final Pattern keyPattern;
@@ -775 +779 @@
         }
 
+        public String getKey() {
+            return key;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
         @Override
         public String toString() {
@@ -891 +903 @@
     public static class ExactKeyValue extends TaggedMatch {
 
-        enum Mode {
+        public enum Mode {
             ANY, ANY_KEY, ANY_VALUE, EXACT, NONE, MISSING_KEY,
             ANY_KEY_REGEXP, ANY_VALUE_REGEXP, EXACT_REGEXP, MISSING_KEY_REGEXP;
@@ -1003 +1015 @@
         }
 
+        public String getKey() {
+            return key;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public Mode getMode() {
+            return mode;
+        }
+
         @Override
         public String toString() {
@@ -1148 +1172 @@
     }
 
-    private static class ExactType extends Match {
+    public static class ExactType extends Match {
         private final OsmPrimitiveType type;
 
@@ -1157 +1181 @@
         }
 
+        public OsmPrimitiveType getType() {
+            return type;
+        }
+
         @Override
         public boolean match(OsmPrimitive osm) {
@@ -1186 +1214 @@
      * Matches objects last changed by the given username.
      */
-    private static class UserMatch extends Match {
+    public static class UserMatch extends Match {
         private String user;
 
@@ -1195 +1223 @@
                 this.user = user;
             }
+        }
+
+        public String getUser() {
+            return user;
         }