Changeset 18065 in josm

Timestamp:

2021-07-18T15:40:42+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #21131 - allow to edit direction/position of sequence of geo-images without GPX track

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxImageCorrelation.java (modified) (3 diffs)
• data/gpx/GpxImageCorrelationSettings.java (modified) (1 diff)
• data/gpx/GpxImageDirectionPositionSettings.java (modified) (1 diff)
• data/gpx/GpxImageEntry.java (modified) (3 diffs)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (9 diffs)
• gui/layer/geoimage/EditImagesSequenceAction.java (added)
• gui/layer/geoimage/GeoImageLayer.java (modified) (8 diffs)

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

@@ -26 +26 @@
 
     /**
-     * Match a list of photos to a gpx track with a given offset.
+     * Match a list of photos to a gpx track with given settings.
      * All images need a exifTime attribute and the List must be sorted according to these times.
      * @param images images to match
@@ -35 +35 @@
     public static int matchGpxTrack(List<? extends GpxImageEntry> images, GpxData selectedGpx, GpxImageCorrelationSettings settings) {
         int ret = 0;
+
+        if (Logging.isDebugEnabled()) {
+            Logging.debug("Correlating {0} images to {1} GPX track segments using {2}",
+                    images.size(), selectedGpx.getTrackSegsCount(), settings);
+        }
 
         boolean trkInt, trkTag, segInt, segTag;
@@ -73 +78 @@
         WayPoint prevWp = null;
 
-        for (List<List<WayPoint>> segs : loadTracks(selectedGpx.tracks)) {
+        for (List<List<WayPoint>> segs : loadTracks(selectedGpx.getTracks())) {
             boolean firstSegment = true;
             for (List<WayPoint> wps : segs) {

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

@@ -59 +59 @@
         return directionPositionSettings;
     }
+
+    @Override
+    public String toString() {
+        return "[offset=" + offset + ", forceTags=" + forceTags
+                + ", directionPositionSettings=" + directionPositionSettings + ']';
+    }
 }

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

@@ -70 +70 @@
         return elevationShift;
     }
+
+    @Override
+    public String toString() {
+        return "[setImageDirection=" + setImageDirection
+                + ", imageDirectionAngleOffset=" + imageDirectionAngleOffset + ", shiftImageX=" + shiftImageX
+                + ", shiftImageY=" + shiftImageY + ", elevationShift=" + elevationShift + ']';
+    }
 }

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

@@ -11 +11 @@
 import java.util.Locale;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Consumer;
 
@@ -512 +513 @@
      * {@link #applyTmp()} or {@link #discardTmp()} if the temporary variable
      * is not needed anymore.
-     */
-    public void createTmp() {
+     * @return the fresh copy.
+     */
+    public GpxImageEntry createTmp() {
         tmp = new GpxImageEntry(this);
         tmp.tmp = null;
+        return tmp;
     }
 
@@ -765 +768 @@
         }
     }
+
+    /**
+     * Returns a {@link WayPoint} representation of this GPX image entry.
+     * @return a {@code WayPoint} representation of this GPX image entry (containing position, instant and elevation)
+     * @since 18065
+     */
+    public WayPoint asWayPoint() {
+        CachedLatLon position = getPos();
+        WayPoint wpt = null;
+        if (position != null) {
+            wpt = new WayPoint(position);
+            wpt.setInstant(Optional.ofNullable(exifGpsTime).orElse(exifTime));
+            Double ele = getElevation();
+            if (ele != null) {
+                wpt.put(GpxConstants.PT_ELE, ele.toString());
+            }
+        }
+        return wpt;
+    }
 }

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

@@ -24 +24 @@
 import java.io.File;
 import java.text.ParseException;
-import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -52 +51 @@
 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;
 import org.openstreetmap.josm.data.gpx.GpxTimezone;
@@ -152 +150 @@
             case CANCEL:
                 if (yLayer != null) {
-                    for (ImageEntry ie : yLayer.getImageData().getImages()) {
-                        ie.discardTmp();
-                    }
+                    yLayer.discardTmp();
                     yLayer.updateBufferAndRepaint();
                 }
@@ -188 +184 @@
                 }
 
-                for (ImageEntry ie : yLayer.getImageData().getImages()) {
-                    ie.applyTmp();
-                }
-
+                yLayer.applyTmp();
                 yLayer.updateBufferAndRepaint();
 
                 break;
             default:
-                throw new IllegalStateException();
+                throw new IllegalStateException(Integer.toString(result));
             }
         }
@@ -469 +462 @@
         JLabel labelPosition = new JLabel(tr("Override position for: "));
 
-        int numAll = getSortedImgList(true, true).size();
-        int numExif = numAll - getSortedImgList(false, true).size();
-        int numTagged = numAll - getSortedImgList(true, false).size();
+        int numAll = yLayer.getSortedImgList(true, true).size();
+        int numExif = numAll - yLayer.getSortedImgList(false, true).size();
+        int numTagged = numAll - yLayer.getSortedImgList(true, false).size();
 
         cbExifImg = new JCheckBox(tr("Images with geo location in exif data ({0}/{1})", numExif, numAll));
@@ -581 +574 @@
         statusBar.add(statusBarText);
 
-        RepaintTheMapListener repaintTheMap = new RepaintTheMapListener();
+        RepaintTheMapListener repaintTheMap = new RepaintTheMapListener(yLayer);
         pDirectionPosition.addFocusListenerOnComponent(repaintTheMap);
         tfTimezone.addFocusListener(repaintTheMap);
