diff --git a/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java b/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java
index a99f934..951f162 100644
--- a/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java
+++ b/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java
@@ -173,6 +173,7 @@
 			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])).doubleValue()));
 		}
 
 		@Test
@@ -180,6 +181,7 @@
 			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])).doubleValue()));
 		}
 
 		@Test
@@ -187,6 +189,7 @@
 			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])).doubleValue()));
 		}
 
 		@Test
@@ -194,6 +197,7 @@
 			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])).doubleValue()));
 		}
 
 		@Test
@@ -201,6 +205,7 @@
 			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])).doubleValue()));
 		}
 
 		@Test
@@ -208,6 +213,7 @@
 			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])).doubleValue()));
 		}
 
 		@Test
@@ -215,6 +221,7 @@
 			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])).doubleValue()));
 		}
 
 		@Test
@@ -222,6 +229,7 @@
 			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])).doubleValue()));
 		}
 
 		@Test
@@ -229,6 +237,7 @@
 			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])).doubleValue()));
 		}
 
 		@Test
diff --git a/importPicture/test/osm/jp/gpx/ImportPictureTest.java b/importPicture/test/osm/jp/gpx/ImportPictureTest.java
index 5359b5d..cfb6ccc 100644
--- a/importPicture/test/osm/jp/gpx/ImportPictureTest.java
+++ b/importPicture/test/osm/jp/gpx/ImportPictureTest.java
@@ -30,12 +30,16 @@
 		String value;
 		boolean expect;
 		String timeStr;
+		double latD;
+		double lonD;
 		boolean magvar;
 		
-		public Expecter(String value, boolean expect, String timeStr, boolean magvar){
+		public Expecter(String value, boolean expect, String timeStr, double latD, double lonD, boolean magvar) {
 			this.value = value;
 			this.expect = expect;
 			this.timeStr = timeStr;
+			this.latD = latD;
+			this.lonD = lonD;
 			this.magvar = magvar;
 		}
 	}
@@ -83,12 +87,12 @@
 					"testdata/cameradata/20170518.gpx",
 					"testdata/AdjustTime.20170518.A1.ini",
 					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 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 Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, true),
+						new Expecter("10170518/DSC05183.JPG", false, null, 90.0D, 180.0D, false),
+						new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 90.0D, 180.0D, true),
+						new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 90.0D, 180.0D, true),
+						new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 90.0D, 180.0D, true),
+						new Expecter("10170518/DSC05205.JPG", false, null, 90.0D, 180.0D, false),
 					}),
 			new Fixture(
 					"[A2].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時",
@@ -97,12 +101,12 @@
 					"testdata/cameradata/20170518.gpx",
 					"testdata/AdjustTime.20170518.A2.ini",
 					new Expecter[] {
-						new Expecter("10170518/20170518_.gpx", true, null, 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 Expecter("10170518/20170518_.gpx", true, null, 90.0D, 180.0D, true),
+						new Expecter("10170518/DSC05183.JPG", true, "2017:05:18 09:16:48", 90.0D, 180.0D, true),
+						new Expecter("10170518/DSC05184.JPG", true, "2017:05:18 09:34:44", 90.0D, 180.0D, true),
+						new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 90.0D, 180.0D, true),
+						new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 90.0D, 180.0D, true),
+						new Expecter("10170518/DSC05205.JPG", true, "2017:05:18 09:48:04", 90.0D, 180.0D, true),
 					}),
 			
 			new Fixture(
@@ -112,11 +116,11 @@
 					"testdata/cameradata/20170518.gpx",
 					"testdata/AdjustTime.20170518.B1.ini",
 					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 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),
+						new Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, true),
+						new Expecter("cameradata/20170518_092031A.jpg", false, null, 90.0D, 180.0D, false),
+						new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 90.0D, 180.0D, true),
+						new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 90.0D, 180.0D, true),
+						new Expecter("cameradata/20170518_094827A.jpg", false, null, 90.0D, 180.0D, false),
 					}),
 
 			new Fixture(
@@ -126,11 +130,11 @@
 					"testdata/cameradata/20170518.gpx",
 					"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 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 Expecter("cameradata/20170518_.gpx", true, null, 90.0D, 180.0D, true),
+						new Expecter("cameradata/20170518_092031A.jpg", true, "2017:05:18 09:20:30", 0.0D, 0.0D, true),
+						new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 90.0D, 180.0D, true),
+						new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 90.0D, 180.0D, true),
+						new Expecter("cameradata/20170518_094827A.jpg", true, "2017:05:18 09:48:26", 90.0D, 180.0D, true),
 					}),
 			
 			new Fixture(
@@ -141,32 +145,32 @@
 					"testdata/AdjustTime.M1a.separate.ini",
 					new Expecter[] {
 				        // GPX file
-						new Expecter("separate/separate_.gpx", true, null, true),
+						new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
 			            
 			            // out of time ( - 2017-05-29T01:23:18)
-						new Expecter("separate/20170529_102305A.jpg", false, null, false),
-						new Expecter("separate/20170529_102314A.jpg", false, null, false),
+						new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
+						new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
 			            
 			            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-						new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",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),
+						new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
+						new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
+						new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 90.0D, 180.0D, 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),
+						new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
+						new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
 
 			            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-						new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true),
