X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=importPicture%2Fsrc%2Fosm%2Fjp%2Fgpx%2FImportPicture.java;fp=importPicture%2Fsrc%2Fosm%2Fjp%2Fgpx%2FImportPicture.java;h=ef2b2fd83ac3c1475496ecac73a123b193249371;hb=08b7b64652a2a53782825a120e76052558dae386;hp=9eefb5c5e8e83cfff4a7eb3fbc4ab32af192717c;hpb=865caf1532e163a8099441084bfbfcf5737e6b76;p=importpicture%2Fimportpicture.git

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