Ticket #24347: ticket_24347.patch

src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java

@@ -76 +76 @@
         final GpxImageDirectionPositionSettings dirpos = settings.getDirectionPositionSettings();
         final GpxImageDatumSettings datumSettings = settings.getDatumSettings();
         final long offset = settings.getOffset();
+        final TimeSource imgTimeSource = settings.getImgTimeSource();
 
         boolean isFirst = true;
         long prevWpTime = 0;
@@ -144 +145 @@
                         }
                     }
                     WayPoint nextWp = i < size - 1 ? wps.get(i + 1) : null;
-                    ret += matchPoints(images, prevWp, prevWpTime, curWp, curWpTime, offset,
+                    ret += matchPoints(images, prevWp, prevWpTime, curWp, curWpTime, imgTimeSource, offset,
                                        interpolate, tagTime, nextWp, dirpos, datumSettings);
                     prevWp = curWp;
                     prevWpTime = curWpTime;
@@ -152 +153 @@
             }
         }
         if (trkTag && prevWp != null) {
-            ret += matchPoints(images, prevWp, prevWpTime, prevWp, prevWpTime, offset,
+            ret += matchPoints(images, prevWp, prevWpTime, prevWp, prevWpTime, imgTimeSource, offset,
                                false, trkTagTime, null, dirpos, datumSettings);
         }
         Logging.debug("Correlated {0} total points", ret);
@@ -361 +362 @@
                                         long prevWpTime,
                                         WayPoint curWp,
                                         long curWpTime,
+                                        TimeSource imgTimeSource,
                                         long offset,
                                         boolean interpolate,
                                         int tagTime,
@@ -375 +377 @@
         if (isLast) {
             i = images.size() - 1;
         } else {
-            i = getLastIndexOfListBefore(images, curWpTime);
+            i = getLastIndexOfListBefore(images, curWpTime, imgTimeSource);
         }
 
         if (Logging.isDebugEnabled()) {
@@ -426 +428 @@
             while (i >= 0) {
                 final GpxImageEntry curImg = images.get(i);
                 final GpxImageEntry curTmp = curImg.getTmp();
-                final long time = curImg.getExifInstant().toEpochMilli();
+                final long time = curImg.getThisInstant(imgTimeSource).toEpochMilli();
                 if ((!isLast && time > curWpTime) || time < prevWpTime) {
                     break;
                 }
@@ -459 +461 @@
             LatLon nextCoorForDirection = nextWp.getCoor();
             while (i >= 0) {
                 final GpxImageEntry curImg = images.get(i);
-                final long imgTime = curImg.getExifInstant().toEpochMilli();
+                final long imgTime = curImg.getThisInstant(imgTimeSource).toEpochMilli();
                 if (imgTime < prevWpTime) {
                     break;
                 }
@@ -547 +549 @@
                             curTmp.setExifGpsDatum("WGS-84");
                     }
 
-                    curTmp.setGpsTime(curImg.getExifInstant().minusMillis(offset));
+                    curTmp.setGpsTime(curImg.getThisInstant(imgTimeSource).minusMillis(offset));
                     curTmp.flagNewGpsData();
                     curImg.tmpUpdated();
 
@@ -578 +580 @@
      * @param searchedTime time to search
      * @return index of last image before given time
      */
-    private static int getLastIndexOfListBefore(List<? extends GpxImageEntry> images, long searchedTime) {
+    private static int getLastIndexOfListBefore(List<? extends GpxImageEntry> images, long searchedTime, TimeSource imgTimeSource) {
         int lstSize = images.size();
 
         // No photos or the first photo taken is later than the search period
-        if (lstSize == 0 || searchedTime < images.get(0).getExifInstant().toEpochMilli())
+        if (lstSize == 0 || searchedTime < images.get(0).getThisInstant(imgTimeSource).toEpochMilli())
             return -1;
 
         // The search period is later than the last photo
-        if (searchedTime > images.get(lstSize - 1).getExifInstant().toEpochMilli())
+        if (searchedTime > images.get(lstSize - 1).getThisInstant(imgTimeSource).toEpochMilli())
             return lstSize-1;
 
         // The searched index is somewhere in the middle, do a binary search from the beginning
@@ -595 +597 @@
         int endIndex = lstSize-1;
         while (endIndex - startIndex > 1) {
             curIndex = (endIndex + startIndex) / 2;
-            if (searchedTime > images.get(curIndex).getExifInstant().toEpochMilli()) {
+            if (searchedTime > images.get(curIndex).getThisInstant(imgTimeSource).toEpochMilli()) {
                 startIndex = curIndex;
             } else {
                 endIndex = curIndex;
             }
         }
-        if (searchedTime < images.get(endIndex).getExifInstant().toEpochMilli())
+        if (searchedTime < images.get(endIndex).getThisInstant(imgTimeSource).toEpochMilli())
             return startIndex;
 
         // This final loop is to check if photos with the exact same EXIF time follows
-        while ((endIndex < (lstSize - 1)) && (images.get(endIndex).getExifInstant().toEpochMilli()
-                == images.get(endIndex + 1).getExifInstant().toEpochMilli())) {
+        while ((endIndex < (lstSize - 1)) && (images.get(endIndex).getThisInstant(imgTimeSource).toEpochMilli()
+                == images.get(endIndex + 1).getThisInstant(imgTimeSource).toEpochMilli())) {
             endIndex++;
         }
         return endIndex;

src/org/openstreetmap/josm/data/gpx/GpxImageCorrelationSettings.java

@@ -11 +11 @@
 
     private final long offset;
     private final boolean forceTags;
+    private final TimeSource imgTimeSource;
     private final GpxImageDirectionPositionSettings directionPositionSettings;
     private final GpxImageDatumSettings datumSettings;
 
@@ -20 +21 @@
      * @param forceTags force tagging of all photos, otherwise prefs are used
      */
     public GpxImageCorrelationSettings(long offset, boolean forceTags) {
-        this(offset, forceTags,
+        this(offset, forceTags, TimeSource.EXIFCAMTIME,
         new GpxImageDirectionPositionSettings(false, 0, false, 0, 0, 0),
         new GpxImageDatumSettings(false, null)
         );
@@ -30 +31 @@
      * Constructs a new {@code GpxImageCorrelationSettings}.
      * @param offset offset in milliseconds
      * @param forceTags force tagging of all photos, otherwise prefs are used
+     * @param imgTimeSource select image clock source: 
+     *                      "exifCamTime" for camera internal clock
+     *                      "exifGpsTime for the GPS clock of the camera
      * @param directionPositionSettings direction/position settings
+     * @since xxx @imgTimeSource was added
      */
-    public GpxImageCorrelationSettings(long offset, boolean forceTags,
+    public GpxImageCorrelationSettings(long offset, boolean forceTags, TimeSource imgTimeSource,
             GpxImageDirectionPositionSettings directionPositionSettings) {
-        this(offset, forceTags, directionPositionSettings,
+        this(offset, forceTags, imgTimeSource, directionPositionSettings,
         new GpxImageDatumSettings(false, null));
     }
 
@@ -42 +47 @@
      * Constructs a new {@code GpxImageCorrelationSettings}.
      * @param offset offset in milliseconds
      * @param forceTags force tagging of all photos, otherwise prefs are used
+     * @param imgTimeSource select image clock source: 
+     *                      "exifCamTime" for camera internal clock
+     *                      "exifGpsTime for the GPS clock of the camera
      * @param directionPositionSettings direction/position settings
      * @param datumSettings GPS datum settings
      * @since 19387 @datumSettings was added
+     * @since xxx @imgTimeSource was added
      */
-    public GpxImageCorrelationSettings(long offset, boolean forceTags,
+    public GpxImageCorrelationSettings(long offset, boolean forceTags, TimeSource imgTimeSource,
             GpxImageDirectionPositionSettings directionPositionSettings,
             GpxImageDatumSettings datumSettings) {
         this.offset = offset;
         this.forceTags = forceTags;
+        this.imgTimeSource = imgTimeSource;
         this.directionPositionSettings = Objects.requireNonNull(directionPositionSettings);
         this.datumSettings = Objects.requireNonNull(datumSettings);
     }
@@ -71 +81 @@
         return forceTags;
     }
 
+    /**
+     * Return the selected image clock source, which is camera internal time, or GPS time
+     * @return the clock source
+     * @since xxx
+     */
+    public TimeSource getImgTimeSource() {
+        return imgTimeSource;
+    }
+
     /**
      * Returns the direction/position settings.
      * @return the direction/position settings
@@ -91 +110 @@
     @Override
     public String toString() {
         return "[offset=" + offset + ", forceTags=" + forceTags
+                + ", clock source=" + imgTimeSource
                 + ", directionPositionSettings=" + directionPositionSettings
                 + ", datumSettings=" + datumSettings + ']';
     }

src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java

@@ -336 +336 @@
         return exifGpsTime != null;
     }
 
+    /**
+     * Return the time value selected with the parameter.
+     * @param timeSource the wanted time value, exifCamTime or exifGpsTime
+     * @return exifInstant or exifGpsInstant value
+     * @since xxx
+     */
+    @Override
+    public Instant getThisInstant(TimeSource timeSource) {
+        switch (timeSource) {
+            case EXIFGPSTIME:
+                return getExifGpsInstant();
+            case EXIFCAMTIME:
+                return getExifInstant();
+        }
+        return null;
+    }
+
     private static Date getDefensiveDate(Instant date) {
         if (date == null)
             return null;

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

@@ -32 +32 @@
 
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JRadioButton;
 import javax.swing.JSeparator;
 import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
@@ -56 +58 @@
 import org.openstreetmap.josm.data.gpx.GpxImageDatumSettings;
 import org.openstreetmap.josm.data.gpx.GpxTimeOffset;
 import org.openstreetmap.josm.data.gpx.GpxTimezone;
+import org.openstreetmap.josm.data.gpx.TimeSource;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -88 +91 @@
 
     private static JosmComboBoxModel<GpxDataWrapper> gpxModel;
     private static boolean forceTags;
+    private static TimeSource imgTimeSource;
 
     private final transient GeoImageLayer yLayer;
     private transient CorrelationSupportLayer supportLayer;
@@ -253 +257 @@
     private JButton buttonSupport;
     private JosmTextField tfTimezone;
     private JosmTextField tfOffset;
+    private JRadioButton rbTimeFromCamera;
+    private JRadioButton rbTimeFromGps;
     private JCheckBox cbExifImg;
     private JCheckBox cbTaggedImg;
     private JCheckBox cbShowThumbs;
@@ -520 +526 @@
         tfOffset = new JosmTextField(10);
         tfOffset.setText(delta.formatOffset());
 
+        // Image Time/Clock source choice 
+        rbTimeFromCamera = new JRadioButton(tr("Camera clock"));
+        rbTimeFromCamera.setSelected(true);
+        rbTimeFromGps = new JRadioButton(tr("Camera GPS clock"));        
+        ButtonGroup timeSourceGroup = new ButtonGroup();
+        timeSourceGroup.add(rbTimeFromCamera);
+        timeSourceGroup.add(rbTimeFromGps);
+
         JButton buttonViewGpsPhoto = new JButton(tr("<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"));
         buttonViewGpsPhoto.setIcon(ImageProvider.get("clock"));
         buttonViewGpsPhoto.addActionListener(new SetOffsetActionListener());
@@ -586 +600 @@
         gbc.gridx = 3;
         panelTf.add(buttonAdjust, gbc);
 
+        // Image time source choice
+        gbc = GBC.eol();
+        gbc.gridx = 0;
+        gbc.gridy = y++;
+        panelTf.add(new JLabel(tr("Image time source:")), gbc);
+
+        gbc = GBC.eol();
+        gbc.gridx = 1;
+        gbc.gridy = y++;
+        panelTf.add(rbTimeFromCamera, gbc);
+
+        gbc = GBC.eol();
+        gbc.gridx = 1;
+        gbc.gridy = y++;
+        panelTf.add(rbTimeFromGps, gbc);
+
         gbc = GBC.eol().grid(0, y++).fill(GridBagConstraints.HORIZONTAL).insets(0, 12, 0, 0);
         panelTf.add(new JSeparator(SwingConstants.HORIZONTAL), gbc);
         panelTf.add(labelPosition, GBC.eol().grid(0, y++));
@@ -619 +649 @@
         //TODO An AutoCompComboBox would be nice to list the recent datum values. I don't have the skill to add it.
         tfDatum = new JosmTextField(loadGpsDatum(), 8);
         tfDatum.setToolTipText(tr("<html>Enter the datum for your images coordinates. Default value is WGS-84.<br>" + 
-                                "For RTK it could be your local CRS epsg code.<br>(e.g. EPSG:9782 for France mainland.)</html>"));
+                                "For RTK it could be your local CRS epsg code.<br>(e.g. EPSG:9781 for France mainland.)</html>"));
         tfDatum.setEnabled(false);
 
         expertPanel.add(labelExtTags, GBC.eol().grid(0, 1));
@@ -651 +681 @@
 
         tfTimezone.getDocument().addDocumentListener(statusBarUpdater);
         tfOffset.getDocument().addDocumentListener(statusBarUpdater);
+        rbTimeFromCamera.addItemListener(statusBarUpdaterWithRepaint);
+        rbTimeFromGps.addItemListener(statusBarUpdaterWithRepaint);
         cbExifImg.addItemListener(statusBarUpdaterWithRepaint);
         cbTaggedImg.addItemListener(statusBarUpdaterWithRepaint);
         cbAddGpsDatum.addItemListener(statusBarUpdaterWithRepaint);
@@ -783 +815 @@
                 return e.getMessage();
             }
 
+            // Set image time source from the radio button status
+            if (rbTimeFromGps.isSelected()) {
+                imgTimeSource = TimeSource.EXIFGPSTIME;
+            } else {
+                imgTimeSource = TimeSource.EXIFCAMTIME;
+            }
+
             // The selection of images we are about to correlate may have changed.
             // So reset all images.
             yLayer.discardTmp();
@@ -799 +838 @@
             final long offsetMs = ((long) (timezone.getHours() * TimeUnit.HOURS.toMillis(1))) + delta.getMilliseconds(); // in milliseconds
             lastNumMatched = GpxImageCorrelation.matchGpxTrack(dateImgLst, selGpx.data,
                     pDirectionPosition.isVisible() ?
-                            new GpxImageCorrelationSettings(offsetMs, forceTags, pDirectionPosition.getSettings(),
+                            new GpxImageCorrelationSettings(offsetMs, forceTags, imgTimeSource, pDirectionPosition.getSettings(),
                                                             new GpxImageDatumSettings(cbAddGpsDatum.isSelected(), tfDatum.getText())) :
                             new GpxImageCorrelationSettings(offsetMs, forceTags));
 

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

@@ -16 +16 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.gpx.GpxImageCorrelation;
 import org.openstreetmap.josm.data.gpx.GpxImageCorrelationSettings;
+import org.openstreetmap.josm.data.gpx.TimeSource;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.geoimage.CorrelateGpxWithImages.RepaintTheMapListener;
@@ -82 +83 @@
             // Create a temporary copy for each image
             dateImgLst.forEach(ie -> ie.createTmp().unflagNewGpsData());
             GpxImageCorrelation.matchGpxTrack(dateImgLst, yLayer.getFauxGpxData(),
-                            new GpxImageCorrelationSettings(0, false, pDirectionPosition.getSettings()));
+                            new GpxImageCorrelationSettings(0, false, TimeSource.EXIFCAMTIME, pDirectionPosition.getSettings()));
             yLayer.updateBufferAndRepaint();
         }
     }

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

@@ -11 +11 @@
 import java.util.List;
 
 import org.openstreetmap.josm.data.coor.ILatLon;
+import org.openstreetmap.josm.data.gpx.TimeSource;
 import org.openstreetmap.josm.data.imagery.street_level.Projections;
 
 /**
@@ -115 +116 @@
      */
     boolean hasExifGpsTime();
 
+    /**
+     * Return the time value selected with the parameter.
+     * @param timeSource the wanted time value, exifCamTime or exifGpsTime
+     * @return exifInstant or exifGpsInstant value
+     * @since xxx
+     */
+    Instant getThisInstant(TimeSource timeSource);
+
     /**
      * Get the EXIF coordinates
      * @return The location of the image

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

@@ -17 +17 @@
 import java.util.function.Supplier;
 
 import org.openstreetmap.josm.data.coor.ILatLon;
+import org.openstreetmap.josm.data.gpx.TimeSource;
 import org.openstreetmap.josm.data.imagery.street_level.IImageEntry;
 import org.openstreetmap.josm.data.imagery.street_level.Projections;
 import org.openstreetmap.josm.tools.HttpClient;
@@ -360 +361 @@
         return this.exifTime != null;
     }
 
+    @Override
+    public Instant getThisInstant(TimeSource timeSource) {
+        return this.getThisInstant(timeSource);
+    }
+
     @Override
     public Instant getExifGpsInstant() {
         return this.exifGpsTime;