IMAGEファイルに絡むGPXファイルのみコピーする

diff --git a/src/osm/jp/gpx/ImportPicture.java b/src/osm/jp/gpx/ImportPicture.java
index 169f5a8..0f66415 100644 (file)
--- a/src/osm/jp/gpx/ImportPicture.java
+++ b/src/osm/jp/gpx/ImportPicture.java
@@ -354,13 +354,13 @@ public class ImportPicture extends Thread {
         System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");\r
         System.out.println("| name                           | Camera Time        | GPStime            |   Latitude   |   Longitude  | ele    |magvar| km/h |");\r
         System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");\r
-        proc(imgDir, delta, gpxFile.mapTRKSEG, exif, gpxFile);\r
+        boolean out = proc(imgDir, delta, gpxFile.mapTRKSEG, exif, gpxFile);\r
         System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");\r
-\r
-        // GPX出力\r
-        gpxFile.output(outDir);\r
+        if (out) {\r
+            // GPX出力\r
+            gpxFile.output(outDir);\r
+        }\r
     }\r
-    \r
        \r
     /**\r
      * 再帰メソッド\r
@@ -457,8 +457,6 @@ public class ImportPicture extends Thread {
         String eleStr = "-";\r
         String magvarStr = "-";\r
         String speedStr = "-";\r
-        double latitude = 90.5D;\r
-        double longitude = 180.5D;\r
         TagTrkpt trkptT = null;\r
 \r
         for (Map.Entry<Date,ElementMapTRKPT> map : mapTRKSEG.entrySet()) {\r
@@ -478,8 +476,8 @@ public class ImportPicture extends Thread {
             }\r
         }\r
         else {\r
-            latitude = trkptT.lat;\r
-            longitude = trkptT.lon;\r
+            double latitude = trkptT.lat;\r
+            double longitude = trkptT.lon;\r
             \r
             if (trkptT.eleStr != null) {\r
                eleStr = trkptT.eleStr;\r
@@ -492,7 +490,6 @@ public class ImportPicture extends Thread {
             if (trkptT.speedStr != null) {\r
                speedStr = trkptT.speedStr;\r
             }\r
-            //System.out.print(String.format("%-14s|%-14s|", (new Double(latitude)).toString(), (new Double(longitude)).toString()));\r
             System.out.print(String.format("%14.10f|%14.10f|", latitude, longitude));\r
             System.out.println(String.format("%8s|%6s|%6s|", eleStr, magvarStr, speedStr));\r
         }\r

diff --git a/test/AdjustTime.ini b/test/AdjustTime.ini
new file mode 100644 (file)
index 0000000..5323854
--- /dev/null
+++ b/test/AdjustTime.ini
@@ -0,0 +1,17 @@
+#by AdjustTime
+#Sun Aug 25 16:00:56 JST 2019
+GPX.OVERWRITE_MAGVAR=false
+IMG.BASE_FILE=00009.jpg
+GPX.SOURCE_FOLDER=/home/yuu/work/mapping/Unmapped_2019-08-24_\u4E2D\u5C71\u9053_\u7B20\u53D6\u5CE0/GPX
+IMG.SOURCE_FOLDER=/home/yuu/work/mapping/Unmapped_2019-08-24_\u4E2D\u5C71\u9053_\u7B20\u53D6\u5CE0/img/20190824_132842A
+GPX.OUTPUT_SPEED=false
+IMG.OUTPUT_FOLDER=/home/yuu/work/mapping/Unmapped_2019-08-24_\u4E2D\u5C71\u9053_\u7B20\u53D6\u5CE0/Movie
+GPX.noFirstNode=false
+GPX.gpxSplit=true
+IMG.OUTPUT=true
+GPX.OUTPUT_WPT=false
+GPX.REUSE=false
+IMG.TIME=2019-08-24T04\:29\:23Z
+IMG.OUTPUT_EXIF=true
+IMG.OUTPUT_ALL=false
+GPX.BASETIME=FILE_UPDATE