-						new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true),
+						new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
+						new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, 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),
+						new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
+						new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
 
 			            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-						new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true),
-						new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true),
+						new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
+						new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true),
 					}),
 
 			new Fixture(
@@ -177,32 +181,32 @@
 					"testdata/AdjustTime.M1b.separate.ini",
 					new Expecter[] {
 					        // GPX file
-							new Expecter("separate/separate_.gpx", true, null, true),
+							new Expecter("separate/separate_.gpx", true, null, 90.D, 180.0D, true),
 				            
 				            // out of time ( - 2017-05-29T01:23:18)
-							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),
+							new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
 				            
 				            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",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),
+							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 90.0D, 180.0D, true),
 
 				            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-							new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10",true),
-							new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18",true),
+							new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
 
 				            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true),
-							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true),
+							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
 
 				            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-							new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14",true),
-							new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44",true),
+							new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, true),
 
 				            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true),
-							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true),
+							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true),
 					}),
 
 			new Fixture(
@@ -213,32 +217,32 @@
 					"testdata/AdjustTime.M1c.separate.ini",
 					new Expecter[] {
 					        // GPX file
-							new Expecter("separate/separate_.gpx", true, null, true),
+							new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
 				            
 				            // out of time ( - 2017-05-29T01:23:18)
-							new Expecter("separate/20170529_102305A.jpg", false, null, false),
-							new Expecter("separate/20170529_102314A.jpg", false, null, false),
+							new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
 				            
 				            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",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),
+							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 90.0D, 180.0D, 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),
+							new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
 
 				            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true),
-							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true),
+							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, 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),
+							new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
 
 				            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true),
-							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19",true),
+							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true),
 					}),
 
 			new Fixture(
@@ -249,32 +253,32 @@
 					"testdata/AdjustTime.M1d.separate.ini",
 					new Expecter[] {
 					        // GPX file
-							new Expecter("separate/separate_.gpx", true, null, true),
+							new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
 				            
 				            // out of time ( - 2017-05-29T01:23:18)
-							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),
+							new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
 				            
 				            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",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),
+							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 90.0D, 180.0D, true),
 
 				            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-							new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09",true),
-							new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18",true),
+							new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
 
 				            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true),
-							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true),
+							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
 
 				            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-							new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15",true),
-							new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45",true),
+							new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, true),
 
 				            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true),
-							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19",true),
+							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true),
 					}),
 
 			
@@ -286,32 +290,32 @@
 					"testdata/AdjustTime.M2a.separate.ini",
 					new Expecter[] {
 					        // GPX file
-							new Expecter("separate/separate_.gpx", true, null, true),
+							new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
 				            
 				            // out of time ( - 2017-05-29T01:23:18)
-							new Expecter("separate/20170529_102305A.jpg", false, null, false),
-							new Expecter("separate/20170529_102314A.jpg", false, null, false),
+							new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
 				            
 				            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",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),
+							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 90.0D, 180.0D, 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),
+							new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
 
 				            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true),
-							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true),
+							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, 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),
+							new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
 
 				            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true),
-							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true),
+							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true),
 					}),
 
 			new Fixture(
@@ -322,32 +326,32 @@
 					"testdata/AdjustTime.M2b.separate.ini",
 					new Expecter[] {
 					        // GPX file
-							new Expecter("separate/separate_.gpx", true, null, true),
+							new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
 				            
 				            // out of time ( - 2017-05-29T01:23:18)
-							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),
+							new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
 				            
 				            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",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),
+							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 90.0D, 180.0D, true),
 
 				            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-							new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10",true),
-							new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18",true),
+							new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
 
 				            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true),
-							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true),
+							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
 
 				            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-							new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14",true),
-							new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44",true),
+							new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, true),
 
 				            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true),
