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