Changeset 17988 in josm for trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

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)

File:

• trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java (modified) (2 diffs)

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(" ", "")