diff --git a/pom.xml b/pom.xml index 2cb4d49..fb74b74 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,12 @@ 4.0.0 osm.surveyor AdjustTerra - 5.3-SNAPSHOT + 5.3.1-SNAPSHOT + + scm:git:http://surveyor.mydns.jp/gitbucket/git/yuu/AdjustTerra.git + http://surveyor.mydns.jp/gitbucket/yuu/AdjustTerra/wiki + scm:git:http://surveyor.mydns.jp/gitbucket/git/yuu/AdjustTerra.git + UTF-8 @@ -28,6 +33,11 @@ + osm.surveyor + AdjustTime + 5.3.3 + + org.apache.commons commons-imaging 1.0-alpha1 @@ -80,6 +90,18 @@ + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + install + v@{project.version} + + + org.codehaus.mojo diff --git a/src/main/java/osm/jp/gpx/AppParameters.java b/src/main/java/osm/jp/gpx/AppParameters.java deleted file mode 100644 index 8e7c610..0000000 --- a/src/main/java/osm/jp/gpx/AppParameters.java +++ /dev/null @@ -1,344 +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: 基準時刻 {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"; - - // 出力フォルダ:(変換した画像ファイルを出力するフォルダ) - 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"; - - public static String GPX_REUSE = "GPX.REUSE"; - - //public boolean param_ImgOutputAll = false; - //public boolean exif = false; - //public boolean param_GpxSplit = false; - //public boolean param_GpxReuse = false; - - 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出力: ソース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: 基準時刻 {FILE_UPDATE | EXIF} - valueStr = this.getProperty(GPX_BASETIME); - if (valueStr == null) { - update = true; - setProperty(AppParameters.GPX_BASETIME, "FILE_UPDATE"); - } - - // その他のパラメータを読み取る - valueStr = getProperty(AppParameters.GPX_GPXSPLIT); - if (valueStr == null) { - update = true; - setProperty(AppParameters.GPX_GPXSPLIT, Boolean.toString(false)); - } - - valueStr = getProperty(AppParameters.GPX_NO_FIRST_NODE); - if (valueStr == null) { - update = true; - setProperty(AppParameters.GPX_NO_FIRST_NODE, Boolean.toString(false)); - } - - valueStr = getProperty(AppParameters.IMG_OUTPUT_ALL); - if (valueStr == null) { - update = true; - setProperty(AppParameters.IMG_OUTPUT_ALL, Boolean.toString(false)); - } - - valueStr = getProperty(AppParameters.GPX_OVERWRITE_MAGVAR); - if (valueStr == null) { - update = true; - setProperty(AppParameters.GPX_OVERWRITE_MAGVAR, Boolean.toString(false)); - } - - - valueStr = getProperty(AppParameters.GPX_OUTPUT_SPEED); - if (valueStr == null) { - update = true; - setProperty(AppParameters.GPX_OUTPUT_SPEED, Boolean.toString(false)); - } - - valueStr = getProperty(AppParameters.GPX_REUSE); - if (valueStr == null) { - update = true; - setProperty(AppParameters.GPX_REUSE, Boolean.toString(false)); - } - - - if (update) { - // ・ファイルがなければ新たに作る - // ・項目が足りない時は書き足す。 - this.store(new FileOutputStream(this.file), "defuilt settings"); - } - } - - public void store() throws FileNotFoundException, IOException { - this.store(new FileOutputStream(this.file), "by AdjustTime"); - } - - public void printout() { - System.out.println(" - param： "+ AppParameters.IMG_TIME +"="+ getProperty(AppParameters.IMG_TIME) ); - System.out.println(" - param： "+ AppParameters.IMG_BASE_FILE +"="+ getProperty(AppParameters.IMG_BASE_FILE) ); - System.out.println(" - param： "+ AppParameters.GPX_BASETIME +"="+ getProperty(AppParameters.GPX_BASETIME) ); - System.out.println(" - param： "+ AppParameters.IMG_SOURCE_FOLDER +"="+ getProperty(AppParameters.IMG_SOURCE_FOLDER) ); - System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_FOLDER +"="+ getProperty(AppParameters.IMG_OUTPUT_FOLDER) ); - System.out.println(" - param： "+ AppParameters.IMG_OUTPUT +"="+ getProperty(AppParameters.IMG_OUTPUT)); - System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_ALL +"="+ isImgOutputAll()); - System.out.println(" - param： "+ AppParameters.IMG_OUTPUT_EXIF +"= "+ isImgOutputExif()); - System.out.println(" - param： "+ AppParameters.GPX_SOURCE_FOLDER +"="+ getProperty(AppParameters.GPX_SOURCE_FOLDER)); - System.out.println(" - param： "+ AppParameters.GPX_OVERWRITE_MAGVAR +"="+ getProperty(AppParameters.GPX_OVERWRITE_MAGVAR)); - System.out.println(" - param： "+ AppParameters.GPX_OUTPUT_SPEED +"="+ getProperty(AppParameters.GPX_OUTPUT_SPEED)); - System.out.println(" - param： "+ AppParameters.GPX_GPXSPLIT +"="+ isGpxSplit()); - System.out.println(" - param： "+ AppParameters.GPX_NO_FIRST_NODE +"="+ isGpxNoFirstNode()); - System.out.println(" - param： "+ AppParameters.GPX_REUSE +"="+ isGpxReuse()); - } - - /** - * 基準時刻（ファイル更新日時 | EXIF撮影日時) - * @return boolean exifBase = false; - */ - public boolean isExifBase() { - return (getProperty(AppParameters.GPX_BASETIME).equals("EXIF_TIME")); - } - - /** - * IMG出力: IMGを出力する - * @return - */ - public boolean isImgOutput() { - String valueStr = getProperty(AppParameters.IMG_OUTPUT); - if ((valueStr != null) && valueStr.equals(Boolean.toString(true))) { - return true; - } - return false; - } - - public boolean isImgOutputExif() { - String valueStr = getProperty(AppParameters.IMG_OUTPUT_EXIF); - if ((valueStr != null) && valueStr.equals(Boolean.toString(true))) { - return true; - } - return false; - } - - /** - * AppParameters.IMG_SOURCE_FOLDER - * @return new File(getProperty(AppParameters.IMG_SOURCE_FOLDER)); - */ - public File getImgSourceFolder() { - return new File(getProperty(AppParameters.IMG_SOURCE_FOLDER)); - } - - public File getGpxSourceFolder() { - String str = getProperty(AppParameters.GPX_SOURCE_FOLDER); - if (str == null) { - return null; - } - if (str.isEmpty()) { - return null; - } - return new File(str); - } - - /** - * AppParameters.GPX_GPXSPLIT - * @return - */ - public boolean isGpxSplit() { - return isParam(AppParameters.GPX_GPXSPLIT); - } - - public boolean isGpxNoFirstNode() { - return isParam(AppParameters.GPX_NO_FIRST_NODE); - } - - public boolean isImgOutputAll() { - return isParam(AppParameters.IMG_OUTPUT_ALL); - } - - public boolean isGpxOverwriteMagvar() { - return isParam(AppParameters.GPX_OVERWRITE_MAGVAR); - } - - public void setGpxOverwriteMagvar(boolean v) { - this.setProperty(GPX_OVERWRITE_MAGVAR, String.valueOf(v)); - } - - public boolean isGpxOutputSpeed() { - return isParam(AppParameters.GPX_OUTPUT_SPEED); - } - - public boolean isGpxReuse() { - return isParam(AppParameters.GPX_REUSE); - } - - boolean isParam(String item) { - String valueStr = getProperty(item); - if ((valueStr != null) && valueStr.equals(Boolean.toString(true))) { - return true; - } - return false; - } -} diff --git a/src/main/java/osm/jp/gpx/Complementation.java b/src/main/java/osm/jp/gpx/Complementation.java deleted file mode 100644 index 4b5b878..0000000 --- a/src/main/java/osm/jp/gpx/Complementation.java +++ /dev/null @@ -1,108 +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 TagTrkpt imaTag = null; - public TagTrkpt maeTag = null; - //public static boolean param_GpxOutputSpeed = false; - //public static boolean param_GpxOverwriteMagvar = false; - - /** - * @param imaE - * @param maeE - * @throws java.text.ParseException - * @code{ - * - * 267.291 - * 359 - * - * - * - * } - * - * - * @throws ParseException - */ - public Complementation(TagTrkpt imaE, TagTrkpt maeE) throws ParseException { - this.imaTag = imaE.clone(); - if (maeE != null) { - this.maeTag = maeE.clone(); - } - } - - /** - * 緯度・経度と時間差から速度(km/h)を求める - * - */ - public void complementationSpeed() { - if (imaTag.speedStr != null) { - try { - Double.parseDouble(imaTag.speedStr); - } - catch (NumberFormatException e) { - // 数字以外ならエレメントを削除する - 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.speedStr = str; - } - } - - /** - * 経度(longitude)と経度から進行方向を求める - * @throws ParseException - */ - public void complementationMagvar() throws ParseException { - if (imaTag.magvarStr != null) { - try { - Double.parseDouble(imaTag.magvarStr); - } - catch (NumberFormatException e) { - // 数字以外ならエレメントを削除する - 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.magvarStr = str; - } - } -} diff --git a/src/main/java/osm/jp/gpx/ElementMapTRKPT.java b/src/main/java/osm/jp/gpx/ElementMapTRKPT.java deleted file mode 100644 index 2599ccd..0000000 --- a/src/main/java/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; - -@SuppressWarnings("serial") -public class ElementMapTRKPT extends TreeMap { - public static final long DIFF_MAE_TIME = 3000L; // before 3 secound - AppParameters params; - - public ElementMapTRKPT(AppParameters params) { - super(new TimeComparator()); - this.params = params; - } - - /** - * 拡張put value:ElementをputするとElement内のtimeを読み取ってkeyとしてthis.put(key,value)する。 - * @param tag - * @return - * @throws java.text.ParseException - * @code{ - * - * 614.90 - * - * 0.5 - * - * } - * @return keyとして登録したtime:Date - */ - public Date put(TagTrkpt tag) { - this.put(tag.getTime(), tag); - return tag.getTime(); - } - - /** - * 指定時刻(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 (params.isGpxOverwriteMagvar()) { - comp.complementationMagvar(); - } - - // 緯度・経度と時間差から速度(km/h)を求める - if (params.isGpxOutputSpeed()) { - 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/src/main/java/osm/jp/gpx/ElementMapTRKSEG.java b/src/main/java/osm/jp/gpx/ElementMapTRKSEG.java deleted file mode 100644 index a3bcae0..0000000 --- a/src/main/java/osm/jp/gpx/ElementMapTRKSEG.java +++ /dev/null @@ -1,60 +0,0 @@ -package osm.jp.gpx; - -import java.util.Date; -import java.util.TreeMap; - -/** - * GPXファイルをパースする - * @param gpxFile - * @code{ - * - * - * - * - * 47.20000076293945 - * - * 0.5 - * - * - * - * - * } - */ -@SuppressWarnings("serial") -public class ElementMapTRKSEG extends TreeMap { - public ElementMapTRKSEG() { - super(new TimeComparator()); - } - - /** - * 拡張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 printheader() { - System.out.println("|--------------------------------+--------------------+--------------------|"); - System.out.println("| GPS logging time | First Time | Last Time |"); - System.out.println("|--------------------------------+--------------------+--------------------|"); - } - - public void printfooter() { - System.out.println("|--------------------------------+--------------------+--------------------|"); - System.out.println(); - } - - public void printinfo() { - printheader(); - for (java.util.Map.Entry map : this.entrySet()) { - ElementMapTRKPT mapTRKPT = map.getValue(); - mapTRKPT.printinfo(); - } - printfooter(); - } -} diff --git a/src/main/java/osm/jp/gpx/GeoDistance.java b/src/main/java/osm/jp/gpx/GeoDistance.java deleted file mode 100644 index 894c67c..0000000 --- a/src/main/java/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/src/main/java/osm/jp/gpx/GpxFile.java b/src/main/java/osm/jp/gpx/GpxFile.java deleted file mode 100644 index 60315e3..0000000 --- a/src/main/java/osm/jp/gpx/GpxFile.java +++ /dev/null @@ -1,65 +0,0 @@ -package osm.jp.gpx; - -import java.io.File; -import java.io.IOException; -import java.text.ParseException; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; - -@SuppressWarnings("serial") -public class GpxFile extends File { - GpxParser gpx; - AppParameters params; - - public GpxFile(AppParameters params, File file) throws ParserConfigurationException, SAXException, IOException, ParseException { - super(file.getParentFile(), file.getName()); - this.params = params; - this.gpx = new GpxParser(params); - } - - /** - * XMLパースを実行する - * - */ - public void parse() throws ParserConfigurationException, SAXException, IOException { - SAXParserFactory factory = SAXParserFactory.newInstance(); - factory.setValidating(false); - - SAXParser parser; - parser = factory.newSAXParser(); - try { - parser.parse(this, gpx); - } catch (SAXParseException e) {} - - // XMLが閉じられなかったデータを救出する - if (gpx.tag != null) { - if (gpx.tag.getTime() != null) { - gpx.trkpt.put(gpx.tag.clone()); - } - gpx.tag = null; - } - if (gpx.trkpt.size() > 0) { - gpx.trkseg.put((ElementMapTRKPT)gpx.trkpt.clone()); - gpx.trkpt.clear(); - } - } - - public ElementMapTRKSEG getTrksegMap() { - return this.gpx.trkseg; - } - - /** - * インスタンス状態の表示（parse()実行後に有効になる） - * - */ - public void printinfo() { - // 表示 - System.out.println(String.format("GPX file: '%s'", getName())); - gpx.trkseg.printinfo(); - } -} diff --git a/src/main/java/osm/jp/gpx/GpxFolder.java b/src/main/java/osm/jp/gpx/GpxFolder.java deleted file mode 100644 index dd4af8c..0000000 --- a/src/main/java/osm/jp/gpx/GpxFolder.java +++ /dev/null @@ -1,107 +0,0 @@ -package osm.jp.gpx; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FilenameFilter; -import java.io.IOException; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; - -import javax.xml.parsers.ParserConfigurationException; - -import org.xml.sax.SAXException; - -public class GpxFolder extends ArrayList { - private static final long serialVersionUID = 6178901459948163548L; - AppParameters params; - - public GpxFolder(AppParameters params) throws ParserConfigurationException, SAXException, IOException, ParseException { - this.params = params; - - File[] gpxfiles; - File gpxDir = params.getGpxSourceFolder(); - if (gpxDir == null) { - // GPXファイルまたはディレクトリが存在しません。('%s') - throw new FileNotFoundException(String.format(ImportPicture.i18n.getString("msg.100"), "null")); - } - if (!gpxDir.exists()) { - // GPXファイルまたはディレクトリが存在しません。('%s') - throw new FileNotFoundException(String.format(ImportPicture.i18n.getString("msg.100"), gpxDir.getAbsolutePath())); - } - - if (gpxDir.isFile()) { - if (accept(params, gpxDir.getName())) { - List fileList = new ArrayList<>(); - fileList.add(gpxDir); - gpxfiles = fileList.toArray(new File[fileList.size()]); - } - else { - // GPXファイルまたはディレクトリが存在しません。('%s') - throw new FileNotFoundException(String.format(ImportPicture.i18n.getString("msg.100"), gpxDir.getAbsolutePath())); - } - } - else if (gpxDir.isDirectory()) { - // 指定されたディレクトリ内のGPXファイルすべてを対象とする - gpxfiles = gpxDir.listFiles(new GpxFileFilter()); - if (gpxfiles == null) { - // 対象となるGPXファイルがありませんでした。('%s') - throw new FileNotFoundException( - String.format(ImportPicture.i18n.getString("msg.110"), gpxDir.getAbsolutePath()) - ); - } - if (params.isImgOutputAll() && (gpxfiles.length > 1)) { - // "複数のGPXファイルがあるときには、'IMG.OUTPUT_ALL'オプションは指定できません。" - throw new FileNotFoundException( - String.format(ImportPicture.i18n.getString("msg.120")) - ); - } - } - else { - // GPXファイルまたはディレクトリが存在しません。('%s') - throw new FileNotFoundException(String.format(ImportPicture.i18n.getString("msg.100"), gpxDir.getAbsolutePath())); - } - - Arrays.sort(gpxfiles, new FileSort()); - for (File file : gpxfiles) { - this.add(new GpxFile(params, file)); - } - } - - /** - * 対象は '*.GPX' のみ対象とする - */ - public static boolean accept(AppParameters params, String name) { - String filename = name.toUpperCase(); - if (filename.endsWith(".GPX")) { - if (!filename.endsWith("_.GPX") || params.isGpxReuse()) { - return true; - } - } - return false; - } - - /** - * ファイル名の順序に並び替えるためのソートクラス - * - */ - static class FileSort implements Comparator { - @Override - public int compare(File src, File target){ - int diff = src.getName().compareTo(target.getName()); - return diff; - } - } - - /** - * GPXファイルフィルター - */ - class GpxFileFilter implements FilenameFilter { - @Override - public boolean accept(File dir, String name) { - return GpxFolder.accept(params, name); - } - } -} diff --git a/src/main/java/osm/jp/gpx/GpxParser.java b/src/main/java/osm/jp/gpx/GpxParser.java deleted file mode 100644 index ea4c71f..0000000 --- a/src/main/java/osm/jp/gpx/GpxParser.java +++ /dev/null @@ -1,151 +0,0 @@ -package osm.jp.gpx; - -import java.text.ParseException; -import org.xml.sax.Attributes; -import org.xml.sax.helpers.DefaultHandler; - -/** - * GPXファイルをパースする - * @param gpxFile - * @code{ - * - * - * - * - * 47.20000076293945 - * - * 0.5 - * - * - * - * - * } - * - */ -public class GpxParser extends DefaultHandler { - StringBuffer outSb; - int segCnt = 0; - int kptCnt = 0; - boolean kpt = false; - TagTrkpt tag = null; - public ElementMapTRKPT trkpt; - public ElementMapTRKSEG trkseg = new ElementMapTRKSEG(); - - AppParameters params; - - public GpxParser(AppParameters params) { - super(); - this.params = params; - trkpt = new ElementMapTRKPT(params); - } - - /** - * ドキュメント開始 - */ - public void startDocument() { - outSb = new StringBuffer(); - } - - /** - * ドキュメント終了 - */ - public void endDocument() { - } - - public void startElement(String uri,String localName, String qName, Attributes atts) { - if(qName.equals("trkseg")){ - segCnt++; - kptCnt = 0; - if (trkpt.size() > 0) { - trkpt.printinfo(); - trkseg.put((ElementMapTRKPT) trkpt.clone()); - trkpt.clear(); - } - } - if(qName.equals("trkpt")){ - kpt = true; - kptCnt++; - if (tag != null) { - if (tag.getTime() != null) { - trkpt.put(tag.clone()); - } - tag = null; - } - - Double lat = null; - Double lon = null; - - for (int i = 0; i < atts.getLength(); i++) { - String aname = atts.getQName(i); - if (aname.equals("lat")) { - lat = new Double(atts.getValue(i)); - } - if (aname.equals("lon")) { - lon = new Double(atts.getValue(i)); - } - } - - if ((lat != null) && (lon != null)) { - tag = new TagTrkpt(lat, lon); - } - } - if(qName.equals("ele")){ - outSb = new StringBuffer(); - } - if(qName.equals("time")){ - outSb = new StringBuffer(); - } - if(qName.equals("magvar")){ - outSb = new StringBuffer(); - } - if(qName.equals("speed")){ - outSb = new StringBuffer(); - } - } - - /** - * 要素の終了タグ読み込み時に毎回呼ばれる - */ - public void endElement(String uri,String localName,String qName) { - if(qName.equals("trkseg")){ - if (trkpt.size() > 0) { - trkseg.put((ElementMapTRKPT) trkpt.clone()); - trkpt.clear(); - } - } - if(qName.equals("trkpt")){ - kpt = false; - if (tag != null) { - if (tag.getTime() != null) { - trkpt.put(tag); - } - tag = null; - } - } - if(qName.equals("ele")){ - tag.setEle(outSb.toString()); - } - if(qName.equals("time")){ - try { - tag.setTime(ImportPicture.toUTCDate(outSb.toString())); - } catch (ParseException e) {} - } - if(qName.equals("magvar")){ - tag.setMagvar(outSb.toString()); - } - if(qName.equals("speed")){ - tag.setSpeed(outSb.toString()); - } - outSb = new StringBuffer(); - } - - /** - * テキストデータ読み込み時に毎回呼ばれる - */ - public void characters(char[] ch, int offset, int length) { - if (kpt) { - outSb.append(new String(ch, offset, length)); - } - } - - } diff --git a/src/main/java/osm/jp/gpx/ImgFile.java b/src/main/java/osm/jp/gpx/ImgFile.java deleted file mode 100644 index c96aa53..0000000 --- a/src/main/java/osm/jp/gpx/ImgFile.java +++ /dev/null @@ -1,300 +0,0 @@ -package osm.jp.gpx; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.nio.channels.FileChannel; -import java.text.DecimalFormat; -import java.text.ParseException; -import java.util.Calendar; -import java.util.Date; -import java.util.Map; -import java.util.TimeZone; - -import javax.xml.parsers.ParserConfigurationException; - -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.xml.sax.SAXException; - -@SuppressWarnings("serial") -public class ImgFile extends File { - boolean done = false; - Date imgtime = null; - Date gpstime = null; - double latitude = 0.0D; - double longitude = 0.0D; - String eleStr = "-"; - String magvarStr = "-"; - String speedStr = "-"; - - public ImgFile(File file) { - super(file.getParentFile(), file.getName()); - } - - public void setDone(boolean done) { - this.done = done; - } - - public boolean isDone() { - return this.done; - } - - /** - * 対象は '*.JPG' のみ対象とする - * @return - * @param name - */ - public boolean isImageFile() { - String name = this.getName(); - return ((name != null) && name.toUpperCase().endsWith(".JPG")); - } - - public boolean procImageFile(AppParameters params, long delta, GpxFile gpxFile, File outDir) throws ParseException, ImageReadException, IOException, ImageWriteException, ParserConfigurationException, SAXException { - //ElementMapTRKSEG mapTRKSEG = gpxFile.parse(); - boolean exifWrite = params.isImgOutputExif(); - - // itime <-- 画像ファイルの撮影時刻 - // ファイルの更新日時／EXIFの撮影日時 - imgtime = getDate(params); - - // uktime <-- 画像撮影時刻に対応するGPX時刻(補正日時) - gpstime = new Date(imgtime.getTime() + delta); - - // 時刻uktimeにおけるをtrkptに追加する - TagTrkpt trkptT = null; - - for (Map.Entry map : gpxFile.getTrksegMap().entrySet()) { - ElementMapTRKPT mapTRKPT = map.getValue(); - trkptT = mapTRKPT.getValue(gpstime); - if (trkptT != null) { - break; - } - } - - if (trkptT == null) { - if (!params.isImgOutputAll()) { - return false; - } - } - 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; - } - } - - outDir.mkdir(); - if (exifWrite) { - exifWrite(this, gpstime, trkptT, outDir); - } - else { - if (params.isImgOutputAll()) { - // EXIFの変換を伴わない単純なファイルコピー - FileInputStream sStream = new FileInputStream(this); - FileInputStream dStream = new FileInputStream(new File(outDir, this.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(); - } - } - } - return true; - } - - void exifWrite(File imageFile, Date correctedtime, TagTrkpt trkptT, File outDir) 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) { - 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); - } - } - - /** - * 基準時刻ファイルの「更新日時」を取得する - * @param baseFile = new File(this.imgDir, this.params.getProperty(AppParameters.IMG_BASE_FILE)); - * @return - * @throws ImageReadException - * @throws IOException - * @throws ParseException - */ - Date getDate(AppParameters params) throws ImageReadException, IOException, ParseException { - return getDate(params, this); - } - - /** - * 基準時刻ファイルの「更新日時」を取得する - * @param baseFile = new File(this.imgDir, this.params.getProperty(AppParameters.IMG_BASE_FILE)); - * @return - * @throws ImageReadException - * @throws IOException - * @throws ParseException - */ - static Date getDate(AppParameters params, File baseFile) throws ImageReadException, IOException, ParseException { - if (params.isExifBase()) { - // 基準時刻（EXIF撮影日時) - ImageMetadata meta = Imaging.getMetadata(baseFile); - JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta; - if (jpegMetadata == null) { - // "'%s'にEXIF情報がありません" - throw new ImageReadException( - String.format( - ImportPicture.i18n.getString("msg.140"), - baseFile.getAbsolutePath() - ) - ); - } - TiffImageMetadata exif = jpegMetadata.getExif(); - if (exif == null) { - // "'%s'にEXIF情報がありません" - throw new ImageReadException( - String.format( - ImportPicture.i18n.getString("msg.140"), - baseFile.getAbsolutePath() - ) - ); - } - String dateTimeOriginal = exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0]; - return new Date(ImportPicture.toEXIFDate(dateTimeOriginal).getTime()); - } - else { - // 基準時刻（ファイル更新日時) - return new Date(baseFile.lastModified()); - } - } - - /** - * ImgFileインスタンスの状態をTEXT化 - * @return １行 - */ - String toText() { - String ret = ""; - if (isDone()) { - ret += (String.format("|%-32s|", this.getName())); - ret += (String.format("%20s|", (imgtime==null ? "" : ImportPicture.toUTCString(imgtime)))); - ret += (String.format("%20s|", (gpstime==null ? "" : ImportPicture.toUTCString(gpstime)))); - ret += (String.format("%14.10f|%14.10f|", latitude, longitude)); - ret += (String.format("%8s|%6s|%6s|", eleStr, magvarStr, speedStr)); - } - else { - ret += (String.format("|%-32s|", this.getName())); - ret += (String.format("%20s|", (imgtime==null ? "" : ImportPicture.toUTCString(imgtime)))); - ret += (String.format("%20s|", (gpstime==null ? "" : ImportPicture.toUTCString(gpstime)))); - ret += (String.format("%-14s|%-14s|", "", "")); - ret += (String.format("%8s|%6s|%6s|", "", "", "")); - } - return ret; - } - - public void printinfo() { - System.out.println(toText()); - } - - public static void printheader() { - System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); - System.out.println("| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |"); - System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); - } - - public static void printfooter() { - System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); - System.out.println(); - } -} diff --git a/src/main/java/osm/jp/gpx/ImgFileFilter.java b/src/main/java/osm/jp/gpx/ImgFileFilter.java deleted file mode 100644 index 906d6bc..0000000 --- a/src/main/java/osm/jp/gpx/ImgFileFilter.java +++ /dev/null @@ -1,17 +0,0 @@ -package osm.jp.gpx; - -import java.io.File; -import java.io.FilenameFilter; - -/** - * JPEGファイルフィルター - * @author yuu - */ -public class ImgFileFilter implements FilenameFilter { - - @Override - public boolean accept(File dir, String name) { - return name.toUpperCase().matches(".*\\.JPG$"); - } - -} diff --git a/src/main/java/osm/jp/gpx/ImgFolder.java b/src/main/java/osm/jp/gpx/ImgFolder.java deleted file mode 100644 index 66879d9..0000000 --- a/src/main/java/osm/jp/gpx/ImgFolder.java +++ /dev/null @@ -1,91 +0,0 @@ -package osm.jp.gpx; - -import java.io.File; -import java.io.IOException; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.TransformerException; - -import org.apache.commons.imaging.ImageReadException; -import org.apache.commons.imaging.ImageWriteException; -import org.xml.sax.SAXException; - -public class ImgFolder extends ArrayList { - private static final long serialVersionUID = -1137199371724546343L; - AppParameters params; - File imgDir; - File outDir; - - public ImgFolder(AppParameters params) { - this.params = params; - imgDir = params.getImgSourceFolder(); - File[] files = imgDir.listFiles(new ImgFileFilter()); - Arrays.sort(files, new FileSort()); - for (File file : files) { - this.add(new ImgFile(file)); - } - } - - public void setOutDir(File outDir) { - this.outDir = outDir; - } - - public File getOutDir() { - return this.outDir; - } - - public File getImgDir() { - return this.imgDir; - } - - /** - * 個別のGPXファイルを処理する - * - * @throws ParserConfigurationException - * @throws IOException - * @throws SAXException - * @throws ParseException - * @throws ImageWriteException - * @throws ImageReadException - * @throws TransformerException - */ - void procGPXfile(GpxFile gpxFile, long delta) throws ParserConfigurationException, SAXException, IOException, ParseException, ImageReadException, ImageWriteException, TransformerException { - // imgDir内の画像ファイルを処理する - //System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); - //System.out.println("| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h |"); - //System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); - - //ElementMapTRKSEG seg = gpxFile.parse(); - for (ImgFile image : this) { - try { - if (!image.isDone()) { - if(image.procImageFile(params, delta, gpxFile, outDir)) { - image.setDone(true); - } - } - } - catch(Exception e) { - System.out.print(String.format("%s", e.toString())); - continue; - } - } - - //System.out.println("|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------|"); - } - - /** - * ファイル名の順序に並び替えるためのソートクラス - * - */ - static class FileSort implements Comparator { - @Override - public int compare(File src, File target){ - int diff = src.getName().compareTo(target.getName()); - return diff; - } - } -} diff --git a/src/main/java/osm/jp/gpx/ImportPicture.java b/src/main/java/osm/jp/gpx/ImportPicture.java deleted file mode 100644 index ac6e29c..0000000 --- a/src/main/java/osm/jp/gpx/ImportPicture.java +++ /dev/null @@ -1,251 +0,0 @@ -package osm.jp.gpx; - -import java.io.*; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -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.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 { - try (InputStream 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); - } catch (IOException e1) { - LOGGER.severe(e1.toString()); - } - } - - /** メイン - * 画像ファイルを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ファイルのパス名 - * - * @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 ImgFolder imgFolder; - public GpxFolder gpxFolder; - public AppParameters params; - - private static final String EXIF_DATE_TIME_FORMAT_STRING = "yyyy:MM:dd HH:mm:ss"; - public static final ResourceBundle i18n = ResourceBundle.getBundle("i18n"); - - public void setUp(String paramFilePath) throws Exception { - System.out.println("Param File = '"+ paramFilePath +"'"); - this.params = new AppParameters(paramFilePath); - params.printout(); - - this.ex = null; - - // AppParameters.IMG_SOURCE_FOLDER に置き換え - imgFolder = new ImgFolder(params); - gpxFolder = new GpxFolder(params); - - // 出力ファイル - // AppParameters.IMG_OUTPUT に置き換え - if (params.isImgOutput()) { - File outDir = new File(params.getProperty(AppParameters.IMG_OUTPUT_FOLDER)); - if (!outDir.exists()) { - // 出力ディレクトリが存在しないときは作成する - outDir.mkdir(); - } - else if (outDir.isFile()) { - // 出力ディレクトリがFILEのときはERROR - throw new FileNotFoundException(String.format("OUTPUT directory '%s' is a File!", outDir.getAbsolutePath())); - } - outDir = new File(outDir, imgFolder.getImgDir().getName()); - imgFolder.setOutDir(outDir); - } - - 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 { - long delta = 0; - String timeStr = params.getProperty(AppParameters.IMG_TIME); - try { - Date t = ImportPicture.toUTCDate(timeStr); - - // 基準時刻ファイルの「更新日時」を使って時刻合わせを行う。 - // argv[1] --> AppParameters.IMG_BASE_FILE に置き換え - Date imgtime = ImgFile.getDate(params, getImgBaseFile()); - delta = t.getTime() - imgtime.getTime(); - } - catch (ParseException e) { - // "'%s'の書式が違います(%s)"0 - System.out.println( - String.format( - ImportPicture.i18n.getString("msg.130"), - timeStr, - ImportPicture.TIME_FORMAT_STRING - ) - ); - return; - } - - for (GpxFile gpxFile : gpxFolder) { - gpxFile.parse(); - - System.out.println("time difference: "+ (delta / 1000) +"(sec)"); - System.out.println(" Target GPX: ["+ gpxFile.getAbsolutePath() +"]"); - System.out.println(" EXIF: "+ (params.isImgOutputExif() ? ("convert to '" + imgFolder.getOutDir().getAbsolutePath() +"'") : "off")); - System.out.println(); - - gpxFile.printinfo(); - imgFolder.procGPXfile(gpxFile, delta); - } - - // imgDir内の画像ファイルを処理する - ImgFile.printheader(); - for (ImgFile image : imgFolder) { - image.printinfo(); - } - ImgFile.printfooter(); - } - catch(ParserConfigurationException | SAXException | IOException | ParseException | ImageReadException | ImageWriteException | IllegalArgumentException | TransformerException e) { - e.printStackTrace(); - this.ex = new Exception(e); - } - } - - - - - - - public static final String TIME_FORMAT_STRING = "yyyy-MM-dd'T'HH:mm:ss'Z'"; - - public static Date toUTCDate(String timeStr) throws ParseException { - DateFormat dfUTC = new SimpleDateFormat(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); - } - - /** - * 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 File getImgBaseFile() { - return new File(imgFolder.getImgDir(), params.getProperty(AppParameters.IMG_BASE_FILE)); - } - - 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; - } - } -} \ No newline at end of file diff --git a/src/main/java/osm/jp/gpx/Restamp.java b/src/main/java/osm/jp/gpx/Restamp.java deleted file mode 100644 index 0670d3d..0000000 --- a/src/main/java/osm/jp/gpx/Restamp.java +++ /dev/null @@ -1,264 +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 { - static public final String TIME_PATTERN = "yyyy-MM-dd HH:mm:ss z"; - - /** - * 実行中に発生した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 z" --> baseTime - * argv[3] = 時刻補正の基準とする画像ファイル --> baseFile - * argv[4] = 基準画像ファイルの精確な撮影日時 "yyyy-MM-dd HH:mm:ss z" --> 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(TIME_PATTERN); - 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; - } - - Date baseTime2 = df1.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"); - - 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 { - DateFormat df2 = new SimpleDateFormat(TIME_PATTERN); - - // imgDir内の画像ファイルを処理する - long span = baseTime2.getTime() - baseTime1.getTime(); - span = span / (bCount2 - bCount1); - int i = 0; - System.out.println("-------------------------------"); - System.out.println("Update last modified date time."); - for (File jpgFile : this.jpgFiles) { - long deltaMsec = (i - (bCount1 -1)) * span; - i++; - Calendar cal = Calendar.getInstance(); - cal.setTime(baseTime1); - cal.add(Calendar.MILLISECOND, (int) deltaMsec); - - System.out.println(String.format("\t%s --> %s", df2.format(cal.getTime()), jpgFile.getName())); - jpgFile.setLastModified(cal.getTimeInMillis()); - } - System.out.println("-------------------------------"); - } - catch(Exception e) { - 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/src/main/java/osm/jp/gpx/TagTrkpt.java b/src/main/java/osm/jp/gpx/TagTrkpt.java deleted file mode 100644 index f5a50e3..0000000 --- a/src/main/java/osm/jp/gpx/TagTrkpt.java +++ /dev/null @@ -1,94 +0,0 @@ -package osm.jp.gpx; - -import java.util.Date; - -/** - * @code{ - * ＜trkpt lat="35.32123832" lon="139.56965631"> - * 47.20000076293945 - * - * - * - * ＜/trkpt> - * } - * - */ -public class TagTrkpt implements Cloneable { - 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(Double lat, Double lon) { - this.lat = lat; - this.lon = lon; - } - - @Override - public TagTrkpt clone() { //基本的にはpublic修飾子を付け、自分自身の型を返り値とする - TagTrkpt b = null; - - // ObjectクラスのcloneメソッドはCloneNotSupportedExceptionを投げる可能性があるので、try-catch文で記述(呼び出し元に投げても良い) - try { - //親クラスのcloneメソッドを呼び出す(親クラスの型で返ってくるので、自分自身の型でのキャストを忘れないようにする) - b =(TagTrkpt)super.clone(); - //親クラスのcloneメソッドで深いコピー(複製先のクラス型変数と複製元のクラス型変数で指しているインスタンスの中身が違うコピー)がなされていないクラス型変数をその変数のcloneメソッドで複製し、複製先のクラス型変数に代入 - b.lat = this.lat; - b.lon = this.lon; - b.eleStr = (this.eleStr == null ? null : this.eleStr.toString()); - b.time = (Date) this.time.clone(); - b.magvarStr = (this.magvarStr==null ? null : this.magvarStr.toString()); - b.speedStr = (this.speedStr == null ? null : this.speedStr.toString()); - } catch (Exception e){ - e.printStackTrace(); - } - return b; - } - - public void setEle(String ele) { - this.eleStr = ele; - } - - public void setTime(Date time) { - this.time = time; - } - - public Date getTime() { - return this.time; - } - - public void setMagvar(String magvar) { - this.magvarStr = magvar; - } - - public void setSpeed(String speed) { - this.speedStr = speed; - } - - public String toString() { - String ret = " -{ - /** - * 日付順にソート - * @param arg0 - * @param arg1 - */ - @Override - public int compare(Date arg0, Date arg1) { - return arg0.compareTo(arg1); - } -} diff --git a/src/main/java/osm/jp/gpx/YuuLogFormatter.java b/src/main/java/osm/jp/gpx/YuuLogFormatter.java deleted file mode 100644 index 99ffc0b..0000000 --- a/src/main/java/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()))).append(" "); - - 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())).append(" "); - } - buf.append(" ").append(argLogRecord.getMessage()).append("\n"); - return buf.toString(); - } -} \ No newline at end of file diff --git a/src/test/AdjustTime.ini b/src/test/AdjustTime.ini deleted file mode 100644 index cd653c8..0000000 --- a/src/test/AdjustTime.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sat Jan 25 22:02:27 JST 2020 -GPX.OVERWRITE_MAGVAR=false -IMG.BASE_FILE=00002.jpg -GPX.OUTPUT_SPEED=false -IMG.SOURCE_FOLDER=/mnt/ssd500/home/yuu/workspace/AdjustGps/src/test/data/images -GPX.SOURCE_FOLDER=/mnt/ssd500/home/yuu/workspace/AdjustGps/src/test/data -IMG.OUTPUT_FOLDER=/mnt/ssd500/home/yuu/workspace/AdjustGps/src/test/data/out -GPX.noFirstNode=true -GPX.gpxSplit=true -IMG.OUTPUT=true -GPX.OUTPUT_WPT=false -GPX.REUSE=false -IMG.TIME=2019-09-04T07\:26\:55Z -IMG.OUTPUT_EXIF=true -IMG.OUTPUT_ALL=false -GPX.BASETIME=FILE_UPDATE diff --git a/src/test/java/osm/jp/gpx/AppParametersTest.java b/src/test/java/osm/jp/gpx/AppParametersTest.java deleted file mode 100644 index 9e422f1..0000000 --- a/src/test/java/osm/jp/gpx/AppParametersTest.java +++ /dev/null @@ -1,200 +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 定義ファイルが存在しない場合 { - - @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 { - AppParameters params = new AppParameters("target/test-classes/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("target/test-classes/ini", "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 = 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(); - 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("target/test-classes/ini", "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(); - AppParameters newParams = new AppParameters(); - String valueStr = newParams.getProperty(AppParameters.IMG_OUTPUT_ALL); - assertThat(valueStr, is("true")); - } - catch (IOException e) { - fail("Exceptionが発生した。"); - } - } - } -} diff --git a/src/test/java/osm/jp/gpx/ElementMapTRKPTTest.java b/src/test/java/osm/jp/gpx/ElementMapTRKPTTest.java deleted file mode 100644 index f034fda..0000000 --- a/src/test/java/osm/jp/gpx/ElementMapTRKPTTest.java +++ /dev/null @@ -1,271 +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 org.junit.Before; -import org.junit.Test; -import org.junit.experimental.runners.Enclosed; -import org.junit.runner.RunWith; - -@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(new AppParameters(AppParameters.FILE_PATH)); - 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"} - }; - - TagTrkpt createElement(String[] values) throws ParseException { - TagTrkpt trkpt = new TagTrkpt(new Double(values[1]), new Double(values[2])); - trkpt.setTime(ImportPicture.toUTCDate(values[0])); - if (values[3] != null) { - trkpt.setEle(values[3]); - } - return trkpt; - } - - @Before - public void setUp() throws Exception { - AppParameters params = new AppParameters(AppParameters.FILE_PATH); - params.setGpxOverwriteMagvar(true); - - map = new ElementMapTRKPT(params); - for (int cnt = values.length; cnt > 0; cnt--) { - map.put(createElement(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/src/test/java/osm/jp/gpx/ElementMapTRKSEGTest.java b/src/test/java/osm/jp/gpx/ElementMapTRKSEGTest.java deleted file mode 100644 index 1634b70..0000000 --- a/src/test/java/osm/jp/gpx/ElementMapTRKSEGTest.java +++ /dev/null @@ -1,98 +0,0 @@ -package osm.jp.gpx; - -import java.io.File; -import java.io.IOException; -import java.text.ParseException; -import java.util.Date; - -import javax.xml.parsers.ParserConfigurationException; - -import org.junit.Test; -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.xml.sax.SAXException; -import static org.junit.Assert.*; -import static org.hamcrest.CoreMatchers.*; - -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("target/test-classes/gpx/20170517.gpx", 1), - new Fixture("target/test-classes/gpx/20170518.gpx", 1), - new Fixture("target/test-classes/gpx/2019-09-07 16.17.12 Day.gpx", 1), - new Fixture("target/test-classes/gpx/2019-12-29 06.50.19 Day.gpx", 1), - new Fixture("target/test-classes/gpx/2020-02-29 13.35.58 Day.gpx", 1), - //new Fixture("target/test-classes/gpx/muiltiTRK.GarminColorado.gpx.xml", 3), - //new Fixture("target/test-classes/gpx/muiltiTRKSEG.GarminColorado.gpx.xml", 3), - //new Fixture("target/test-classes/gpx/muiltiTRKSEG.noNameSpace.gpx.xml", 3), - //new Fixture("target/test-classes/gpx/multiTRKSEG.eTrex_20J.gpx.xml", 3), - //new Fixture("target/test-classes/gpx/multiTRKSEGreverse.eTrex_20J.gpx.xml", 3), - }; - - @Theory - public void TRKSEGを読み込む(Fixture dataset) { - try { - System.out.println("GPX file: "+ dataset.gpxSourcePath); - GpxFile gpx = new GpxFile(new AppParameters(AppParameters.FILE_PATH), new File(dataset.gpxSourcePath)); - gpx.parse(); - assertThat(gpx.gpx.trkseg.size(), is(dataset.segCount)); - for (Date key : gpx.gpx.trkseg.keySet()) { - assertThat(key, is(notNullValue())); - } - } - catch (IOException | ParseException | ParserConfigurationException | SAXException e) { - fail(); - } - } - - @Test - public void test整形されていないGPX() { - String gpxSourcePath = "target/test-classes/gpx/2020-02-29 13.35.58 Day.gpx"; - try { - System.out.println("GPX file: "+ gpxSourcePath); - GpxFile gpx = new GpxFile(new AppParameters(AppParameters.FILE_PATH), new File(gpxSourcePath)); - gpx.parse(); - ElementMapTRKSEG seg = gpx.gpx.trkseg; - assertTrue(seg.size() == 1); - for (Date key : seg.keySet()) { - assertThat(key, notNullValue()); - } - } - catch (IOException e) { - fail(); - } - catch (ParseException e) { - fail(); - } - catch (ParserConfigurationException e) { - fail(); - } - catch (SAXException e) { - // 整形されていないXML - } - } - } -} diff --git a/src/test/java/osm/jp/gpx/Expecter.java b/src/test/java/osm/jp/gpx/Expecter.java deleted file mode 100644 index d202408..0000000 --- a/src/test/java/osm/jp/gpx/Expecter.java +++ /dev/null @@ -1,159 +0,0 @@ -package osm.jp.gpx; - -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; - -import java.io.File; -import java.util.List; - -import org.apache.commons.imaging.Imaging; -import org.apache.commons.imaging.common.ImageMetadata; -import org.apache.commons.imaging.common.ImageMetadata.ImageMetadataItem; -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.apache.commons.imaging.formats.tiff.constants.GpsTagConstants; - -public class Expecter { - String value; - boolean expect; - String timeStr; - double latD; - double lonD; - String magvar; - - public Expecter(String value, boolean expect, String timeStr, double latD, double lonD, String magvar) { - this.value = value; - this.expect = expect; - this.timeStr = timeStr; - this.latD = latD; - this.lonD = lonD; - this.magvar = magvar; - } - - public static String comparePosition(double b) { - return String.format("%.4f", b); - } - - public static void check(Fixture dataset) { - Expecter[] es = dataset.expecters; - AppParameters params; - try { - 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(Expecter.comparePosition(gpsInfo.getLatitudeAsDegreesNorth()), is(Expecter.comparePosition(e.latD))); - } - if (e.lonD != 180.0D) { - assertThat(Expecter.comparePosition(gpsInfo.getLongitudeAsDegreesEast()), is(Expecter.comparePosition(e.lonD))); - } - - // ELE - //RationalNumber[] ele = (RationalNumber[]) exif.getFieldValue(GpsTagConstants.GPS_TAG_GPS_ALTITUDE); - - // MAGVAR - checkItem(exif, GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION.name, e.magvar); - - // SPEED - - } - } - } catch (Exception e1) { - fail("予期しない例外: "+ e1.toString()); - } - } - - /** - * 指定のEXIFアイテムが設定されているかどうかのテスト - * @param exif - * @param keyword 例：GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION.name; - */ - static void checkItem(TiffImageMetadata exif, String keyword) { - boolean ismagvar = false; - List dirs = exif.getDirectories(); - for (ImageMetadataItem dir : dirs) { - if (dir instanceof TiffImageMetadata.Directory) { - List items = ((TiffImageMetadata.Directory)dir).getItems(); - for (ImageMetadataItem item : items) { - if (item instanceof TiffImageMetadata.TiffMetadataItem) { - String str = item.toString(); - assertNotNull(str); - TiffImageMetadata.TiffMetadataItem tiffitem = (TiffImageMetadata.TiffMetadataItem)item; - if (tiffitem.getKeyword() == keyword) { - str = tiffitem.getText(); - assertNotNull(str); - ismagvar = true; // MAGVARが設定されている - } - } - } - } - } - if (!ismagvar) { - fail("MAGVARが設定されていない"); - } - - } - - /** - * 指定のEXIFアイテムが設定されているかどうかのテスト - * @param exif - * @param keyword 例：GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION.name; - * @param value 期待する値（nullの場合はアイテムが設定されていないことを期待する） - */ - static void checkItem(TiffImageMetadata exif, String keyword, String value) { - boolean is = false; - List dirs = exif.getDirectories(); - for (ImageMetadataItem dir : dirs) { - if (dir instanceof TiffImageMetadata.Directory) { - List items = ((TiffImageMetadata.Directory)dir).getItems(); - for (ImageMetadataItem item : items) { - if (item instanceof TiffImageMetadata.TiffMetadataItem) { - String str = item.toString(); - assertNotNull(str); - TiffImageMetadata.TiffMetadataItem tiffitem = (TiffImageMetadata.TiffMetadataItem)item; - if (tiffitem.getKeyword() == keyword) { - if (value == null) { - fail("MAGVARが設定されている"); - } - str = tiffitem.getText(); - assertNotNull(str); - assertThat(str, is(value)); - is = true; // MAGVARが設定されている - } - } - } - } - } - if (!is && (value != null)) { - fail("MAGVARが設定されていない"); - } - } -} diff --git a/src/test/java/osm/jp/gpx/Fixture.java b/src/test/java/osm/jp/gpx/Fixture.java deleted file mode 100644 index bc20a28..0000000 --- a/src/test/java/osm/jp/gpx/Fixture.java +++ /dev/null @@ -1,566 +0,0 @@ -package osm.jp.gpx; - -import org.junit.experimental.theories.DataPoints; - -import osm.jp.gpx.Expecter; - -public 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; - } - - - /** - * ユニットテスト用データ - * [Canonカメラ] - */ - @DataPoints - public static Fixture[] stddatas = { - new Fixture( - "[std0].Canonカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時", - "target/test-classes/imgdata/Canon20200426.tar.gz", - "target/test-classes/cameradata/", - "target/test-classes/cameradata/", - "target/test-classes/cameradata/AdjustTime.ini", - new Expecter[] { - new Expecter("109_0426/IMG_0001.JPG", false, null, 90.0D, 180.0D, null), - new Expecter("109_0426/IMG_0004.JPG", true, "2020:04:26 10:58:18", 35.4393043555D, 139.4478441775D, null), - new Expecter("109_0426/IMG_0007.JPG", true, "2020:04:26 11:17:48", 35.4382312205D, 139.4584579300D, null), - new Expecter("109_0426/IMG_0010.JPG", true, "2020:04:26 11:20:42", 35.4374477640D, 139.4604294375D, null), - new Expecter("109_0426/IMG_0013.JPG", true, "2020:04:26 12:11:28", 35.4209551122D, 139.4677959569D, null), - new Expecter("109_0426/IMG_0016.JPG", true, "2020:04:26 12:19:42", 35.4202432372D, 139.4685635716D, null), - new Expecter("109_0426/IMG_0019.JPG", true, "2020:04:26 12:21:48", 35.4181452468D, 139.4684348255D, null), - new Expecter("109_0426/IMG_0022.JPG", false, null, 90.0D, 180.0D, null), - new Expecter("109_0426/IMG_0025.JPG", false, null, 90.0D, 180.0D, null), - new Expecter("109_0426/IMG_0028.JPG", false, null, 90.0D, 180.0D, null), - new Expecter("109_0426/IMG_0031.JPG", false, null, 90.0D, 180.0D, null), - new Expecter("109_0426/IMG_0034.JPG", false, null, 90.0D, 180.0D, null), - } - ), - new Fixture( - "[std1].Canonカメラの場合.FILE_UPDATE時間を基準,MAGVARをONの時", - "target/test-classes/imgdata/Canon20200426.tar.gz", - "target/test-classes/cameradata/", - "target/test-classes/cameradata/", - "target/test-classes/cameradata/AdjustTime.magvar.ini", - new Expecter[] { - new Expecter("109_0426/IMG_0001.JPG", false, null, 90.0D, 180.0D, null), - new Expecter("109_0426/IMG_0004.JPG", true, "2020:04:26 10:58:18", 35.4393043555D, 139.4478441775D, "348"), - new Expecter("109_0426/IMG_0007.JPG", true, "2020:04:26 11:17:48", 35.4382312205D, 139.4584579300D, "126"), - new Expecter("109_0426/IMG_0010.JPG", true, "2020:04:26 11:20:42", 35.4374477640D, 139.4604294375D, "115"), - new Expecter("109_0426/IMG_0013.JPG", true, "2020:04:26 12:11:28", 35.4209551122D, 139.4677959569D, "101"), - new Expecter("109_0426/IMG_0016.JPG", true, "2020:04:26 12:19:42", 35.4202432372D, 139.4685635716D, "189"), - new Expecter("109_0426/IMG_0019.JPG", true, "2020:04:26 12:21:48", 35.4181452468D, 139.4684348255D, "173"), - new Expecter("109_0426/IMG_0022.JPG", false, null, 90.0D, 180.0D, null), - new Expecter("109_0426/IMG_0025.JPG", false, null, 90.0D, 180.0D, null), - new Expecter("109_0426/IMG_0028.JPG", false, null, 90.0D, 180.0D, null), - new Expecter("109_0426/IMG_0031.JPG", false, null, 90.0D, 180.0D, null), - new Expecter("109_0426/IMG_0034.JPG", false, null, 90.0D, 180.0D, null), - } - ), - }; - - /** - * 各種カメラGPXファイル - */ - @DataPoints - public static Fixture[] datas = { - // 1 - new Fixture( - "[A1].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時", - "target/test-classes/imgdata/Sony20170518.tar.gz", - "target/test-classes/gpx/20170518.gpx", - "target/test-classes/cameradata/20170518.gpx", - "target/test-classes/ini/AdjustTime.20170518.A1.ini", - new Expecter[] { - new Expecter("10170518/DSC05183.JPG", false, null, 90.0D, 180.0D, null), - new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 35.4367520000D, 139.4082730000D, null), - new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, null), - new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 35.4368560000D, 139.4082190000D, null), - new Expecter("10170518/DSC05205.JPG", false, null, 90.0D, 180.0D, null), - } - ), - // 2 - new Fixture( - "[A2].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時", - "target/test-classes/imgdata/Sony20170518.tar.gz", - "target/test-classes/gpx/20170518.gpx", - "target/test-classes/cameradata/20170518.gpx", - "target/test-classes/ini/AdjustTime.20170518.A2.ini", - new Expecter[] { - new Expecter("10170518/DSC05183.JPG", true, "2017:05:18 09:16:48", 90.0D, 180.0D, null), - new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 35.4367520000D, 139.4082730000D, null), - new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, null), - new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 35.4368560000D, 139.4082190000D, null), - new Expecter("10170518/DSC05205.JPG", true, "2017:05:18 09:48:04", 90.0D, 180.0D, null), - } - ), - // 3. - new Fixture( - "[B1].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時", - "target/test-classes/imgdata/WiMiUS20170518.tar.gz", - "target/test-classes/gpx/20170518.gpx", - "target/test-classes/cameradata/20170518.gpx", - "target/test-classes/ini/AdjustTime.20170518.B1.ini", - new Expecter[] { - new Expecter("cameradata/20170518_092031A.jpg", false, null, 90.0D, 180.0D, null), - new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 35.4366860000D, 139.4082650000D, null), - new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, null), - new Expecter("cameradata/20170518_094827A.jpg", false, null, 90.0D, 180.0D, null), - } - ), - // 4. - new Fixture( - "[B2].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時", - "target/test-classes/imgdata/WiMiUS20170518.tar.gz", - "target/test-classes/gpx/20170518.gpx", - "target/test-classes/cameradata/20170518.gpx", - "target/test-classes/ini/AdjustTime.20170518.B2.ini", - new Expecter[] { - new Expecter("cameradata/20170518_092031A.jpg", true, "2017:05:18 09:20:30", 90.0D, 180.0D, null), - new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 35.4366860000D, 139.4082650000D, null), - new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, null), - new Expecter("cameradata/20170518_094827A.jpg", true, "2017:05:18 09:48:26", 90.0D, 180.0D, null), - } - ), - // 5. - new Fixture( - "[M1a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado", - "target/test-classes/imgdata/separate.tar.gz", - "target/test-classes/gpx/muiltiTRK.GarminColorado.gpx.xml", - "target/test-classes/cameradata/separate.gpx", - "target/test-classes/ini/AdjustTime.M1a.separate.ini", - new Expecter[] { - // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, null), - new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, null), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, "100"), - - // 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, null), - new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, "178"), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"), - - // 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, null), - new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, "111"), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, "344"), - } - ), - - new Fixture( - "[M1b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado", - "target/test-classes/imgdata/separate.tar.gz", - "target/test-classes/gpx/muiltiTRK.GarminColorado.gpx.xml", - "target/test-classes/cameradata/separate.gpx", - "target/test-classes/ini/AdjustTime.M1b.separate.ini", - new Expecter[] { - // 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, null), - new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, null), - - // 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, null), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808641881D, 137.9979D, "100"), - - // 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, null), - new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, null), - - // 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, "178"), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"), - - // 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, null), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, null), - - // 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, "111"), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, "344"), - } - ), - - new Fixture( - "[M1c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado", - "target/test-classes/imgdata/separate.tar.gz", - "target/test-classes/gpx/muiltiTRK.GarminColorado.gpx.xml", - "target/test-classes/cameradata/separate.gpx", - "target/test-classes/ini/AdjustTime.M1c.separate.ini", - new Expecter[] { - // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, null), - new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, null), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, "100"), - - // 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, null), - new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, "178"), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"), - - // 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, null), - new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, "111"), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, "345"), - } - ), - - new Fixture( - "[M1d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado", - "target/test-classes/imgdata/separate.tar.gz", - "target/test-classes/gpx/muiltiTRK.GarminColorado.gpx.xml", - "target/test-classes/cameradata/separate.gpx", - "target/test-classes/ini/AdjustTime.M1d.separate.ini", - new Expecter[] { - // 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, null), - new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, null), - - // 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, null), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, "100"), - - // 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, null), - new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, null), - - // 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, "178"), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"), - - // 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, null), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, null), - - // 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, "111"), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, "345"), - } - ), - - - new Fixture( - "[M2a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J", - "target/test-classes/imgdata/separate.tar.gz", - "target/test-classes/gpx/multiTRKSEG.eTrex_20J.gpx.xml", - "target/test-classes/cameradata/separate.gpx", - "target/test-classes/ini/AdjustTime.M2a.separate.ini", - new Expecter[] { - // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, null), - new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, null), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808641881D, 137.9979, "100"), - - // 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, null), - new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, "178"), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"), - - // 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, null), - new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, "111"), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, "344"), - } - ), - - new Fixture( - "[M2b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J", - "target/test-classes/imgdata/separate.tar.gz", - "target/test-classes/gpx/multiTRKSEG.eTrex_20J.gpx.xml", - "target/test-classes/cameradata/separate.gpx", - "target/test-classes/ini/AdjustTime.M2b.separate.ini", - new Expecter[] { - // 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, null), - new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, null), - - // 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, null), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808641881D, 137.9979, "100"), - - // 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, null), - new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, null), - - // 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, "178"), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"), - - // 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, null), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, null), - - // 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, "111"), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, "344"), - } - ), - - new Fixture( - "[M2c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J", - "target/test-classes/imgdata/separate.tar.gz", - "target/test-classes/gpx/multiTRKSEG.eTrex_20J.gpx.xml", - "target/test-classes/cameradata/separate.gpx", - "target/test-classes/ini/AdjustTime.M2c.separate.ini", - new Expecter[] { - // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, null), - new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, null), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, "100"), - - // 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, null), - new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, "178"), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"), - - // 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, null), - new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, "111"), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, "345"), - } - ), - - new Fixture( - "[M2d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J", - "target/test-classes/imgdata/separate.tar.gz", - "target/test-classes/gpx/multiTRKSEG.eTrex_20J.gpx.xml", - "target/test-classes/cameradata/separate.gpx", - "target/test-classes/ini/AdjustTime.M2d.separate.ini", - new Expecter[] { - // 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, null), - new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, null), - - // 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, null), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, "100"), - - // 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, null), - new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, null), - - // 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, "178"), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"), - - // 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, null), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, null), - - // 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, "111"), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, "345"), - } - ), - - new Fixture( - "[M3a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse", - "target/test-classes/imgdata/separate.tar.gz", - "target/test-classes/gpx/multiTRKSEGreverse.eTrex_20J.gpx.xml", - "target/test-classes/cameradata/separate.gpx", - "target/test-classes/ini/AdjustTime.M2a.separate.ini", - new Expecter[] { - // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, null), - new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, null), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808641881D, 137.9979, "100"), - - // 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, null), - new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, "178"), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"), - - // 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, null), - new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, "111"), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, "344"), - } - ), - - new Fixture( - "[M3b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse", - "target/test-classes/imgdata/separate.tar.gz", - "target/test-classes/gpx/multiTRKSEGreverse.eTrex_20J.gpx.xml", - "target/test-classes/cameradata/separate.gpx", - "target/test-classes/ini/AdjustTime.M2b.separate.ini", - new Expecter[] { - // 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, null), - new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, null), - - // 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, null), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808641881D, 137.9979D, "100"), - - // 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, null), - new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, null), - - // 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, "178"), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"), - - // 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, null), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, null), - - // 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, "111"), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, "344"), - } - ), - - new Fixture( - "[M3c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse", - "target/test-classes/imgdata/separate.tar.gz", - "target/test-classes/gpx/multiTRKSEGreverse.eTrex_20J.gpx.xml", - "target/test-classes/cameradata/separate.gpx", - "target/test-classes/ini/AdjustTime.M2c.separate.ini", - new Expecter[] { - // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, null), - new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, null), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, "100"), - - // 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, null), - new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, "178"), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"), - - // 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, null), - new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, null), - - // 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, "111"), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, "345"), - } - ), - - new Fixture( - "[M3d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse", - "target/test-classes/imgdata/separate.tar.gz", - "target/test-classes/gpx/multiTRKSEGreverse.eTrex_20J.gpx.xml", - "target/test-classes/cameradata/separate.gpx", - "target/test-classes/ini/AdjustTime.M2d.separate.ini", - new Expecter[] { - // 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, null), - new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, null), - - // 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, null), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, "191"), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, "100"), - - // 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, null), - new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, null), - - // 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, "178"), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, "95"), - - // 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, null), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, null), - - // 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, "111"), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, "345"), - } - ), - }; - -} diff --git a/src/test/java/osm/jp/gpx/ImportPictureTest.java b/src/test/java/osm/jp/gpx/ImportPictureTest.java deleted file mode 100644 index 3d9b074..0000000 --- a/src/test/java/osm/jp/gpx/ImportPictureTest.java +++ /dev/null @@ -1,69 +0,0 @@ -package osm.jp.gpx; - -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.runner.*; -import org.junit.experimental.theories.DataPoints; -import org.junit.experimental.theories.Theories; -import org.junit.experimental.theories.Theory; - -@RunWith(Theories.class) -public class ImportPictureTest { - - @DataPoints - public static Fixture[] datas = Fixture.datas; - - @Theory - public void パラメータテスト(Fixture dataset) throws Exception { - ImportPictureTest.setup(dataset); - ImportPictureTest.testdo(dataset.iniFilePath); - Expecter.check(dataset); - } - - static void setup(Fixture dataset) throws IOException { - System.out.println(dataset.toString()); - - // カメラディレクトリを削除する - File dir = new File("target/test-classes/cameradata"); - if (dir.exists()) { - UnZip.delete(dir); - } - File outDir = new File("target/test-classes/output"); - if (outDir.exists()) { - UnZip.delete(outDir); - } - outDir.mkdir(); - - // カメラディレクトリを作成する - UnZip.uncompress(new File(dataset.tarFilePath), new File("target/test-classes/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が発生した。"); - } - } -} \ No newline at end of file diff --git a/src/test/java/osm/jp/gpx/ImportPictureUnitTest.java b/src/test/java/osm/jp/gpx/ImportPictureUnitTest.java deleted file mode 100644 index d4cdd8c..0000000 --- a/src/test/java/osm/jp/gpx/ImportPictureUnitTest.java +++ /dev/null @@ -1,136 +0,0 @@ -package osm.jp.gpx; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; - -import java.io.File; - -import org.junit.runner.*; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.runners.*; - -@RunWith(Enclosed.class) -public class ImportPictureUnitTest { - - public static class 出力ディレクトリが存在しないとき { - - @Before - public void setUp() throws Exception { - Fixture dataset = Fixture.stddatas[0]; - System.out.println(dataset.toString()); - - // カメラディレクトリを削除する - File dir = new File("target/test-classes/cameradata"); - if (dir.exists()) { - UnZip.delete(dir); - } - File outDir = new File("target/test-classes/output"); - if (outDir.exists()) { - UnZip.delete(outDir); - } - //outDir.mkdir(); - - // カメラディレクトリを作成する - UnZip.uncompress(new File(dataset.tarFilePath), new File("target/test-classes/cameradata")); - } - - - @Test - public void 実行() throws Exception { - Fixture dataset = Fixture.stddatas[0]; - try { - ImportPictureUnitTest.testdo(dataset.iniFilePath); - } - catch (Exception e) { - e.printStackTrace(); - fail("Exceptionが発生した。"); - } - - AppParameters params = new AppParameters(dataset.iniFilePath); - File outDir = new File(params.getProperty(AppParameters.IMG_OUTPUT_FOLDER)); - assertThat(outDir.exists(), is(true)); - - Expecter.check(dataset); - } - - @Test - public void MAGVARをON() throws Exception { - Fixture dataset = Fixture.stddatas[1]; - try { - ImportPictureUnitTest.testdo(dataset.iniFilePath); - } - catch (Exception e) { - e.printStackTrace(); - fail("Exceptionが発生した。"); - } - - AppParameters params = new AppParameters(dataset.iniFilePath); - File outDir = new File(params.getProperty(AppParameters.IMG_OUTPUT_FOLDER)); - assertThat(outDir.exists(), is(true)); - - Expecter.check(dataset); - } - - static String comparePosition(double b) { - return String.format("%.4f", b); - } - } - - public static class 出力ディレクトリがFILEのとき { - - @Before - public void setUp() throws Exception { - Fixture dataset = Fixture.stddatas[0]; - System.out.println(dataset.toString()); - - // カメラディレクトリを削除する - File dir = new File("target/test-classes/cameradata"); - if (dir.exists()) { - UnZip.delete(dir); - } - File outDir = new File("target/test-classes/output"); - if (outDir.exists()) { - UnZip.delete(outDir); - } - - // ファイルを生成 - outDir.createNewFile(); - - // カメラディレクトリを作成する - UnZip.uncompress(new File(dataset.tarFilePath), new File("target/test-classes/cameradata")); - } - - - @Test - public void 実行() throws Exception { - Fixture dataset = Fixture.stddatas[0]; - try { - ImportPictureUnitTest.testdo(dataset.iniFilePath); - fail("outDirがFILEなのに、例外が発生しなかった"); // 例外が発生しなかった - } - catch (Exception e) { - // 例外が発生する - assertThat(true, is(true)); - } - - AppParameters params = new AppParameters(dataset.iniFilePath); - File outDir = new File(params.getProperty(AppParameters.IMG_OUTPUT_FOLDER)); - assertThat(outDir.exists(), is(true)); - } - - static String comparePosition(double b) { - return String.format("%.4f", b); - } - } - - - /** - * 実行する - * @throws Exception - */ - static void testdo(String iniFilePath) throws Exception { - String[] argv = {iniFilePath}; - ImportPicture.main(argv); - } -} \ No newline at end of file diff --git a/src/test/java/osm/jp/gpx/UnZip.java b/src/test/java/osm/jp/gpx/UnZip.java deleted file mode 100644 index 8e1ffff..0000000 --- a/src/test/java/osm/jp/gpx/UnZip.java +++ /dev/null @@ -1,139 +0,0 @@ -package osm.jp.gpx; -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.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; - -import org.apache.commons.compress.archivers.tar.TarArchiveEntry; -import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; -import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; - -public class UnZip { - - /** - * *.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; - while ((len = tarIn.read(btoRead)) != -1) { - bout.write(btoRead, 0, len); - } - } - destPath.setLastModified(tarEntry.getLastModifiedDate().getTime()); - } - tarEntry = tarIn.getNextTarEntry(); - } - } - } - - /** - * 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(); - } - } - - - 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() +"'"); - } - } -} diff --git a/src/test/resources/gpx/20170517.gpx b/src/test/resources/gpx/20170517.gpx deleted file mode 100644 index d1c827b..0000000 --- a/src/test/resources/gpx/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/src/test/resources/gpx/20170518.gpx b/src/test/resources/gpx/20170518.gpx deleted file mode 100644 index 32ec1cb..0000000 --- a/src/test/resources/gpx/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/src/test/resources/gpx/2019-09-07 16.17.12 Day.gpx b/src/test/resources/gpx/2019-09-07 16.17.12 Day.gpx deleted file mode 100755 index f9f7303..0000000 --- a/src/test/resources/gpx/2019-09-07 16.17.12 Day.gpx +++ /dev/null @@ -1 +0,0 @@ -Garmin International2019-09-07 16:17:12 DayDarkMagenta910.03909.54909.06908.10908.10908.58908.58908.58908.58909.06908.58909.06909.06908.58908.58908.58908.58908.58908.58908.58908.58908.58908.58908.58908.10907.62907.62907.14907.14906.66906.18906.18906.18905.70905.70905.22905.22905.22905.22904.74904.74904.26903.78903.30903.30902.82902.82903.30903.30903.30903.78903.78903.78903.78903.30903.30903.30903.30902.82902.82902.82902.82902.82902.82902.33902.33902.33902.33901.85901.85901.85901.85901.85901.85901.85901.85901.85902.33902.33902.33902.82902.82902.82902.82902.82902.82902.82903.30903.30903.78904.26904.26904.26904.26904.26903.78903.30902.82902.82902.82902.33902.33902.33902.33902.33902.33901.85901.85901.37901.37901.85901.85901.85901.85901.85901.85901.37901.37901.37900.89900.89900.41900.41899.93899.45898.97898.97898.49898.49898.49898.49898.49898.49898.01898.01898.01898.01898.01898.49898.49898.49898.49898.49898.49898.01898.01898.01898.01898.01898.49898.49898.97898.97898.97899.45899.45899.45899.45899.45899.45899.45899.93899.93899.93899.93899.45899.45899.45899.45898.97898.49898.01897.53897.05896.57896.09896.09895.61895.61895.61895.12894.16893.68892.72892.24891.28890.80890.32889.84889.84889.36889.36889.36889.36889.36888.88888.88888.88888.40888.40887.91887.91887.43887.43887.43887.43887.43887.43887.91887.91888.40888.40888.88888.88889.36889.36889.84889.84890.32890.32890.80890.80890.80890.80890.80890.32890.32890.32889.84889.84889.36889.36889.36888.88888.40888.40888.40887.91888.40888.40888.40888.88888.88889.36889.36889.84889.84890.32890.80890.80891.28891.28891.28891.76891.76891.76891.76891.76892.24892.24892.24891.76891.76891.76891.28891.28891.28891.28891.28891.28891.76891.76891.76891.76891.76892.24892.24892.24892.24892.24892.24892.24892.24892.24891.76891.76891.76891.28891.28891.28891.28891.28891.76891.76891.28891.76891.28891.28891.28891.28891.28891.76891.76892.24892.24891.76891.28891.28890.80891.28890.80890.80890.32890.32890.32890.32890.32890.32890.32890.80890.80890.80891.28891.28891.76891.76892.24891.76891.76891.76891.76891.76891.76892.24892.24892.24892.24892.24892.24892.24892.24891.76891.76891.28891.28890.80890.80890.80890.80890.80890.80891.28891.28891.76891.76892.24892.72893.20893.20893.68893.68893.68893.68893.68893.68893.20893.20893.20892.72892.72892.24892.24892.24891.76891.76891.28891.28890.80890.32890.32890.32890.32890.32890.32890.32890.32890.32890.32890.80890.80890.80890.80890.80890.80890.80890.80890.80890.32890.32890.32890.32890.32890.32889.84889.84889.84889.84889.84889.84889.84889.84889.84889.84889.84889.84889.84889.84890.32890.32890.32890.80890.80890.80890.80890.80890.80890.80890.32890.32890.32890.80891.28891.28891.76892.24892.72892.72892.72893.20892.72892.72892.72892.72892.72892.72892.72892.24892.24892.24892.24892.72892.72893.20894.16895.12896.09897.05897.53898.01898.01898.49898.49898.97898.97898.97898.97899.45899.45899.45899.93899.93900.41900.89900.89901.37901.37901.37901.85901.85901.85901.85902.33902.33902.33901.85902.33902.33902.33902.33902.33902.82902.82903.30903.78904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.74904.74904.74905.22904.74904.74904.74904.74904.74904.74905.22905.22905.22905.70905.70905.70906.18906.18906.18906.18906.18906.66906.66907.14907.14907.14907.14907.14906.66906.66906.66906.66907.14907.14907.62907.14907.62907.14907.14907.14907.14907.14907.14907.14907.14907.14907.14907.14907.14907.62907.62907.62907.62907.62907.62907.62908.10908.10908.10908.10907.62907.62907.62907.14906.66906.66906.66906.66906.66906.66906.66906.66906.66906.66906.66906.66906.66906.66906.18906.18906.18906.18906.18906.18906.18906.18906.18906.18905.70905.70905.70905.22905.22905.22905.22905.70905.70905.70906.18906.18906.66906.66907.14907.14907.62907.62908.10908.10908.58908.58909.06909.06909.54909.54910.03910.51910.99910.99911.47911.47911.95912.43912.91913.39913.87914.35914.83915.31915.79915.79916.27916.75917.24917.24917.72917.72917.24917.24917.24917.24917.24917.72917.72917.72918.20918.20918.68919.16919.16919.64919.64920.12920.12920.12920.60920.60921.08921.08921.08920.60920.60920.12920.12920.12920.12919.64919.64919.16919.16918.68918.68918.68919.16919.16919.16919.16919.64920.12920.12920.60921.08921.08921.56922.04922.04922.52923.00923.00923.48923.48923.48923.48923.48923.48923.48923.48923.96923.96923.96923.48923.48923.48923.48923.96923.96923.96923.96923.96923.96923.96923.96923.96924.45924.45924.93924.93925.41925.41925.89925.89925.89925.89925.89925.89926.37926.37926.85926.85927.33927.33927.33927.33927.33927.81927.81927.81928.29928.29928.29928.77928.77928.77928.77928.77928.77929.25929.73929.73929.73930.21930.21930.69930.69930.69931.17931.17931.17931.17931.17931.17931.17930.69930.69930.21930.21929.73929.25929.25928.29927.33926.85925.41924.93924.45923.96923.96924.45924.45924.93924.93924.93925.41926.37926.85927.81928.29929.25929.73931.17931.65931.65931.17930.69929.73928.29925.89925.41924.93925.89925.89926.37926.37927.33927.81928.29929.25929.25929.25924.45923.00921.08919.64918.20917.72917.72917.72917.72917.72917.72917.24917.24917.24917.24917.24917.24917.24917.24917.24916.75916.75917.24917.24917.24917.24917.24917.24917.24917.24917.24917.24917.24916.75916.75916.27916.27915.79915.31915.31915.31914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83915.31915.31915.31915.31915.31914.83914.83913.87913.39912.91912.43911.95911.47910.99910.51910.03909.54909.06908.58908.58908.10908.10908.58908.10908.10908.10908.10908.10908.10908.10908.10908.10908.10907.62907.62907.14907.62907.62907.62907.62907.62907.62907.62907.14907.14907.14907.14907.14907.14907.62907.62907.62907.14907.14907.14906.18905.70905.22904.74904.74904.26903.78902.82902.33901.37900.41898.97898.01897.05896.57895.61895.12895.12895.12895.12895.12895.12895.12894.64894.64895.12895.12895.12895.12894.64894.64894.64894.64894.16894.64894.16893.68893.20893.20892.72892.72892.24892.24892.24892.24892.24892.24892.24891.76891.76891.28891.28890.80890.32889.84889.36889.36889.36888.88888.40888.40888.40887.91887.91887.91887.91887.91887.91887.43887.43887.43887.43886.95886.95886.95886.95886.95886.47886.47885.99885.51885.51885.03884.55884.07884.07884.07883.59883.59883.11883.11883.11883.11883.11883.59883.59883.59884.07884.07884.07884.07884.07883.59883.59883.59883.59883.59883.11883.11883.11883.11883.11883.11883.11883.11883.11883.11883.11883.59883.59883.59884.07884.07884.55884.55885.03885.51885.51885.99885.99886.47886.47886.95886.95886.95886.95886.95886.47886.47886.47885.99885.51885.03884.55884.55884.07883.59883.59883.59883.11882.63882.15882.15882.15882.15882.15882.15882.15882.15881.67881.67881.19881.19881.19880.71880.71880.71880.71880.22879.74878.78877.82877.34876.86876.38876.38876.38876.86876.86876.86877.34877.34877.34877.34877.34877.82877.82877.82877.82877.82878.30878.78879.26879.74880.22880.71881.19881.19881.19881.19881.19881.19880.71880.22880.22880.22879.74879.74879.26879.26879.26878.78878.78878.30878.30877.34877.34876.86876.38876.38876.38875.90875.90875.42875.42874.94874.94874.94874.46874.46873.98873.50873.50873.01872.53872.53872.05871.57871.09870.61870.61870.13869.65869.65869.17868.69868.69868.21867.73867.73867.25866.77866.77866.29866.29865.80865.80865.80865.32865.32865.32864.84864.36864.36864.36863.88863.88863.88863.88863.88863.88863.88863.88863.88863.88864.36864.36864.84864.84865.32865.32865.32865.32865.32865.80865.80866.29866.29866.29866.77866.77866.77866.77867.25867.73867.73867.73868.21868.21868.21868.21868.21868.21868.21868.21868.21868.21867.73867.73867.25867.25866.77866.77866.29866.29866.29865.80865.32865.32864.84864.36863.88863.88863.40863.40863.40862.92862.92862.44861.96861.96861.96861.96861.96861.96861.48861.48861.48861.00861.00861.48861.48861.48861.48861.48861.48861.48861.48861.00861.00861.00861.00861.48861.00861.48861.48861.48861.48861.48861.48861.00860.52860.04859.56859.08858.59858.11857.63857.15856.67856.19855.71855.71855.71855.23855.23855.23855.23855.23855.23855.23855.23855.23855.23855.23854.75854.75854.27853.79853.31852.83852.83851.87850.90850.42848.98848.50848.50848.02848.02847.54847.06846.58846.10845.62844.66843.69843.21842.25841.29839.85839.37838.89838.41837.93837.45837.45836.96836.48836.00835.52835.52835.04834.08833.60833.60833.12833.12832.64832.16832.16832.16832.16832.16832.64832.64832.64832.64832.64832.64832.64833.12833.12833.12833.60833.60833.60833.12833.12833.12832.64832.64832.64832.64832.64832.64832.64833.12832.64833.12833.12833.12833.12833.60833.60834.08834.08834.08834.56834.08834.56834.56834.08833.60833.60833.12832.64832.64832.16831.68831.20831.20830.72830.24829.27829.27828.79828.31827.83827.35827.35826.87826.87826.87826.39826.39826.39826.39826.39826.39826.39826.39826.39826.87826.87826.87826.87827.35827.35827.35827.35827.35827.35827.35826.87826.87826.87826.87826.87826.87826.87826.87826.87826.87826.87826.39826.39826.39826.39826.39826.39825.91825.91825.43825.43825.91825.91825.43825.91825.43825.43825.43825.43825.43825.43825.43823.99823.03823.03823.03823.03823.03823.03823.03823.03823.03823.51823.51823.51823.99823.99823.51823.51823.03823.03822.55822.55822.06821.58821.10820.62820.62820.14820.14820.62820.62820.62821.10821.10821.10821.10820.62820.62820.14820.14820.14820.14820.14820.14820.14820.14820.62820.62820.62821.10821.10821.58822.06822.55823.03823.03823.03823.03823.03823.51823.03823.03823.51823.51823.03823.03823.03822.55822.06822.06822.06822.06821.58821.58821.58821.58821.58821.58821.58821.58821.58821.58821.58821.10821.10821.10821.10821.10821.58821.10821.10821.10821.10820.62820.62820.62820.14820.14820.14820.14820.14820.14819.66819.18819.18818.70818.70818.70818.70818.22818.22818.22818.22818.22818.22818.22818.22818.70818.70819.18819.18819.18819.18818.70818.70818.70818.22818.22818.22817.74817.74817.26817.26816.78816.78816.78816.30815.82815.34815.82815.34815.34815.34814.85814.85814.85814.85814.37814.37814.37813.89813.41812.45811.97811.49811.01810.53810.05810.05809.57809.09808.61808.13808.13807.64807.16807.16806.68806.68806.68806.68806.20805.72805.72805.72805.24805.24805.24804.76804.28804.28804.28804.28804.28804.28804.28804.28804.28804.28804.76804.76804.76804.76804.76805.24805.24805.24806.20806.68806.68807.16807.64807.64808.13808.13808.61808.61809.09809.57810.05810.53811.01811.49811.97812.45812.45812.93812.93812.93812.93812.93812.93812.93812.93812.93812.93812.93813.41812.93812.93812.93812.93812.93813.41813.41813.41813.89813.89813.89814.37814.37814.85814.85814.85815.34815.34815.82816.30816.30816.30816.30816.78816.78817.26817.26817.26817.26817.26817.26817.26817.26817.74817.74817.74818.22818.22818.22818.70818.70819.18819.18819.18819.18819.18819.18819.18819.18819.18819.18819.66820.14820.14820.14820.14820.62820.62820.62821.10821.10821.58822.06822.06822.55823.03823.03823.51823.51823.99824.47824.47825.43825.91826.39826.87826.87827.35827.35827.83827.83828.31828.31828.79828.79828.79829.27829.27829.76830.24830.24830.72830.72831.20831.68831.68832.16832.16832.16832.16832.16832.64832.64833.12833.60833.60834.08834.08834.08834.56834.56834.56835.04835.04835.04835.04835.04834.56834.56834.56834.08834.56834.56834.56834.08833.60833.60833.12833.12832.64832.64832.64832.16832.16832.16832.16832.16832.16832.16832.16832.16832.16832.64832.64833.12833.12833.12833.12833.60833.60833.60834.08834.08834.08833.60833.60833.12832.64832.64832.16831.68831.68831.20831.20830.72830.24830.24829.76829.27828.79828.31828.31827.83827.35827.35826.87826.87826.87826.39825.91825.91825.43825.91825.91825.91825.91826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.87826.87826.87826.39826.39826.39826.39826.87826.87826.87827.35827.35827.83828.31828.31828.79828.79829.27829.27829.27829.76829.76830.24830.24830.24830.24830.24830.24830.24830.72831.20831.20831.68832.16832.16832.64833.12833.12833.60834.08834.08834.56835.04835.04835.04835.52835.52836.00836.00836.00836.48836.48836.96836.96837.45837.45837.45837.93837.93838.41838.89838.89838.89839.37838.89838.89838.41838.41837.93837.93837.93837.93837.93837.93837.93837.93837.93837.93838.41838.41838.41838.41838.41838.41837.93838.41838.41838.41838.41838.41838.89839.37839.37839.85839.85840.33840.81841.29841.29841.77842.25842.73842.73842.73842.73842.73842.73842.73842.25842.25841.77842.25842.25842.73842.25842.25843.21843.21843.69844.18844.66844.66845.14845.62846.10846.10846.58847.54847.54848.02848.50848.50848.98848.98848.98848.50848.98849.46849.46849.94850.42850.42850.42849.94849.94849.94849.46849.46848.98848.50848.02848.02847.54847.54847.06847.06847.06847.06847.54847.54847.54848.02848.02848.02848.02848.02848.02848.02848.50848.50849.46849.46849.46849.46849.46849.46849.46849.46849.94849.94849.94850.42850.42850.42850.42850.42850.42850.42850.42850.90850.90850.90851.38851.38851.38851.87851.87852.35852.83852.83852.83853.31853.79853.79854.27854.27854.27854.75854.75854.75855.23854.75854.75854.75854.27853.31852.83852.35851.87851.38850.90849.94849.94849.94849.94849.94849.94849.46849.46849.46849.46849.46848.98848.98848.50847.54845.14843.21841.77840.81840.33839.85839.37837.93837.45837.45836.96836.96836.48836.48836.48836.00836.00835.52835.52835.04835.04835.04835.04835.04835.04835.04835.04835.04835.04835.04835.04835.04835.04835.52835.52836.00836.00836.48836.48836.96836.96836.96836.96836.96836.48836.00835.52835.04834.56834.56834.56834.08833.60833.12833.12833.12833.12832.64832.16832.16832.16832.16832.16832.16832.16832.16832.16832.64832.64833.12833.60834.08834.08834.56835.04835.04835.04835.04835.52836.00836.00836.00836.48836.48836.48836.48836.48836.48836.48836.48836.48836.96836.96837.45837.45837.45837.93837.93838.41838.41838.41838.41838.41838.89838.89838.89838.89838.89839.37839.85839.85839.37839.37839.37839.37838.89838.41838.89838.41838.41838.41837.45837.45837.93837.93837.93837.45836.96836.00836.00835.52835.52835.52835.04835.52835.04835.04834.56834.56834.08834.08833.60833.12832.64832.64832.64832.16832.16832.16832.16832.64832.64832.64833.12833.12833.60834.08834.08834.56834.56834.56834.56834.08833.60833.12832.64832.16831.68831.20830.72829.76829.76829.27827.83826.87826.39825.91825.91825.91825.91825.91825.43825.43825.43825.43825.43824.95824.95824.95824.95825.43825.43824.95824.47823.99823.51823.03822.55821.58820.62819.66817.74816.30815.34814.37813.41812.93812.93812.93812.93812.93812.45811.97811.97811.97811.97811.49811.01811.01810.53810.05810.05809.57809.57809.09808.61808.13807.16806.68806.68806.20805.72805.72805.24805.24805.24805.24804.76804.76804.28803.80803.32803.32802.84803.32803.32803.32803.32803.80803.32803.80803.80803.80803.80804.28804.76805.24805.24805.72806.20806.68807.16807.64808.13808.61809.09809.57810.05810.53811.01811.49811.97812.45812.93813.41813.89814.37814.85814.85815.34815.34815.34815.82815.82815.82815.82815.82815.82815.82815.82815.82815.82815.34815.34815.34815.34814.85814.85814.37814.37814.37814.37814.37814.37814.37814.37813.89813.89813.41811.97811.49811.49811.97811.97811.01810.53810.05809.57808.61808.13808.13807.64807.16807.16806.68806.68806.20805.72805.24804.76804.76804.76804.76804.76804.76804.76804.28803.80803.32802.84802.36802.36801.88800.92800.92800.44800.44799.95799.47798.99798.51797.55797.55797.07796.59796.59796.11796.11795.63795.15794.67794.19793.71792.74792.74792.26792.26791.78791.78791.30791.30791.30791.30790.82790.82790.82791.30791.30791.78791.78791.78792.26792.74793.22793.22793.71793.71794.19794.19794.67795.15795.15795.15795.63796.11796.11796.59797.07797.55797.55798.03798.51798.51798.99799.47799.47799.95800.44800.44800.92801.40801.88801.88801.88802.36802.36802.84802.84803.32803.80803.80804.28804.28804.76804.76805.24805.72805.72806.20806.20806.68806.68807.16807.16807.64808.13808.61808.61809.09809.09809.57809.57810.05810.53811.01811.49811.49811.97811.97812.45812.45812.45812.93812.93813.41813.41813.89813.89813.89814.37814.85814.85815.34815.34815.34815.82816.30816.30816.78817.26817.26817.74818.22818.22818.70819.18819.66819.66820.14820.14820.14820.62820.62821.10821.58822.06822.55823.03823.03823.51823.51823.99824.47824.95824.95825.43825.91825.91826.39826.87826.87827.35827.83828.31828.31828.79829.27829.27829.76830.24830.72830.72831.20831.68832.16832.64833.12833.60834.08834.56835.04835.52836.48836.96837.45838.41838.89839.37839.85840.33841.29841.77842.25843.21843.69844.18844.66845.62846.10846.58847.06847.54848.02848.02848.50848.50848.98849.46848.98848.98848.50848.02848.02848.02847.54847.54847.06847.06846.58846.10845.62845.14844.66843.69843.69842.73842.73842.25842.25841.77841.29840.81839.85838.89838.89838.41838.41837.93837.45836.96836.00835.52835.04834.56834.56834.56834.56834.56834.08833.60833.12832.16831.68831.20831.20830.72830.24830.24829.76829.27828.79828.31826.87825.91824.95823.99823.03822.06821.10819.66818.70816.78815.82814.85814.37814.37813.89813.89813.41812.93812.45812.45811.97811.49811.01811.01810.53809.57809.09808.61808.61808.13808.13807.64807.64807.64806.68806.20806.20805.72805.24804.76804.28802.84801.88801.40800.44798.99797.55795.63792.26789.86787.46785.53784.57783.61782.65781.21779.77778.32777.36776.40775.92775.92775.44774.96774.96774.96774.48774.00773.52773.52773.04773.04773.04772.56772.56771.60771.11770.63770.63770.15770.15769.67769.19769.19768.71768.23767.75767.27766.79766.31766.31766.31765.83766.31765.83765.35764.87764.87764.39763.42762.94762.94762.94762.46762.46762.46762.46762.46762.46762.46762.94762.94762.94763.42763.42763.42763.90763.90763.90763.90764.39763.90763.90763.90763.42763.42762.94762.46762.46762.46762.46762.46762.46762.46762.46762.46762.46762.46762.46762.46762.46761.98761.98761.50761.50761.02761.02760.54760.54760.06760.06760.06760.06760.06759.58759.10759.10759.10758.62758.14758.14758.14757.66757.66757.18757.18756.69757.18756.69756.69756.69756.69756.69756.69756.21756.21756.21755.73755.73755.25755.25755.25754.77754.77754.77754.29754.29754.29753.81753.81753.81753.33753.33752.85752.37751.89751.89751.89751.41750.93750.93750.93750.93750.45750.45750.45749.97749.97749.49749.00749.00749.00749.00749.49749.00749.00748.52748.04747.56747.56747.08746.60746.12745.64745.64745.16744.68744.68744.68744.68744.68744.68744.68744.68744.68744.68744.68745.16745.64745.64746.12746.12745.64745.64745.64745.16744.68743.72743.72743.24742.76742.28 \ No newline at end of file diff --git a/src/test/resources/gpx/2019-12-29 06.50.19 Day.gpx b/src/test/resources/gpx/2019-12-29 06.50.19 Day.gpx deleted file mode 100755 index 1124536..0000000 --- a/src/test/resources/gpx/2019-12-29 06.50.19 Day.gpx +++ /dev/null @@ -1 +0,0 @@ -Garmin International2019-12-29 06:50:19 DayDarkMagenta73.6874.1674.6474.6474.1674.1674.6475.1275.1275.1275.1275.6075.6076.0877.0477.5277.5276.5675.6075.1274.1672.7272.2472.2472.2472.2472.2472.7273.2073.6874.1674.6474.6475.1275.6075.6077.0478.0078.9779.4579.9379.9381.3782.8183.7784.7386.1887.1488.5889.5490.5091.4692.4293.3993.8793.8793.8793.8793.3992.9092.4292.4291.9491.4690.9890.9890.9890.9891.4691.4690.9891.4691.4691.4691.9491.9492.4292.4292.9092.9092.9092.9093.3993.3993.8794.3594.3594.3594.3594.3594.8394.8394.8394.8395.3195.3195.3195.7995.7995.3194.8395.7996.2795.7996.7596.7597.2397.2397.7197.7197.7198.1998.1997.7197.7197.2396.7596.2795.7995.3194.8394.3594.3594.3593.8793.8793.8793.3993.3992.9092.9092.4291.4690.9891.4690.5090.5090.9891.4691.4691.9491.9491.9491.9492.4292.4292.9092.9092.9092.9092.4292.4292.9092.9092.9092.4292.4292.4292.4292.4292.4292.4292.4292.4291.9492.4292.4292.9093.3993.3993.8793.3993.3993.3993.3993.3993.3993.3993.8793.8794.3594.3594.3594.8394.8394.8394.8395.3195.3195.3195.3194.8395.3195.3195.3195.7995.7996.2796.2796.7596.7596.7596.7596.7596.7596.7596.7596.7596.7596.7597.2397.2397.7197.7197.7198.1998.1998.1998.6798.6798.6798.6798.6798.6798.6798.6798.6798.6798.6798.6798.6798.6797.7198.1998.1997.7197.7197.7197.7197.2397.2397.2397.2397.2397.2397.2397.2397.2397.2397.2397.2397.2397.2396.7595.7995.3194.8394.8394.3594.8394.8394.8394.8394.8394.8394.8394.8394.8394.8394.8394.8394.3593.8793.8794.3594.3595.3197.2398.6799.63100.60102.04103.00103.96104.92105.88106.84107.32107.81108.29108.77109.25109.73109.73110.21109.73109.73109.25108.77108.77108.77108.29108.29107.81107.32107.32106.84106.36105.88105.40105.40104.92104.92104.92104.92104.92104.92104.92105.40105.40105.40105.40104.92105.40105.40105.40105.40105.40105.40105.40104.92104.44103.96103.48103.00102.52102.52102.04102.04101.56101.56101.56101.56101.56101.56101.56102.04102.04102.04102.04101.56101.56101.56101.08101.08101.08101.08101.08101.08101.08101.08101.08101.08101.08101.08100.60100.60100.60100.60100.60100.60100.60100.60100.60100.60100.60100.11100.1199.6399.6399.6399.1599.6399.6399.6399.6399.6399.6399.63100.11100.11100.60100.60100.60101.08101.08101.08101.08101.08100.60100.1199.6399.1599.1598.6798.6798.1998.1998.6798.6798.6798.6798.6798.6798.1998.1998.1998.1998.1998.1998.1998.1998.1997.7197.7197.2396.7596.2795.7995.3194.8394.8394.3594.3594.3593.8793.8793.8793.3992.9092.9092.9092.4292.4292.4292.4292.4292.9092.9092.9093.3993.3993.3993.3993.3993.3993.3993.3993.8793.3993.3993.3993.3993.3993.3993.3993.3993.3993.8793.8794.3594.3594.3593.8793.8793.8793.3993.3992.9092.4292.4292.4291.9491.9491.4690.9890.9890.9890.9890.5090.9890.9890.9890.9891.4691.4691.4691.4691.9491.9491.9491.9491.9491.9491.9491.9491.9491.9491.4691.4691.4691.4691.4691.4691.4691.9491.9491.9492.4292.4292.9092.9093.3994.3594.8395.3196.2796.7597.2397.7198.6799.63101.08102.04102.52103.00103.48103.96104.44104.92104.92105.88106.36106.36106.84106.84106.84106.36106.36105.88106.36106.36105.88105.88106.36106.36106.36106.36106.36106.36106.36106.36106.84106.84106.84106.84107.32107.81108.29108.77109.25109.73109.73110.69111.17112.13113.09113.57114.05114.53115.50116.46116.94117.90118.38118.86119.34119.82120.30120.78121.26121.74122.22122.71122.71122.71122.71122.71122.22122.22122.22122.22121.74120.78120.30120.30120.30119.82119.34118.86118.86118.86117.90117.90117.90117.42117.42117.42115.98115.50115.50115.01115.01114.53114.53114.53115.01115.01115.50115.98116.46117.42117.90118.38118.38117.90116.94116.46115.98115.50115.01114.53114.53114.53114.05114.05114.05114.05114.05113.57113.57113.57113.57114.05114.53115.01115.01115.01115.01114.53114.53114.53115.01115.50115.50115.50115.50115.50115.50115.01115.01115.01115.50115.50115.50115.50115.50115.98115.98115.98115.98115.98115.50115.50115.01115.01115.01114.53114.53114.53114.53114.05114.05114.05114.05113.57113.57113.57113.09113.09113.57113.57113.57113.09112.61112.61112.13112.13112.13112.61113.57114.53115.50116.46116.94116.94117.90118.38119.34119.82120.78121.26121.26121.74121.74121.74121.26121.26121.26120.78120.30119.82119.34118.38117.90117.42116.94116.94116.94116.46116.46116.46115.98115.50115.01114.53114.05114.53114.53114.53114.53114.53114.53114.53114.53115.01115.01115.01115.01115.50115.98115.98116.46116.46116.94116.94116.94116.94116.94116.94116.94116.94117.90118.38118.86119.34119.82120.30121.26121.74122.22122.71123.67125.11125.59126.07127.03127.99128.47129.43129.92130.40131.36131.84132.32132.32132.80133.28133.28133.76133.28134.24135.20136.64137.61138.09139.05140.01140.49140.97141.93142.41143.37144.34144.82145.78146.26147.22147.70148.18148.18148.66149.14149.62149.62149.62149.14148.66148.18146.74146.26145.78144.34143.37142.89141.45140.49139.53138.57137.61137.13136.16135.68135.68134.72134.24133.76133.28132.80132.32131.84131.36130.88130.40130.40130.40129.92129.92129.92130.40130.40130.88130.88131.36131.84131.84131.36131.84131.84131.84131.36131.36130.88130.88131.36131.84132.32132.80132.80133.28133.28133.76134.72134.72135.20135.20135.68136.16136.64136.64136.64136.16136.16136.16135.68134.72134.24133.76132.80132.32131.84131.36130.88130.40130.40130.40129.92129.92129.92129.92129.92129.92129.92129.43129.43128.95129.43129.92130.40130.88130.88130.40129.92129.92129.92129.43129.43129.43129.43128.95128.47127.99127.99127.99127.51127.51126.55125.59125.11124.63124.15124.63124.63124.63124.63124.63124.15124.15124.15123.67123.67123.19123.19123.19123.19123.19122.71122.22121.26121.26120.78120.78120.78120.30120.30120.30120.30120.30120.78120.78120.78121.26121.26121.74122.22122.71122.71123.19123.19124.15124.63125.11125.59126.07126.55127.03127.99128.47128.95129.43130.40130.88131.36131.84132.32132.80133.28133.76134.24134.72134.72134.72135.20135.20135.20135.68135.68136.16136.16135.68135.68135.20134.72134.24133.76132.80132.32132.32132.32132.32132.32132.80133.28133.28133.28133.76133.76133.76133.76134.24134.24134.72134.72135.20135.20135.68135.68136.16136.16136.16136.16135.68135.68135.20134.72134.72134.24133.76133.28133.28133.28133.28133.28133.28133.28133.28133.28133.28133.28133.28133.28133.76133.76133.76133.76133.28133.28133.28133.28133.28133.28133.28133.76133.76133.76134.24134.24134.72135.20135.20135.68136.16136.64137.13137.13137.61138.09138.57139.05139.53140.01140.49141.45142.41143.37144.34145.30146.26147.22147.70148.66149.14150.10151.06151.54152.51152.99153.47153.95153.95154.43154.91155.39155.87156.35156.35156.35156.35156.35156.35156.35155.39154.91154.43153.95153.95153.47152.51152.03152.03151.54150.58150.10149.62149.14148.18147.22146.26145.30144.34143.37142.41141.45140.49139.53138.09136.64134.72133.28131.84130.40128.95128.47127.99127.99127.51127.99127.99127.99127.99127.51127.03126.55126.07125.59125.11124.63124.15124.15123.67122.71120.78119.34118.38116.94116.46115.98115.50115.01114.05113.09112.61112.13112.13111.65111.65111.17111.17110.21109.73109.73109.25108.77108.29108.77109.25109.25109.73109.73109.73110.21110.69111.65112.61113.57114.53115.50116.46116.94117.90118.86119.34119.82120.30121.26122.22122.71123.19123.19123.67123.67123.67123.67124.15124.15123.67124.15124.15124.63124.63125.11125.59125.59125.59126.07126.07126.07126.07126.07126.07126.07126.07126.07126.55127.03127.51127.51127.51127.51127.51127.99127.99127.51127.51127.99127.99127.51127.51126.55126.07125.59123.67122.22121.74121.74121.26120.78120.30119.82118.38117.90117.90117.42117.42116.46115.50114.05113.09112.13111.65110.69110.21109.73109.25109.25108.77108.29107.81107.32107.32106.84106.84106.36106.36106.36106.36105.88105.88105.40104.92104.44103.96103.48103.48103.00103.00102.52102.04101.56101.08100.60100.1199.1598.6797.7197.2397.2396.7597.2397.2397.2397.2397.7198.1998.6799.63100.11101.08102.04103.00103.48104.44104.92106.36106.84107.81108.29108.77109.73110.21111.17112.13112.61113.57114.53115.50116.46117.42118.38119.34118.86119.82120.30120.78121.26122.22122.71122.71123.19123.67124.63126.07127.03127.99128.47128.95129.43129.43129.92130.88132.32133.76135.20136.16137.61139.05140.01141.45142.41143.37144.34145.30146.26147.22147.70148.18148.18148.18148.66148.66148.66149.14149.14149.14148.66148.18147.70147.22147.22147.22146.74146.26146.26145.78145.30144.82143.85143.37142.41141.93141.93141.45140.97140.49140.01139.05138.57138.09137.61137.13137.13136.64136.16136.16135.68135.68135.20134.72134.72134.24133.76133.76133.76133.76133.76133.28133.28132.80132.80132.32131.84130.88128.47126.55125.59125.59125.59125.59124.15123.19121.74121.26120.30119.82119.34118.86118.38117.90117.90117.42116.94116.46115.98115.50115.01114.53114.05114.05113.57113.09112.61112.13111.65111.65111.65111.65111.17111.17110.69109.73108.77108.29106.84105.88103.96102.04100.1198.6797.2396.2795.3194.8394.3593.8793.8793.8793.8793.8793.3993.3993.8794.3594.3594.8395.7996.2796.7597.2397.7198.1999.1599.63100.11100.60100.60101.08101.08101.56101.56101.56102.04102.04102.52102.52102.52101.56101.56101.08101.08100.60101.08101.08101.56101.56101.56101.56101.08101.08100.60100.60100.60100.60100.60100.60100.60100.60100.60100.11100.11100.11100.11100.11100.1199.6399.6399.6399.1599.1598.6798.6798.6798.6798.1998.1998.1998.1998.1998.1998.1998.1998.1998.6798.6799.1599.1599.1599.6399.6399.6399.6399.6399.6399.6399.6399.6399.1599.1599.1599.1599.1599.1598.6798.6798.6799.1599.1598.6798.6798.6799.1599.1599.1598.6798.6798.1998.1997.7197.7197.2396.7596.7596.2796.2795.7996.2795.7995.7995.7995.3194.8394.8394.8394.8394.3594.3594.3593.8793.8793.8793.3993.3992.9092.9092.4292.4292.4292.4292.4291.9491.9491.4691.4691.4690.9890.5090.5090.5090.9890.9891.4691.9491.9492.4292.4292.4292.4292.4292.4292.4292.4292.4291.9491.9491.9491.9491.9491.4691.4691.4691.4691.9491.9491.9491.9491.9491.9491.4691.4690.9891.4690.9890.9890.9890.5090.5090.9890.9891.4691.9492.4293.3993.8794.8395.7996.2796.7597.2397.7198.1998.6799.1599.1599.63100.11100.60101.08101.56101.56102.04102.52103.00103.48103.96104.44105.40106.36106.84106.36106.36106.84107.81109.25110.21111.17111.65112.61113.09113.09111.65111.17111.65112.13112.61113.09114.05114.53115.01115.01115.01115.50116.46116.94117.42117.90118.86119.34119.82120.30120.30120.30120.30120.30120.30120.78120.30120.30119.82120.30120.30120.30120.78120.78120.78120.78120.78121.26121.26121.74121.74122.22122.22122.71123.19123.19123.67124.15124.63125.11125.59125.59126.07126.55127.03127.51127.51127.51127.51127.51127.03127.03126.55126.55126.55127.03127.51127.99128.47128.95129.43129.43129.92130.40130.88131.84132.32132.80132.80133.28133.28133.28133.28133.76133.76134.24134.24134.72134.72135.20135.20135.68135.68135.68135.20135.20135.68135.68136.16136.64136.64137.13137.13137.61137.61137.61137.61137.61137.61137.61138.09138.09138.09138.57139.05139.53139.53139.53139.53140.01140.49141.45142.41142.89143.37143.37143.85143.85144.34144.34144.82145.30145.30145.30145.78145.78146.26146.74147.22147.70148.66149.14149.14149.62150.10150.10150.58150.58151.06150.58149.62148.66148.18148.18147.70146.74145.78144.82144.34143.85142.89142.41141.93141.45140.49140.01139.05138.09137.61136.64136.16135.68135.20134.72134.24133.28133.76133.76134.24134.72134.72134.72135.20135.20135.68136.16137.13137.61138.09139.05139.53140.01140.97140.97141.45141.93142.41143.37143.37143.85143.85143.85143.85143.37143.37143.37143.37143.85143.85143.85143.85143.37143.37143.37143.37143.37143.37143.37143.37143.37143.37142.89141.45141.45140.97140.49139.53137.61136.16134.72133.28132.80132.32132.32131.84131.84131.36130.88130.40129.92129.43128.47127.51127.03126.07125.59125.59125.59126.07126.07126.07126.07126.07126.07126.07126.07126.07126.07126.55126.55127.03127.03126.07126.07125.59125.59125.59126.07125.59125.59125.11124.63124.15124.15124.15124.15124.15124.63124.63125.11125.11125.59126.07126.55127.03127.51127.99128.47128.95129.43129.92130.40130.40130.88130.88130.88131.36131.36131.36131.36131.36130.88130.40129.92128.95128.47127.99127.51127.51126.55126.07125.59125.11125.11124.63124.15123.67123.67123.19123.19123.19123.67124.15124.15124.63124.63124.63125.11125.11124.63124.63124.63124.63124.15124.15124.15124.15123.67123.67123.67124.15124.15124.15124.15124.15124.15124.15124.15124.15124.15124.15123.67123.67123.67124.15124.15124.63124.63124.63124.15124.15123.67123.19123.19122.71122.71123.19123.19123.19123.67123.67123.67123.67123.67123.19122.71121.74121.26120.78120.30119.82119.34118.86118.86118.86118.86118.86116.46115.98115.98115.98115.98115.98115.98116.46116.94116.94117.42118.38119.34120.78121.74123.19124.63126.55127.99129.92131.84133.76135.20137.13138.09139.05140.01140.49140.97141.45141.45141.93142.41142.89142.89143.37143.37143.37142.89142.89142.41142.41141.93141.45141.45141.45140.97140.97140.97141.45141.45141.93141.93141.93141.93141.93141.93141.45140.97140.49140.01140.01139.53139.05138.57137.13137.13137.13136.16134.72132.80130.88129.92128.95127.99126.55125.59125.59125.11125.11125.11125.59125.59125.59125.11125.11125.11125.11124.15123.67123.19123.19122.71122.71122.71121.74120.78120.78120.30120.30120.30120.30119.82119.82120.30120.30120.78121.26122.22122.71123.19123.19124.15124.63125.11125.59126.07126.55127.03127.51127.99128.47128.47128.95128.95129.43129.43129.43129.43129.43128.95128.47128.95128.95129.43129.43129.92129.92129.92129.92129.92129.92129.92129.92129.92129.92129.92129.92129.92129.92129.43129.43129.43129.43129.43129.43129.43129.92129.92130.40130.40130.88130.88130.88130.40130.40130.40130.40130.40130.40130.40130.40130.88130.88130.88131.36131.36131.36131.84131.84131.36131.84130.88130.88130.40130.40130.40130.40129.92130.40130.40130.40130.88130.88130.88131.36131.36130.88130.88130.88131.36131.36131.84131.84131.84131.84132.32131.84132.32132.32132.32132.32132.32132.80132.80132.80132.80133.28133.76133.76134.24134.24134.72135.20135.20135.68135.68136.16136.16136.64136.64137.13137.61137.61137.61138.09138.09138.57138.57138.57138.09136.64136.16136.16135.68135.68135.20134.72134.24134.24133.76134.24134.72134.72134.72135.20135.20135.20135.68135.68136.16136.16136.64137.13137.13137.61138.09138.09138.09139.05139.53140.49141.45142.41143.37143.85144.34144.82145.78146.26146.74147.22147.22147.22147.22147.70147.70147.70147.22146.74146.74146.26146.26145.78145.30145.30145.30144.82144.82144.34143.85143.85143.37143.37142.89142.41142.41142.41141.93141.93141.45141.45140.97140.49140.01140.01138.09137.13135.68134.72134.72134.72134.72134.24134.24134.24134.72134.72134.24133.76131.36128.95125.59123.19121.26119.82118.86117.90117.42116.46116.46115.98115.50114.53114.05113.57112.61111.65111.17110.69110.69110.69110.69110.69111.17111.17111.65111.65111.17110.69110.21109.73109.73109.73109.73109.73109.25109.25108.77108.29108.29107.81107.32107.32107.32107.32107.32106.84107.32107.32107.32106.84106.84106.84106.84106.84106.84106.84107.32107.32107.81108.29108.29108.77109.25109.25109.73109.73110.21110.69110.69111.17111.17111.17111.65111.65111.65111.65111.65111.65112.13112.13112.13112.13112.13112.13111.17110.69110.21109.25108.77108.77108.77108.77109.25109.25109.25109.25108.77108.29108.29108.29107.81108.29108.29108.29108.77108.77108.77109.25108.77108.77108.77108.77108.29108.29107.81107.81107.81107.81107.32107.32106.84106.84106.84106.84106.84106.36106.36105.88105.88105.40105.40104.92104.92104.92104.92104.44104.44103.96103.48103.96103.96104.44104.44104.44104.44104.44104.92104.92104.92105.40105.40105.40105.88105.88105.88105.88105.88105.40105.40105.40105.40105.40105.40105.40104.92104.92104.92104.92104.92105.40104.92104.92104.92104.44103.96103.96103.48103.48103.48103.48103.48103.96103.96103.96103.48103.48103.48103.48103.96103.96103.96104.44104.44103.96103.48103.00102.52102.52102.04102.04101.56101.56101.08101.08101.08101.08100.60100.60100.60100.11100.11100.11100.11100.60100.60100.60101.08101.08101.08101.08101.08100.60100.60100.60100.11100.11100.11100.11100.11100.1199.6399.6399.63100.11100.11100.11100.60100.60100.60100.60101.08101.08101.08101.56101.56101.56101.56101.56101.56102.04102.04102.04101.56101.56101.08101.08101.08101.08101.08101.08100.60100.60100.60100.60100.60100.60100.60100.11100.11100.11100.11100.11100.11100.11100.11100.11100.11100.11100.11100.60100.60100.60100.60100.60100.60100.60100.60100.60100.60100.11100.60100.60100.60100.60100.60100.60100.60100.60101.08101.08101.56101.56102.04102.04102.04102.04102.04102.04102.04102.04102.52102.52103.00103.00103.00103.00103.00103.00103.00102.52102.52103.00103.00103.48103.48103.48103.48103.96103.96103.96104.44104.44104.44104.44104.44104.92105.40105.88105.88106.36106.36106.36106.84106.84107.32107.32107.81108.29108.77109.25109.25109.73110.21110.69111.17111.17111.17111.65111.65112.13112.13112.61112.61112.61112.61112.61112.61112.61112.61113.09113.09113.09113.09113.09113.09113.09113.57113.57113.57113.57113.57113.57113.57113.57113.57113.57113.57114.05114.05114.05114.53114.53114.53114.05114.05113.57113.57113.09113.09112.61112.61112.61112.61113.09113.09113.09113.57113.57113.57113.09113.09113.57113.57113.57113.09113.09113.57113.57113.57113.57113.09113.09113.09113.09113.09113.09113.09112.61112.61112.61112.13112.13111.65111.65111.65111.65111.65111.65111.17111.17111.17111.17110.69110.69110.69110.69111.17111.17111.17111.17111.17111.17110.69110.69110.69110.69110.69110.69111.17111.17111.17111.17111.17111.17111.17111.17111.17110.69110.21110.21109.73109.25109.25108.77108.29108.29107.81107.32107.32106.84106.84106.84107.32107.32107.32107.32107.32107.32107.32107.81108.29108.29108.77109.25109.25109.25109.73109.73110.21109.73109.73109.73109.73109.25108.77108.77109.25109.73110.21111.17111.65112.13112.13112.13111.65111.65111.65111.17111.17111.17110.69110.69110.69110.69110.21110.21109.73109.25109.25108.77108.29107.32107.32106.84105.88105.40105.40104.92104.92104.92104.92104.92104.92104.92104.92104.44104.44104.44104.44104.44104.44104.44103.96 \ No newline at end of file diff --git a/src/test/resources/gpx/2020-02-29 13.35.58 Day.gpx b/src/test/resources/gpx/2020-02-29 13.35.58 Day.gpx deleted file mode 100644 index c3a0a63..0000000 --- a/src/test/resources/gpx/2020-02-29 13.35.58 Day.gpx +++ /dev/null @@ -1 +0,0 @@ -Garmin International2020-02-29 13:35:58 DayDarkMagenta29.9430.4230.9031.3831.3831.3831.8632.3432.3432.8232.8232.8232.8232.8232.3432.3432.8232.8232.8233.3033.7834.2634.7435.2335.7136.1936.6737.6338.1138.5939.0739.5540.0340.5140.9940.9941.4741.9541.9542.4442.4442.4442.9242.9242.9242.9242.9242.9242.9243.4043.4042.9242.4441.9541.4740.9940.5140.0339.5539.0738.5938.5938.1138.1138.1137.6337.6337.6337.6337.1536.6735.7135.7135.2334.2633.7833.3032.8232.8232.3432.3432.3432.8232.3432.3431.8631.3830.4229.4628.9828.5028.0227.5327.5327.0527.0526.5726.0925.6125.6126.0926.0926.0926.5726.5727.0527.0527.0527.0527.5328.0228.5028.5028.5028.5028.5028.0228.0227.5327.5327.0527.0527.0527.0526.5726.5726.0926.0925.6125.6125.6125.6125.6125.1325.1325.1324.6524.6524.6524.6524.1723.6923.6923.6923.6923.2123.2123.2123.2123.2123.2123.2123.2122.7322.7322.7322.2522.2522.2522.2521.7721.7721.7721.7721.7721.7721.2921.2921.2921.2921.2921.2921.2921.2921.2921.2921.2921.2920.8120.3220.3220.3220.3220.3220.3220.3219.8419.8419.3619.3618.8818.8818.4018.4018.4017.9217.9217.4417.4416.9616.9616.9616.9616.9616.4816.4816.4816.0016.0016.0015.5216.0016.0016.0016.4816.0016.0016.4816.4816.0016.0016.0016.0016.4816.4816.9616.9617.4417.9217.9218.4018.4018.4018.8818.8819.3619.8420.3220.8121.2921.7722.2523.2123.6923.6924.1724.1724.6524.6525.1325.6125.6126.0926.5727.0527.5327.5328.0228.5028.9828.9829.4629.9430.4230.9031.3831.8631.8632.3432.3432.8232.8232.3431.8631.3831.3830.9030.9030.9030.4229.9429.9429.4629.4628.9828.9828.9828.9828.9828.5028.5028.5028.0227.5327.5327.0526.5726.0925.6125.1324.6524.1723.6923.6923.2123.2122.7322.2522.2521.7721.7721.7721.7721.7721.7721.7721.7722.2522.2522.7322.7322.7322.7323.2123.2123.2123.6923.6923.6924.1724.6525.1325.6126.0926.5726.5726.5727.0527.0527.0527.5328.0228.0228.9829.9430.4230.9031.3831.8632.3432.8233.3033.3033.7834.2634.2634.2634.2634.2634.7434.7434.7434.7434.7434.7434.7434.7435.2335.2335.2335.7135.7135.7135.7135.7135.7135.7135.2335.23<.6589033455" lon="139.7556033544">86.1885.6985.2185.2185.2185.2184.7384.7384.7384.7384.2583.7783.2983.2982.3381.3781.3780.8980.4180.4179.9379.4578.9778.4878.4878.0077.5277.0477.0477.0477.0477.5277.5277.5277.5277.5277.5278.0078.4878.4878.9778.9778.9778.9778.9778.9778.9778.9778.9779.4579.4579.4579.4579.9379.9379.9380.4180.4180.8981.3781.3781.8581.8581.3781.3781.3780.8980.8980.8980.8980.8980.4179.9379.9380.4181.3782.3382.8183.7784.7386.1886.1886.1886.6686.6685.6985.2184.7383.7783.7783.7783.7783.2982.3381.8580.8980.8980.4179.9379.4578.9778.4878.0077.5277.0477.0476.5676.0876.0875.6075.1275.1274.6475.1275.1275.1275.1275.6075.6076.0876.0876.5677.0477.5277.5277.5277.5278.0077.5278.0078.4878.9779.4579.4579.4579.9379.4579.4579.4579.4579.4579.4579.4579.9379.9380.4180.4180.8981.3781.8581.8581.8582.3381.8580.4179.9379.4579.4579.9379.9379.9380.4180.8981.3782.3383.2983.7784.7385.6986.1887.1488.1089.0690.0290.5090.9891.4691.4691.4691.9492.9093.3993.8794.8395.3196.2796.7597.2397.7198.1998.6798.6799.1599.1599.1599.6399.63100.11100.11100.60101.08101.56102.04102.52103.00103.00103.48103.96103.96103.96103.96104.44104.44104.44104.44104.92105.40105.40104.92105.40105.40105.40104.92104.92104.92104.92104.92104.44104.44104.44104.44104.44104.44104.92104.92104.92104.92105.40105.40105.88105.88105.88105.88105.88105.88105.40105.40105.40104.92104.44104.44104.92104.92104.92104.92104.92104.92104.44103.96103.96103.48103.96104.44104.92105.40105.88105.40104.92104.92104.44104.44103.96103.48103.48103.96103.96103.96103.96103.96103.96104.44104.92105.40105.88106.36106.84106.84107.32107.81107.81108.29108.77108.77109.25109.73110.21110.21110.21109.73109.73108.77108.29107.81103.00101.08100.1199.1597.2395.7994.8393.8792.9092.4291.9490.9890.5090.0289.0688.1087.1486.6686.1885.2184.2583.7782.8182.3381.8581.3780.8980.4180.4179.9379.4578.4878.4878.0077.5277.5277.0477.0476.0875.6074.6474.6474.1674.1674.1674.1674.1674.1674.1674.1674.1674.6474.6474.6475.1274.6474.6474.6474.6474.1674.1674.1673.6873.2072.7272.2471.7671.2770.7970.3169.3568.3967.4366.4765.9965.5165.0364.5564.5564.5564.5565.0365.0365.5165.9965.9965.5165.0363.5863.1062.1460.7060.2259.2658.3057.3456.8656.3755.4154.4553.4952.5351.5750.6149.6549.1648.6848.2047.7247.2446.7646.7646.7645.8045.3245.3244.8444.3644.3644.3643.8843.8843.4042.9242.9242.9242.4442.4442.4442.4442.4442.4442.9242.4441.9541.9541.9541.9541.9541.9541.9541.9542.4443.4044.3643.8843.8843.8844.8444.8445.3245.8045.8045.8046.2846.2846.2846.2845.8045.8046.2845.8045.8045.8045.3245.3244.8444.3643.8843.8842.9241.9541.4740.9940.9940.5140.0340.0339.5539.5539.5539.0738.5938.5938.1138.1137.6337.6337.6337.6338.1138.1138.1138.5939.0740.5141.4741.4741.4740.9940.9941.4741.4741.4741.9542.4442.4442.9243.4043.4042.9242.9243.8844.3644.3644.3644.8445.3245.3245.8045.3242.4441.9542.4445.8048.2048.6849.1650.1350.6151.0951.0951.5752.0552.5352.5353.0153.4953.9754.9355.4155.8956.3757.3457.3457.8257.8258.3059.2660.2261.1861.6662.6263.1063.1063.1063.5864.0764.5565.0365.5166.4766.9567.4368.3968.8768.8768.3968.3968.3968.8769.3569.3569.8369.8369.8370.3170.3170.3170.7971.2771.7671.7670.3170.3170.3170.7971.2771.2770.7971.2770.7970.7971.2771.2770.3169.8368.8766.9563.5862.1461.1860.7060.2260.7060.7061.6662.1462.6263.5864.0764.5565.5165.9966.4766.9566.9565.9965.9965.9965.9966.9566.9567.4367.9168.8769.3569.8370.3170.7971.2772.2472.7273.2073.6873.6873.6874.1674.6474.6475.1275.6076.0877.0478.0078.4878.9779.4579.4580.4180.8981.3782.3379.9377.5276.0875.1274.6473.6873.2072.2471.7671.2771.2771.7671.7671.7671.7672.2472.2472.7272.2472.2472.2472.2472.2472.7272.2472.7273.2073.2073.2073.6873.6873.6874.1673.6873.2073.2073.2072.7272.7272.2472.2471.2770.3169.8369.3568.8768.8768.8768.8768.8768.8769.3569.3569.3569.3569.3569.3569.3569.3569.3569.8369.8370.3170.7971.7672.2472.7273.2073.6874.6475.1275.6076.0877.0477.5278.0078.4879.4579.9380.4181.3781.8582.3382.8183.2984.2584.7385.2185.6986.1886.6687.1487.1487.6287.6288.1088.5889.0689.5489.5490.0290.0290.5090.5090.5090.9890.9891.4691.9492.4292.4292.4292.9093.3993.3993.3992.9092.9091.9491.4691.4691.4691.4691.9491.9492.4292.4292.4292.9093.3993.8794.3594.8395.3195.3195.3195.3195.3195.3195.3195.3195.3195.3194.8393.3993.3992.9092.4292.4292.4292.9092.9093.3993.3993.8794.3595.3196.2796.7597.7198.6799.63100.60101.56102.52103.48104.44104.92105.88107.32108.29109.73110.69111.65112.13112.61113.09112.61113.09113.09113.09112.61112.13112.13112.61113.09112.61113.09114.05114.53115.01115.50115.50115.98116.94116.94117.42117.90118.38118.38117.42117.42116.46115.50115.50115.01114.05113.09112.13111.17110.21108.77107.32105.88104.44103.48102.52101.56101.08100.1199.6398.6797.2396.2795.3194.3593.3992.9091.9491.4690.5090.0289.5489.5489.5489.5490.0290.0290.5090.5090.5090.9890.9891.4691.9492.4292.9093.3993.3993.8793.8794.3594.3594.3594.3593.8793.3992.9092.9092.4291.9491.4690.9890.5090.0290.0289.5489.5489.0689.0689.0688.5888.1087.6287.6287.1486.6686.6686.6686.1885.6985.6985.2185.2184.7384.7384.7384.7385.2185.2185.2185.2184.7384.7384.2583.2982.8182.3381.8582.3382.3382.3382.8183.2983.7783.7785.6987.6288.1088.5888.5889.0689.0689.5490.5091.4691.4690.9891.4691.4691.4690.9890.5090.0289.5489.0688.5888.5888.1087.6287.6287.1487.1486.6686.6686.6686.6686.6687.1487.6287.6288.1088.1088.1088.5888.5889.0689.5490.0290.5090.5090.9891.9492.4293.3994.3595.3196.2797.2397.7197.2396.2795.7995.3195.3195.3195.7996.2796.2796.7597.7197.7198.1998.1998.6799.1599.63100.60101.08101.56102.04102.04102.52102.52103.00103.00103.48103.48103.48103.96103.96103.96103.00102.04101.08100.1199.6398.6798.1997.7196.2795.3194.3593.3992.9092.4292.4291.9491.4690.9890.0289.5489.0689.0688.5888.5888.1088.1088.5888.5888.5889.0689.5489.5490.0290.0290.0290.5090.5090.9891.4691.9492.4292.9093.3993.8794.3594.8395.3196.2796.7597.7198.1999.1599.6399.6399.6399.6399.63100.1199.6399.6399.6399.6399.6399.6399.63100.11100.11100.60100.60101.08101.08101.56102.04102.52103.00103.48103.48103.48103.48103.48103.48103.48103.48103.48103.00103.00102.52102.04101.56101.08100.60100.1199.6398.6798.1997.7197.7197.2396.7596.2795.7995.7995.3194.8394.8394.3594.3594.3594.3594.3594.3594.3594.3594.3593.8793.8793.8793.8794.3594.3594.3594.8395.3195.3195.7996.7597.2398.1998.6799.63100.11101.08101.56102.04102.52103.00103.48103.96104.44104.92105.40105.88106.84107.32107.81108.29108.77109.25109.25109.73109.73109.25108.77108.77108.29107.81107.32106.84106.36105.88105.88105.40104.92104.92104.92104.44103.48102.52101.56100.1199.1598.1998.1998.1998.6798.6799.1599.63100.11100.60101.56102.04102.52103.48103.48103.96104.44104.44104.92105.40105.40105.88106.36106.36106.84106.84107.32107.32107.32107.81108.29108.29108.77109.25109.25109.73109.73108.77108.29107.32106.84105.88105.40104.92104.44104.44103.96103.96103.48103.00102.52102.52102.52102.52103.00102.52102.04101.56101.08100.60100.1199.1598.6798.1997.7197.2396.2795.7995.3195.3194.8394.8394.8394.8394.8395.7996.7597.7198.1999.1599.63100.11101.08101.56102.04103.00103.48103.96104.92105.40105.88105.40105.88106.36106.84107.32107.81108.29109.25110.21111.65112.61113.57114.53115.50115.98116.94117.42118.38118.86119.82121.26122.22123.67125.59127.03128.95130.88132.80134.72136.16138.09139.53140.97142.41143.85144.82145.78147.22148.66150.10151.54152.99153.95154.91156.35157.31157.79159.24160.20161.16161.64162.12163.56165.00166.45167.89169.33170.77172.21173.17174.14175.58177.02178.46179.90181.35182.79183.75185.19184.71184.71185.19185.67185.67185.67185.19185.19184.71184.23184.23184.23183.75183.75184.23183.75183.27182.79182.79182.79182.79182.79182.79182.79182.79183.27183.75183.27182.31180.87180.38179.42178.46177.98176.54175.58174.62174.14174.14174.14174.14174.62174.14173.66173.17172.21171.73170.77170.29169.33168.37167.41166.45165.96165.00164.52164.04164.04164.04164.04164.52164.52164.04163.08162.12159.72159.24158.75159.24159.24159.72158.75156.83155.87154.91154.43154.43154.43154.43153.95153.95153.95153.95152.99152.99152.51151.54150.58149.62148.66147.22146.74146.74146.26146.74146.26144.82143.37141.45140.49139.05138.57138.09138.09136.16133.28132.32131.36130.40129.43128.47127.03126.07124.63124.63124.15123.67122.71122.22122.22121.26120.30119.34117.90117.42116.94116.94116.46115.98115.50115.01114.53113.57112.13111.17110.69110.21110.21110.69110.69109.73109.25107.81106.36104.92103.00102.04101.56101.08100.60100.1199.1598.6798.1997.7196.7596.2795.7995.3194.3593.3991.9490.9890.0289.5489.0688.5888.1088.1087.6286.6686.6685.6985.6985.6985.6985.6985.6985.6985.2185.2185.2185.2184.7384.7384.2583.7783.7783.2983.2982.8182.3382.3381.8581.8581.8581.8581.8581.8581.8581.8582.3382.3382.8182.8182.8183.2983.2983.7783.7784.2584.2584.7384.7384.2583.2982.3381.8581.3780.4179.4578.4877.0476.0875.1274.1673.2072.7271.2770.3169.3568.3967.4366.4766.4765.9965.5165.0364.5563.1061.6660.7059.7459.2658.7857.3455.8954.9353.9753.0152.5352.0552.0551.5751.0950.6150.6150.1350.1350.1350.1350.1349.6549.1648.6848.2048.2048.6849.1649.6549.6549.6549.6549.6549.6549.6549.6549.6550.1350.1350.6150.6150.6150.6150.6151.0951.0951.0951.0951.0951.5752.0552.0552.5353.0153.0153.0153.0153.0153.0153.0153.0153.0152.5352.5352.5352.5353.0153.0153.0153.0153.0152.5352.5352.0552.0552.0552.0552.0552.0552.0552.0552.5352.5353.0153.4954.4555.4156.3756.8657.8258.3058.7859.2659.7460.7060.7061.1861.6661.6661.6661.6661.1860.7060.7060.7060.7060.7060.7061.1861.1861.6662.1462.6263.1063.5864.0764.5565.0365.0364.5564.0763.5863.5863.5863.5863.5863.1063.1062.6262.1461.6661.1860.7060.7060.2260.2260.2260.2260.2259.7459.7459.7459.7460.2260.2260.2260.2260.7060.2260.2260.2260.2260.2260.2260.2260.2260.2260.7060.7060.2260.2260.2260.2260.2259.7459.7459.7458.7858.3057.3456.8655.8954.9354.4554.4553.4953.0152.5352.5352.0551.5751.5751.5751.0951.0950.6150.6150.1350.1349.6549.6549.6550.1350.1350.6151.0951.5752.0552.5353.0153.4953.4953.9754.4554.9355.4155.8955.8955.8955.8955.8955.8955.8956.3756.3756.3756.3756.8656.8656.3755.8955.4155.4155.4155.4155.4155.4155.8955.8955.8955.8955.8955.8955.8955.8955.8955.8956.3756.8656.8656.3756.3755.4155.4154.9354.9354.4554.4554.4554.4554.4554.4554.4554.4554.4554.4554.4553.9753.0152.0551.5751.0951.0951.0951.0950.6150.6150.6150.6150.6150.6150.6150.1350.1350.1350.1350.1350.6150.6150.1350.1349.6549.6549.6549.6549.6549.6549.6550.1350.1350.6150.6150.6151.0951.0951.5751.5752.0552.0552.0551.5751.5751.0951.0951.0951.0950.6150.1350.1350.1349.6549.6549.6549.6549.6549.6550.1349.6549.6549.1648.6848.2048.2048.2047.7248.2047.7247.7247.7247.7247.2447.2447.2446.7646.2845.8045.8045.3244.3643.8842.9242.4441.9541.4741.4740.9940.5140.5140.5140.0340.0339.5539.5539.5539.0739.0738.5938.5938.1138.1137.6337.1537.1537.6337.6337.6337.6337.6338.1138.1138.5938.5938.5939.0739.5539.5540.0340.5140.9941.4741.4741.9541.9541.9541.9541.9541.9541.4741.4741.4741.4741.4741.9541.9541.9541.4741.4741.4741.4741.4741.4740.9940.5140.5140.5140.5140.5140.9941.4742.4442.9243.8844.8445.8046.7647.7248.6849.6550.6151.5752.5353.4954.4555.4156.3756.8657.3457.8258.3058.7859.2658.7858.7858.7858.7858.7858.7859.2659.2659.2659.2658.7858.7858.7858.7858.7858.7858.7858.3058.3057.8257.8257.3456.8657.3456.8656.8656.8656.8657.3456.8656.8656.8656.8656.8656.3755.8954.4553.9753.4953.4953.0153.0152.0551.5751.0950.6150.1350.1349.6549.6548.2047.2446.7645.8044.8444.3643.4042.9241.9540.9940.5139.5538.5937.6335.7134.2633.3032.3431.8629.4627.5326.5725.6125.1325.1325.1324.6524.6524.6524.1723.6923.2123.2123.2122.7323.2124.1725.1325.6125.6126.0926.5726.5727.0527.0527.5328.0228.0228.0227.5327.0527.5327.5327.5328.0228.0228.0228.0228.0228.5028.0228.0228.0227.5327.5327.5327.5327.5327.5327.5327.5327.5327.5327.5327.5328.0228.5028.9828.9828.5028.5028.5028.5028.5028.0227.5327.0526.5726.5726.5727.0527.5328.0228.9829.4629.9430.4230.9031.3831.8632.3432.8232.8233.3033.3033.7833.3032.8231.8631.3830.9030.4230.4229.9429.9429.9429.4628.9828.9828.9828.9828.9828.9828.9829.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.9429.9429.9429.9429.9429.9429.9429.4629.4628.9828.9828.9828.9828.9828.5028.5028.5028.9828.5028.5028.5028.5028.5028.5028.5028.5028.5028.0228.5028.5028.5028.0228.0228.0227.5327.5327.0526.5726.5727.0527.0527.0527.0527.0527.0527.0527.0527.0527.0527.0527.5328.5028.9830.4231.8633.3035.2336.6737.6338.1139.0739.5540.5140.9941.4741.9542.4443.4043.8844.3645.3246.2846.7647.7248.2049.1649.6550.6151.0951.5752.0552.5353.0153.9754.4554.9355.8956.3756.8657.3457.8258.3058.7859.7460.7062.1463.1064.0765.0366.4766.9567.4367.9167.9168.3968.8768.8768.8768.8769.3569.3569.8370.3171.2771.7672.2472.7273.6874.1675.1275.6076.5677.0478.0078.4878.9779.4579.9381.3782.3382.8183.7784.2583.7784.2584.7384.7385.2185.2185.2185.6986.1886.6686.6687.1487.1487.6287.6287.6287.6287.6288.1088.1089.0689.0689.0689.0689.5489.5490.5090.9891.4691.9492.4293.3993.8794.3594.8395.3196.2797.2398.1998.6799.1599.1599.1599.1599.6399.6399.63100.11100.1199.6399.1598.6798.6798.1997.7197.2396.7596.7596.2795.7995.7995.3195.3195.3195.3195.3195.3195.3195.3194.8394.8394.8394.8395.3195.3195.3195.3195.7995.7995.7995.7995.7995.3195.7995.7996.2796.2796.2796.7597.2397.2397.2397.2397.7197.7197.7197.2397.2397.7197.2397.2397.2397.7197.7197.2397.2397.2396.7596.7596.7596.7596.7596.2796.2796.2795.7995.3195.3195.3195.3195.3195.7995.7995.7995.7995.7996.2796.2795.7995.7995.7995.7995.7995.7995.3195.3194.8395.3195.3194.8392.9090.9890.9890.0289.0687.6287.1486.6686.1884.2582.8181.3779.9378.9778.0077.5277.0476.0875.1274.1673.2072.7271.7670.7969.8368.3966.9565.9965.0364.0763.1062.1461.1860.2259.7458.7858.7858.3057.8257.3456.3755.8954.9353.9753.0152.5352.0551.5751.0950.6150.6150.1349.6548.6848.2047.2446.7646.2845.8045.3244.3643.8842.9241.9540.9940.5140.0339.0738.5938.5938.1137.6337.1537.1536.6736.6736.1936.1936.1935.7135.2334.2633.7833.3033.3032.8232.3431.8631.8631.3830.9030.4230.4229.9429.4629.4629.4628.9828.9828.9828.9828.5028.5028.0227.5327.53 - - - 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/src/test/resources/gpx/muiltiTRKSEG.GarminColorado.gpx.xml b/src/test/resources/gpx/muiltiTRKSEG.GarminColorado.gpx.xml deleted file mode 100644 index 7a86786..0000000 --- a/src/test/resources/gpx/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/src/test/resources/gpx/muiltiTRKSEG.noNameSpace.gpx.xml b/src/test/resources/gpx/muiltiTRKSEG.noNameSpace.gpx.xml deleted file mode 100644 index ce805f4..0000000 --- a/src/test/resources/gpx/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/src/test/resources/gpx/multiTRKSEG.eTrex_20J.gpx.xml b/src/test/resources/gpx/multiTRKSEG.eTrex_20J.gpx.xml deleted file mode 100644 index d315e7a..0000000 --- a/src/test/resources/gpx/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/src/test/resources/gpx/multiTRKSEGreverse.eTrex_20J.gpx.xml b/src/test/resources/gpx/multiTRKSEGreverse.eTrex_20J.gpx.xml deleted file mode 100644 index 125c417..0000000 --- a/src/test/resources/gpx/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/src/test/resources/imgdata/00001.jpg b/src/test/resources/imgdata/00001.jpg deleted file mode 100644 index 250b249..0000000 --- a/src/test/resources/imgdata/00001.jpg +++ /dev/null Binary files differ diff --git a/src/test/resources/imgdata/00002.jpg b/src/test/resources/imgdata/00002.jpg deleted file mode 100644 index 8938854..0000000 --- a/src/test/resources/imgdata/00002.jpg +++ /dev/null Binary files differ diff --git a/src/test/resources/imgdata/00003.jpg b/src/test/resources/imgdata/00003.jpg deleted file mode 100644 index ee8642f..0000000 --- a/src/test/resources/imgdata/00003.jpg +++ /dev/null Binary files differ diff --git a/src/test/resources/imgdata/00004.jpg b/src/test/resources/imgdata/00004.jpg deleted file mode 100755 index 4e457b9..0000000 --- a/src/test/resources/imgdata/00004.jpg +++ /dev/null Binary files differ diff --git a/src/test/resources/imgdata/00005.jpg b/src/test/resources/imgdata/00005.jpg deleted file mode 100755 index 6cd9dfc..0000000 --- a/src/test/resources/imgdata/00005.jpg +++ /dev/null Binary files differ diff --git a/src/test/resources/imgdata/IMG_0092.JPG b/src/test/resources/imgdata/IMG_0092.JPG deleted file mode 100755 index 6ec147f..0000000 --- a/src/test/resources/imgdata/IMG_0092.JPG +++ /dev/null Binary files differ diff --git a/src/test/resources/imgdata/IMG_0093.JPG b/src/test/resources/imgdata/IMG_0093.JPG deleted file mode 100755 index 64699c6..0000000 --- a/src/test/resources/imgdata/IMG_0093.JPG +++ /dev/null Binary files differ diff --git a/src/test/resources/imgdata/IMG_0097.JPG b/src/test/resources/imgdata/IMG_0097.JPG deleted file mode 100755 index 50795b1..0000000 --- a/src/test/resources/imgdata/IMG_0097.JPG +++ /dev/null Binary files differ diff --git a/src/test/resources/imgdata/IMG_0291.JPG b/src/test/resources/imgdata/IMG_0291.JPG deleted file mode 100755 index baf8ac2..0000000 --- a/src/test/resources/imgdata/IMG_0291.JPG +++ /dev/null Binary files differ diff --git a/src/test/resources/ini/AdjustTime.20170517.ini b/src/test/resources/ini/AdjustTime.20170517.ini deleted file mode 100644 index bd229d9..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata/10070517/10070517 -GPX.SOURCE_FOLDER=target/test-classes/cameradata/10070517/10070517/20170517.gpx -IMG.OUTPUT_FOLDER=target/test-classes/ diff --git a/src/test/resources/ini/AdjustTime.20170518.A1.ini b/src/test/resources/ini/AdjustTime.20170518.A1.ini deleted file mode 100644 index 5763b04..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata/10170518 -GPX.SOURCE_FOLDER=target/test-classes/gpx/20170518.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.20170518.A2.ini b/src/test/resources/ini/AdjustTime.20170518.A2.ini deleted file mode 100644 index eb3f3ad..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata/10170518 -GPX.SOURCE_FOLDER=target/test-classes/cameradata/20170518.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.20170518.B1.ini b/src/test/resources/ini/AdjustTime.20170518.B1.ini deleted file mode 100644 index 8b2861d..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata -GPX.SOURCE_FOLDER=target/test-classes/cameradata/20170518.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.20170518.B2.ini b/src/test/resources/ini/AdjustTime.20170518.B2.ini deleted file mode 100644 index bd5e067..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata -GPX.SOURCE_FOLDER=target/test-classes/cameradata/20170518.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.20170518.ini b/src/test/resources/ini/AdjustTime.20170518.ini deleted file mode 100644 index 8b2861d..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata -GPX.SOURCE_FOLDER=target/test-classes/cameradata/20170518.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.M1a.separate.ini b/src/test/resources/ini/AdjustTime.M1a.separate.ini deleted file mode 100644 index 2791866..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata/separate -GPX.SOURCE_FOLDER=target/test-classes/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.M1b.separate.ini b/src/test/resources/ini/AdjustTime.M1b.separate.ini deleted file mode 100644 index d28903d..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata/separate -GPX.SOURCE_FOLDER=target/test-classes/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.M1c.separate.ini b/src/test/resources/ini/AdjustTime.M1c.separate.ini deleted file mode 100644 index ef810b3..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata/separate -GPX.SOURCE_FOLDER=target/test-classes/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.M1d.separate.ini b/src/test/resources/ini/AdjustTime.M1d.separate.ini deleted file mode 100644 index 36a903e..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata/separate -GPX.SOURCE_FOLDER=target/test-classes/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.M2a.separate.ini b/src/test/resources/ini/AdjustTime.M2a.separate.ini deleted file mode 100644 index 2791866..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata/separate -GPX.SOURCE_FOLDER=target/test-classes/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.M2b.separate.ini b/src/test/resources/ini/AdjustTime.M2b.separate.ini deleted file mode 100644 index d28903d..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata/separate -GPX.SOURCE_FOLDER=target/test-classes/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.M2c.separate.ini b/src/test/resources/ini/AdjustTime.M2c.separate.ini deleted file mode 100644 index ef810b3..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata/separate -GPX.SOURCE_FOLDER=target/test-classes/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.M2d.separate.ini b/src/test/resources/ini/AdjustTime.M2d.separate.ini deleted file mode 100644 index 36a903e..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata/separate -GPX.SOURCE_FOLDER=target/test-classes/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output diff --git a/src/test/resources/ini/AdjustTime.null.ini b/src/test/resources/ini/AdjustTime.null.ini deleted file mode 100644 index 7b60e49..0000000 --- a/src/test/resources/ini/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/src/test/resources/ini/AdjustTime.off.ini b/src/test/resources/ini/AdjustTime.off.ini deleted file mode 100644 index 60db05f..0000000 --- a/src/test/resources/ini/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=. -GPX.SOURCE_FOLDER=. -IMG.OUTPUT_FOLDER=. diff --git a/src/test/resources/ini/AdjustTime.on.ini b/src/test/resources/ini/AdjustTime.on.ini deleted file mode 100644 index 73df834..0000000 --- a/src/test/resources/ini/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=. -GPX.SOURCE_FOLDER=. -IMG.OUTPUT_FOLDER=. diff --git a/src/test/resources/ini/AdjustTime.separate.ini b/src/test/resources/ini/AdjustTime.separate.ini deleted file mode 100644 index 2791866..0000000 --- a/src/test/resources/ini/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=target/test-classes/cameradata/separate -GPX.SOURCE_FOLDER=target/test-classes/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=target/test-classes/output