Changeset 18061 in josm

Timestamp:

2021-07-18T06:58:54+02:00 (3 years ago)

Author:

Don-vip

Message:

see #21131 - Improve GPX image correlation: direction detection and position shift

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java (modified) (11 diffs)
• src/org/openstreetmap/josm/data/gpx/GpxImageCorrelationSettings.java (added)
• src/org/openstreetmap/josm/data/gpx/GpxImageDirectionPositionSettings.java (added)
• src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (13 diffs)
• src/org/openstreetmap/josm/gui/layer/geoimage/ImageDirectionPositionPanel.java (added)
• src/org/openstreetmap/josm/gui/widgets/DefaultTextComponentValidator.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java (modified) (9 diffs)

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

@@ -3 +3 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -25 +30 @@
      * @param images images to match
      * @param selectedGpx selected GPX data
-     * @param offset offset
-     * @param forceTags force tagging of all photos, otherwise prefs are used
+     * @param settings correlation settings
      * @return number of matched points
      */
-    public static int matchGpxTrack(List<? extends GpxImageEntry> images, GpxData selectedGpx, long offset, boolean forceTags) {
+    public static int matchGpxTrack(List<? extends GpxImageEntry> images, GpxData selectedGpx, GpxImageCorrelationSettings settings) {
         int ret = 0;
-
-        long prevWpTime = 0;
-        WayPoint prevWp = null;
-
-        List<List<List<WayPoint>>> trks = new ArrayList<>();
-
-        for (IGpxTrack trk : selectedGpx.tracks) {
-            List<List<WayPoint>> segs = new ArrayList<>();
-            for (IGpxTrackSegment seg : trk.getSegments()) {
-                List<WayPoint> wps = new ArrayList<>(seg.getWayPoints());
-                if (!wps.isEmpty()) {
-                    //remove waypoints at the beginning of the track/segment without timestamps
-                    int wp;
-                    for (wp = 0; wp < wps.size(); wp++) {
-                        if (wps.get(wp).hasDate()) {
-                            break;
-                        }
-                    }
-                    if (wp == 0) {
-                        segs.add(wps);
-                    } else if (wp < wps.size()) {
-                        segs.add(wps.subList(wp, wps.size()));
-                    }
-                }
-            }
-            //sort segments by first waypoint
-            if (!segs.isEmpty()) {
-                segs.sort((o1, o2) -> {
-                    if (o1.isEmpty() || o2.isEmpty())
-                        return 0;
-                    return o1.get(0).compareTo(o2.get(0));
-                });
-                trks.add(segs);
-            }
-        }
-        //sort tracks by first waypoint of first segment
-        trks.sort((o1, o2) -> {
-            if (o1.isEmpty() || o1.get(0).isEmpty()
-             || o2.isEmpty() || o2.get(0).isEmpty())
-                return 0;
-            return o1.get(0).get(0).compareTo(o2.get(0).get(0));
-        });
 
         boolean trkInt, trkTag, segInt, segTag;
         int trkTime, trkDist, trkTagTime, segTime, segDist, segTagTime;
 
-        if (forceTags) { //temporary option to override advanced settings and activate all possible interpolations / tagging methods
+        if (settings.isForceTags()) {
+            // temporary option to override advanced settings and activate all possible interpolations / tagging methods
             trkInt = trkTag = segInt = segTag = true;
             trkTime = trkDist = trkTagTime = segTime = segDist = segTagTime = Integer.MAX_VALUE;
@@ -102 +65 @@
                     Config.getPref().getInt("geoimage.seg.tag.time.val", 2) : Integer.MAX_VALUE;
         }
+
+        final GpxImageDirectionPositionSettings dirpos = settings.getDirectionPositionSettings();
+        final long offset = settings.getOffset();
+
         boolean isFirst = true;
-
-        for (int t = 0; t < trks.size(); t++) {
-            List<List<WayPoint>> segs = trks.get(t);
-            for (int s = 0; s < segs.size(); s++) {
-                List<WayPoint> wps = segs.get(s);
+        long prevWpTime = 0;
+        WayPoint prevWp = null;
+
+        for (List<List<WayPoint>> segs : loadTracks(selectedGpx.tracks)) {
+            boolean firstSegment = true;
+            for (List<WayPoint> wps : segs) {
                 for (int i = 0; i < wps.size(); i++) {
-                    WayPoint curWp = wps.get(i);
+                    final WayPoint curWp = wps.get(i);
                     // Interpolate timestamps in the segment, if one or more waypoints miss them
                     if (!curWp.hasDate()) {
@@ -142 +110 @@
                     int tagTime = 0;
                     if (i == 0) {
-                        if (s == 0) { //First segment of the track, so apply settings for tracks
+                        if (firstSegment) {
+                            // First segment of the track, so apply settings for tracks
+                            firstSegment = false;
                             if (!trkInt || isFirst || prevWp == null ||
                                     Math.abs(curWpTime - prevWpTime) > TimeUnit.MINUTES.toMillis(trkTime) ||
@@ -152 +122 @@
                                 }
                             }
-                        } else { //Apply settings for segments
+                        } else {
+                            // Apply settings for segments
                             if (!segInt || prevWp == null ||
                                     Math.abs(curWpTime - prevWpTime) > TimeUnit.MINUTES.toMillis(segTime) ||
@@ -163 +134 @@
                         }
                     }
-                    ret += matchPoints(images, prevWp, prevWpTime, curWp, curWpTime, offset, interpolate, tagTime, false);
+                    ret += matchPoints(images, prevWp, prevWpTime, curWp, curWpTime, offset, interpolate, tagTime, false, dirpos);
                     prevWp = curWp;
                     prevWpTime = curWpTime;
@@ -170 +141 @@
         }
         if (trkTag && prevWp != null) {
-            ret += matchPoints(images, prevWp, prevWpTime, prevWp, prevWpTime, offset, false, trkTagTime, true);
+            ret += matchPoints(images, prevWp, prevWpTime, prevWp, prevWpTime, offset, false, trkTagTime, true, dirpos);
         }
         return ret;
+    }
+
+    static List<List<List<WayPoint>>> loadTracks(Collection<IGpxTrack> tracks) {
+        List<List<List<WayPoint>>> trks = new ArrayList<>();
+        for (IGpxTrack trk : tracks) {
+            List<List<WayPoint>> segs = new ArrayList<>();
+            for (IGpxTrackSegment seg : trk.getSegments()) {
+                List<WayPoint> wps = new ArrayList<>(seg.getWayPoints());
+                if (!wps.isEmpty()) {
+                    //remove waypoints at the beginning of the track/segment without timestamps
+                    int wp;
+                    for (wp = 0; wp < wps.size(); wp++) {
+                        if (wps.get(wp).hasDate()) {
+                            break;
+                        }
+                    }
+                    if (wp == 0) {
+                        segs.add(wps);
+                    } else if (wp < wps.size()) {
+                        segs.add(wps.subList(wp, wps.size()));
+                    }
+                }
+            }
+            //sort segments by first waypoint
+            if (!segs.isEmpty()) {
+                segs.sort((o1, o2) -> {
+                    if (o1.isEmpty() || o2.isEmpty())
+                        return 0;
+                    return o1.get(0).compareTo(o2.get(0));
+                });
+                trks.add(segs);
+            }
+        }
+        //sort tracks by first waypoint of first segment
+        trks.sort((o1, o2) -> {
+            if (o1.isEmpty() || o1.get(0).isEmpty()
+             || o2.isEmpty() || o2.get(0).isEmpty())
+                return 0;
+            return o1.get(0).get(0).compareTo(o2.get(0).get(0));
+        });
+        return trks;
     }
 
@@ -190 +202 @@
 
     private static int matchPoints(List<? extends GpxImageEntry> images, WayPoint prevWp, long prevWpTime, WayPoint curWp, long curWpTime,
-            long offset, boolean interpolate, int tagTime, boolean isLast) {
+            long offset, boolean interpolate, int tagTime, boolean isLast, GpxImageDirectionPositionSettings dirpos) {
 
         int ret = 0;
@@ -218 +230 @@
         }
 
-        Double curElevation = getElevation(curWp);
+        final Double curElevation = getElevation(curWp);
 
         if (!interpolate || isLast) {
@@ -250 +262 @@
             // previous track point assuming a constant speed in between
             while (i >= 0) {
-                GpxImageEntry curImg = images.get(i);
-                GpxImageEntry curTmp = curImg.getTmp();
+                final GpxImageEntry curImg = images.get(i);
+                final GpxImageEntry curTmp = curImg.getTmp();
                 final long imgTime = curImg.getExifInstant().toEpochMilli();
                 if (imgTime < prevWpTime) {
@@ -258 +270 @@
                 if (!curTmp.hasNewGpsData()) {
                     // The values of timeDiff are between 0 and 1, it is not seconds but a dimensionless variable
-                    double timeDiff = (double) (imgTime - prevWpTime) / Math.abs(curWpTime - prevWpTime);
-                    curTmp.setPos(prevWp.getCoor().interpolate(curWp.getCoor(), timeDiff));
+                    final double timeDiff = (double) (imgTime - prevWpTime) / Math.abs(curWpTime - prevWpTime);
+                    final boolean shiftXY = dirpos.getShiftImageX() != 0d || dirpos.getShiftImageY() != 0d;
+                    final LatLon prevCoor = prevWp.getCoor();
+                    final LatLon curCoor = curWp.getCoor();
+                    LatLon position = prevCoor.interpolate(curCoor, timeDiff);
+                    if (shiftXY || dirpos.isSetImageDirection()) {
+                        double direction = prevCoor.bearing(curCoor);
+                        if (dirpos.isSetImageDirection()) {
+                            curTmp.setExifImgDir((Utils.toDegrees(direction) + dirpos.getImageDirectionAngleOffset()) % 360d);
+                            direction = Utils.toRadians(curTmp.getExifImgDir());
+                        }
+                        if (shiftXY) {
+                            final Projection proj = ProjectionRegistry.getProjection();
+                            final double offsetX = dirpos.getShiftImageX();
+                            final double offsetY = dirpos.getShiftImageY();
+                            final double r = Math.sqrt(offsetX * offsetX + offsetY * offsetY);
+                            final double orientation = (direction + LatLon.ZERO.bearing(new LatLon(offsetX, offsetY))) % (2 * Math.PI);
+                            position = proj.eastNorth2latlon(proj.latlon2eastNorth(position)
+                                    .add(r * Math.sin(orientation), r * Math.cos(orientation)));
+                        }
+                    }
+                    curTmp.setPos(position);
                     curTmp.setSpeed(speed);
                     if (curElevation != null && prevElevation != null) {
-                        curTmp.setElevation(prevElevation + (curElevation - prevElevation) * timeDiff);
+                        curTmp.setElevation(prevElevation + (curElevation - prevElevation) * timeDiff + dirpos.getElevationShift());
                     }
                     curTmp.setGpsTime(curImg.getExifInstant().minusMillis(offset));

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

@@ -42 +42 @@
 import javax.swing.MutableComboBoxModel;
 import javax.swing.SwingConstants;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
+import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.actions.ExpertToggleAction.ExpertModeChangeListener;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxImageCorrelation;
+import org.openstreetmap.josm.data.gpx.GpxImageCorrelationSettings;
 import org.openstreetmap.josm.data.gpx.GpxImageEntry;
 import org.openstreetmap.josm.data.gpx.GpxTimeOffset;
@@ -77 +82 @@
  * @since 2566
  */
-public class CorrelateGpxWithImages extends AbstractAction implements Destroyable {
+public class CorrelateGpxWithImages extends AbstractAction implements ExpertModeChangeListener, Destroyable {
 
     private static MutableComboBoxModel<GpxDataWrapper> gpxModel;
@@ -94 +99 @@
         new ImageProvider("dialogs/geoimage/gpx2img").getResource().attachImageIcon(this, true);
         this.yLayer = layer;
+        ExpertToggleAction.addExpertModeChangeListener(this);
     }
 
@@ -237 +243 @@
     private JCheckBox cbShowThumbs;
     private JLabel statusBarText;
+    private JSeparator sepDirectionPosition;
+    private ImageDirectionPositionPanel pDirectionPosition;
 
     // remember the last number of matched photos
@@ -556 +564 @@
         panelTf.add(cbShowThumbs, gbc);
 
+        gbc = GBC.eol().fill(GBC.HORIZONTAL).insets(0, 12, 0, 0);
+        sepDirectionPosition = new JSeparator(SwingConstants.HORIZONTAL);
+        panelTf.add(sepDirectionPosition, gbc);
+
+        gbc = GBC.eol();
+        gbc.gridwidth = 3;
+        pDirectionPosition = ImageDirectionPositionPanel.forGpxTrace();
+        panelTf.add(pDirectionPosition, gbc);
+
+        expertChanged(ExpertToggleAction.isExpert());
+
         final JPanel statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
         statusBar.setBorder(BorderFactory.createLoweredBevelBorder());
@@ -563 +582 @@
 
         RepaintTheMapListener repaintTheMap = new RepaintTheMapListener();
+        pDirectionPosition.addFocusListenerOnComponent(repaintTheMap);
         tfTimezone.addFocusListener(repaintTheMap);
         tfOffset.addFocusListener(repaintTheMap);
@@ -570 +590 @@
         cbExifImg.addItemListener(statusBarUpdaterWithRepaint);
         cbTaggedImg.addItemListener(statusBarUpdaterWithRepaint);
+        pDirectionPosition.addChangeListenerOnComponents(statusBarUpdaterWithRepaint);
 
         statusBarUpdater.matchAndUpdateStatusBar();
@@ -596 +617 @@
     }
 
+    @Override
+    public void expertChanged(boolean isExpert) {
+        if (sepDirectionPosition != null) {
+            sepDirectionPosition.setVisible(isExpert);
+        }
+        if (pDirectionPosition != null) {
+            pDirectionPosition.setVisible(isExpert);
+        }
+        if (syncDialog != null) {
+            syncDialog.pack();
+        }
+    }
+
     private static void removeDuplicates(File file) {
         for (int i = gpxModel.getSize() - 1; i >= 0; i--) {
@@ -613 +647 @@
     private final transient StatusBarUpdater statusBarUpdaterWithRepaint = new StatusBarUpdater(true);
 
-    private class StatusBarUpdater implements DocumentListener, ItemListener, ActionListener {
+    private class StatusBarUpdater implements DocumentListener, ItemListener, ChangeListener, ActionListener {
         private final boolean doRepaint;
 
@@ -637 +671 @@
         @Override
         public void itemStateChanged(ItemEvent e) {
+            matchAndUpdateStatusBar();
+        }
+
+        @Override
+        public void stateChanged(ChangeEvent e) {
             matchAndUpdateStatusBar();
         }
@@ -681 +720 @@
 
             final long offsetMs = ((long) (timezone.getHours() * TimeUnit.HOURS.toMillis(1))) + delta.getMilliseconds(); // in milliseconds
-            lastNumMatched = GpxImageCorrelation.matchGpxTrack(dateImgLst, selGpx.data, offsetMs, forceTags);
+            lastNumMatched = GpxImageCorrelation.matchGpxTrack(dateImgLst, selGpx.data,
+                    pDirectionPosition.isVisible() ?
+                            new GpxImageCorrelationSettings(offsetMs, forceTags, pDirectionPosition.getSettings()) :
+                            new GpxImageCorrelationSettings(offsetMs, forceTags));
 
             return trn("<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>",
@@ -869 +911 @@
     @Override
     public void destroy() {
+        ExpertToggleAction.removeExpertModeChangeListener(this);
         if (cbGpx != null) {
             // Force the JCombobox to remove its eventListener from the static GpxDataWrapper
@@ -874 +917 @@
             cbGpx = null;
         }
+
+        outerPanel = null;
+        tfTimezone = null;
+        tfOffset = null;
+        cbExifImg = null;
+        cbTaggedImg = null;
+        cbShowThumbs = null;
+        statusBarText = null;
+        sepDirectionPosition = null;
+        pDirectionPosition = null;
+
         closeDialog();
     }

trunk/src/org/openstreetmap/josm/gui/widgets/DefaultTextComponentValidator.java

@@ -15 +15 @@
     /**
      * Constructs a new {@code DefaultTextComponentValidator}.
-     * @param tc he text component. Must not be null.
+     * @param tc the text component. Must not be null.
      * @param validFeedback text displayed for valid feedback
      * @param invalidFeedback text displayed for invalid feedback

trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java

@@ -115 +115 @@
     @Test
     void testMatchGpxTrack1() {
-        assertEquals(7, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+        assertEquals(7, GpxImageCorrelation.matchGpxTrack(images, gpx, new GpxImageCorrelationSettings(0, false)));
         assertEquals(null, ib.getPos());
         assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), i0.getPos()); // start of track
@@ -167 +167 @@
         s.putBoolean("geoimage.seg.int", false);
 
-        assertEquals(4, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+        assertEquals(4, GpxImageCorrelation.matchGpxTrack(images, gpx, new GpxImageCorrelationSettings(0, false)));
         assertEquals(null, ib.getPos());
         assertEquals(null, i0.getPos());
@@ -195 +195 @@
         s.putBoolean("geoimage.seg.int", false);
 
-        assertEquals(6, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+        assertEquals(6, GpxImageCorrelation.matchGpxTrack(images, gpx, new GpxImageCorrelationSettings(0, false)));
         assertEquals(null, ib.getPos());
         assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), i0.getPos());
@@ -217 +217 @@
     @Test
     void testMatchGpxTrack4() {
-        assertEquals(9, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, true));
+        assertEquals(9, GpxImageCorrelation.matchGpxTrack(images, gpx, new GpxImageCorrelationSettings(0, true)));
         assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), ib.getPos());
         assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), i0.getPos());
@@ -254 +254 @@
         s.putBoolean("geoimage.seg.int.dist", false);
 
-        assertEquals(9, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+        assertEquals(9, GpxImageCorrelation.matchGpxTrack(images, gpx, new GpxImageCorrelationSettings(0, false)));
         assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), ib.getPos());
         assertEquals(new CachedLatLon(47.19286847859621, 8.79732714034617), i0.getPos());
@@ -288 +288 @@
         s.putBoolean("geoimage.seg.int", false);
 
-        assertEquals(4, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+        assertEquals(4, GpxImageCorrelation.matchGpxTrack(images, gpx, new GpxImageCorrelationSettings(0, false)));
     }
 
@@ -307 +307 @@
         s.putBoolean("geoimage.seg.int", false);
 
-        assertEquals(6, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+        assertEquals(6, GpxImageCorrelation.matchGpxTrack(images, gpx, new GpxImageCorrelationSettings(0, false)));
     }
 
@@ -326 +326 @@
         s.putBoolean("geoimage.seg.int", false);
 
-        assertEquals(4, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+        assertEquals(4, GpxImageCorrelation.matchGpxTrack(images, gpx, new GpxImageCorrelationSettings(0, false)));
     }
 
@@ -345 +345 @@
         s.putBoolean("geoimage.seg.int", false);
 
-        assertEquals(6, GpxImageCorrelation.matchGpxTrack(images, gpx, 0, false));
+        assertEquals(6, GpxImageCorrelation.matchGpxTrack(images, gpx, new GpxImageCorrelationSettings(0, false)));
     }