Ticket #17576: 17576-timezones-V2.diff

src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -36 +36 @@
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
@@ -540 +539 @@
      *
      */
     private class SetOffsetActionListener implements ActionListener {
+        JCheckBox ckDst;
+        ImageDisplay imgDisp;
+        JLabel lbExifTime;
+        JosmTextField tfGpsTime;
 
+        class TimeZoneItem implements Comparable<TimeZoneItem> {
+            private TimeZone tz;
+            private String rawString;
+            private String dstString;
+
+            public TimeZoneItem(TimeZone tz) {
+                this.tz = tz;
+            }
+
+            public String getFormattedString() {
+                if (ckDst.isSelected()) {
+                    return getDstString();
+                } else {
+                    return getRawString();
+                }
+            }
+
+            public String getDstString() {
+                if (dstString == null) {
+                    dstString = formatTimezone(tz.getRawOffset() + tz.getDSTSavings());
+                }
+                return dstString;
+            }
+
+            public String getRawString() {
+                if (rawString == null) {
+                    rawString = formatTimezone(tz.getRawOffset());
+                }
+                return rawString;
+            }
+
+            public String getID() {
+                return tz.getID();
+            }
+
+            @Override
+            public String toString() {
+                return getID() + " (" + getFormattedString() + ")";
+            }
+
+            @Override
+            public int compareTo(TimeZoneItem o) {
+                return getID().compareTo(o.getID());
+            }
+
+            private String formatTimezone(int offset) {
+                return new GpxTimezone((double) offset / TimeUnit.HOURS.toMillis(1)).formatTimezone();
+            }
+        }
+
         @Override
         public void actionPerformed(ActionEvent arg0) {
             SimpleDateFormat dateFormat = (SimpleDateFormat) DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
@@ -551 +604 @@
                     + "And then, simply capture the time you read on the photo and select a timezone<hr></html>")),
                     BorderLayout.NORTH);
 
-            ImageDisplay imgDisp = new ImageDisplay();
+            imgDisp = new ImageDisplay();
             imgDisp.setPreferredSize(new Dimension(300, 225));
             panel.add(imgDisp, BorderLayout.CENTER);
 
@@ -565 +618 @@
             gc.anchor = GridBagConstraints.WEST;
             panelTf.add(new JLabel(tr("Photo time (from exif):")), gc);
 
-            JLabel lbExifTime = new JLabel();
+            lbExifTime = new JLabel();
             gc.gridx = 1;
             gc.weightx = 1.0;
             gc.fill = GridBagConstraints.HORIZONTAL;
@@ -580 +633 @@
             gc.anchor = GridBagConstraints.WEST;
             panelTf.add(new JLabel(tr("Gps time (read from the above photo): ")), gc);
 
-            JosmTextField tfGpsTime = new JosmTextField(12);
+            tfGpsTime = new JosmTextField(12);
             tfGpsTime.setEnabled(false);
             tfGpsTime.setMinimumSize(new Dimension(155, tfGpsTime.getMinimumSize().height));
             gc.gridx = 1;
@@ -598 +651 @@
             gc.weightx = gc.weighty = 0.0;
             gc.fill = GridBagConstraints.NONE;
             gc.anchor = GridBagConstraints.WEST;
-            panelTf.add(new JLabel(tr("I am in the timezone of: ")), gc);
+            panelTf.add(new JLabel(tr("Photo taken in the timezone of: ")), gc);
 
+            ckDst = new JCheckBox(tr("Use daylight saving time (where applicable)"), Config.getPref().getBoolean("geoimage.timezoneid.dst"));
+
             String[] tmp = TimeZone.getAvailableIDs();
-            List<String> vtTimezones = new ArrayList<>(tmp.length);
+            List<TimeZoneItem> vtTimezones = new ArrayList<>(tmp.length);
 
+            String defTzStr = Config.getPref().get("geoimage.timezoneid", "");
+            if (defTzStr.isEmpty()) {
+                defTzStr = TimeZone.getDefault().getID();
+            }
+            TimeZoneItem defTzItem = null;
+
             for (String tzStr : tmp) {
-                TimeZone tz = TimeZone.getTimeZone(tzStr);
-
-                String tzDesc = tzStr + " (" +
-                        new GpxTimezone(((double) tz.getRawOffset()) / TimeUnit.HOURS.toMillis(1)).formatTimezone() +
-                        ')';
-                vtTimezones.add(tzDesc);
+                TimeZoneItem tz = new TimeZoneItem(TimeZone.getTimeZone(tzStr));
+                vtTimezones.add(tz);
+                if (defTzStr.equals(tzStr)) {
+                    defTzItem = tz;
+                }
             }
 
             Collections.sort(vtTimezones);
 
-            JosmComboBox<String> cbTimezones = new JosmComboBox<>(vtTimezones.toArray(new String[0]));
+            JosmComboBox<TimeZoneItem> cbTimezones = new JosmComboBox<>(vtTimezones.toArray(new TimeZoneItem[0]));
 