-							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true),
+							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true),
 					}),
 
 			new Fixture(
@@ -358,32 +362,32 @@
 					"testdata/AdjustTime.M2c.separate.ini",
 					new Expecter[] {
 					        // GPX file
-							new Expecter("separate/separate_.gpx", true, null, true),
+							new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
 				            
 				            // out of time ( - 2017-05-29T01:23:18)
-							new Expecter("separate/20170529_102305A.jpg", false, null, false),
-							new Expecter("separate/20170529_102314A.jpg", false, null, false),
+							new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
 				            
 				            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",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),
+							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 90.0D, 180.0D, 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),
+							new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
 
 				            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true),
-							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true),
+							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, 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),
+							new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
 
 				            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true),
-							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19",true),
+							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true),
 					}),
 
 			new Fixture(
@@ -394,32 +398,32 @@
 					"testdata/AdjustTime.M2d.separate.ini",
 					new Expecter[] {
 					        // GPX file
-							new Expecter("separate/separate_.gpx", true, null, true),
+							new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
 				            
 				            // out of time ( - 2017-05-29T01:23:18)
-							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),
+							new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
 				            
 				            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",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),
+							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 90.0D, 180.0D, true),
 
 				            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-							new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09",true),
-							new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18",true),
+							new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
 
 				            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true),
-							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true),
+							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
 
 				            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-							new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15",true),
-							new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45",true),
+							new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, true),
 
 				            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true),
-							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19",true),
+							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true),
 					}),
 			
 			new Fixture(
@@ -430,32 +434,32 @@
 					"testdata/AdjustTime.M2a.separate.ini",
 					new Expecter[] {
 					        // GPX file
-							new Expecter("separate/separate_.gpx", true, null, true),
+							new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
 				            
 				            // out of time ( - 2017-05-29T01:23:18)
-							new Expecter("separate/20170529_102305A.jpg", false, null, false),
-							new Expecter("separate/20170529_102314A.jpg", false, null, false),
+							new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
 				            
 				            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",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),
+							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 90.0D, 180.0D, 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),
+							new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
 
 				            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true),
-							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true),
+							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, 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),
+							new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
 
 				            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true),
-							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true),
+							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true),
 					}),
 
 			new Fixture(
@@ -466,32 +470,32 @@
 					"testdata/AdjustTime.M2b.separate.ini",
 					new Expecter[] {
 					        // GPX file
-							new Expecter("separate/separate_.gpx", true, null, true),
+							new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
 
 				            // out of time ( - 2017-05-29T01:23:18)
-							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),
+							new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:06", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
 				            
 				            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",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),
+							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 90.0D, 180.0D, true),
 
 				            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-							new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10",true),
-							new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18",true),
+							new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
 
 				            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true),
-							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true),
+							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
 
 				            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-							new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14",true),
-							new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44",true),
+							new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, true),
 
 				            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true),
-							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18",true),
+							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true),
 					}),
 
 			new Fixture(
@@ -502,32 +506,32 @@
 					"testdata/AdjustTime.M2c.separate.ini",
 					new Expecter[] {
 					        // GPX file
-							new Expecter("separate/separate_.gpx", true, null, true),
+							new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
 				            
 				            // out of time ( - 2017-05-29T01:23:18)
-							new Expecter("separate/20170529_102305A.jpg", false, null, false),
-							new Expecter("separate/20170529_102314A.jpg", false, null, false),
+							new Expecter("separate/20170529_102305A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_102314A.jpg", false, null, 90.0D, 180.0D, false),
 				            
 				            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",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),
+							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 90.0D, 180.0D, 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),
+							new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false),
 
 				            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true),
-							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true),
+							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, 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),
+							new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false),
+							new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false),
 
 				            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true),
-							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19",true),
+							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true),
 					}),
 
 			new Fixture(
@@ -538,32 +542,32 @@
 					"testdata/AdjustTime.M2d.separate.ini",
 					new Expecter[] {
 					        // GPX file
-							new Expecter("separate/separate_.gpx", true, null, true),
+							new Expecter("separate/separate_.gpx", true, null, 90.0D, 180.0D, true),
 				            
 				            // out of time ( - 2017-05-29T01:23:18)
-							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),
+							new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 10:23:05", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 10:23:14", 90.0D, 180.0D, true),
 				            
 				            // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05)
-							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18",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),
+							new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 90.0D, 180.0D, true),
 
 				            // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37)
-							new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09",true),
-							new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18",true),
+							new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true),
 
 				            // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03)
-							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48",true),
-							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46",true),
+							new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true),
 
 				            // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53)
-							new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15",true),
-							new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45",true),
+							new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, true),
 
 				            // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35)
-							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14",true),
-							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19",true),
+							new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true),
+							new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true),
 					}),
 	};