Changeset 18243 in josm for trunk/src

Timestamp:

2021-10-03T13:24:18+02:00 (3 years ago)

Author:

Don-vip

Message:

see #21144 - see #21334 - add debug logs + fix coverity 1464077 (Logically dead code: nextWp cannot be null with the isLast branch, but Eclipse doesn't see it)

File:

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

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

@@ -150 +150 @@
             ret += matchPoints(images, prevWp, prevWpTime, prevWp, prevWpTime, offset, false, trkTagTime, null, dirpos);
         }
+        Logging.debug("Correlated {0} total points", ret);
         return ret;
     }
@@ -211 +212 @@
             long offset, boolean interpolate, int tagTime, WayPoint nextWp, GpxImageDirectionPositionSettings dirpos) {
 
-        int ret = 0;
         final boolean isLast = nextWp == null;
 
@@ -222 +222 @@
         }
 
+        if (Logging.isDebugEnabled()) {
+            Logging.debug("Correlating images for i={1} - curWp={2}/{3} - prevWp={4}/{5} - nextWp={6} - tagTime={7} - interpolate={8}",
+                    i, curWp, curWpTime, prevWp, prevWpTime, nextWp, tagTime, interpolate);
+        }
+
         // no photos match
-        if (i < 0)
+        if (i < 0) {
+            Logging.debug("Correlated nothing, no photos match");
             return 0;
-
+        }
+
+        int ret = 0;
         Double speed = null;
         Double prevElevation = null;
@@ -273 +281 @@
             // 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;
+            @SuppressWarnings("null")
+            LatLon nextCoorForDirection = nextWp.getCoor();
             while (i >= 0) {
                 final GpxImageEntry curImg = images.get(i);
@@ -318 +327 @@
             }
         }
+        Logging.debug("Correlated {0} image(s)", ret);
         return ret;
     }