• R/O
  • HTTP
  • SSH
  • HTTPS

importpicture: Commit


Commit MetaInfo

Revisionf0f52c86292737f4f86ded2a2e97324a419dca92 (tree)
Time2019-09-09 15:46:33
Authorhaya4 <hayashi.yuu@gmai...>
Commiterhaya4

Log Message

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

Change Summary

Incremental Difference

--- a/src/osm/jp/gpx/ImportPicture.java
+++ b/src/osm/jp/gpx/ImportPicture.java
@@ -354,13 +354,13 @@ public class ImportPicture extends Thread {
354354 System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");
355355 System.out.println("| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |");
356356 System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");
357- proc(imgDir, delta, gpxFile.mapTRKSEG, exif, gpxFile);
357+ boolean out = proc(imgDir, delta, gpxFile.mapTRKSEG, exif, gpxFile);
358358 System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");
359-
360- // GPX出力
361- gpxFile.output(outDir);
359+ if (out) {
360+ // GPX出力
361+ gpxFile.output(outDir);
362+ }
362363 }
363-
364364
365365 /**
366366 * 再帰メソッド
@@ -457,8 +457,6 @@ public class ImportPicture extends Thread {
457457 String eleStr = "-";
458458 String magvarStr = "-";
459459 String speedStr = "-";
460- double latitude = 90.5D;
461- double longitude = 180.5D;
462460 TagTrkpt trkptT = null;
463461
464462 for (Map.Entry<Date,ElementMapTRKPT> map : mapTRKSEG.entrySet()) {
@@ -478,8 +476,8 @@ public class ImportPicture extends Thread {
478476 }
479477 }
480478 else {
481- latitude = trkptT.lat;
482- longitude = trkptT.lon;
479+ double latitude = trkptT.lat;
480+ double longitude = trkptT.lon;
483481
484482 if (trkptT.eleStr != null) {
485483 eleStr = trkptT.eleStr;
@@ -492,7 +490,6 @@ public class ImportPicture extends Thread {
492490 if (trkptT.speedStr != null) {
493491 speedStr = trkptT.speedStr;
494492 }
495- //System.out.print(String.format("%-14s|%-14s|", (new Double(latitude)).toString(), (new Double(longitude)).toString()));
496493 System.out.print(String.format("%14.10f|%14.10f|", latitude, longitude));
497494 System.out.println(String.format("%8s|%6s|%6s|", eleStr, magvarStr, speedStr));
498495 }
--- /dev/null
+++ b/test/AdjustTime.ini
@@ -0,0 +1,17 @@
1+#by AdjustTime
2+#Sun Aug 25 16:00:56 JST 2019
3+GPX.OVERWRITE_MAGVAR=false
4+IMG.BASE_FILE=00009.jpg
5+GPX.SOURCE_FOLDER=/home/yuu/work/mapping/Unmapped_2019-08-24_\u4E2D\u5C71\u9053_\u7B20\u53D6\u5CE0/GPX
6+IMG.SOURCE_FOLDER=/home/yuu/work/mapping/Unmapped_2019-08-24_\u4E2D\u5C71\u9053_\u7B20\u53D6\u5CE0/img/20190824_132842A
7+GPX.OUTPUT_SPEED=false
8+IMG.OUTPUT_FOLDER=/home/yuu/work/mapping/Unmapped_2019-08-24_\u4E2D\u5C71\u9053_\u7B20\u53D6\u5CE0/Movie
9+GPX.noFirstNode=false
10+GPX.gpxSplit=true
11+IMG.OUTPUT=true
12+GPX.OUTPUT_WPT=false
13+GPX.REUSE=false
14+IMG.TIME=2019-08-24T04\:29\:23Z
15+IMG.OUTPUT_EXIF=true
16+IMG.OUTPUT_ALL=false
17+GPX.BASETIME=FILE_UPDATE
Show on old repository browser