Changeset 17988 in josm for trunk

Timestamp:

2021-07-10T23:26:59+02:00 (4 years ago)

Author:

Don-vip

Message:

fix #21021 - proper fix of "newer" keyword, handling both formats (date and duration)

Location:

trunk

Files:

• 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/io/OverpassDownloadReaderTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/SearchCompilerQueryWizardTest.java (modified) (1 diff)

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

@@ -46 +46 @@
 import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -243 +244 @@
     }
 
-    static String date(String humanDuration, LocalDateTime from) {
+    static String date(String dateOrHumanDuration, LocalDateTime from) {
+        try {
+            return DateUtils.parseInstant(dateOrHumanDuration).toString();
+        } catch (UncheckedParseException e) {
+            Logging.trace(e);
+        }
+        return duration(dateOrHumanDuration, from);
+    }
+
+    static String duration(String humanDuration, LocalDateTime from) {
         // Convert to ISO 8601. Replace months by X temporarily to avoid conflict with minutes
         String duration = humanDuration.toLowerCase(Locale.ENGLISH).replace(" ", "")

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

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

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

@@ -120 +120 @@
     @Test
     public void testDateNewer() {
-        final String query = getExpandedQuery("type:node and newer:3minutes");
+        String query = getExpandedQuery("type:node and newer:3minutes");
         String statement = query.substring(query.indexOf("node(newer:\"") + 12, query.lastIndexOf("\");"));
+        assertNotNull(DateUtils.fromString(statement));
+
+        query = getExpandedQuery("type:node and newer:\"2021-05-30T20:00:00Z\"");
+        statement = query.substring(query.indexOf("node(newer:\"") + 12, query.lastIndexOf("\");"));
         assertNotNull(DateUtils.fromString(statement));
     }

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

@@ -221 +221 @@
     @Test
     void testNewer() {
-        assertQueryEquals("  nwr(newer:\"2021-05-30T20:00:00Z\");\n",
+        assertQueryEquals("  nwr(newer:\"{{date:3minutes}}\");\n",
+                "newer:3minutes");
+
+        assertQueryEquals("  nwr(newer:\"{{date:2021-05-30T20:00:00Z}}\");\n",
                 "newer:\"2021-05-30T20:00:00Z\"");
     }