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

Timestamp:

2021-04-11T21:56:50+02:00 (4 years ago)

Author:

simon04

Message:

see #14176 - Migrate OsmPrimitive to Instant

File:

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

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

@@ -741 +741 @@
             String mv;
             if ("timestamp".equals(key) && osm instanceof OsmPrimitive) {
-                mv = DateUtils.fromTimestamp(((OsmPrimitive) osm).getRawTimestamp());
+                mv = ((OsmPrimitive) osm).getInstant().toString();
             } else {
                 mv = osm.get(key);
@@ -1493 +1493 @@
             try {
                 // if min timestamp is empty: use lowest possible date
-                minDate = DateUtils.fromString(rangeA1.isEmpty() ? "1980" : rangeA1).getTime();
+                minDate = DateUtils.parseInstant(rangeA1.isEmpty() ? "1980" : rangeA1).toEpochMilli();
             } catch (UncheckedParseException | DateTimeException ex) {
                 throw new SearchParseError(tr("Cannot parse timestamp ''{0}''", rangeA1), ex);
@@ -1499 +1499 @@
             try {
                 // if max timestamp is empty: use "now"
-                maxDate = rangeA2.isEmpty() ? System.currentTimeMillis() : DateUtils.fromString(rangeA2).getTime();
+                maxDate = rangeA2.isEmpty() ? System.currentTimeMillis() : DateUtils.parseInstant(rangeA2).toEpochMilli();
             } catch (UncheckedParseException | DateTimeException ex) {
                 throw new SearchParseError(tr("Cannot parse timestamp ''{0}''", rangeA2), ex);
@@ -1508 +1508 @@
         @Override
         protected Long getNumber(OsmPrimitive osm) {
-            return osm.getTimestamp().getTime();
+            return osm.getInstant().toEpochMilli();
         }