Changeset 6450 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

Timestamp:

2013-12-07T13:51:13+01:00 (10 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs: fix recent issues

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (6 diffs)

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

@@ -1074 +1074 @@
         List<ImageEntry> dateImgLst = new ArrayList<ImageEntry>(yLayer.data.size());
         for (ImageEntry e : yLayer.data) {
-            if (e.getExifTime() == null) {
+            if (!e.hasExifTime()) {
                 continue;
             }
@@ -1159 +1159 @@
     }
 
+    private static Double getElevation(WayPoint wp) {
+        String value = (String) wp.attr.get("ele");
+        if (value != null) {
+            try {
+                return new Double(value);
+            } catch (NumberFormatException e) {
+                Main.warn(e);
+            }
+        }
+        return null;
+    }
+    
     private int matchPoints(List<ImageEntry> images, WayPoint prevWp, long prevWpTime,
             WayPoint curWp, long curWpTime, long offset) {
@@ -1175 +1187 @@
         Double speed = null;
         Double prevElevation = null;
-        Double curElevation = null;
 
         if (prevWp != null) {
@@ -1183 +1194 @@
                 speed = 3600 * distance / (curWpTime - prevWpTime);
             }
-            try {
-                prevElevation = new Double((String) prevWp.attr.get("ele"));
-            } catch(Exception e) {}
-        }
-
-        try {
-            curElevation = new Double((String) curWp.attr.get("ele"));
-        } catch (Exception e) {}
+            prevElevation = getElevation(prevWp);
+        }
+
+        Double curElevation = getElevation(curWp);
 
         // First trackpoint, then interval is set to five seconds, i.e. photos up to five seconds
         // before the first point will be geotagged with the starting point
-        if(prevWpTime == 0 || curWpTime <= prevWpTime) {
+        if (prevWpTime == 0 || curWpTime <= prevWpTime) {
             while (true) {
                 if (i < 0) {
@@ -1200 +1207 @@
                 }
                 final ImageEntry curImg = images.get(i);
-                if (curImg.getExifTime().getTime() > curWpTime
-                        || curImg.getExifTime().getTime() < curWpTime - interval) {
+                long time = curImg.getExifTime().getTime();
+                if (time > curWpTime || time < curWpTime - interval) {
                     break;
                 }
-                if(curImg.tmp.getPos() == null) {
+                if (curImg.tmp.getPos() == null) {
                     curImg.tmp.setPos(curWp.getCoor());
                     curImg.tmp.setSpeed(speed);
@@ -1229 +1236 @@
             }
 
-            if(curImg.tmp.getPos() == null) {
-                // The values of timeDiff are between 0 and 1, it is not seconds but a dimensionless
-                // variable
+            if (curImg.tmp.getPos() == null) {
+                // The values of timeDiff are between 0 and 1, it is not seconds but a dimensionless variable
                 double timeDiff = (double)(imgTime - prevWpTime) / interval;
                 curImg.tmp.setPos(prevWp.getCoor().interpolate(curWp.getCoor(), timeDiff));