@@ -703 +696 @@
             // The selection of images we are about to correlate may have changed.
             // So reset all images.
-            for (ImageEntry ie: yLayer.getImageData().getImages()) {
-                ie.discardTmp();
-            }
+            yLayer.discardTmp();
 
             // Construct a list of images that have a date, and sort them on the date.
             List<ImageEntry> dateImgLst = getSortedImgList();
             // Create a temporary copy for each image
-            dateImgLst.forEach(ie -> {
-                ie.createTmp();
-                ie.getTmp().unflagNewGpsData();
-            });
+            dateImgLst.forEach(ie -> ie.createTmp().unflagNewGpsData());
 
             GpxDataWrapper selGpx = selectedGPX(false);
@@ -731 +719 @@
     }
 
-    private class RepaintTheMapListener implements FocusListener {
+    static class RepaintTheMapListener implements FocusListener {
+
+        private final GeoImageLayer yLayer;
+
+        RepaintTheMapListener(GeoImageLayer yLayer) {
+            this.yLayer = Objects.requireNonNull(yLayer);
+        }
+
         @Override
         public void focusGained(FocusEvent e) { // do nothing
@@ -877 +872 @@
 
     private List<ImageEntry> getSortedImgList() {
-        return getSortedImgList(cbExifImg.isSelected(), cbTaggedImg.isSelected());
-    }
-
-    /**
-     * Returns a list of images that fulfill the given criteria.
-     * Default setting is to return untagged images, but may be overwritten.
-     * @param exif also returns images with exif-gps info
-     * @param tagged also returns tagged images
-     * @return matching images
-     */
-    private List<ImageEntry> getSortedImgList(boolean exif, boolean tagged) {
-        return yLayer.getImageData().getImages().stream()
-                .filter(GpxImageEntry::hasExifTime)
-                .filter(e -> e.getExifCoor() == null || exif)
-                .filter(e -> tagged || !e.isTagged() || e.getExifCoor() != null)
-                .sorted(Comparator.comparing(ImageEntry::getExifInstant))
-                .collect(Collectors.toList());
+        return yLayer.getSortedImgList(cbExifImg.isSelected(), cbTaggedImg.isSelected());
     }
 

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer.geoimage;
 
+import static java.util.stream.Collectors.toList;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
@@ -21 +22 @@
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -31 +36 @@
 
 import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
@@ -40 +46 @@
 import org.openstreetmap.josm.data.ImageData.ImageDataUpdateListener;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.gpx.GpxImageEntry;
+import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -72 +79 @@
     GpxLayer gpxLayer;
     GpxLayer gpxFauxLayer;
+    GpxData gpxFauxData;
 
     private CorrelateGpxWithImages gpxCorrelateAction;
@@ -247 +255 @@
         entries.add(SeparatorLayerAction.INSTANCE);
         entries.add(getGpxCorrelateAction());
+        if (ExpertToggleAction.isExpert()) {
+            entries.add(new EditImagesSequenceAction(this));
+        }
         entries.add(new ShowThumbnailAction(this));
         if (!menuAdditions.isEmpty()) {
@@ -807 +818 @@
         if (gpxLayer != null) return getGpxLayer();
         if (gpxFauxLayer == null) {
-            GpxData gpxData = new GpxData();
-            for (ImageEntry image : data.getImages()) {
-                gpxData.addWaypoint(new WayPoint(image.getPos()));
-            }
-            gpxFauxLayer = new GpxLayer(gpxData);
+            gpxFauxLayer = new GpxLayer(getFauxGpxData());
         }
         return gpxFauxLayer;
+    }
+
+    /**
+     * Returns a faux GPX data built from the images or the associated GPX layer data.
+     * @return A faux GPX data or the associated GPX layer data
+     * @since 18065
+     */
+    public synchronized GpxData getFauxGpxData() {
+        if (gpxLayer != null) return getGpxLayer().data;
+        if (gpxFauxData == null) {
+            gpxFauxData = new GpxData();
+            gpxFauxData.addTrack(new GpxTrack(Arrays.asList(
+                    data.getImages().stream().map(ImageEntry::asWayPoint).filter(Objects::nonNull).collect(toList())),
+                    Collections.emptyMap()));
+        }
+        return gpxFauxData;
     }
 
@@ -870 +893 @@
         return data;
     }
+
+    void applyTmp() {
+        data.getImages().forEach(ImageEntry::applyTmp);
+    }
+
+    void discardTmp() {
+        data.getImages().forEach(ImageEntry::discardTmp);
+    }
+
+    /**
+     * Returns a list of images that fulfill the given criteria.
+     * Default setting is to return untagged images, but may be overwritten.
+     * @param exif also returns images with exif-gps info
+     * @param tagged also returns tagged images
+     * @return matching images
+     */
+    List<ImageEntry> getSortedImgList(boolean exif, boolean tagged) {
+        return data.getImages().stream()
+                .filter(GpxImageEntry::hasExifTime)
+                .filter(e -> e.getExifCoor() == null || exif)
+                .filter(e -> tagged || !e.isTagged() || e.getExifCoor() != null)
+                .sorted(Comparator.comparing(ImageEntry::getExifInstant))
+                .collect(toList());
+    }
 }