Changeset 15045 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2019-05-04T14:17:27+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17576 - Fix timezones and DST for image correlation (patch by Bjoeni, modified)

File:

• trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -7 +7 @@
 import java.time.DateTimeException;
 import java.time.Instant;
-import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
@@ -101 +100 @@
                 parsePart2(str, 17),
                 0,
-                // consider EXIF date in default timezone
-                checkLayout(str, "xxxx:xx:xx xx:xx:xx") ? ZoneId.systemDefault() : ZoneOffset.UTC
+                ZoneOffset.UTC
             );
             if (str.length() == 22 || str.length() == 25) {
@@ -123 +121 @@
                 parsePart2(str, 17),
                 parsePart3(str, 20) * 1_000_000,
-                // consider EXIF date in default timezone
-                checkLayout(str, "xxxx:xx:xx xx:xx:xx.xxx") ? ZoneId.systemDefault() : ZoneOffset.UTC
+                ZoneOffset.UTC
             );
             if (str.length() == 29) {