diff --git a/importPicture/doc/EXiF.class.violet.html b/importPicture/doc/EXiF.class.violet.html index 5a00acf..8def701 100644 --- a/importPicture/doc/EXiF.class.violet.html +++ b/importPicture/doc/EXiF.class.violet.html @@ -20,7 +20,7 @@ - + 1 @@ -45,7 +45,7 @@ - + 1 @@ -63,7 +63,7 @@ - + 1 @@ -82,7 +82,7 @@ - + 1 @@ -103,7 +103,7 @@ - + 1 @@ -122,7 +122,7 @@ - + 1 @@ -140,7 +140,7 @@ - + 1 @@ -240,356 +240,354 @@ ]]>

- embedded diagram image + embedded diagram image \ No newline at end of file diff --git a/importPicture/test/osm/jp/gpx/ImportPictureTest.java b/importPicture/test/osm/jp/gpx/ImportPictureTest.java index a2181fc..f017baa 100644 --- a/importPicture/test/osm/jp/gpx/ImportPictureTest.java +++ b/importPicture/test/osm/jp/gpx/ImportPictureTest.java @@ -85,9 +85,9 @@ new Expecter[] { new Expecter("10170518/20170518_.gpx", true, null, true), new Expecter("10170518/DSC05183.JPG", false, null, false), - new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 00:34:44", true), - new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 00:37:32", true), - new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 00:46:48", true), + new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", true), + new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", true), + new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", true), new Expecter("10170518/DSC05205.JPG", false, null, false), }), new Fixture( @@ -98,11 +98,11 @@ "testdata/AdjustTime.20170518.A2.ini", new Expecter[] { new Expecter("10170518/20170518_.gpx", true, null, true), - new Expecter("10170518/DSC05183.JPG", true, "2017:05:18 00:16:48", true), - new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 00:34:44", true), - new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 00:37:32", true), - new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 00:46:48", true), - new Expecter("10170518/DSC05205.JPG", true, "2017:05:18 00:48:04", true), + new Expecter("10170518/DSC05183.JPG", true, "2017:05:18 09:16:48", true), + new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", true), + new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", true), + new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", true), + new Expecter("10170518/DSC05205.JPG", true, "2017:05:18 09:48:04", true), }), new Fixture( @@ -114,8 +114,8 @@ new Expecter[] { new Expecter("cameradata/20170518_.gpx", true, null, true), new Expecter("cameradata/20170518_092031A.jpg", false, null, false), - new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 00:42:26", true), - new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 00:47:36", true), + new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", true), + new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", true), new Expecter("cameradata/20170518_094827A.jpg", false, null, false), }), @@ -127,10 +127,10 @@ "testdata/AdjustTime.20170518.B2.ini", new Expecter[] { new Expecter("cameradata/20170518_.gpx", true, null, true), - new Expecter("cameradata/20170518_092031A.jpg", true, "2017:05:18 00:20:30", true), - new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 00:42:26", true), - new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 00:47:36", true), - new Expecter("cameradata/20170518_094827A.jpg", true, "2017:05:18 00:48:26", true), + new Expecter("cameradata/20170518_092031A.jpg", true, "2017:05:18 09:20:30", true), + new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", true), + new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", true), + new Expecter("cameradata/20170518_094827A.jpg", true, "2017:05:18 09:48:26", true), }), new Fixture( @@ -148,25 +148,25 @@ new Expecter("separate/20170529_102314A.jpg", false, null, false), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) - new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:04",true), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, false), new Expecter("separate/20170529_102418A.jpg", false, null, false), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 01:24:48",true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", false, null, false), new Expecter("separate/20170529_103545A.jpg", false, null, false), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:18",true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true), }), new Fixture( @@ -180,29 +180,29 @@ new Expecter("separate/separate_.gpx", true, null, true), // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 01:23:06", true), - new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 01:23:14", true), + new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", true), + new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", true), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) - new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:04",true), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) - new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 01:24:10",true), - new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 01:24:18",true), + new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10",true), + new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18",true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 01:24:48",true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) - new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:14",true), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:44",true), + new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14",true), + new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44",true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:18",true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true), }), new Fixture( @@ -220,25 +220,25 @@ new Expecter("separate/20170529_102314A.jpg", false, null, false), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) - new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:05",true), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, false), new Expecter("separate/20170529_102418A.jpg", false, null, false), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 01:24:48",true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", false, null, false), new Expecter("separate/20170529_103545A.jpg", false, null, false), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:19",true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19",true), }), new Fixture( @@ -252,29 +252,29 @@ new Expecter("separate/separate_.gpx", true, null, true), // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 01:23:05", true), - new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 01:23:14", true), + new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", true), + new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", true), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) - new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:05",true), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) - new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 01:24:09",true), - new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 01:24:18",true), + new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09",true), + new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18",true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 01:24:48",true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) - new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:15",true), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:45",true), + new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15",true), + new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45",true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:19",true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19",true), }), @@ -293,25 +293,25 @@ new Expecter("separate/20170529_102314A.jpg", false, null, false), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) - new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:04",true), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, false), new Expecter("separate/20170529_102418A.jpg", false, null, false), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 01:24:48",true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", false, null, false), new Expecter("separate/20170529_103545A.jpg", false, null, false), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:18",true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true), }), new Fixture( @@ -325,29 +325,29 @@ new Expecter("separate/separate_.gpx", true, null, true), // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 01:23:06", true), - new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 01:23:14", true), + new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", true), + new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", true), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) - new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:04",true), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) - new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 01:24:10",true), - new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 01:24:18",true), + new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10",true), + new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18",true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 01:24:48",true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) - new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:14",true), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:44",true), + new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14",true), + new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44",true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:18",true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true), }), new Fixture( @@ -365,25 +365,25 @@ new Expecter("separate/20170529_102314A.jpg", false, null, false), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) - new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:05",true), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, false), new Expecter("separate/20170529_102418A.jpg", false, null, false), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 01:24:48",true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", false, null, false), new Expecter("separate/20170529_103545A.jpg", false, null, false), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:19",true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19",true), }), new Fixture( @@ -397,29 +397,29 @@ new Expecter("separate/separate_.gpx", true, null, true), // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 01:23:05", true), - new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 01:23:14", true), + new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", true), + new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", true), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) - new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:05",true), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) - new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 01:24:09",true), - new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 01:24:18",true), + new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10",true), + new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18",true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 01:24:48",true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) - new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:15",true), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:45",true), + new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14",true), + new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44",true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:19",true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true), }), new Fixture( @@ -437,25 +437,25 @@ new Expecter("separate/20170529_102314A.jpg", false, null, false), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) - new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:04",true), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, false), new Expecter("separate/20170529_102418A.jpg", false, null, false), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 01:24:48",true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", false, null, false), new Expecter("separate/20170529_103545A.jpg", false, null, false), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:18",true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19",true), }), new Fixture( @@ -469,29 +469,29 @@ new Expecter("separate/separate_.gpx", true, null, true), // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 01:23:06", true), - new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 01:23:14", true), + new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", true), + new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", true), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) - new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:04",true), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) - new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 01:24:10",true), - new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 01:24:18",true), + new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10",true), + new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18",true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 01:24:48",true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) - new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:14",true), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:44",true), + new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14",true), + new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44",true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:18",true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true), }), new Fixture( @@ -509,25 +509,25 @@ new Expecter("separate/20170529_102314A.jpg", false, null, false), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) - new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:05",true), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, false), new Expecter("separate/20170529_102418A.jpg", false, null, false), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 01:24:48",true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", false, null, false), new Expecter("separate/20170529_103545A.jpg", false, null, false), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:19",true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19",true), }), new Fixture( @@ -541,29 +541,29 @@ new Expecter("separate/separate_.gpx", true, null, true), // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 01:23:05", true), - new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 01:23:14", true), + new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", true), + new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", true), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) - new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), - new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:05",true), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) - new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 01:24:09",true), - new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 01:24:18",true), + new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10",true), + new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18",true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 01:24:48",true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) - new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:15",true), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:45",true), + new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14",true), + new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44",true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:19",true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true), }), };