-            String tzId = Config.getPref().get("geoimage.timezoneid", "");
-            TimeZone defaultTz;
-            if (tzId.isEmpty()) {
-                defaultTz = TimeZone.getDefault();
-            } else {
-                defaultTz = TimeZone.getTimeZone(tzId);
+            if (defTzItem != null) {
+                cbTimezones.setSelectedItem(defTzItem);
             }
 
-            cbTimezones.setSelectedItem(defaultTz.getID() + " (" +
-                    new GpxTimezone(((double) defaultTz.getRawOffset()) / TimeUnit.HOURS.toMillis(1)).formatTimezone() +
-                    ')');
-
             gc.gridx = 1;
             gc.weightx = 1.0;
             gc.gridwidth = 2;
@@ -634 +686 @@
             gc.fill = GridBagConstraints.HORIZONTAL;
             panelTf.add(cbTimezones, gc);
 
+            gc.gridy = 3;
+            panelTf.add(ckDst, gc);
+
+            ckDst.addActionListener(l -> {
+                cbTimezones.repaint();
+            });
+
             panel.add(panelTf, BorderLayout.SOUTH);
 
             JPanel panelLst = new JPanel(new BorderLayout());
@@ -653 +712 @@
             imgList.getSelectionModel().addListSelectionListener(evt -> {
                 int index = imgList.getSelectedIndex();
                 ImageEntry img = yLayer.getImageData().getImages().get(index);
-                imgDisp.setImage(img);
-                Date date = img.getExifTime();
-                if (date != null) {
-                    DateFormat df = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
-                    lbExifTime.setText(df.format(date));
-                    tfGpsTime.setText(df.format(date));
-                    tfGpsTime.setCaretPosition(tfGpsTime.getText().length());
-                    tfGpsTime.setEnabled(true);
-                    tfGpsTime.requestFocus();
-                } else {
-                    lbExifTime.setText(tr("No date"));
-                    tfGpsTime.setText("");
-                    tfGpsTime.setEnabled(false);
-                }
+                updateExifComponents(img);
             });
             panelLst.add(new JScrollPane(imgList), BorderLayout.CENTER);
 
@@ -678 +724 @@
                     return;
                 ImageEntry entry = new ImageEntry(fc.getSelectedFile());
                 entry.extractExif();
-                imgDisp.setImage(entry);
-
-                Date date = entry.getExifTime();
-                if (date != null) {
-                    lbExifTime.setText(DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM).format(date));
-                    tfGpsTime.setText(DateUtils.getDateFormat(DateFormat.SHORT).format(date)+' ');
-                    tfGpsTime.setEnabled(true);
-                } else {
-                    lbExifTime.setText(tr("No date"));
-                    tfGpsTime.setText("");
-                    tfGpsTime.setEnabled(false);
-                }
+                updateExifComponents(entry);
             });
             panelLst.add(openButton, BorderLayout.PAGE_END);
 
@@ -718 +753 @@
                     continue;
                 }
 
-                String selectedTz = (String) cbTimezones.getSelectedItem();
-                int pos = selectedTz.lastIndexOf('(');
-                tzId = selectedTz.substring(0, pos - 1);
-                String tzValue = selectedTz.substring(pos + 1, selectedTz.length() - 1);
+                TimeZoneItem selectedTz = (TimeZoneItem) cbTimezones.getSelectedItem();
 
-                Config.getPref().put("geoimage.timezoneid", tzId);
+                Config.getPref().put("geoimage.timezoneid", selectedTz.getID());
+                Config.getPref().putBoolean("geoimage.timezoneid.dst", ckDst.isSelected());
                 tfOffset.setText(GpxTimeOffset.milliseconds(delta).formatOffset());
-                tfTimezone.setText(tzValue);
+                tfTimezone.setText(selectedTz.getFormattedString());
 
                 isOk = true;
 
@@ -733 +766 @@
             statusBarUpdater.updateStatusBar();
             yLayer.updateBufferAndRepaint();
         }
+
+        void updateExifComponents(ImageEntry img) {
+            imgDisp.setImage(img);
+            Date date = img.getExifTime();
+            if (date != null) {
+                DateFormat df = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM);
+                df.setTimeZone(DateUtils.UTC); //EXIF data does not contain timezone information and is read as UTC
+                lbExifTime.setText(df.format(date));
+                tfGpsTime.setText(df.format(date));
+                tfGpsTime.setCaretPosition(tfGpsTime.getText().length());
+                tfGpsTime.setEnabled(true);
+                tfGpsTime.requestFocus();
+            } else {
+                lbExifTime.setText(tr("No date"));
+                tfGpsTime.setText("");
+                tfGpsTime.setEnabled(false);
+            }
+        }
     }
 
     private class GpxLayerAddedListener implements LayerChangeListener {
@@ -817 +868 @@
         JPanel panelTf = new JPanel(new GridBagLayout());
 
         try {
-            timezone = GpxTimezone.parseTimezone(Optional.ofNullable(Config.getPref().get("geoimage.timezone", "0:00")).orElse("0:00"));
+            String tz = Config.getPref().get("geoimage.timezone");
+            if (!tz.isEmpty()) {
+                timezone = GpxTimezone.parseTimezone(tz);
+            } else {
+                timezone = new GpxTimezone(TimeUnit.MILLISECONDS.toMinutes(TimeZone.getDefault().getRawOffset()) / 60.); //hours is double
+            }
         } catch (ParseException e) {
             timezone = GpxTimezone.ZERO;
             Logging.trace(e);
@@ -1054 +1110 @@
             if (selGpx == null)
                 return tr("No gpx selected");
 
-            final long offsetMs = ((long) (timezone.getHours() * TimeUnit.HOURS.toMillis(-1))) + delta.getMilliseconds(); // in milliseconds
+            final long offsetMs = ((long) (timezone.getHours() * TimeUnit.HOURS.toMillis(1))) + delta.getMilliseconds(); // in milliseconds
             lastNumMatched = GpxImageCorrelation.matchGpxTrack(dateImgLst, selGpx.data, offsetMs, forceTags);
 
             return trn("<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>",

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

@@ -6 +6 @@
 import java.text.SimpleDateFormat;
 import java.time.DateTimeException;
 import java.time.Instant;
-import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -100 +99 @@
                 parsePart2(str, 14),
                 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) {
                 final int plusHr = parsePart2(str, 20);
@@ -122 +120 @@
                 parsePart2(str, 14),
                 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) {
                 final int plusHr = parsePart2(str, 24);