Changeset 17982 in josm

Timestamp:

2021-07-10T21:21:24+02:00 (4 years ago)

Author:

Don-vip

Message:

fix #21021 - see #18164 - OverpassTurboQueryWizard: fix "newer" statements

Location:

trunk

Files:

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

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

@@ -69 +69 @@
             default:
                 super.buttonAction(buttonIndex, evt);
-
         }
     }

trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

@@ -12 +12 @@
 import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.time.format.DateTimeParseException;
 import java.util.Arrays;
 import java.util.EnumMap;
@@ -223 +224 @@
                         Logging.warn("Unsupported syntax: " + matcher.group(1));
                 }
-            } catch (UncheckedParseException | IOException | NoSuchElementException | IndexOutOfBoundsException ex) {
+            } catch (UncheckedParseException | DateTimeParseException | IOException | NoSuchElementException | IndexOutOfBoundsException ex) {
                 final String msg = tr("Failed to evaluate {0}", matcher.group());
                 Logging.log(Logging.LEVEL_WARN, msg, ex);

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

@@ -104 +104 @@
             final String value = ((SearchCompiler.KeyValue) match).getValue();
             if ("newer".equals(key)) {
-                return "(newer:" + quote("{{date:" + value + "}}") + ")";
+                return "(newer:" + quote(value) + ")";
             }
             return "[~" + quote(key) + "~" + quote(value) + "]";

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

@@ -217 +217 @@
 
     /**
+     * Test "newer" query.
+     */
+    @Test
+    void testNewer() {
+        assertQueryEquals("  nwr(newer:\"2021-05-30T20:00:00Z\");\n",
+                "newer:\"2021-05-30T20:00:00Z\"");
+    }
+
+    /**
      * Test building an Overpass query based on a preset name.
      */