Changeset 18237 in josm for trunk/src/org

Timestamp:

2021-09-30T01:35:56+02:00 (3 years ago)

Author:

Don-vip

Message:

see #21144 - fix #21334 - fix correlated image direction when position is between 2 gpx points

File:

• trunk/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java (modified) (3 diffs)

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

@@ -273 +273 @@
             // This code gives a simple linear interpolation of the coordinates between current and
             // previous track point assuming a constant speed in between
+            LatLon nextCoorForDirection = nextWp != null ? nextWp.getCoor() : null;
             while (i >= 0) {
                 final GpxImageEntry curImg = images.get(i);
-                final GpxImageEntry curTmp = curImg.getTmp();
                 final long imgTime = curImg.getExifInstant().toEpochMilli();
                 if (imgTime < prevWpTime) {
                     break;
                 }
+                final GpxImageEntry curTmp = curImg.getTmp();
                 if (!curTmp.hasNewGpsData()) {
                     // The values of timeDiff are between 0 and 1, it is not seconds but a dimensionless variable
@@ -287 +288 @@
                     final LatLon curCoor = curWp.getCoor();
                     LatLon position = prevCoor.interpolate(curCoor, timeDiff);
-                    if (nextWp != null && (shiftXY || dirpos.isSetImageDirection())) {
-                        double direction = curCoor.bearing(nextWp.getCoor());
+                    if (nextCoorForDirection != null && (shiftXY || dirpos.isSetImageDirection())) {
+                        double direction = position.bearing(nextCoorForDirection);
                         if (dirpos.isSetImageDirection()) {
                             curTmp.setExifImgDir(computeDirection(direction, dirpos.getImageDirectionAngleOffset()));
@@ -311 +312 @@
                     curImg.tmpUpdated();
 
+                    nextCoorForDirection = curCoor;
                     ret++;
                 }