green:

[importpicture/importpicture.git] / importPicture / src / osm / jp / gpx / ImportPicture.java

diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java
index 9eefb5c..ef2b2fd 100644 (file)
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java
@@ -463,17 +463,17 @@ public class ImportPicture extends Thread {
             String speedStr = "-";\r
             double latitude = 90.5D;\r
             double longitude = 180.5D;\r
-            Element trkptE = null;\r
+            //Element trkptE = null;\r
             TagTrkpt trkptT = null;\r
 \r
             for (Map.Entry<Date,ElementMapTRKPT> map : mapTRKSEG.entrySet()) {\r
                ElementMapTRKPT mapTRKPT = map.getValue();\r
-                trkptE = mapTRKPT.getValue(correctedtime);\r
-                if (trkptE != null) {\r
+               trkptT = mapTRKPT.getValue(correctedtime);\r
+                if (trkptT != null) {\r
                     break;\r
                 }\r
             }\r
-            if (trkptE == null) {\r
+            if (trkptT == null) {\r
                 System.out.print(String.format("%-14s|%-14s|", "", ""));\r
                 System.out.println(String.format("%8s|%6s|%6s|", "", "", ""));\r
                 if (!this.param_ImgOutputAll) {\r
@@ -481,7 +481,6 @@ public class ImportPicture extends Thread {
                 }\r
             }\r
             else {\r
-                trkptT = new TagTrkpt(trkptE);\r
                 latitude = trkptT.lat;\r
                 longitude = trkptT.lon;\r
                 \r
@@ -552,7 +551,7 @@ public class ImportPicture extends Thread {
                     gpsDir.add(GpsTagConstants.GPS_TAG_GPS_DATE_STAMP, dateStamp);\r
                 }\r
 \r
-                if (trkptE != null) {\r
+                if (trkptT != null) {\r
                        //---- EXIF GPS elevation/ALTITUDE ----\r
                        if (eleStr.equals("-") == false) {\r
                            final double altitude = Double.parseDouble(eleStr);\r