Changeset 17878 in josm for trunk/src/org

Timestamp:

2021-05-06T22:44:54+02:00 (4 years ago)

Author:

simon04

Message:

fix #11710 - Re-geotagging hides pictures that are not covered by GPX track (patch by Bjoeni)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxImageCorrelation.java (modified) (2 diffs)
• data/gpx/GpxImageEntry.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)

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

@@ -230 +230 @@
                 }
                 long tagms = TimeUnit.MINUTES.toMillis(tagTime);
-                if (curTmp.getPos() == null &&
+                if (!curTmp.hasNewGpsData() &&
                         (Math.abs(time - curWpTime) <= tagms
                         || Math.abs(prevWpTime - time) <= tagms)) {
@@ -256 +256 @@
                     break;
                 }
-                if (curTmp.getPos() == null) {
+                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);

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

@@ -572 +572 @@
             gpsTime = tmp.gpsTime;
             exifImgDir = tmp.exifImgDir;
-            isNewGpsData = tmp.isNewGpsData;
+            isNewGpsData = isNewGpsData || tmp.isNewGpsData;
             tmp = null;
         }

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

@@ -1091 +1091 @@
             List<ImageEntry> dateImgLst = getSortedImgList();
             // Create a temporary copy for each image
-            for (ImageEntry ie : dateImgLst) {
+            dateImgLst.forEach(ie -> {
                 ie.createTmp();
-                ie.getTmp().setPos(null);
-            }
+                ie.getTmp().unflagNewGpsData();
+            });
 
             GpxDataWrapper selGpx = selectedGPX(false);