Changeset 17336 in josm

Timestamp:

2020-11-23T19:59:45+01:00 (4 years ago)

Author:

GerdP

Message:

fix #20037: Overpass query wizard generates wrong query with "*=value"

• remove obsolete getInstance()
• fix bug and add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/SearchCompilerQueryWizard.java (modified) (6 diffs)
• test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/SearchCompilerQueryWizardTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java

@@ -91 +91 @@
     private Optional<String> tryParseSearchTerm(String searchTerm) {
         try {
-            return Optional.of(SearchCompilerQueryWizard.getInstance().constructQuery(searchTerm));
+            return Optional.of(SearchCompilerQueryWizard.constructQuery(searchTerm));
         } catch (UncheckedParseException | IllegalStateException ex) {
             Logging.error(ex);

trunk/src/org/openstreetmap/josm/tools/SearchCompilerQueryWizard.java

@@ -26 +26 @@
 public final class SearchCompilerQueryWizard {
 
-    private static final SearchCompilerQueryWizard instance = new SearchCompilerQueryWizard();
-
-    /**
-     * Replies the unique instance of this class.
-     *
-     * @return the unique instance of this class
-     */
-    public static SearchCompilerQueryWizard getInstance() {
-        return instance;
-    }
-
     private SearchCompilerQueryWizard() {
         // private constructor for utility class
@@ -47 +36 @@
      * @throws UncheckedParseException when the parsing fails
      */
-    public String constructQuery(final String search) {
+    public static String constructQuery(final String search) {
         try {
             Matcher matcher = Pattern.compile("\\s+GLOBAL\\s*$", Pattern.CASE_INSENSITIVE).matcher(search);
@@ -74 +63 @@
                 }
             }
-            
+
             final Match match = SearchCompiler.compile(search);
             return constructQuery(match, "[bbox:{{bbox}}];", "");
@@ -82 +71 @@
     }
 
-    private String constructQuery(final Match match, final String bounds, final String queryLineSuffix) {
+    private static String constructQuery(final Match match, final String bounds, final String queryLineSuffix) {
         final List<Match> normalized = normalizeToDNF(match);
         final List<String> queryLines = new ArrayList<>();
@@ -136 +125 @@
                 case EXACT:
                     return "[" + quote(key) + (negated ? "!=" : "=") + quote(value) + "]";
+                case ANY_KEY: // *=value
+                    // fall through
                 case EXACT_REGEXP:
                     final Matcher matcher = Pattern.compile("/(?<regex>.*)/(?<flags>i)?").matcher(value);
@@ -141 +132 @@
                             ? quote(matcher.group("regex")) + Optional.ofNullable(matcher.group("flags")).map(f -> "," + f).orElse("")
                             : quote(value);
+                    if (mode == SearchCompiler.ExactKeyValue.Mode.ANY_KEY)
+                        return "[~\"^.*$\"" + (negated ? "!~" : "~") + valueQuery + "]";
                     return "[" + quote(key) + (negated ? "!~" : "~") + valueQuery + "]";
                 case MISSING_KEY:

trunk/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java

@@ -59 +59 @@
 
     private String getExpandedQuery(String search) {
-        final String query = SearchCompilerQueryWizard.getInstance().constructQuery(search);
+        final String query = SearchCompilerQueryWizard.constructQuery(search);
         final String request = new OverpassDownloadReader(new Bounds(1, 2, 3, 4), null, query)
                 .getRequestForBbox(1, 2, 3, 4)

trunk/test/unit/org/openstreetmap/josm/tools/SearchCompilerQueryWizardTest.java

@@ -24 +24 @@
 
     private static String constructQuery(String s) {
-        return SearchCompilerQueryWizard.getInstance().constructQuery(s);
+        return SearchCompilerQueryWizard.constructQuery(s);
     }
 
@@ -241 +241 @@
                 "type:relation and type=multipolygon and -landuse=* and -\"area:highway\"=*");
     }
+
+    /**
+     * Test for ticket <a href="https://josm.openstreetmap.de/ticket/20037>#20037</a>
+     */
+    @Test
+    void testTicket20037() {
+        assertQueryEquals(
+                "  node[~\"^.*$\"~\"forward\"];\n" +
+                "  node[~\"^.*$\"~\"backward\"];\n",
+                "type:node AND (*=forward OR *=backward)");
+    }
 }