is not a file.
diff --git a/importPicture/src/i18n_ja_JP.properties b/importPicture/src/i18n_ja_JP.properties
deleted file mode 100644
index 6f75d3d..0000000
--- a/importPicture/src/i18n_ja_JP.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-dialog.quit=\u7d42\u4e86
-dialog.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb
-dialog.msg1=\u30d7\u30ed\u30b0\u30e9\u30e0\u3092\u7d42\u4e86\u3057\u307e\u3059\u3002
-dialog.select=\u9078\u629e
-
-menu.quit=\u7d42\u4e86...
-button.next=\u6b21\u3078
-button.previous=\u623b\u308b
-button.execute=\u51e6\u7406\u5b9f\u884c
-button.select=\u9078\u629e...
-
-label.100=1. \u4f4d\u7f6e\u60c5\u5831\u3092\u4ed8\u52a0\u3057\u305f\u3044\u753b\u50cf\u30d5\u30a1\u30a4\u30eb\u304c\u683c\u7d0d\u3055\u308c\u3066\u3044\u308b\u30d5\u30a9\u30eb\u30c0\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
- \u30b3\u30d4\u30fc\u52d5\u4f5c\u3092\u884c\u3046\u3068\u3001\u30d5\u30a1\u30a4\u30eb\u66f4\u65b0\u6642\u523b\u304c\u30b3\u30d4\u30fc\u3092\u5b9f\u884c\u3057\u305f\u6642\u523b\u306b\u66f8\u304d\u63db\u308f\u3063\u3066\u3057\u307e\u3046\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002\u30ab\u30e1\u30e9SD\u30ab\u30fc\u30c9\u5185\u306e\u30d5\u30a9\u30eb\u30c0\u3092\u76f4\u63a5\u6307\u5b9a\u3059\u308b\u3053\u3068\u3092\u304a\u3059\u3059\u3081\u3057\u307e\u3059\u3002
-label.110=\u5bfe\u8c61\u30d5\u30a9\u30eb\u30c0
-
-label.200=2. \u6b63\u78ba\u306a\u64ae\u5f71\u6642\u523b\u304c\u5224\u660e\u3067\u304d\u308b\u753b\u50cf\u3092\u9078\u3093\u3067\u304f\u3060\u3055\u3044\u3002
- \u30b9\u30de\u30fc\u30c8\u30d5\u30a9\u30f3\u306e\u6642\u8a08\u753b\u9762\uff08\u79d2\u304c\u5224\u5225\u3067\u304d\u308b\u3053\u3068\uff09\u3092\u64ae\u5f71\u3057\u305f\u753b\u50cf
- \u30ab\u30e1\u30e9\u306e\u6642\u8a08\u304c\u6b63\u78ba\u306a\u3089\u3070\u3001\u3069\u306e\u753b\u50cf\u3092\u9078\u3093\u3067\u3082\u69cb\u3044\u307e\u305b\u3093\u3002
-label.210=\u57fa\u6e96\u6642\u523b\u753b\u50cf
-label.220=EXIF\u306e\u65e5\u6642\u3092\u57fa\u6e96\u306b\u3059\u308b
-label.230=\u30d5\u30a1\u30a4\u30eb\u66f4\u65b0\u65e5\u6642\u3092\u57fa\u6e96\u306b\u3059\u308b
-
-label.300=3. \u6b63\u78ba\u306a\u64ae\u5f71\u6642\u523b\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
- \u30ab\u30e1\u30e9\u306e\u6642\u8a08\u304c\u6b63\u78ba\u306a\u3089\u3070\u3001\u8a2d\u5b9a\u3092\u5909\u66f4\u3059\u308b\u5fc5\u8981\u306f\u3042\u308a\u307e\u305b\u3093\u3002
-label.310=\u57fa\u6e96\u6642\u523b
-
-label.400=4. \u30d2\u30e2\u4ed8\u3092\u884c\u3046GPX\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
- \u30d5\u30a9\u30eb\u30c0\u3092\u6307\u5b9a\u3059\u308b\u3068\u3001\u30d5\u30a9\u30eb\u30c0\u5185\u306b\u3042\u308b\u3059\u3079\u3066\u306eGPX\u30d5\u30a1\u30a4\u30eb\u3092\u5bfe\u8c61\u3068\u3057\u307e\u3059\u3002
-label.410=GPX\u30d5\u30a9\u30eb\u30c0
-label.420=\u30bb\u30b0\u30e1\u30f3\u30c8'trkseg'\u306e\u6700\u521d\u306e\uff11\u30ce\u30fc\u30c9\u306f\u7121\u8996\u3059\u308b
-label.430=\u751f\u6210\u3055\u308c\u305fGPX\u30d5\u30a1\u30a4\u30eb\uff08\u30d5\u30a1\u30a4\u30eb\u540d\u304c'_.gpx'\u3067\u7d42\u308f\u308b\u3082\u306e\uff09\u3082\u5909\u63db\u306e\u5bfe\u8c61\u306b\u3059\u308b
-
-label.500=EXIF\u5909\u63db\u3092\u884c\u3046\u304b\u3069\u3046\u304b\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044
-label.501=EXIF\u5909\u63db\u3092\u884c\u3046\u5834\u5408\u306b\u306f\u3001\u5909\u63db\u30d5\u30a1\u30a4\u30eb\u3092\u51fa\u529b\u3059\u308b\u30d5\u30a9\u30eb\u30c0\u3082\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-label.502=\u51fa\u529b\u30d5\u30a9\u30eb\u30c0\u306b\u306f\u3001\u66f8\u304d\u8fbc\u307f\u6a29\u9650\u3068\u3001\u5341\u5206\u306a\u7a7a\u304d\u5bb9\u91cf\u304c\u5fc5\u8981\u3067\u3059\u3002
-label.510=IMG\u306e\u5909\u63db\u3092\u3059\u308b
-label.520=GPX\u30d5\u30a1\u30a4\u30eb\u6642\u9593\u5916\u306e\u30d5\u30a1\u30a4\u30eb\u3082\u30b3\u30d4\u30fc\u3059\u308b
-label.530=\u51fa\u529b\u30d5\u30a9\u30eb\u30c0
-label.540=EXIF\u306e\u5909\u63db\u3092\u3059\u308b
-label.550=\u30dd\u30a4\u30f3\u30c8\u30de\u30fc\u30ab\u30fc\u3092GPX\u30d5\u30a1\u30a4\u30eb\u306b\u51fa\u529b\u3059\u308b
-label.560=\u30bd\u30fc\u30b9GPX\u306e\u3092\u7121\u8996\u3059\u308b
-label.570=\u51fa\u529bGPX\u306b\u3092\u4e0a\u66f8\u304d\u3059\u308b
-
-msg.100=GPX\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u304c\u5b58\u5728\u3057\u307e\u305b\u3093\u3002('%s')
-msg.110=\u5bfe\u8c61\u3068\u306a\u308bGPX\u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093('%s')
-msg.120=\u8907\u6570\u306eGPX\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308b\u3068\u304d\u306b\u306f\u3001'IMG.OUTPUT_ALL'\u30aa\u30d7\u30b7\u30e7\u30f3\u306f\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093\u3002
-msg.130='%s'\u306e\u66f8\u5f0f\u304c\u9055\u3044\u307e\u3059(%s)
-msg.140='%s'\u306bEXIF\u60c5\u5831\u304c\u3042\u308a\u307e\u305b\u3093
-
-msg.200=[error] \u304c\u5b58\u5728\u3057\u307e\u305b\u3093
-msg.210=[error] \u304c\u30d5\u30a9\u30eb\u30c0\u3058\u3083\u306a\u3044
-msg.220=[error] \u304c\u5b58\u5728\u3057\u307e\u305b\u3093
-msg.230=[error] \u304c\u30d5\u30a1\u30a4\u30eb\u3058\u3083\u306a\u3044
-msg.240=[error] \u304c\u5b58\u5728\u3057\u307e\u305b\u3093
-msg.250=[error] \u304c\u30d5\u30a1\u30a4\u30eb\u3058\u3083\u306a\u3044
diff --git a/importPicture/src/osm/jp/gpx/AppParameters.java b/importPicture/src/osm/jp/gpx/AppParameters.java
deleted file mode 100644
index 12a519c..0000000
--- a/importPicture/src/osm/jp/gpx/AppParameters.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package osm.jp.gpx;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Properties;
-
-@SuppressWarnings("serial")
-public class AppParameters extends Properties {
- static final String FILE_PATH = "AdjustTime.ini";
-
- // GPX: 時間的に間隔が開いたGPXログを別のセグメントに分割する。 {ON | OFF}
- public static String GPX_GPXSPLIT = "GPX.gpxSplit";
-
- // GPX: セグメントの最初の１ノードは無視する。 {ON | OFF}
- public static String GPX_NO_FIRST_NODE = "GPX.noFirstNode";
-
- // GPX: 生成されたGPXファイル（ファイル名が'_.gpx'で終わるもの）も対象にする。 {ON | OFF}
- public static String GPX_REUSE = "GPX.REUSE";
-
- // GPX: 基準時刻 {FILE_UPDATE | EXIF_TIME}
- public static String GPX_BASETIME = "GPX.BASETIME";
-
- // GPX: ファイル更新時刻 yyyy:MM:dd HH:mm:ss
- public static String IMG_TIME = "IMG.TIME";
-
- // 対象IMGフォルダ:(位置情報を付加したい画像ファイルが格納されているフォルダ)
- public static String IMG_SOURCE_FOLDER = "IMG.SOURCE_FOLDER";
-
- // 基準時刻画像(正確な撮影時刻が判明できる画像)
- public static String IMG_BASE_FILE = "IMG.BASE_FILE";
-
- // 対象GPXフォルダ:(GPXファイルが格納されているフォルダ)
- public static String GPX_SOURCE_FOLDER = "GPX.SOURCE_FOLDER";
-
- // 出力フォルダ:(変換した画像ファイルとGPXファイルを出力するフォルダ)
- public static String IMG_OUTPUT_FOLDER = "IMG.OUTPUT_FOLDER";
-
- // 出力IMG: IMG出力をする {ON | OFF}
- public static String IMG_OUTPUT = "IMG.OUTPUT";
-
- // 出力IMG: 'out of time'も IMG出力の対象とする {ON | OFF}
- // この場合は、対象IMGフォルダ内のすべてのIMGファイルが出力フォルダに出力される
- public static String IMG_OUTPUT_ALL = "IMG.OUTPUT_ALL";
-
- // 出力IMG: EXIFを変換する
- public static String IMG_OUTPUT_EXIF = "IMG.OUTPUT_EXIF";
-
- // 出力GPX: を上書き出力する {ON | OFF}
- public static String GPX_OUTPUT_SPEED = "GPX.OUTPUT_SPEED";
-
- // 出力GPX: ソースGPXのを無視する {ON | OFF}
- public static String GPX_OVERWRITE_MAGVAR = "GPX.OVERWRITE_MAGVAR";
-
- // 出力GPX: マーカーを出力する {ON | OFF}
- public static String GPX_OUTPUT_WPT = "GPX.OUTPUT_WPT";
-
- File file;
-
- public AppParameters() throws FileNotFoundException, IOException {
- super();
- this.file = new File(FILE_PATH);
- syncFile();
- }
-
- public AppParameters(Properties defaults) throws FileNotFoundException, IOException {
- super(defaults);
- this.file = new File(FILE_PATH);
- syncFile();
- }
-
- public AppParameters(String iniFileName) throws FileNotFoundException, IOException {
- super();
- this.file = new File(iniFileName);
- syncFile();
- }
-
- private void syncFile() throws FileNotFoundException, IOException {
- boolean update = false;
-
- if (this.file.exists()) {
- // ファイルが存在すれば、その内容をロードする。
- this.load(new FileInputStream(file));
- }
- else {
- update = true;
- }
-
- //------------------------------------------------
- // 対象フォルダ:(位置情報を付加したい画像ファイルが格納されているフォルダ)
- String valueStr = this.getProperty(IMG_SOURCE_FOLDER);
- if (valueStr == null) {
- update = true;
- this.setProperty(IMG_SOURCE_FOLDER, (new File(".")).getAbsolutePath());
- }
-
- //------------------------------------------------
- // 対象フォルダ:(GPXファイルが格納されているフォルダ)
- valueStr = this.getProperty(GPX_SOURCE_FOLDER);
- if (valueStr == null) {
- update = true;
- this.setProperty(GPX_SOURCE_FOLDER, (new File(".")).getAbsolutePath());
- }
-
- //------------------------------------------------
- // 基準時刻画像(正確な撮影時刻が判明できる画像)
- valueStr = this.getProperty(IMG_BASE_FILE);
- if (valueStr == null) {
- update = true;
- this.setProperty(IMG_BASE_FILE, "");
- }
-
- //------------------------------------------------
- // 出力フォルダ:(変換した画像ファイルとGPXファイルを出力するフォルダ)
- valueStr = this.getProperty(IMG_OUTPUT_FOLDER);
- if (valueStr == null) {
- update = true;
- this.setProperty(IMG_OUTPUT_FOLDER, (new File(".")).getAbsolutePath());
- }
-
- //------------------------------------------------
- // IMG出力: IMGを出力する
- valueStr = this.getProperty(IMG_OUTPUT);
- if (valueStr == null) {
- update = true;
- valueStr = String.valueOf(true);
- }
- this.setProperty(IMG_OUTPUT, String.valueOf(valueStr));
-
- //------------------------------------------------
- // 出力IMG: 'out of time'も IMG出力の対象とする
- valueStr = this.getProperty(IMG_OUTPUT_ALL);
- if (valueStr == null) {
- update = true;
- valueStr = String.valueOf(false);
- }
- this.setProperty(IMG_OUTPUT_ALL, String.valueOf(valueStr));
-
- //------------------------------------------------
- // IMG出力: EXIFを変換する
- valueStr = this.getProperty(IMG_OUTPUT_EXIF);
- if (valueStr == null) {
- update = true;
- valueStr = String.valueOf(true);
- }
- this.setProperty(IMG_OUTPUT_EXIF, String.valueOf(valueStr));
-
- //------------------------------------------------
- // GPX出力: 時間的に間隔が開いたGPXログを別のセグメントに分割する。 {ON | OFF}
- valueStr = this.getProperty(GPX_GPXSPLIT);
- if (valueStr == null) {
- update = true;
- this.setProperty(GPX_GPXSPLIT, String.valueOf(true));
- }
-
- //------------------------------------------------
- // GPX出力: セグメントの最初の１ノードは無視する。 {ON | OFF}
- valueStr = this.getProperty(GPX_NO_FIRST_NODE);
- if (valueStr == null) {
- update = true;
- this.setProperty(GPX_NO_FIRST_NODE, String.valueOf(true));
- }
-
- //------------------------------------------------
- // GPX出力: ポイントマーカーを出力する {ON | OFF}
- valueStr = this.getProperty(GPX_OUTPUT_WPT);
- if (valueStr == null) {
- update = true;
- this.setProperty(GPX_OUTPUT_WPT, String.valueOf(false));
- }
-
- //------------------------------------------------
- // GPX出力: ソースGPXのを無視する {ON | OFF}
- valueStr = this.getProperty(GPX_OVERWRITE_MAGVAR);
- if (valueStr == null) {
- update = true;
- this.setProperty(GPX_OVERWRITE_MAGVAR, String.valueOf(false));
- }
-
- //------------------------------------------------
- // GPX出力: を上書き出力する {ON | OFF}
- valueStr = this.getProperty(GPX_OUTPUT_SPEED);
- if (valueStr == null) {
- update = true;
- this.setProperty(GPX_OUTPUT_SPEED, String.valueOf(false));
- }
-
- //------------------------------------------------
- // GPX出力: 生成されたGPXファイル（ファイル名が'_.gpx'で終わるもの）も対象にする。 {ON | OFF}
- valueStr = this.getProperty(GPX_REUSE);
- if (valueStr == null) {
- update = true;
- this.setProperty(GPX_REUSE, String.valueOf(false));
- }
-
- //------------------------------------------------
- // GPX: 基準時刻 {FILE_UPDATE | EXIF}
- valueStr = this.getProperty(GPX_BASETIME);
- if (valueStr == null) {
- update = true;
- this.setProperty(GPX_BASETIME, "FILE_UPDATE");
- }
-
- if (update) {
- // ・ファイルがなければ新たに作る
- // ・項目が足りない時は書き足す。
- this.store(new FileOutputStream(this.file), "defuilt settings");
- }
- }
-
- public void store() throws FileNotFoundException, IOException {
- this.store(new FileOutputStream(this.file), "by AdjustTime");
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/Complementation.java b/importPicture/src/osm/jp/gpx/Complementation.java
deleted file mode 100644
index 617f183..0000000
--- a/importPicture/src/osm/jp/gpx/Complementation.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package osm.jp.gpx;
-
-import java.text.ParseException;
-
-public class Complementation {
- public static final Double R = (6378137D + 6356752.314D)/2D; // 6367444.657m
- //public static final double dLat = 0.00453D; // 1km距離を表す緯度（差分）
- //public static final double dLon = 0.005588D; // 1km距離を表す経度（差分）
-
- public TagTrkpt imaTag = null;
- public TagTrkpt maeTag = null;
- public static boolean param_GpxOutputSpeed = false;
- public static boolean param_GpxOverwriteMagvar = false;
-
- /**
- * @param imaE
- * @param maeE
- * @code{
- *
- * 267.291
- * 359
- *
- *
- *
- * }
- *
- *
- * @throws ParseException
- */
- public Complementation(TagTrkpt imaE, TagTrkpt maeE) throws ParseException {
- this.imaTag = new TagTrkpt(imaE.trkpt);
- if (maeE != null) {
- this.maeTag = new TagTrkpt(maeE.trkpt);
- }
- }
-
- /**
- * 緯度・経度と時間差から速度(km/h)を求める
- *
- */
- public void complementationSpeed() {
- if (imaTag.speedStr != null) {
- try {
- Double.parseDouble(imaTag.speedStr);
- }
- catch (NumberFormatException e) {
- // 数字以外ならエレメントを削除する
- imaTag.removeElement("speed");
- imaTag.speedStr = null;
- }
- }
-
- if (imaTag.speedStr == null) {
- double d = GeoDistance.calcDistHubeny(imaTag.lat, imaTag.lon, maeTag.lat, maeTag.lon);
- String str = Double.toString((d * 3600) / (imaTag.time.getTime() - maeTag.time.getTime()));
- int iDot = str.indexOf('.');
- if (iDot > 0) {
- str = str.substring(0, iDot+2);
- }
- imaTag.appendElement("speed", str);
- imaTag.speedStr = str;
- }
- }
-
- /**
- * 経度(longitude)と経度から進行方向を求める
- * @throws ParseException
- */
- public void complementationMagvar() throws ParseException {
- if (imaTag.magvarStr != null) {
- try {
- Double.parseDouble(imaTag.magvarStr);
- }
- catch (NumberFormatException e) {
- // 数字以外ならエレメントを削除する
- imaTag.removeElement("magvar");
- imaTag.magvarStr = null;
- }
- }
-
- if (imaTag.magvarStr == null) {
- Double r = Math.cos(Math.toRadians((imaTag.lat + maeTag.lat) / 2)) * R;
- Double x = Math.toRadians(imaTag.lon - maeTag.lon) * r;
- Double y = Math.toRadians(imaTag.lat - maeTag.lat) * R;
- double rad = Math.toDegrees(Math.atan2(y, x));
-
- if (y >= 0) {
- if (x >= 0) {
- rad = 0 - (rad - 90);
- }
- else {
- rad = 360 - (rad - 90);
- }
- }
- else {
- if (x >= 0) {
- rad = 90 - rad;
- }
- else {
- rad = 90 - rad;
- }
- }
-
- String str = Double.toString(rad);
- int iDot = str.indexOf('.');
- if (iDot > 0) {
- str = str.substring(0, iDot);
- }
- imaTag.appendElement("magvar", str);
- imaTag.magvarStr = str;
- }
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/ElementMapTRKPT.java b/importPicture/src/osm/jp/gpx/ElementMapTRKPT.java
deleted file mode 100644
index 538f025..0000000
--- a/importPicture/src/osm/jp/gpx/ElementMapTRKPT.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package osm.jp.gpx;
-
-import java.text.ParseException;
-import java.util.Date;
-import java.util.TreeMap;
-
-import org.w3c.dom.DOMException;
-
-@SuppressWarnings("serial")
-public class ElementMapTRKPT extends TreeMap {
- public static final long DIFF_MAE_TIME = 3000L; // before 3 secound
-
- public ElementMapTRKPT() {
- super(new TimeComparator());
- }
-
- /**
- * 拡張put value:ElementをputするとElement内のtimeを読み取ってkeyとしてthis.put(key,value)する。
- * @param tag
- * @code{
- *
- * 614.90
- *
- * 0.5
- *
- * }
- * @return keyとして登録したtime:Date
- * @throws ParseException
- * @throws DOMException
- */
- public Date put(TagTrkpt tag) throws DOMException, ParseException {
- this.put(tag.time, tag);
- return tag.time;
- }
-
- /**
- * 指定時刻(jptime)のTRKPTエレメントを取り出す。
- *
- * @param jptime 指定する日時
- * @return エレメントTRKPT。指定時刻に対応するノードがないときはnullを返す。
- * @throws ParseException
- */
- public TagTrkpt getValue(Date jptime) throws ParseException {
- TagTrkpt imaE = getTrkpt(jptime);
- if (imaE != null) {
- TagTrkpt maeE = getMaeTrkpt(imaE.time);
- if (maeE != null) {
- Complementation comp = new Complementation(imaE, maeE);
-
- // がなければ、
- // 直前の位置と、現在地から進行方向を求める
- // 経度(longitude)と経度から進行方向を求める
- if (Complementation.param_GpxOverwriteMagvar) {
- comp.complementationMagvar();
- }
-
- // 緯度・経度と時間差から速度(km/h)を求める
- if (Complementation.param_GpxOutputSpeed) {
- comp.complementationSpeed();
- }
- //return (TagTrkpt)(comp.imaTag.trkpt.cloneNode(true));
- return (TagTrkpt)(comp.imaTag);
- }
- return imaE;
- }
- return null;
- }
-
- /**
- * [map]から指定した時刻のエレメントを取り出す。
- * 取り出すエレメントは、指定した時刻と同一時刻、もしくは、直近・直前の時刻のエレメントとする。
- * 指定した時刻以前のエレメントが存在しない場合は null を返す。
- * 指定した時刻と直近・直前のエレメントの時刻との乖離が プロパティ[OVER_TIME_LIMIT=3000(ミリ秒)]より大きい場合には null を返す。
- *
- * @param jptime
- * @return エレメント。対象のエレメントが存在しなかった場合には null。
- * @throws ParseException
- */
- private TagTrkpt getTrkpt(Date jptime) throws ParseException {
- Date keyTime = null;
- for (Date key : this.keySet()) {
- int flag = jptime.compareTo(key);
- if (flag < 0) {
- if (keyTime != null) {
- return this.get(keyTime);
- }
- return null;
- }
- else if (flag == 0) {
- return this.get(key);
- }
- else if (flag > 0) {
- keyTime = new Date(key.getTime());
- }
- }
- if (keyTime != null) {
- if (Math.abs(keyTime.getTime() - jptime.getTime()) <= OVER_TIME_LIMIT) {
- return this.get(keyTime);
- }
- }
- return null;
- }
-
- /**
- * ロガーの最終取得時刻を超えた場合、どこまでを有効とするかを設定する。
- * この設定がないと、最終取得時刻を超えたものは全て有効になってしまう。
- * OVER_TIME_LIMITは、GPSロガーの位置取得間隔（）よりも長くする必要がある。長すぎても良くない。
- */
- public static long OVER_TIME_LIMIT = 3000; // ミリ秒(msec)
-
- private TagTrkpt getMaeTrkpt(Date time) throws ParseException {
- Date maeTime = null;
- for (Date key : this.keySet()) {
- int flag = time.compareTo(key);
- if (flag > 0) {
- maeTime = new Date(key.getTime());
- }
- else if (flag == 0) {
- if (maeTime == null) {
- return null;
- }
- return this.get(maeTime);
- }
- else {
- // time は key より古い
- if (maeTime == null) {
- return null;
- }
- if (Math.abs(maeTime.getTime() - time.getTime()) > OVER_TIME_LIMIT) {
- return null;
- }
- return this.get(maeTime);
- }
- }
- return null;
- }
-
- public void printinfo() {
- Date firstTime = null;
- Date lastTime = null;
- for (Date key : this.keySet()) {
- if (firstTime == null) {
- firstTime = new Date(key.getTime());
- }
- lastTime = new Date(key.getTime());
- }
- System.out.println(String.format("| |%20s|%20s|", ImportPicture.toUTCString(firstTime), ImportPicture.toUTCString(lastTime)));
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/ElementMapTRKSEG.java b/importPicture/src/osm/jp/gpx/ElementMapTRKSEG.java
deleted file mode 100644
index 892fc7b..0000000
--- a/importPicture/src/osm/jp/gpx/ElementMapTRKSEG.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package osm.jp.gpx;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.TreeMap;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.*;
-import org.xml.sax.SAXException;
-
-@SuppressWarnings("serial")
-public class ElementMapTRKSEG extends TreeMap {
- /**
- * TESTing
- * @param argv
- * @throws ParseException
- * @throws ParserConfigurationException
- * @throws IOException
- * @throws SAXException
- * @throws DOMException
- */
- public static void main(String[] argv) throws DOMException, SAXException, IOException, ParserConfigurationException, ParseException {
- ElementMapTRKSEG mapTRKSEG = null;
- mapTRKSEG = new ElementMapTRKSEG();
- mapTRKSEG.parse(new File("testdata/cameradata/separate.gpx"));
- mapTRKSEG.printinfo();
- }
-
- public ElementMapTRKSEG() {
- super(new TimeComparator());
- }
-
- /**
- * GPXファイルをパースする
- * @code{
- *
- *
- *
- *
- * 47.20000076293945
- *
- * 0.5
- *
- *
- *
- *
- * }
- *
- * @param gpxFile
- * @return Document
- * @throws SAXException
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws DOMException
- * @throws ParseException
- */
- public Document parse(File gpxFile) throws SAXException, IOException, ParserConfigurationException, DOMException, ParseException {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- factory.setIgnoringElementContentWhitespace(true);
- factory.setIgnoringComments(true);
- factory.setValidating(true);
-
- Node gpx = builder.parse(gpxFile).getFirstChild();
- Document document = gpx.getOwnerDocument();
- NodeList nodes = gpx.getChildNodes();
- for (int i=0; i < nodes.getLength(); i++) {
- Node node2 = nodes.item(i);
- if (node2.getNodeName().equals("trk")) {
- Element trk = (Element) node2;
-
- NodeList nodes1 = trk.getChildNodes();
- for (int i1=0; i1 < nodes1.getLength(); i1++) {
- Node nodeTRKSEG = nodes1.item(i1);
- if (nodeTRKSEG.getNodeName().equals("trkseg")) {
- this.put(nodeTRKSEG);
- }
- }
- }
- }
- return document;
- }
-
- /**
- * @code{
- * 拡張put value:NodeをputするとNode内のNodeを put(key,value)する。
- * }
- * @param nodeTRKSEG
- * @throws ParseException
- * @throws DOMException
- */
- public void put(Node nodeTRKSEG) throws DOMException, ParseException {
- if (nodeTRKSEG.getNodeName().equals("trkseg")) {
- NodeList nodes2 = nodeTRKSEG.getChildNodes();
-
- ElementMapTRKPT mapTRKPT = new ElementMapTRKPT();
- for (int i2 = 0; i2 < nodes2.getLength(); i2++) {
- Node nodeTRKPT = nodes2.item(i2);
- if (nodeTRKPT.getNodeName().equals("trkpt")) {
- if (ImportPicture.param_GpxNoFirstNode && (i2 == 0)) {
- continue;
- }
- mapTRKPT.put(new TagTrkpt((Element)nodeTRKPT));
- }
- }
- this.put(mapTRKPT);
- }
- }
-
- /**
- * 拡張put value:ElementMapTRKPTをputするとElementMapTRKPT内の最初のエントリのtimeを読み取ってkeyとしてthis.put(key,value)する。
- * @param value
- * @throws DOMException
- */
- public void put(ElementMapTRKPT value) {
- for (Date key : value.keySet()) {
- this.put(key, value);
- return;
- }
- }
-
- public void printinfo() {
- System.out.println(" +--------------------+--------------------|");
- System.out.println(" GPS logging time | First Time | Last Time |");
- System.out.println("|--------------------------------+--------------------+--------------------|");
- for (java.util.Map.Entry map : this.entrySet()) {
- ElementMapTRKPT mapTRKPT = map.getValue();
- mapTRKPT.printinfo();
- }
- System.out.println("|--------------------------------+--------------------+--------------------|");
- System.out.println();
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/GeoDistance.java b/importPicture/src/osm/jp/gpx/GeoDistance.java
deleted file mode 100644
index 894c67c..0000000
--- a/importPicture/src/osm/jp/gpx/GeoDistance.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package osm.jp.gpx;
-
-/**
- * The MIT License (MIT)
- * Copyright(C) 2007-2012 やまだらけ
- * http://yamadarake.jp/trdi/report000001.html
- * 「Cords.java」を改変
- * 2016-10-03
- *
- * @author やまだらけ yama_darake@yahoo.co.jp
- *
- */
-public class GeoDistance {
-
- public static final double GRS80_A = 6378137.000; // 赤道半径（ｍ）
- public static final double GRS80_E2 = 0.00669438002301188;
- public static final double GRS80_MNUM = 6335439.32708317; //
-
- public static final double WGS84_A = 6378137.000;
- public static final double WGS84_E2 = 0.00669437999019758;
- public static final double WGS84_MNUM = 6335439.32729246;
-
- /**
- * 角度（180度）をラジアン(2π）に変換する
- * @param deg
- * @return
- */
- public static double deg2rad(double deg){
- return deg * Math.PI / 180.0;
- }
-
- /**
- * 距離(m)を返す
- * @param lat1
- * @param lng1
- * @param lat2
- * @param lng2
- * @return
- */
- public static double calcDistHubeny(double lat1, double lng1,
- double lat2, double lng2){
- double my = deg2rad((lat1 + lat2) / 2.0); // 平均緯度
- double dy = deg2rad(lat1 - lat2); // ２点間の緯度
- double dx = deg2rad(lng1 - lng2); // ２点間の経度
-
- double sin = Math.sin(my);
- double w = Math.sqrt(1.0 - GRS80_E2 * sin * sin);
- double m = GRS80_MNUM / (w * w * w);
- double n = GRS80_A / w;
-
- double dym = dy * m;
- double dxncos = dx * n * Math.cos(my);
-
- return Math.sqrt(dym * dym + dxncos * dxncos);
- }
-
-
- public static void main(String[] args){
- System.out.println("Coords Test Program");
- double lat1, lng1, lat2, lng2;
-
- lat1 = Double.parseDouble(args[0]);
- lng1 = Double.parseDouble(args[1]);
- lat2 = Double.parseDouble(args[2]);
- lng2 = Double.parseDouble(args[3]);
-
- double d = calcDistHubeny(lat1, lng1, lat2, lng2);
-
- System.out.println("Distance = " + d + " m");
- }
-}
\ No newline at end of file
diff --git a/importPicture/src/osm/jp/gpx/GpxFile.java b/importPicture/src/osm/jp/gpx/GpxFile.java
deleted file mode 100644
index bc7c306..0000000
--- a/importPicture/src/osm/jp/gpx/GpxFile.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package osm.jp.gpx;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.text.ParseException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-@SuppressWarnings("serial")
-public class GpxFile extends File {
- Node gpx = null;
- ElementMapTRKSEG mapTRKSEG = null;
- Document document;
-
- @SuppressWarnings("LeakingThisInConstructor")
- public GpxFile(File file) throws ParserConfigurationException, DOMException, SAXException, IOException, ParseException {
- super(file.getParentFile(), file.getName());
-
- DocumentBuilderFactory factory = null;
- DocumentBuilder builder = null;
-
- factory = DocumentBuilderFactory.newInstance();
- builder = factory.newDocumentBuilder();
- factory.setIgnoringElementContentWhitespace(true);
- factory.setIgnoringComments(true);
- factory.setValidating(true);
-
- // GPXファイルをパースする
- mapTRKSEG = new ElementMapTRKSEG();
- document = mapTRKSEG.parse(this);
-
- // パースされた mapTRKSEG の中身を出力する
- mapTRKSEG.printinfo();
-
- // GPX file --> Node root
- gpx = builder.parse(this).getFirstChild();
- }
-
- /**
- * GPX 変換出力
- * @param outDir
- * @throws FileNotFoundException
- * @throws TransformerException
- */
- public void output(File outDir) throws FileNotFoundException, TransformerException {
- String fileName = this.getName();
- String iStr = fileName.substring(0, fileName.length() - 4);
- File outputFile = new File(outDir, iStr +"_.gpx");
- System.out.println(this.getAbsolutePath() + " => "+ outputFile.getAbsolutePath());
-
- outputFile.getParentFile().mkdirs();
- DOMSource source = new DOMSource(this.gpx);
- FileOutputStream os = new FileOutputStream(outputFile);
- StreamResult result = new StreamResult(os);
- TransformerFactory transFactory = TransformerFactory.newInstance();
- Transformer transformer = transFactory.newTransformer();
- transformer.setOutputProperty(OutputKeys.INDENT, "yes");
- transformer.setOutputProperty(OutputKeys.METHOD, "xml");
- transformer.transform(source, result);
-
- os = new FileOutputStream(outputFile);
- result = new StreamResult(os);
- transformer.transform(source, result);
- }
-
- /**
- * ＜wpt lat="35.25714922" lon="139.15490497">
- * ＜ele>62.099998474121094＜/ele>
- * ＜time>2012-06-11T00:44:38Z＜/time>
- * ＜name>＜/name>
- * ＜link href="2012-06-11_09-44-38.jpg">
- * ＜text>2012-06-11_09-44-38.jpg＜/text>
- * ＜/link>
- * ＜/wpt>
- *
- * ＜trkpt lat="35.32123832" lon="139.56965631">
- * ＜ele>47.20000076293945＜/ele>
- * ＜time>2012-06-15T03:00:29Z＜/time>
- * ＜/trkpt>
- *
- * @param imgDir
- * @return
- * @param iFile
- * @param timestamp
- * @param trkpt
- */
- public Element createWptTag(File iFile, File imgDir, long timestamp, Element trkpt) {
- Element wpt = document.createElement("wpt");
-
- NamedNodeMap nodeMap = trkpt.getAttributes();
- if (null != nodeMap) {
- for (int j=0; j < nodeMap.getLength(); j++ ) {
- switch (nodeMap.item(j).getNodeName()) {
- case "lat":
- String lat = nodeMap.item(j).getNodeValue();
- wpt.setAttribute("lat", lat);
- break;
- case "lon":
- String lon = nodeMap.item(j).getNodeValue();
- wpt.setAttribute("lon", lon);
- break;
- }
- }
- }
-
- NodeList nodes1 = trkpt.getChildNodes();
- for (int i1=0; i1 < nodes1.getLength(); i1++) {
- Node node1 = nodes1.item(i1);
- NodeList nodes2 = node1.getChildNodes();
- switch (node1.getNodeName()) {
- case "ele":
- for (int i2=0; i2 < nodes2.getLength(); i2++) {
- Node node2 = nodes2.item(i2);
- if (node2 != null) {
- if (node2.getNodeType() == Node.TEXT_NODE) {
- String eleStr = node2.getNodeValue();
- Element eleE = document.createElement("ele");
- eleE.setTextContent(eleStr);
- wpt.appendChild(eleE);
- }
- }
- }
- break;
- case "time":
- for (int i2=0; i2 < nodes2.getLength(); i2++) {
- Node node2 = nodes2.item(i2);
- if (node2 != null) {
- if (node2.getNodeType() == Node.TEXT_NODE) {
- String timeStr = node2.getNodeValue();
- Element timeE = document.createElement("time");
- timeE.setTextContent(timeStr);
- wpt.appendChild(timeE);
- }
- }
- }
- break;
- case "magvar":
- for (int i2=0; i2 < nodes2.getLength(); i2++) {
- Node node2 = nodes2.item(i2);
- if (node2 != null) {
- if (node2.getNodeType() == Node.TEXT_NODE) {
- String magvarStr = node2.getNodeValue();
- Element magvarE = document.createElement("magvar");
- magvarE.setTextContent(magvarStr);
- wpt.appendChild(magvarE);
- }
- }
- }
- break;
- case "speed":
- for (int i2=0; i2 < nodes2.getLength(); i2++) {
- Node node2 = nodes2.item(i2);
- if (node2 != null) {
- if (node2.getNodeType() == Node.TEXT_NODE) {
- String speedStr = node2.getNodeValue();
- Element speedE = document.createElement("speed");
- speedE.setTextContent(speedStr);
- wpt.appendChild(speedE);
- }
- }
- }
- break;
- }
- }
-
- Element name = document.createElement("name");
- name.appendChild(document.createCDATASection("写真"));
- wpt.appendChild(name);
-
- Element link = document.createElement("link");
- link.setAttribute("href", ImportPicture.getShortPathName(imgDir, iFile));
- Element text = document.createElement("text");
- text.setTextContent(iFile.getName());
- link.appendChild(text);
- wpt.appendChild(link);
-
- return wpt;
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java
deleted file mode 100644
index 169f5a8..0000000
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ /dev/null
@@ -1,729 +0,0 @@
-package osm.jp.gpx;
-
-import java.io.*;
-import java.nio.channels.FileChannel;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.TimeZone;
-import java.util.logging.LogManager;
-import java.util.logging.Logger;
-
-import javax.xml.parsers.*;
-import javax.xml.transform.TransformerException;
-
-import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.ImageMetadata;
-import org.apache.commons.imaging.common.RationalNumber;
-import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
-import org.apache.commons.imaging.formats.jpeg.exif.ExifRewriter;
-import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
-import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
-import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants;
-import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory;
-import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
-import org.w3c.dom.*;
-import org.xml.sax.SAXException;
-
-public class ImportPicture extends Thread {
-
- /**
- * 実行中に発生したExceptionを保持する場所
- */
- public Exception ex = null;
-
- /**
- * ログ設定プロパティファイルのファイル内容
- */
- protected static final String LOGGING_PROPERTIES_DATA
- = "handlers=java.util.logging.ConsoleHandler\n"
- + ".level=FINEST\n"
- + "java.util.logging.ConsoleHandler.level=INFO\n"
- + "java.util.logging.ConsoleHandler.formatter=osm.jp.gpx.YuuLogFormatter";
-
- /**
- * static initializer によるログ設定の初期化
- */
- public static final Logger LOGGER = Logger.getLogger("CommandLogging");
- static {
- InputStream inStream = null;
- try {
- inStream = new ByteArrayInputStream(LOGGING_PROPERTIES_DATA.getBytes("UTF-8"));
- try {
- LogManager.getLogManager().readConfiguration(inStream);
- // "ログ設定: LogManagerを設定しました。"
- LOGGER.config("LoggerSettings: LogManager setuped.");
- }
- catch (IOException e) {
- // LogManager設定の際に例外が発生しました.
- String str = "LoggerSettings: Exception occered:" + e.toString();
- LOGGER.warning(str);
- }
- }
- catch (UnsupportedEncodingException e) {
- String str = "LoggerSettings: Not supported 'UTF-8' encoding: " + e.toString();
- LOGGER.severe(str);
- }
- finally {
- try {
- if (inStream != null) {
- inStream.close();
- }
- } catch (IOException e) {
- String str = "LoggerSettings: Exception occored: "+ e.toString();
- LOGGER.warning(str);
- }
- }
- }
-
- /** メイン
- * 画像ファイルをGPXファイルに取り込みます。
- *
- * ・画像ファイルの更新日付をその画像の撮影日時とします。(Exi情報は無視します)
- * ※ 対象とするファイルは'*.jpg'のみ
- * ・精確な時刻との時差を入力することで、撮影日時を補正します。
- * ・画像ファイルの更新日付リストをCSV形式のファイルとして出力する。
- * ・・結果は、取り込み元のGPXファイルとは別に、元ファイル名にアンダーバー「_」を付加した.ファイルに出力します。
- *
- * exp) $ java -cp .:AdjustTime.jar:commons-imaging-1.0-SNAPSHOT.jar [AdjustTime.ini]
- * exp) > java -cp .;AdjustTime.jar;commons-imaging-1.0-SNAPSHOT.jar [AdjustTime.ini]
- *
- * @param argv
- * argv[0] = INIファイルのパス名
- *
- * argv[-] = dummy
- * argv[0] = 画像ファイルが格納されているディレクトリ --> imgDir
- * argv[1] = 時刻補正の基準とする画像ファイル --> baseFile
- * argv[2] = 基準画像ファイルの精確な撮影日時 "yyyy-MM-dd'T'HH:mm:ss" --> timeStr
- * argv[3] = 出力先フォルダ --> outDir
- * argv[4] = 撮影位置をロギングしたGPXファイル --> gpxDir
- *
- * @throws IOException
- * @throws ImageReadException
- */
- public static void main(String[] argv) throws Exception
- {
- ImportPicture obj = new ImportPicture();
- obj.setUp(((argv.length < 1) ? AppParameters.FILE_PATH : argv[0]));
- }
-
- public File gpxDir;
- public File imgDir;
- public File outDir;
- public long delta = 0;
- public boolean exif = false;
- public boolean exifBase = false;
- public ArrayList gpxFiles = new ArrayList<>();
- public AppParameters params;
- public boolean param_GpxSplit = false;
- public static boolean param_GpxNoFirstNode = false;
- public boolean param_GpxReuse = false;
- public boolean param_GpxOutputWpt = true;
- public boolean param_ImgOutputAll = false;
- public String param_GpxSourceFolder = ".";
-
- public static final String TIME_FORMAT_STRING = "yyyy-MM-dd'T'HH:mm:ss'Z'";
- private static final String EXIF_DATE_TIME_FORMAT_STRING = "yyyy:MM:dd HH:mm:ss";
- public ResourceBundle i18n = ResourceBundle.getBundle("i18n");
-
- public void setUp(String paramFilePath) throws Exception {
- System.out.println("Param File = '"+ paramFilePath +"'");
- this.params = new AppParameters(paramFilePath);
-
- Date imgtime;
-
- System.out.println(" - param： "+ AppParameters.IMG_TIME +"="+ this.params.getProperty(AppParameters.IMG_TIME) );
- System.out.println(" - param： "+ AppParameters.IMG_BASE_FILE +"="+ this.params.getProperty(AppParameters.IMG_BASE_FILE) );
- System.out.println(" - param： "+ AppParameters.GPX_BASETIME +"="+ this.params.getProperty(AppParameters.GPX_BASETIME) );
- System.out.println(" - param： "+ AppParameters.IMG_SOURCE_FOLDER +"="+ this.params.getProperty(AppParameters.IMG_SOURCE_FOLDER) );
- System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_FOLDER +"="+ this.params.getProperty(AppParameters.IMG_OUTPUT_FOLDER) );
- System.out.println(" - param： "+ AppParameters.IMG_OUTPUT +"="+ this.params.getProperty(AppParameters.IMG_OUTPUT));
- System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_ALL +"="+ this.param_ImgOutputAll);
- System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_EXIF +"= "+ String.valueOf(this.exif));
- System.out.println(" - param： "+ AppParameters.GPX_SOURCE_FOLDER +"="+ this.param_GpxSourceFolder);
- System.out.println(" - param： "+ AppParameters.GPX_OUTPUT_WPT +"="+ this.param_GpxOutputWpt);
- System.out.println(" - param： "+ AppParameters.GPX_OVERWRITE_MAGVAR +"="+ Complementation.param_GpxOverwriteMagvar);
- System.out.println(" - param： "+ AppParameters.GPX_OUTPUT_SPEED +"="+ Complementation.param_GpxOutputSpeed);
- System.out.println(" - param： "+ AppParameters.GPX_GPXSPLIT +"="+ this.param_GpxSplit);
- System.out.println(" - param： "+ AppParameters.GPX_NO_FIRST_NODE +"="+ ImportPicture.param_GpxNoFirstNode);
- System.out.println(" - param： "+ AppParameters.GPX_REUSE +"="+ this.param_GpxReuse);
-
- this.ex = null;
- // argv[0] --> AppParameters.IMG_SOURCE_FOLDER に置き換え
- this.imgDir = new File(this.params.getProperty(AppParameters.IMG_SOURCE_FOLDER));
-
- // 基準時刻（ファイル更新日時 | EXIF撮影日時)
- this.exifBase = (this.params.getProperty(AppParameters.GPX_BASETIME).equals("EXIF_TIME"));
-
- // 基準時刻ファイルの「更新日時」を使って時刻合わせを行う。
- // argv[1] --> AppParameters.IMG_BASE_FILE に置き換え
- imgtime = this.adjustTime(new File(this.imgDir, this.params.getProperty(AppParameters.IMG_BASE_FILE)));
-
- // 出力ファイル
- // argv[3] --> AppParameters.IMG_OUTPUT に置き換え
- this.outDir = new File(this.params.getProperty(AppParameters.IMG_OUTPUT_FOLDER));
-
- // その他のパラメータを読み取る
- String paramStr = this.params.getProperty(AppParameters.GPX_GPXSPLIT);
- if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {
- this.param_GpxSplit = true;
- }
-
- paramStr = this.params.getProperty(AppParameters.GPX_NO_FIRST_NODE);
- if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {
- ImportPicture.param_GpxNoFirstNode = true;
- }
-
- paramStr = this.params.getProperty(AppParameters.GPX_REUSE);
- if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {
- this.param_GpxReuse = true;
- }
-
- paramStr = this.params.getProperty(AppParameters.IMG_OUTPUT_ALL);
- if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {
- this.param_ImgOutputAll = true;
- }
-
- paramStr = this.params.getProperty(AppParameters.GPX_OUTPUT_WPT);
- if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {
- this.param_GpxOutputWpt = true;
- }
-
- paramStr = this.params.getProperty(AppParameters.GPX_OVERWRITE_MAGVAR);
- if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {
- Complementation.param_GpxOverwriteMagvar = true;
- }
-
- paramStr = this.params.getProperty(AppParameters.GPX_OUTPUT_SPEED);
- if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {
- Complementation.param_GpxOutputSpeed = true;
- }
-
- paramStr = this.params.getProperty(AppParameters.GPX_SOURCE_FOLDER);
- if (paramStr != null) {
- this.param_GpxSourceFolder = paramStr;
- this.gpxDir = new File(this.param_GpxSourceFolder);
- if (!this.gpxDir.exists()) {
- // GPXファイルまたはディレクトリが存在しません。('%s')
- System.out.println(
- String.format(i18n.getString("msg.100"), paramStr)
- );
- return;
- }
- }
- else {
- this.gpxDir = this.imgDir;
- }
-
- // 指定されたディレクトリ内のGPXファイルすべてを対象とする
- if (this.gpxDir.isDirectory()) {
- File[] files = this.gpxDir.listFiles();
- if (files == null) {
- // 対象となるGPXファイルがありませんでした。('%s')
- System.out.println(
- String.format(i18n.getString("msg.110"), this.gpxDir.getAbsolutePath())
- );
- return;
- }
- if (this.param_ImgOutputAll && (files.length > 1)) {
- // "複数のGPXファイルがあるときには、'IMG.OUTPUT_ALL'オプションは指定できません。"
- System.out.println(
- i18n.getString("msg.120")
- );
- return;
- }
-
- java.util.Arrays.sort(
- files, new java.util.Comparator() {
- @Override
- public int compare(File file1, File file2){
- return file1.getName().compareTo(file2.getName());
- }
- }
- );
- for (File file : files) {
- if (file.isFile()) {
- String filename = file.getName().toUpperCase();
- if (filename.toUpperCase().endsWith(".GPX")) {
- if (!filename.toUpperCase().endsWith("_.GPX") || this.param_GpxReuse) {
- this.gpxFiles.add(file);
- }
- }
- }
- }
- }
- else {
- this.gpxFiles.add(this.gpxDir);
- }
-
- paramStr = this.params.getProperty(AppParameters.IMG_OUTPUT_EXIF);
- if ((paramStr != null) && (paramStr.equals(Boolean.toString(true)))) {
- this.exif = true;
- }
-
- String timeStr = this.params.getProperty(AppParameters.IMG_TIME);
- try {
- Date t = toUTCDate(timeStr);
- this.delta = t.getTime() - imgtime.getTime();
- }
- catch (ParseException e) {
- // "'%s'の書式が違います(%s)"
- System.out.println(
- String.format(
- i18n.getString("msg.130"),
- timeStr,
- TIME_FORMAT_STRING
- )
- );
- return;
- }
-
- this.start();
- try {
- this.join();
- } catch(InterruptedException end) {}
- if (this.ex != null) {
- throw this.ex;
- }
- }
-
- /**
- * @code{
-
- 62.099998474121094
-
- 0.75
-
-
-
- 2012-06-11_09-44-38.jpg
-
- 9
-
- * }
- */
- @Override
- public void run() {
- try {
- if (params.getProperty(AppParameters.IMG_OUTPUT).equals(Boolean.toString(true))) {
- outDir = new File(outDir, imgDir.getName());
- }
- else {
- outDir = gpxDir;
- }
- for (File gpxFile : this.gpxFiles) {
- procGPXfile(new GpxFile(gpxFile));
- }
- }
- catch(ParserConfigurationException | DOMException | SAXException | IOException | ParseException | ImageReadException | ImageWriteException | IllegalArgumentException | TransformerException e) {
- e.printStackTrace();
- this.ex = new Exception(e);
- }
- }
-
- /**
- * 個別のGPXファイルを処理する
- *
- * @throws ParserConfigurationException
- * @throws IOException
- * @throws SAXException
- * @throws ParseException
- * @throws ImageWriteException
- * @throws ImageReadException
- * @throws TransformerException
- */
- void procGPXfile(GpxFile gpxFile) throws ParserConfigurationException, SAXException, IOException, ParseException, ImageReadException, ImageWriteException, TransformerException {
- System.gc();
-
- System.out.println("time difference: "+ (delta / 1000) +"(sec)");
- System.out.println(" Target GPX: ["+ gpxFile.getAbsolutePath() +"]");
- System.out.println(" EXIF: "+ (exif ? ("convert to '" + outDir.getAbsolutePath() +"'") : "off"));
- System.out.println();
-
- // imgDir内の画像ファイルを処理する
- 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);
- System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|");
-
- // GPX出力
- gpxFile.output(outDir);
- }
-
-
- /**
- * 再帰メソッド
- * @throws ParseException
- * @throws IOException
- * @throws ImageReadException
- * @throws ImageWriteException
- */
- boolean proc(File dir, long delta, ElementMapTRKSEG mapTRKSEG, boolean exifWrite, GpxFile gpxFile) throws ParseException, ImageReadException, IOException, ImageWriteException {
- boolean ret = false;
- File[] files = dir.listFiles(new JpegFileFilter());
- Arrays.sort(files, new FileSort());
- for (File image : files) {
- System.out.print(String.format("|%-32s|", image.getName()));
- if (image.isDirectory()) {
- ret = proc(image, delta, mapTRKSEG, exifWrite, gpxFile);
- continue;
- }
-
- String imageName = image.getName();
- if (!checkFile(imageName)) {
- System.out.println(String.format("%20s ", "it is not image file."));
- continue;
- }
-
- Discripter result = procImageFile(image, delta, mapTRKSEG, exifWrite, gpxFile);
- ret |= result.ret;
- switch (result.control) {
- case Discripter.CONTINUE:
- continue;
- case Discripter.BREAK:
- break;
- }
- }
- return ret;
- }
-
- class Discripter {
- static final int NEXT = 0;
- static final int CONTINUE = -1;
- static final int BREAK = 1;
-
- public boolean ret;
- public int control;
- public Discripter(boolean ret) {
- this.ret = ret;
- this.control = Discripter.NEXT;
- }
- }
-
- Discripter procImageFile(File imageFile, long delta, ElementMapTRKSEG mapTRKSEG, boolean exifWrite, GpxFile gpxFile) throws ParseException, ImageReadException, IOException, ImageWriteException {
- Discripter result = new Discripter(false);
-
- // itime <-- 画像ファイルの撮影時刻
- // ファイルの更新日時／EXIFの撮影日時
- Date itime = new Date(imageFile.lastModified());
- if (this.exifBase) {
- ImageMetadata meta = Imaging.getMetadata(imageFile);
- JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta;
- if (jpegMetadata == null) {
- // "'%s'にEXIF情報がありません"
- System.out.println(
- String.format(
- i18n.getString("msg.140"),
- imageFile.getAbsolutePath()
- )
- );
- result.control = Discripter.CONTINUE;
- return result;
- }
- @SuppressWarnings("LocalVariableHidesMemberVariable")
- TiffImageMetadata exif = jpegMetadata.getExif();
- if (exif == null) {
- // "'%s'にEXIF情報がありません"
- System.out.println(
- String.format(
- i18n.getString("msg.140"),
- imageFile.getAbsolutePath()
- )
- );
- result.control = Discripter.CONTINUE;
- return result;
- }
- String dateTimeOriginal = exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0];
- itime = ImportPicture.toEXIFDate(dateTimeOriginal);
- }
- System.out.print(String.format("%20s|", toUTCString(itime)));
-
- // uktime <-- 画像撮影時刻に対応するGPX時刻(補正日時)
- Date correctedtime = new Date(itime.getTime() + delta);
- System.out.print(String.format("%20s|", toUTCString(correctedtime)));
-
- // 時刻uktimeにおけるをtrkptに追加する
- String eleStr = "-";
- String magvarStr = "-";
- String speedStr = "-";
- double latitude = 90.5D;
- double longitude = 180.5D;
- TagTrkpt trkptT = null;
-
- for (Map.Entry map : mapTRKSEG.entrySet()) {
- ElementMapTRKPT mapTRKPT = map.getValue();
- trkptT = mapTRKPT.getValue(correctedtime);
- if (trkptT != null) {
- break;
- }
- }
-
- if (trkptT == null) {
- System.out.print(String.format("%-14s|%-14s|", "", ""));
- System.out.println(String.format("%8s|%6s|%6s|", "", "", ""));
- if (!this.param_ImgOutputAll) {
- result.control = Discripter.CONTINUE;
- return result;
- }
- }
- else {
- latitude = trkptT.lat;
- longitude = trkptT.lon;
-
- if (trkptT.eleStr != null) {
- eleStr = trkptT.eleStr;
- }
-
- if (trkptT.magvarStr != null) {
- magvarStr = trkptT.magvarStr;
- }
-
- 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));
- }
-
- result.ret = true;
- outDir.mkdir();
-
- if (exifWrite) {
- exifWrite(imageFile, correctedtime, trkptT);
-
- if (Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OUTPUT_WPT))) {
- if (trkptT != null) {
- Element temp = gpxFile.createWptTag(imageFile, imgDir, itime.getTime(), trkptT.trkpt);
- gpxFile.gpx.appendChild(temp);
- }
- }
- }
- else {
- if (this.param_ImgOutputAll) {
- // EXIFの変換を伴わない単純なファイルコピー
- FileInputStream sStream = new FileInputStream(imageFile);
- FileInputStream dStream = new FileInputStream(new File(outDir, imageFile.getName()));
- FileChannel srcChannel = sStream.getChannel();
- FileChannel destChannel = dStream.getChannel();
- try {
- srcChannel.transferTo(0, srcChannel.size(), destChannel);
- }
- finally {
- srcChannel.close();
- destChannel.close();
- sStream.close();
- dStream.close();
- }
- }
- }
- result.control = Discripter.NEXT;
- return result;
- }
-
- void exifWrite(File imageFile, Date correctedtime, TagTrkpt trkptT) throws ImageReadException, IOException, ImageWriteException {
- DecimalFormat yearFormatter = new DecimalFormat("0000");
- DecimalFormat monthFormatter = new DecimalFormat("00");
- DecimalFormat dayFormatter = new DecimalFormat("00");
-
- TiffOutputSet outputSet = null;
-
- ImageMetadata meta = Imaging.getMetadata(imageFile);
- JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta;
- if (jpegMetadata != null) {
- @SuppressWarnings("LocalVariableHidesMemberVariable")
- TiffImageMetadata exif = jpegMetadata.getExif();
- if (exif != null) {
- outputSet = exif.getOutputSet();
- }
- }
-
- if (outputSet == null) {
- outputSet = new TiffOutputSet();
- }
-
- //---- EXIF_TAG_DATE_TIME_ORIGINAL / 「撮影日時/オリジナル画像の生成日時」----
- TiffOutputDirectory exifDir = outputSet.getOrCreateExifDirectory();
- {
- Calendar cal = Calendar.getInstance();
- cal.setTimeZone(TimeZone.getTimeZone("UTC"));
- cal.setTime(correctedtime);
- exifDir.removeField(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL);
- exifDir.add(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL, ImportPicture.toEXIFString(cal.getTime()));
- }
-
- //---- EXIF GPS_TIME_STAMP ----
- TiffOutputDirectory gpsDir = outputSet.getOrCreateGPSDirectory();
- {
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- cal.setTimeZone(TimeZone.getTimeZone("GMT+00"));
- cal.setTime(correctedtime);
- final String yearStr = yearFormatter.format(cal.get(Calendar.YEAR));
- final String monthStr = monthFormatter.format(cal.get(Calendar.MONTH) + 1);
- final String dayStr = dayFormatter.format(cal.get(Calendar.DAY_OF_MONTH));
- final String dateStamp = yearStr +":"+ monthStr +":"+ dayStr;
-
- gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_TIME_STAMP);
- gpsDir.add(
- GpsTagConstants.GPS_TAG_GPS_TIME_STAMP,
- RationalNumber.valueOf(cal.get(Calendar.HOUR_OF_DAY)),
- RationalNumber.valueOf(cal.get(Calendar.MINUTE)),
- RationalNumber.valueOf(cal.get(Calendar.SECOND))
- );
- gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_DATE_STAMP);
- gpsDir.add(GpsTagConstants.GPS_TAG_GPS_DATE_STAMP, dateStamp);
- }
-
- if (trkptT != null) {
- //---- EXIF GPS elevation/ALTITUDE ----
- if (trkptT.eleStr != null) {
- final double altitude = Double.parseDouble(trkptT.eleStr);
- gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_ALTITUDE);
- gpsDir.add(GpsTagConstants.GPS_TAG_GPS_ALTITUDE, RationalNumber.valueOf(altitude));
- }
-
- //---- EXIF GPS magvar/IMG_DIRECTION ----
- if (trkptT.magvarStr != null) {
- final double magvar = Double.parseDouble(trkptT.magvarStr);
- gpsDir.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION);
- gpsDir.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION, RationalNumber.valueOf(magvar));
- }
-
- //---- EXIF GPS_ ----
- outputSet.setGPSInDegrees(trkptT.lon, trkptT.lat);
- }
-
- ExifRewriter rewriter = new ExifRewriter();
- try (FileOutputStream fos = new FileOutputStream(new File(outDir, imageFile.getName()))) {
- rewriter.updateExifMetadataLossy(imageFile, fos, outputSet);
- }
- }
-
- // 基準時刻ファイルの「更新日時」を使って時刻合わせを行う。
- // argv[1] --> AppParameters.IMG_BASE_FILE に置き換え
- // File baseFile = new File(this.imgDir, this.params.getProperty(AppParameters.IMG_BASE_FILE));
- private Date adjustTime(File baseFile) throws ImageReadException, IOException, ParseException {
- if (exifBase) {
- ImageMetadata meta = Imaging.getMetadata(baseFile);
- JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta;
- if (jpegMetadata == null) {
- // "'%s'にEXIF情報がありません"
- System.out.println(
- String.format(
- i18n.getString("msg.140"),
- baseFile.getAbsolutePath()
- )
- );
- return null;
- }
- @SuppressWarnings("LocalVariableHidesMemberVariable")
- TiffImageMetadata exif = jpegMetadata.getExif();
- if (exif == null) {
- // "'%s'にEXIF情報がありません"
- System.out.println(
- String.format(
- i18n.getString("msg.140"),
- baseFile.getAbsolutePath()
- )
- );
- return null;
- }
- String dateTimeOriginal = exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0];
- return new Date(ImportPicture.toEXIFDate(dateTimeOriginal).getTime());
- }
- else {
- return new Date(baseFile.lastModified());
- }
- }
-
- /**
- * 対象は '*.JPG' のみ対象とする
- * @return
- * @param name
- */
- public static boolean checkFile(String name) {
- return ((name != null) && name.toUpperCase().endsWith(".JPG"));
- }
-
- /**
- * DateをEXIFの文字列に変換する。
- * 注意：EXiFの撮影時刻はUTC時間ではない
- * @param localdate
- * @return
- */
- public static String toEXIFString(Date localdate) {
- DateFormat dfUTC = new SimpleDateFormat(EXIF_DATE_TIME_FORMAT_STRING);
- return dfUTC.format(localdate);
- }
-
- /**
- * EXIFの文字列をDateに変換する。
- * 注意：EXiFの撮影時刻はUTC時間ではない
- * @param timeStr
- * @return
- * @throws ParseException
- */
- public static Date toEXIFDate(String timeStr) throws ParseException {
- DateFormat dfUTC = new SimpleDateFormat(EXIF_DATE_TIME_FORMAT_STRING);
- //dfUTC.setTimeZone(TimeZone.getTimeZone("UTC"));
- return dfUTC.parse(timeStr);
- }
-
- public static String toUTCString(Date localdate) {
- DateFormat dfUTC = new SimpleDateFormat(TIME_FORMAT_STRING);
- dfUTC.setTimeZone(TimeZone.getTimeZone("UTC"));
- return dfUTC.format(localdate);
- }
-
- public static Date toUTCDate(String timeStr) throws ParseException {
- DateFormat dfUTC = new SimpleDateFormat(TIME_FORMAT_STRING);
- dfUTC.setTimeZone(TimeZone.getTimeZone("UTC"));
- return dfUTC.parse(timeStr);
- }
-
- static String getShortPathName(File dir, File iFile) {
- String dirPath = dir.getAbsolutePath();
- String filePath = iFile.getAbsolutePath();
- if (filePath.startsWith(dirPath)) {
- return filePath.substring(dirPath.length()+1);
- }
- else {
- return filePath;
- }
- }
-
- /**
- * ファイル名の順序に並び替えるためのソートクラス
- *
- * @author hayashi
- */
- static class FileSort implements Comparator {
- @Override
- public int compare(File src, File target){
- int diff = src.getName().compareTo(target.getName());
- return diff;
- }
- }
-
- /**
- * JPEGファイルフィルター
- * @author yuu
- */
- class JpegFileFilter implements FilenameFilter {
- @Override
- public boolean accept(File dir, String name) {
- return name.toUpperCase().matches(".*\\.JPG$");
- }
- }
-}
\ No newline at end of file
diff --git a/importPicture/src/osm/jp/gpx/Restamp.java b/importPicture/src/osm/jp/gpx/Restamp.java
deleted file mode 100644
index 237fe6b..0000000
--- a/importPicture/src/osm/jp/gpx/Restamp.java
+++ /dev/null
@@ -1,259 +0,0 @@
-package osm.jp.gpx;
-
-import java.io.*;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.ResourceBundle;
-import java.util.logging.LogManager;
-import java.util.logging.Logger;
-import org.apache.commons.imaging.ImageReadException;
-
-/**
- * 動画から一定間隔で切り出したIMAGEのファイル更新日時を書き換える
- *
- * @author yuu
- */
-public class Restamp extends Thread {
- /**
- * 実行中に発生したExceptionを保持する場所
- */
- public Exception ex = null;
-
- /**
- * ログ設定プロパティファイルのファイル内容
- */
- protected static final String LOGGING_PROPERTIES_DATA
- = "handlers=java.util.logging.ConsoleHandler\n"
- + ".level=FINEST\n"
- + "java.util.logging.ConsoleHandler.level=INFO\n"
- + "java.util.logging.ConsoleHandler.formatter=osm.jp.gpx.YuuLogFormatter";
-
- /**
- * static initializer によるログ設定の初期化
- */
- public static final Logger LOGGER = Logger.getLogger("CommandLogging");
- static {
- InputStream inStream = null;
- try {
- inStream = new ByteArrayInputStream(LOGGING_PROPERTIES_DATA.getBytes("UTF-8"));
- try {
- LogManager.getLogManager().readConfiguration(inStream);
- // "ログ設定: LogManagerを設定しました。"
- LOGGER.config("LoggerSettings: LogManager setuped.");
- }
- catch (IOException e) {
- // LogManager設定の際に例外が発生しました.
- String str = "LoggerSettings: Exception occered:" + e.toString();
- LOGGER.warning(str);
- }
- }
- catch (UnsupportedEncodingException e) {
- String str = "LoggerSettings: Not supported 'UTF-8' encoding: " + e.toString();
- LOGGER.severe(str);
- }
- finally {
- try {
- if (inStream != null) {
- inStream.close();
- }
- } catch (IOException e) {
- String str = "LoggerSettings: Exception occored: "+ e.toString();
- LOGGER.warning(str);
- }
- }
- }
-
- /**
- * メイン
- * 動画から一定間隔で切り出したIMAGEのファイル更新日時を書き換える
- *
- * ・画像ファイルの更新日付を書き換えます。(Exi情報は無視します)
- * ※ 指定されたディレクトリ内のすべての'*.jpg'ファイルを処理の対象とします
- * ・画像は連番形式（名前順に並べられること）の名称となっていること
- *
- * パラメータ
- * ・対象のフォルダ（ディレクトリ内のすべての'*.jpg'ファイルを処理の対象とします）
- * ・基準となる画像
- * ・基準画像の正しい日時
- * ・画像ファイルの間隔（秒）
- *
- * exp) $ java -cp .:AdjustTime.jar:commons-imaging-1.0-SNAPSHOT.jar [AdjustTime.ini]
- * exp) > java -cp .;AdjustTime.jar;commons-imaging-1.0-SNAPSHOT.jar [AdjustTime.ini]
- *
- * 1. 予め、動画から画像を切り出す
- * ソースファイル（mp4ファイル）; 「-i 20160427_104154.mp4」
- * 出力先: 「-f image2 img/%06d.jpg」 imgフォルダに６桁の連番ファイルを差出力する
- * 切り出し開始秒数→ 「-ss 0」 （ファイルの０秒から切り出し開始）
- * 切り出し間隔； 「-r 30」 (１秒間隔=３０fps間隔)
- * ```
- * $ cd /home/yuu/Desktop/OSM/20180325_横浜新道
- * $ ffmpeg -ss 0 -i 20160427_104154.mp4 -f image2 -r 15 img/%06d.jpg
- * ```
- *
- * 2. ファイルの更新日付を書き換える
- * ```
- * $ cd /home/yuu/Desktop/workspace/AdjustTime/importPicture/dist
- * $ java -cp .:AdjustTime2.jar osm.jp.gpx.Restamp /home/yuu/Desktop/OSM/20180325_横浜新道/img 000033.jpg 2018-03-25_12:20:32 003600.jpg 2018-03-25_13:20:09
- * ```
- *
- * @param argv
- * argv[0] = 画像ファイルが格納されているディレクトリ --> imgDir
- * argv[1] = 時刻補正の基準とする画像ファイル --> baseFile
- * argv[2] = 基準画像ファイルの精確な撮影日時 "yyyy-MM-dd_HH:mm:ss" --> baseTime
- * argv[3] = 時刻補正の基準とする画像ファイル --> baseFile
- * argv[4] = 基準画像ファイルの精確な撮影日時 "yyyy-MM-dd_HH:mm:ss" --> baseTime
- *
- * @throws IOException
- * @throws ImageReadException
- */
- public static void main(String[] argv) throws Exception
- {
- if (argv.length < 5) {
- System.out.println("java Restamp ");
- return;
- }
-
- File imgDir = new File(argv[0]);
- if (!imgDir.exists()) {
- // "[error] が存在しません。"
- System.out.println(i18n.getString("msg.200"));
- return;
- }
- if (!imgDir.isDirectory()) {
- // "[error] がフォルダじゃない"
- System.out.println(i18n.getString("msg.210"));
- return;
- }
-
- File baseFile1 = new File(imgDir, argv[1]);
- if (!baseFile1.exists()) {
- // "[error] が存在しません。"
- System.out.println(i18n.getString("msg.220"));
- return;
- }
- if (!baseFile1.isFile()) {
- // "[error] がファイルじゃない"
- System.out.println(i18n.getString("msg.230"));
- return;
- }
-
- DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd'_'HH:mm:ss");
- Date baseTime1 = df1.parse(argv[2]);
-
- File baseFile2 = new File(imgDir, argv[3]);
- if (!baseFile2.exists()) {
- // "[error] が存在しません。"
- System.out.println(i18n.getString("msg.240"));
- return;
- }
- if (!baseFile2.isFile()) {
- // "[error] がファイルじゃない"
- System.out.println(i18n.getString("msg.250"));
- return;
- }
-
- DateFormat df2 = new SimpleDateFormat("yyyy-MM-dd'_'HH:mm:ss");
- Date baseTime2 = df2.parse(argv[4]);
-
- Restamp obj = new Restamp();
- obj.setUp(imgDir, baseFile1, baseTime1, baseFile2, baseTime2);
- }
-
- public File imgDir;
- public Date baseTime1;
- public Date baseTime2;
- public int bCount1 = 0;
- public int bCount2 = 0;
- public long span = 0;
- public ArrayList jpgFiles = new ArrayList<>();
- public static ResourceBundle i18n = ResourceBundle.getBundle("i18n");
-
- @SuppressWarnings("Convert2Lambda")
- public void setUp(File imgDir, File baseFile1, Date baseTime1, File baseFile2, Date baseTime2) throws Exception {
- // 指定されたディレクトリ内のGPXファイルすべてを対象とする
- File[] files = imgDir.listFiles();
- java.util.Arrays.sort(files, new java.util.Comparator() {
- @Override
- public int compare(File file1, File file2){
- return file1.getName().compareTo(file2.getName());
- }
- });
- bCount1 = 0;
- bCount2 = 0;
- boolean base1 = false;
- boolean base2 = false;
- for (File file : files) {
- if (file.isFile()) {
- String filename = file.getName().toUpperCase();
- if (filename.toUpperCase().endsWith(".JPG")) {
- this.jpgFiles.add(file);
- bCount1 += (base1 ? 0 : 1);
- bCount2 += (base2 ? 0 : 1);
- if (file.getName().equals(baseFile1.getName())) {
- base1 = true;
- }
- if (file.getName().equals(baseFile2.getName())) {
- base2 = true;
- }
- }
- }
- }
-
- try {
- // imgDir内の画像ファイルを処理する
- @SuppressWarnings("LocalVariableHidesMemberVariable")
- long span = baseTime2.getTime() - baseTime1.getTime();
- span = span / (bCount2 - bCount1);
- int i = 0;
- for (File jpgFile : this.jpgFiles) {
- long deltaMsec = (i - bCount1) * span;
- i++;
- Calendar cal = Calendar.getInstance();
- cal.setTime(baseTime1);
- cal.add(Calendar.MILLISECOND, (int) deltaMsec);
- jpgFile.setLastModified(cal.getTimeInMillis());
- }
- }
- catch(Exception e) {
- e.printStackTrace();
- this.ex = new Exception(e);
- }
- }
-
- /**
- * 対象は '*.JPG' のみ対象とする
- * @return
- * @param name
- */
- public static boolean checkFile(String name) {
- return ((name != null) && name.toUpperCase().endsWith(".JPG"));
- }
-
- /**
- * ファイル名の順序に並び替えるためのソートクラス
- *
- * @author hayashi
- */
- static class FileSort implements Comparator {
- @Override
- public int compare(File src, File target){
- int diff = src.getName().compareTo(target.getName());
- return diff;
- }
- }
-
- /**
- * JPEGファイルフィルター
- * @author yuu
- */
- class JpegFileFilter implements FilenameFilter {
- @Override
- public boolean accept(File dir, String name) {
- return name.toUpperCase().matches(".*\\.JPG$");
- }
- }
-}
\ No newline at end of file
diff --git a/importPicture/src/osm/jp/gpx/TagTrkpt.java b/importPicture/src/osm/jp/gpx/TagTrkpt.java
deleted file mode 100644
index 171827f..0000000
--- a/importPicture/src/osm/jp/gpx/TagTrkpt.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package osm.jp.gpx;
-
-import java.text.ParseException;
-import java.util.Date;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @code{
- * ＜trkpt lat="35.32123832" lon="139.56965631">
- * 47.20000076293945
- *
- *
- *
- * ＜/trkpt>
- * }
- *
- */
-public class TagTrkpt {
- public Element trkpt = null;
- public Double lat = null;
- public Double lon = null;
- public String eleStr = null;
- public Date time = null;
- public String magvarStr = null;
- public String speedStr = null;
-
- public TagTrkpt(Element trkpt) {
- this.trkpt = (Element) trkpt.cloneNode(true);
-
- NamedNodeMap nodeMap = trkpt.getAttributes();
- for (int j=0; j < nodeMap.getLength(); j++ ) {
- switch (nodeMap.item(j).getNodeName()) {
- case "lat":
- String latStr = nodeMap.item(j).getNodeValue();
- this.lat = new Double(latStr);
- break;
- case "lon":
- String lonStr = nodeMap.item(j).getNodeValue();
- this.lon = new Double(lonStr);
- break;
- }
- }
-
- NodeList nodes1 = trkpt.getChildNodes();
- for (int i1=0; i1 < nodes1.getLength(); i1++) {
- Node node1 = nodes1.item(i1);
- NodeList nodes2 = node1.getChildNodes();
- switch (node1.getNodeName()) {
- case "ele":
- for (int i2=0; i2 < nodes2.getLength(); i2++) {
- Node node2 = nodes2.item(i2);
- if (node2 != null) {
- if (node2.getNodeType() == Node.TEXT_NODE) {
- this.eleStr = node2.getNodeValue();
- }
- }
- }
- break;
- case "time":
- for (int i2=0; i2 < nodes2.getLength(); i2++) {
- Node node2 = nodes2.item(i2);
- if (node2 != null) {
- if (node2.getNodeType() == Node.TEXT_NODE) {
- try {
- this.time = ImportPicture.toUTCDate(node2.getNodeValue());
- } catch (ParseException e) {
- this.time = null;
- }
- }
- }
- }
- break;
- case "magvar":
- for (int i2=0; i2 < nodes2.getLength(); i2++) {
- Node node2 = nodes2.item(i2);
- if (node2 != null) {
- if (node2.getNodeType() == Node.TEXT_NODE) {
- this.magvarStr = node2.getNodeValue();
- }
- }
- }
- break;
- case "speed":
- for (int i2=0; i2 < nodes2.getLength(); i2++) {
- Node node2 = nodes2.item(i2);
- if (node2 != null) {
- if (node2.getNodeType() == Node.TEXT_NODE) {
- this.speedStr = node2.getNodeValue();
- }
- }
- }
- break;
- }
- }
- }
-
- public void removeElement(String eleName) {
- Node child;
- for (child = trkpt.getFirstChild(); child != null; child = child.getNextSibling()) {
- NodeList nodeList = child.getChildNodes();
- for(int i = 0; i < nodeList.getLength(); i++) {
- Node grandChild = child.getChildNodes().item(i);
- if (grandChild.getNodeName().equals(eleName)) {
- child.removeChild(grandChild);
- }
- }
- }
- }
-
- public void appendElement(String eleName, String valueStr) {
- Document doc = trkpt.getOwnerDocument();
- Element newElement = doc.createElement(eleName);
- newElement.setTextContent(valueStr);
- trkpt.appendChild(newElement);
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/TimeComparator.java b/importPicture/src/osm/jp/gpx/TimeComparator.java
deleted file mode 100644
index 484516f..0000000
--- a/importPicture/src/osm/jp/gpx/TimeComparator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package osm.jp.gpx;
-
-import java.util.Comparator;
-import java.util.Date;
-
-/**
- * java.util.Date型をコレクションのKEYにした時に、時間順に並べ替える
- *
- */
-public class TimeComparator implements Comparator
-{
- /**
- * 日付順にソート
- * @param arg0
- * @param arg1
- */
- @Override
- public int compare(Date arg0, Date arg1) {
- return arg0.compareTo(arg1);
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/YuuLogFormatter.java b/importPicture/src/osm/jp/gpx/YuuLogFormatter.java
deleted file mode 100644
index 1650465..0000000
--- a/importPicture/src/osm/jp/gpx/YuuLogFormatter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package osm.jp.gpx;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.logging.Formatter;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-
-/**
- * シンプルなサンプルログフォーマッタ
- */
-public class YuuLogFormatter extends Formatter {
- private final SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
-
- @Override
- public String format(final LogRecord argLogRecord) {
- final StringBuffer buf = new StringBuffer();
-
- buf.append(sdFormat.format(new Date(argLogRecord.getMillis())) +" ");
-
- if (argLogRecord.getLevel() == Level.FINEST) {
- buf.append("[FINEST]");
- }
- else if (argLogRecord.getLevel() == Level.FINER) {
- buf.append("[FINER]");
- }
- else if (argLogRecord.getLevel() == Level.FINE) {
- buf.append("[FINE]");
- }
- else if (argLogRecord.getLevel() == Level.CONFIG) {
- buf.append("[CONFIG]");
- }
- else if (argLogRecord.getLevel() == Level.INFO) {
- buf.append("[INFO]");
- }
- else if (argLogRecord.getLevel() == Level.WARNING) {
- buf.append("[WARN]");
- }
- else if (argLogRecord.getLevel() == Level.SEVERE) {
- buf.append("[SEVERE]");
- }
- else {
- buf.append(Integer.toString(argLogRecord.getLevel().intValue()) +" ");
- }
- buf.append(" "+ /* argLogRecord.getLoggerName() +" - "+ */ argLogRecord.getMessage() +"\n");
- return buf.toString();
- }
-}
\ No newline at end of file
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/AboutDialog.java b/importPicture/src/osm/jp/gpx/matchtime/gui/AboutDialog.java
deleted file mode 100644
index 1a0558c..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/AboutDialog.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package osm.jp.gpx.matchtime.gui;
-import java.awt.*;
-
-@SuppressWarnings("serial")
-public class AboutDialog extends Dialog
-{
- //{{DECLARE_CONTROLS
- java.awt.Label label1;
- java.awt.Button okButton;
- java.awt.Label label2;
- //}}
-
- // Used for addNotify redundency check.
- boolean fComponentsAdjusted = false;
-
- class SymWindow extends java.awt.event.WindowAdapter
- {
- @Override
- public void windowClosing(java.awt.event.WindowEvent event) {
- Object object = event.getSource();
- if (object == AboutDialog.this) {
- AboutDialog_WindowClosing(event);
- }
- }
- }
-
- class SymAction implements java.awt.event.ActionListener
- {
- @Override
- public void actionPerformed(java.awt.event.ActionEvent event) {
- Object object = event.getSource();
- if (object == okButton) {
- okButton_Clicked(event);
- }
- }
- }
-
- @SuppressWarnings("OverridableMethodCallInConstructor")
- public AboutDialog(Frame parent, boolean modal) {
- super(parent, modal);
-
- // This code is automatically generated by Visual Cafe when you add
- // components to the visual environment. It instantiates and initializes
- // the components. To modify the code, only use code syntax that matches
- // what Visual Cafe can generate, or Visual Cafe may be unable to back
- // parse your Java file into its visual environment.
-
-
- //{{INIT_CONTROLS
- setLayout(null);
- setVisible(false);
- setSize(360,114);
- label1 = new java.awt.Label(AdjustTime.PROGRAM_NAME +" Version "+ AdjustTime.PROGRAM_VARSION +" ("+ AdjustTime.PROGRAM_UPDATE +")", Label.CENTER);
- label1.setBounds(10,10,340,20);
- add(label1);
- okButton = new java.awt.Button();
- okButton.setLabel("OK");
- okButton.setBounds(145,65,66,27);
- add(okButton);
- label2 = new java.awt.Label("Copyright(C) 2014,2018, yuuhayashi \n The MIT License (MIT).",Label.RIGHT);
- label2.setBounds(10,40,340,20);
- add(label2);
- setTitle("About... "+ AdjustTime.PROGRAM_NAME);
- //}}
-
- //{{REGISTER_LISTENERS
- SymWindow aSymWindow = new SymWindow();
- this.addWindowListener(aSymWindow);
- SymAction lSymAction = new SymAction();
- okButton.addActionListener(lSymAction);
- //}}
- }
-
- @SuppressWarnings("OverridableMethodCallInConstructor")
- public AboutDialog(Frame parent, String title, boolean modal) {
- this(parent, modal);
- setTitle(title);
- }
-
- @Override
- public void addNotify() {
- // Record the size of the window prior to calling parents addNotify.
-
- super.addNotify();
-
- // Only do this once.
- if (fComponentsAdjusted) {
- return;
- }
-
- // Adjust components according to the insets
- setSize(getInsets().left + getInsets().right + getSize().width, getInsets().top + getInsets().bottom + getSize().height);
- Component components[] = getComponents();
- for (Component component : components) {
- Point p = component.getLocation();
- p.translate(getInsets().left, getInsets().top);
- component.setLocation(p);
- }
-
- // Used for addNotify check.
- fComponentsAdjusted = true;
- }
-
- /**
- * Shows or hides the component depending on the boolean flag b.
- * @param b if true, show the component; otherwise, hide the component.
- * @see java.awt.Component#isVisible
- */
- @Override
- public void setVisible(boolean b) {
- if(b) {
- Rectangle bounds = getParent().getBounds();
- Rectangle abounds = getBounds();
- setLocation(bounds.x + (bounds.width - abounds.width)/ 2,
- bounds.y + (bounds.height - abounds.height)/2);
- }
- super.setVisible(b);
- }
-
- void AboutDialog_WindowClosing(java.awt.event.WindowEvent event) {
- dispose();
- }
-
- void okButton_Clicked(java.awt.event.ActionEvent event) {
- //{{CONNECTION
- // Clicked from okButton Hide the Dialog
- dispose();
- //}}
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java b/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
deleted file mode 100644
index 5ab17fd..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/AdjustTime.java
+++ /dev/null
@@ -1,756 +0,0 @@
-package osm.jp.gpx.matchtime.gui;
-
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.ResourceBundle;
-import java.util.TimeZone;
-import javax.swing.*;
-import osm.jp.gpx.*;
-import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.ImageMetadata;
-import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
-import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
-import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
-
-/**
- * 本プログラムのメインクラス
- */
-@SuppressWarnings("serial")
-public class AdjustTime extends JFrame
-{
- public static final String PROGRAM_NAME = "AdjustTime for JOSM";
- public static final String PROGRAM_VARSION = "4.01";
- public static final String PROGRAM_UPDATE = "2018/09/17";
-
- AppParameters params;
- SimpleDateFormat dfjp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
-
- // Used for addNotify check.
- boolean fComponentsAdjusted = false;
- public ResourceBundle i18n = ResourceBundle.getBundle("i18n");
-
- //{{DECLARE_CONTROLS
- JPanel cardPanel; // ウィザード形式パネル（カード型）
- JPanel[] cards;
- int cardPanelNo = 0;
- JPanel argsPanel; // パラメータ設定パネル (上部)
- JScrollPane imageSPane; // スクロールパネル
- JLabel imageLabel; // 基準時刻画像表示
- ButtonGroup baseTimeGroup; // 基準時刻の指定グループ
- JRadioButton exifBase; // EXIF日時を基準にする／ !(ファイル更新日時を基準にする)
- JRadioButton fupdateBase; // File更新日時を基準にする／ !(EXIF日時を基準にする)
- JCheckBox noFirstNode; // GPX: セグメントの最初の１ノードは無視する。 {ON | OFF}
- JCheckBox gpxReuse; // 生成されたGPXファイル（ファイル名が'_.gpx'で終わるもの）も対象にする。 {ON | OFF}
- JTextArea textArea; // 実行結果表示領域
- //ImagePreview imagePane; // 基準時刻画像表示
- ParameterPanelFolder arg1_srcFolder;
- ParameterPanelImageFile arg2_baseTimeImg;
- ParameterPanel arg3_basetime; // 基準時刻:
- JCheckBox outputIMG; // IMGの変換 する／しない
- JCheckBox outputIMG_all; // 'out of GPX time'でもIMGの変換をする {ON | OFF}
- JCheckBox exifON; // EXIF 書き出しモード ／ !(EXIFの書き換えはしない)
- JCheckBox gpxOutputWpt; // GPXにを書き出す
- JCheckBox gpxOverwriteMagvar; // ソースGPXのを無視する
- JCheckBox gpxOutputSpeed; // GPXにを書き出す
- ParameterPanelFolder arg5_outputFolder; // EXIF 書き出しフォルダ
- ParameterPanelGpx arg4_gpxFolder; // GPXファイル・フォルダ
-
- JPanel buttonPanel; // ボタンパネル (下部)
- JButton openButton; // [Fit]ボタン
- JButton zoomInButton; // [Zoom in]ボタン
- JButton zoomOutButton; // [Zoom out]ボタン
-
- JButton nextButton; // [次へ]ボタン
- JButton backButton; // [戻る]ボタン
- JButton doButton; // [処理実行]ボタン
- //}}
-
- //{{DECLARE_MENUS
- java.awt.MenuBar mainMenuBar;
- java.awt.Menu menu1;
- java.awt.MenuItem miDoNewFileList;
- java.awt.MenuItem miDoDirSize;
- java.awt.MenuItem miDoReadXML;
- java.awt.MenuItem miExit;
- java.awt.Menu menu3;
- java.awt.MenuItem miAbout;
- //}}
-
- class SymWindow extends java.awt.event.WindowAdapter {
- /**
- * このFrameが閉じられるときの動作。
- * このパネルが閉じられたら、このアプリケーションも終了させる。
- */
- @Override
- public void windowClosing(java.awt.event.WindowEvent event) {
- Object object = event.getSource();
- if (object == AdjustTime.this) {
- DbMang_WindowClosing(event);
- }
- }
- }
-
- class SymAction implements java.awt.event.ActionListener {
- @Override
- public void actionPerformed(java.awt.event.ActionEvent event) {
- Object object = event.getSource();
- if (object == miAbout) {
- miAbout_Action(event);
- }
- else if (object == miExit) {
- miExit_Action(event);
- }
- else if (object == openButton) {
- imageView_Action(event);
- }
- else if (object == zoomInButton) {
- zoomin_Action(event);
- }
- else if (object == zoomOutButton) {
- zoomout_Action(event);
- }
- else if (object == arg2_baseTimeImg.argField) {
- imageView_Action(event);
- }
- else if (object == arg2_baseTimeImg.openButton) {
- selectImage_Action(event);
- imageView_Action(event);
- }
- else if (object == outputIMG) {
- outputIMG_Action(event);
- }
- else if (object == outputIMG_all) {
- outputIMGall_Action(event);
- }
- else if (object == exifON) {
- exifON_Action(event);
- }
- else if (object == gpxOutputWpt) {
- gpxOutputWpt_Action(event);
- }
- else if (object == gpxOutputSpeed) {
- gpxOutputSpeed_Action(event);
- }
- else if (object == doButton) {
- doButton_Action(event);
- }
- else if (object == nextButton) {
- nextButton_Action(event);
- }
- else if (object == backButton) {
- backButton_Action(event);
- }
- }
- }
-
- /**
- * データベース内のテーブルを一覧で表示するFrame
- * @throws IOException
- */
- @SuppressWarnings("OverridableMethodCallInConstructor")
- public AdjustTime() throws IOException
- {
- dfjp.setTimeZone(TimeZone.getTimeZone("JST"));
-
- // INIT_CONTROLS
- Container container = getContentPane();
- container.setLayout(new BorderLayout());
- setSize(
- getInsets().left + getInsets().right + 720,
- getInsets().top + getInsets().bottom + 480
- );
- setTitle(AdjustTime.PROGRAM_NAME +" v"+ AdjustTime.PROGRAM_VARSION);
-
- //---- CENTER -----
- JPanel mainPanel = new JPanel();
- mainPanel.setLayout(new BorderLayout());
- container.add(mainPanel, BorderLayout.CENTER);
-
- //---- SOUTH -----
- JPanel southPanel = new JPanel(new BorderLayout());
- southPanel.add(Box.createVerticalStrut(10), BorderLayout.SOUTH);
- southPanel.add(Box.createVerticalStrut(10), BorderLayout.NORTH);
- container.add(southPanel, BorderLayout.SOUTH);
-
- //---- SPACE -----
- container.add(Box.createVerticalStrut(30), BorderLayout.NORTH);
- container.add(Box.createHorizontalStrut(10), BorderLayout.WEST);
- container.add(Box.createHorizontalStrut(10), BorderLayout.EAST);
-
- params = new AppParameters();
-
- //---------------------------------------------------------------------
- cardPanel = new JPanel();
- cardPanel.setLayout(new CardLayout());
- mainPanel.add(cardPanel, BorderLayout.CENTER);
-
- nextButton = new JButton(i18n.getString("button.next"));
- southPanel.add(nextButton, BorderLayout.EAST);
-
- backButton = new JButton(i18n.getString("button.previous"));
- southPanel.add(backButton, BorderLayout.WEST);
-
- cards = new JPanel[5];
- for (int i=0; i < 5; i++) {
- cards[i] = new JPanel();
- cardPanel.add(cards[i], String.valueOf(i));
- }
- cardPanelNo = 0;
-
- //---------------------------------------------------------------------
- // 1.[対象フォルダ]設定パネル
- int cardNo = 0;
- cards[cardNo].setLayout(new BorderLayout());
- JLabel label1 = new JLabel();
- label1.setText(i18n.getString("label.100"));
- cards[cardNo].add(label1, BorderLayout.NORTH);
-
- argsPanel = new JPanel();
- argsPanel.setLayout(new BoxLayout(argsPanel, BoxLayout.Y_AXIS));
- arg1_srcFolder = new ParameterPanelFolder(i18n.getString("label.110") +": ", params.getProperty(AppParameters.IMG_SOURCE_FOLDER));
- argsPanel.add(arg1_srcFolder);
- cards[cardNo].add(argsPanel, BorderLayout.CENTER);
-
- //---------------------------------------------------------------------
- // 2.[基準時刻画像]設定パネル
- cardNo++;
- cards[cardNo].setLayout(new BorderLayout());
- JLabel label2 = new JLabel();
- label2.setText(i18n.getString("label.200"));
- cards[cardNo].add(label2, BorderLayout.NORTH);
-
- argsPanel = new JPanel();
-
- // 基準時刻画像
- argsPanel.setLayout(new BoxLayout(argsPanel, BoxLayout.Y_AXIS));
- arg2_baseTimeImg = new ParameterPanelImageFile(i18n.getString("label.210") +": ", params.getProperty(AppParameters.IMG_BASE_FILE), arg1_srcFolder);
- argsPanel.add(arg2_baseTimeImg);
-
- baseTimeGroup = new ButtonGroup();
-
- // EXIFの日時を基準にする
- exifBase = new JRadioButton(i18n.getString("label.220"));
-
- // ファイル更新日時を基準にする
- fupdateBase = new JRadioButton(i18n.getString("label.230"));
- baseTimeGroup.add(exifBase);
- baseTimeGroup.add(fupdateBase);
- argsPanel.add(exifBase);
- argsPanel.add(fupdateBase);
- if (params.getProperty(AppParameters.GPX_BASETIME).equals("EXIF_TIME")) {
- fupdateBase.setSelected(false);
- exifBase.setSelected(true);
- }
- else {
- fupdateBase.setSelected(true);
- exifBase.setSelected(false);
- }
- cards[cardNo].add(argsPanel, BorderLayout.CENTER);
-
- //---------------------------------------------------------------------
- // 3.基準時刻の入力画面
- cardNo++;
- cards[cardNo].setLayout(new BorderLayout());
- argsPanel = new JPanel();
- argsPanel.setLayout(new GridLayout(2, 1));
-
- // 3. 正確な撮影時刻を入力してください。
- // カメラの時計が正確ならば、設定を変更する必要はありません。
- JLabel label3 = new JLabel();
- label3.setText(i18n.getString("label.300"));
- argsPanel.add(label3);
-
- // 基準時刻:
- String str310 = String.format(" %s: ", i18n.getString("label.310"));
- arg3_basetime = new ParameterPanel(str310, ImportPicture.TIME_FORMAT_STRING);
- argsPanel.add(arg3_basetime);
- cards[cardNo].add(argsPanel, BorderLayout.NORTH);
-
- // 参考画像
- imageLabel = new JLabel();
- imageSPane = new JScrollPane(imageLabel);
- cards[cardNo].add(imageSPane, BorderLayout.CENTER);
-
- // 画像ファイル選択ダイアログを起動するボタン
- buttonPanel = new JPanel();
- buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS));
- openButton = new JButton(createImageIcon("images/Fit16.gif"));
- buttonPanel.add(openButton);
- zoomInButton = new JButton(createImageIcon("images/ZoomIn16.gif"));
- buttonPanel.add(zoomInButton);
- zoomOutButton = new JButton(createImageIcon("images/ZoomOut16.gif"));
- buttonPanel.add(zoomOutButton);
- cards[cardNo].add(buttonPanel, BorderLayout.SOUTH);
-
- //---------------------------------------------------------------------
- // 4.GPXファイル設定画面
- cardNo++;
- cards[cardNo].setLayout(new BorderLayout());
-
- // 4. ヒモ付を行うGPXファイルを選択してください。
- // - フォルダを指定すると、フォルダ内のすべてのGPXファイルを対象とします。
- JLabel label4 = new JLabel();
- label4.setText(i18n.getString("label.400"));
- cards[cardNo].add(label4, BorderLayout.NORTH);
-
- JPanel tmpPanel4a = new JPanel();
- tmpPanel4a.setLayout(new BoxLayout(tmpPanel4a, BoxLayout.Y_AXIS));
-
- // "GPXフォルダ: "
- arg4_gpxFolder = new ParameterPanelGpx(
- i18n.getString("label.410") + ": ",
- params.getProperty(AppParameters.GPX_SOURCE_FOLDER)
- );
- tmpPanel4a.add(arg4_gpxFolder);
-
- // "セグメント'trkseg'の最初の１ノードは無視する。"
- noFirstNode = new JCheckBox(
- i18n.getString("label.420"),
- params.getProperty(AppParameters.GPX_NO_FIRST_NODE).equals("ON")
- );
- tmpPanel4a.add(noFirstNode);
-
- // "生成されたGPXファイル（ファイル名が'_.gpx'で終わるもの）も変換の対象にする"
- gpxReuse = new JCheckBox(
- i18n.getString("label.430"),
- params.getProperty(AppParameters.GPX_REUSE).equals("ON")
- );
- gpxReuse.setEnabled(true);
- tmpPanel4a.add(gpxReuse);
- cards[cardNo].add(tmpPanel4a, BorderLayout.CENTER);
-
- //---------------------------------------------------------------------
- // 5.EXIF更新設定画面
- cardNo++;
- cards[cardNo].setLayout(new BorderLayout());
-
- // 5. EXIF変換を行うかどうかを選択してください。
- // - EXIF変換を行う場合には、変換ファイルを出力するフォルダも指定する必要があります。
- // - 出力フォルダには、書き込み権限と、十分な空き容量が必要です。
- JLabel label5 = new JLabel();
- label5.setText(
- String.format(
- "5. %s
",
- i18n.getString("label.500"),
- i18n.getString("label.501"),
- i18n.getString("label.502")
- )
- );
- cards[cardNo].add(label5, BorderLayout.NORTH);
-
- JPanel tmpPanel5 = new JPanel();
- tmpPanel5.setLayout(new BoxLayout(tmpPanel5, BoxLayout.Y_AXIS));
-
- // "IMGの変換をする"
- outputIMG = new JCheckBox(
- i18n.getString("label.510"),
- Boolean.parseBoolean(params.getProperty(AppParameters.IMG_OUTPUT))
- );
- tmpPanel5.add(outputIMG);
-
- // "GPXファイル時間外のファイルもコピーする"
- outputIMG_all = new JCheckBox(
- i18n.getString("label.520"),
- Boolean.parseBoolean(params.getProperty(AppParameters.IMG_OUTPUT_ALL))
- );
- tmpPanel5.add(outputIMG_all);
-
- // "出力フォルダ: "
- arg5_outputFolder = new ParameterPanelFolder(
- i18n.getString("label.530") + ": ",
- params.getProperty(AppParameters.IMG_OUTPUT_FOLDER)
- );
- tmpPanel5.add(arg5_outputFolder);
-
- // "EXIFの変換をする"
- exifON = new JCheckBox(
- i18n.getString("label.540"),
- Boolean.parseBoolean(params.getProperty(AppParameters.IMG_OUTPUT_EXIF))
- );
- tmpPanel5.add(exifON);
-
- // "ポイントマーカーをGPXファイルに出力する"
- gpxOutputWpt = new JCheckBox(
- i18n.getString("label.550"),
- Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OUTPUT_WPT))
- );
- gpxOutputWpt.setEnabled(true);
- tmpPanel5.add(gpxOutputWpt);
-
- // "ソースGPXのを無視する"
- gpxOverwriteMagvar = new JCheckBox(
- i18n.getString("label.560"),
- Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OVERWRITE_MAGVAR))
- );
- gpxOverwriteMagvar.setEnabled(true);
- tmpPanel5.add(gpxOverwriteMagvar);
-
- // "出力GPXにを上書きする"
- gpxOutputSpeed = new JCheckBox(
- i18n.getString("label.570"),
- Boolean.parseBoolean(params.getProperty(AppParameters.GPX_OUTPUT_SPEED))
- );
- gpxOutputSpeed.setEnabled(true);
- tmpPanel5.add(gpxOutputSpeed);
-
- cards[cardNo].add(tmpPanel5, BorderLayout.CENTER);
-
- // "処理実行"
- doButton = new JButton(
- i18n.getString("button.execute"),
- AdjustTime.createImageIcon("images/media_playback_start.png")
- );
- cards[cardNo].add(doButton, BorderLayout.SOUTH);
-
-
- //---------------------------------------------------------------------
- // INIT_MENUS
- menu1 = new java.awt.Menu("File");
- miExit = new java.awt.MenuItem(i18n.getString("menu.quit"));
- miExit.setFont(new Font("Dialog", Font.PLAIN, 12));
- menu1.add(miExit);
-
- miAbout = new java.awt.MenuItem("About...");
- miAbout.setFont(new Font("Dialog", Font.PLAIN, 12));
-
- menu3 = new java.awt.Menu("Help");
- menu3.setFont(new Font("Dialog", Font.PLAIN, 12));
- menu3.add(miAbout);
-
- mainMenuBar = new java.awt.MenuBar();
- mainMenuBar.setHelpMenu(menu3);
- mainMenuBar.add(menu1);
- mainMenuBar.add(menu3);
- setMenuBar(mainMenuBar);
-
- //{{REGISTER_LISTENERS
- SymWindow aSymWindow = new SymWindow();
- this.addWindowListener(aSymWindow);
- SymAction lSymAction = new SymAction();
- miAbout.addActionListener(lSymAction);
- miExit.addActionListener(lSymAction);
- openButton.addActionListener(lSymAction);
- zoomOutButton.addActionListener(lSymAction);
- zoomInButton.addActionListener(lSymAction);
- arg2_baseTimeImg.argField.addActionListener(lSymAction);
- arg2_baseTimeImg.openButton.addActionListener(lSymAction);
- doButton.addActionListener(lSymAction);
- outputIMG_all.addActionListener(lSymAction);
- exifON.addActionListener(lSymAction);
- gpxOutputSpeed.addActionListener(lSymAction);
- noFirstNode.addActionListener(lSymAction);
- gpxReuse.addActionListener(lSymAction);
- //arg1Panel_4.field.addActionListener(lSymAction);
- nextButton.addActionListener(lSymAction);
- backButton.addActionListener(lSymAction);
- //}}
- }
-
- /**
- * Shows or hides the component depending on the boolean flag b.
- * @param b trueのときコンポーネントを表示; その他のとき, componentを隠す.
- * @see java.awt.Component#isVisible
- */
- @Override
- public void setVisible(boolean b) {
- if(b) {
- setLocation(50, 50);
- }
- super.setVisible(b);
- }
-
- /**
- * このクラスをインスタンスを生成して表示する。
- * コマンドラインの引数はありません。
- * @param args
- */
- @SuppressWarnings("UseSpecificCatch")
- static public void main(String args[]) {
- SwingUtilities.invokeLater(() -> {
- try {
- createAndShowGUI();
- } catch (Exception e) {
- e.printStackTrace();
- }
- });
- }
- private static void createAndShowGUI() throws IOException {
- (new AdjustTime()).setVisible(true);
- }
-
- @Override
- public void addNotify() {
- // Record the size of the window prior to calling parents addNotify.
- Dimension d = getSize();
-
- super.addNotify();
-
- if (fComponentsAdjusted)
- return;
-
- // Adjust components according to the insets
- setSize(getInsets().left + getInsets().right + d.width, getInsets().top + getInsets().bottom + d.height);
- Component components[] = getComponents();
- for (Component component : components) {
- Point p = component.getLocation();
- p.translate(getInsets().left, getInsets().top);
- component.setLocation(p);
- }
- fComponentsAdjusted = true;
- }
-
- void DbMang_WindowClosing(java.awt.event.WindowEvent event) {
- setVisible(false); // hide the Manager
- dispose(); // free the system resources
- System.exit(0); // close the application
- }
-
- void miAbout_Action(java.awt.event.ActionEvent event) {
- // Action from About Create and show as modal
- (new AboutDialog(this, true)).setVisible(true);
- }
-
- void miExit_Action(java.awt.event.ActionEvent event) {
- // Action from Exit Create and show as modal
- //(new hayashi.yuu.tools.gui.QuitDialog(this, true)).setVisible(true);
- (new QuitDialog(this, true)).setVisible(true);
- }
-
- ImageIcon refImage;
-
- /**
- * 選択された画像ファイルを表示する
- * 基準画像ボタンがクリックされた時に、基準時刻フィールドに基準画像の作成日時を設定する。
- * @param ev
- */
- @SuppressWarnings("UseSpecificCatch")
- public void imageView_Action(ActionEvent ev) {
- String path = (new File(arg1_srcFolder.getText(), arg2_baseTimeImg.getText())).getPath();
-
- File timeFile = new File(path);
- if (exifBase.isSelected()) {
- try {
- ImageMetadata meta = Imaging.getMetadata(timeFile);
- JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta;
- if (jpegMetadata != null) {
- TiffImageMetadata exif = jpegMetadata.getExif();
- if (exif != null) {
- String dateTimeOriginal = exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0];
- long lastModifyTime = (new SimpleDateFormat("yyyy:MM:dd HH:mm:ss")).parse(dateTimeOriginal).getTime();
- arg3_basetime.argField.setText(dfjp.format(new Date(lastModifyTime)));
- }
- else {
- arg3_basetime.argField.setText("exif == null");
- }
- }
- }
- catch (Exception e) {}
- }
- else {
- long lastModifyTime = timeFile.lastModified();
- arg3_basetime.argField.setText(dfjp.format(new Date(lastModifyTime)));
- }
-
- int size_x = imageSPane.getWidth() - 8;
- ImageIcon tmpIcon = new ImageIcon(path);
- refImage = tmpIcon;
- if (tmpIcon.getIconWidth() > size_x) {
- refImage = new ImageIcon(tmpIcon.getImage().getScaledInstance(size_x, -1, Image.SCALE_DEFAULT));
- }
- imageLabel.setIcon(refImage);
- repaint();
- }
-
- public void zoomin_Action(ActionEvent ev) {
- if (refImage != null) {
- int size_x = imageLabel.getWidth();
- String path = (new File(arg1_srcFolder.getText(), arg2_baseTimeImg.getText())).getPath();
- ImageIcon tmpIcon = new ImageIcon(path);
- refImage = new ImageIcon(tmpIcon.getImage().getScaledInstance(size_x * 2, -1, Image.SCALE_DEFAULT));
- imageLabel.setIcon(refImage);
- repaint();
- }
- }
-
- public void zoomout_Action(ActionEvent ev) {
- if (refImage != null) {
- int size_x = imageLabel.getWidth();
- ImageIcon tmpIcon = refImage;
- refImage = new ImageIcon(tmpIcon.getImage().getScaledInstance(size_x / 2, -1, Image.SCALE_DEFAULT));
- imageLabel.setIcon(refImage);
- repaint();
- }
- }
-
- /**
- * ソースディレクトリが選択された時のアクション
- * → AdjustTime.ini に書き込む
- * @param ev
- */
- public void selectSource_Action(ActionEvent ev) {
- }
-
- public void selectImage_Action(ActionEvent ev) {
- JFileChooser fc;
-
- //Set up the file chooser.
- File sdir = new File(arg1_srcFolder.getText());
- System.out.println(sdir.getPath());
- if (sdir.isDirectory()) {
- fc = new JFileChooser(sdir);
- }
- else {
- fc = new JFileChooser();
- }
-
- //Add a custom file filter and disable the default
- //(Accept All) file filter.
- fc.addChoosableFileFilter(new ImageFilter());
- fc.setAcceptAllFileFilterUsed(false);
-
- //Add custom icons for file types.
- fc.setFileView(new ImageFileView());
-
- //Add the preview pane.
- fc.setAccessory(new ImagePreview(fc));
-
- //Show it. "選択"
- int returnVal = fc.showDialog(this, i18n.getString("dialog.select"));
-
- //Process the results.
- if (returnVal == JFileChooser.APPROVE_OPTION) {
- File file = fc.getSelectedFile();
- arg2_baseTimeImg.argField.setText(file.getName());
- }
-
- //Reset the file chooser for the next time it's shown.
- fc.setSelectedFile(null);
- }
-
- /** Returns an ImageIcon, or null if the path was invalid.
- * @param path
- * @return */
- public static ImageIcon createImageIcon(String path) {
- java.net.URL imgURL = AdjustTime.class.getResource(path);
- if (imgURL != null) {
- return new ImageIcon(imgURL);
- } else {
- System.err.println("Couldn't find file: " + path);
- return null;
- }
- }
-
- /**
- * checkbox[IMG変換]を変更した場合のアクション
- * ON ー＞ IMG出力フォルダのフィールドを有効にする
- * OFF -> IMG出力フォルダのフィールドを無効にする
- * @param event
- */
- void outputIMG_Action (ActionEvent event) {
- arg5_outputFolder.setEnabled(outputIMG.isEnabled());
- }
-
- /**
- * checkbox[GPXファイル時間外のファイルもコピーする]を変更した場合のアクション
- * @param event
- */
- void outputIMGall_Action (ActionEvent event) {
- }
-
- /**
- * checkbox[EXIF書き出し]を変更した場合のアクション
- * @param event
- */
- void exifON_Action (ActionEvent event) {
- }
-
- /**
- * checkbox[GPXのを出力する]を変更した場合のアクション
- * @param event
- */
- void gpxOutputWpt_Action (ActionEvent event) {
- }
-
- /**
- * checkbox[GPXのを書き換える]を変更した場合のアクション
- * @param event
- */
- void gpxOutputSpeed_Action (ActionEvent event) {
- }
-
- /**
- * [実行]ボタンをクリックしたときの動作
- * @param event
- */
- @SuppressWarnings("UseSpecificCatch")
- void doButton_Action(java.awt.event.ActionEvent event) {
- doButton.setEnabled(false);
-
- String[] argv = new String[0];
- /*
- argv[0] = arg1_srcFolder.getText();
- argv[1] = arg2_baseTimeImg.getText();
- argv[2] = arg3_basetiome.getText();
- argv[3] = arg5_outputFolder.getText();
- argv[4] = arg4_gpxFolder.getText();
- */
- this.params.setProperty(AppParameters.GPX_NO_FIRST_NODE, String.valueOf(noFirstNode.isSelected()));
- this.params.setProperty(AppParameters.GPX_REUSE, String.valueOf(gpxReuse.isSelected()));
- this.params.setProperty(AppParameters.GPX_SOURCE_FOLDER, arg4_gpxFolder.getText());
-
- if (exifBase.isSelected()) {
- this.params.setProperty(AppParameters.GPX_BASETIME, "EXIF_TIME");
- }
- else {
- this.params.setProperty(AppParameters.GPX_BASETIME, "FILE_UPDATE");
- }
- try {
- this.params.setProperty(AppParameters.IMG_SOURCE_FOLDER, arg1_srcFolder.getText());
- this.params.setProperty(AppParameters.IMG_BASE_FILE, arg2_baseTimeImg.getText());
- this.params.setProperty(AppParameters.IMG_TIME, ImportPicture.toUTCString(dfjp.parse(arg3_basetime.getText())));
- this.params.setProperty(AppParameters.IMG_OUTPUT, String.valueOf(outputIMG.isSelected()));
- this.params.setProperty(AppParameters.IMG_OUTPUT_FOLDER, arg5_outputFolder.getText());
- this.params.setProperty(AppParameters.IMG_OUTPUT_ALL, String.valueOf(outputIMG_all.isSelected()));
- this.params.setProperty(AppParameters.IMG_OUTPUT_EXIF, String.valueOf(exifON.isSelected()));
- this.params.setProperty(AppParameters.GPX_OVERWRITE_MAGVAR, String.valueOf(gpxOverwriteMagvar.isSelected()));
- this.params.setProperty(AppParameters.GPX_OUTPUT_SPEED, String.valueOf(gpxOutputSpeed.isSelected()));
- this.params.setProperty(AppParameters.GPX_OUTPUT_WPT, String.valueOf(gpxOutputWpt.isSelected()));
- this.params.store();
- }
- catch(Exception e) {
- e.printStackTrace();
- }
-
- (new DoDialog(this, argv)).setVisible(true);
-
- doButton.setEnabled(true);
- }
-
- /**
- * [次へ]ボタンをクリックした時の動作
- * @param event
- */
- void nextButton_Action(ActionEvent event) {
- if ((cardPanelNo + 1) < cards.length) {
- cardPanelNo++;
- CardLayout cl = (CardLayout)(cardPanel.getLayout());
- cl.show(cardPanel, String.valueOf(cardPanelNo));
- }
- }
-
- /**
- * [戻る]ボタンをクリックした時の動作
- * @param event
- */
- void backButton_Action(ActionEvent event) {
- if ((cardPanelNo - 1) >= 0) {
- cardPanelNo--;
- CardLayout cl = (CardLayout)(cardPanel.getLayout());
- cl.show(cardPanel, String.valueOf(cardPanelNo));
- }
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/Command.java b/importPicture/src/osm/jp/gpx/matchtime/gui/Command.java
deleted file mode 100644
index 5918db8..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/Command.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package osm.jp.gpx.matchtime.gui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.text.SimpleDateFormat;
-
-class Command extends Thread {
- String[] args; // コマンドパラメータ
- private String commandName = ""; // コマンド名
- @SuppressWarnings({ "rawtypes" })
- private final Class cmd; // 実行対象インスタンス
-
- /**
- * コンストラクタ：実行対象のインスタンスを得る
- * @param cmd
- */
- public Command(Class cmd) {
- super();
- this.cmd = cmd;
- this.commandName = cmd.getName();
- this.args = new String[0];
- }
-
- /**
- * コマンドパラメータの設定
- * @param folder
- */
- public void setArgs(String[] args) {
- this.args = args;
- }
-
- public void setCommandName(String name) {
- this.commandName = name;
- }
- public String getCommandName() {
- return this.commandName;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public void run() {
- System.out.println("[START:"+ (new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss")).format(new java.util.Date()) +"]\t"+ this.commandName);
- for (int i=0; i < args.length; i++) {
- System.out.println(" args["+ i +"]: "+ this.args[i]);
- }
- System.out.println();
-
- try {
- try {
- java.lang.reflect.Method method = this.cmd.getMethod("main", new Class[] {String[].class});
- method.setAccessible(true);
- method.invoke(null, new Object[]{this.args});
-
- System.out.println();
- System.out.println("[END:"+ (new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss")).format(new java.util.Date()) +"]\t"+ this.commandName);
- }
- catch (InvocationTargetException e) {
- System.out.println("[ERR!:"+ (new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss")).format(new java.util.Date()) +"]\t"+ this.commandName);
- throw e;
- }
- catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException e) {
- System.out.println("[ERR!:"+ (new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss")).format(new java.util.Date()) +"]\t"+ this.commandName);
- throw e;
- }
- }
- catch(InvocationTargetException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException e) {
- e.printStackTrace(System.out);
- }
- System.out.println();
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/DoDialog.java b/importPicture/src/osm/jp/gpx/matchtime/gui/DoDialog.java
deleted file mode 100644
index bcaa10f..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/DoDialog.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package osm.jp.gpx.matchtime.gui;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Point;
-import java.awt.event.ActionEvent;
-import java.io.*;
-import javax.swing.*;
-
-/**
- * 処理
- */
-@SuppressWarnings("serial")
-public class DoDialog extends JDialog {
- public static final String TITLE = "Do Command";
-
- // Used for addNotify check.
- boolean fComponentsAdjusted = false;
- String[] args;
-
- //{{DECLARE_CONTROLS
- JFrame parentFrame; // MatchTime.class
- JPanel buttonPanel; // ボタン配置パネル (下部)
- JButton closeButton; // [クローズ]ボタン
- JButton doButton; // [実行]ボタン
- JTextArea textArea; // 実行結果を表示するJTextArea (中央)
- //}}
-
- @SuppressWarnings("OverridableMethodCallInConstructor")
- public DoDialog(JFrame parentFrame, String[] args) {
- super(parentFrame, true); // モーダルダイアログを基盤にする
- this.parentFrame = parentFrame;
- this.args = args;
-
- // INIT_CONTROLS
- @SuppressWarnings("OverridableMethodCallInConstructor")
- Container container = getContentPane();
- container.setLayout(new BorderLayout());
- parentFrame.setVisible(false);
- setSize(getInsets().left + getInsets().right + 980, getInsets().top + getInsets().bottom + 480);
- setTitle(DoDialog.TITLE);
-
- // コントロールパネル
- buttonPanel = new JPanel();
-
- doButton = new JButton("実行");
- doButton.setToolTipText("処理を実行します.");
- doButton.setEnabled(true);
- doButton.addActionListener((ActionEvent event) -> {
- // 処理中であることを示すため
- // ボタンの文字列を変更し，使用不可にする
- doButton.setText("処理中...");
- doButton.setEnabled(false);
-
- // SwingWorker を生成し，実行する
- LongTaskWorker worker = new LongTaskWorker(doButton);
- worker.execute();
- });
- buttonPanel.add(doButton);
-
- closeButton = new JButton("閉じる");
- closeButton.setToolTipText("処理を終了します.");
- closeButton.addActionListener((ActionEvent event) -> {
- dispose();
- });
- buttonPanel.add(closeButton);
-
- this.getContentPane().add("South", buttonPanel);
-
- // 説明文
- textArea = new JTextArea();
- JScrollPane sc=new JScrollPane(textArea);
- textArea.setFont(new Font(Font.MONOSPACED,Font.PLAIN,12));
- textArea.setTabSize(4);
- this.getContentPane().add("Center", sc);
-
- try {
- textArea.append("> java -cp importPicture.jar osm.jp.gpx.ImportPicture");
- for (String arg : args) {
- textArea.append(" '" + arg + "'");
- }
- textArea.append("\n\n");
- }
- catch (Exception e) {
- System.out.println(e.toString());
- }
-
- // JFrameの表示
- parentFrame.setVisible(true);
- }
-
- /**
- * Shows or hides the component depending on the boolean flag b.
- * @param b trueのときコンポーネントを表示; その他のとき, componentを隠す.
- * @see java.awt.Component#isVisible
- */
- @Override
- public void setVisible(boolean b) {
- if(b) {
- setLocation(80, 80);
- }
- super.setVisible(b);
- }
-
- @Override
- public void addNotify() {
- // Record the size of the window prior to calling parents addNotify.
- Dimension d = getSize();
-
- super.addNotify();
-
- if (fComponentsAdjusted) {
- return;
- }
-
- // Adjust components according to the insets
- setSize(getInsets().left + getInsets().right + d.width, getInsets().top + getInsets().bottom + d.height);
- Component components[] = getComponents();
- for (Component component : components) {
- Point p = component.getLocation();
- p.translate(getInsets().left, getInsets().top);
- component.setLocation(p);
- }
- fComponentsAdjusted = true;
- }
-
-
- /**
- * JTextAreaに書き出すOutputStream
- */
- public static class JTextAreaOutputStream extends OutputStream {
- private final ByteArrayOutputStream os;
-
- /** 書き出し対象 */
- private final JTextArea textArea;
- private final String encode;
-
- public JTextAreaOutputStream(JTextArea textArea, String encode) {
- this.textArea = textArea;
- this.encode = encode;
- this.os = new ByteArrayOutputStream();
- }
-
- /**
- * OutputStream#write(byte[])のオーバーライド
- * @param arg
- * @throws java.io.IOException
- */
- @Override
- public void write(int arg) throws IOException {
- this.os.write(arg);
- }
-
- /**
- * flush()でJTextAreaに書き出す
- * @throws java.io.IOException
- */
- @Override
- public void flush() throws IOException {
- // 文字列のエンコード
- final String str = new String(this.os.toByteArray(), this.encode);
- // 実際の書き出し処理
- SwingUtilities.invokeLater(
- new Runnable(){
- @Override
- public void run() {
- JTextAreaOutputStream.this.textArea.append(str);
- }
- }
- );
- // 書き出した内容はクリアする
- this.os.reset();
- }
- }
-
- // 非同期に行う処理を記述するためのクラス
- class LongTaskWorker extends SwingWorker {
- private final JButton button;
-
- public LongTaskWorker(JButton button) {
- this.button = button;
- }
-
- // 非同期に行われる処理
- @Override
- @SuppressWarnings("SleepWhileInLoop")
- public Object doInBackground() {
- // ながーい処理
- PrintStream defOut = System.out;
- PrintStream defErr = System.err;
-
- OutputStream os = new JTextAreaOutputStream(textArea, "UTF-8");
- PrintStream stdout = new PrintStream(os, true); // 自動flushをtrueにしておく
-
- // System.out にJTextAreaOutputStreamに書き出すPrintStreamを設定
- System.setOut(stdout);
- System.setErr(stdout);
-
- try {
- Command command = new Command(osm.jp.gpx.ImportPicture.class);
- command.setArgs(args);
- command.start(); // コマンドを実行
- while (command.isAlive()) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {}
- }
- }
- catch(Exception e) {
- e.printStackTrace(stdout);
- }
- finally {
- System.setOut(defOut);
- System.setErr(defErr);
- doButton.setEnabled(true);
- }
-
- return null;
- }
-
- // 非同期処理後に実行
- @Override
- protected void done() {
- // 処理が終了したので，文字列を元に戻し
- // ボタンを使用可能にする
- button.setText("実行");
- button.setEnabled(true);
- }
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/GpxAndFolderFilter.java b/importPicture/src/osm/jp/gpx/matchtime/gui/GpxAndFolderFilter.java
deleted file mode 100644
index 3c075cd..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/GpxAndFolderFilter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package osm.jp.gpx.matchtime.gui;
-
-import java.io.File;
-import javax.swing.filechooser.*;
-
-public class GpxAndFolderFilter extends FileFilter {
-
- @Override
- public boolean accept(File f) {
- if (f.isDirectory()) {
- return true;
- }
-
- String extension = Utils.getExtension(f);
- if (extension != null) {
- return extension.equals("gpx");
- }
- return false;
- }
-
- @Override
- public String getDescription() {
- return "Just GPXs";
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/ImageFileView.java b/importPicture/src/osm/jp/gpx/matchtime/gui/ImageFileView.java
deleted file mode 100644
index b04236f..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/ImageFileView.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of Oracle or the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package osm.jp.gpx.matchtime.gui;
-
-import java.io.File;
-import javax.swing.*;
-import javax.swing.filechooser.*;
-
-/* ImageFileView.java is used by FileChooserDemo2.java. */
-public class ImageFileView extends FileView {
- ImageIcon jpgIcon = Utils.createImageIcon("images/jpgIcon.gif");
- ImageIcon gifIcon = Utils.createImageIcon("images/gifIcon.gif");
- ImageIcon tiffIcon = Utils.createImageIcon("images/tiffIcon.gif");
- ImageIcon pngIcon = Utils.createImageIcon("images/pngIcon.png");
-
- @Override
- public String getName(File f) {
- return null; //let the L&F FileView figure this out
- }
-
- @Override
- public String getDescription(File f) {
- return null; //let the L&F FileView figure this out
- }
-
- @Override
- public Boolean isTraversable(File f) {
- return null; //let the L&F FileView figure this out
- }
-
- @Override
- public String getTypeDescription(File f) {
- String extension = Utils.getExtension(f);
- String type = null;
-
- if (extension != null) {
- switch (extension) {
- case Utils.jpeg:
- case Utils.jpg:
- type = "JPEG Image";
- break;
- case Utils.gif:
- type = "GIF Image";
- break;
- case Utils.tiff:
- case Utils.tif:
- type = "TIFF Image";
- break;
- case Utils.png:
- type = "PNG Image";
- break;
- default:
- break;
- }
- }
- return type;
- }
-
- @Override
- public Icon getIcon(File f) {
- String extension = Utils.getExtension(f);
- Icon icon = null;
-
- if (extension != null) {
- switch (extension) {
- case Utils.jpeg:
- case Utils.jpg:
- icon = jpgIcon;
- break;
- case Utils.gif:
- icon = gifIcon;
- break;
- case Utils.tiff:
- case Utils.tif:
- icon = tiffIcon;
- break;
- case Utils.png:
- icon = pngIcon;
- break;
- default:
- break;
- }
- }
- return icon;
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/ImageFilter.java b/importPicture/src/osm/jp/gpx/matchtime/gui/ImageFilter.java
deleted file mode 100644
index e49b543..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/ImageFilter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of Oracle or the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package osm.jp.gpx.matchtime.gui;
-
-import java.io.File;
-import javax.swing.filechooser.*;
-
-/* ImageFilter.java is used by FileChooserDemo2.java. */
-public class ImageFilter extends FileFilter {
-
- //Accept all directories and all gif, jpg, tiff, or png files.
- @Override
- public boolean accept(File f) {
- if (f.isDirectory()) {
- return true;
- }
-
- String extension = Utils.getExtension(f);
- if (extension != null) {
- return extension.equals(Utils.tiff) ||
- extension.equals(Utils.tif) ||
- extension.equals(Utils.gif) ||
- extension.equals(Utils.jpeg) ||
- extension.equals(Utils.jpg) ||
- extension.equals(Utils.png);
- }
- return false;
- }
-
- //The description of this filter
- @Override
- public String getDescription() {
- return "Just Images";
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/ImagePreview.java b/importPicture/src/osm/jp/gpx/matchtime/gui/ImagePreview.java
deleted file mode 100644
index bd306e7..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/ImagePreview.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of Oracle or the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package osm.jp.gpx.matchtime.gui;
-
-import javax.swing.*;
-
-import java.beans.*;
-import java.awt.*;
-import java.io.File;
-
-/* ImagePreview.java by FileChooserDemo2.java. */
-@SuppressWarnings("serial")
-public class ImagePreview extends JComponent implements PropertyChangeListener {
- ImageIcon thumbnail = null;
- File file = null;
- static int IMAGE_SIZE_X = 320;
- static int IMAGE_SIZE_Y = 240;
-
- @SuppressWarnings({"LeakingThisInConstructor", "OverridableMethodCallInConstructor"})
- public ImagePreview(JFileChooser fc) {
- setPreferredSize(new Dimension(IMAGE_SIZE_X + 10, IMAGE_SIZE_Y + 10));
- fc.addPropertyChangeListener(this);
- }
-
- public void loadImage() {
- if (file == null) {
- thumbnail = null;
- return;
- }
-
- //Don't use createImageIcon (which is a wrapper for getResource)
- //because the image we're trying to load is probably not one
- //of this program's own resources.
- ImageIcon tmpIcon = new ImageIcon(file.getPath());
- if (tmpIcon != null) {
- if (tmpIcon.getIconWidth() > IMAGE_SIZE_X) {
- thumbnail = new ImageIcon(tmpIcon.getImage().
- getScaledInstance(IMAGE_SIZE_X, -1, Image.SCALE_DEFAULT));
- } else { //no need to miniaturize
- thumbnail = tmpIcon;
- }
- }
- }
-
- @Override
- public void propertyChange(PropertyChangeEvent e) {
- boolean update = false;
- String prop = e.getPropertyName();
-
- if (JFileChooser.DIRECTORY_CHANGED_PROPERTY.equals(prop)) {
- file = null;
- update = true;
- }
- else if (JFileChooser.SELECTED_FILE_CHANGED_PROPERTY.equals(prop)) {
- file = (File) e.getNewValue();
- update = true;
- }
- if (update) {
- thumbnail = null;
- if (isShowing()) {
- loadImage();
- repaint();
- }
- }
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- if (thumbnail == null) {
- loadImage();
- }
- if (thumbnail != null) {
- int x = getWidth()/2 - thumbnail.getIconWidth()/2;
- int y = getHeight()/2 - thumbnail.getIconHeight()/2;
-
- if (y < 0) {
- y = 0;
- }
-
- if (x < 5) {
- x = 5;
- }
- thumbnail.paintIcon(this, g, x, y);
- }
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanel.java b/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanel.java
deleted file mode 100644
index ac629c7..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanel.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package osm.jp.gpx.matchtime.gui;
-
-import java.awt.Dimension;
-import java.awt.LayoutManager;
-import java.util.ResourceBundle;
-
-import javax.swing.BoxLayout;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-/**
- * パラメータを設定する為のパネル。
- * この１インスタンスで、１パラメータをあらわす。
- */
-public class ParameterPanel extends JPanel {
- private static final long serialVersionUID = 4629824800747170556L;
- public JTextField argField;
- public JLabel argLabel;
- public ResourceBundle i18n = ResourceBundle.getBundle("i18n");
-
- @SuppressWarnings("OverridableMethodCallInConstructor")
- public ParameterPanel(String label, String text) {
- super();
-
- argLabel = new JLabel(label);
- argField = new JTextField(text);
-
- this.setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
- this.setMaximumSize(new Dimension(1920, 40));
- this.add(argLabel);
- this.add(argField);
- }
-
- public String getText() {
- return this.argField.getText();
- }
-
- public ParameterPanel(boolean isDoubleBuffered) {
- super(isDoubleBuffered);
- // TODO 自動生成されたコンストラクター・スタブ
- }
-
- public ParameterPanel(LayoutManager layout) {
- super(layout);
- // TODO 自動生成されたコンストラクター・スタブ
- }
-
- public ParameterPanel(LayoutManager layout, boolean isDoubleBuffered) {
- super(layout, isDoubleBuffered);
- // TODO 自動生成されたコンストラクター・スタブ
- }
-
-}
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelFolder.java b/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelFolder.java
deleted file mode 100644
index fb2a4e6..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelFolder.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package osm.jp.gpx.matchtime.gui;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-
-@SuppressWarnings("serial")
-public class ParameterPanelFolder extends ParameterPanel implements ActionListener
-{
- JFileChooser fc;
- JButton openButton;
- int chooser;
-
- @SuppressWarnings({"OverridableMethodCallInConstructor", "LeakingThisInConstructor"})
- public ParameterPanelFolder(String label, String text, int chooser) {
- super(label, text);
-
- // Create a file chooser
- this.chooser = chooser;
-
- // "選択..."
- openButton = new JButton(
- i18n.getString("button.select"),
- AdjustTime.createImageIcon("images/Open16.gif")
- );
- openButton.addActionListener(this);
- this.add(openButton);
- }
-
- public ParameterPanelFolder(String label, String text) {
- this(label, text, JFileChooser.DIRECTORIES_ONLY);
- }
-
- public void setEnable(boolean f) {
- super.setEnabled(f);
- openButton.setEnabled(f);
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- if (e.getSource() == openButton){
- System.out.println("ParameterPanelFolder.actionPerformed(openButton)");
- File sdir = new File(this.argField.getText());
- if (sdir.exists()) {
- this.fc = new JFileChooser(sdir);
- }
- else {
- this.fc = new JFileChooser();
- }
- this.fc.setFileSelectionMode(this.chooser);
-
- int returnVal = this.fc.showOpenDialog(ParameterPanelFolder.this);
-
- if (returnVal == JFileChooser.APPROVE_OPTION) {
- File file = this.fc.getSelectedFile();
- this.argField.setText(file.getAbsolutePath());
- }
- }
- }
-}
\ No newline at end of file
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelGpx.java b/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelGpx.java
deleted file mode 100644
index c2ebba5..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelGpx.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package osm.jp.gpx.matchtime.gui;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-
-@SuppressWarnings("serial")
-public class ParameterPanelGpx extends ParameterPanel implements ActionListener
-{
- JFileChooser fc;
- JButton openButton;
-
- @SuppressWarnings({"OverridableMethodCallInConstructor", "LeakingThisInConstructor"})
- public ParameterPanelGpx(String label, String text) {
- super(label, text);
-
- // "選択..."
- openButton = new JButton(
- i18n.getString("button.select"),
- AdjustTime.createImageIcon("images/Open16.gif")
- );
- openButton.addActionListener(this);
- this.add(openButton);
- }
-
- public void setEnable(boolean f) {
- super.setEnabled(f);
- openButton.setEnabled(f);
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- if (e.getSource() == openButton){
- System.out.println("ParameterPanelGpx.actionPerformed(openButton)");
- File sdir = new File(this.argField.getText());
- if (sdir.exists()) {
- this.fc = new JFileChooser(sdir);
- }
- else {
- this.fc = new JFileChooser();
- }
- this.fc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
- this.fc.addChoosableFileFilter(new GpxAndFolderFilter());
- this.fc.setAcceptAllFileFilterUsed(false);
-
- int returnVal = this.fc.showOpenDialog(ParameterPanelGpx.this);
-
- if (returnVal == JFileChooser.APPROVE_OPTION) {
- File file = this.fc.getSelectedFile();
- this.argField.setText(file.getAbsolutePath());
- }
- }
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelImageFile.java b/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelImageFile.java
deleted file mode 100644
index e672786..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelImageFile.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package osm.jp.gpx.matchtime.gui;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-
-@SuppressWarnings("serial")
-public class ParameterPanelImageFile extends ParameterPanel implements ActionListener {
- JFileChooser fc;
- JButton openButton;
- ParameterPanelFolder paramDir;
-
- @SuppressWarnings("OverridableMethodCallInConstructor")
- public ParameterPanelImageFile(String label, String text, ParameterPanelFolder paramDir) {
- super(label, text);
-
- // "選択..."
- openButton = new JButton(i18n.getString("button.select"));
-
- /*
- openButton.addActionListener(this);
- */
-
- this.add(openButton);
-
- //Create a file chooser
- this.paramDir = paramDir;
- }
-
- @SuppressWarnings("override")
- public void actionPerformed(ActionEvent e) {
- /*
- //Set up the file chooser.
- File sdir = new File(paramDir.getText());
- System.out.println(sdir.toPath());
- if (sdir.isDirectory()) {
- fc = new JFileChooser(sdir);
- }
- else {
- fc = new JFileChooser();
- }
-
- //Add a custom file filter and disable the default
- //(Accept All) file filter.
- fc.addChoosableFileFilter(new ImageFilter());
- fc.setAcceptAllFileFilterUsed(false);
-
- //Add custom icons for file types.
- fc.setFileView(new ImageFileView());
-
- //Add the preview pane.
- fc.setAccessory(new ImagePreview(fc));
-
- //Show it.
- int returnVal = fc.showDialog(ParameterPanelImageFile.this, "選択");
-
- //Process the results.
- if (returnVal == JFileChooser.APPROVE_OPTION) {
- File file = fc.getSelectedFile();
- this.argField.setText(file.getName());
- }
-
- //Reset the file chooser for the next time it's shown.
- fc.setSelectedFile(null);
- */
- }
-}
\ No newline at end of file
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelSelecter.java b/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelSelecter.java
deleted file mode 100644
index 15b8d96..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelSelecter.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package osm.jp.gpx.matchtime.gui;
-
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class ParameterPanelSelecter extends JPanel implements ActionListener {
- public static final int ITEM_WIDTH_1 = 160;
- public static final int ITEM_WIDTH_2 = 240;
- public static final int LINE_WIDTH = ITEM_WIDTH_1 + ITEM_WIDTH_2;
- public static final int LINE_HEIGHT = 18;
- public JLabel label;
- public JComboBox field;
- public String value;
-
- @SuppressWarnings({"OverridableMethodCallInConstructor", "LeakingThisInConstructor"})
- public ParameterPanelSelecter(String title, String[] items) {
- super(null);
- this.value = items[0];
-
- this.label = new JLabel(title, JLabel.RIGHT);
- this.label.setBounds(0, 0, ITEM_WIDTH_1 - 6, LINE_HEIGHT);
- add(this.label);
-
- this.field = new JComboBox<>();
- this.field.addActionListener(this);
- for (String item : items) {
- this.field.addItem(item);
- }
- this.field.setBounds(ITEM_WIDTH_1, 0, ITEM_WIDTH_2, LINE_HEIGHT);
- add(this.field);
-
- setPreferredSize(new Dimension(ITEM_WIDTH_1, LINE_HEIGHT));
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- this.value = (String)this.field.getSelectedItem();
- }
-}
\ No newline at end of file
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java b/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java
deleted file mode 100644
index 19a0e63..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/ParameterPanelTime.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package osm.jp.gpx.matchtime.gui;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-
-@SuppressWarnings("serial")
-public class ParameterPanelTime extends ParameterPanel implements ActionListener {
- JFileChooser fc;
- public JButton doButton;
-
- @SuppressWarnings({"OverridableMethodCallInConstructor", "LeakingThisInConstructor"})
- public ParameterPanelTime(String label, String text) {
- super(label, text);
-
- doButton = new JButton("処理実行", AdjustTime.createImageIcon("images/media_playback_start.png"));
- doButton.addActionListener(this);
- this.add(doButton);
- }
-
- @Override
- public void actionPerformed(ActionEvent e) {
- }
-}
\ No newline at end of file
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/QuitDialog.java b/importPicture/src/osm/jp/gpx/matchtime/gui/QuitDialog.java
deleted file mode 100644
index bf5b9e3..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/QuitDialog.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package osm.jp.gpx.matchtime.gui;
-
-import java.awt.Font;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.Window;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.util.ResourceBundle;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-
-@SuppressWarnings("serial")
-public class QuitDialog extends JDialog implements WindowListener
-{
- JButton yesButton;
- JButton noButton;
- JLabel label1;
-
- @SuppressWarnings("OverridableMethodCallInConstructor")
- public QuitDialog(JFrame parent, boolean modal) {
- super(parent, modal);
-
- ResourceBundle i18n = ResourceBundle.getBundle("i18n");
-
- addWindowListener((WindowListener) this);
- setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
-
- setLayout(null);
- setSize(getInsets().left + getInsets().right + 337, getInsets().top + getInsets().bottom + 135);
-
- yesButton = new JButton(String.format(" %s ", i18n.getString("dialog.quit")));
- yesButton.addActionListener(new java.awt.event.ActionListener() {
- @Override
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new WindowEvent((Window)getParent(), 201));
- System.exit(0);
- }
- });
- yesButton.setBounds(getInsets().left + 72, getInsets().top + 80, 79, 22);
- yesButton.setFont(new Font("Dialog", 1, 12));
- add(yesButton);
-
- noButton = new JButton(i18n.getString("dialog.cancel"));
- noButton.addActionListener(new java.awt.event.ActionListener() {
- @Override
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new WindowEvent(QuitDialog.this, WindowEvent.WINDOW_CLOSING));
- setVisible(false);
- }
- });
- noButton.setBounds(getInsets().left + 185, getInsets().top + 80, 99, 22);
- noButton.setFont(new Font("Dialog", 1, 12));
- add(noButton);
-
- label1 = new JLabel(i18n.getString("dialog.msg1"), JLabel.CENTER);
- label1.setBounds(78, 33, 180, 23);
- add(label1);
- setTitle(i18n.getString("dialog.msg1"));
- setResizable(false);
- setVisible(true);
- }
-
- @Override
- public void setVisible(boolean b) {
- if(b) {
- Rectangle bounds = getParent().getBounds();
- Rectangle abounds = getBounds();
- setLocation(bounds.x + (bounds.width - abounds.width) / 2, bounds.y + (bounds.height - abounds.height) / 2);
- }
- super.setVisible(b);
- }
-
-
- @Override
- public void windowActivated(WindowEvent e) {
- }
-
- @Override
- public void windowClosed(WindowEvent e) {
- setVisible(false);
- }
-
- @Override
- public void windowClosing(WindowEvent e) {
- setVisible(false);
- }
-
- @Override
- public void windowDeactivated(WindowEvent e) {
- }
-
- @Override
- public void windowDeiconified(WindowEvent e) {
- }
-
- @Override
- public void windowIconified(WindowEvent e) {
- }
-
- @Override
- public void windowOpened(WindowEvent e) {
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/Utils.java b/importPicture/src/osm/jp/gpx/matchtime/gui/Utils.java
deleted file mode 100644
index ca44214..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/Utils.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of Oracle or the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package osm.jp.gpx.matchtime.gui;
-
-import java.io.File;
-import javax.swing.ImageIcon;
-
-/* Utils.java is used by FileChooserDemo2.java. */
-public class Utils {
- public final static String jpeg = "jpeg";
- public final static String jpg = "jpg";
- public final static String gif = "gif";
- public final static String tiff = "tiff";
- public final static String tif = "tif";
- public final static String png = "png";
-
- /*
- * Get the extension of a file.
- */
- public static String getExtension(File f) {
- String ext = null;
- String s = f.getName();
- int i = s.lastIndexOf('.');
-
- if (i > 0 && i < s.length() - 1) {
- ext = s.substring(i+1).toLowerCase();
- }
- return ext;
- }
-
- /** Returns an ImageIcon, or null if the path was invalid.
- * @param path
- * @return
- */
- protected static ImageIcon createImageIcon(String path) {
- java.net.URL imgURL = Utils.class.getResource(path);
- if (imgURL != null) {
- return new ImageIcon(imgURL);
- } else {
- System.err.println("Couldn't find file: " + path);
- return null;
- }
- }
-}
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/Fit16.gif b/importPicture/src/osm/jp/gpx/matchtime/gui/images/Fit16.gif
deleted file mode 100644
index 0d94f66..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/Fit16.gif
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/Open16.gif b/importPicture/src/osm/jp/gpx/matchtime/gui/images/Open16.gif
deleted file mode 100644
index fabd567..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/Open16.gif
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/Original16.gif b/importPicture/src/osm/jp/gpx/matchtime/gui/images/Original16.gif
deleted file mode 100644
index 57e71ce..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/Original16.gif
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/Rotate16.gif b/importPicture/src/osm/jp/gpx/matchtime/gui/images/Rotate16.gif
deleted file mode 100644
index 587b9d2..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/Rotate16.gif
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/Save16.gif b/importPicture/src/osm/jp/gpx/matchtime/gui/images/Save16.gif
deleted file mode 100644
index 954f1ac..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/Save16.gif
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/Thumbs.db b/importPicture/src/osm/jp/gpx/matchtime/gui/images/Thumbs.db
deleted file mode 100644
index d27d66b..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/Thumbs.db
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/ZoomIn16.gif b/importPicture/src/osm/jp/gpx/matchtime/gui/images/ZoomIn16.gif
deleted file mode 100644
index 2329426..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/ZoomIn16.gif
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/ZoomOut16.gif b/importPicture/src/osm/jp/gpx/matchtime/gui/images/ZoomOut16.gif
deleted file mode 100644
index f9f7565..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/ZoomOut16.gif
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/gifIcon.gif b/importPicture/src/osm/jp/gpx/matchtime/gui/images/gifIcon.gif
deleted file mode 100644
index 915e184..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/gifIcon.gif
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/jpgIcon.gif b/importPicture/src/osm/jp/gpx/matchtime/gui/images/jpgIcon.gif
deleted file mode 100644
index 7294f36..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/jpgIcon.gif
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/media_playback_start.png b/importPicture/src/osm/jp/gpx/matchtime/gui/images/media_playback_start.png
deleted file mode 100644
index 2f8c4b5..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/media_playback_start.png
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/pngIcon.png b/importPicture/src/osm/jp/gpx/matchtime/gui/images/pngIcon.png
deleted file mode 100644
index bd2fd54..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/pngIcon.png
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/matchtime/gui/images/tiffIcon.gif b/importPicture/src/osm/jp/gpx/matchtime/gui/images/tiffIcon.gif
deleted file mode 100644
index 84b4132..0000000
--- a/importPicture/src/osm/jp/gpx/matchtime/gui/images/tiffIcon.gif
+++ /dev/null
Binary files differ
diff --git a/importPicture/src/osm/jp/gpx/utils/TarGz.java b/importPicture/src/osm/jp/gpx/utils/TarGz.java
deleted file mode 100644
index b447f8c..0000000
--- a/importPicture/src/osm/jp/gpx/utils/TarGz.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package osm.jp.gpx.utils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
-
-/**
- * 「＊.tar.gz」を解凍する。
- * ファイル更新日時をオリジナルと同じにします。
- * Apache Commons Compressライブラリ
- * commons-compress-1.14.jar
- */
-public abstract class TarGz
-{
- public static void main(String[] args) throws IOException {
- File baseDir = new File("testdata/cameradata");
- File tazFile = new File("testdata", "Sony20170518.tar.gz");
- TarGz.uncompress(tazFile, baseDir);
- }
-
- /**
- * *.tar.gz解凍
- * ファイル更新日時をオリジナルと同じにします。
- * @param tazFile 解凍する*.tar.gzファイル
- * @param dest 解凍先フォルダ
- * @throws IOException
- */
- public static void uncompress(File tazFile, File dest) throws IOException {
- dest.mkdir();
-
- TarArchiveInputStream tarIn = null;
- tarIn = new TarArchiveInputStream(new GzipCompressorInputStream(new BufferedInputStream(new FileInputStream(tazFile))));
-
- TarArchiveEntry tarEntry = tarIn.getNextTarEntry();
- while (tarEntry != null) {
- File destPath = new File(dest, tarEntry.getName());
- System.out.println("uncompress: " + destPath.getCanonicalPath());
- if (tarEntry.isDirectory()) {
- destPath.mkdirs();
- }
- else {
- File dir = new File(destPath.getParent());
- if (!dir.exists()) {
- dir.mkdirs();
- }
- destPath.createNewFile();
- byte[] btoRead = new byte[1024];
- try (BufferedOutputStream bout = new BufferedOutputStream(new FileOutputStream(destPath))) {
- int len = 0;
- while ((len = tarIn.read(btoRead)) != -1) {
- bout.write(btoRead, 0, len);
- }
- }
- destPath.setLastModified(tarEntry.getLastModifiedDate().getTime());
- btoRead = null;
- }
- tarEntry = tarIn.getNextTarEntry();
- }
- tarIn.close();
- }
-}
diff --git a/importPicture/test/osm/jp/gpx/AppParametersTest.java b/importPicture/test/osm/jp/gpx/AppParametersTest.java
deleted file mode 100644
index e0f9f6b..0000000
--- a/importPicture/test/osm/jp/gpx/AppParametersTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package osm.jp.gpx;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.experimental.runners.*;
-
-@RunWith(Enclosed.class)
-public class AppParametersTest {
-
- public static class 定義ファイルが存在しない場合 {
- AppParameters params;
-
- @Before
- public void setUp() throws Exception {
- File iniFile = new File("AdjustTime.ini");
- File orgFile = new File("AdjustTime.ini.org");
-
- if (orgFile.exists()) {
- orgFile.delete();
- }
- if (iniFile.exists()) {
- iniFile.renameTo(orgFile);
- }
- }
-
- @After
- public void tearDown() throws Exception {
- File iniFile = new File("AdjustTime.ini");
- File orgFile = new File("AdjustTime.ini.org");
- if (iniFile.exists()) {
- iniFile.delete();
- }
- if (orgFile.exists()) {
- orgFile.renameTo(iniFile);
- }
- }
-
- @Test
- public void IMG_OUTPUT_ALLが定義されていない時() {
- try {
- params = new AppParameters("testdata/AdjustTime.off.ini");
- String valueStr = params.getProperty(AppParameters.IMG_OUTPUT_ALL);
- assertThat(valueStr, is("false"));
- }
- catch (IOException e) {
- fail("Exceptionが発生した。");
- }
- }
- }
-
- public static class 定義ファイルがtureに定義されているとき {
-
- @Before
- public void setUp() throws Exception {
- File iniFile = new File("AdjustTime.ini");
- File orgFile = new File("AdjustTime.ini.org");
- File testFile = new File("testdata", "AdjustTime.on.ini");
-
- if (orgFile.exists()) {
- orgFile.delete();
- }
- if (iniFile.exists()) {
- iniFile.renameTo(orgFile);
- }
-
- FileInputStream inStream = new FileInputStream(testFile);
- FileOutputStream outStream = new FileOutputStream(new File("AdjustTime.ini"));
- FileChannel inChannel = inStream.getChannel();
- FileChannel outChannel = outStream.getChannel();
- try {
- inChannel.transferTo(0, inChannel.size(),outChannel);
- }
- finally {
- if (inChannel != null) inChannel.close();
- if (outChannel != null) outChannel.close();
- inStream.close();
- outStream.close();
- }
- }
-
- @After
- public void tearDown() throws Exception {
- File iniFile = new File("AdjustTime.ini");
- File orgFile = new File("AdjustTime.ini.org");
- if (iniFile.exists()) {
- iniFile.delete();
- }
- if (orgFile.exists()) {
- orgFile.renameTo(iniFile);
- }
- }
-
- @Test
- public void IMG_OUTPUT_ALLがtureに定義されているとき() {
- try {
- AppParameters params;
- params = new AppParameters();
- String valueStr = params.getProperty(AppParameters.IMG_OUTPUT_ALL);
- assertThat(valueStr, is("true"));
- }
- catch (IOException e) {
- fail("Exceptionが発生した。");
- }
- }
-
- @Test
- public void IMG_OUTPUT_ALLをfalseに書き換える() {
- try {
- AppParameters params = new AppParameters();
- params.setProperty(AppParameters.IMG_OUTPUT_ALL, "false");
- params.store();
- params = null;
- AppParameters newParams = new AppParameters();
- String valueStr = newParams.getProperty(AppParameters.IMG_OUTPUT_ALL);
- assertThat(valueStr, is("false"));
- }
- catch (IOException e) {
- fail("Exceptionが発生した。");
- }
- }
- }
-
- public static class 定義ファイルがfalseに定義されているとき {
-
- @Before
- public void setUp() throws Exception {
- File iniFile = new File("AdjustTime.ini");
- File orgFile = new File("AdjustTime.ini.org");
- File testFile = new File("testdata", "AdjustTime.off.ini");
-
- if (orgFile.exists()) {
- orgFile.delete();
- }
- if (iniFile.exists()) {
- iniFile.renameTo(orgFile);
- }
-
- FileInputStream inStream = new FileInputStream(testFile);
- FileOutputStream outStream = new FileOutputStream(new File("AdjustTime.ini"));
- FileChannel inChannel = inStream.getChannel();
- FileChannel outChannel = outStream.getChannel();
- try {
- inChannel.transferTo(0, inChannel.size(),outChannel);
- }
- finally {
- if (inChannel != null) inChannel.close();
- if (outChannel != null) outChannel.close();
- inStream.close();
- outStream.close();
- }
- }
-
- @After
- public void tearDown() throws Exception {
- File iniFile = new File("AdjustTime.ini");
- File orgFile = new File("AdjustTime.ini.org");
- if (iniFile.exists()) {
- iniFile.delete();
- }
- if (orgFile.exists()) {
- orgFile.renameTo(iniFile);
- }
- }
-
- @Test
- public void IMG_OUTPUT_ALLがfalseに定義されているとき() {
- try {
- AppParameters params = new AppParameters();
- String valueStr = params.getProperty(AppParameters.IMG_OUTPUT_ALL);
- assertThat(valueStr, is("false"));
- }
- catch (IOException e) {
- fail("Exceptionが発生した。");
- }
- }
-
- @Test
- public void IMG_OUTPUT_ALLをtrueに書き換える() {
- try {
- AppParameters params = new AppParameters();
- params.setProperty(AppParameters.IMG_OUTPUT_ALL, "true");
- params.store();
- params = null;
- AppParameters newParams = new AppParameters();
- String valueStr = newParams.getProperty(AppParameters.IMG_OUTPUT_ALL);
- assertThat(valueStr, is("true"));
- }
- catch (IOException e) {
- fail("Exceptionが発生した。");
- }
- }
- }
-}
diff --git a/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java b/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java
deleted file mode 100644
index 26c3be9..0000000
--- a/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java
+++ /dev/null
@@ -1,286 +0,0 @@
-package osm.jp.gpx;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.*;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.runners.Enclosed;
-import org.junit.runner.RunWith;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-@RunWith(Enclosed.class)
-public class ElementMapTRKPTTest {
-
- public static class Keyのみ {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
- ElementMapTRKPT map = null;
- long timeL;
- static String[] values = {
- "1970-01-01 08:59:59.999",
- "1970-01-01 09:00:00.000",
- "1970-01-01 09:00:00.001",
- "2018-10-25 07:59:59.999",
- "2018-10-25 08:00:00.000",
- "2018-10-25 08:00:00.001"
- };
-
- @Before
- public void setUp() throws Exception {
- timeL = (sdf.parse("2018-10-25 08:00:00.000")).getTime();
- map = new ElementMapTRKPT();
- map.put(new Date(timeL), null); // 5-6: 2018-10-25 08:00:00.000
- map.put(new Date(timeL + 1L), null); // 7: 2018-10-25 08:00:00.001
- map.put(new Date(timeL - 1L), null); // 4: 2018-10-25 07:59:59.999
- map.put(new Date(1L), null); // 3: 1970-01-01 09:00:00.001
- map.put(new Date(0L), null); // 2: 1970-01-01 09:00:00.000
- map.put(new Date(-1L), null); // 1: 1970-01-01 08:59:59.999
- map.put(new Date(timeL), null); // 5-6: 2018-10-25 08:00:00.000
- }
-
- @Test
- public void 同一キーをPUTした場合() {
- assertThat(map.size(), is(6));
- }
-
- @Test
- public void イテレータを使って読みだす() {
- assertThat(map.size(), is(6));
-
- int i = 0;
- for (Date key : map.keySet()) {
- assertThat(sdf.format(key), is(values[i++]));
- }
- }
-
- @Test
- public void 拡張FOR文を使って読みだす() {
- assertThat(map.size(), is(6));
-
- int i = 0;
- for (Date key : map.keySet()) {
- assertThat(sdf.format(key), is(values[i++]));
- }
- }
- }
-
- public static class Keyとvalueのセット {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
- ElementMapTRKPT map = null;
- long timeL;
-
- /*
- *
- * 614.90
- * 615.00
- * 615.03
- */
- static String[][] values = {
- {"2017-05-29T01:23:18Z", "35.8812697884", "137.9952202085", null},
- {"2017-05-29T01:23:21Z", "35.8811769169", "137.9951928835", "614.90"},
- {"2017-05-29T01:23:24Z", "35.881112963", "137.9951796401", "615.00"},
- {"2017-05-29T01:23:27Z", "35.881072646", "137.9951728508", "615.03"}
- };
-
- Element createElement(Document document, String[] values) {
- Element trkpt = document.createElement("trkpt");
- trkpt.setAttribute("lat", values[1]);
- trkpt.setAttribute("lon", values[2]);
- Element timeE = document.createElement("time");
- timeE.appendChild(document.createTextNode(values[0]));
- trkpt.appendChild(timeE);
- if (values[3] != null) {
- Element eleE = document.createElement("ele");
- eleE.appendChild(document.createTextNode(values[3]));
- trkpt.appendChild(eleE);
- }
- return trkpt;
- }
-
- @Before
- public void setUp() throws Exception {
- Complementation.param_GpxOverwriteMagvar = true;
-
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = factory.newDocumentBuilder();
- DOMImplementation domImpl=builder.getDOMImplementation();
- Document document = domImpl.createDocument("","trkpt",null);
-
- map = new ElementMapTRKPT();
- for (int cnt = 4; cnt > 0; cnt--) {
- map.put(new TagTrkpt(createElement(document, values[cnt - 1])));
- }
- }
-
- @Test
- public void コンテンツの数をチェック() {
- assertThat(map.size(), is(4));
- }
-
- @Test
- public void KEYが時間順に取り出せるか() {
- int i = 0;
- for (Date key : map.keySet()) {
- try {
- String s = sdf.format(ImportPicture.toUTCDate(values[i++][0]));
- assertThat(sdf.format(key), is(s));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- }
- }
-
- @Test
- public void get_17() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:17Z"));
- assertThat(tag, is(nullValue()));
- }
-
- @Test
- public void get_18() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:18Z"));
- assertThat(sdf.format(tag.time), is("2017-05-29T10:23:18Z"));
- assertThat(tag.eleStr, is(nullValue()));
- assertThat(tag.lat, is(new Double(values[0][1])));
- assertThat(tag.lon, is(new Double(values[0][2])));
- assertThat(tag.magvarStr, is(nullValue()));
- }
-
- @Test
- public void get_19() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:19Z"));
- assertThat(sdf.format(tag.time), is("2017-05-29T10:23:18Z"));
- assertThat(tag.eleStr, is(nullValue()));
- assertThat(tag.lat, is(new Double(values[0][1])));
- assertThat(tag.lon, is(new Double(values[0][2])));
- assertThat(tag.magvarStr, is(nullValue()));
- }
-
- @Test
- public void get_20() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:20Z"));
- assertThat(sdf.format(tag.time), is("2017-05-29T10:23:18Z"));
- assertThat(tag.eleStr, is(nullValue()));
- assertThat(tag.lat, is(new Double(values[0][1])));
- assertThat(tag.lon, is(new Double(values[0][2])));
- assertThat(tag.magvarStr, is(nullValue()));
- }
-
- @Test
- public void get_21() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:21Z"));
- assertThat(sdf.format(tag.time), is("2017-05-29T10:23:21Z"));
- assertThat(tag.eleStr, is("614.90"));
- assertThat(tag.lat, is(new Double(values[1][1])));
- assertThat(tag.lon, is(new Double(values[1][2])));
- assertThat(tag.magvarStr, is(notNullValue()));
- }
-
- @Test
- public void get_22() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:22Z"));
- assertThat(sdf.format(tag.time), is("2017-05-29T10:23:21Z"));
- assertThat(tag.eleStr, is("614.90"));
- assertThat(tag.lat, is(new Double(values[1][1])));
- assertThat(tag.lon, is(new Double(values[1][2])));
- assertThat(tag.magvarStr, is(notNullValue()));
- }
-
- @Test
- public void get_23() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:23Z"));
- assertThat(sdf.format(tag.time), is("2017-05-29T10:23:21Z"));
- assertThat(tag.eleStr, is("614.90"));
- assertThat(tag.lat, is(new Double(values[1][1])));
- assertThat(tag.lon, is(new Double(values[1][2])));
- assertThat(tag.magvarStr, is(notNullValue()));
- }
-
- @Test
- public void get_24() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:24Z"));
- assertThat(sdf.format(tag.time), is("2017-05-29T10:23:24Z"));
- assertThat(tag.eleStr, is("615.00"));
- assertThat(tag.lat, is(new Double(values[2][1])));
- assertThat(tag.lon, is(new Double(values[2][2])));
- assertThat(tag.magvarStr, is(notNullValue()));
- }
-
- @Test
- public void get_25() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:25Z"));
- assertThat(sdf.format(tag.time), is("2017-05-29T10:23:24Z"));
- assertThat(tag.eleStr, is("615.00"));
- assertThat(tag.lat, is(new Double(values[2][1])));
- assertThat(tag.lon, is(new Double(values[2][2])));
- assertThat(tag.magvarStr, is(notNullValue()));
- }
-
- @Test
- public void get_26() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:26Z"));
- assertThat(sdf.format(tag.time), is("2017-05-29T10:23:24Z"));
- assertThat(tag.eleStr, is("615.00"));
- assertThat(tag.lat, is(new Double(values[2][1])));
- assertThat(tag.lon, is(new Double(values[2][2])));
- assertThat(tag.magvarStr, is(notNullValue()));
- }
-
- @Test
- public void get_27() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:27Z"));
- assertThat(sdf.format(tag.time), is("2017-05-29T10:23:27Z"));
- assertThat(tag.eleStr, is("615.03"));
- assertThat(tag.lat, is(new Double(values[3][1])));
- assertThat(tag.lon, is(new Double(values[3][2])));
- assertThat(tag.magvarStr, is(notNullValue()));
- }
-
- @Test
- public void get_28() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:28Z"));
- assertThat(sdf.format(tag.time), is("2017-05-29T10:23:27Z"));
- assertThat(tag.eleStr, is("615.03"));
- assertThat(tag.lat, is(new Double(values[3][1])));
- assertThat(tag.lon, is(new Double(values[3][2])));
- assertThat(tag.magvarStr, is(notNullValue()));
- }
-
- @Test
- public void get_30() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:30Z"));
- assertThat(sdf.format(tag.time), is("2017-05-29T10:23:27Z"));
- assertThat(tag.eleStr, is("615.03"));
- assertThat(tag.lat, is(new Double(values[3][1])));
- assertThat(tag.lon, is(new Double(values[3][2])));
- assertThat(tag.magvarStr, is(notNullValue()));
- }
-
- @Test
- public void get_31() throws ParseException {
- TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:31Z"));
- assertThat(tag, is(nullValue()));
- }
- }
-
- public static class タイムスタンプの書式 {
- @Test
- public void EXIF時刻書式テスト() throws Exception {
- String dateTimeOriginal = "2017:06:30 09:59:59";
- Date time = ImportPicture.toEXIFDate(dateTimeOriginal);
- assertThat(ImportPicture.toEXIFString(time), is("2017:06:30 09:59:59"));
- assertThat(ImportPicture.toUTCString(time), is("2017-06-30T00:59:59Z"));
- DateFormat dfUTC = new SimpleDateFormat(ImportPicture.TIME_FORMAT_STRING);
- assertThat(dfUTC.format(time), is("2017-06-30T09:59:59Z"));
- }
- }
-}
diff --git a/importPicture/test/osm/jp/gpx/ElementMapTRKSEGTest.java b/importPicture/test/osm/jp/gpx/ElementMapTRKSEGTest.java
deleted file mode 100644
index fb794e4..0000000
--- a/importPicture/test/osm/jp/gpx/ElementMapTRKSEGTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package osm.jp.gpx;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.Date;
-import javax.xml.parsers.ParserConfigurationException;
-import org.junit.experimental.theories.DataPoints;
-import org.junit.experimental.theories.Theories;
-import org.junit.experimental.theories.Theory;
-import org.junit.runner.RunWith;
-import org.w3c.dom.DOMException;
-import org.xml.sax.SAXException;
-
-public class ElementMapTRKSEGTest {
-
- @RunWith(Theories.class)
- public static class 各種GPXファイルを食わせる {
- static class Fixture {
- String gpxSourcePath; // GPXファイル（オリジナル）
- int segCount; // GPXファイルに含まれるTRKSEGノードの数
-
- public Fixture(String gpxSourcePath, int segCount) {
- this.gpxSourcePath = gpxSourcePath;
- this.segCount = segCount;
- }
-
- @Override
- public String toString() {
- String msg = "テストパターン : \n";
- msg += "\tgpxSourcePath = "+ gpxSourcePath +"\n";
- msg += "\tsegCount = "+ segCount;
- return msg;
- }
- }
-
- @DataPoints
- public static Fixture[] datas = {
- new Fixture("testdata/20170517.gpx", 1),
- new Fixture("testdata/20170518.gpx", 1),
- new Fixture("testdata/muiltiTRK.GarminColorado.gpx.xml", 3),
- new Fixture("testdata/muiltiTRKSEG.GarminColorado.gpx.xml", 3),
- new Fixture("testdata/muiltiTRKSEG.noNameSpace.gpx.xml", 3),
- new Fixture("testdata/multiTRKSEG.eTrex_20J.gpx.xml", 3),
- new Fixture("testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml", 3),
- };
-
- @Theory
- public void TRKSEGを読み込む(Fixture dataset) {
- try {
- ElementMapTRKSEG mapTRKSEG = new ElementMapTRKSEG();
- mapTRKSEG.parse(new File(dataset.gpxSourcePath));
- mapTRKSEG.printinfo();
- System.out.println("GPX file: "+ dataset.gpxSourcePath);
- assertThat(mapTRKSEG.size(), is(dataset.segCount));
- for (Date key : mapTRKSEG.keySet()) {
- assertThat(key, is(notNullValue()));
- }
- }
- catch (IOException | ParseException | ParserConfigurationException | DOMException | SAXException e) {
- fail();
- }
- }
- }
-}
diff --git a/importPicture/test/osm/jp/gpx/ImportPictureTest.java b/importPicture/test/osm/jp/gpx/ImportPictureTest.java
deleted file mode 100644
index d20a355..0000000
--- a/importPicture/test/osm/jp/gpx/ImportPictureTest.java
+++ /dev/null
@@ -1,740 +0,0 @@
-package osm.jp.gpx;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
-import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.common.ImageMetadata;
-import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
-import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
-import org.apache.commons.imaging.formats.tiff.TiffImageMetadata.GPSInfo;
-import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
-import org.junit.runner.*;
-import org.junit.experimental.theories.DataPoints;
-import org.junit.experimental.theories.Theories;
-import org.junit.experimental.theories.Theory;
-
-public class ImportPictureTest {
- static class Expecter {
- String value;
- boolean expect;
- String timeStr;
- double latD;
- double lonD;
- boolean magvar;
-
- public Expecter(String value, boolean expect, String timeStr, double latD, double lonD, boolean magvar) {
- this.value = value;
- this.expect = expect;
- this.timeStr = timeStr;
- this.latD = latD;
- this.lonD = lonD;
- this.magvar = magvar;
- }
- }
-
- static class Fixture {
- String comment; // テスト概要（コメント）
- String tarFilePath; // TARデータ
- String gpxSourcePath; // GPXファイル（オリジナル）
- String gpxDestinationPath; // GPXファイル（配置先）
- String iniFilePath; // iniファイル
- Expecter[] expecters;
-
- public Fixture(
- String comment,
- String tarFilePath,
- String gpxSourcePath,
- String gpxDestinationPath,
- String iniFilePath,
- Expecter[] expecters
- ) {
- this.comment = comment;
- this.tarFilePath = tarFilePath;
- this.gpxSourcePath = gpxSourcePath;
- this.gpxDestinationPath = gpxDestinationPath;
- this.iniFilePath = iniFilePath;
- this.expecters = expecters;
- }
-
- @Override
- public String toString() {
- String msg = "テストパターン : "+ comment + "\n";
- msg += "\ttarFilePath = "+ tarFilePath +"\n";
- msg += "\tgpxSourcePath = "+ gpxSourcePath +"\n";
- msg += "\tgpxDestinationPath = "+ gpxDestinationPath +"\n";
- msg += "\tiniFilePath = "+ iniFilePath;
- return msg;
- }
- }
-
-
- @RunWith(Theories.class)
- public static class 各種カメラGPXファイル {
-
- @DataPoints
- public static Fixture[] datas = {
- // 1
- new Fixture(
- "[A1].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時",
- "testdata/Sony20170518.tar.gz",
- "testdata/20170518.gpx",
- "testdata/cameradata/20170518.gpx",
- "testdata/AdjustTime.20170518.A1.ini",
- new Expecter[] {
- new Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, false),
- new Expecter("10170518/DSC05183.JPG", false, null, 90.0D, 180.0D, false),
- new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 35.4367520000D, 139.4082730000D, true),
- new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, true),
- new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 35.4368560000D, 139.4082190000D, true),
- new Expecter("10170518/DSC05205.JPG", false, null, 90.0D, 180.0D, false),
- }
- ),
- // 2
- new Fixture(
- "[A2].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時",
- "testdata/Sony20170518.tar.gz",
- "testdata/20170518.gpx",
- "testdata/cameradata/20170518.gpx",
- "testdata/AdjustTime.20170518.A2.ini",
- new Expecter[] {
- new Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, false),
- new Expecter("10170518/DSC05183.JPG", true, "2017:05:18 09:16:48", 90.0D, 180.0D, true),
- new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 35.4367520000D, 139.4082730000D, true),
- new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, true),
- new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 35.4368560000D, 139.4082190000D, true),
- new Expecter("10170518/DSC05205.JPG", true, "2017:05:18 09:48:04", 90.0D, 180.0D, true),
- }
- ),
- // 3.
- new Fixture(
- "[B1].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時",
- "testdata/WiMiUS20170518.tar.gz",
- "testdata/20170518.gpx",
- "testdata/cameradata/20170518.gpx",
- "testdata/AdjustTime.20170518.B1.ini",
- new Expecter[] {
- new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, false),
- new Expecter("cameradata/20170518_092031A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 35.4366860000D, 139.4082650000D, true),
- new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, true),
- new Expecter("cameradata/20170518_094827A.jpg", false, null, 90.0D, 180.0D, false),
- }
- ),
- // 4.
- new Fixture(
- "[B2].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時",
- "testdata/WiMiUS20170518.tar.gz",
- "testdata/20170518.gpx",
- "testdata/cameradata/20170518.gpx",
- "testdata/AdjustTime.20170518.B2.ini",
- new Expecter[] {
- new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, false),
- new Expecter("cameradata/20170518_092031A.jpg", true, "2017:05:18 09:20:30", 90.0D, 180.0D, true),
- new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 35.4366860000D, 139.4082650000D, true),
- new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, true),
- new Expecter("cameradata/20170518_094827A.jpg", true, "2017:05:18 09:48:26", 90.0D, 180.0D, true),
- }
- ),
- // 5.
- new Fixture(
- "[M1a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado",
- "testdata/separate.tar.gz",
- "testdata/muiltiTRK.GarminColorado.gpx.xml",
- "testdata/cameradata/separate.gpx",
- "testdata/AdjustTime.M1a.separate.ini",
- new Expecter[] {
- // GPX file
- new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
-
- // out of time ( - 2017-05-29T01:23:18)
- new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
- new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
- new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
- new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
-
- // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
- new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
- new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
- new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
-
- // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
- new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
- new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
- new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
- }
- ),
-
- new Fixture(
- "[M1b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado",
- "testdata/separate.tar.gz",
- "testdata/muiltiTRK.GarminColorado.gpx.xml",
- "testdata/cameradata/separate.gpx",
- "testdata/AdjustTime.M1b.separate.ini",
- new Expecter[] {
- // GPX file
- new Expecter("separate/separate_.gpx", true, null, 90.D, 180.0D, false),
-
- // out of time ( - 2017-05-29T01:23:18)
- new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
-
- // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
- new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
- new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
- new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
-
- // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
- new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
-
- // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
- new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
- new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
-
- // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
- new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, true),
-
- // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
- new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
- new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
- }
- ),
-
- new Fixture(
- "[M1c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado",
- "testdata/separate.tar.gz",
- "testdata/muiltiTRK.GarminColorado.gpx.xml",
- "testdata/cameradata/separate.gpx",
- "testdata/AdjustTime.M1c.separate.ini",
- new Expecter[] {
- // GPX file
- new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
-
- // out of time ( - 2017-05-29T01:23:18)
- new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
- new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
- new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
- new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
-
- // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
- new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
- new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
- new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
-
- // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
- new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
- new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
- new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, true),
- }
- ),
-
- new Fixture(
- "[M1d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado",
- "testdata/separate.tar.gz",
- "testdata/muiltiTRK.GarminColorado.gpx.xml",
- "testdata/cameradata/separate.gpx",
- "testdata/AdjustTime.M1d.separate.ini",
- new Expecter[] {
- // GPX file
- new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
-
- // out of time ( - 2017-05-29T01:23:18)
- new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
-
- // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
- new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
- new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
- new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
-
- // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
- new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
-
- // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
- new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
- new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
-
- // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
- new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, true),
-
- // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
- new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
- new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, true),
- }
- ),
-
-
- new Fixture(
- "[M2a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J",
- "testdata/separate.tar.gz",
- "testdata/multiTRKSEG.eTrex_20J.gpx.xml",
- "testdata/cameradata/separate.gpx",
- "testdata/AdjustTime.M2a.separate.ini",
- new Expecter[] {
- // GPX file
- new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
-
- // out of time ( - 2017-05-29T01:23:18)
- new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
- new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
- new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
- new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
-
- // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
- new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
- new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
- new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
-
- // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
- new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
- new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
- new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
- }
- ),
-
- new Fixture(
- "[M2b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J",
- "testdata/separate.tar.gz",
- "testdata/multiTRKSEG.eTrex_20J.gpx.xml",
- "testdata/cameradata/separate.gpx",
- "testdata/AdjustTime.M2b.separate.ini",
- new Expecter[] {
- // GPX file
- new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
-
- // out of time ( - 2017-05-29T01:23:18)
- new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
-
- // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
- new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
- new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
- new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
-
- // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
- new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
-
- // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
- new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
- new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
-
- // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
- new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, true),
-
- // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
- new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
- new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
- }
- ),
-
- new Fixture(
- "[M2c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J",
- "testdata/separate.tar.gz",
- "testdata/multiTRKSEG.eTrex_20J.gpx.xml",
- "testdata/cameradata/separate.gpx",
- "testdata/AdjustTime.M2c.separate.ini",
- new Expecter[] {
- // GPX file
- new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
-
- // out of time ( - 2017-05-29T01:23:18)
- new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
- new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
- new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
- new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
-
- // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
- new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
- new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
- new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
-
- // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
- new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
- new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
- new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true),
- }
- ),
-
- new Fixture(
- "[M2d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J",
- "testdata/separate.tar.gz",
- "testdata/multiTRKSEG.eTrex_20J.gpx.xml",
- "testdata/cameradata/separate.gpx",
- "testdata/AdjustTime.M2d.separate.ini",
- new Expecter[] {
- // GPX file
- new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
-
- // out of time ( - 2017-05-29T01:23:18)
- new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
-
- // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
- new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
- new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
- new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
-
- // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
- new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
-
- // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
- new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
- new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
-
- // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
- new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, true),
-
- // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
- new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
- new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true),
- }
- ),
-
- new Fixture(
- "[M3a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse",
- "testdata/separate.tar.gz",
- "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
- "testdata/cameradata/separate.gpx",
- "testdata/AdjustTime.M2a.separate.ini",
- new Expecter[] {
- // GPX file
- new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
-
- // out of time ( - 2017-05-29T01:23:18)
- new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
- new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
- new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
- new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
-
- // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
- new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
- new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
- new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
-
- // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
- new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
- new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
- new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
- }
- ),
-
- new Fixture(
- "[M3b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse",
- "testdata/separate.tar.gz",
- "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
- "testdata/cameradata/separate.gpx",
- "testdata/AdjustTime.M2b.separate.ini",
- new Expecter[] {
- // GPX file
- new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
-
- // out of time ( - 2017-05-29T01:23:18)
- new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
-
- // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
- new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
- new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
- new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true),
-
- // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
- new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
-
- // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
- new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
- new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
-
- // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
- new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, true),
-
- // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
- new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
- new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true),
- }
- ),
-
- new Fixture(
- "[M3c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse",
- "testdata/separate.tar.gz",
- "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
- "testdata/cameradata/separate.gpx",
- "testdata/AdjustTime.M2c.separate.ini",
- new Expecter[] {
- // GPX file
- new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
-
- // out of time ( - 2017-05-29T01:23:18)
- new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
- new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
- new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
- new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
-
- // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
- new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
- new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
- new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
-
- // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
- new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
- new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
-
- // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
- new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
- new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true),
- }
- ),
-
- new Fixture(
- "[M3d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse",
- "testdata/separate.tar.gz",
- "testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml",
- "testdata/cameradata/separate.gpx",
- "testdata/AdjustTime.M2d.separate.ini",
- new Expecter[] {
- // GPX file
- new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, false),
-
- // out of time ( - 2017-05-29T01:23:18)
- new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
-
- // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
- new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true),
- new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true),
- new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true),
-
- // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
- new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
-
- // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
- new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true),
- new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true),
-
- // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
- new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, true),
- new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, true),
-
- // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
- new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true),
- new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true),
- }
- ),
- };
-
- @Theory
- public void パラメータテスト(Fixture dataset) throws Exception {
- ImportPictureTest.setup(dataset);
- ImportPictureTest.testdo(dataset.iniFilePath);
- //SimpleDateFormat format = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss", Locale.UK);
-
- Expecter[] es = dataset.expecters;
- AppParameters params = new AppParameters(dataset.iniFilePath);
- File outDir = new File(params.getProperty(AppParameters.IMG_OUTPUT_FOLDER));
- for (Expecter e : es) {
- File file = new File(outDir, e.value);
- System.out.println("[JUnit.debug] assert file='"+ file.getAbsolutePath() +"'");
- assertThat(file.exists(), is(e.expect));
- if (e.timeStr != null) {
- // JPEG メタデータが存在すること
- ImageMetadata meta = Imaging.getMetadata(file);
- // メタデータは インスタンスJpegImageMetadata であること
- assertThat((meta instanceof JpegImageMetadata), is(true));
- JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta;
- assertNotNull(jpegMetadata);
- // EXIFデータが存在すること
- TiffImageMetadata exif = jpegMetadata.getExif();
- assertNotNull(exif);
- // EXIF-TIME が正しく設定されていること
- String exifTime = ImportPicture.toEXIFString(ImportPicture.toEXIFDate(exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0]));
- System.out.println("[debug] exifTime = '"+ exifTime +"' <--> '" + e.timeStr + "'");
- assertThat(exifTime, is(e.timeStr));
- // LAT,LON
- GPSInfo gpsInfo = exif.getGPS();
- if (e.latD != 90.0D) {
- assertThat(comparePosition(gpsInfo.getLatitudeAsDegreesNorth()), is(comparePosition(e.latD)));
- }
- if (e.lonD != 180.0D) {
- assertThat(comparePosition(gpsInfo.getLongitudeAsDegreesEast()), is(comparePosition(e.lonD)));
- }
- }
- }
- }
-
- static String comparePosition(double b) {
- return String.format("%.4f", b);
- }
- }
-
- static void setup(Fixture dataset) throws IOException {
- System.out.println(dataset.toString());
-
- // カメラディレクトリを削除する
- File dir = new File("testdata/cameradata");
- if (dir.exists()) {
- ImportPictureTest.delete(dir);
- }
- File outDir = new File("testdata/output");
- if (outDir.exists()) {
- ImportPictureTest.delete(outDir);
- }
- outDir.mkdir();
-
- // カメラディレクトリを作成する
- ImportPictureTest.uncompress(new File(dataset.tarFilePath), new File("testdata/cameradata"));
-
- // GPXファイルをセット
- try (FileInputStream inStream = new FileInputStream(new File(dataset.gpxSourcePath));
- FileOutputStream outStream = new FileOutputStream(new File(dataset.gpxDestinationPath));
- FileChannel inChannel = inStream.getChannel();
- FileChannel outChannel = outStream.getChannel())
- {
- inChannel.transferTo(0, inChannel.size(), outChannel);
- }
- }
-
- /**
- * 実行する
- * @throws Exception
- */
- static void testdo(String iniFilePath) {
- try {
- String[] argv = {iniFilePath};
- ImportPicture.main(argv);
- }
- catch (Exception e) {
- e.printStackTrace();
- fail("Exceptionが発生した。");
- }
- }
-
- /**
- * *.tar.gz解凍
- * ファイル更新日時をオリジナルと同じにします。
- * @param tazFile 解凍する*.tar.gzファイル
- * @param dest 解凍先フォルダ
- * @throws IOException
- */
- public static void uncompress(File tazFile, File dest) throws IOException {
- dest.mkdir();
-
- try (TarArchiveInputStream tarIn = new TarArchiveInputStream(new GzipCompressorInputStream(new BufferedInputStream(new FileInputStream(tazFile))))) {
- TarArchiveEntry tarEntry = tarIn.getNextTarEntry();
- while (tarEntry != null) {
- File destPath = new File(dest, tarEntry.getName());
- //System.out.println("uncompress: " + destPath.getCanonicalPath());
- if (tarEntry.isDirectory()) {
- destPath.mkdirs();
- }
- else {
- File dir = new File(destPath.getParent());
- if (!dir.exists()) {
- dir.mkdirs();
- }
- destPath.createNewFile();
- byte[] btoRead = new byte[1024];
- try (BufferedOutputStream bout = new BufferedOutputStream(new FileOutputStream(destPath))) {
- int len = 0;
- while ((len = tarIn.read(btoRead)) != -1) {
- bout.write(btoRead, 0, len);
- }
- }
- destPath.setLastModified(tarEntry.getLastModifiedDate().getTime());
- btoRead = null;
- }
- tarEntry = tarIn.getNextTarEntry();
- }
- }
- }
-
- public static void delete(File file) throws IOException {
- if (!file.exists()) {
- System.out.println("ERROR: ファイルまたはディレクトリが見つかりませんでした。");
- throw new IOException("File not found.");
- }
-
- if (file.isDirectory()) {
- File files[] = file.listFiles();
- if (files != null) {
- for (File file1 : files) {
- delete(file1); // 再帰呼び出し
- }
- }
- }
- if (!file.delete()) {
- System.out.println("ERROR: ファイルは削除できませんでした。 '" + file.getAbsolutePath() +"'");
- }
- }
-}
\ No newline at end of file
diff --git a/importPicture/test/osm/jp/gpx/RestampTest.java b/importPicture/test/osm/jp/gpx/RestampTest.java
deleted file mode 100644
index caa8c3c..0000000
--- a/importPicture/test/osm/jp/gpx/RestampTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package osm.jp.gpx;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author yuu
- */
-public class RestampTest {
-
- public RestampTest() {
- }
-
- @BeforeClass
- public static void setUpClass() {
- }
-
- @AfterClass
- public static void tearDownClass() {
- }
-
- @Before
- public void setUp() {
- }
-
- @After
- public void tearDown() {
- }
-
- /**
- * Test of main method, of class Restamp.
- */
- @Test
- public void testMain() {
- try {
- System.out.println("main");
- String[] argv = new String[]{
- "/home/yuu/Desktop/OSM/20180325_横浜新道/img",
- "000033.jpg",
- "2018-03-25_12:20:32",
- "003752.jpg",
- "2018-03-25_13:22:42"
- };
- Restamp.main(argv);
- }
- catch (Exception e) {
- fail();
- }
- }
-
-}
diff --git a/importPicture/test/osm/jp/gpx/UnZip.java b/importPicture/test/osm/jp/gpx/UnZip.java
deleted file mode 100644
index 2b6a72f..0000000
--- a/importPicture/test/osm/jp/gpx/UnZip.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package osm.jp.gpx;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-public class UnZip {
-
- /**
- * Zipファイルを展開します
- * @param aZipFile zipファイル
- * @param aOutDir 出力先ディレクトリ
- * @throws java.io.IOException
- */
- public static void decode(File aZipFile, String aOutDir) throws IOException {
- FileInputStream fileIn = null;
- FileOutputStream fileOut = null;
- ZipInputStream zipIn = null;
-
- try {
- File outDir = new File(aOutDir);
- outDir.mkdirs();
-
- fileIn = new FileInputStream(aZipFile);
- zipIn = new ZipInputStream(fileIn);
-
- ZipEntry entry = null;
- while ((entry = zipIn.getNextEntry()) != null) {
- if (entry.isDirectory()) {
- String relativePath = entry.getName();
- outDir = new File(outDir, relativePath);
- outDir.mkdirs();
- }
- else {
- String relativePath = entry.getName();
- File outFile = new File( outDir, relativePath );
-
- File parentFile = outFile.getParentFile();
- parentFile.mkdirs();
-
- fileOut = new FileOutputStream( outFile );
-
- byte[] buf = new byte[ 256 ];
- int size = 0;
- while ((size = zipIn.read(buf)) > 0){
- fileOut.write(buf, 0, size);
- }
- fileOut.close();
- fileOut = null;
- }
- zipIn.closeEntry();
- }
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- finally {
- if (fileIn != null) {
- try {
- fileIn.close();
- }
- catch (IOException e) {}
- }
- if (fileOut != null) {
- try {
- fileOut.close();
- }
- catch(IOException e) {}
- }
- zipIn.close();
- }
- }
-}
diff --git a/importPicture/testdata/20170517.gpx b/importPicture/testdata/20170517.gpx
deleted file mode 100644
index d1c827b..0000000
--- a/importPicture/testdata/20170517.gpx
+++ /dev/null
@@ -1,7424 +0,0 @@
-
-
-
- ACTIVE LOG095807
-
-
- 40.664
-
-
-
- 39.233
-
-
-
- 38.879
-
-
-
- 39.321
-
-
-
- 38.839
-
-
-
- 33.392
-
-
-
- 29.491
-
-
-
- 27.843
-
-
-
- 25.357
-
-
-
- 23.539
-
-
-
- 22.851
-
-
-
- 21.926
-
-
-
- 21.243
-
-
-
- 20.950
-
-
-
- 21.018
-
-
-
- 21.071
-
-
-
- 21.837
-
-
-
- 21.948
-
-
-
- 22.006
-
-
-
- 21.446
-
-
-
- 21.410
-
-
-
- 21.952
-
-
-
- 23.713
-
-
-
- 24.738
-
-
-
- 25.244
-
-
-
- 25.777
-
-
-
- 25.996
-
-
-
- 26.247
-
-
-
- 26.379
-
-
-
- 26.517
-
-
-
- 26.728
-
-
-
- 26.927
-
-
-
- 27.188
-
-
-
- 27.789
-
-
-
- 28.672
-
-
-
- 28.999
-
-
-
- 29.350
-
-
-
- 29.730
-
-
-
- 30.171
-
-
-
- 30.468
-
-
-
- 30.764
-
-
-
- 30.900
-
-
-
- 31.151
-
-
-
- 31.440
-
-
-
- 31.928
-
-
-
- 32.253
-
-
-
- 32.387
-
-
-
- 32.626
-
-
-
- 32.832
-
-
-
- 32.886
-
-
-
- 32.980
-
-
-
- 33.004
-
-
-
- 33.093
-
-
-
- 33.046
-
-
-
- 33.043
-
-
-
- 33.013
-
-
-
- 33.147
-
-
-
- 33.131
-
-
-
- 33.188
-
-
-
- 33.329
-
-
-
- 33.488
-
-
-
- 33.635
-
-
-
- 33.751
-
-
-
- 33.625
-
-
-
- 33.551
-
-
-
- 33.481
-
-
-
- 33.369
-
-
-
- 33.316
-
-
-
- 33.258
-
-
-
- 33.150
-
-
-
- 33.026
-
-
-
- 32.984
-
-
-
- 32.930
-
-
-
- 32.927
-
-
-
- 32.947
-
-
-
- 32.850
-
-
-
- 32.994
-
-
-
- 33.009
-
-
-
- 33.069
-
-
-
- 33.247
-
-
-
- 33.735
-
-
-
- 34.147
-
-
-
- 34.563
-
-
-
- 35.077
-
-
-
- 35.376
-
-
-
- 35.896
-
-
-
- 36.311
-
-
-
- 36.825
-
-
-
- 37.205
-
-
-
- 37.355
-
-
-
- 37.317
-
-
-
- 37.305
-
-
-
- 37.035
-
-
-
- 36.754
-
-
-
- 36.628
-
-
-
- 36.487
-
-
-
- 36.456
-
-
-
- 36.411
-
-
-
- 36.394
-
-
-
- 36.369
-
-
-
- 36.372
-
-
-
- 36.332
-
-
-
- 36.372
-
-
-
- 36.407
-
-
-
- 36.541
-
-
-
- 36.665
-
-
-
- 36.710
-
-
-
- 36.797
-
-
-
- 36.882
-
-
-
- 36.811
-
-
-
- 36.768
-
-
-
- 36.847
-
-
-
- 36.919
-
-
-
- 36.956
-
-
-
- 37.005
-
-
-
- 37.137
-
-
-
- 37.220
-
-
-
- 37.381
-
-
-
- 37.547
-
-
-
- 37.699
-
-
-
- 37.851
-
-
-
- 37.931
-
-
-
- 38.114
-
-
-
- 38.373
-
-
-
- 38.559
-
-
-
- 38.607
-
-
-
- 38.673
-
-
-
- 38.791
-
-
-
- 39.014
-
-
-
- 39.180
-
-
-
- 39.230
-
-
-
- 39.412
-
-
-
- 39.472
-
-
-
- 39.616
-
-
-
- 39.769
-
-
-
- 39.872
-
-
-
- 39.996
-
-
-
- 40.143
-
-
-
- 40.299
-
-
-
- 40.497
-
-
-
- 41.021
-
-
-
- 41.277
-
-
-
- 41.379
-
-
-
- 41.479
-
-
-
- 41.683
-
-
-
- 41.926
-
-
-
- 42.022
-
-
-
- 42.184
-
-
-
- 42.303
-
-
-
- 42.385
-
-
-
- 42.511
-
-
-
- 42.651
-
-
-
- 42.794
-
-
-
- 42.889
-
-
-
- 42.846
-
-
-
- 42.865
-
-
-
- 42.776
-
-
-
- 42.888
-
-
-
- 42.905
-
-
-
- 42.919
-
-
-
- 43.000
-
-
-
- 42.792
-
-
-
- 42.476
-
-
-
- 42.003
-
-
-
- 41.724
-
-
-
- 41.350
-
-
-
- 41.085
-
-
-
- 40.979
-
-
-
- 41.179
-
-
-
- 41.260
-
-
-
- 41.141
-
-
-
- 40.948
-
-
-
- 40.745
-
-
-
- 40.618
-
-
-
- 40.517
-
-
-
- 40.465
-
-
-
- 40.349
-
-
-
- 40.321
-
-
-
- 40.320
-
-
-
- 40.322
-
-
-
- 40.301
-
-
-
- 40.230
-
-
-
- 40.109
-
-
-
- 40.063
-
-
-
- 39.991
-
-
-
- 39.926
-
-
-
- 39.906
-
-
-
- 39.859
-
-
-
- 39.803
-
-
-
- 39.742
-
-
-
- 39.660
-
-
-
- 39.584
-
-
-
- 39.467
-
-
-
- 39.359
-
-
-
- 39.248
-
-
-
- 39.123
-
-
-
- 38.997
-
-
-
- 38.797
-
-
-
- 38.679
-
-
-
- 38.523
-
-
-
- 38.370
-
-
-
- 38.201
-
-
-
- 38.114
-
-
-
- 37.945
-
-
-
- 37.790
-
-
-
- 37.650
-
-
-
- 37.517
-
-
-
- 37.347
-
-
-
- 37.285
-
-
-
- 37.277
-
-
-
- 37.175
-
-
-
- 37.096
-
-
-
- 37.054
-
-
-
- 37.028
-
-
-
- 37.036
-
-
-
- 37.115
-
-
-
- 37.475
-
-
-
- 37.929
-
-
-
- 38.381
-
-
-
- 38.858
-
-
-
- 39.276
-
-
-
- 39.211
-
-
-
- 39.698
-
-
-
- 40.199
-
-
-
- 40.495
-
-
-
- 40.550
-
-
-
- 40.849
-
-
-
- 41.138
-
-
-
- 41.453
-
-
-
- 41.665
-
-
-
- 41.661
-
-
-
- 41.468
-
-
-
- 41.545
-
-
-
- 41.579
-
-
-
- 41.347
-
-
-
- 41.316
-
-
-
- 41.252
-
-
-
- 41.279
-
-
-
- 41.266
-
-
-
- 41.412
-
-
-
- 41.487
-
-
-
- 41.656
-
-
-
- 41.799
-
-
-
- 41.907
-
-
-
- 41.986
-
-
-
- 42.079
-
-
-
- 42.164
-
-
-
- 42.160
-
-
-
- 42.134
-
-
-
- 42.131
-
-
-
- 42.177
-
-
-
- 42.245
-
-
-
- 42.389
-
-
-
- 42.409
-
-
-
- 42.360
-
-
-
- 42.338
-
-
-
- 42.326
-
-
-
- 42.228
-
-
-
- 42.171
-
-
-
- 42.094
-
-
-
- 41.977
-
-
-
- 41.841
-
-
-
- 41.697
-
-
-
- 41.640
-
-
-
- 41.520
-
-
-
- 41.331
-
-
-
- 41.126
-
-
-
- 40.994
-
-
-
- 40.847
-
-
-
- 40.697
-
-
-
- 40.633
-
-
-
- 40.587
-
-
-
- 40.541
-
-
-
- 40.579
-
-
-
- 40.656
-
-
-
- 40.613
-
-
-
- 40.698
-
-
-
- 40.878
-
-
-
- 41.058
-
-
-
- 41.361
-
-
-
- 41.584
-
-
-
- 41.848
-
-
-
- 42.017
-
-
-
- 42.139
-
-
-
- 42.308
-
-
-
- 42.405
-
-
-
- 42.546
-
-
-
- 42.779
-
-
-
- 43.059
-
-
-
- 43.270
-
-
-
- 43.487
-
-
-
- 43.619
-
-
-
- 43.647
-
-
-
- 43.695
-
-
-
- 43.911
-
-
-
- 44.085
-
-
-
- 44.282
-
-
-
- 44.443
-
-
-
- 44.526
-
-
-
- 44.606
-
-
-
- 44.597
-
-
-
- 44.636
-
-
-
- 44.653
-
-
-
- 44.646
-
-
-
- 44.613
-
-
-
- 44.547
-
-
-
- 44.514
-
-
-
- 44.507
-
-
-
- 44.588
-
-
-
- 44.672
-
-
-
- 44.771
-
-
-
- 44.836
-
-
-
- 44.401
-
-
-
- 43.828
-
-
-
- 43.220
-
-
-
- 42.716
-
-
-
- 42.360
-
-
-
- 41.916
-
-
-
- 41.555
-
-
-
- 41.251
-
-
-
- 41.055
-
-
-
- 40.848
-
-
-
- 40.610
-
-
-
- 40.449
-
-
-
- 40.209
-
-
-
- 40.076
-
-
-
- 39.950
-
-
-
- 39.787
-
-
-
- 39.653
-
-
-
- 39.630
-
-
-
- 39.666
-
-
-
- 39.699
-
-
-
- 39.761
-
-
-
- 39.829
-
-
-
- 39.642
-
-
-
- 39.475
-
-
-
- 39.373
-
-
-
- 39.158
-
-
-
- 39.068
-
-
-
- 38.738
-
-
-
- 38.153
-
-
-
- 37.802
-
-
-
- 37.555
-
-
-
- 37.495
-
-
-
- 37.467
-
-
-
- 37.267
-
-
-
- 37.168
-
-
-
- 37.014
-
-
-
- 36.991
-
-
-
- 37.025
-
-
-
- 37.258
-
-
-
- 37.450
-
-
-
- 37.539
-
-
-
- 37.657
-
-
-
- 37.915
-
-
-
- 38.135
-
-
-
- 38.268
-
-
-
- 38.347
-
-
-
- 38.839
-
-
-
- 39.324
-
-
-
- 40.132
-
-
-
- 40.520
-
-
-
- 40.870
-
-
-
- 41.369
-
-
-
- 41.794
-
-
-
- 42.125
-
-
-
- 42.442
-
-
-
- 42.734
-
-
-
- 42.860
-
-
-
- 42.983
-
-
-
- 42.748
-
-
-
- 42.571
-
-
-
- 42.612
-
-
-
- 42.745
-
-
-
- 42.837
-
-
-
- 43.037
-
-
-
- 43.107
-
-
-
- 43.143
-
-
-
- 43.270
-
-
-
- 43.301
-
-
-
- 43.399
-
-
-
- 43.426
-
-
-
- 43.440
-
-
-
- 43.851
-
-
-
- 44.299
-
-
-
- 44.742
-
-
-
- 45.096
-
-
-
- 45.428
-
-
-
- 45.743
-
-
-
- 46.031
-
-
-
- 46.297
-
-
-
- 46.553
-
-
-
- 46.829
-
-
-
- 47.422
-
-
-
- 47.829
-
-
-
- 48.229
-
-
-
- 48.421
-
-
-
- 48.472
-
-
-
- 48.153
-
-
-
- 47.834
-
-
-
- 47.527
-
-
-
- 47.219
-
-
-
- 46.905
-
-
-
- 46.813
-
-
-
- 46.613
-
-
-
- 46.267
-
-
-
- 45.942
-
-
-
- 45.556
-
-
-
- 44.920
-
-
-
- 44.293
-
-
-
- 43.799
-
-
-
- 43.457
-
-
-
- 43.186
-
-
-
- 42.969
-
-
-
- 42.824
-
-
-
- 42.639
-
-
-
- 42.483
-
-
-
- 42.300
-
-
-
- 42.044
-
-
-
- 41.847
-
-
-
- 41.637
-
-
-
- 41.640
-
-
-
- 41.587
-
-
-
- 41.516
-
-
-
- 41.483
-
-
-
- 41.535
-
-
-
- 41.659
-
-
-
- 41.685
-
-
-
- 41.766
-
-
-
- 42.210
-
-
-
- 42.301
-
-
-
- 42.382
-
-
-
- 42.281
-
-
-
- 42.049
-
-
-
- 41.841
-
-
-
- 42.034
-
-
-
- 42.050
-
-
-
- 41.929
-
-
-
- 41.987
-
-
-
- 42.106
-
-
-
- 42.025
-
-
-
- 41.852
-
-
-
- 41.728
-
-
-
- 41.696
-
-
-
- 41.327
-
-
-
- 40.883
-
-
-
- 40.517
-
-
-
- 40.207
-
-
-
- 39.915
-
-
-
- 39.907
-
-
-
- 39.602
-
-
-
- 39.313
-
-
-
- 39.141
-
-
-
- 39.092
-
-
-
- 39.047
-
-
-
- 39.029
-
-
-
- 38.989
-
-
-
- 39.013
-
-
-
- 38.991
-
-
-
- 38.990
-
-
-
- 39.029
-
-
-
- 38.960
-
-
-
- 38.874
-
-
-
- 38.899
-
-
-
- 38.936
-
-
-
- 39.058
-
-
-
- 39.104
-
-
-
- 39.094
-
-
-
- 38.996
-
-
-
- 38.947
-
-
-
- 38.925
-
-
-
- 39.151
-
-
-
- 39.465
-
-
-
- 39.586
-
-
-
- 39.703
-
-
-
- 40.138
-
-
-
- 40.662
-
-
-
- 41.192
-
-
-
- 41.629
-
-
-
- 42.375
-
-
-
- 42.770
-
-
-
- 43.177
-
-
-
- 43.239
-
-
-
- 43.490
-
-
-
- 43.438
-
-
-
- 43.457
-
-
-
- 43.305
-
-
-
- 43.285
-
-
-
- 43.225
-
-
-
- 43.381
-
-
-
- 43.595
-
-
-
- 43.859
-
-
-
- 44.067
-
-
-
- 44.236
-
-
-
- 44.112
-
-
-
- 44.019
-
-
-
- 43.993
-
-
-
- 44.105
-
-
-
- 44.284
-
-
-
- 44.516
-
-
-
- 44.575
-
-
-
- 44.536
-
-
-
- 44.643
-
-
-
- 44.768
-
-
-
- 44.944
-
-
-
- 45.034
-
-
-
- 45.161
-
-
-
- 45.343
-
-
-
- 45.341
-
-
-
- 45.464
-
-
-
- 45.617
-
-
-
- 45.929
-
-
-
- 46.152
-
-
-
- 46.550
-
-
-
- 46.608
-
-
-
- 46.623
-
-
-
- 46.807
-
-
-
- 46.977
-
-
-
- 47.310
-
-
-
- 47.566
-
-
-
- 47.877
-
-
-
- 48.052
-
-
-
- 48.425
-
-
-
- 48.767
-
-
-
- 48.944
-
-
-
- 49.163
-
-
-
- 49.439
-
-
-
- 49.639
-
-
-
- 49.745
-
-
-
- 49.866
-
-
-
- 50.015
-
-
-
- 50.109
-
-
-
- 50.278
-
-
-
- 50.509
-
-
-
- 50.645
-
-
-
- 50.573
-
-
-
- 50.453
-
-
-
- 50.484
-
-
-
- 50.370
-
-
-
- 50.354
-
-
-
- 50.221
-
-
-
- 50.036
-
-
-
- 50.042
-
-
-
- 49.978
-
-
-
- 49.869
-
-
-
- 49.838
-
-
-
- 49.849
-
-
-
- 50.060
-
-
-
- 50.202
-
-
-
- 50.237
-
-
-
- 50.207
-
-
-
- 50.339
-
-
-
- 50.523
-
-
-
- 50.655
-
-
-
- 50.660
-
-
-
- 50.793
-
-
-
- 50.930
-
-
-
- 51.033
-
-
-
- 51.274
-
-
-
- 51.551
-
-
-
- 51.875
-
-
-
- 52.266
-
-
-
- 52.353
-
-
-
- 52.493
-
-
-
- 52.511
-
-
-
- 52.499
-
-
-
- 52.531
-
-
-
- 52.621
-
-
-
- 52.573
-
-
-
- 52.744
-
-
-
- 52.962
-
-
-
- 53.055
-
-
-
- 53.044
-
-
-
- 52.736
-
-
-
- 52.528
-
-
-
- 51.923
-
-
-
- 51.675
-
-
-
- 51.379
-
-
-
- 50.930
-
-
-
- 50.432
-
-
-
- 49.866
-
-
-
- 49.351
-
-
-
- 48.938
-
-
-
- 48.732
-
-
-
- 48.347
-
-
-
- 48.059
-
-
-
- 47.887
-
-
-
- 47.905
-
-
-
- 47.867
-
-
-
- 47.775
-
-
-
- 47.753
-
-
-
- 47.799
-
-
-
- 47.821
-
-
-
- 47.968
-
-
-
- 48.137
-
-
-
- 48.291
-
-
-
- 48.310
-
-
-
- 48.506
-
-
-
- 48.597
-
-
-
- 48.621
-
-
-
- 48.595
-
-
-
- 48.791
-
-
-
- 48.786
-
-
-
- 48.625
-
-
-
- 48.441
-
-
-
- 48.258
-
-
-
- 48.099
-
-
-
- 47.948
-
-
-
- 47.758
-
-
-
- 47.478
-
-
-
- 47.214
-
-
-
- 46.950
-
-
-
- 46.681
-
-
-
- 46.660
-
-
-
- 46.663
-
-
-
- 46.668
-
-
-
- 46.694
-
-
-
- 46.665
-
-
-
- 46.668
-
-
-
- 46.819
-
-
-
- 46.881
-
-
-
- 46.901
-
-
-
- 47.044
-
-
-
- 47.168
-
-
-
- 47.389
-
-
-
- 47.518
-
-
-
- 47.706
-
-
-
- 47.911
-
-
-
- 48.163
-
-
-
- 48.356
-
-
-
- 48.566
-
-
-
- 48.835
-
-
-
- 48.967
-
-
-
- 49.096
-
-
-
- 49.239
-
-
-
- 49.264
-
-
-
- 49.170
-
-
-
- 49.126
-
-
-
- 49.068
-
-
-
- 48.951
-
-
-
- 48.853
-
-
-
- 48.699
-
-
-
- 48.604
-
-
-
- 48.609
-
-
-
- 48.563
-
-
-
- 48.577
-
-
-
- 48.629
-
-
-
- 48.695
-
-
-
- 48.678
-
-
-
- 48.663
-
-
-
- 48.703
-
-
-
- 48.697
-
-
-
- 48.538
-
-
-
- 48.390
-
-
-
- 48.290
-
-
-
- 48.191
-
-
-
- 48.204
-
-
-
- 48.046
-
-
-
- 48.017
-
-
-
- 47.955
-
-
-
- 47.992
-
-
-
- 48.084
-
-
-
- 48.043
-
-
-
- 48.015
-
-
-
- 47.894
-
-
-
- 47.619
-
-
-
- 47.161
-
-
-
- 46.575
-
-
-
- 46.205
-
-
-
- 45.835
-
-
-
- 45.523
-
-
-
- 45.079
-
-
-
- 44.767
-
-
-
- 44.311
-
-
-
- 43.782
-
-
-
- 43.408
-
-
-
- 43.029
-
-
-
- 42.626
-
-
-
- 42.348
-
-
-
- 42.115
-
-
-
- 41.978
-
-
-
- 41.780
-
-
-
- 41.663
-
-
-
- 41.571
-
-
-
- 41.317
-
-
-
- 41.343
-
-
-
- 41.144
-
-
-
- 40.981
-
-
-
- 40.775
-
-
-
- 40.604
-
-
-
- 40.499
-
-
-
- 40.312
-
-
-
- 40.080
-
-
-
- 39.698
-
-
-
- 39.244
-
-
-
- 38.720
-
-
-
- 38.276
-
-
-
- 37.955
-
-
-
- 37.817
-
-
-
- 37.742
-
-
-
- 37.671
-
-
-
- 37.554
-
-
-
- 37.360
-
-
-
- 37.225
-
-
-
- 37.069
-
-
-
- 36.985
-
-
-
- 36.829
-
-
-
- 36.675
-
-
-
- 36.509
-
-
-
- 36.535
-
-
-
- 36.547
-
-
-
- 36.625
-
-
-
- 36.874
-
-
-
- 37.195
-
-
-
- 37.556
-
-
-
- 37.900
-
-
-
- 38.360
-
-
-
- 38.643
-
-
-
- 38.760
-
-
-
- 38.827
-
-
-
- 38.840
-
-
-
- 38.962
-
-
-
- 39.041
-
-
-
- 39.009
-
-
-
- 39.030
-
-
-
- 38.873
-
-
-
- 38.615
-
-
-
- 38.388
-
-
-
- 38.230
-
-
-
- 38.115
-
-
-
- 38.010
-
-
-
- 37.807
-
-
-
- 37.787
-
-
-
- 37.905
-
-
-
- 38.007
-
-
-
- 37.725
-
-
-
- 37.532
-
-
-
- 37.387
-
-
-
- 37.247
-
-
-
- 36.977
-
-
-
- 36.675
-
-
-
- 36.425
-
-
-
- 36.034
-
-
-
- 35.895
-
-
-
- 35.680
-
-
-
- 35.283
-
-
-
- 34.903
-
-
-
- 34.366
-
-
-
- 34.209
-
-
-
- 34.153
-
-
-
- 34.238
-
-
-
- 34.424
-
-
-
- 35.003
-
-
-
- 35.137
-
-
-
- 35.554
-
-
-
- 35.751
-
-
-
- 35.857
-
-
-
- 35.832
-
-
-
- 35.690
-
-
-
- 35.363
-
-
-
- 35.161
-
-
-
- 34.925
-
-
-
- 34.590
-
-
-
- 34.507
-
-
-
- 34.579
-
-
-
- 34.646
-
-
-
- 34.202
-
-
-
- 33.714
-
-
-
- 33.249
-
-
-
- 32.925
-
-
-
- 32.654
-
-
-
- 32.537
-
-
-
- 32.292
-
-
-
- 32.320
-
-
-
- 32.347
-
-
-
- 32.402
-
-
-
- 32.454
-
-
-
- 32.593
-
-
-
- 32.701
-
-
-
- 32.792
-
-
-
- 33.014
-
-
-
- 33.367
-
-
-
- 33.471
-
-
-
- 33.512
-
-
-
- 33.611
-
-
-
- 33.768
-
-
-
- 33.941
-
-
-
- 34.157
-
-
-
- 34.340
-
-
-
- 34.404
-
-
-
- 34.448
-
-
-
- 34.406
-
-
-
- 34.360
-
-
-
- 34.352
-
-
-
- 34.413
-
-
-
- 34.587
-
-
-
- 34.857
-
-
-
- 35.182
-
-
-
- 35.582
-
-
-
- 35.865
-
-
-
- 36.151
-
-
-
- 36.355
-
-
-
- 36.611
-
-
-
- 36.769
-
-
-
- 36.831
-
-
-
- 36.927
-
-
-
- 37.115
-
-
-
- 37.285
-
-
-
- 37.506
-
-
-
- 37.798
-
-
-
- 37.972
-
-
-
- 38.044
-
-
-
- 38.084
-
-
-
- 37.938
-
-
-
- 37.771
-
-
-
- 37.676
-
-
-
- 37.814
-
-
-
- 37.971
-
-
-
- 38.099
-
-
-
- 38.301
-
-
-
- 38.454
-
-
-
- 38.647
-
-
-
- 38.880
-
-
-
- 38.805
-
-
-
- 38.721
-
-
-
- 38.872
-
-
-
- 38.581
-
-
-
- 38.344
-
-
-
- 38.362
-
-
-
- 38.454
-
-
-
- 38.298
-
-
-
- 38.435
-
-
-
- 38.958
-
-
-
- 39.500
-
-
-
- 40.237
-
-
-
- 40.769
-
-
-
- 41.283
-
-
-
- 41.642
-
-
-
- 41.872
-
-
-
- 42.038
-
-
-
- 42.171
-
-
-
- 42.483
-
-
-
- 42.594
-
-
-
- 42.710
-
-
-
- 42.900
-
-
-
- 43.132
-
-
-
- 43.344
-
-
-
- 43.555
-
-
-
- 43.735
-
-
-
- 43.792
-
-
-
- 43.983
-
-
-
- 44.176
-
-
-
- 44.287
-
-
-
- 44.276
-
-
-
- 44.419
-
-
-
- 44.511
-
-
-
- 44.615
-
-
-
- 44.709
-
-
-
- 44.885
-
-
-
- 45.040
-
-
-
- 45.170
-
-
-
- 45.263
-
-
-
- 45.436
-
-
-
- 45.577
-
-
-
- 45.812
-
-
-
- 45.830
-
-
-
- 45.995
-
-
-
- 46.197
-
-
-
- 46.335
-
-
-
- 46.428
-
-
-
- 46.530
-
-
-
- 46.673
-
-
-
- 46.616
-
-
-
- 46.708
-
-
-
- 46.923
-
-
-
- 46.972
-
-
-
- 46.828
-
-
-
- 46.696
-
-
-
- 46.704
-
-
-
- 46.834
-
-
-
- 46.848
-
-
-
- 46.600
-
-
-
- 46.061
-
-
-
- 45.772
-
-
-
- 45.569
-
-
-
- 45.614
-
-
-
- 45.638
-
-
-
- 45.678
-
-
-
- 45.617
-
-
-
- 45.521
-
-
-
- 45.451
-
-
-
- 45.506
-
-
-
- 45.565
-
-
-
- 45.546
-
-
-
- 45.487
-
-
-
- 45.509
-
-
-
- 45.582
-
-
-
- 45.559
-
-
-
- 45.583
-
-
-
- 45.831
-
-
-
- 45.840
-
-
-
- 45.928
-
-
-
- 46.265
-
-
-
- 46.540
-
-
-
- 46.794
-
-
-
- 47.035
-
-
-
- 47.348
-
-
-
- 47.248
-
-
-
- 47.115
-
-
-
- 46.923
-
-
-
- 47.109
-
-
-
- 47.281
-
-
-
- 47.452
-
-
-
- 47.614
-
-
-
- 47.839
-
-
-
- 47.937
-
-
-
- 47.914
-
-
-
- 48.199
-
-
-
- 48.299
-
-
-
- 48.352
-
-
-
- 48.350
-
-
-
- 48.141
-
-
-
- 47.961
-
-
-
- 47.650
-
-
-
- 47.839
-
-
-
- 47.986
-
-
-
- 48.098
-
-
-
- 48.659
-
-
-
- 49.055
-
-
-
- 49.979
-
-
-
- 50.733
-
-
-
- 51.367
-
-
-
- 51.843
-
-
-
- 52.252
-
-
-
- 52.567
-
-
-
- 53.182
-
-
-
- 53.715
-
-
-
- 53.734
-
-
-
- 53.753
-
-
-
- 53.521
-
-
-
- 53.300
-
-
-
- 53.001
-
-
-
- 52.755
-
-
-
- 52.799
-
-
-
- 52.925
-
-
-
- 52.804
-
-
-
- 52.680
-
-
-
- 52.397
-
-
-
- 51.878
-
-
-
- 51.405
-
-
-
- 51.120
-
-
-
- 50.998
-
-
-
- 50.933
-
-
-
- 50.914
-
-
-
- 50.876
-
-
-
- 50.798
-
-
-
- 50.727
-
-
-
- 50.623
-
-
-
- 50.337
-
-
-
- 50.201
-
-
-
- 49.986
-
-
-
- 49.801
-
-
-
- 49.610
-
-
-
- 49.464
-
-
-
- 49.302
-
-
-
- 49.118
-
-
-
- 48.779
-
-
-
- 48.451
-
-
-
- 48.225
-
-
-
- 47.963
-
-
-
- 47.715
-
-
-
- 47.583
-
-
-
- 47.773
-
-
-
- 47.724
-
-
-
- 47.796
-
-
-
- 47.798
-
-
-
- 47.889
-
-
-
- 48.025
-
-
-
- 48.122
-
-
-
- 48.137
-
-
-
- 48.093
-
-
-
- 47.997
-
-
-
- 47.996
-
-
-
- 47.878
-
-
-
- 47.799
-
-
-
- 47.790
-
-
-
- 47.817
-
-
-
- 47.902
-
-
-
- 48.038
-
-
-
- 48.167
-
-
-
- 48.153
-
-
-
- 48.156
-
-
-
- 48.010
-
-
-
- 47.634
-
-
-
- 47.267
-
-
-
- 46.826
-
-
-
- 46.591
-
-
-
- 46.083
-
-
-
- 45.630
-
-
-
- 45.151
-
-
-
- 44.686
-
-
-
- 44.406
-
-
-
- 44.208
-
-
-
- 44.112
-
-
-
- 44.059
-
-
-
- 43.945
-
-
-
- 43.759
-
-
-
- 43.492
-
-
-
- 43.286
-
-
-
- 43.113
-
-
-
- 42.729
-
-
-
- 42.252
-
-
-
- 41.756
-
-
-
- 41.507
-
-
-
- 41.329
-
-
-
- 41.210
-
-
-
- 41.026
-
-
-
- 40.800
-
-
-
- 40.420
-
-
-
- 40.066
-
-
-
- 39.753
-
-
-
- 39.580
-
-
-
- 39.375
-
-
-
- 39.426
-
-
-
- 39.536
-
-
-
- 39.481
-
-
-
- 39.485
-
-
-
- 39.510
-
-
-
- 39.664
-
-
-
- 39.748
-
-
-
- 39.834
-
-
-
- 39.741
-
-
-
- 39.646
-
-
-
- 39.501
-
-
-
- 39.408
-
-
-
- 39.233
-
-
-
- 39.098
-
-
-
- 38.977
-
-
-
- 38.913
-
-
-
- 38.764
-
-
-
- 38.580
-
-
-
- 38.273
-
-
-
- 38.219
-
-
-
- 38.189
-
-
-
- 38.687
-
-
-
- 39.031
-
-
-
- 39.385
-
-
-
- 39.770
-
-
-
- 40.104
-
-
-
- 40.340
-
-
-
- 40.536
-
-
-
- 40.772
-
-
-
- 40.866
-
-
-
- 40.900
-
-
-
- 40.956
-
-
-
- 40.894
-
-
-
- 40.882
-
-
-
- 40.951
-
-
-
- 40.880
-
-
-
- 40.961
-
-
-
- 41.005
-
-
-
- 41.008
-
-
-
- 41.220
-
-
-
- 41.278
-
-
-
- 41.398
-
-
-
- 41.418
-
-
-
- 41.484
-
-
-
- 41.523
-
-
-
- 41.745
-
-
-
- 42.505
-
-
-
- 42.776
-
-
-
- 42.953
-
-
-
- 43.218
-
-
-
- 43.214
-
-
-
- 43.060
-
-
-
- 42.884
-
-
-
- 42.603
-
-
-
- 42.629
-
-
-
- 42.956
-
-
-
- 43.269
-
-
-
- 43.642
-
-
-
- 43.882
-
-
-
- 44.223
-
-
-
- 44.649
-
-
-
- 45.193
-
-
-
- 45.906
-
-
-
- 46.143
-
-
-
- 46.359
-
-
-
- 46.540
-
-
-
- 46.651
-
-
-
- 46.731
-
-
-
- 46.786
-
-
-
- 46.721
-
-
-
- 46.687
-
-
-
- 46.561
-
-
-
- 46.255
-
-
-
- 46.158
-
-
-
- 45.891
-
-
-
- 45.615
-
-
-
- 45.250
-
-
-
- 44.972
-
-
-
- 44.731
-
-
-
- 44.390
-
-
-
- 44.244
-
-
-
- 44.279
-
-
-
- 44.496
-
-
-
- 44.925
-
-
-
- 45.250
-
-
-
- 45.538
-
-
-
- 45.777
-
-
-
- 46.004
-
-
-
- 46.200
-
-
-
- 46.409
-
-
-
- 46.541
-
-
-
- 46.777
-
-
-
- 46.972
-
-
-
- 47.129
-
-
-
- 47.111
-
-
-
- 46.998
-
-
-
- 46.835
-
-
-
- 46.638
-
-
-
- 46.649
-
-
-
- 46.451
-
-
-
- 46.227
-
-
-
- 46.090
-
-
-
- 45.891
-
-
-
- 45.656
-
-
-
- 45.425
-
-
-
- 45.143
-
-
-
- 45.043
-
-
-
- 44.836
-
-
-
- 44.999
-
-
-
- 45.050
-
-
-
- 44.657
-
-
-
- 44.338
-
-
-
- 44.396
-
-
-
- 43.953
-
-
-
- 42.954
-
-
-
- 41.928
-
-
-
- 41.104
-
-
-
- 40.646
-
-
-
- 40.444
-
-
-
- 40.435
-
-
-
- 40.702
-
-
-
- 40.795
-
-
-
- 40.906
-
-
-
- 40.992
-
-
-
- 41.088
-
-
-
- 41.245
-
-
-
- 41.384
-
-
-
- 41.415
-
-
-
- 41.429
-
-
-
- 41.396
-
-
-
- 41.438
-
-
-
- 41.423
-
-
-
- 41.611
-
-
-
- 41.561
-
-
-
- 41.540
-
-
-
- 41.447
-
-
-
- 41.416
-
-
-
- 41.528
-
-
-
- 41.720
-
-
-
- 41.896
-
-
-
- 42.176
-
-
-
- 42.383
-
-
-
- 42.612
-
-
-
- 42.722
-
-
-
- 42.836
-
-
-
- 42.928
-
-
-
- 43.070
-
-
-
- 43.216
-
-
-
- 43.559
-
-
-
- 43.781
-
-
-
- 43.752
-
-
-
- 43.846
-
-
-
- 44.097
-
-
-
- 44.196
-
-
-
- 44.396
-
-
-
- 44.352
-
-
-
- 44.205
-
-
-
- 44.103
-
-
-
- 44.068
-
-
-
- 44.394
-
-
-
- 44.678
-
-
-
- 44.884
-
-
-
- 45.103
-
-
-
- 45.236
-
-
-
- 45.247
-
-
-
- 45.345
-
-
-
- 45.382
-
-
-
- 45.476
-
-
-
- 45.539
-
-
-
- 45.527
-
-
-
- 45.522
-
-
-
- 45.757
-
-
-
- 45.979
-
-
-
- 45.929
-
-
-
- 46.152
-
-
-
- 46.447
-
-
-
- 46.762
-
-
-
- 46.952
-
-
-
- 46.870
-
-
-
- 46.721
-
-
-
- 46.964
-
-
-
- 47.261
-
-
-
- 47.241
-
-
-
- 47.319
-
-
-
- 47.448
-
-
-
- 47.467
-
-
-
- 47.494
-
-
-
- 47.382
-
-
-
- 47.275
-
-
-
- 47.156
-
-
-
- 47.028
-
-
-
- 46.925
-
-
-
- 46.669
-
-
-
- 46.455
-
-
-
- 46.466
-
-
-
- 46.507
-
-
-
- 46.472
-
-
-
- 46.667
-
-
-
- 46.974
-
-
-
- 47.207
-
-
-
- 47.416
-
-
-
- 47.513
-
-
-
- 47.658
-
-
-
- 48.004
-
-
-
- 48.202
-
-
-
- 48.379
-
-
-
- 48.706
-
-
-
- 48.930
-
-
-
- 49.078
-
-
-
- 49.055
-
-
-
- 48.818
-
-
-
- 48.802
-
-
-
- 48.904
-
-
-
- 48.885
-
-
-
- 48.742
-
-
-
- 48.749
-
-
-
- 48.660
-
-
-
- 48.486
-
-
-
- 48.287
-
-
-
- 48.205
-
-
-
- 48.179
-
-
-
- 48.165
-
-
-
- 48.157
-
-
-
- 48.141
-
-
-
- 48.080
-
-
-
- 48.205
-
-
-
- 48.385
-
-
-
- 48.359
-
-
-
- 48.352
-
-
-
- 48.320
-
-
-
- 48.157
-
-
-
- 48.050
-
-
-
- 47.917
-
-
-
- 47.847
-
-
-
- 47.710
-
-
-
- 47.266
-
-
-
- 46.381
-
-
-
- 46.068
-
-
-
- 45.794
-
-
-
- 45.476
-
-
-
- 45.183
-
-
-
- 44.849
-
-
-
- 44.385
-
-
-
- 43.999
-
-
-
- 43.599
-
-
-
- 43.129
-
-
-
- 42.602
-
-
-
- 42.314
-
-
-
- 42.176
-
-
-
- 42.184
-
-
-
- 42.285
-
-
-
- 42.245
-
-
-
- 42.061
-
-
-
- 41.722
-
-
-
- 41.410
-
-
-
- 41.223
-
-
-
- 41.281
-
-
-
- 41.251
-
-
-
- 41.076
-
-
-
- 40.892
-
-
-
- 40.789
-
-
-
- 40.720
-
-
-
- 41.042
-
-
-
- 41.641
-
-
-
- 41.876
-
-
-
- 42.021
-
-
-
- 42.171
-
-
-
- 42.251
-
-
-
- 42.544
-
-
-
- 42.800
-
-
-
- 43.038
-
-
-
- 43.481
-
-
-
- 43.870
-
-
-
- 44.068
-
-
-
- 44.149
-
-
-
- 44.273
-
-
-
- 44.492
-
-
-
- 44.670
-
-
-
- 44.856
-
-
-
- 45.062
-
-
-
- 45.170
-
-
-
- 45.377
-
-
-
- 45.631
-
-
-
- 45.866
-
-
-
- 46.062
-
-
-
- 46.273
-
-
-
- 46.333
-
-
-
- 46.382
-
-
-
- 46.369
-
-
-
- 46.285
-
-
-
- 46.222
-
-
-
- 46.102
-
-
-
- 46.228
-
-
-
- 46.310
-
-
-
- 46.403
-
-
-
- 46.781
-
-
-
- 46.969
-
-
-
- 47.139
-
-
-
- 47.007
-
-
-
- 46.898
-
-
-
- 46.736
-
-
-
- 46.469
-
-
-
- 46.244
-
-
-
- 46.041
-
-
-
- 45.806
-
-
-
- 45.662
-
-
-
- 45.486
-
-
-
- 45.283
-
-
-
- 45.006
-
-
-
- 44.720
-
-
-
- 44.581
-
-
-
- 44.499
-
-
-
- 44.436
-
-
-
- 44.385
-
-
-
- 44.369
-
-
-
- 44.396
-
-
-
- 44.511
-
-
-
- 44.601
-
-
-
- 44.506
-
-
-
- 44.357
-
-
-
- 44.180
-
-
-
- 43.865
-
-
-
- 43.480
-
-
-
- 43.060
-
-
-
- 42.477
-
-
-
- 41.853
-
-
-
- 41.170
-
-
-
- 40.541
-
-
-
- 39.945
-
-
-
- 39.408
-
-
-
- 38.792
-
-
-
- 38.416
-
-
-
- 38.152
-
-
-
- 37.904
-
-
-
- 37.859
-
-
-
- 37.887
-
-
-
- 37.970
-
-
-
- 37.985
-
-
-
- 37.845
-
-
-
- 37.792
-
-
-
- 37.766
-
-
-
- 37.772
-
-
-
- 37.897
-
-
-
- 37.929
-
-
-
- 37.973
-
-
-
- 38.074
-
-
-
- 38.098
-
-
-
- 37.903
-
-
-
- 37.676
-
-
-
- 37.564
-
-
-
- 37.504
-
-
-
- 37.346
-
-
-
- 37.390
-
-
-
- 37.358
-
-
-
- 37.452
-
-
-
- 37.514
-
-
-
- 37.640
-
-
-
- 37.709
-
-
-
- 37.763
-
-
-
- 37.713
-
-
-
- 37.614
-
-
-
- 37.519
-
-
-
- 37.431
-
-
-
- 37.281
-
-
-
- 37.222
-
-
-
- 37.245
-
-
-
- 37.285
-
-
-
- 37.606
-
-
-
- 38.125
-
-
-
- 38.653
-
-
-
- 39.235
-
-
-
- 39.941
-
-
-
- 40.455
-
-
-
- 40.935
-
-
-
- 41.337
-
-
-
- 41.852
-
-
-
- 42.353
-
-
-
- 42.658
-
-
-
- 42.839
-
-
-
- 43.117
-
-
-
- 43.409
-
-
-
- 43.698
-
-
-
- 43.812
-
-
-
- 43.965
-
-
-
- 44.263
-
-
-
- 44.420
-
-
-
- 44.399
-
-
-
- 44.179
-
-
-
- 43.868
-
-
-
- 43.340
-
-
-
- 43.039
-
-
-
- 42.958
-
-
-
- 42.895
-
-
-
- 42.811
-
-
-
- 42.574
-
-
-
- 42.665
-
-
-
- 42.412
-
-
-
- 42.268
-
-
-
- 42.151
-
-
-
- 42.007
-
-
-
- 41.721
-
-
-
- 41.389
-
-
-
- 41.151
-
-
-
- 41.118
-
-
-
- 41.081
-
-
-
- 40.979
-
-
-
- 40.911
-
-
-
- 40.636
-
-
-
- 40.299
-
-
-
- 39.840
-
-
-
- 39.392
-
-
-
- 39.100
-
-
-
- 38.982
-
-
-
- 38.995
-
-
-
- 39.355
-
-
-
- 40.049
-
-
-
- 40.375
-
-
-
- 40.529
-
-
-
- 40.501
-
-
-
- 40.646
-
-
-
- 40.607
-
-
-
- 40.620
-
-
-
- 40.190
-
-
-
- 39.632
-
-
-
- 39.168
-
-
-
- 38.836
-
-
-
- 38.879
-
-
-
- 39.055
-
-
-
- 39.289
-
-
-
- 39.617
-
-
-
- 39.820
-
-
-
- 39.682
-
-
-
- 39.541
-
-
-
- 39.332
-
-
-
- 39.175
-
-
-
- 39.205
-
-
-
- 39.304
-
-
-
- 39.411
-
-
-
- 39.527
-
-
-
- 39.497
-
-
-
- 39.432
-
-
-
- 39.386
-
-
-
- 39.265
-
-
-
- 39.096
-
-
-
- 39.025
-
-
-
- 38.919
-
-
-
- 38.878
-
-
-
- 38.834
-
-
-
- 38.704
-
-
-
- 38.765
-
-
-
- 39.124
-
-
-
- 39.160
-
-
-
- 39.240
-
-
-
- 39.373
-
-
-
- 39.397
-
-
-
- 39.334
-
-
-
- 39.280
-
-
-
- 39.455
-
-
-
- 39.397
-
-
-
- 38.954
-
-
-
- 38.375
-
-
-
- 37.750
-
-
-
- 37.243
-
-
-
- 36.726
-
-
-
- 36.261
-
-
-
- 36.067
-
-
-
- 35.847
-
-
-
- 35.559
-
-
-
- 35.226
-
-
-
- 34.892
-
-
-
- 34.558
-
-
-
- 34.128
-
-
-
- 33.710
-
-
-
- 33.277
-
-
-
- 32.855
-
-
-
- 32.777
-
-
-
- 33.038
-
-
-
- 33.068
-
-
-
- 33.330
-
-
-
- 33.537
-
-
-
- 33.767
-
-
-
- 34.059
-
-
-
- 34.409
-
-
-
- 35.030
-
-
-
- 35.367
-
-
-
- 35.550
-
-
-
- 35.569
-
-
-
- 35.544
-
-
-
- 35.691
-
-
-
- 35.754
-
-
-
- 35.863
-
-
-
- 35.931
-
-
-
- 35.987
-
-
-
- 36.202
-
-
-
- 36.336
-
-
-
- 36.422
-
-
-
- 36.473
-
-
-
- 36.533
-
-
-
- 36.596
-
-
-
- 36.592
-
-
-
- 36.553
-
-
-
- 36.517
-
-
-
- 36.615
-
-
-
- 36.825
-
-
-
- 37.056
-
-
-
- 37.158
-
-
-
- 37.310
-
-
-
- 37.532
-
-
-
- 37.683
-
-
-
- 37.895
-
-
-
- 38.063
-
-
-
- 38.140
-
-
-
- 38.239
-
-
-
- 38.328
-
-
-
- 38.374
-
-
-
- 38.537
-
-
-
- 38.729
-
-
-
- 38.853
-
-
-
- 38.903
-
-
-
- 38.957
-
-
-
- 39.109
-
-
-
- 39.277
-
-
-
- 39.384
-
-
-
- 39.480
-
-
-
- 39.727
-
-
-
- 39.897
-
-
-
- 40.257
-
-
-
- 40.524
-
-
-
- 40.774
-
-
-
- 41.107
-
-
-
- 41.518
-
-
-
- 41.744
-
-
-
- 42.107
-
-
-
- 42.380
-
-
-
- 42.670
-
-
-
- 43.062
-
-
-
- 43.384
-
-
-
- 43.738
-
-
-
- 44.182
-
-
-
- 44.374
-
-
-
- 44.656
-
-
-
- 44.974
-
-
-
- 45.396
-
-
-
- 45.773
-
-
-
- 46.146
-
-
-
- 46.609
-
-
-
- 46.920
-
-
-
- 47.206
-
-
-
- 47.525
-
-
-
- 47.555
-
-
-
- 47.619
-
-
-
- 47.695
-
-
-
- 47.819
-
-
-
- 47.928
-
-
-
- 47.957
-
-
-
- 48.102
-
-
-
- 48.201
-
-
-
- 48.368
-
-
-
- 48.317
-
-
-
- 48.352
-
-
-
- 48.240
-
-
-
- 48.139
-
-
-
- 48.078
-
-
-
- 48.027
-
-
-
- 47.833
-
-
-
- 47.657
-
-
-
- 47.563
-
-
-
- 47.595
-
-
-
- 47.609
-
-
-
- 47.683
-
-
-
- 48.067
-
-
-
- 48.501
-
-
-
- 48.937
-
-
-
- 49.062
-
-
-
- 49.129
-
-
-
- 49.080
-
-
-
- 49.240
-
-
-
- 49.408
-
-
-
- 49.634
-
-
-
- 49.882
-
-
-
- 50.074
-
-
-
- 50.329
-
-
-
- 50.381
-
-
-
- 50.539
-
-
-
- 50.388
-
-
-
- 50.276
-
-
-
- 49.848
-
-
-
- 49.755
-
-
-
- 49.745
-
-
-
- 49.818
-
-
-
- 49.652
-
-
-
- 49.542
-
-
-
- 49.565
-
-
-
- 49.708
-
-
-
- 49.841
-
-
-
- 50.142
-
-
-
- 50.428
-
-
-
- 50.616
-
-
-
- 50.728
-
-
-
- 50.792
-
-
-
- 50.908
-
-
-
- 51.011
-
-
-
- 51.116
-
-
-
- 51.212
-
-
-
- 51.320
-
-
-
- 51.424
-
-
-
- 51.494
-
-
-
- 51.508
-
-
-
- 51.408
-
-
-
- 51.425
-
-
-
- 51.314
-
-
-
- 51.127
-
-
-
- 50.885
-
-
-
- 50.617
-
-
-
- 50.337
-
-
-
- 50.023
-
-
-
- 49.626
-
-
-
- 49.195
-
-
-
- 48.733
-
-
-
- 48.294
-
-
-
- 47.902
-
-
-
- 47.748
-
-
-
- 47.875
-
-
-
- 48.056
-
-
-
- 48.170
-
-
-
- 48.144
-
-
-
- 48.063
-
-
-
- 48.016
-
-
-
- 47.866
-
-
-
- 47.721
-
-
-
- 47.664
-
-
-
- 47.416
-
-
-
- 47.046
-
-
-
- 46.232
-
-
-
- 45.867
-
-
-
- 45.516
-
-
-
- 45.201
-
-
-
- 44.878
-
-
-
- 44.566
-
-
-
- 44.133
-
-
-
- 43.924
-
-
-
- 43.812
-
-
-
- 43.717
-
-
-
- 43.529
-
-
-
- 43.618
-
-
-
- 43.783
-
-
-
- 43.918
-
-
-
- 43.930
-
-
-
- 43.982
-
-
-
- 43.998
-
-
-
- 44.082
-
-
-
- 44.202
-
-
-
- 44.167
-
-
-
- 43.969
-
-
-
- 44.037
-
-
-
- 44.293
-
-
-
- 44.061
-
-
-
- 43.674
-
-
-
- 43.374
-
-
-
- 43.172
-
-
-
- 42.927
-
-
-
- 42.775
-
-
-
- 42.556
-
-
-
- 42.523
-
-
-
- 42.507
-
-
-
- 42.428
-
-
-
- 42.373
-
-
-
- 42.126
-
-
-
- 41.980
-
-
-
- 41.888
-
-
-
- 42.060
-
-
-
- 42.114
-
-
-
- 42.127
-
-
-
- 41.983
-
-
-
- 42.017
-
-
-
- 42.125
-
-
-
- 42.226
-
-
-
- 42.080
-
-
-
- 41.725
-
-
-
- 41.419
-
-
-
- 41.887
-
-
-
- 42.293
-
-
-
- 42.643
-
-
-
- 42.930
-
-
-
- 43.220
-
-
-
- 43.390
-
-
-
- 43.581
-
-
-
- 43.899
-
-
-
- 44.232
-
-
-
- 44.019
-
-
-
- 43.741
-
-
-
- 43.381
-
-
-
- 43.016
-
-
-
- 42.607
-
-
-
- 42.108
-
-
-
- 42.118
-
-
-
- 42.148
-
-
-
- 42.317
-
-
-
- 42.482
-
-
-
- 42.634
-
-
-
- 42.815
-
-
-
- 43.113
-
-
-
- 43.329
-
-
-
- 43.390
-
-
-
- 43.514
-
-
-
- 43.714
-
-
-
- 43.883
-
-
-
- 44.009
-
-
-
- 44.139
-
-
-
- 44.297
-
-
-
- 44.408
-
-
-
- 44.587
-
-
-
- 44.797
-
-
-
- 45.043
-
-
-
- 45.325
-
-
-
- 45.622
-
-
-
- 45.839
-
-
-
- 46.068
-
-
-
- 46.164
-
-
-
- 46.014
-
-
-
- 45.648
-
-
-
- 45.315
-
-
-
- 44.852
-
-
-
- 44.397
-
-
-
- 44.007
-
-
-
- 43.865
-
-
-
- 43.675
-
-
-
- 43.397
-
-
-
- 43.071
-
-
-
- 42.874
-
-
-
- 42.452
-
-
-
- 42.188
-
-
-
- 41.880
-
-
-
- 41.554
-
-
-
- 41.182
-
-
-
- 40.878
-
-
-
- 40.613
-
-
-
- 40.296
-
-
-
- 39.813
-
-
-
- 39.481
-
-
-
- 39.358
-
-
-
- 39.284
-
-
-
- 38.950
-
-
-
- 38.754
-
-
-
- 38.409
-
-
-
- 38.456
-
-
-
- 38.410
-
-
-
- 38.380
-
-
-
- 38.369
-
-
-
- 38.213
-
-
-
- 38.056
-
-
-
- 38.203
-
-
-
- 38.349
-
-
-
- 38.339
-
-
-
- 38.392
-
-
-
- 38.890
-
-
-
- 39.742
-
-
-
- 40.532
-
-
-
- 41.158
-
-
-
- 41.832
-
-
-
- 42.166
-
-
-
- 42.306
-
-
-
- 42.038
-
-
-
- 41.840
-
-
-
- 41.688
-
-
-
- 41.602
-
-
-
- 41.484
-
-
-
- 41.242
-
-
-
- 40.958
-
-
-
- 40.744
-
-
-
- 40.548
-
-
-
- 40.354
-
-
-
- 40.184
-
-
-
- 40.185
-
-
-
- 40.228
-
-
-
- 40.279
-
-
-
- 40.276
-
-
-
- 40.093
-
-
-
- 40.042
-
-
-
- 39.915
-
-
-
- 39.779
-
-
-
- 39.647
-
-
-
- 39.521
-
-
-
- 39.394
-
-
-
- 39.270
-
-
-
- 39.155
-
-
-
- 39.041
-
-
-
- 38.927
-
-
-
- 38.801
-
-
-
- 38.663
-
-
-
- 38.517
-
-
-
- 38.371
-
-
-
- 38.225
-
-
-
- 38.080
-
-
-
- 37.938
-
-
-
- 37.802
-
-
-
- 37.683
-
-
-
- 37.574
-
-
-
- 37.456
-
-
-
- 37.349
-
-
-
- 37.250
-
-
-
- 37.111
-
-
-
- 37.027
-
-
-
- 36.950
-
-
-
- 36.879
-
-
-
- 36.805
-
-
-
- 36.761
-
-
-
- 36.709
-
-
-
- 36.643
-
-
-
- 36.578
-
-
-
- 36.503
-
-
-
- 36.431
-
-
-
- 36.346
-
-
-
- 36.260
-
-
-
- 36.160
-
-
-
- 36.072
-
-
-
- 35.964
-
-
-
- 35.839
-
-
-
- 35.752
-
-
-
- 35.663
-
-
-
- 35.580
-
-
-
- 35.511
-
-
-
- 35.428
-
-
-
- 35.372
-
-
-
- 35.334
-
-
-
- 35.314
-
-
-
- 35.307
-
-
-
- 35.293
-
-
-
- 35.288
-
-
-
- 35.258
-
-
-
- 35.191
-
-
-
-
-
diff --git a/importPicture/testdata/20170518.gpx b/importPicture/testdata/20170518.gpx
deleted file mode 100644
index 32ec1cb..0000000
--- a/importPicture/testdata/20170518.gpx
+++ /dev/null
@@ -1,6208 +0,0 @@
-
-
-
- ACTIVE LOG092126
-
-
- 83.455
-
-
-
- 82.968
-
-
-
- 82.084
-
-
-
- 81.598
-
-
-
- 81.086
-
-
-
- 80.517
-
-
-
- 80.207
-
-
-
- 79.826
-
-
-
- 79.443
-
-
-
- 77.951
-
-
-
- 77.464
-
-
-
- 76.627
-
-
-
- 75.457
-
-
-
- 75.154
-
-
-
- 74.335
-
-
-
- 74.189
-
-
-
- 73.966
-
-
-
- 73.134
-
-
-
- 73.140
-
-
-
- 73.475
-
-
-
- 73.624
-
-
-
- 73.642
-
-
-
- 73.633
-
-
-
- 73.489
-
-
-
- 82.719
-
-
-
- 75.938
-
-
-
- 69.962
-
-
-
- 67.924
-
-
-
- 67.810
-
-
-
- 67.810
-
-
-
- 67.831
-
-
-
- 67.910
-
-
-
- 67.622
-
-
-
- 67.432
-
-
-
- 67.313
-
-
-
- 67.146
-
-
-
- 67.020
-
-
-
- 66.824
-
-
-
- 66.714
-
-
-
- 66.567
-
-
-
- 66.350
-
-
-
- 66.143
-
-
-
- 65.958
-
-
-
- 65.998
-
-
-
- 65.905
-
-
-
- 65.688
-
-
-
- 65.495
-
-
-
- 65.335
-
-
-
- 65.346
-
-
-
- 65.320
-
-
-
- 65.291
-
-
-
- 65.267
-
-
-
- 65.369
-
-
-
- 65.465
-
-
-
- 59.141
-
-
-
- 57.383
-
-
-
- 56.962
-
-
-
- 56.812
-
-
-
- 56.667
-
-
-
- 57.037
-
-
-
- 57.361
-
-
-
- 57.511
-
-
-
- 57.404
-
-
-
- 57.573
-
-
-
- 57.686
-
-
-
- 57.625
-
-
-
- 57.609
-
-
-
- 57.453
-
-
-
- 57.332
-
-
-
- 57.301
-
-
-
- 57.160
-
-
-
- 56.944
-
-
-
- 56.834
-
-
-
- 56.674
-
-
-
- 56.604
-
-
-
- 56.640
-
-
-
- 56.662
-
-
-
- 56.688
-
-
-
- 56.660
-
-
-
- 56.660
-
-
-
- 56.763
-
-
-
- 56.858
-
-
-
- 56.917
-
-
-
- 57.003
-
-
-
- 56.979
-
-
-
- 56.998
-
-
-
- 57.064
-
-
-
- 57.164
-
-
-
- 57.336
-
-
-
- 57.422
-
-
-
- 57.580
-
-
-
- 57.809
-
-
-
- 58.170
-
-
-
- 58.161
-
-
-
- 58.071
-
-
-
- 58.005
-
-
-
- 57.886
-
-
-
- 57.714
-
-
-
- 57.625
-
-
-
- 57.595
-
-
-
- 57.409
-
-
-
- 57.144
-
-
-
- 57.063
-
-
-
- 57.149
-
-
-
- 56.678
-
-
-
- 56.180
-
-
-
- 55.476
-
-
-
- 54.350
-
-
-
- 53.611
-
-
-
- 53.155
-
-
-
- 52.874
-
-
-
- 52.491
-
-
-
- 52.067
-
-
-
- 51.935
-
-
-
- 52.213
-
-
-
- 52.099
-
-
-
- 52.031
-
-
-
- 52.248
-
-
-
- 52.578
-
-
-
- 52.794
-
-
-
- 52.782
-
-
-
- 53.019
-
-
-
- 53.235
-
-
-
- 53.422
-
-
-
- 53.468
-
-
-
- 53.576
-
-
-
- 53.692
-
-
-
- 53.843
-
-
-
- 54.086
-
-
-
- 54.355
-
-
-
- 54.669
-
-
-
- 54.823
-
-
-
- 54.911
-
-
-
- 54.973
-
-
-
- 54.877
-
-
-
- 54.735
-
-
-
- 54.661
-
-
-
- 54.530
-
-
-
- 54.280
-
-
-
- 54.064
-
-
-
- 53.927
-
-
-
- 53.636
-
-
-
- 53.200
-
-
-
- 52.835
-
-
-
- 52.483
-
-
-
- 52.521
-
-
-
- 52.431
-
-
-
- 52.067
-
-
-
- 51.582
-
-
-
- 51.135
-
-
-
- 50.508
-
-
-
- 49.916
-
-
-
- 49.372
-
-
-
- 48.778
-
-
-
- 48.099
-
-
-
- 47.403
-
-
-
- 46.868
-
-
-
- 46.262
-
-
-
- 45.842
-
-
-
- 45.284
-
-
-
- 44.912
-
-
-
- 44.768
-
-
-
- 44.501
-
-
-
- 44.307
-
-
-
- 44.138
-
-
-
- 44.023
-
-
-
- 43.948
-
-
-
- 44.115
-
-
-
- 44.249
-
-
-
- 44.492
-
-
-
- 44.660
-
-
-
- 44.780
-
-
-
- 44.801
-
-
-
- 44.762
-
-
-
- 44.829
-
-
-
- 44.905
-
-
-
- 44.904
-
-
-
- 44.972
-
-
-
- 45.100
-
-
-
- 45.241
-
-
-
- 45.381
-
-
-
- 45.386
-
-
-
- 45.412
-
-
-
- 45.559
-
-
-
- 45.551
-
-
-
- 45.572
-
-
-
- 45.732
-
-
-
- 45.934
-
-
-
- 46.239
-
-
-
- 46.662
-
-
-
- 47.003
-
-
-
- 47.459
-
-
-
- 47.984
-
-
-
- 48.572
-
-
-
- 49.088
-
-
-
- 49.574
-
-
-
- 50.001
-
-
-
- 50.469
-
-
-
- 50.930
-
-
-
- 51.343
-
-
-
- 51.680
-
-
-
- 51.951
-
-
-
- 52.251
-
-
-
- 52.625
-
-
-
- 53.032
-
-
-
- 53.314
-
-
-
- 53.659
-
-
-
- 53.981
-
-
-
- 54.362
-
-
-
- 54.746
-
-
-
- 55.104
-
-
-
- 55.431
-
-
-
- 55.772
-
-
-
- 56.249
-
-
-
- 56.791
-
-
-
- 57.414
-
-
-
- 57.968
-
-
-
- 58.428
-
-
-
- 58.809
-
-
-
- 59.406
-
-
-
- 59.820
-
-
-
- 60.215
-
-
-
- 60.443
-
-
-
- 60.715
-
-
-
- 60.935
-
-
-
- 61.044
-
-
-
- 60.972
-
-
-
- 61.007
-
-
-
- 60.977
-
-
-
- 60.930
-
-
-
- 60.889
-
-
-
- 60.864
-
-
-
- 60.826
-
-
-
- 60.690
-
-
-
- 60.458
-
-
-
- 60.249
-
-
-
- 60.081
-
-
-
- 59.910
-
-
-
- 59.826
-
-
-
- 59.723
-
-
-
- 59.324
-
-
-
- 59.032
-
-
-
- 58.780
-
-
-
- 58.463
-
-
-
- 58.301
-
-
-
- 58.137
-
-
-
- 58.024
-
-
-
- 58.066
-
-
-
- 58.229
-
-
-
- 58.404
-
-
-
- 58.553
-
-
-
- 58.729
-
-
-
- 58.933
-
-
-
- 59.146
-
-
-
- 59.124
-
-
-
- 59.310
-
-
-
- 58.617
-
-
-
- 58.016
-
-
-
- 57.502
-
-
-
- 57.232
-
-
-
- 57.220
-
-
-
- 57.088
-
-
-
- 57.181
-
-
-
- 57.977
-
-
-
- 58.886
-
-
-
- 59.584
-
-
-
- 60.446
-
-
-
- 61.246
-
-
-
- 61.472
-
-
-
- 61.755
-
-
-
- 62.223
-
-
-
- 62.388
-
-
-
- 62.671
-
-
-
- 62.953
-
-
-
- 63.444
-
-
-
- 63.539
-
-
-
- 63.370
-
-
-
- 63.201
-
-
-
- 63.081
-
-
-
- 62.605
-
-
-
- 62.081
-
-
-
- 61.793
-
-
-
- 61.699
-
-
-
- 61.651
-
-
-
- 61.592
-
-
-
- 61.521
-
-
-
- 61.438
-
-
-
- 61.380
-
-
-
- 61.331
-
-
-
- 61.407
-
-
-
- 61.525
-
-
-
- 61.732
-
-
-
- 61.913
-
-
-
- 62.015
-
-
-
- 62.153
-
-
-
- 62.381
-
-
-
- 63.366
-
-
-
- 64.048
-
-
-
- 64.211
-
-
-
- 64.045
-
-
-
- 63.621
-
-
-
- 63.372
-
-
-
- 63.274
-
-
-
- 62.916
-
-
-
- 62.479
-
-
-
- 62.169
-
-
-
- 62.003
-
-
-
- 62.033
-
-
-
- 62.019
-
-
-
- 61.962
-
-
-
- 61.883
-
-
-
- 61.845
-
-
-
- 61.912
-
-
-
- 61.933
-
-
-
- 62.197
-
-
-
- 62.458
-
-
-
- 62.818
-
-
-
- 63.184
-
-
-
- 63.594
-
-
-
- 63.821
-
-
-
- 64.166
-
-
-
- 64.443
-
-
-
- 64.789
-
-
-
- 65.159
-
-
-
- 65.579
-
-
-
- 65.972
-
-
-
- 66.168
-
-
-
- 66.408
-
-
-
- 66.645
-
-
-
- 66.903
-
-
-
- 66.969
-
-
-
- 66.914
-
-
-
- 66.900
-
-
-
- 66.988
-
-
-
- 67.071
-
-
-
- 66.981
-
-
-
- 67.082
-
-
-
- 66.979
-
-
-
- 66.836
-
-
-
- 66.684
-
-
-
- 66.648
-
-
-
- 66.638
-
-
-
- 66.693
-
-
-
- 66.901
-
-
-
- 67.089
-
-
-
- 67.369
-
-
-
- 67.503
-
-
-
- 67.572
-
-
-
- 67.638
-
-
-
- 67.847
-
-
-
- 68.181
-
-
-
- 68.561
-
-
-
- 68.819
-
-
-
- 69.152
-
-
-
- 69.599
-
-
-
- 69.935
-
-
-
- 70.050
-
-
-
- 70.077
-
-
-
- 70.030
-
-
-
- 69.912
-
-
-
- 69.822
-
-
-
- 69.880
-
-
-
- 69.926
-
-
-
- 70.101
-
-
-
- 70.374
-
-
-
- 70.344
-
-
-
- 70.369
-
-
-
- 70.287
-
-
-
- 70.336
-
-
-
- 70.398
-
-
-
- 70.214
-
-
-
- 70.136
-
-
-
- 69.985
-
-
-
- 69.883
-
-
-
- 69.700
-
-
-
- 69.553
-
-
-
- 69.573
-
-
-
- 69.521
-
-
-
- 69.537
-
-
-
- 69.484
-
-
-
- 69.240
-
-
-
- 68.931
-
-
-
- 68.727
-
-
-
- 68.441
-
-
-
- 68.038
-
-
-
- 67.729
-
-
-
- 67.290
-
-
-
- 67.129
-
-
-
- 67.146
-
-
-
- 67.181
-
-
-
- 67.329
-
-
-
- 67.561
-
-
-
- 67.815
-
-
-
- 68.286
-
-
-
- 68.569
-
-
-
- 68.562
-
-
-
- 68.722
-
-
-
- 68.704
-
-
-
- 67.659
-
-
-
- 66.435
-
-
-
- 65.259
-
-
-
- 64.157
-
-
-
- 63.192
-
-
-
- 62.457
-
-
-
- 62.043
-
-
-
- 61.622
-
-
-
- 61.320
-
-
-
- 61.012
-
-
-
- 60.733
-
-
-
- 60.626
-
-
-
- 60.655
-
-
-
- 60.722
-
-
-
- 60.767
-
-
-
- 60.686
-
-
-
- 60.735
-
-
-
- 60.773
-
-
-
- 60.802
-
-
-
- 60.985
-
-
-
- 61.048
-
-
-
- 61.177
-
-
-
- 61.255
-
-
-
- 61.520
-
-
-
- 61.946
-
-
-
- 62.367
-
-
-
- 62.868
-
-
-
- 63.597
-
-
-
- 64.507
-
-
-
- 65.226
-
-
-
- 65.808
-
-
-
- 65.880
-
-
-
- 66.060
-
-
-
- 66.282
-
-
-
- 66.555
-
-
-
- 66.966
-
-
-
- 67.301
-
-
-
- 67.510
-
-
-
- 67.639
-
-
-
- 67.682
-
-
-
- 67.725
-
-
-
- 67.649
-
-
-
- 67.593
-
-
-
- 67.699
-
-
-
- 67.703
-
-
-
- 67.807
-
-
-
- 67.908
-
-
-
- 68.084
-
-
-
- 67.788
-
-
-
- 67.277
-
-
-
- 66.971
-
-
-
- 66.877
-
-
-
- 66.649
-
-
-
- 66.357
-
-
-
- 66.289
-
-
-
- 66.103
-
-
-
- 65.880
-
-
-
- 65.694
-
-
-
- 65.426
-
-
-
- 65.395
-
-
-
- 65.346
-
-
-
- 65.305
-
-
-
- 65.205
-
-
-
- 65.164
-
-
-
- 64.920
-
-
-
- 64.620
-
-
-
- 64.532
-
-
-
- 64.532
-
-
-
- 64.467
-
-
-
- 64.362
-
-
-
- 64.291
-
-
-
- 64.220
-
-
-
- 64.168
-
-
-
- 64.262
-
-
-
- 64.238
-
-
-
- 64.146
-
-
-
- 64.148
-
-
-
- 64.037
-
-
-
- 63.941
-
-
-
- 63.911
-
-
-
- 63.850
-
-
-
- 64.105
-
-
-
- 64.370
-
-
-
- 64.398
-
-
-
- 64.656
-
-
-
- 64.850
-
-
-
- 64.959
-
-
-
- 64.716
-
-
-
- 64.640
-
-
-
- 64.596
-
-
-
- 64.341
-
-
-
- 64.172
-
-
-
- 64.294
-
-
-
- 64.246
-
-
-
- 64.121
-
-
-
- 63.992
-
-
-
- 63.938
-
-
-
- 63.876
-
-
-
- 63.663
-
-
-
- 63.292
-
-
-
- 62.872
-
-
-
- 62.497
-
-
-
- 62.277
-
-
-
- 62.181
-
-
-
- 62.188
-
-
-
- 62.181
-
-
-
- 62.181
-
-
-
- 62.132
-
-
-
- 61.977
-
-
-
- 61.811
-
-
-
- 61.546
-
-
-
- 61.255
-
-
-
- 60.910
-
-
-
- 60.723
-
-
-
- 60.654
-
-
-
- 60.519
-
-
-
- 60.556
-
-
-
- 60.640
-
-
-
- 60.636
-
-
-
- 60.585
-
-
-
- 60.417
-
-
-
- 60.189
-
-
-
- 59.753
-
-
-
- 59.042
-
-
-
- 58.420
-
-
-
- 57.845
-
-
-
- 57.489
-
-
-
- 57.535
-
-
-
- 57.384
-
-
-
- 57.299
-
-
-
- 57.178
-
-
-
- 56.977
-
-
-
- 56.742
-
-
-
- 56.607
-
-
-
- 56.610
-
-
-
- 56.717
-
-
-
- 56.936
-
-
-
- 57.129
-
-
-
- 57.360
-
-
-
- 57.666
-
-
-
- 58.015
-
-
-
- 58.251
-
-
-
- 58.487
-
-
-
- 58.983
-
-
-
- 59.251
-
-
-
- 59.573
-
-
-
- 59.970
-
-
-
- 60.182
-
-
-
- 60.222
-
-
-
- 60.390
-
-
-
- 60.509
-
-
-
- 60.649
-
-
-
- 60.825
-
-
-
- 60.914
-
-
-
- 60.818
-
-
-
- 60.890
-
-
-
- 61.020
-
-
-
- 61.123
-
-
-
- 61.250
-
-
-
- 61.384
-
-
-
- 61.557
-
-
-
- 61.746
-
-
-
- 61.973
-
-
-
- 62.220
-
-
-
- 62.520
-
-
-
- 62.697
-
-
-
- 62.756
-
-
-
- 62.883
-
-
-
- 62.969
-
-
-
- 63.083
-
-
-
- 63.285
-
-
-
- 63.502
-
-
-
- 63.573
-
-
-
- 63.777
-
-
-
- 63.959
-
-
-
- 64.055
-
-
-
- 64.181
-
-
-
- 64.277
-
-
-
- 64.413
-
-
-
- 64.380
-
-
-
- 64.447
-
-
-
- 64.629
-
-
-
- 64.954
-
-
-
- 65.293
-
-
-
- 65.601
-
-
-
- 65.861
-
-
-
- 66.165
-
-
-
- 66.384
-
-
-
- 66.616
-
-
-
- 66.809
-
-
-
- 67.028
-
-
-
- 67.168
-
-
-
- 67.287
-
-
-
- 67.366
-
-
-
- 67.447
-
-
-
- 67.579
-
-
-
- 67.818
-
-
-
- 67.863
-
-
-
- 67.868
-
-
-
- 67.948
-
-
-
- 67.976
-
-
-
- 67.876
-
-
-
- 67.761
-
-
-
- 67.775
-
-
-
- 67.845
-
-
-
- 67.885
-
-
-
- 67.880
-
-
-
- 67.873
-
-
-
- 67.891
-
-
-
- 67.792
-
-
-
- 67.755
-
-
-
- 67.706
-
-
-
- 67.632
-
-
-
- 67.525
-
-
-
- 67.362
-
-
-
- 67.402
-
-
-
- 67.387
-
-
-
- 67.241
-
-
-
- 66.727
-
-
-
- 66.269
-
-
-
- 65.902
-
-
-
- 65.430
-
-
-
- 65.014
-
-
-
- 64.536
-
-
-
- 64.098
-
-
-
- 63.715
-
-
-
- 63.415
-
-
-
- 63.124
-
-
-
- 62.867
-
-
-
- 62.711
-
-
-
- 62.617
-
-
-
- 62.555
-
-
-
- 62.604
-
-
-
- 62.745
-
-
-
- 62.935
-
-
-
- 63.072
-
-
-
- 63.326
-
-
-
- 63.591
-
-
-
- 64.023
-
-
-
- 64.462
-
-
-
- 64.946
-
-
-
- 65.111
-
-
-
- 65.312
-
-
-
- 65.464
-
-
-
- 65.561
-
-
-
- 65.461
-
-
-
- 65.273
-
-
-
- 65.153
-
-
-
- 65.035
-
-
-
- 65.035
-
-
-
- 65.083
-
-
-
- 64.979
-
-
-
- 65.021
-
-
-
- 65.105
-
-
-
- 65.111
-
-
-
- 65.173
-
-
-
- 65.496
-
-
-
- 65.671
-
-
-
- 65.943
-
-
-
- 66.140
-
-
-
- 66.315
-
-
-
- 66.473
-
-
-
- 66.796
-
-
-
- 67.118
-
-
-
- 67.558
-
-
-
- 68.071
-
-
-
- 68.318
-
-
-
- 68.590
-
-
-
- 68.793
-
-
-
- 69.020
-
-
-
- 69.137
-
-
-
- 69.147
-
-
-
- 69.406
-
-
-
- 69.593
-
-
-
- 69.696
-
-
-
- 69.709
-
-
-
- 69.817
-
-
-
- 69.962
-
-
-
- 70.005
-
-
-
- 70.027
-
-
-
- 70.019
-
-
-
- 70.103
-
-
-
- 70.237
-
-
-
- 70.427
-
-
-
- 70.613
-
-
-
- 70.809
-
-
-
- 71.010
-
-
-
- 71.051
-
-
-
- 70.991
-
-
-
- 70.802
-
-
-
- 70.712
-
-
-
- 70.559
-
-
-
- 70.401
-
-
-
- 70.307
-
-
-
- 70.124
-
-
-
- 69.814
-
-
-
- 69.506
-
-
-
- 69.248
-
-
-
- 69.111
-
-
-
- 68.829
-
-
-
- 68.685
-
-
-
- 68.478
-
-
-
- 68.487
-
-
-
- 68.638
-
-
-
- 68.837
-
-
-
- 68.816
-
-
-
- 69.106
-
-
-
- 69.182
-
-
-
- 69.242
-
-
-
- 69.431
-
-
-
- 69.557
-
-
-
- 69.866
-
-
-
- 70.022
-
-
-
- 69.908
-
-
-
- 69.895
-
-
-
- 69.151
-
-
-
- 68.183
-
-
-
- 67.086
-
-
-
- 66.201
-
-
-
- 65.764
-
-
-
- 65.187
-
-
-
- 64.691
-
-
-
- 64.547
-
-
-
- 64.220
-
-
-
- 63.943
-
-
-
- 63.808
-
-
-
- 63.890
-
-
-
- 64.268
-
-
-
- 64.133
-
-
-
- 63.953
-
-
-
- 63.722
-
-
-
- 63.610
-
-
-
- 63.409
-
-
-
- 63.477
-
-
-
- 63.447
-
-
-
- 63.487
-
-
-
- 63.390
-
-
-
- 63.298
-
-
-
- 63.314
-
-
-
- 63.301
-
-
-
- 63.397
-
-
-
- 63.416
-
-
-
- 63.374
-
-
-
- 63.423
-
-
-
- 63.333
-
-
-
- 63.255
-
-
-
- 63.203
-
-
-
- 63.279
-
-
-
- 63.442
-
-
-
- 63.445
-
-
-
- 63.316
-
-
-
- 63.250
-
-
-
- 63.184
-
-
-
- 63.125
-
-
-
- 63.108
-
-
-
- 62.899
-
-
-
- 62.718
-
-
-
- 62.390
-
-
-
- 62.467
-
-
-
- 62.399
-
-
-
- 62.281
-
-
-
- 62.125
-
-
-
- 61.950
-
-
-
- 61.725
-
-
-
- 61.664
-
-
-
- 61.915
-
-
-
- 62.144
-
-
-
- 62.401
-
-
-
- 62.799
-
-
-
- 63.087
-
-
-
- 63.259
-
-
-
- 63.277
-
-
-
- 63.150
-
-
-
- 62.760
-
-
-
- 62.427
-
-
-
- 62.313
-
-
-
- 62.258
-
-
-
- 62.259
-
-
-
- 62.099
-
-
-
- 62.104
-
-
-
- 62.120
-
-
-
- 62.324
-
-
-
- 62.521
-
-
-
- 62.655
-
-
-
- 62.866
-
-
-
- 63.060
-
-
-
- 63.157
-
-
-
- 63.288
-
-
-
- 63.351
-
-
-
- 63.338
-
-
-
- 63.397
-
-
-
- 63.599
-
-
-
- 63.588
-
-
-
- 63.612
-
-
-
- 63.706
-
-
-
- 63.844
-
-
-
- 63.809
-
-
-
- 63.813
-
-
-
- 63.697
-
-
-
- 63.304
-
-
-
- 62.738
-
-
-
- 62.117
-
-
-
- 61.497
-
-
-
- 60.780
-
-
-
- 60.160
-
-
-
- 59.427
-
-
-
- 58.765
-
-
-
- 58.333
-
-
-
- 58.055
-
-
-
- 57.727
-
-
-
- 57.493
-
-
-
- 57.228
-
-
-
- 57.078
-
-
-
- 56.984
-
-
-
- 57.061
-
-
-
- 56.699
-
-
-
- 56.404
-
-
-
- 56.245
-
-
-
- 56.033
-
-
-
- 56.091
-
-
-
- 56.095
-
-
-
- 56.173
-
-
-
- 56.417
-
-
-
- 57.117
-
-
-
- 57.681
-
-
-
- 58.093
-
-
-
- 58.505
-
-
-
- 58.732
-
-
-
- 58.961
-
-
-
- 59.122
-
-
-
- 59.342
-
-
-
- 59.382
-
-
-
- 59.382
-
-
-
- 59.458
-
-
-
- 59.545
-
-
-
- 59.608
-
-
-
- 59.751
-
-
-
- 59.862
-
-
-
- 59.958
-
-
-
- 60.034
-
-
-
- 60.196
-
-
-
- 60.341
-
-
-
- 60.456
-
-
-
- 60.698
-
-
-
- 60.970
-
-
-
- 61.142
-
-
-
- 61.351
-
-
-
- 61.507
-
-
-
- 61.471
-
-
-
- 61.465
-
-
-
- 61.533
-
-
-
- 61.727
-
-
-
- 61.793
-
-
-
- 61.887
-
-
-
- 61.938
-
-
-
- 61.967
-
-
-
- 61.890
-
-
-
- 62.006
-
-
-
- 62.196
-
-
-
- 62.339
-
-
-
- 62.448
-
-
-
- 62.599
-
-
-
- 62.681
-
-
-
- 62.756
-
-
-
- 62.955
-
-
-
- 63.205
-
-
-
- 63.572
-
-
-
- 63.816
-
-
-
- 64.189
-
-
-
- 64.543
-
-
-
- 64.958
-
-
-
- 65.266
-
-
-
- 65.690
-
-
-
- 66.168
-
-
-
- 66.548
-
-
-
- 66.902
-
-
-
- 67.398
-
-
-
- 67.747
-
-
-
- 67.543
-
-
-
- 67.506
-
-
-
- 67.441
-
-
-
- 67.328
-
-
-
- 67.305
-
-
-
- 67.291
-
-
-
- 67.335
-
-
-
- 67.310
-
-
-
- 67.438
-
-
-
- 67.582
-
-
-
- 67.703
-
-
-
- 67.771
-
-
-
- 67.795
-
-
-
- 67.942
-
-
-
- 68.001
-
-
-
- 67.982
-
-
-
- 68.063
-
-
-
- 68.156
-
-
-
- 68.228
-
-
-
- 68.318
-
-
-
- 68.237
-
-
-
- 68.067
-
-
-
- 67.994
-
-
-
- 67.822
-
-
-
- 67.757
-
-
-
- 67.730
-
-
-
- 67.788
-
-
-
- 67.788
-
-
-
- 67.670
-
-
-
- 67.672
-
-
-
- 67.755
-
-
-
- 67.816
-
-
-
- 67.758
-
-
-
- 67.866
-
-
-
- 67.944
-
-
-
- 67.917
-
-
-
- 67.891
-
-
-
- 67.928
-
-
-
- 68.042
-
-
-
- 68.214
-
-
-
- 68.249
-
-
-
- 68.260
-
-
-
- 68.232
-
-
-
- 68.158
-
-
-
- 68.113
-
-
-
- 68.066
-
-
-
- 68.058
-
-
-
- 68.058
-
-
-
- 68.007
-
-
-
- 67.985
-
-
-
- 67.921
-
-
-
- 67.851
-
-
-
- 68.015
-
-
-
- 68.314
-
-
-
- 68.428
-
-
-
- 68.484
-
-
-
- 68.561
-
-
-
- 68.570
-
-
-
- 68.618
-
-
-
- 68.610
-
-
-
- 68.374
-
-
-
- 68.101
-
-
-
- 67.883
-
-
-
- 67.664
-
-
-
- 67.157
-
-
-
- 66.623
-
-
-
- 66.019
-
-
-
- 65.567
-
-
-
- 64.986
-
-
-
- 64.587
-
-
-
- 64.136
-
-
-
- 63.797
-
-
-
- 63.505
-
-
-
- 63.352
-
-
-
- 63.297
-
-
-
- 63.556
-
-
-
- 63.850
-
-
-
- 64.330
-
-
-
- 64.593
-
-
-
- 65.017
-
-
-
- 65.228
-
-
-
- 65.417
-
-
-
- 65.599
-
-
-
- 65.701
-
-
-
- 66.065
-
-
-
- 66.243
-
-
-
- 66.456
-
-
-
- 66.714
-
-
-
- 66.867
-
-
-
- 67.086
-
-
-
- 67.256
-
-
-
- 67.344
-
-
-
- 67.391
-
-
-
- 67.381
-
-
-
- 67.537
-
-
-
- 67.788
-
-
-
- 68.014
-
-
-
- 68.333
-
-
-
- 68.529
-
-
-
- 68.750
-
-
-
- 68.940
-
-
-
- 69.051
-
-
-
- 69.248
-
-
-
- 69.538
-
-
-
- 69.766
-
-
-
- 69.973
-
-
-
- 70.057
-
-
-
- 70.279
-
-
-
- 70.455
-
-
-
- 70.624
-
-
-
- 70.724
-
-
-
- 70.738
-
-
-
- 70.627
-
-
-
- 70.334
-
-
-
- 69.978
-
-
-
- 69.652
-
-
-
- 69.581
-
-
-
- 69.679
-
-
-
- 69.804
-
-
-
- 69.565
-
-
-
- 69.513
-
-
-
- 69.438
-
-
-
- 69.293
-
-
-
- 69.205
-
-
-
- 69.260
-
-
-
- 69.229
-
-
-
- 68.923
-
-
-
- 68.890
-
-
-
- 68.888
-
-
-
- 68.860
-
-
-
- 68.823
-
-
-
- 68.799
-
-
-
- 68.781
-
-
-
- 68.916
-
-
-
- 69.153
-
-
-
- 69.466
-
-
-
- 69.743
-
-
-
- 69.963
-
-
-
- 69.926
-
-
-
- 70.026
-
-
-
- 70.083
-
-
-
- 70.029
-
-
-
- 69.852
-
-
-
- 69.709
-
-
-
- 69.698
-
-
-
- 69.703
-
-
-
- 69.857
-
-
-
- 70.136
-
-
-
- 70.380
-
-
-
- 70.551
-
-
-
- 70.519
-
-
-
- 69.999
-
-
-
- 69.453
-
-
-
- 69.078
-
-
-
- 68.560
-
-
-
- 68.015
-
-
-
- 67.954
-
-
-
- 68.010
-
-
-
- 67.904
-
-
-
- 67.902
-
-
-
- 67.879
-
-
-
- 67.820
-
-
-
- 67.860
-
-
-
- 67.839
-
-
-
- 67.668
-
-
-
- 67.617
-
-
-
- 67.510
-
-
-
- 67.468
-
-
-
- 67.350
-
-
-
- 67.254
-
-
-
- 67.251
-
-
-
- 67.114
-
-
-
- 66.856
-
-
-
- 66.754
-
-
-
- 66.569
-
-
-
- 66.509
-
-
-
- 66.404
-
-
-
- 66.396
-
-
-
- 66.388
-
-
-
- 66.327
-
-
-
- 66.316
-
-
-
- 66.289
-
-
-
- 66.233
-
-
-
- 66.317
-
-
-
- 66.426
-
-
-
- 66.579
-
-
-
- 66.679
-
-
-
- 66.868
-
-
-
- 66.969
-
-
-
- 67.184
-
-
-
- 67.398
-
-
-
- 67.564
-
-
-
- 67.596
-
-
-
- 67.688
-
-
-
- 67.850
-
-
-
- 67.994
-
-
-
- 68.054
-
-
-
- 68.230
-
-
-
- 68.500
-
-
-
- 68.732
-
-
-
- 68.935
-
-
-
- 69.149
-
-
-
- 69.324
-
-
-
- 69.480
-
-
-
- 69.587
-
-
-
- 69.669
-
-
-
- 69.704
-
-
-
- 69.733
-
-
-
- 69.819
-
-
-
- 70.048
-
-
-
- 70.256
-
-
-
- 70.535
-
-
-
- 70.771
-
-
-
- 71.090
-
-
-
- 71.219
-
-
-
- 71.562
-
-
-
- 72.033
-
-
-
- 72.528
-
-
-
- 72.872
-
-
-
- 73.197
-
-
-
- 73.631
-
-
-
- 74.003
-
-
-
- 74.322
-
-
-
- 74.713
-
-
-
- 74.966
-
-
-
- 75.181
-
-
-
- 75.546
-
-
-
- 75.941
-
-
-
- 76.148
-
-
-
- 76.438
-
-
-
- 76.501
-
-
-
- 76.372
-
-
-
- 76.196
-
-
-
- 76.186
-
-
-
- 75.461
-
-
-
- 74.594
-
-
-
- 74.391
-
-
-
- 74.128
-
-
-
- 73.906
-
-
-
- 73.749
-
-
-
- 73.484
-
-
-
- 73.187
-
-
-
- 73.057
-
-
-
- 72.795
-
-
-
- 72.536
-
-
-
- 72.325
-
-
-
- 72.060
-
-
-
- 71.712
-
-
-
- 71.485
-
-
-
- 71.178
-
-
-
- 70.853
-
-
-
- 70.652
-
-
-
- 70.449
-
-
-
- 69.818
-
-
-
- 69.091
-
-
-
- 68.233
-
-
-
- 67.550
-
-
-
- 67.048
-
-
-
- 66.527
-
-
-
- 66.183
-
-
-
- 65.844
-
-
-
- 65.511
-
-
-
- 65.267
-
-
-
- 65.153
-
-
-
- 64.997
-
-
-
- 64.942
-
-
-
- 64.848
-
-
-
- 64.748
-
-
-
- 64.560
-
-
-
- 64.236
-
-
-
- 64.044
-
-
-
- 63.800
-
-
-
- 63.545
-
-
-
- 63.252
-
-
-
- 63.029
-
-
-
- 62.806
-
-
-
- 62.602
-
-
-
- 62.420
-
-
-
- 62.133
-
-
-
- 61.984
-
-
-
- 61.909
-
-
-
- 61.924
-
-
-
- 61.807
-
-
-
- 61.673
-
-
-
- 61.357
-
-
-
- 60.973
-
-
-
- 60.596
-
-
-
- 60.368
-
-
-
- 60.145
-
-
-
- 59.958
-
-
-
- 59.786
-
-
-
- 59.801
-
-
-
- 59.781
-
-
-
- 59.833
-
-
-
- 59.962
-
-
-
- 60.259
-
-
-
- 60.563
-
-
-
- 60.764
-
-
-
- 60.684
-
-
-
- 60.730
-
-
-
- 60.672
-
-
-
- 60.570
-
-
-
- 60.450
-
-
-
- 60.636
-
-
-
- 60.586
-
-
-
- 60.937
-
-
-
- 61.431
-
-
-
- 61.776
-
-
-
- 62.177
-
-
-
- 62.332
-
-
-
- 62.640
-
-
-
- 62.785
-
-
-
- 62.663
-
-
-
- 62.536
-
-
-
- 62.435
-
-
-
- 62.472
-
-
-
- 62.449
-
-
-
- 62.384
-
-
-
- 62.471
-
-
-
- 62.444
-
-
-
- 62.597
-
-
-
- 62.698
-
-
-
- 62.782
-
-
-
- 62.870
-
-
-
- 62.893
-
-
-
- 62.891
-
-
-
- 62.742
-
-
-
- 62.745
-
-
-
- 62.650
-
-
-
- 62.420
-
-
-
- 62.243
-
-
-
- 62.411
-
-
-
- 62.419
-
-
-
- 62.543
-
-
-
- 62.647
-
-
-
- 62.743
-
-
-
- 62.714
-
-
-
- 62.684
-
-
-
- 62.530
-
-
-
- 62.459
-
-
-
- 62.447
-
-
-
- 62.525
-
-
-
- 62.566
-
-
-
- 62.532
-
-
-
- 62.447
-
-
-
- 62.277
-
-
-
- 62.084
-
-
-
- 61.865
-
-
-
- 61.718
-
-
-
- 61.666
-
-
-
- 61.662
-
-
-
- 61.742
-
-
-
- 61.796
-
-
-
- 61.958
-
-
-
- 61.852
-
-
-
- 61.796
-
-
-
- 61.798
-
-
-
- 61.700
-
-
-
- 61.615
-
-
-
- 61.400
-
-
-
- 61.120
-
-
-
- 60.970
-
-
-
- 60.902
-
-
-
- 60.738
-
-
-
- 60.627
-
-
-
- 60.564
-
-
-
- 60.547
-
-
-
- 60.496
-
-
-
- 60.494
-
-
-
- 60.497
-
-
-
- 60.529
-
-
-
- 60.435
-
-
-
- 60.492
-
-
-
- 60.567
-
-
-
- 60.674
-
-
-
- 60.755
-
-
-
- 60.766
-
-
-
- 60.663
-
-
-
- 60.368
-
-
-
- 60.034
-
-
-
- 59.781
-
-
-
- 59.481
-
-
-
- 59.277
-
-
-
- 59.186
-
-
-
- 59.367
-
-
-
- 59.549
-
-
-
- 59.542
-
-
-
- 59.608
-
-
-
- 59.479
-
-
-
- 59.451
-
-
-
- 59.578
-
-
-
- 59.641
-
-
-
- 59.731
-
-
-
- 59.904
-
-
-
- 60.022
-
-
-
- 60.149
-
-
-
- 60.552
-
-
-
- 60.881
-
-
-
- 61.324
-
-
-
- 61.838
-
-
-
- 62.191
-
-
-
- 62.624
-
-
-
- 63.160
-
-
-
- 63.582
-
-
-
- 64.066
-
-
-
- 64.454
-
-
-
- 64.885
-
-
-
- 65.264
-
-
-
- 65.668
-
-
-
- 66.074
-
-
-
- 66.445
-
-
-
- 66.691
-
-
-
- 66.617
-
-
-
- 66.428
-
-
-
- 66.366
-
-
-
- 66.335
-
-
-
- 66.271
-
-
-
- 66.374
-
-
-
- 66.440
-
-
-
- 66.419
-
-
-
- 66.441
-
-
-
- 66.439
-
-
-
- 66.279
-
-
-
- 66.384
-
-
-
- 66.400
-
-
-
- 66.420
-
-
-
- 66.446
-
-
-
- 66.488
-
-
-
- 66.564
-
-
-
- 66.704
-
-
-
- 66.813
-
-
-
- 67.037
-
-
-
- 66.985
-
-
-
- 66.986
-
-
-
- 67.126
-
-
-
- 67.227
-
-
-
- 67.334
-
-
-
- 67.628
-
-
-
- 67.938
-
-
-
- 68.267
-
-
-
- 68.634
-
-
-
- 68.914
-
-
-
- 69.035
-
-
-
- 69.006
-
-
-
- 68.855
-
-
-
- 68.683
-
-
-
- 68.507
-
-
-
- 68.477
-
-
-
- 68.514
-
-
-
- 68.571
-
-
-
- 68.748
-
-
-
- 68.966
-
-
-
- 69.109
-
-
-
- 69.347
-
-
-
- 69.920
-
-
-
- 70.504
-
-
-
- 70.967
-
-
-
- 71.281
-
-
-
- 71.528
-
-
-
- 71.814
-
-
-
- 71.889
-
-
-
- 71.993
-
-
-
- 72.029
-
-
-
- 72.039
-
-
-
- 72.226
-
-
-
- 72.327
-
-
-
- 72.492
-
-
-
- 72.536
-
-
-
- 72.786
-
-
-
- 72.864
-
-
-
- 72.910
-
-
-
- 72.972
-
-
-
- 72.988
-
-
-
- 73.037
-
-
-
- 73.241
-
-
-
- 73.501
-
-
-
- 73.983
-
-
-
- 74.372
-
-
-
- 74.545
-
-
-
- 74.704
-
-
-
- 74.661
-
-
-
- 74.478
-
-
-
- 74.572
-
-
-
- 74.446
-
-
-
- 74.554
-
-
-
- 74.647
-
-
-
- 74.786
-
-
-
- 74.989
-
-
-
- 74.975
-
-
-
- 74.898
-
-
-
- 74.980
-
-
-
- 75.505
-
-
-
- 75.981
-
-
-
- 76.566
-
-
-
- 77.058
-
-
-
- 77.319
-
-
-
- 77.662
-
-
-
- 77.936
-
-
-
- 78.210
-
-
-
- 78.333
-
-
-
- 78.386
-
-
-
- 78.471
-
-
-
- 78.424
-
-
-
- 78.086
-
-
-
- 77.591
-
-
-
- 77.283
-
-
-
- 77.159
-
-
-
- 77.169
-
-
-
- 77.349
-
-
-
- 77.447
-
-
-
- 77.443
-
-
-
- 77.476
-
-
-
- 77.557
-
-
-
- 77.419
-
-
-
- 77.292
-
-
-
- 76.995
-
-
-
- 76.573
-
-
-
- 76.312
-
-
-
- 76.191
-
-
-
- 76.159
-
-
-
- 76.069
-
-
-
- 76.043
-
-
-
- 75.778
-
-
-
- 75.595
-
-
-
- 75.458
-
-
-
- 75.330
-
-
-
- 75.312
-
-
-
- 75.164
-
-
-
- 75.275
-
-
-
- 75.431
-
-
-
- 75.729
-
-
-
- 76.021
-
-
-
- 76.187
-
-
-
- 76.060
-
-
-
- 76.132
-
-
-
- 76.232
-
-
-
- 76.297
-
-
-
- 76.469
-
-
-
- 76.612
-
-
-
- 76.590
-
-
-
- 76.678
-
-
-
- 76.606
-
-
-
- 76.380
-
-
-
- 76.158
-
-
-
- 76.069
-
-
-
- 76.014
-
-
-
- 75.939
-
-
-
- 75.932
-
-
-
- 75.887
-
-
-
- 75.921
-
-
-
- 76.102
-
-
-
- 76.083
-
-
-
- 76.049
-
-
-
- 75.961
-
-
-
- 75.740
-
-
-
- 75.629
-
-
-
- 75.608
-
-
-
- 75.550
-
-
-
- 75.662
-
-
-
- 75.512
-
-
-
- 75.257
-
-
-
- 75.297
-
-
-
- 75.432
-
-
-
- 75.543
-
-
-
- 75.522
-
-
-
- 75.331
-
-
-
- 75.173
-
-
-
- 75.138
-
-
-
- 75.015
-
-
-
- 74.946
-
-
-
- 74.623
-
-
-
- 74.250
-
-
-
- 74.148
-
-
-
- 74.156
-
-
-
- 74.032
-
-
-
- 74.003
-
-
-
- 73.978
-
-
-
- 73.901
-
-
-
- 73.772
-
-
-
- 73.715
-
-
-
- 73.446
-
-
-
- 73.126
-
-
-
- 72.756
-
-
-
- 72.706
-
-
-
- 72.532
-
-
-
- 72.428
-
-
-
- 72.179
-
-
-
- 71.913
-
-
-
- 71.633
-
-
-
- 71.585
-
-
-
- 71.638
-
-
-
- 71.579
-
-
-
- 71.387
-
-
-
- 71.068
-
-
-
- 71.089
-
-
-
- 71.221
-
-
-
- 71.157
-
-
-
- 70.966
-
-
-
- 70.825
-
-
-
- 70.989
-
-
-
- 70.918
-
-
-
- 70.835
-
-
-
- 70.717
-
-
-
- 70.464
-
-
-
- 70.242
-
-
-
- 69.954
-
-
-
- 69.799
-
-
-
- 69.791
-
-
-
- 69.659
-
-
-
- 69.624
-
-
-
- 69.473
-
-
-
- 69.333
-
-
-
- 69.143
-
-
-
- 68.932
-
-
-
- 68.789
-
-
-
- 68.637
-
-
-
- 68.509
-
-
-
- 68.379
-
-
-
- 68.276
-
-
-
- 68.177
-
-
-
- 68.124
-
-
-
- 68.071
-
-
-
- 67.988
-
-
-
- 67.918
-
-
-
- 67.870
-
-
-
- 67.810
-
-
-
- 67.849
-
-
-
- 67.823
-
-
-
- 67.722
-
-
-
- 67.633
-
-
-
- 67.553
-
-
-
- 67.412
-
-
-
- 67.300
-
-
-
- 67.104
-
-
-
- 66.958
-
-
-
- 66.839
-
-
-
- 66.617
-
-
-
- 66.399
-
-
-
- 66.224
-
-
-
- 66.141
-
-
-
- 66.075
-
-
-
- 66.017
-
-
-
- 65.903
-
-
-
- 65.840
-
-
-
- 65.741
-
-
-
- 65.654
-
-
-
- 65.586
-
-
-
- 65.560
-
-
-
- 65.531
-
-
-
- 65.516
-
-
-
- 65.488
-
-
-
- 65.504
-
-
-
- 65.493
-
-
-
- 65.487
-
-
-
- 65.524
-
-
-
- 65.578
-
-
-
- 65.646
-
-
-
- 65.648
-
-
-
- 65.590
-
-
-
- 65.510
-
-
-
- 65.567
-
-
-
- 65.537
-
-
-
- 65.387
-
-
-
- 65.185
-
-
-
- 64.969
-
-
-
- 64.807
-
-
-
- 64.736
-
-
-
- 64.690
-
-
-
- 64.575
-
-
-
- 64.467
-
-
-
- 64.524
-
-
-
- 64.372
-
-
-
- 64.349
-
-
-
- 64.330
-
-
-
-
-
diff --git a/importPicture/testdata/AdjustTime.20170517.ini b/importPicture/testdata/AdjustTime.20170517.ini
deleted file mode 100644
index d86002c..0000000
--- a/importPicture/testdata/AdjustTime.20170517.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-#by AdjustTime
-#Wed May 17 19:07:03 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=false
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-17T10\:02\:51
-GPX.OVERWRITE_MAGVAR=false
-GPX.REUSE=false
-IMG.BASE_FILE=DSC05105.JPG
-IMG.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/10070517/10070517
-GPX.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/10070517/10070517/20170517.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/
diff --git a/importPicture/testdata/AdjustTime.20170518.A1.ini b/importPicture/testdata/AdjustTime.20170518.A1.ini
deleted file mode 100644
index 5db4a3e..0000000
--- a/importPicture/testdata/AdjustTime.20170518.A1.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sat Jun 24 20:33:37 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=false
-IMG.OUTPUT_ALL=false
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.BASE_FILE=DSC05183.JPG
-IMG.TIME=2017-05-18T00\:16\:48Z
-GPX.OVERWRITE_MAGVAR=false
-GPX.REUSE=false
-IMG.SOURCE_FOLDER=testdata/cameradata/10170518
-GPX.SOURCE_FOLDER=testdata/cameradata/20170518.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.20170518.A1.log b/importPicture/testdata/AdjustTime.20170518.A1.log
deleted file mode 100644
index a8a04a4..0000000
--- a/importPicture/testdata/AdjustTime.20170518.A1.log
+++ /dev/null
@@ -1,69 +0,0 @@
-テストパターン : [A1].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時
- tarFilePath = testdata/Sony20170518.tar.gz
- gpxSourcePath = testdata/20170518.gpx
- gpxDestinationPath = testdata/cameradata/20170518.gpx
- iniFilePath = testdata/AdjustTime.20170518.A1.ini
-Param File = 'testdata/AdjustTime.20170518.A1.ini'
- - param： IMG.TIME=2017-05-18T00:16:48Z
- - param： IMG.BASE_FILE=DSC05183.JPG
- - param： GPX.BASETIME=FILE_UPDATE
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/10170518
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=false
- - param： GPX.OUTPUT_SPEED=false
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=false
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx
- 時差: -32420(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|DSC05183.JPG |2017-05-18T09:17:08Z|2017-05-18T00:16:48Z| | | | | |
-|DSC05184.JPG |2017-05-18T09:35:04Z|2017-05-18T00:34:44Z| 35.4367520000|139.4082730000| 63.087| -| -|
-|DSC05185.JPG |2017-05-18T09:35:08Z|2017-05-18T00:34:48Z| 35.4367360000|139.4082530000| 62.760| -| -|
-|DSC05186.JPG |2017-05-18T09:35:10Z|2017-05-18T00:34:50Z| 35.4367340000|139.4082440000| 62.313| -| -|
-|DSC05187.JPG |2017-05-18T09:35:20Z|2017-05-18T00:35:00Z| 35.4367720000|139.4082390000| 63.060| -| -|
-|DSC05188.JPG |2017-05-18T09:35:28Z|2017-05-18T00:35:08Z| 35.4367940000|139.4082300000| 63.612| -| -|
-|DSC05189.JPG |2017-05-18T09:35:40Z|2017-05-18T00:35:20Z| 35.4368380000|139.4081910000| 59.427| -| -|
-|DSC05190.JPG |2017-05-18T09:36:10Z|2017-05-18T00:35:50Z| 35.4371180000|139.4083070000| 59.608| -| -|
-|DSC05191.JPG |2017-05-18T09:36:20Z|2017-05-18T00:36:00Z| 35.4371710000|139.4083370000| 61.142| -| -|
-|DSC05192.JPG |2017-05-18T09:36:26Z|2017-05-18T00:36:06Z| 35.4372020000|139.4083510000| 61.727| -| -|
-|DSC05193.JPG |2017-05-18T09:36:52Z|2017-05-18T00:36:32Z| 35.4374490000|139.4084050000| 67.747| -| -|
-|DSC05194.JPG |2017-05-18T09:37:10Z|2017-05-18T00:36:50Z| 35.4375190000|139.4084670000| 68.156| -| -|
-|DSC05195.JPG |2017-05-18T09:37:24Z|2017-05-18T00:37:04Z| 35.4376190000|139.4084540000| 67.816| -| -|
-|DSC05196.JPG |2017-05-18T09:37:52Z|2017-05-18T00:37:32Z| 35.4376820000|139.4085150000| 68.610| -| -|
-|DSC05197.JPG |2017-05-18T09:38:18Z|2017-05-18T00:37:58Z| 35.4377770000|139.4086780000| 66.243| -| -|
-|DSC05198.JPG |2017-05-18T09:38:22Z|2017-05-18T00:38:02Z| 35.4377680000|139.4086840000| 67.086| -| -|
-|DSC05199.JPG |2017-05-18T09:38:28Z|2017-05-18T00:38:08Z| 35.4377680000|139.4086970000| 67.788| -| -|
-|DSC05200.JPG |2017-05-18T09:38:48Z|2017-05-18T00:38:28Z| 35.4376200000|139.4087570000| 69.652| -| -|
-|DSC05201.JPG |2017-05-18T09:38:52Z|2017-05-18T00:38:32Z| 35.4375980000|139.4087640000| 69.565| -| -|
-|DSC05202.JPG |2017-05-18T09:39:00Z|2017-05-18T00:38:40Z| 35.4375630000|139.4087800000| 68.890| -| -|
-|DSC05203.JPG |2017-05-18T09:39:24Z|2017-05-18T00:39:04Z| 35.4372650000|139.4087430000| 69.999| -| -|
-|DSC05204.JPG |2017-05-18T09:47:08Z|2017-05-18T00:46:48Z| 35.4368560000|139.4082190000| 68.637| -| -|
-|DSC05205.JPG |2017-05-18T09:48:24Z|2017-05-18T00:48:04Z| | | | | |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05183.JPG'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05184.JPG'
-[debug] exifTime = '2017:05:18 09:34:44' <--> '2017:05:18 09:34:44'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05196.JPG'
-[debug] exifTime = '2017:05:18 09:37:32' <--> '2017:05:18 09:37:32'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05204.JPG'
-[debug] exifTime = '2017:05:18 09:46:48' <--> '2017:05:18 09:46:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05205.JPG'
-
diff --git a/importPicture/testdata/AdjustTime.20170518.A2.ini b/importPicture/testdata/AdjustTime.20170518.A2.ini
deleted file mode 100644
index 6277705..0000000
--- a/importPicture/testdata/AdjustTime.20170518.A2.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sat Jun 24 20:33:37 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=false
-IMG.OUTPUT_ALL=true
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.BASE_FILE=DSC05183.JPG
-IMG.TIME=2017-05-18T00\:16\:48Z
-GPX.OVERWRITE_MAGVAR=false
-GPX.REUSE=false
-IMG.SOURCE_FOLDER=testdata/cameradata/10170518
-GPX.SOURCE_FOLDER=testdata/cameradata/20170518.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.20170518.A2.log b/importPicture/testdata/AdjustTime.20170518.A2.log
deleted file mode 100644
index b8b0439..0000000
--- a/importPicture/testdata/AdjustTime.20170518.A2.log
+++ /dev/null
@@ -1,71 +0,0 @@
-テストパターン : [A2].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時
- tarFilePath = testdata/Sony20170518.tar.gz
- gpxSourcePath = testdata/20170518.gpx
- gpxDestinationPath = testdata/cameradata/20170518.gpx
- iniFilePath = testdata/AdjustTime.20170518.A2.ini
-Param File = 'testdata/AdjustTime.20170518.A2.ini'
- - param： IMG.TIME=2017-05-18T00:16:48Z
- - param： IMG.BASE_FILE=DSC05183.JPG
- - param： GPX.BASETIME=FILE_UPDATE
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/10170518
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=false
- - param： GPX.OUTPUT_SPEED=false
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx
- 時差: -32420(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|DSC05183.JPG |2017-05-18T09:17:08Z|2017-05-18T00:16:48Z| | | | | |
-|DSC05184.JPG |2017-05-18T09:35:04Z|2017-05-18T00:34:44Z| 35.4367520000|139.4082730000| 63.087| -| -|
-|DSC05185.JPG |2017-05-18T09:35:08Z|2017-05-18T00:34:48Z| 35.4367360000|139.4082530000| 62.760| -| -|
-|DSC05186.JPG |2017-05-18T09:35:10Z|2017-05-18T00:34:50Z| 35.4367340000|139.4082440000| 62.313| -| -|
-|DSC05187.JPG |2017-05-18T09:35:20Z|2017-05-18T00:35:00Z| 35.4367720000|139.4082390000| 63.060| -| -|
-|DSC05188.JPG |2017-05-18T09:35:28Z|2017-05-18T00:35:08Z| 35.4367940000|139.4082300000| 63.612| -| -|
-|DSC05189.JPG |2017-05-18T09:35:40Z|2017-05-18T00:35:20Z| 35.4368380000|139.4081910000| 59.427| -| -|
-|DSC05190.JPG |2017-05-18T09:36:10Z|2017-05-18T00:35:50Z| 35.4371180000|139.4083070000| 59.608| -| -|
-|DSC05191.JPG |2017-05-18T09:36:20Z|2017-05-18T00:36:00Z| 35.4371710000|139.4083370000| 61.142| -| -|
-|DSC05192.JPG |2017-05-18T09:36:26Z|2017-05-18T00:36:06Z| 35.4372020000|139.4083510000| 61.727| -| -|
-|DSC05193.JPG |2017-05-18T09:36:52Z|2017-05-18T00:36:32Z| 35.4374490000|139.4084050000| 67.747| -| -|
-|DSC05194.JPG |2017-05-18T09:37:10Z|2017-05-18T00:36:50Z| 35.4375190000|139.4084670000| 68.156| -| -|
-|DSC05195.JPG |2017-05-18T09:37:24Z|2017-05-18T00:37:04Z| 35.4376190000|139.4084540000| 67.816| -| -|
-|DSC05196.JPG |2017-05-18T09:37:52Z|2017-05-18T00:37:32Z| 35.4376820000|139.4085150000| 68.610| -| -|
-|DSC05197.JPG |2017-05-18T09:38:18Z|2017-05-18T00:37:58Z| 35.4377770000|139.4086780000| 66.243| -| -|
-|DSC05198.JPG |2017-05-18T09:38:22Z|2017-05-18T00:38:02Z| 35.4377680000|139.4086840000| 67.086| -| -|
-|DSC05199.JPG |2017-05-18T09:38:28Z|2017-05-18T00:38:08Z| 35.4377680000|139.4086970000| 67.788| -| -|
-|DSC05200.JPG |2017-05-18T09:38:48Z|2017-05-18T00:38:28Z| 35.4376200000|139.4087570000| 69.652| -| -|
-|DSC05201.JPG |2017-05-18T09:38:52Z|2017-05-18T00:38:32Z| 35.4375980000|139.4087640000| 69.565| -| -|
-|DSC05202.JPG |2017-05-18T09:39:00Z|2017-05-18T00:38:40Z| 35.4375630000|139.4087800000| 68.890| -| -|
-|DSC05203.JPG |2017-05-18T09:39:24Z|2017-05-18T00:39:04Z| 35.4372650000|139.4087430000| 69.999| -| -|
-|DSC05204.JPG |2017-05-18T09:47:08Z|2017-05-18T00:46:48Z| 35.4368560000|139.4082190000| 68.637| -| -|
-|DSC05205.JPG |2017-05-18T09:48:24Z|2017-05-18T00:48:04Z| | | | | |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05183.JPG'
-[debug] exifTime = '2017:05:18 09:16:48' <--> '2017:05:18 09:16:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05184.JPG'
-[debug] exifTime = '2017:05:18 09:34:44' <--> '2017:05:18 09:34:44'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05196.JPG'
-[debug] exifTime = '2017:05:18 09:37:32' <--> '2017:05:18 09:37:32'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05204.JPG'
-[debug] exifTime = '2017:05:18 09:46:48' <--> '2017:05:18 09:46:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05205.JPG'
-[debug] exifTime = '2017:05:18 09:48:04' <--> '2017:05:18 09:48:04'
-
diff --git a/importPicture/testdata/AdjustTime.20170518.B1.ini b/importPicture/testdata/AdjustTime.20170518.B1.ini
deleted file mode 100644
index 0b37f82..0000000
--- a/importPicture/testdata/AdjustTime.20170518.B1.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sat Jun 24 20:33:37 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=false
-IMG.OUTPUT_ALL=false
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-18T00\:20\:30Z
-GPX.OVERWRITE_MAGVAR=false
-GPX.REUSE=false
-IMG.BASE_FILE=20170518_092031A.jpg
-IMG.SOURCE_FOLDER=testdata/cameradata
-GPX.SOURCE_FOLDER=testdata/cameradata/20170518.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.20170518.B1.log b/importPicture/testdata/AdjustTime.20170518.B1.log
deleted file mode 100644
index acb2d9b..0000000
--- a/importPicture/testdata/AdjustTime.20170518.B1.log
+++ /dev/null
@@ -1,93 +0,0 @@
-テストパターン : [B1].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時
- tarFilePath = testdata/WiMiUS20170518.tar.gz
- gpxSourcePath = testdata/20170518.gpx
- gpxDestinationPath = testdata/cameradata/20170518.gpx
- iniFilePath = testdata/AdjustTime.20170518.B1.ini
-Param File = 'testdata/AdjustTime.20170518.B1.ini'
- - param： IMG.TIME=2017-05-18T00:20:30Z
- - param： IMG.BASE_FILE=20170518_092031A.jpg
- - param： GPX.BASETIME=FILE_UPDATE
- - param： IMG.SOURCE_FOLDER=testdata/cameradata
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=false
- - param： GPX.OUTPUT_SPEED=false
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx
- 時差: -32400(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170517_153708A.jpg |2017-05-17T15:37:08Z|2017-05-17T06:37:08Z| | | | | |
-|20170518_092031A.jpg |2017-05-18T09:20:30Z|2017-05-18T00:20:30Z| | | | | |
-|20170518_094226A_snap.jpg |2017-05-18T09:42:26Z|2017-05-18T00:42:26Z| 35.4366860000|139.4082650000| 61.958| -| -|
-|20170518_094230A.jpg |2017-05-18T09:42:30Z|2017-05-18T00:42:30Z| 35.4366840000|139.4082500000| 61.700| -| -|
-|20170518_094235A.jpg |2017-05-18T09:42:34Z|2017-05-18T00:42:34Z| 35.4366880000|139.4082510000| 60.970| -| -|
-|20170518_094239A.jpg |2017-05-18T09:42:38Z|2017-05-18T00:42:38Z| 35.4366920000|139.4082490000| 60.564| -| -|
-|20170518_094243A.jpg |2017-05-18T09:42:42Z|2017-05-18T00:42:42Z| 35.4367100000|139.4082430000| 60.497| -| -|
-|20170518_094248A.jpg |2017-05-18T09:42:48Z|2017-05-18T00:42:48Z| 35.4367510000|139.4082460000| 60.755| -| -|
-|20170518_094252A.jpg |2017-05-18T09:42:52Z|2017-05-18T00:42:52Z| 35.4367750000|139.4082250000| 60.034| -| -|
-|20170518_094256A.jpg |2017-05-18T09:42:56Z|2017-05-18T00:42:56Z| 35.4368010000|139.4082140000| 59.186| -| -|
-|20170518_094300A.jpg |2017-05-18T09:43:00Z|2017-05-18T00:43:00Z| 35.4368290000|139.4082170000| 59.608| -| -|
-|20170518_094305A.jpg |2017-05-18T09:43:04Z|2017-05-18T00:43:04Z| 35.4368690000|139.4082180000| 59.641| -| -|
-|20170518_094309A.jpg |2017-05-18T09:43:08Z|2017-05-18T00:43:08Z| 35.4369020000|139.4082280000| 60.149| -| -|
-|20170518_094313A.jpg |2017-05-18T09:43:12Z|2017-05-18T00:43:12Z| 35.4369510000|139.4082380000| 61.838| -| -|
-|20170518_094318A.jpg |2017-05-18T09:43:18Z|2017-05-18T00:43:18Z| 35.4370030000|139.4082700000| 64.454| -| -|
-|20170518_094322A.jpg |2017-05-18T09:43:22Z|2017-05-18T00:43:22Z| 35.4370310000|139.4082910000| 66.074| -| -|
-|20170518_094326A.jpg |2017-05-18T09:43:26Z|2017-05-18T00:43:26Z| 35.4370530000|139.4083160000| 66.428| -| -|
-|20170518_094332A.jpg |2017-05-18T09:43:32Z|2017-05-18T00:43:32Z| 35.4370790000|139.4083410000| 66.419| -| -|
-|20170518_094336A.jpg |2017-05-18T09:43:36Z|2017-05-18T00:43:36Z| 35.4371070000|139.4083470000| 66.384| -| -|
-|20170518_094340A.jpg |2017-05-18T09:43:40Z|2017-05-18T00:43:40Z| 35.4371310000|139.4083400000| 66.488| -| -|
-|20170518_094352A.jpg |2017-05-18T09:43:52Z|2017-05-18T00:43:52Z| 35.4371940000|139.4083500000| 68.267| -| -|
-|20170518_094357A.jpg |2017-05-18T09:43:56Z|2017-05-18T00:43:56Z| 35.4372240000|139.4083580000| 69.006| -| -|
-|20170518_094401A.jpg |2017-05-18T09:44:00Z|2017-05-18T00:44:00Z| 35.4372560000|139.4083600000| 68.477| -| -|
-|20170518_094405A.jpg |2017-05-18T09:44:04Z|2017-05-18T00:44:04Z| 35.4372910000|139.4083820000| 68.966| -| -|
-|20170518_094410A.jpg |2017-05-18T09:44:10Z|2017-05-18T00:44:10Z| 35.4373480000|139.4084020000| 71.281| -| -|
-|20170518_094418A.jpg |2017-05-18T09:44:18Z|2017-05-18T00:44:18Z| 35.4373910000|139.4084280000| 72.327| -| -|
-|20170518_094422A.jpg |2017-05-18T09:44:22Z|2017-05-18T00:44:22Z| 35.4374130000|139.4084290000| 72.864| -| -|
-|20170518_094427A.jpg |2017-05-18T09:44:26Z|2017-05-18T00:44:26Z| 35.4374290000|139.4084330000| 73.037| -| -|
-|20170518_094431A.jpg |2017-05-18T09:44:30Z|2017-05-18T00:44:30Z| 35.4374440000|139.4084380000| 74.372| -| -|
-|20170518_094435A.jpg |2017-05-18T09:44:34Z|2017-05-18T00:44:34Z| 35.4374640000|139.4084300000| 74.478| -| -|
-|20170518_094440A.jpg |2017-05-18T09:44:40Z|2017-05-18T00:44:40Z| 35.4374820000|139.4084610000| 74.989| -| -|
-|20170518_094444A.jpg |2017-05-18T09:44:44Z|2017-05-18T00:44:44Z| 35.4374660000|139.4084760000| 75.505| -| -|
-|20170518_094448A.jpg |2017-05-18T09:44:48Z|2017-05-18T00:44:48Z| 35.4374590000|139.4084720000| 77.319| -| -|
-|20170518_094452A.jpg |2017-05-18T09:44:52Z|2017-05-18T00:44:52Z| 35.4374410000|139.4084730000| 78.333| -| -|
-|20170518_094457A.jpg |2017-05-18T09:44:56Z|2017-05-18T00:44:56Z| 35.4374170000|139.4084750000| 78.086| -| -|
-|20170518_094501A.jpg |2017-05-18T09:45:00Z|2017-05-18T00:45:00Z| 35.4373940000|139.4084600000| 77.169| -| -|
-|20170518_094505A.jpg |2017-05-18T09:45:04Z|2017-05-18T00:45:04Z| 35.4373720000|139.4084510000| 77.476| -| -|
-|20170518_094509A.jpg |2017-05-18T09:45:10Z|2017-05-18T00:45:10Z| 35.4373380000|139.4084390000| 76.312| -| -|
-|20170518_094514A.jpg |2017-05-18T09:45:14Z|2017-05-18T00:45:14Z| 35.4372990000|139.4084320000| 76.043| -| -|
-|20170518_094518A.jpg |2017-05-18T09:45:18Z|2017-05-18T00:45:18Z| 35.4372460000|139.4084230000| 75.330| -| -|
-|20170518_094522A.jpg |2017-05-18T09:45:22Z|2017-05-18T00:45:22Z| 35.4371980000|139.4084180000| 75.431| -| -|
-|20170518_094527A.jpg |2017-05-18T09:45:26Z|2017-05-18T00:45:26Z| 35.4371630000|139.4084100000| 76.060| -| -|
-|20170518_094531A.jpg |2017-05-18T09:45:30Z|2017-05-18T00:45:30Z| 35.4371360000|139.4083960000| 76.469| -| -|
-|20170518_094535A.jpg |2017-05-18T09:45:34Z|2017-05-18T00:45:34Z| 35.4371100000|139.4083820000| 76.606| -| -|
-|20170518_094539A.jpg |2017-05-18T09:45:40Z|2017-05-18T00:45:40Z| 35.4370480000|139.4083650000| 75.932| -| -|
-|20170518_094544A.jpg |2017-05-18T09:45:44Z|2017-05-18T00:45:44Z| 35.4370160000|139.4083570000| 76.083| -| -|
-|20170518_094733A_snap.jpg |2017-05-18T09:47:32Z|2017-05-18T00:47:32Z| 35.4368190000|139.4082730000| 65.510| -| -|
-|20170518_094737A.jpg |2017-05-18T09:47:36Z|2017-05-18T00:47:36Z| 35.4368200000|139.4082810000| 65.185| -| -|
-|20170518_094827A.jpg |2017-05-18T09:48:26Z|2017-05-18T00:48:26Z| | | | | |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_092031A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094226A_snap.jpg'
-[debug] exifTime = '2017:05:18 09:42:26' <--> '2017:05:18 09:42:26'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094737A.jpg'
-[debug] exifTime = '2017:05:18 09:47:36' <--> '2017:05:18 09:47:36'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094827A.jpg'
-
diff --git a/importPicture/testdata/AdjustTime.20170518.B2.ini b/importPicture/testdata/AdjustTime.20170518.B2.ini
deleted file mode 100644
index 502984d..0000000
--- a/importPicture/testdata/AdjustTime.20170518.B2.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sat Jun 24 20:33:37 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=false
-IMG.OUTPUT_ALL=true
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-18T00\:20\:30Z
-GPX.OVERWRITE_MAGVAR=false
-GPX.REUSE=false
-IMG.BASE_FILE=20170518_092031A.jpg
-IMG.SOURCE_FOLDER=testdata/cameradata
-GPX.SOURCE_FOLDER=testdata/cameradata/20170518.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.20170518.B2.log b/importPicture/testdata/AdjustTime.20170518.B2.log
deleted file mode 100644
index 32dfd3b..0000000
--- a/importPicture/testdata/AdjustTime.20170518.B2.log
+++ /dev/null
@@ -1,95 +0,0 @@
-テストパターン : [B2].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時
- tarFilePath = testdata/WiMiUS20170518.tar.gz
- gpxSourcePath = testdata/20170518.gpx
- gpxDestinationPath = testdata/cameradata/20170518.gpx
- iniFilePath = testdata/AdjustTime.20170518.B2.ini
-Param File = 'testdata/AdjustTime.20170518.B2.ini'
- - param： IMG.TIME=2017-05-18T00:20:30Z
- - param： IMG.BASE_FILE=20170518_092031A.jpg
- - param： GPX.BASETIME=FILE_UPDATE
- - param： IMG.SOURCE_FOLDER=testdata/cameradata
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=false
- - param： GPX.OUTPUT_SPEED=false
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx
- 時差: -32400(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170517_153708A.jpg |2017-05-17T15:37:08Z|2017-05-17T06:37:08Z| | | | | |
-|20170518_092031A.jpg |2017-05-18T09:20:30Z|2017-05-18T00:20:30Z| | | | | |
-|20170518_094226A_snap.jpg |2017-05-18T09:42:26Z|2017-05-18T00:42:26Z| 35.4366860000|139.4082650000| 61.958| -| -|
-|20170518_094230A.jpg |2017-05-18T09:42:30Z|2017-05-18T00:42:30Z| 35.4366840000|139.4082500000| 61.700| -| -|
-|20170518_094235A.jpg |2017-05-18T09:42:34Z|2017-05-18T00:42:34Z| 35.4366880000|139.4082510000| 60.970| -| -|
-|20170518_094239A.jpg |2017-05-18T09:42:38Z|2017-05-18T00:42:38Z| 35.4366920000|139.4082490000| 60.564| -| -|
-|20170518_094243A.jpg |2017-05-18T09:42:42Z|2017-05-18T00:42:42Z| 35.4367100000|139.4082430000| 60.497| -| -|
-|20170518_094248A.jpg |2017-05-18T09:42:48Z|2017-05-18T00:42:48Z| 35.4367510000|139.4082460000| 60.755| -| -|
-|20170518_094252A.jpg |2017-05-18T09:42:52Z|2017-05-18T00:42:52Z| 35.4367750000|139.4082250000| 60.034| -| -|
-|20170518_094256A.jpg |2017-05-18T09:42:56Z|2017-05-18T00:42:56Z| 35.4368010000|139.4082140000| 59.186| -| -|
-|20170518_094300A.jpg |2017-05-18T09:43:00Z|2017-05-18T00:43:00Z| 35.4368290000|139.4082170000| 59.608| -| -|
-|20170518_094305A.jpg |2017-05-18T09:43:04Z|2017-05-18T00:43:04Z| 35.4368690000|139.4082180000| 59.641| -| -|
-|20170518_094309A.jpg |2017-05-18T09:43:08Z|2017-05-18T00:43:08Z| 35.4369020000|139.4082280000| 60.149| -| -|
-|20170518_094313A.jpg |2017-05-18T09:43:12Z|2017-05-18T00:43:12Z| 35.4369510000|139.4082380000| 61.838| -| -|
-|20170518_094318A.jpg |2017-05-18T09:43:18Z|2017-05-18T00:43:18Z| 35.4370030000|139.4082700000| 64.454| -| -|
-|20170518_094322A.jpg |2017-05-18T09:43:22Z|2017-05-18T00:43:22Z| 35.4370310000|139.4082910000| 66.074| -| -|
-|20170518_094326A.jpg |2017-05-18T09:43:26Z|2017-05-18T00:43:26Z| 35.4370530000|139.4083160000| 66.428| -| -|
-|20170518_094332A.jpg |2017-05-18T09:43:32Z|2017-05-18T00:43:32Z| 35.4370790000|139.4083410000| 66.419| -| -|
-|20170518_094336A.jpg |2017-05-18T09:43:36Z|2017-05-18T00:43:36Z| 35.4371070000|139.4083470000| 66.384| -| -|
-|20170518_094340A.jpg |2017-05-18T09:43:40Z|2017-05-18T00:43:40Z| 35.4371310000|139.4083400000| 66.488| -| -|
-|20170518_094352A.jpg |2017-05-18T09:43:52Z|2017-05-18T00:43:52Z| 35.4371940000|139.4083500000| 68.267| -| -|
-|20170518_094357A.jpg |2017-05-18T09:43:56Z|2017-05-18T00:43:56Z| 35.4372240000|139.4083580000| 69.006| -| -|
-|20170518_094401A.jpg |2017-05-18T09:44:00Z|2017-05-18T00:44:00Z| 35.4372560000|139.4083600000| 68.477| -| -|
-|20170518_094405A.jpg |2017-05-18T09:44:04Z|2017-05-18T00:44:04Z| 35.4372910000|139.4083820000| 68.966| -| -|
-|20170518_094410A.jpg |2017-05-18T09:44:10Z|2017-05-18T00:44:10Z| 35.4373480000|139.4084020000| 71.281| -| -|
-|20170518_094418A.jpg |2017-05-18T09:44:18Z|2017-05-18T00:44:18Z| 35.4373910000|139.4084280000| 72.327| -| -|
-|20170518_094422A.jpg |2017-05-18T09:44:22Z|2017-05-18T00:44:22Z| 35.4374130000|139.4084290000| 72.864| -| -|
-|20170518_094427A.jpg |2017-05-18T09:44:26Z|2017-05-18T00:44:26Z| 35.4374290000|139.4084330000| 73.037| -| -|
-|20170518_094431A.jpg |2017-05-18T09:44:30Z|2017-05-18T00:44:30Z| 35.4374440000|139.4084380000| 74.372| -| -|
-|20170518_094435A.jpg |2017-05-18T09:44:34Z|2017-05-18T00:44:34Z| 35.4374640000|139.4084300000| 74.478| -| -|
-|20170518_094440A.jpg |2017-05-18T09:44:40Z|2017-05-18T00:44:40Z| 35.4374820000|139.4084610000| 74.989| -| -|
-|20170518_094444A.jpg |2017-05-18T09:44:44Z|2017-05-18T00:44:44Z| 35.4374660000|139.4084760000| 75.505| -| -|
-|20170518_094448A.jpg |2017-05-18T09:44:48Z|2017-05-18T00:44:48Z| 35.4374590000|139.4084720000| 77.319| -| -|
-|20170518_094452A.jpg |2017-05-18T09:44:52Z|2017-05-18T00:44:52Z| 35.4374410000|139.4084730000| 78.333| -| -|
-|20170518_094457A.jpg |2017-05-18T09:44:56Z|2017-05-18T00:44:56Z| 35.4374170000|139.4084750000| 78.086| -| -|
-|20170518_094501A.jpg |2017-05-18T09:45:00Z|2017-05-18T00:45:00Z| 35.4373940000|139.4084600000| 77.169| -| -|
-|20170518_094505A.jpg |2017-05-18T09:45:04Z|2017-05-18T00:45:04Z| 35.4373720000|139.4084510000| 77.476| -| -|
-|20170518_094509A.jpg |2017-05-18T09:45:10Z|2017-05-18T00:45:10Z| 35.4373380000|139.4084390000| 76.312| -| -|
-|20170518_094514A.jpg |2017-05-18T09:45:14Z|2017-05-18T00:45:14Z| 35.4372990000|139.4084320000| 76.043| -| -|
-|20170518_094518A.jpg |2017-05-18T09:45:18Z|2017-05-18T00:45:18Z| 35.4372460000|139.4084230000| 75.330| -| -|
-|20170518_094522A.jpg |2017-05-18T09:45:22Z|2017-05-18T00:45:22Z| 35.4371980000|139.4084180000| 75.431| -| -|
-|20170518_094527A.jpg |2017-05-18T09:45:26Z|2017-05-18T00:45:26Z| 35.4371630000|139.4084100000| 76.060| -| -|
-|20170518_094531A.jpg |2017-05-18T09:45:30Z|2017-05-18T00:45:30Z| 35.4371360000|139.4083960000| 76.469| -| -|
-|20170518_094535A.jpg |2017-05-18T09:45:34Z|2017-05-18T00:45:34Z| 35.4371100000|139.4083820000| 76.606| -| -|
-|20170518_094539A.jpg |2017-05-18T09:45:40Z|2017-05-18T00:45:40Z| 35.4370480000|139.4083650000| 75.932| -| -|
-|20170518_094544A.jpg |2017-05-18T09:45:44Z|2017-05-18T00:45:44Z| 35.4370160000|139.4083570000| 76.083| -| -|
-|20170518_094733A_snap.jpg |2017-05-18T09:47:32Z|2017-05-18T00:47:32Z| 35.4368190000|139.4082730000| 65.510| -| -|
-|20170518_094737A.jpg |2017-05-18T09:47:36Z|2017-05-18T00:47:36Z| 35.4368200000|139.4082810000| 65.185| -| -|
-|20170518_094827A.jpg |2017-05-18T09:48:26Z|2017-05-18T00:48:26Z| | | | | |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_092031A.jpg'
-[debug] exifTime = '2017:05:18 09:20:30' <--> '2017:05:18 09:20:30'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094226A_snap.jpg'
-[debug] exifTime = '2017:05:18 09:42:26' <--> '2017:05:18 09:42:26'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094737A.jpg'
-[debug] exifTime = '2017:05:18 09:47:36' <--> '2017:05:18 09:47:36'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094827A.jpg'
-[debug] exifTime = '2017:05:18 09:48:26' <--> '2017:05:18 09:48:26'
-
diff --git a/importPicture/testdata/AdjustTime.20170518.ini b/importPicture/testdata/AdjustTime.20170518.ini
deleted file mode 100644
index 0b37f82..0000000
--- a/importPicture/testdata/AdjustTime.20170518.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sat Jun 24 20:33:37 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=false
-IMG.OUTPUT_ALL=false
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-18T00\:20\:30Z
-GPX.OVERWRITE_MAGVAR=false
-GPX.REUSE=false
-IMG.BASE_FILE=20170518_092031A.jpg
-IMG.SOURCE_FOLDER=testdata/cameradata
-GPX.SOURCE_FOLDER=testdata/cameradata/20170518.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.M1a.separate.ini b/importPicture/testdata/AdjustTime.M1a.separate.ini
deleted file mode 100644
index 25e9f7c..0000000
--- a/importPicture/testdata/AdjustTime.M1a.separate.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sun Jun 25 09:32:18 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=true
-IMG.OUTPUT_ALL=false
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-29T01\:31\:46Z
-GPX.OVERWRITE_MAGVAR=true
-GPX.REUSE=false
-IMG.BASE_FILE=20170529_103146A.jpg
-IMG.SOURCE_FOLDER=testdata/cameradata/separate
-GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.M1a.separate.log b/importPicture/testdata/AdjustTime.M1a.separate.log
deleted file mode 100644
index 3f2c98e..0000000
--- a/importPicture/testdata/AdjustTime.M1a.separate.log
+++ /dev/null
@@ -1,104 +0,0 @@
-テストパターン : [M1a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado
- tarFilePath = testdata/separate.tar.gz
- gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml
- gpxDestinationPath = testdata/cameradata/separate.gpx
- iniFilePath = testdata/AdjustTime.M1a.separate.ini
-Param File = 'testdata/AdjustTime.M1a.separate.ini'
- - param： IMG.TIME=2017-05-29T01:31:46Z
- - param： IMG.BASE_FILE=20170529_103146A.jpg
- - param： GPX.BASETIME=FILE_UPDATE
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=false
- - param： GPX.OUTPUT_SPEED=false
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
- 時差: -32400(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z| | | | | |
-|20170529_102310A.jpg |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z| | | | | |
-|20170529_102314A.jpg |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z| | | | | |
-|20170529_102318A.jpg |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -|
-|20170529_102322A.jpg |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -|
-|20170529_102401A.jpg |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493| 685.56| -| -|
-|20170529_102405A.jpg |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332| 687.00| -| -|
-|20170529_102409A.jpg |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z| | | | | |
-|20170529_102414A.jpg |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z| | | | | |
-|20170529_102418A.jpg |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z| | | | | |
-|20170529_102448A.jpg |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -|
-|20170529_102518A.jpg |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102547A.jpg |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102618A.jpg |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102647A.jpg |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102717A.jpg |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102747A.jpg |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102817A.jpg |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102847A.jpg |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102917A.jpg |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102947A.jpg |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103016A.jpg |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103046A.jpg |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103116A.jpg |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103146A.jpg |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103216A.jpg |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -|
-|20170529_103246A.jpg |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -|
-|20170529_103315A.jpg |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z| | | | | |
-|20170529_103345A.jpg |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z| | | | | |
-|20170529_103415A.jpg |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z| | | | | |
-|20170529_103445A.jpg |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z| | | | | |
-|20170529_103515A.jpg |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z| | | | | |
-|20170529_103545A.jpg |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z| | | | | |
-|20170529_103615A.jpg |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -|
-|20170529_103645A.jpg |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -|
-|20170529_103714A.jpg |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -|
-|20170529_103744A.jpg |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -|
-|20170529_103814A.jpg |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -|
-|20170529_103844A.jpg |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -|
-|20170529_103914A.jpg |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -|
-|20170529_103944A.jpg |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -|
-|20170529_104014A.jpg |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -|
-|20170529_104048A.jpg |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -|
-|20170529_104119A.jpg |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050| 793.71| -| -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
-
diff --git a/importPicture/testdata/AdjustTime.M1b.separate.ini b/importPicture/testdata/AdjustTime.M1b.separate.ini
deleted file mode 100644
index 12b8aed..0000000
--- a/importPicture/testdata/AdjustTime.M1b.separate.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sun Jun 25 09:32:18 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=true
-IMG.OUTPUT_ALL=true
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-29T01\:31\:46Z
-GPX.OVERWRITE_MAGVAR=true
-GPX.REUSE=false
-IMG.BASE_FILE=20170529_103146A.jpg
-IMG.SOURCE_FOLDER=testdata/cameradata/separate
-GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.M1b.separate.log b/importPicture/testdata/AdjustTime.M1b.separate.log
deleted file mode 100644
index f6b7c95..0000000
--- a/importPicture/testdata/AdjustTime.M1b.separate.log
+++ /dev/null
@@ -1,110 +0,0 @@
-テストパターン : [M1b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado
- tarFilePath = testdata/separate.tar.gz
- gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml
- gpxDestinationPath = testdata/cameradata/separate.gpx
- iniFilePath = testdata/AdjustTime.M1b.separate.ini
-Param File = 'testdata/AdjustTime.M1b.separate.ini'
- - param： IMG.TIME=2017-05-29T01:31:46Z
- - param： IMG.BASE_FILE=20170529_103146A.jpg
- - param： GPX.BASETIME=FILE_UPDATE
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=true
- - param： GPX.OUTPUT_SPEED=true
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
- 時差: -32400(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z| | | | | |
-|20170529_102310A.jpg |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z| | | | | |
-|20170529_102314A.jpg |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z| | | | | |
-|20170529_102318A.jpg |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -|
-|20170529_102322A.jpg |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -|
-|20170529_102401A.jpg |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493| 685.56| -| -|
-|20170529_102405A.jpg |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332| 687.00| -| -|
-|20170529_102409A.jpg |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z| | | | | |
-|20170529_102414A.jpg |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z| | | | | |
-|20170529_102418A.jpg |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z| | | | | |
-|20170529_102448A.jpg |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -|
-|20170529_102518A.jpg |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102547A.jpg |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102618A.jpg |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102647A.jpg |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102717A.jpg |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102747A.jpg |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102817A.jpg |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102847A.jpg |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102917A.jpg |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102947A.jpg |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103016A.jpg |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103046A.jpg |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103116A.jpg |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103146A.jpg |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103216A.jpg |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -|
-|20170529_103246A.jpg |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -|
-|20170529_103315A.jpg |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z| | | | | |
-|20170529_103345A.jpg |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z| | | | | |
-|20170529_103415A.jpg |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z| | | | | |
-|20170529_103445A.jpg |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z| | | | | |
-|20170529_103515A.jpg |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z| | | | | |
-|20170529_103545A.jpg |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z| | | | | |
-|20170529_103615A.jpg |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -|
-|20170529_103645A.jpg |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -|
-|20170529_103714A.jpg |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -|
-|20170529_103744A.jpg |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -|
-|20170529_103814A.jpg |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -|
-|20170529_103844A.jpg |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -|
-|20170529_103914A.jpg |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -|
-|20170529_103944A.jpg |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -|
-|20170529_104014A.jpg |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -|
-|20170529_104048A.jpg |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -|
-|20170529_104119A.jpg |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050| 793.71| -| -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[debug] exifTime = '2017:05:29 10:23:06' <--> '2017:05:29 10:23:06'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[debug] exifTime = '2017:05:29 10:24:10' <--> '2017:05:29 10:24:10'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[debug] exifTime = '2017:05:29 10:33:14' <--> '2017:05:29 10:33:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[debug] exifTime = '2017:05:29 10:35:44' <--> '2017:05:29 10:35:44'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
-
diff --git a/importPicture/testdata/AdjustTime.M1c.separate.ini b/importPicture/testdata/AdjustTime.M1c.separate.ini
deleted file mode 100644
index f432ba7..0000000
--- a/importPicture/testdata/AdjustTime.M1c.separate.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sun Jun 25 09:32:18 JST 2017
-GPX.BASETIME=EXIF_TIME
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=true
-IMG.OUTPUT_ALL=false
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-29T01\:31\:46Z
-GPX.OVERWRITE_MAGVAR=true
-GPX.REUSE=false
-IMG.BASE_FILE=20170529_103146A.jpg
-IMG.SOURCE_FOLDER=testdata/cameradata/separate
-GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.M1c.separate.log b/importPicture/testdata/AdjustTime.M1c.separate.log
deleted file mode 100644
index 92f0f3b..0000000
--- a/importPicture/testdata/AdjustTime.M1c.separate.log
+++ /dev/null
@@ -1,104 +0,0 @@
-テストパターン : [M1c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado
- tarFilePath = testdata/separate.tar.gz
- gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml
- gpxDestinationPath = testdata/cameradata/separate.gpx
- iniFilePath = testdata/AdjustTime.M1c.separate.ini
-Param File = 'testdata/AdjustTime.M1c.separate.ini'
- - param： IMG.TIME=2017-05-29T01:31:46Z
- - param： IMG.BASE_FILE=20170529_103146A.jpg
- - param： GPX.BASETIME=EXIF_TIME
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=true
- - param： GPX.OUTPUT_SPEED=true
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
- 時差: 0(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z| | | | | |
-|20170529_102310A.jpg |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z| | | | | |
-|20170529_102314A.jpg |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z| | | | | |
-|20170529_102318A.jpg |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -|
-|20170529_102322A.jpg |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -|
-|20170529_102401A.jpg |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035| 685.56| -| -|
-|20170529_102405A.jpg |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169| 687.48| -| -|
-|20170529_102409A.jpg |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z| | | | | |
-|20170529_102414A.jpg |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z| | | | | |
-|20170529_102418A.jpg |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z| | | | | |
-|20170529_102448A.jpg |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -|
-|20170529_102518A.jpg |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102547A.jpg |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102618A.jpg |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102647A.jpg |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102717A.jpg |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102747A.jpg |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102817A.jpg |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102847A.jpg |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102917A.jpg |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102947A.jpg |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103016A.jpg |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103046A.jpg |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103116A.jpg |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103146A.jpg |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103216A.jpg |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -|
-|20170529_103246A.jpg |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -|
-|20170529_103315A.jpg |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z| | | | | |
-|20170529_103345A.jpg |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z| | | | | |
-|20170529_103415A.jpg |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z| | | | | |
-|20170529_103445A.jpg |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z| | | | | |
-|20170529_103515A.jpg |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z| | | | | |
-|20170529_103545A.jpg |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z| | | | | |
-|20170529_103615A.jpg |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -|
-|20170529_103645A.jpg |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -|
-|20170529_103714A.jpg |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -|
-|20170529_103744A.jpg |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -|
-|20170529_103814A.jpg |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -|
-|20170529_103844A.jpg |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -|
-|20170529_103914A.jpg |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -|
-|20170529_103944A.jpg |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -|
-|20170529_104014A.jpg |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -|
-|20170529_104048A.jpg |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -|
-|20170529_104119A.jpg |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639| 793.71| -| -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
-
diff --git a/importPicture/testdata/AdjustTime.M1d.separate.ini b/importPicture/testdata/AdjustTime.M1d.separate.ini
deleted file mode 100644
index d0ab153..0000000
--- a/importPicture/testdata/AdjustTime.M1d.separate.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sun Jun 25 09:32:18 JST 2017
-GPX.BASETIME=EXIF_TIME
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=true
-IMG.OUTPUT_ALL=true
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-29T01\:31\:46Z
-GPX.OVERWRITE_MAGVAR=true
-GPX.REUSE=false
-IMG.BASE_FILE=20170529_103146A.jpg
-IMG.SOURCE_FOLDER=testdata/cameradata/separate
-GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.M1d.separate.log b/importPicture/testdata/AdjustTime.M1d.separate.log
deleted file mode 100644
index 0a41943..0000000
--- a/importPicture/testdata/AdjustTime.M1d.separate.log
+++ /dev/null
@@ -1,110 +0,0 @@
-テストパターン : [M1d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado
- tarFilePath = testdata/separate.tar.gz
- gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml
- gpxDestinationPath = testdata/cameradata/separate.gpx
- iniFilePath = testdata/AdjustTime.M1d.separate.ini
-Param File = 'testdata/AdjustTime.M1d.separate.ini'
- - param： IMG.TIME=2017-05-29T01:31:46Z
- - param： IMG.BASE_FILE=20170529_103146A.jpg
- - param： GPX.BASETIME=EXIF_TIME
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=true
- - param： GPX.OUTPUT_SPEED=true
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
- 時差: 0(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z| | | | | |
-|20170529_102310A.jpg |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z| | | | | |
-|20170529_102314A.jpg |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z| | | | | |
-|20170529_102318A.jpg |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -|
-|20170529_102322A.jpg |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -|
-|20170529_102401A.jpg |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035| 685.56| -| -|
-|20170529_102405A.jpg |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169| 687.48| -| -|
-|20170529_102409A.jpg |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z| | | | | |
-|20170529_102414A.jpg |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z| | | | | |
-|20170529_102418A.jpg |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z| | | | | |
-|20170529_102448A.jpg |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -|
-|20170529_102518A.jpg |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102547A.jpg |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102618A.jpg |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102647A.jpg |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102717A.jpg |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102747A.jpg |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102817A.jpg |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102847A.jpg |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102917A.jpg |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102947A.jpg |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103016A.jpg |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103046A.jpg |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103116A.jpg |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103146A.jpg |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103216A.jpg |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -|
-|20170529_103246A.jpg |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -|
-|20170529_103315A.jpg |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z| | | | | |
-|20170529_103345A.jpg |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z| | | | | |
-|20170529_103415A.jpg |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z| | | | | |
-|20170529_103445A.jpg |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z| | | | | |
-|20170529_103515A.jpg |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z| | | | | |
-|20170529_103545A.jpg |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z| | | | | |
-|20170529_103615A.jpg |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -|
-|20170529_103645A.jpg |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -|
-|20170529_103714A.jpg |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -|
-|20170529_103744A.jpg |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -|
-|20170529_103814A.jpg |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -|
-|20170529_103844A.jpg |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -|
-|20170529_103914A.jpg |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -|
-|20170529_103944A.jpg |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -|
-|20170529_104014A.jpg |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -|
-|20170529_104048A.jpg |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -|
-|20170529_104119A.jpg |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639| 793.71| -| -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[debug] exifTime = '2017:05:29 10:23:05' <--> '2017:05:29 10:23:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[debug] exifTime = '2017:05:29 10:24:09' <--> '2017:05:29 10:24:09'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[debug] exifTime = '2017:05:29 10:33:15' <--> '2017:05:29 10:33:15'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[debug] exifTime = '2017:05:29 10:35:45' <--> '2017:05:29 10:35:45'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
-
diff --git a/importPicture/testdata/AdjustTime.M2a.separate.ini b/importPicture/testdata/AdjustTime.M2a.separate.ini
deleted file mode 100644
index 25e9f7c..0000000
--- a/importPicture/testdata/AdjustTime.M2a.separate.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sun Jun 25 09:32:18 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=true
-IMG.OUTPUT_ALL=false
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-29T01\:31\:46Z
-GPX.OVERWRITE_MAGVAR=true
-GPX.REUSE=false
-IMG.BASE_FILE=20170529_103146A.jpg
-IMG.SOURCE_FOLDER=testdata/cameradata/separate
-GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.M2a.separate.log b/importPicture/testdata/AdjustTime.M2a.separate.log
deleted file mode 100644
index 5e7d117..0000000
--- a/importPicture/testdata/AdjustTime.M2a.separate.log
+++ /dev/null
@@ -1,210 +0,0 @@
-テストパターン : [M2a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J
- tarFilePath = testdata/separate.tar.gz
- gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml
- gpxDestinationPath = testdata/cameradata/separate.gpx
- iniFilePath = testdata/AdjustTime.M2a.separate.ini
-Param File = 'testdata/AdjustTime.M2a.separate.ini'
- - param： IMG.TIME=2017-05-29T01:31:46Z
- - param： IMG.BASE_FILE=20170529_103146A.jpg
- - param： GPX.BASETIME=FILE_UPDATE
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=true
- - param： GPX.OUTPUT_SPEED=true
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
- 時差: -32400(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z| | | | | |
-|20170529_102310A.jpg |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z| | | | | |
-|20170529_102314A.jpg |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z| | | | | |
-|20170529_102318A.jpg |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -|
-|20170529_102322A.jpg |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -|
-|20170529_102401A.jpg |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493| 685.56| -| -|
-|20170529_102405A.jpg |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332| 687.00| -| -|
-|20170529_102409A.jpg |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z| | | | | |
-|20170529_102414A.jpg |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z| | | | | |
-|20170529_102418A.jpg |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z| | | | | |
-|20170529_102448A.jpg |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -|
-|20170529_102518A.jpg |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102547A.jpg |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102618A.jpg |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102647A.jpg |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102717A.jpg |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102747A.jpg |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102817A.jpg |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102847A.jpg |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102917A.jpg |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102947A.jpg |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103016A.jpg |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103046A.jpg |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103116A.jpg |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103146A.jpg |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103216A.jpg |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -|
-|20170529_103246A.jpg |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -|
-|20170529_103315A.jpg |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z| | | | | |
-|20170529_103345A.jpg |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z| | | | | |
-|20170529_103415A.jpg |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z| | | | | |
-|20170529_103445A.jpg |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z| | | | | |
-|20170529_103515A.jpg |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z| | | | | |
-|20170529_103545A.jpg |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z| | | | | |
-|20170529_103615A.jpg |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -|
-|20170529_103645A.jpg |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -|
-|20170529_103714A.jpg |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -|
-|20170529_103744A.jpg |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -|
-|20170529_103814A.jpg |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -|
-|20170529_103844A.jpg |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -|
-|20170529_103914A.jpg |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -|
-|20170529_103944A.jpg |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -|
-|20170529_104014A.jpg |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -|
-|20170529_104048A.jpg |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -|
-|20170529_104119A.jpg |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050| 793.71| -| -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
-
-
-
-テストパターン : [M3a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse
- tarFilePath = testdata/separate.tar.gz
- gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
- gpxDestinationPath = testdata/cameradata/separate.gpx
- iniFilePath = testdata/AdjustTime.M2a.separate.ini
-Param File = 'testdata/AdjustTime.M2a.separate.ini'
- - param： IMG.TIME=2017-05-29T01:31:46Z
- - param： IMG.BASE_FILE=20170529_103146A.jpg
- - param： GPX.BASETIME=FILE_UPDATE
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=true
- - param： GPX.OUTPUT_SPEED=true
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
- 時差: -32400(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z| | | | | |
-|20170529_102310A.jpg |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z| | | | | |
-|20170529_102314A.jpg |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z| | | | | |
-|20170529_102318A.jpg |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -|
-|20170529_102322A.jpg |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -|
-|20170529_102401A.jpg |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493| 685.56| -| -|
-|20170529_102405A.jpg |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332| 687.00| -| -|
-|20170529_102409A.jpg |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z| | | | | |
-|20170529_102414A.jpg |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z| | | | | |
-|20170529_102418A.jpg |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z| | | | | |
-|20170529_102448A.jpg |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -|
-|20170529_102518A.jpg |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102547A.jpg |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102618A.jpg |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102647A.jpg |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102717A.jpg |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102747A.jpg |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102817A.jpg |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102847A.jpg |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102917A.jpg |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102947A.jpg |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103016A.jpg |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103046A.jpg |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103116A.jpg |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103146A.jpg |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103216A.jpg |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -|
-|20170529_103246A.jpg |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -|
-|20170529_103315A.jpg |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z| | | | | |
-|20170529_103345A.jpg |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z| | | | | |
-|20170529_103415A.jpg |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z| | | | | |
-|20170529_103445A.jpg |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z| | | | | |
-|20170529_103515A.jpg |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z| | | | | |
-|20170529_103545A.jpg |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z| | | | | |
-|20170529_103615A.jpg |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -|
-|20170529_103645A.jpg |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -|
-|20170529_103714A.jpg |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -|
-|20170529_103744A.jpg |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -|
-|20170529_103814A.jpg |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -|
-|20170529_103844A.jpg |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -|
-|20170529_103914A.jpg |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -|
-|20170529_103944A.jpg |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -|
-|20170529_104014A.jpg |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -|
-|20170529_104048A.jpg |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -|
-|20170529_104119A.jpg |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050| 793.71| -| -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
-
diff --git a/importPicture/testdata/AdjustTime.M2b.separate.ini b/importPicture/testdata/AdjustTime.M2b.separate.ini
deleted file mode 100644
index 12b8aed..0000000
--- a/importPicture/testdata/AdjustTime.M2b.separate.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sun Jun 25 09:32:18 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=true
-IMG.OUTPUT_ALL=true
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-29T01\:31\:46Z
-GPX.OVERWRITE_MAGVAR=true
-GPX.REUSE=false
-IMG.BASE_FILE=20170529_103146A.jpg
-IMG.SOURCE_FOLDER=testdata/cameradata/separate
-GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.M2b.separate.log b/importPicture/testdata/AdjustTime.M2b.separate.log
deleted file mode 100644
index 188ac42..0000000
--- a/importPicture/testdata/AdjustTime.M2b.separate.log
+++ /dev/null
@@ -1,222 +0,0 @@
-テストパターン : [M2b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J
- tarFilePath = testdata/separate.tar.gz
- gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml
- gpxDestinationPath = testdata/cameradata/separate.gpx
- iniFilePath = testdata/AdjustTime.M2b.separate.ini
-Param File = 'testdata/AdjustTime.M2b.separate.ini'
- - param： IMG.TIME=2017-05-29T01:31:46Z
- - param： IMG.BASE_FILE=20170529_103146A.jpg
- - param： GPX.BASETIME=FILE_UPDATE
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=true
- - param： GPX.OUTPUT_SPEED=true
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
- 時差: -32400(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z| | | | | |
-|20170529_102310A.jpg |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z| | | | | |
-|20170529_102314A.jpg |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z| | | | | |
-|20170529_102318A.jpg |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -|
-|20170529_102322A.jpg |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -|
-|20170529_102401A.jpg |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493| 685.56| -| -|
-|20170529_102405A.jpg |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332| 687.00| -| -|
-|20170529_102409A.jpg |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z| | | | | |
-|20170529_102414A.jpg |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z| | | | | |
-|20170529_102418A.jpg |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z| | | | | |
-|20170529_102448A.jpg |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -|
-|20170529_102518A.jpg |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102547A.jpg |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102618A.jpg |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102647A.jpg |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102717A.jpg |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102747A.jpg |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102817A.jpg |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102847A.jpg |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102917A.jpg |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102947A.jpg |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103016A.jpg |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103046A.jpg |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103116A.jpg |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103146A.jpg |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103216A.jpg |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -|
-|20170529_103246A.jpg |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -|
-|20170529_103315A.jpg |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z| | | | | |
-|20170529_103345A.jpg |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z| | | | | |
-|20170529_103415A.jpg |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z| | | | | |
-|20170529_103445A.jpg |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z| | | | | |
-|20170529_103515A.jpg |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z| | | | | |
-|20170529_103545A.jpg |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z| | | | | |
-|20170529_103615A.jpg |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -|
-|20170529_103645A.jpg |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -|
-|20170529_103714A.jpg |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -|
-|20170529_103744A.jpg |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -|
-|20170529_103814A.jpg |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -|
-|20170529_103844A.jpg |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -|
-|20170529_103914A.jpg |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -|
-|20170529_103944A.jpg |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -|
-|20170529_104014A.jpg |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -|
-|20170529_104048A.jpg |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -|
-|20170529_104119A.jpg |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050| 793.71| -| -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[debug] exifTime = '2017:05:29 10:23:06' <--> '2017:05:29 10:23:06'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[debug] exifTime = '2017:05:29 10:24:10' <--> '2017:05:29 10:24:10'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[debug] exifTime = '2017:05:29 10:33:14' <--> '2017:05:29 10:33:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[debug] exifTime = '2017:05:29 10:35:44' <--> '2017:05:29 10:35:44'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
-
-
-
-テストパターン : [M3b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse
- tarFilePath = testdata/separate.tar.gz
- gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
- gpxDestinationPath = testdata/cameradata/separate.gpx
- iniFilePath = testdata/AdjustTime.M2b.separate.ini
-Param File = 'testdata/AdjustTime.M2b.separate.ini'
- - param： IMG.TIME=2017-05-29T01:31:46Z
- - param： IMG.BASE_FILE=20170529_103146A.jpg
- - param： GPX.BASETIME=FILE_UPDATE
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=true
- - param： GPX.OUTPUT_SPEED=true
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
- 時差: -32400(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z| | | | | |
-|20170529_102310A.jpg |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z| | | | | |
-|20170529_102314A.jpg |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z| | | | | |
-|20170529_102318A.jpg |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -|
-|20170529_102322A.jpg |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -|
-|20170529_102401A.jpg |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493| 685.56| -| -|
-|20170529_102405A.jpg |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332| 687.00| -| -|
-|20170529_102409A.jpg |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z| | | | | |
-|20170529_102414A.jpg |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z| | | | | |
-|20170529_102418A.jpg |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z| | | | | |
-|20170529_102448A.jpg |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -|
-|20170529_102518A.jpg |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102547A.jpg |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102618A.jpg |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102647A.jpg |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102717A.jpg |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102747A.jpg |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102817A.jpg |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102847A.jpg |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102917A.jpg |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102947A.jpg |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103016A.jpg |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103046A.jpg |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103116A.jpg |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103146A.jpg |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103216A.jpg |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -|
-|20170529_103246A.jpg |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -|
-|20170529_103315A.jpg |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z| | | | | |
-|20170529_103345A.jpg |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z| | | | | |
-|20170529_103415A.jpg |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z| | | | | |
-|20170529_103445A.jpg |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z| | | | | |
-|20170529_103515A.jpg |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z| | | | | |
-|20170529_103545A.jpg |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z| | | | | |
-|20170529_103615A.jpg |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -|
-|20170529_103645A.jpg |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -|
-|20170529_103714A.jpg |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -|
-|20170529_103744A.jpg |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -|
-|20170529_103814A.jpg |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -|
-|20170529_103844A.jpg |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -|
-|20170529_103914A.jpg |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -|
-|20170529_103944A.jpg |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -|
-|20170529_104014A.jpg |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -|
-|20170529_104048A.jpg |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -|
-|20170529_104119A.jpg |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050| 793.71| -| -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[debug] exifTime = '2017:05:29 10:23:06' <--> '2017:05:29 10:23:06'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[debug] exifTime = '2017:05:29 10:24:10' <--> '2017:05:29 10:24:10'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[debug] exifTime = '2017:05:29 10:33:14' <--> '2017:05:29 10:33:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[debug] exifTime = '2017:05:29 10:35:44' <--> '2017:05:29 10:35:44'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18'
-
diff --git a/importPicture/testdata/AdjustTime.M2c.separate.ini b/importPicture/testdata/AdjustTime.M2c.separate.ini
deleted file mode 100644
index f432ba7..0000000
--- a/importPicture/testdata/AdjustTime.M2c.separate.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sun Jun 25 09:32:18 JST 2017
-GPX.BASETIME=EXIF_TIME
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=true
-IMG.OUTPUT_ALL=false
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-29T01\:31\:46Z
-GPX.OVERWRITE_MAGVAR=true
-GPX.REUSE=false
-IMG.BASE_FILE=20170529_103146A.jpg
-IMG.SOURCE_FOLDER=testdata/cameradata/separate
-GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.M2c.separate.log b/importPicture/testdata/AdjustTime.M2c.separate.log
deleted file mode 100644
index 2a3c808..0000000
--- a/importPicture/testdata/AdjustTime.M2c.separate.log
+++ /dev/null
@@ -1,210 +0,0 @@
-テストパターン : [M2c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J
- tarFilePath = testdata/separate.tar.gz
- gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml
- gpxDestinationPath = testdata/cameradata/separate.gpx
- iniFilePath = testdata/AdjustTime.M2c.separate.ini
-Param File = 'testdata/AdjustTime.M2c.separate.ini'
- - param： IMG.TIME=2017-05-29T01:31:46Z
- - param： IMG.BASE_FILE=20170529_103146A.jpg
- - param： GPX.BASETIME=EXIF_TIME
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=true
- - param： GPX.OUTPUT_SPEED=true
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
- 時差: 0(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z| | | | | |
-|20170529_102310A.jpg |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z| | | | | |
-|20170529_102314A.jpg |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z| | | | | |
-|20170529_102318A.jpg |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -|
-|20170529_102322A.jpg |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -|
-|20170529_102401A.jpg |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035| 685.56| -| -|
-|20170529_102405A.jpg |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169| 687.48| -| -|
-|20170529_102409A.jpg |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z| | | | | |
-|20170529_102414A.jpg |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z| | | | | |
-|20170529_102418A.jpg |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z| | | | | |
-|20170529_102448A.jpg |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -|
-|20170529_102518A.jpg |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102547A.jpg |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102618A.jpg |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102647A.jpg |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102717A.jpg |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102747A.jpg |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102817A.jpg |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102847A.jpg |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102917A.jpg |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102947A.jpg |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103016A.jpg |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103046A.jpg |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103116A.jpg |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103146A.jpg |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103216A.jpg |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -|
-|20170529_103246A.jpg |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -|
-|20170529_103315A.jpg |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z| | | | | |
-|20170529_103345A.jpg |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z| | | | | |
-|20170529_103415A.jpg |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z| | | | | |
-|20170529_103445A.jpg |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z| | | | | |
-|20170529_103515A.jpg |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z| | | | | |
-|20170529_103545A.jpg |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z| | | | | |
-|20170529_103615A.jpg |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -|
-|20170529_103645A.jpg |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -|
-|20170529_103714A.jpg |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -|
-|20170529_103744A.jpg |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -|
-|20170529_103814A.jpg |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -|
-|20170529_103844A.jpg |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -|
-|20170529_103914A.jpg |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -|
-|20170529_103944A.jpg |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -|
-|20170529_104014A.jpg |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -|
-|20170529_104048A.jpg |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -|
-|20170529_104119A.jpg |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639| 793.71| -| -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
-
-
-
-テストパターン : [M3c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse
- tarFilePath = testdata/separate.tar.gz
- gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
- gpxDestinationPath = testdata/cameradata/separate.gpx
- iniFilePath = testdata/AdjustTime.M2c.separate.ini
-Param File = 'testdata/AdjustTime.M2c.separate.ini'
- - param： IMG.TIME=2017-05-29T01:31:46Z
- - param： IMG.BASE_FILE=20170529_103146A.jpg
- - param： GPX.BASETIME=EXIF_TIME
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=true
- - param： GPX.OUTPUT_SPEED=true
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
- 時差: 0(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z| | | | | |
-|20170529_102310A.jpg |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z| | | | | |
-|20170529_102314A.jpg |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z| | | | | |
-|20170529_102318A.jpg |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -|
-|20170529_102322A.jpg |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -|
-|20170529_102401A.jpg |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035| 685.56| -| -|
-|20170529_102405A.jpg |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169| 687.48| -| -|
-|20170529_102409A.jpg |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z| | | | | |
-|20170529_102414A.jpg |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z| | | | | |
-|20170529_102418A.jpg |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z| | | | | |
-|20170529_102448A.jpg |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -|
-|20170529_102518A.jpg |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102547A.jpg |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102618A.jpg |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102647A.jpg |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102717A.jpg |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102747A.jpg |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102817A.jpg |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102847A.jpg |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102917A.jpg |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102947A.jpg |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103016A.jpg |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103046A.jpg |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103116A.jpg |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103146A.jpg |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103216A.jpg |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -|
-|20170529_103246A.jpg |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -|
-|20170529_103315A.jpg |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z| | | | | |
-|20170529_103345A.jpg |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z| | | | | |
-|20170529_103415A.jpg |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z| | | | | |
-|20170529_103445A.jpg |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z| | | | | |
-|20170529_103515A.jpg |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z| | | | | |
-|20170529_103545A.jpg |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z| | | | | |
-|20170529_103615A.jpg |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -|
-|20170529_103645A.jpg |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -|
-|20170529_103714A.jpg |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -|
-|20170529_103744A.jpg |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -|
-|20170529_103814A.jpg |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -|
-|20170529_103844A.jpg |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -|
-|20170529_103914A.jpg |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -|
-|20170529_103944A.jpg |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -|
-|20170529_104014A.jpg |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -|
-|20170529_104048A.jpg |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -|
-|20170529_104119A.jpg |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639| 793.71| -| -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
-
diff --git a/importPicture/testdata/AdjustTime.M2d.separate.ini b/importPicture/testdata/AdjustTime.M2d.separate.ini
deleted file mode 100644
index d0ab153..0000000
--- a/importPicture/testdata/AdjustTime.M2d.separate.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sun Jun 25 09:32:18 JST 2017
-GPX.BASETIME=EXIF_TIME
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=true
-IMG.OUTPUT_ALL=true
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-29T01\:31\:46Z
-GPX.OVERWRITE_MAGVAR=true
-GPX.REUSE=false
-IMG.BASE_FILE=20170529_103146A.jpg
-IMG.SOURCE_FOLDER=testdata/cameradata/separate
-GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/AdjustTime.M2d.separate.log b/importPicture/testdata/AdjustTime.M2d.separate.log
deleted file mode 100644
index e816976..0000000
--- a/importPicture/testdata/AdjustTime.M2d.separate.log
+++ /dev/null
@@ -1,222 +0,0 @@
-テストパターン : [M2d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J
- tarFilePath = testdata/separate.tar.gz
- gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml
- gpxDestinationPath = testdata/cameradata/separate.gpx
- iniFilePath = testdata/AdjustTime.M2d.separate.ini
-Param File = 'testdata/AdjustTime.M2d.separate.ini'
- - param： IMG.TIME=2017-05-29T01:31:46Z
- - param： IMG.BASE_FILE=20170529_103146A.jpg
- - param： GPX.BASETIME=EXIF_TIME
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=true
- - param： GPX.OUTPUT_SPEED=true
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
- 時差: 0(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z| | | | | |
-|20170529_102310A.jpg |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z| | | | | |
-|20170529_102314A.jpg |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z| | | | | |
-|20170529_102318A.jpg |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -|
-|20170529_102322A.jpg |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -|
-|20170529_102401A.jpg |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035| 685.56| -| -|
-|20170529_102405A.jpg |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169| 687.48| -| -|
-|20170529_102409A.jpg |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z| | | | | |
-|20170529_102414A.jpg |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z| | | | | |
-|20170529_102418A.jpg |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z| | | | | |
-|20170529_102448A.jpg |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -|
-|20170529_102518A.jpg |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102547A.jpg |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102618A.jpg |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102647A.jpg |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102717A.jpg |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102747A.jpg |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102817A.jpg |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102847A.jpg |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102917A.jpg |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102947A.jpg |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103016A.jpg |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103046A.jpg |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103116A.jpg |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103146A.jpg |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103216A.jpg |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -|
-|20170529_103246A.jpg |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -|
-|20170529_103315A.jpg |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z| | | | | |
-|20170529_103345A.jpg |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z| | | | | |
-|20170529_103415A.jpg |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z| | | | | |
-|20170529_103445A.jpg |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z| | | | | |
-|20170529_103515A.jpg |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z| | | | | |
-|20170529_103545A.jpg |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z| | | | | |
-|20170529_103615A.jpg |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -|
-|20170529_103645A.jpg |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -|
-|20170529_103714A.jpg |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -|
-|20170529_103744A.jpg |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -|
-|20170529_103814A.jpg |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -|
-|20170529_103844A.jpg |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -|
-|20170529_103914A.jpg |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -|
-|20170529_103944A.jpg |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -|
-|20170529_104014A.jpg |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -|
-|20170529_104048A.jpg |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -|
-|20170529_104119A.jpg |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639| 793.71| -| -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[debug] exifTime = '2017:05:29 10:23:05' <--> '2017:05:29 10:23:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[debug] exifTime = '2017:05:29 10:24:09' <--> '2017:05:29 10:24:09'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[debug] exifTime = '2017:05:29 10:33:15' <--> '2017:05:29 10:33:15'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[debug] exifTime = '2017:05:29 10:35:45' <--> '2017:05:29 10:35:45'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
-
-
-
-
-テストパターン : [M3d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse
- tarFilePath = testdata/separate.tar.gz
- gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
- gpxDestinationPath = testdata/cameradata/separate.gpx
- iniFilePath = testdata/AdjustTime.M2d.separate.ini
-Param File = 'testdata/AdjustTime.M2d.separate.ini'
- - param： IMG.TIME=2017-05-29T01:31:46Z
- - param： IMG.BASE_FILE=20170529_103146A.jpg
- - param： GPX.BASETIME=EXIF_TIME
- - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate
- - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
- - param： IMG.OUTPUT=true
- - param： IMG.OUTPUT_ALL=false
- - param： IMG.OUTPUT_EXIF= false
- - param： GPX.SOURCE_FOLDER=.
- - param： GPX.OUTPUT_WPT=true
- - param： GPX.OVERWRITE_MAGVAR=true
- - param： GPX.OUTPUT_SPEED=true
- - param： GPX.gpxSplit=false
- - param： GPX.noFirstNode=true
- - param： GPX.REUSE=false
-/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx
- 時差: 0(sec)
- Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx]
- EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate'
-
- +--------------------+--------------------|
- GPS logging time | First Time | Last Time |
-|--------------------------------+--------------------+--------------------|
-| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z|
-| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z|
-| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z|
-|--------------------------------+--------------------+--------------------|
-
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-|20170529_102305A.jpg |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z| | | | | |
-|20170529_102310A.jpg |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z| | | | | |
-|20170529_102314A.jpg |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z| | | | | |
-|20170529_102318A.jpg |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -|
-|20170529_102322A.jpg |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -|
-|20170529_102401A.jpg |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035| 685.56| -| -|
-|20170529_102405A.jpg |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169| 687.48| -| -|
-|20170529_102409A.jpg |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z| | | | | |
-|20170529_102414A.jpg |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z| | | | | |
-|20170529_102418A.jpg |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z| | | | | |
-|20170529_102448A.jpg |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -|
-|20170529_102518A.jpg |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102547A.jpg |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102618A.jpg |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102647A.jpg |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102717A.jpg |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102747A.jpg |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102817A.jpg |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102847A.jpg |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102917A.jpg |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_102947A.jpg |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103016A.jpg |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103046A.jpg |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103116A.jpg |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103146A.jpg |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -|
-|20170529_103216A.jpg |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -|
-|20170529_103246A.jpg |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -|
-|20170529_103315A.jpg |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z| | | | | |
-|20170529_103345A.jpg |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z| | | | | |
-|20170529_103415A.jpg |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z| | | | | |
-|20170529_103445A.jpg |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z| | | | | |
-|20170529_103515A.jpg |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z| | | | | |
-|20170529_103545A.jpg |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z| | | | | |
-|20170529_103615A.jpg |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -|
-|20170529_103645A.jpg |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -|
-|20170529_103714A.jpg |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -|
-|20170529_103744A.jpg |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -|
-|20170529_103814A.jpg |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -|
-|20170529_103844A.jpg |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -|
-|20170529_103914A.jpg |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -|
-|20170529_103944A.jpg |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -|
-|20170529_104014A.jpg |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -|
-|20170529_104048A.jpg |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -|
-|20170529_104119A.jpg |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639| 793.71| -| -|
-|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg'
-[debug] exifTime = '2017:05:29 10:23:05' <--> '2017:05:29 10:23:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg'
-[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg'
-[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg'
-[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg'
-[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg'
-[debug] exifTime = '2017:05:29 10:24:09' <--> '2017:05:29 10:24:09'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg'
-[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg'
-[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg'
-[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg'
-[debug] exifTime = '2017:05:29 10:33:15' <--> '2017:05:29 10:33:15'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg'
-[debug] exifTime = '2017:05:29 10:35:45' <--> '2017:05:29 10:35:45'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg'
-[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14'
-[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg'
-[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'
diff --git a/importPicture/testdata/AdjustTime.null.ini b/importPicture/testdata/AdjustTime.null.ini
deleted file mode 100644
index 7b60e49..0000000
--- a/importPicture/testdata/AdjustTime.null.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-#defuilt settings
-#Tue May 16 15:59:01 JST 2017
-GPX.BASETIME=
-IMG.OUTPUT_EXIF=
-GPX.OUTPUT_SPEED=
-GPX.OUTPUT_WPT=
-IMG.OUTPUT_ALL=
-GPX.noFirstNode=
-IMG.OUTPUT=
-GPX.gpxSplit=
-GPX.REUSE=
-GPX.OVERWRITE_MAGVAR=
-IMG.BASE_FILE=
-IMG.SOURCE_FOLDER=
-GPX.SOURCE_FOLDER=
-IMG.OUTPUT_FOLDER=
diff --git a/importPicture/testdata/AdjustTime.off.ini b/importPicture/testdata/AdjustTime.off.ini
deleted file mode 100644
index 3494d77..0000000
--- a/importPicture/testdata/AdjustTime.off.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-#defuilt settings
-#Tue May 16 15:59:01 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=false
-GPX.OUTPUT_SPEED=false
-GPX.OUTPUT_WPT=false
-IMG.OUTPUT_ALL=false
-GPX.noFirstNode=false
-IMG.OUTPUT=false
-GPX.gpxSplit=false
-GPX.REUSE=false
-GPX.OVERWRITE_MAGVAR=false
-IMG.BASE_FILE=
-IMG.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/.
-GPX.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/.
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/.
diff --git a/importPicture/testdata/AdjustTime.on.ini b/importPicture/testdata/AdjustTime.on.ini
deleted file mode 100644
index 8a9a96b..0000000
--- a/importPicture/testdata/AdjustTime.on.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-#defuilt settings
-#Tue May 16 15:59:01 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_SPEED=true
-GPX.OUTPUT_WPT=true
-IMG.OUTPUT_ALL=true
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-GPX.REUSE=true
-GPX.OVERWRITE_MAGVAR=true
-IMG.BASE_FILE=
-IMG.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/.
-GPX.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/.
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/.
diff --git a/importPicture/testdata/AdjustTime.separate.ini b/importPicture/testdata/AdjustTime.separate.ini
deleted file mode 100644
index 26f1d1d..0000000
--- a/importPicture/testdata/AdjustTime.separate.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-#by AdjustTime
-#Sun Jun 25 09:32:18 JST 2017
-GPX.BASETIME=FILE_UPDATE
-IMG.OUTPUT_EXIF=true
-GPX.OUTPUT_WPT=false
-GPX.OUTPUT_SPEED=true
-IMG.OUTPUT_ALL=false
-GPX.noFirstNode=true
-IMG.OUTPUT=true
-GPX.gpxSplit=true
-IMG.TIME=2017-05-29T01\:31\:46Z
-GPX.OVERWRITE_MAGVAR=true
-GPX.REUSE=false
-IMG.BASE_FILE=20170529_103146A.jpg
-IMG.SOURCE_FOLDER=./testdata/cameradata/separate
-GPX.SOURCE_FOLDER=./testdata/cameradata/separate.gpx
-IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output
diff --git a/importPicture/testdata/Sony20170518.tar.gz b/importPicture/testdata/Sony20170518.tar.gz
deleted file mode 100644
index dc7294c..0000000
--- a/importPicture/testdata/Sony20170518.tar.gz
+++ /dev/null
Binary files differ
diff --git a/importPicture/testdata/WiMiUS20170518.tar.gz b/importPicture/testdata/WiMiUS20170518.tar.gz
deleted file mode 100644
index cd69b56..0000000
--- a/importPicture/testdata/WiMiUS20170518.tar.gz
+++ /dev/null
Binary files differ
diff --git a/importPicture/testdata/muiltiTRK.GarminColorado.gpx.xml b/importPicture/testdata/muiltiTRK.GarminColorado.gpx.xml
deleted file mode 100644
index 8023fc1..0000000
--- a/importPicture/testdata/muiltiTRK.GarminColorado.gpx.xml
+++ /dev/null
@@ -1,3327 +0,0 @@
-
-
-
- ACTIVE LOG092126
-
-
- 686.52
-
-
-
- 686.04
-
-
-
- 685.56
-
-
-
- 685.08
-
-
-
- 684.60
-
-
-
- 684.12
-
-
-
- 683.15
-
-
-
- 682.67
-
-
-
- 682.19
-
-
-
- 681.23
-
-
-
- 680.75
-
-
-
- 680.27
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 680.27
-
-
-
- 680.27
-
-
-
- 680.27
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 681.23
-
-
-
- 681.23
-
-
-
- 681.23
-
-
-
- 681.71
-
-
-
- 682.19
-
-
-
- 682.19
-
-
-
- 682.67
-
-
-
- 683.15
-
-
-
- 683.63
-
-
-
- 684.12
-
-
-
- 684.12
-
-
-
- 684.60
-
-
-
- 685.08
-
-
-
- 685.56
-
-
-
- 685.56
-
-
-
- 686.04
-
-
-
- 686.52
-
-
-
- 687.00
-
-
-
- 687.48
-
-
-
-
-
- 2017-05-29 10:11:03 Day
-
-
- 704.30
-
-
-
- 705.26
-
-
-
- 706.23
-
-
-
- 707.19
-
-
-
- 708.15
-
-
-
- 709.11
-
-
-
- 710.07
-
-
-
- 711.03
-
-
-
- 711.99
-
-
-
- 712.95
-
-
-
- 713.44
-
-
-
- 713.92
-
-
-
- 713.92
-
-
-
- 714.40
-
-
-
- 714.40
-
-
-
- 714.40
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.40
-
-
-
- 713.92
-
-
-
- 713.44
-
-
-
- 712.95
-
-
-
- 711.99
-
-
-
- 711.99
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 755.25
-
-
-
- 753.81
-
-
-
- 752.85
-
-
-
- 751.89
-
-
-
- 751.41
-
-
-
- 750.45
-
-
-
- 749.97
-
-
-
- 749.49
-
-
-
- 749.00
-
-
-
- 748.52
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
-
-
- 761.02
-
-
-
- 761.02
-
-
-
- 760.54
-
-
-
- 759.10
-
-
-
- 758.62
-
-
-
- 758.14
-
-
-
- 757.66
-
-
-
- 757.18
-
-
-
- 756.69
-
-
-
- 755.73
-
-
-
- 755.25
-
-
-
- 754.29
-
-
-
- 753.81
-
-
-
- 753.33
-
-
-
- 752.85
-
-
-
- 752.37
-
-
-
- 752.37
-
-
-
- 751.89
-
-
-
- 751.41
-
-
-
- 751.41
-
-
-
- 750.93
-
-
-
- 750.93
-
-
-
- 750.45
-
-
-
- 749.97
-
-
-
- 749.49
-
-
-
- 749.00
-
-
-
- 749.00
-
-
-
- 748.52
-
-
-
- 748.04
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 748.04
-
-
-
- 748.52
-
-
-
- 749.00
-
-
-
- 749.00
-
-
-
- 749.49
-
-
-
- 749.97
-
-
-
- 750.45
-
-
-
- 750.45
-
-
-
- 750.93
-
-
-
- 750.93
-
-
-
- 751.41
-
-
-
- 751.89
-
-
-
- 752.37
-
-
-
- 752.37
-
-
-
- 753.33
-
-
-
- 753.81
-
-
-
- 754.29
-
-
-
- 754.77
-
-
-
- 754.77
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.73
-
-
-
- 755.73
-
-
-
- 755.73
-
-
-
- 756.21
-
-
-
- 756.69
-
-
-
- 756.69
-
-
-
- 757.18
-
-
-
- 757.66
-
-
-
- 758.14
-
-
-
- 758.62
-
-
-
- 759.10
-
-
-
- 759.58
-
-
-
- 760.06
-
-
-
- 760.06
-
-
-
- 760.54
-
-
-
- 760.54
-
-
-
- 761.02
-
-
-
- 761.02
-
-
-
- 761.50
-
-
-
- 761.98
-
-
-
- 762.46
-
-
-
- 762.46
-
-
-
- 763.42
-
-
-
- 763.90
-
-
-
- 764.39
-
-
-
- 764.39
-
-
-
- 765.35
-
-
-
- 765.83
-
-
-
- 766.31
-
-
-
- 766.79
-
-
-
- 767.75
-
-
-
- 768.23
-
-
-
- 768.71
-
-
-
- 769.19
-
-
-
- 770.15
-
-
-
- 770.63
-
-
-
- 771.60
-
-
-
- 772.08
-
-
-
- 773.04
-
-
-
- 773.52
-
-
-
- 774.00
-
-
-
- 774.48
-
-
-
- 774.96
-
-
-
- 775.92
-
-
-
- 776.40
-
-
-
- 776.88
-
-
-
- 777.36
-
-
-
- 778.32
-
-
-
- 778.81
-
-
-
- 779.29
-
-
-
- 779.77
-
-
-
- 780.73
-
-
-
- 781.21
-
-
-
- 781.69
-
-
-
- 782.17
-
-
-
- 783.13
-
-
-
- 783.61
-
-
-
- 784.57
-
-
-
- 785.05
-
-
-
- 786.02
-
-
-
- 786.50
-
-
-
- 787.46
-
-
-
- 787.94
-
-
-
- 788.42
-
-
-
- 789.38
-
-
-
- 789.86
-
-
-
- 790.34
-
-
-
- 790.82
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 795.63
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 795.63
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 791.78
-
-
-
- 791.30
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.92
-
-
-
- 801.40
-
-
-
- 801.40
-
-
-
- 801.88
-
-
-
- 801.88
-
-
-
-
-
diff --git a/importPicture/testdata/muiltiTRKSEG.GarminColorado.gpx.xml b/importPicture/testdata/muiltiTRKSEG.GarminColorado.gpx.xml
deleted file mode 100644
index 7a86786..0000000
--- a/importPicture/testdata/muiltiTRKSEG.GarminColorado.gpx.xml
+++ /dev/null
@@ -1,3324 +0,0 @@
-
-
-
- ACTIVE LOG092126
-
-
- 686.52
-
-
-
- 686.04
-
-
-
- 685.56
-
-
-
- 685.08
-
-
-
- 684.60
-
-
-
- 684.12
-
-
-
- 683.15
-
-
-
- 682.67
-
-
-
- 682.19
-
-
-
- 681.23
-
-
-
- 680.75
-
-
-
- 680.27
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 680.27
-
-
-
- 680.27
-
-
-
- 680.27
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 681.23
-
-
-
- 681.23
-
-
-
- 681.23
-
-
-
- 681.71
-
-
-
- 682.19
-
-
-
- 682.19
-
-
-
- 682.67
-
-
-
- 683.15
-
-
-
- 683.63
-
-
-
- 684.12
-
-
-
- 684.12
-
-
-
- 684.60
-
-
-
- 685.08
-
-
-
- 685.56
-
-
-
- 685.56
-
-
-
- 686.04
-
-
-
- 686.52
-
-
-
- 687.00
-
-
-
- 687.48
-
-
-
-
-
- 704.30
-
-
-
- 705.26
-
-
-
- 706.23
-
-
-
- 707.19
-
-
-
- 708.15
-
-
-
- 709.11
-
-
-
- 710.07
-
-
-
- 711.03
-
-
-
- 711.99
-
-
-
- 712.95
-
-
-
- 713.44
-
-
-
- 713.92
-
-
-
- 713.92
-
-
-
- 714.40
-
-
-
- 714.40
-
-
-
- 714.40
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.40
-
-
-
- 713.92
-
-
-
- 713.44
-
-
-
- 712.95
-
-
-
- 711.99
-
-
-
- 711.99
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 755.25
-
-
-
- 753.81
-
-
-
- 752.85
-
-
-
- 751.89
-
-
-
- 751.41
-
-
-
- 750.45
-
-
-
- 749.97
-
-
-
- 749.49
-
-
-
- 749.00
-
-
-
- 748.52
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
-
-
- 761.02
-
-
-
- 761.02
-
-
-
- 760.54
-
-
-
- 759.10
-
-
-
- 758.62
-
-
-
- 758.14
-
-
-
- 757.66
-
-
-
- 757.18
-
-
-
- 756.69
-
-
-
- 755.73
-
-
-
- 755.25
-
-
-
- 754.29
-
-
-
- 753.81
-
-
-
- 753.33
-
-
-
- 752.85
-
-
-
- 752.37
-
-
-
- 752.37
-
-
-
- 751.89
-
-
-
- 751.41
-
-
-
- 751.41
-
-
-
- 750.93
-
-
-
- 750.93
-
-
-
- 750.45
-
-
-
- 749.97
-
-
-
- 749.49
-
-
-
- 749.00
-
-
-
- 749.00
-
-
-
- 748.52
-
-
-
- 748.04
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 748.04
-
-
-
- 748.52
-
-
-
- 749.00
-
-
-
- 749.00
-
-
-
- 749.49
-
-
-
- 749.97
-
-
-
- 750.45
-
-
-
- 750.45
-
-
-
- 750.93
-
-
-
- 750.93
-
-
-
- 751.41
-
-
-
- 751.89
-
-
-
- 752.37
-
-
-
- 752.37
-
-
-
- 753.33
-
-
-
- 753.81
-
-
-
- 754.29
-
-
-
- 754.77
-
-
-
- 754.77
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.73
-
-
-
- 755.73
-
-
-
- 755.73
-
-
-
- 756.21
-
-
-
- 756.69
-
-
-
- 756.69
-
-
-
- 757.18
-
-
-
- 757.66
-
-
-
- 758.14
-
-
-
- 758.62
-
-
-
- 759.10
-
-
-
- 759.58
-
-
-
- 760.06
-
-
-
- 760.06
-
-
-
- 760.54
-
-
-
- 760.54
-
-
-
- 761.02
-
-
-
- 761.02
-
-
-
- 761.50
-
-
-
- 761.98
-
-
-
- 762.46
-
-
-
- 762.46
-
-
-
- 763.42
-
-
-
- 763.90
-
-
-
- 764.39
-
-
-
- 764.39
-
-
-
- 765.35
-
-
-
- 765.83
-
-
-
- 766.31
-
-
-
- 766.79
-
-
-
- 767.75
-
-
-
- 768.23
-
-
-
- 768.71
-
-
-
- 769.19
-
-
-
- 770.15
-
-
-
- 770.63
-
-
-
- 771.60
-
-
-
- 772.08
-
-
-
- 773.04
-
-
-
- 773.52
-
-
-
- 774.00
-
-
-
- 774.48
-
-
-
- 774.96
-
-
-
- 775.92
-
-
-
- 776.40
-
-
-
- 776.88
-
-
-
- 777.36
-
-
-
- 778.32
-
-
-
- 778.81
-
-
-
- 779.29
-
-
-
- 779.77
-
-
-
- 780.73
-
-
-
- 781.21
-
-
-
- 781.69
-
-
-
- 782.17
-
-
-
- 783.13
-
-
-
- 783.61
-
-
-
- 784.57
-
-
-
- 785.05
-
-
-
- 786.02
-
-
-
- 786.50
-
-
-
- 787.46
-
-
-
- 787.94
-
-
-
- 788.42
-
-
-
- 789.38
-
-
-
- 789.86
-
-
-
- 790.34
-
-
-
- 790.82
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 795.63
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 795.63
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 791.78
-
-
-
- 791.30
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.92
-
-
-
- 801.40
-
-
-
- 801.40
-
-
-
- 801.88
-
-
-
- 801.88
-
-
-
-
-
diff --git a/importPicture/testdata/muiltiTRKSEG.noNameSpace.gpx.xml b/importPicture/testdata/muiltiTRKSEG.noNameSpace.gpx.xml
deleted file mode 100644
index ce805f4..0000000
--- a/importPicture/testdata/muiltiTRKSEG.noNameSpace.gpx.xml
+++ /dev/null
@@ -1,3334 +0,0 @@
-
-
-
-
- hayashi
-
-
- 2017
- https://creativecommons.org/licenses/by-sa/2.5
-
-
-
-
- 2017-05-29 10:11:03 Day
-
-
- 686.52
-
-
-
- 686.04
-
-
-
- 685.56
-
-
-
- 685.08
-
-
-
- 684.60
-
-
-
- 684.12
-
-
-
- 683.15
-
-
-
- 682.67
-
-
-
- 682.19
-
-
-
- 681.23
-
-
-
- 680.75
-
-
-
- 680.27
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 680.27
-
-
-
- 680.27
-
-
-
- 680.27
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 681.23
-
-
-
- 681.23
-
-
-
- 681.23
-
-
-
- 681.71
-
-
-
- 682.19
-
-
-
- 682.19
-
-
-
- 682.67
-
-
-
- 683.15
-
-
-
- 683.63
-
-
-
- 684.12
-
-
-
- 684.12
-
-
-
- 684.60
-
-
-
- 685.08
-
-
-
- 685.56
-
-
-
- 685.56
-
-
-
- 686.04
-
-
-
- 686.52
-
-
-
- 687.00
-
-
-
- 687.48
-
-
-
-
-
- 704.30
-
-
-
- 705.26
-
-
-
- 706.23
-
-
-
- 707.19
-
-
-
- 708.15
-
-
-
- 709.11
-
-
-
- 710.07
-
-
-
- 711.03
-
-
-
- 711.99
-
-
-
- 712.95
-
-
-
- 713.44
-
-
-
- 713.92
-
-
-
- 713.92
-
-
-
- 714.40
-
-
-
- 714.40
-
-
-
- 714.40
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.40
-
-
-
- 713.92
-
-
-
- 713.44
-
-
-
- 712.95
-
-
-
- 711.99
-
-
-
- 711.99
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 755.25
-
-
-
- 753.81
-
-
-
- 752.85
-
-
-
- 751.89
-
-
-
- 751.41
-
-
-
- 750.45
-
-
-
- 749.97
-
-
-
- 749.49
-
-
-
- 749.00
-
-
-
- 748.52
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
-
-
- 761.02
-
-
-
- 761.02
-
-
-
- 760.54
-
-
-
- 759.10
-
-
-
- 758.62
-
-
-
- 758.14
-
-
-
- 757.66
-
-
-
- 757.18
-
-
-
- 756.69
-
-
-
- 755.73
-
-
-
- 755.25
-
-
-
- 754.29
-
-
-
- 753.81
-
-
-
- 753.33
-
-
-
- 752.85
-
-
-
- 752.37
-
-
-
- 752.37
-
-
-
- 751.89
-
-
-
- 751.41
-
-
-
- 751.41
-
-
-
- 750.93
-
-
-
- 750.93
-
-
-
- 750.45
-
-
-
- 749.97
-
-
-
- 749.49
-
-
-
- 749.00
-
-
-
- 749.00
-
-
-
- 748.52
-
-
-
- 748.04
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 748.04
-
-
-
- 748.52
-
-
-
- 749.00
-
-
-
- 749.00
-
-
-
- 749.49
-
-
-
- 749.97
-
-
-
- 750.45
-
-
-
- 750.45
-
-
-
- 750.93
-
-
-
- 750.93
-
-
-
- 751.41
-
-
-
- 751.89
-
-
-
- 752.37
-
-
-
- 752.37
-
-
-
- 753.33
-
-
-
- 753.81
-
-
-
- 754.29
-
-
-
- 754.77
-
-
-
- 754.77
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.73
-
-
-
- 755.73
-
-
-
- 755.73
-
-
-
- 756.21
-
-
-
- 756.69
-
-
-
- 756.69
-
-
-
- 757.18
-
-
-
- 757.66
-
-
-
- 758.14
-
-
-
- 758.62
-
-
-
- 759.10
-
-
-
- 759.58
-
-
-
- 760.06
-
-
-
- 760.06
-
-
-
- 760.54
-
-
-
- 760.54
-
-
-
- 761.02
-
-
-
- 761.02
-
-
-
- 761.50
-
-
-
- 761.98
-
-
-
- 762.46
-
-
-
- 762.46
-
-
-
- 763.42
-
-
-
- 763.90
-
-
-
- 764.39
-
-
-
- 764.39
-
-
-
- 765.35
-
-
-
- 765.83
-
-
-
- 766.31
-
-
-
- 766.79
-
-
-
- 767.75
-
-
-
- 768.23
-
-
-
- 768.71
-
-
-
- 769.19
-
-
-
- 770.15
-
-
-
- 770.63
-
-
-
- 771.60
-
-
-
- 772.08
-
-
-
- 773.04
-
-
-
- 773.52
-
-
-
- 774.00
-
-
-
- 774.48
-
-
-
- 774.96
-
-
-
- 775.92
-
-
-
- 776.40
-
-
-
- 776.88
-
-
-
- 777.36
-
-
-
- 778.32
-
-
-
- 778.81
-
-
-
- 779.29
-
-
-
- 779.77
-
-
-
- 780.73
-
-
-
- 781.21
-
-
-
- 781.69
-
-
-
- 782.17
-
-
-
- 783.13
-
-
-
- 783.61
-
-
-
- 784.57
-
-
-
- 785.05
-
-
-
- 786.02
-
-
-
- 786.50
-
-
-
- 787.46
-
-
-
- 787.94
-
-
-
- 788.42
-
-
-
- 789.38
-
-
-
- 789.86
-
-
-
- 790.34
-
-
-
- 790.82
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 795.63
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 795.63
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 791.78
-
-
-
- 791.30
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.92
-
-
-
- 801.40
-
-
-
- 801.40
-
-
-
- 801.88
-
-
-
- 801.88
-
-
-
-
-
diff --git a/importPicture/testdata/multiTRKSEG.eTrex_20J.gpx.xml b/importPicture/testdata/multiTRKSEG.eTrex_20J.gpx.xml
deleted file mode 100644
index d315e7a..0000000
--- a/importPicture/testdata/multiTRKSEG.eTrex_20J.gpx.xml
+++ /dev/null
@@ -1,3324 +0,0 @@
-
-
-Garmin International
-
- 2017-05-22 08:02:06 DayDarkMagenta
-
-
- 686.52
-
-
-
- 686.04
-
-
-
- 685.56
-
-
-
- 685.08
-
-
-
- 684.60
-
-
-
- 684.12
-
-
-
- 683.15
-
-
-
- 682.67
-
-
-
- 682.19
-
-
-
- 681.23
-
-
-
- 680.75
-
-
-
- 680.27
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 680.27
-
-
-
- 680.27
-
-
-
- 680.27
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 681.23
-
-
-
- 681.23
-
-
-
- 681.23
-
-
-
- 681.71
-
-
-
- 682.19
-
-
-
- 682.19
-
-
-
- 682.67
-
-
-
- 683.15
-
-
-
- 683.63
-
-
-
- 684.12
-
-
-
- 684.12
-
-
-
- 684.60
-
-
-
- 685.08
-
-
-
- 685.56
-
-
-
- 685.56
-
-
-
- 686.04
-
-
-
- 686.52
-
-
-
- 687.00
-
-
-
- 687.48
-
-
-
-
-
- 704.30
-
-
-
- 705.26
-
-
-
- 706.23
-
-
-
- 707.19
-
-
-
- 708.15
-
-
-
- 709.11
-
-
-
- 710.07
-
-
-
- 711.03
-
-
-
- 711.99
-
-
-
- 712.95
-
-
-
- 713.44
-
-
-
- 713.92
-
-
-
- 713.92
-
-
-
- 714.40
-
-
-
- 714.40
-
-
-
- 714.40
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.40
-
-
-
- 713.92
-
-
-
- 713.44
-
-
-
- 712.95
-
-
-
- 711.99
-
-
-
- 711.99
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 755.25
-
-
-
- 753.81
-
-
-
- 752.85
-
-
-
- 751.89
-
-
-
- 751.41
-
-
-
- 750.45
-
-
-
- 749.97
-
-
-
- 749.49
-
-
-
- 749.00
-
-
-
- 748.52
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
-
-
- 761.02
-
-
-
- 761.02
-
-
-
- 760.54
-
-
-
- 759.10
-
-
-
- 758.62
-
-
-
- 758.14
-
-
-
- 757.66
-
-
-
- 757.18
-
-
-
- 756.69
-
-
-
- 755.73
-
-
-
- 755.25
-
-
-
- 754.29
-
-
-
- 753.81
-
-
-
- 753.33
-
-
-
- 752.85
-
-
-
- 752.37
-
-
-
- 752.37
-
-
-
- 751.89
-
-
-
- 751.41
-
-
-
- 751.41
-
-
-
- 750.93
-
-
-
- 750.93
-
-
-
- 750.45
-
-
-
- 749.97
-
-
-
- 749.49
-
-
-
- 749.00
-
-
-
- 749.00
-
-
-
- 748.52
-
-
-
- 748.04
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 748.04
-
-
-
- 748.52
-
-
-
- 749.00
-
-
-
- 749.00
-
-
-
- 749.49
-
-
-
- 749.97
-
-
-
- 750.45
-
-
-
- 750.45
-
-
-
- 750.93
-
-
-
- 750.93
-
-
-
- 751.41
-
-
-
- 751.89
-
-
-
- 752.37
-
-
-
- 752.37
-
-
-
- 753.33
-
-
-
- 753.81
-
-
-
- 754.29
-
-
-
- 754.77
-
-
-
- 754.77
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.73
-
-
-
- 755.73
-
-
-
- 755.73
-
-
-
- 756.21
-
-
-
- 756.69
-
-
-
- 756.69
-
-
-
- 757.18
-
-
-
- 757.66
-
-
-
- 758.14
-
-
-
- 758.62
-
-
-
- 759.10
-
-
-
- 759.58
-
-
-
- 760.06
-
-
-
- 760.06
-
-
-
- 760.54
-
-
-
- 760.54
-
-
-
- 761.02
-
-
-
- 761.02
-
-
-
- 761.50
-
-
-
- 761.98
-
-
-
- 762.46
-
-
-
- 762.46
-
-
-
- 763.42
-
-
-
- 763.90
-
-
-
- 764.39
-
-
-
- 764.39
-
-
-
- 765.35
-
-
-
- 765.83
-
-
-
- 766.31
-
-
-
- 766.79
-
-
-
- 767.75
-
-
-
- 768.23
-
-
-
- 768.71
-
-
-
- 769.19
-
-
-
- 770.15
-
-
-
- 770.63
-
-
-
- 771.60
-
-
-
- 772.08
-
-
-
- 773.04
-
-
-
- 773.52
-
-
-
- 774.00
-
-
-
- 774.48
-
-
-
- 774.96
-
-
-
- 775.92
-
-
-
- 776.40
-
-
-
- 776.88
-
-
-
- 777.36
-
-
-
- 778.32
-
-
-
- 778.81
-
-
-
- 779.29
-
-
-
- 779.77
-
-
-
- 780.73
-
-
-
- 781.21
-
-
-
- 781.69
-
-
-
- 782.17
-
-
-
- 783.13
-
-
-
- 783.61
-
-
-
- 784.57
-
-
-
- 785.05
-
-
-
- 786.02
-
-
-
- 786.50
-
-
-
- 787.46
-
-
-
- 787.94
-
-
-
- 788.42
-
-
-
- 789.38
-
-
-
- 789.86
-
-
-
- 790.34
-
-
-
- 790.82
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 795.63
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 795.63
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 791.78
-
-
-
- 791.30
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.92
-
-
-
- 801.40
-
-
-
- 801.40
-
-
-
- 801.88
-
-
-
- 801.88
-
-
-
-
\ No newline at end of file
diff --git a/importPicture/testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml b/importPicture/testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
deleted file mode 100644
index 125c417..0000000
--- a/importPicture/testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml
+++ /dev/null
@@ -1,3324 +0,0 @@
-
-
-Garmin International
-
- 2017-05-22 08:02:06 DayDarkMagenta
-
-
- 761.02
-
-
-
- 761.02
-
-
-
- 760.54
-
-
-
- 759.10
-
-
-
- 758.62
-
-
-
- 758.14
-
-
-
- 757.66
-
-
-
- 757.18
-
-
-
- 756.69
-
-
-
- 755.73
-
-
-
- 755.25
-
-
-
- 754.29
-
-
-
- 753.81
-
-
-
- 753.33
-
-
-
- 752.85
-
-
-
- 752.37
-
-
-
- 752.37
-
-
-
- 751.89
-
-
-
- 751.41
-
-
-
- 751.41
-
-
-
- 750.93
-
-
-
- 750.93
-
-
-
- 750.45
-
-
-
- 749.97
-
-
-
- 749.49
-
-
-
- 749.00
-
-
-
- 749.00
-
-
-
- 748.52
-
-
-
- 748.04
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.16
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 745.64
-
-
-
- 746.12
-
-
-
- 746.12
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 748.04
-
-
-
- 748.52
-
-
-
- 749.00
-
-
-
- 749.00
-
-
-
- 749.49
-
-
-
- 749.97
-
-
-
- 750.45
-
-
-
- 750.45
-
-
-
- 750.93
-
-
-
- 750.93
-
-
-
- 751.41
-
-
-
- 751.89
-
-
-
- 752.37
-
-
-
- 752.37
-
-
-
- 753.33
-
-
-
- 753.81
-
-
-
- 754.29
-
-
-
- 754.77
-
-
-
- 754.77
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.25
-
-
-
- 755.73
-
-
-
- 755.73
-
-
-
- 755.73
-
-
-
- 756.21
-
-
-
- 756.69
-
-
-
- 756.69
-
-
-
- 757.18
-
-
-
- 757.66
-
-
-
- 758.14
-
-
-
- 758.62
-
-
-
- 759.10
-
-
-
- 759.58
-
-
-
- 760.06
-
-
-
- 760.06
-
-
-
- 760.54
-
-
-
- 760.54
-
-
-
- 761.02
-
-
-
- 761.02
-
-
-
- 761.50
-
-
-
- 761.98
-
-
-
- 762.46
-
-
-
- 762.46
-
-
-
- 763.42
-
-
-
- 763.90
-
-
-
- 764.39
-
-
-
- 764.39
-
-
-
- 765.35
-
-
-
- 765.83
-
-
-
- 766.31
-
-
-
- 766.79
-
-
-
- 767.75
-
-
-
- 768.23
-
-
-
- 768.71
-
-
-
- 769.19
-
-
-
- 770.15
-
-
-
- 770.63
-
-
-
- 771.60
-
-
-
- 772.08
-
-
-
- 773.04
-
-
-
- 773.52
-
-
-
- 774.00
-
-
-
- 774.48
-
-
-
- 774.96
-
-
-
- 775.92
-
-
-
- 776.40
-
-
-
- 776.88
-
-
-
- 777.36
-
-
-
- 778.32
-
-
-
- 778.81
-
-
-
- 779.29
-
-
-
- 779.77
-
-
-
- 780.73
-
-
-
- 781.21
-
-
-
- 781.69
-
-
-
- 782.17
-
-
-
- 783.13
-
-
-
- 783.61
-
-
-
- 784.57
-
-
-
- 785.05
-
-
-
- 786.02
-
-
-
- 786.50
-
-
-
- 787.46
-
-
-
- 787.94
-
-
-
- 788.42
-
-
-
- 789.38
-
-
-
- 789.86
-
-
-
- 790.34
-
-
-
- 790.82
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 795.63
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 795.63
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 794.67
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.26
-
-
-
- 792.26
-
-
-
- 791.78
-
-
-
- 791.30
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 789.86
-
-
-
- 790.34
-
-
-
- 790.34
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 790.82
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.30
-
-
-
- 791.78
-
-
-
- 792.26
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 792.74
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.22
-
-
-
- 793.71
-
-
-
- 793.71
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.19
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 794.67
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.15
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 795.63
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.11
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 796.59
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.07
-
-
-
- 797.55
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 797.55
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.03
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.51
-
-
-
- 798.51
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 798.99
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.47
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 799.95
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.44
-
-
-
- 800.92
-
-
-
- 801.40
-
-
-
- 801.40
-
-
-
- 801.88
-
-
-
- 801.88
-
-
-
-
-
- 704.30
-
-
-
- 705.26
-
-
-
- 706.23
-
-
-
- 707.19
-
-
-
- 708.15
-
-
-
- 709.11
-
-
-
- 710.07
-
-
-
- 711.03
-
-
-
- 711.99
-
-
-
- 712.95
-
-
-
- 713.44
-
-
-
- 713.92
-
-
-
- 713.92
-
-
-
- 714.40
-
-
-
- 714.40
-
-
-
- 714.40
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.88
-
-
-
- 714.40
-
-
-
- 713.92
-
-
-
- 713.44
-
-
-
- 712.95
-
-
-
- 711.99
-
-
-
- 711.99
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 711.51
-
-
-
- 755.25
-
-
-
- 753.81
-
-
-
- 752.85
-
-
-
- 751.89
-
-
-
- 751.41
-
-
-
- 750.45
-
-
-
- 749.97
-
-
-
- 749.49
-
-
-
- 749.00
-
-
-
- 748.52
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 746.60
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.08
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 747.56
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
- 748.04
-
-
-
-
-
- 686.52
-
-
-
- 686.04
-
-
-
- 685.56
-
-
-
- 685.08
-
-
-
- 684.60
-
-
-
- 684.12
-
-
-
- 683.15
-
-
-
- 682.67
-
-
-
- 682.19
-
-
-
- 681.23
-
-
-
- 680.75
-
-
-
- 680.27
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 679.79
-
-
-
- 680.27
-
-
-
- 680.27
-
-
-
- 680.27
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 680.75
-
-
-
- 681.23
-
-
-
- 681.23
-
-
-
- 681.23
-
-
-
- 681.71
-
-
-
- 682.19
-
-
-
- 682.19
-
-
-
- 682.67
-
-
-
- 683.15
-
-
-
- 683.63
-
-
-
- 684.12
-
-
-
- 684.12
-
-
-
- 684.60
-
-
-
- 685.08
-
-
-
- 685.56
-
-
-
- 685.56
-
-
-
- 686.04
-
-
-
- 686.52
-
-
-
- 687.00
-
-
-
- 687.48
-
-
-
-
\ No newline at end of file
diff --git a/importPicture/testdata/separate.tar.gz b/importPicture/testdata/separate.tar.gz
deleted file mode 100644
index e351848..0000000
--- a/importPicture/testdata/separate.tar.gz
+++ /dev/null
Binary files differ
diff --git a/manifest.mf b/manifest.mf
new file mode 100644
index 0000000..328e8e5
--- /dev/null
+++ b/manifest.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+
diff --git a/src/AdjustTime.ini b/src/AdjustTime.ini
new file mode 100644
index 0000000..db0677f
--- /dev/null
+++ b/src/AdjustTime.ini
@@ -0,0 +1,13 @@
+#by AdjustTime
+GPX.BASETIME=EXIF_TIME
+IMG.OUTPUT_EXIF=true
+GPX.OUTPUT_SPEED=false
+GPX.noFirstNode=true
+IMG.OUTPUT=false
+GPX.gpxSplit=ON
+IMG.TIME=2016-08-14T11\:45\:47
+GPX.REUSE=false
+IMG.BASE_FILE=IMG_0182.jpg
+IMG.SOURCE_FOLDER=.
+GPX.SOURCE_FOLDER=.
+IMG.OUTPUT_FOLDER=.
\ No newline at end of file
diff --git a/src/AdjustTime2.bat b/src/AdjustTime2.bat
new file mode 100644
index 0000000..96ed170
--- /dev/null
+++ b/src/AdjustTime2.bat
@@ -0,0 +1 @@
+javaw -cp .;AdjustTime2.jar;commons-compress-1.14.jar;commons-imaging-1.0-20170205.201009-115.jar osm.jp.gpx.matchtime.gui.AdjustTime
diff --git a/src/AdjustTime2.jnlp b/src/AdjustTime2.jnlp
new file mode 100644
index 0000000..d865797
--- /dev/null
+++ b/src/AdjustTime2.jnlp
@@ -0,0 +1,35 @@
+
+
+
+
+ SwingSet2 Demo Application
+ Sun Microsystems, Inc.
+
+ SwingSet2 Demo Application
+ A demo of the capabilities
+of the Swing Graphical User Interface.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SwingSet2 Demo on Linux
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/AdjustTime2.sh b/src/AdjustTime2.sh
new file mode 100644
index 0000000..bae5196
--- /dev/null
+++ b/src/AdjustTime2.sh
@@ -0,0 +1 @@
+javaw -cp .:AdjustTime2.jar:commons-compress-1.14.jar:commons-imaging-1.0-20170205.201009-115.jar osm.jp.gpx.matchtime.gui.AdjustTime
diff --git a/src/LICENSE.txt b/src/LICENSE.txt
new file mode 100644
index 0000000..a37e276
--- /dev/null
+++ b/src/LICENSE.txt
@@ -0,0 +1,43 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Yuu Hayashi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+以下に定める条件に従い、本ソフトウェアおよび関連文書のファイル（以下「ソフトウェア」）の複製を取得するすべて
+の人に対し、ソフトウェアを無制限に扱うことを無償で許可します。これには、ソフトウェアの複製を使用、複写、変
+更、結合、掲載、頒布、サブライセンス、および/または販売する権利、およびソフトウェアを提供する相手に同じこ
+とを許可する権利も無制限に含まれます。
+
+上記の著作権表示および本許諾表示を、ソフトウェアのすべての複製または重要な部分に記載するものとします。
+
+ソフトウェアは「現状のまま」で、明示であるか暗黙であるかを問わず、何らの保証もなく提供されます。ここでいう保証
+とは、商品性、特定の目的への適合性、および権利非侵害についての保証も含みますが、それに限定されるもので
+はありません。 作者または著作権者は、契約行為、不法行為、またはそれ以外であろうと、ソフトウェアに起因または
+関連し、あるいはソフトウェアの使用またはその他の扱いによって生じる一切の請求、損害、その他の義務について何
+らの責任も負わないものとします。
+
+----------------
+
+osm.jp.gpx.GeoDistance.java は'やまだらけ'様の著作物です。
+ Copyright (C) 2007-2012 やまだらけ
+ The MIT License (MIT)
+ 参照元: http://yamadarake.jp/trdi/report000001.html
+ 「Cords.java」を改変
diff --git a/src/README.jp.txt b/src/README.jp.txt
new file mode 100644
index 0000000..2749310
--- /dev/null
+++ b/src/README.jp.txt
@@ -0,0 +1,128 @@
+[ AdjustTime ]
+
+GPSログファイル(GPX)を元にして写真へ「位置情報(緯度経度)」と「方向」を追記します。(EXIF更新)
+
+[概要]
+GPSログの記録時刻とデジカメの撮影時刻とを見比べて、GPSログ内に写真へのリンク情報を付加した新しいGPSログファイルを作成します。
+
+ ※ 対象とする画像ファイルは'*.jpg'のみです。
+ ※ GPSログの形式は「GPX」形式に対応しています。
+ * 画像ファイルの撮影日時をファイルの更新日時／EXIF撮影日時から選択することができます。
+ - ファイル更新日時： 高速処理が可能です。
+ 一部のトイカメラ系のデジカメにはEXIF情報が正しく付加されないものがあります。そのような機種におすすめです。
+ - EXIF撮影日時: ファイル更新日時が利用できない場合はこちらを使ってください。
+ iPadなど直接ファイルを扱えないデバイスの場合はファイル更新日時が使えません。
+ うっかりファイルをコピーしてしまった場合は、ファイル更新日時が撮影日時を意味しなくなります。その時もEXIFにしてください。
+ * 画像の精確な撮影時刻を入力することでGPSログとの時差を自動補正します。
+ * 結果は、取り込み元のGPXファイルとは別に、元ファイル名にアンダーバー「_」を付加した.ファイルに出力します。
+ - SPEED(速度): 出力GPXにタグを付加することができます。
+ - MAGVAR(方向): 'MAGVAR'とは磁気方位のことです。直前のポイントとの２点間の位置関係を'MAGVAR'として出力できます。
+ - 出力先のGPXに写真へのリンク情報を付加する／付加しないを選択可能にしました。
+ [☑ 出力GPXにポイントマーカーを書き出す]
+ * 画像にEXIF情報を付加することができます。
+ - 緯度経度: GPSログから算出した緯度・経度情報をEXIFに書き出すことができます。
+ - 撮影方向: GPSログから移動方向を擬似撮影方向としてEXIFに書き出すことができます。（カメラの向きではありません）
+
+http://sourceforge.jp/projects/importpicture/wiki/FrontPage
+
+[起動]
+下記のように'AdjustTime'を起動するとGUIでパラメータを逐次設定可能です。（推奨起動方法）
+
+> java -cp .:AdjustTime2.jar:commons-imaging-1.0-SNAPSHOT.jar osm.jp.gpx.matchtime.gui.AdjustTime
+
+
+下記のコマンドラインによる起動方式は度重なる機能追加によりパラメーターが増大したため複雑になりすぎ作者でさえわけがわからなくなりました。
+一応、過去の起動方法を記載しておきます。しかし、コマンドラインからの引数は2016-10-03版以降は正しく引き継がれません。
+'AdjustTime2.jar'と'AdjustTime.ini'を使ってください。
+
+> java -jar importPicture.jar 
+
+
\ No newline at end of file
diff --git a/doc/EXiF.class.violet.html b/doc/EXiF.class.violet.html
new file mode 100644
index 0000000..dc33285
--- /dev/null
+++ b/doc/EXiF.class.violet.html
@@ -0,0 +1,810 @@
+
+
+
+
+
+
+
+
+ This file was generated with Violet UML Editor 2.1.0.
+ ( 
+
+
\ No newline at end of file
diff --git a/doc/GPX.class.violet.html b/doc/GPX.class.violet.html
new file mode 100644
index 0000000..87945ae
--- /dev/null
+++ b/doc/GPX.class.violet.html
@@ -0,0 +1,1921 @@
+
+
+
+
+
+
+
+
+ This file was generated with Violet UML Editor 2.1.0.
+ ( 
+
+
\ No newline at end of file
diff --git a/doc/ImportPicture.class.violet.html b/doc/ImportPicture.class.violet.html
new file mode 100644
index 0000000..729f5ea
--- /dev/null
+++ b/doc/ImportPicture.class.violet.html
@@ -0,0 +1,1039 @@
+
+
+
+
+
+
+
+
+ This file was generated with Violet UML Editor 2.1.0.
+ ( 
+
+
\ No newline at end of file
diff --git a/git.sh b/git.sh
deleted file mode 100755
index 9e4937f..0000000
--- a/git.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-cd ~/workspace/AdjustTime
-gitk
diff --git a/importPicture/.classpath b/importPicture/.classpath
deleted file mode 100644
index 55c672d..0000000
--- a/importPicture/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/importPicture/doc/EXiF.class.violet.html b/importPicture/doc/EXiF.class.violet.html
deleted file mode 100644
index dc33285..0000000
--- a/importPicture/doc/EXiF.class.violet.html
+++ /dev/null
@@ -1,810 +0,0 @@
-
-
-
-
-
-
-
-
- This file was generated with Violet UML Editor 2.1.0.
- ( View Source / Download Violet )
- 
-
-
\ No newline at end of file
diff --git a/importPicture/doc/GPX.class.violet.html b/importPicture/doc/GPX.class.violet.html
deleted file mode 100644
index 87945ae..0000000
--- a/importPicture/doc/GPX.class.violet.html
+++ /dev/null
@@ -1,1921 +0,0 @@
-
-
-
-
-
-
-
-
- This file was generated with Violet UML Editor 2.1.0.
- ( View Source / Download Violet )
- 
-
-
\ No newline at end of file
diff --git a/importPicture/doc/ImportPicture.class.violet.html b/importPicture/doc/ImportPicture.class.violet.html
deleted file mode 100644
index 729f5ea..0000000
--- a/importPicture/doc/ImportPicture.class.violet.html
+++ /dev/null
@@ -1,1039 +0,0 @@
-
-
-
-
-
-
-
-
- This file was generated with Violet UML Editor 2.1.0.
- ( View Source / Download Violet )
- 
-
-
\ No newline at end of file
diff --git a/importPicture/hayashi_0226.jar b/importPicture/hayashi_0226.jar
deleted file mode 100644
index 65c8b85..0000000
--- a/importPicture/hayashi_0226.jar
+++ /dev/null
Binary files differ
diff --git a/importPicture/lib/commons-imaging-1.0-20170205.201009-115.jar b/importPicture/lib/commons-imaging-1.0-20170205.201009-115.jar
deleted file mode 100644
index 7ade0d0..0000000
--- a/importPicture/lib/commons-imaging-1.0-20170205.201009-115.jar
+++ /dev/null
Binary files differ
diff --git a/importPicture/manifest.mf b/importPicture/manifest.mf
deleted file mode 100644
index 328e8e5..0000000
--- a/importPicture/manifest.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
diff --git a/importPicture/nbbuild.xml b/importPicture/nbbuild.xml
deleted file mode 100644
index 488a6cc..0000000
--- a/importPicture/nbbuild.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
-
-