diff --git a/importPicture/doc/EXiF.class.violet.html b/importPicture/doc/EXiF.class.violet.html index 8def701..d6280ed 100644 --- a/importPicture/doc/EXiF.class.violet.html +++ b/importPicture/doc/EXiF.class.violet.html @@ -156,438 +156,626 @@ + + + + + 1 + + 255 + 255 + 255 + 255 + + + 0 + 0 + 0 + 255 + + + + «Imaging» + + + + getMetadata(file:File) + + + + + + + 1 + + + + + GPSInfo + + + + + + + getLatitudeAsDegreesNorth() : double ++ getLongitudeAsDegreesEast() : double + + - - + + - - - - + + + + 1 0..1 getExif() - + - - - - + + + + 1 - + - - - - + + + + 1 1 getOutputSet() - + - - - - + + + + 1 1 getGPSDirectory() - + - - - - + + + + 1 1 getFields() - + - - - - + + + + 1 0..* + + + + + + + + 1 + + 1 + getMetadata(file) + 1 + + + + + + + + + 1 + + + + getExif() + + ]]>

- 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 cfb6ccc..a462fe5 100644 --- a/importPicture/test/osm/jp/gpx/ImportPictureTest.java +++ b/importPicture/test/osm/jp/gpx/ImportPictureTest.java @@ -18,6 +18,7 @@ import org.apache.commons.imaging.common.ImageMetadata; import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; import org.apache.commons.imaging.formats.tiff.TiffImageMetadata; +import org.apache.commons.imaging.formats.tiff.TiffImageMetadata.GPSInfo; import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants; import org.junit.runner.*; import org.junit.experimental.theories.DataPoints; @@ -89,9 +90,9 @@ new Expecter[] { 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/DSC05184.JPG", true, "2017:05:18 09:34:44", 35.4367520000D, 139.4082730000D, true), + new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, true), + new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 35.4368560000D, 139.4082190000D, true), new Expecter("10170518/DSC05205.JPG", false, null, 90.0D, 180.0D, false), }), new Fixture( @@ -103,9 +104,9 @@ new Expecter[] { 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/DSC05184.JPG", true, "2017:05:18 09:34:44", 35.4367520000D, 139.4082730000D, true), + new Expecter("10170518/DSC05196.JPG", true, "2017:05:18 09:37:32", 35.4376820000D, 139.4085150000D, true), + new Expecter("10170518/DSC05204.JPG", true, "2017:05:18 09:46:48", 35.4368560000D, 139.4082190000D, true), new Expecter("10170518/DSC05205.JPG", true, "2017:05:18 09:48:04", 90.0D, 180.0D, true), }), @@ -118,8 +119,8 @@ new Expecter[] { 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_094226A_snap.jpg", true, "2017:05:18 09:42:26", 35.4366860000D, 139.4082650000D, true), + new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, true), new Expecter("cameradata/20170518_094827A.jpg", false, null, 90.0D, 180.0D, false), }), @@ -131,9 +132,9 @@ "testdata/AdjustTime.20170518.B2.ini", new Expecter[] { 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_092031A.jpg", true, "2017:05:18 09:20:30", 90.0D, 180.0D, true), + new Expecter("cameradata/20170518_094226A_snap.jpg", true, "2017:05:18 09:42:26", 35.4366860000D, 139.4082650000D, true), + new Expecter("cameradata/20170518_094737A.jpg", true, "2017:05:18 09:47:36", 35.4368200000D, 139.4082810000D, true), new Expecter("cameradata/20170518_094827A.jpg", true, "2017:05:18 09:48:26", 90.0D, 180.0D, true), }), @@ -152,25 +153,25 @@ 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", 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), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false), new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false), new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true), }), new Fixture( @@ -188,25 +189,25 @@ 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", 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), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, true), new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, true), new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true), }), new Fixture( @@ -224,25 +225,25 @@ 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", 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), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808881603D, 137.9979396332D, true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false), new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false), new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, true), }), new Fixture( @@ -260,25 +261,25 @@ 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", 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), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808881603D, 137.9979396332D, true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24: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", 90.0D, 180.0D, true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, true), new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339846227D, 138.0625408050D, true), }), @@ -297,25 +298,25 @@ 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", 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), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false), new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false), new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true), }), new Fixture( @@ -333,25 +334,25 @@ 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", 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), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, true), new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, true), new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true), }), new Fixture( @@ -369,25 +370,25 @@ 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", 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), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false), new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false), new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true), }), new Fixture( @@ -405,25 +406,25 @@ 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", 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), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, true), new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, true), new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true), }), new Fixture( @@ -441,25 +442,25 @@ 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", 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), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false), new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false), new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true), }), new Fixture( @@ -477,25 +478,25 @@ 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", 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), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:04", 35.8808881603D, 137.9979396332D, true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:10", 90.0D, 180.0D, true), new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:14", 90.0D, 180.0D, true), new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:44", 90.0D, 180.0D, true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 90.0D, 180.0D, true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:18", 35.8339846227D, 138.0625408050D, true), }), new Fixture( @@ -513,25 +514,25 @@ 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", 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), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, 90.0D, 180.0D, false), new Expecter("separate/20170529_102418A.jpg", false, null, 90.0D, 180.0D, false), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", false, null, 90.0D, 180.0D, false), new Expecter("separate/20170529_103545A.jpg", false, null, 90.0D, 180.0D, false), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true), }), new Fixture( @@ -549,25 +550,25 @@ 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", 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), + new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 10:23:18", 35.8812697884D, 137.9952202085D, true), + new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 10:23:22", 35.8810500987D, 137.9951669835D, true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 10:24:05", 35.8808641881D, 137.9981065169D, true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 10:24:09", 90.0D, 180.0D, true), new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 10:24:18", 90.0D, 180.0D, true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) - new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 90.0D, 180.0D, true), - new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 90.0D, 180.0D, true), + new Expecter("separate/20170529_102448A.jpg", true, "2017:05:29 10:24:48", 35.8788877353D, 138.0039562471D, true), + new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 10:32:46", 35.8405660931D, 138.0353022180D, true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 10:33:15", 90.0D, 180.0D, true), new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45", 90.0D, 180.0D, true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) - new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 90.0D, 180.0D, true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 90.0D, 180.0D, true), + new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 10:36:14", 35.8359798510D, 138.0600296706D, true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 10:41:19", 35.8339889813D, 138.0625394639D, true), }), }; @@ -603,10 +604,28 @@ String exifTime = ImportPicture.toEXIFString(ImportPicture.toEXIFDate(exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0])); System.out.println("[debug] exifTime = '"+ exifTime +"' <--> '"+ es[i].timeStr +"'"); assertThat(exifTime, is(es[i].timeStr)); + + // LAT,LON + GPSInfo gpsInfo = exif.getGPS(); + if (es[i].latD != 90.0D) { + assertThat(round7(gpsInfo.getLatitudeAsDegreesNorth()), is(round7(es[i].latD))); + } + if (es[i].lonD != 180.0D) { + assertThat(round7(gpsInfo.getLongitudeAsDegreesEast()), is(round7(es[i].lonD))); + } } } } + /** + * 小数点第８位で四捨五入した文字列 + * @param d + * @return + */ + static String round7(double d) { + return String.format("%.7f", d); + } + static void setup(Fixture dataset) throws IOException { System.out.println(dataset.toString()); @@ -649,7 +668,7 @@ fail("Exceptionが発生した。"); } } - + /** * *.tar.gz解凍 * ファイル更新日時をオリジナルと同じにします。 diff --git a/importPicture/testdata/AdjustTime.20170518.A1.log b/importPicture/testdata/AdjustTime.20170518.A1.log new file mode 100644 index 0000000..a8a04a4 --- /dev/null +++ b/importPicture/testdata/AdjustTime.20170518.A1.log @@ -0,0 +1,69 @@ +テストパターン : [A1].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時 + tarFilePath = testdata/Sony20170518.tar.gz + gpxSourcePath = testdata/20170518.gpx + gpxDestinationPath = testdata/cameradata/20170518.gpx + iniFilePath = testdata/AdjustTime.20170518.A1.ini +Param File = 'testdata/AdjustTime.20170518.A1.ini' + - param： IMG.TIME=2017-05-18T00:16:48Z + - param： IMG.BASE_FILE=DSC05183.JPG + - param： GPX.BASETIME=FILE_UPDATE + - param： IMG.SOURCE_FOLDER=testdata/cameradata/10170518 + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=false + - param： GPX.OUTPUT_SPEED=false + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=false + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx + 時差: -32420(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|DSC05183.JPG |2017-05-18T09:17:08Z|2017-05-18T00:16:48Z| | | | | | +|DSC05184.JPG |2017-05-18T09:35:04Z|2017-05-18T00:34:44Z| 35.4367520000|139.4082730000| 63.087| -| -| +|DSC05185.JPG |2017-05-18T09:35:08Z|2017-05-18T00:34:48Z| 35.4367360000|139.4082530000| 62.760| -| -| +|DSC05186.JPG |2017-05-18T09:35:10Z|2017-05-18T00:34:50Z| 35.4367340000|139.4082440000| 62.313| -| -| +|DSC05187.JPG |2017-05-18T09:35:20Z|2017-05-18T00:35:00Z| 35.4367720000|139.4082390000| 63.060| -| -| +|DSC05188.JPG |2017-05-18T09:35:28Z|2017-05-18T00:35:08Z| 35.4367940000|139.4082300000| 63.612| -| -| +|DSC05189.JPG |2017-05-18T09:35:40Z|2017-05-18T00:35:20Z| 35.4368380000|139.4081910000| 59.427| -| -| +|DSC05190.JPG |2017-05-18T09:36:10Z|2017-05-18T00:35:50Z| 35.4371180000|139.4083070000| 59.608| -| -| +|DSC05191.JPG |2017-05-18T09:36:20Z|2017-05-18T00:36:00Z| 35.4371710000|139.4083370000| 61.142| -| -| +|DSC05192.JPG |2017-05-18T09:36:26Z|2017-05-18T00:36:06Z| 35.4372020000|139.4083510000| 61.727| -| -| +|DSC05193.JPG |2017-05-18T09:36:52Z|2017-05-18T00:36:32Z| 35.4374490000|139.4084050000| 67.747| -| -| +|DSC05194.JPG |2017-05-18T09:37:10Z|2017-05-18T00:36:50Z| 35.4375190000|139.4084670000| 68.156| -| -| +|DSC05195.JPG |2017-05-18T09:37:24Z|2017-05-18T00:37:04Z| 35.4376190000|139.4084540000| 67.816| -| -| +|DSC05196.JPG |2017-05-18T09:37:52Z|2017-05-18T00:37:32Z| 35.4376820000|139.4085150000| 68.610| -| -| +|DSC05197.JPG |2017-05-18T09:38:18Z|2017-05-18T00:37:58Z| 35.4377770000|139.4086780000| 66.243| -| -| +|DSC05198.JPG |2017-05-18T09:38:22Z|2017-05-18T00:38:02Z| 35.4377680000|139.4086840000| 67.086| -| -| +|DSC05199.JPG |2017-05-18T09:38:28Z|2017-05-18T00:38:08Z| 35.4377680000|139.4086970000| 67.788| -| -| +|DSC05200.JPG |2017-05-18T09:38:48Z|2017-05-18T00:38:28Z| 35.4376200000|139.4087570000| 69.652| -| -| +|DSC05201.JPG |2017-05-18T09:38:52Z|2017-05-18T00:38:32Z| 35.4375980000|139.4087640000| 69.565| -| -| +|DSC05202.JPG |2017-05-18T09:39:00Z|2017-05-18T00:38:40Z| 35.4375630000|139.4087800000| 68.890| -| -| +|DSC05203.JPG |2017-05-18T09:39:24Z|2017-05-18T00:39:04Z| 35.4372650000|139.4087430000| 69.999| -| -| +|DSC05204.JPG |2017-05-18T09:47:08Z|2017-05-18T00:46:48Z| 35.4368560000|139.4082190000| 68.637| -| -| +|DSC05205.JPG |2017-05-18T09:48:24Z|2017-05-18T00:48:04Z| | | | | | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05183.JPG' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05184.JPG' +[debug] exifTime = '2017:05:18 09:34:44' <--> '2017:05:18 09:34:44' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05196.JPG' +[debug] exifTime = '2017:05:18 09:37:32' <--> '2017:05:18 09:37:32' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05204.JPG' +[debug] exifTime = '2017:05:18 09:46:48' <--> '2017:05:18 09:46:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05205.JPG' + diff --git a/importPicture/testdata/AdjustTime.20170518.A2.log b/importPicture/testdata/AdjustTime.20170518.A2.log new file mode 100644 index 0000000..b8b0439 --- /dev/null +++ b/importPicture/testdata/AdjustTime.20170518.A2.log @@ -0,0 +1,71 @@ +テストパターン : [A2].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時 + tarFilePath = testdata/Sony20170518.tar.gz + gpxSourcePath = testdata/20170518.gpx + gpxDestinationPath = testdata/cameradata/20170518.gpx + iniFilePath = testdata/AdjustTime.20170518.A2.ini +Param File = 'testdata/AdjustTime.20170518.A2.ini' + - param： IMG.TIME=2017-05-18T00:16:48Z + - param： IMG.BASE_FILE=DSC05183.JPG + - param： GPX.BASETIME=FILE_UPDATE + - param： IMG.SOURCE_FOLDER=testdata/cameradata/10170518 + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=false + - param： GPX.OUTPUT_SPEED=false + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx + 時差: -32420(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|DSC05183.JPG |2017-05-18T09:17:08Z|2017-05-18T00:16:48Z| | | | | | +|DSC05184.JPG |2017-05-18T09:35:04Z|2017-05-18T00:34:44Z| 35.4367520000|139.4082730000| 63.087| -| -| +|DSC05185.JPG |2017-05-18T09:35:08Z|2017-05-18T00:34:48Z| 35.4367360000|139.4082530000| 62.760| -| -| +|DSC05186.JPG |2017-05-18T09:35:10Z|2017-05-18T00:34:50Z| 35.4367340000|139.4082440000| 62.313| -| -| +|DSC05187.JPG |2017-05-18T09:35:20Z|2017-05-18T00:35:00Z| 35.4367720000|139.4082390000| 63.060| -| -| +|DSC05188.JPG |2017-05-18T09:35:28Z|2017-05-18T00:35:08Z| 35.4367940000|139.4082300000| 63.612| -| -| +|DSC05189.JPG |2017-05-18T09:35:40Z|2017-05-18T00:35:20Z| 35.4368380000|139.4081910000| 59.427| -| -| +|DSC05190.JPG |2017-05-18T09:36:10Z|2017-05-18T00:35:50Z| 35.4371180000|139.4083070000| 59.608| -| -| +|DSC05191.JPG |2017-05-18T09:36:20Z|2017-05-18T00:36:00Z| 35.4371710000|139.4083370000| 61.142| -| -| +|DSC05192.JPG |2017-05-18T09:36:26Z|2017-05-18T00:36:06Z| 35.4372020000|139.4083510000| 61.727| -| -| +|DSC05193.JPG |2017-05-18T09:36:52Z|2017-05-18T00:36:32Z| 35.4374490000|139.4084050000| 67.747| -| -| +|DSC05194.JPG |2017-05-18T09:37:10Z|2017-05-18T00:36:50Z| 35.4375190000|139.4084670000| 68.156| -| -| +|DSC05195.JPG |2017-05-18T09:37:24Z|2017-05-18T00:37:04Z| 35.4376190000|139.4084540000| 67.816| -| -| +|DSC05196.JPG |2017-05-18T09:37:52Z|2017-05-18T00:37:32Z| 35.4376820000|139.4085150000| 68.610| -| -| +|DSC05197.JPG |2017-05-18T09:38:18Z|2017-05-18T00:37:58Z| 35.4377770000|139.4086780000| 66.243| -| -| +|DSC05198.JPG |2017-05-18T09:38:22Z|2017-05-18T00:38:02Z| 35.4377680000|139.4086840000| 67.086| -| -| +|DSC05199.JPG |2017-05-18T09:38:28Z|2017-05-18T00:38:08Z| 35.4377680000|139.4086970000| 67.788| -| -| +|DSC05200.JPG |2017-05-18T09:38:48Z|2017-05-18T00:38:28Z| 35.4376200000|139.4087570000| 69.652| -| -| +|DSC05201.JPG |2017-05-18T09:38:52Z|2017-05-18T00:38:32Z| 35.4375980000|139.4087640000| 69.565| -| -| +|DSC05202.JPG |2017-05-18T09:39:00Z|2017-05-18T00:38:40Z| 35.4375630000|139.4087800000| 68.890| -| -| +|DSC05203.JPG |2017-05-18T09:39:24Z|2017-05-18T00:39:04Z| 35.4372650000|139.4087430000| 69.999| -| -| +|DSC05204.JPG |2017-05-18T09:47:08Z|2017-05-18T00:46:48Z| 35.4368560000|139.4082190000| 68.637| -| -| +|DSC05205.JPG |2017-05-18T09:48:24Z|2017-05-18T00:48:04Z| | | | | | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/20170518_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05183.JPG' +[debug] exifTime = '2017:05:18 09:16:48' <--> '2017:05:18 09:16:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05184.JPG' +[debug] exifTime = '2017:05:18 09:34:44' <--> '2017:05:18 09:34:44' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05196.JPG' +[debug] exifTime = '2017:05:18 09:37:32' <--> '2017:05:18 09:37:32' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05204.JPG' +[debug] exifTime = '2017:05:18 09:46:48' <--> '2017:05:18 09:46:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/10170518/DSC05205.JPG' +[debug] exifTime = '2017:05:18 09:48:04' <--> '2017:05:18 09:48:04' + diff --git a/importPicture/testdata/AdjustTime.20170518.B1.log b/importPicture/testdata/AdjustTime.20170518.B1.log new file mode 100644 index 0000000..acb2d9b --- /dev/null +++ b/importPicture/testdata/AdjustTime.20170518.B1.log @@ -0,0 +1,93 @@ +テストパターン : [B1].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時 + tarFilePath = testdata/WiMiUS20170518.tar.gz + gpxSourcePath = testdata/20170518.gpx + gpxDestinationPath = testdata/cameradata/20170518.gpx + iniFilePath = testdata/AdjustTime.20170518.B1.ini +Param File = 'testdata/AdjustTime.20170518.B1.ini' + - param： IMG.TIME=2017-05-18T00:20:30Z + - param： IMG.BASE_FILE=20170518_092031A.jpg + - param： GPX.BASETIME=FILE_UPDATE + - param： IMG.SOURCE_FOLDER=testdata/cameradata + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=false + - param： GPX.OUTPUT_SPEED=false + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx + 時差: -32400(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170517_153708A.jpg |2017-05-17T15:37:08Z|2017-05-17T06:37:08Z| | | | | | +|20170518_092031A.jpg |2017-05-18T09:20:30Z|2017-05-18T00:20:30Z| | | | | | +|20170518_094226A_snap.jpg |2017-05-18T09:42:26Z|2017-05-18T00:42:26Z| 35.4366860000|139.4082650000| 61.958| -| -| +|20170518_094230A.jpg |2017-05-18T09:42:30Z|2017-05-18T00:42:30Z| 35.4366840000|139.4082500000| 61.700| -| -| +|20170518_094235A.jpg |2017-05-18T09:42:34Z|2017-05-18T00:42:34Z| 35.4366880000|139.4082510000| 60.970| -| -| +|20170518_094239A.jpg |2017-05-18T09:42:38Z|2017-05-18T00:42:38Z| 35.4366920000|139.4082490000| 60.564| -| -| +|20170518_094243A.jpg |2017-05-18T09:42:42Z|2017-05-18T00:42:42Z| 35.4367100000|139.4082430000| 60.497| -| -| +|20170518_094248A.jpg |2017-05-18T09:42:48Z|2017-05-18T00:42:48Z| 35.4367510000|139.4082460000| 60.755| -| -| +|20170518_094252A.jpg |2017-05-18T09:42:52Z|2017-05-18T00:42:52Z| 35.4367750000|139.4082250000| 60.034| -| -| +|20170518_094256A.jpg |2017-05-18T09:42:56Z|2017-05-18T00:42:56Z| 35.4368010000|139.4082140000| 59.186| -| -| +|20170518_094300A.jpg |2017-05-18T09:43:00Z|2017-05-18T00:43:00Z| 35.4368290000|139.4082170000| 59.608| -| -| +|20170518_094305A.jpg |2017-05-18T09:43:04Z|2017-05-18T00:43:04Z| 35.4368690000|139.4082180000| 59.641| -| -| +|20170518_094309A.jpg |2017-05-18T09:43:08Z|2017-05-18T00:43:08Z| 35.4369020000|139.4082280000| 60.149| -| -| +|20170518_094313A.jpg |2017-05-18T09:43:12Z|2017-05-18T00:43:12Z| 35.4369510000|139.4082380000| 61.838| -| -| +|20170518_094318A.jpg |2017-05-18T09:43:18Z|2017-05-18T00:43:18Z| 35.4370030000|139.4082700000| 64.454| -| -| +|20170518_094322A.jpg |2017-05-18T09:43:22Z|2017-05-18T00:43:22Z| 35.4370310000|139.4082910000| 66.074| -| -| +|20170518_094326A.jpg |2017-05-18T09:43:26Z|2017-05-18T00:43:26Z| 35.4370530000|139.4083160000| 66.428| -| -| +|20170518_094332A.jpg |2017-05-18T09:43:32Z|2017-05-18T00:43:32Z| 35.4370790000|139.4083410000| 66.419| -| -| +|20170518_094336A.jpg |2017-05-18T09:43:36Z|2017-05-18T00:43:36Z| 35.4371070000|139.4083470000| 66.384| -| -| +|20170518_094340A.jpg |2017-05-18T09:43:40Z|2017-05-18T00:43:40Z| 35.4371310000|139.4083400000| 66.488| -| -| +|20170518_094352A.jpg |2017-05-18T09:43:52Z|2017-05-18T00:43:52Z| 35.4371940000|139.4083500000| 68.267| -| -| +|20170518_094357A.jpg |2017-05-18T09:43:56Z|2017-05-18T00:43:56Z| 35.4372240000|139.4083580000| 69.006| -| -| +|20170518_094401A.jpg |2017-05-18T09:44:00Z|2017-05-18T00:44:00Z| 35.4372560000|139.4083600000| 68.477| -| -| +|20170518_094405A.jpg |2017-05-18T09:44:04Z|2017-05-18T00:44:04Z| 35.4372910000|139.4083820000| 68.966| -| -| +|20170518_094410A.jpg |2017-05-18T09:44:10Z|2017-05-18T00:44:10Z| 35.4373480000|139.4084020000| 71.281| -| -| +|20170518_094418A.jpg |2017-05-18T09:44:18Z|2017-05-18T00:44:18Z| 35.4373910000|139.4084280000| 72.327| -| -| +|20170518_094422A.jpg |2017-05-18T09:44:22Z|2017-05-18T00:44:22Z| 35.4374130000|139.4084290000| 72.864| -| -| +|20170518_094427A.jpg |2017-05-18T09:44:26Z|2017-05-18T00:44:26Z| 35.4374290000|139.4084330000| 73.037| -| -| +|20170518_094431A.jpg |2017-05-18T09:44:30Z|2017-05-18T00:44:30Z| 35.4374440000|139.4084380000| 74.372| -| -| +|20170518_094435A.jpg |2017-05-18T09:44:34Z|2017-05-18T00:44:34Z| 35.4374640000|139.4084300000| 74.478| -| -| +|20170518_094440A.jpg |2017-05-18T09:44:40Z|2017-05-18T00:44:40Z| 35.4374820000|139.4084610000| 74.989| -| -| +|20170518_094444A.jpg |2017-05-18T09:44:44Z|2017-05-18T00:44:44Z| 35.4374660000|139.4084760000| 75.505| -| -| +|20170518_094448A.jpg |2017-05-18T09:44:48Z|2017-05-18T00:44:48Z| 35.4374590000|139.4084720000| 77.319| -| -| +|20170518_094452A.jpg |2017-05-18T09:44:52Z|2017-05-18T00:44:52Z| 35.4374410000|139.4084730000| 78.333| -| -| +|20170518_094457A.jpg |2017-05-18T09:44:56Z|2017-05-18T00:44:56Z| 35.4374170000|139.4084750000| 78.086| -| -| +|20170518_094501A.jpg |2017-05-18T09:45:00Z|2017-05-18T00:45:00Z| 35.4373940000|139.4084600000| 77.169| -| -| +|20170518_094505A.jpg |2017-05-18T09:45:04Z|2017-05-18T00:45:04Z| 35.4373720000|139.4084510000| 77.476| -| -| +|20170518_094509A.jpg |2017-05-18T09:45:10Z|2017-05-18T00:45:10Z| 35.4373380000|139.4084390000| 76.312| -| -| +|20170518_094514A.jpg |2017-05-18T09:45:14Z|2017-05-18T00:45:14Z| 35.4372990000|139.4084320000| 76.043| -| -| +|20170518_094518A.jpg |2017-05-18T09:45:18Z|2017-05-18T00:45:18Z| 35.4372460000|139.4084230000| 75.330| -| -| +|20170518_094522A.jpg |2017-05-18T09:45:22Z|2017-05-18T00:45:22Z| 35.4371980000|139.4084180000| 75.431| -| -| +|20170518_094527A.jpg |2017-05-18T09:45:26Z|2017-05-18T00:45:26Z| 35.4371630000|139.4084100000| 76.060| -| -| +|20170518_094531A.jpg |2017-05-18T09:45:30Z|2017-05-18T00:45:30Z| 35.4371360000|139.4083960000| 76.469| -| -| +|20170518_094535A.jpg |2017-05-18T09:45:34Z|2017-05-18T00:45:34Z| 35.4371100000|139.4083820000| 76.606| -| -| +|20170518_094539A.jpg |2017-05-18T09:45:40Z|2017-05-18T00:45:40Z| 35.4370480000|139.4083650000| 75.932| -| -| +|20170518_094544A.jpg |2017-05-18T09:45:44Z|2017-05-18T00:45:44Z| 35.4370160000|139.4083570000| 76.083| -| -| +|20170518_094733A_snap.jpg |2017-05-18T09:47:32Z|2017-05-18T00:47:32Z| 35.4368190000|139.4082730000| 65.510| -| -| +|20170518_094737A.jpg |2017-05-18T09:47:36Z|2017-05-18T00:47:36Z| 35.4368200000|139.4082810000| 65.185| -| -| +|20170518_094827A.jpg |2017-05-18T09:48:26Z|2017-05-18T00:48:26Z| | | | | | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_092031A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094226A_snap.jpg' +[debug] exifTime = '2017:05:18 09:42:26' <--> '2017:05:18 09:42:26' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094737A.jpg' +[debug] exifTime = '2017:05:18 09:47:36' <--> '2017:05:18 09:47:36' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094827A.jpg' + diff --git a/importPicture/testdata/AdjustTime.20170518.B2.log b/importPicture/testdata/AdjustTime.20170518.B2.log new file mode 100644 index 0000000..32dfd3b --- /dev/null +++ b/importPicture/testdata/AdjustTime.20170518.B2.log @@ -0,0 +1,95 @@ +テストパターン : [B2].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時 + tarFilePath = testdata/WiMiUS20170518.tar.gz + gpxSourcePath = testdata/20170518.gpx + gpxDestinationPath = testdata/cameradata/20170518.gpx + iniFilePath = testdata/AdjustTime.20170518.B2.ini +Param File = 'testdata/AdjustTime.20170518.B2.ini' + - param： IMG.TIME=2017-05-18T00:20:30Z + - param： IMG.BASE_FILE=20170518_092031A.jpg + - param： GPX.BASETIME=FILE_UPDATE + - param： IMG.SOURCE_FOLDER=testdata/cameradata + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=false + - param： GPX.OUTPUT_SPEED=false + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx + 時差: -32400(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/20170518.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-18T00:21:25Z|2017-05-18T00:47:46Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170517_153708A.jpg |2017-05-17T15:37:08Z|2017-05-17T06:37:08Z| | | | | | +|20170518_092031A.jpg |2017-05-18T09:20:30Z|2017-05-18T00:20:30Z| | | | | | +|20170518_094226A_snap.jpg |2017-05-18T09:42:26Z|2017-05-18T00:42:26Z| 35.4366860000|139.4082650000| 61.958| -| -| +|20170518_094230A.jpg |2017-05-18T09:42:30Z|2017-05-18T00:42:30Z| 35.4366840000|139.4082500000| 61.700| -| -| +|20170518_094235A.jpg |2017-05-18T09:42:34Z|2017-05-18T00:42:34Z| 35.4366880000|139.4082510000| 60.970| -| -| +|20170518_094239A.jpg |2017-05-18T09:42:38Z|2017-05-18T00:42:38Z| 35.4366920000|139.4082490000| 60.564| -| -| +|20170518_094243A.jpg |2017-05-18T09:42:42Z|2017-05-18T00:42:42Z| 35.4367100000|139.4082430000| 60.497| -| -| +|20170518_094248A.jpg |2017-05-18T09:42:48Z|2017-05-18T00:42:48Z| 35.4367510000|139.4082460000| 60.755| -| -| +|20170518_094252A.jpg |2017-05-18T09:42:52Z|2017-05-18T00:42:52Z| 35.4367750000|139.4082250000| 60.034| -| -| +|20170518_094256A.jpg |2017-05-18T09:42:56Z|2017-05-18T00:42:56Z| 35.4368010000|139.4082140000| 59.186| -| -| +|20170518_094300A.jpg |2017-05-18T09:43:00Z|2017-05-18T00:43:00Z| 35.4368290000|139.4082170000| 59.608| -| -| +|20170518_094305A.jpg |2017-05-18T09:43:04Z|2017-05-18T00:43:04Z| 35.4368690000|139.4082180000| 59.641| -| -| +|20170518_094309A.jpg |2017-05-18T09:43:08Z|2017-05-18T00:43:08Z| 35.4369020000|139.4082280000| 60.149| -| -| +|20170518_094313A.jpg |2017-05-18T09:43:12Z|2017-05-18T00:43:12Z| 35.4369510000|139.4082380000| 61.838| -| -| +|20170518_094318A.jpg |2017-05-18T09:43:18Z|2017-05-18T00:43:18Z| 35.4370030000|139.4082700000| 64.454| -| -| +|20170518_094322A.jpg |2017-05-18T09:43:22Z|2017-05-18T00:43:22Z| 35.4370310000|139.4082910000| 66.074| -| -| +|20170518_094326A.jpg |2017-05-18T09:43:26Z|2017-05-18T00:43:26Z| 35.4370530000|139.4083160000| 66.428| -| -| +|20170518_094332A.jpg |2017-05-18T09:43:32Z|2017-05-18T00:43:32Z| 35.4370790000|139.4083410000| 66.419| -| -| +|20170518_094336A.jpg |2017-05-18T09:43:36Z|2017-05-18T00:43:36Z| 35.4371070000|139.4083470000| 66.384| -| -| +|20170518_094340A.jpg |2017-05-18T09:43:40Z|2017-05-18T00:43:40Z| 35.4371310000|139.4083400000| 66.488| -| -| +|20170518_094352A.jpg |2017-05-18T09:43:52Z|2017-05-18T00:43:52Z| 35.4371940000|139.4083500000| 68.267| -| -| +|20170518_094357A.jpg |2017-05-18T09:43:56Z|2017-05-18T00:43:56Z| 35.4372240000|139.4083580000| 69.006| -| -| +|20170518_094401A.jpg |2017-05-18T09:44:00Z|2017-05-18T00:44:00Z| 35.4372560000|139.4083600000| 68.477| -| -| +|20170518_094405A.jpg |2017-05-18T09:44:04Z|2017-05-18T00:44:04Z| 35.4372910000|139.4083820000| 68.966| -| -| +|20170518_094410A.jpg |2017-05-18T09:44:10Z|2017-05-18T00:44:10Z| 35.4373480000|139.4084020000| 71.281| -| -| +|20170518_094418A.jpg |2017-05-18T09:44:18Z|2017-05-18T00:44:18Z| 35.4373910000|139.4084280000| 72.327| -| -| +|20170518_094422A.jpg |2017-05-18T09:44:22Z|2017-05-18T00:44:22Z| 35.4374130000|139.4084290000| 72.864| -| -| +|20170518_094427A.jpg |2017-05-18T09:44:26Z|2017-05-18T00:44:26Z| 35.4374290000|139.4084330000| 73.037| -| -| +|20170518_094431A.jpg |2017-05-18T09:44:30Z|2017-05-18T00:44:30Z| 35.4374440000|139.4084380000| 74.372| -| -| +|20170518_094435A.jpg |2017-05-18T09:44:34Z|2017-05-18T00:44:34Z| 35.4374640000|139.4084300000| 74.478| -| -| +|20170518_094440A.jpg |2017-05-18T09:44:40Z|2017-05-18T00:44:40Z| 35.4374820000|139.4084610000| 74.989| -| -| +|20170518_094444A.jpg |2017-05-18T09:44:44Z|2017-05-18T00:44:44Z| 35.4374660000|139.4084760000| 75.505| -| -| +|20170518_094448A.jpg |2017-05-18T09:44:48Z|2017-05-18T00:44:48Z| 35.4374590000|139.4084720000| 77.319| -| -| +|20170518_094452A.jpg |2017-05-18T09:44:52Z|2017-05-18T00:44:52Z| 35.4374410000|139.4084730000| 78.333| -| -| +|20170518_094457A.jpg |2017-05-18T09:44:56Z|2017-05-18T00:44:56Z| 35.4374170000|139.4084750000| 78.086| -| -| +|20170518_094501A.jpg |2017-05-18T09:45:00Z|2017-05-18T00:45:00Z| 35.4373940000|139.4084600000| 77.169| -| -| +|20170518_094505A.jpg |2017-05-18T09:45:04Z|2017-05-18T00:45:04Z| 35.4373720000|139.4084510000| 77.476| -| -| +|20170518_094509A.jpg |2017-05-18T09:45:10Z|2017-05-18T00:45:10Z| 35.4373380000|139.4084390000| 76.312| -| -| +|20170518_094514A.jpg |2017-05-18T09:45:14Z|2017-05-18T00:45:14Z| 35.4372990000|139.4084320000| 76.043| -| -| +|20170518_094518A.jpg |2017-05-18T09:45:18Z|2017-05-18T00:45:18Z| 35.4372460000|139.4084230000| 75.330| -| -| +|20170518_094522A.jpg |2017-05-18T09:45:22Z|2017-05-18T00:45:22Z| 35.4371980000|139.4084180000| 75.431| -| -| +|20170518_094527A.jpg |2017-05-18T09:45:26Z|2017-05-18T00:45:26Z| 35.4371630000|139.4084100000| 76.060| -| -| +|20170518_094531A.jpg |2017-05-18T09:45:30Z|2017-05-18T00:45:30Z| 35.4371360000|139.4083960000| 76.469| -| -| +|20170518_094535A.jpg |2017-05-18T09:45:34Z|2017-05-18T00:45:34Z| 35.4371100000|139.4083820000| 76.606| -| -| +|20170518_094539A.jpg |2017-05-18T09:45:40Z|2017-05-18T00:45:40Z| 35.4370480000|139.4083650000| 75.932| -| -| +|20170518_094544A.jpg |2017-05-18T09:45:44Z|2017-05-18T00:45:44Z| 35.4370160000|139.4083570000| 76.083| -| -| +|20170518_094733A_snap.jpg |2017-05-18T09:47:32Z|2017-05-18T00:47:32Z| 35.4368190000|139.4082730000| 65.510| -| -| +|20170518_094737A.jpg |2017-05-18T09:47:36Z|2017-05-18T00:47:36Z| 35.4368200000|139.4082810000| 65.185| -| -| +|20170518_094827A.jpg |2017-05-18T09:48:26Z|2017-05-18T00:48:26Z| | | | | | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_092031A.jpg' +[debug] exifTime = '2017:05:18 09:20:30' <--> '2017:05:18 09:20:30' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094226A_snap.jpg' +[debug] exifTime = '2017:05:18 09:42:26' <--> '2017:05:18 09:42:26' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094737A.jpg' +[debug] exifTime = '2017:05:18 09:47:36' <--> '2017:05:18 09:47:36' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/cameradata/20170518_094827A.jpg' +[debug] exifTime = '2017:05:18 09:48:26' <--> '2017:05:18 09:48:26' + diff --git a/importPicture/testdata/AdjustTime.M1a.separate.log b/importPicture/testdata/AdjustTime.M1a.separate.log new file mode 100644 index 0000000..3f2c98e --- /dev/null +++ b/importPicture/testdata/AdjustTime.M1a.separate.log @@ -0,0 +1,104 @@ +テストパターン : [M1a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado + tarFilePath = testdata/separate.tar.gz + gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml + gpxDestinationPath = testdata/cameradata/separate.gpx + iniFilePath = testdata/AdjustTime.M1a.separate.ini +Param File = 'testdata/AdjustTime.M1a.separate.ini' + - param： IMG.TIME=2017-05-29T01:31:46Z + - param： IMG.BASE_FILE=20170529_103146A.jpg + - param： GPX.BASETIME=FILE_UPDATE + - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=false + - param： GPX.OUTPUT_SPEED=false + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx + 時差: -32400(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z| +| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z| +| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170529_102305A.jpg |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z| | | | | | +|20170529_102310A.jpg |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z| | | | | | +|20170529_102314A.jpg |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z| | | | | | +|20170529_102318A.jpg |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -| +|20170529_102322A.jpg |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -| +|20170529_102401A.jpg |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493| 685.56| -| -| +|20170529_102405A.jpg |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332| 687.00| -| -| +|20170529_102409A.jpg |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z| | | | | | +|20170529_102414A.jpg |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z| | | | | | +|20170529_102418A.jpg |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z| | | | | | +|20170529_102448A.jpg |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -| +|20170529_102518A.jpg |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102547A.jpg |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102618A.jpg |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102647A.jpg |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102717A.jpg |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102747A.jpg |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102817A.jpg |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102847A.jpg |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102917A.jpg |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102947A.jpg |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103016A.jpg |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103046A.jpg |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103116A.jpg |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103146A.jpg |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103216A.jpg |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -| +|20170529_103246A.jpg |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -| +|20170529_103315A.jpg |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z| | | | | | +|20170529_103345A.jpg |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z| | | | | | +|20170529_103415A.jpg |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z| | | | | | +|20170529_103445A.jpg |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z| | | | | | +|20170529_103515A.jpg |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z| | | | | | +|20170529_103545A.jpg |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z| | | | | | +|20170529_103615A.jpg |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -| +|20170529_103645A.jpg |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -| +|20170529_103714A.jpg |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -| +|20170529_103744A.jpg |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -| +|20170529_103814A.jpg |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -| +|20170529_103844A.jpg |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -| +|20170529_103914A.jpg |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -| +|20170529_103944A.jpg |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -| +|20170529_104014A.jpg |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -| +|20170529_104048A.jpg |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -| +|20170529_104119A.jpg |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050| 793.71| -| -| +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg' +[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg' +[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg' +[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg' +[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg' +[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg' +[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg' +[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18' + diff --git a/importPicture/testdata/AdjustTime.M1b.separate.log b/importPicture/testdata/AdjustTime.M1b.separate.log new file mode 100644 index 0000000..f6b7c95 --- /dev/null +++ b/importPicture/testdata/AdjustTime.M1b.separate.log @@ -0,0 +1,110 @@ +テストパターン : [M1b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado + tarFilePath = testdata/separate.tar.gz + gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml + gpxDestinationPath = testdata/cameradata/separate.gpx + iniFilePath = testdata/AdjustTime.M1b.separate.ini +Param File = 'testdata/AdjustTime.M1b.separate.ini' + - param： IMG.TIME=2017-05-29T01:31:46Z + - param： IMG.BASE_FILE=20170529_103146A.jpg + - param： GPX.BASETIME=FILE_UPDATE + - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=true + - param： GPX.OUTPUT_SPEED=true + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx + 時差: -32400(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z| +| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z| +| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170529_102305A.jpg |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z| | | | | | +|20170529_102310A.jpg |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z| | | | | | +|20170529_102314A.jpg |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z| | | | | | +|20170529_102318A.jpg |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -| +|20170529_102322A.jpg |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -| +|20170529_102401A.jpg |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493| 685.56| -| -| +|20170529_102405A.jpg |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332| 687.00| -| -| +|20170529_102409A.jpg |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z| | | | | | +|20170529_102414A.jpg |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z| | | | | | +|20170529_102418A.jpg |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z| | | | | | +|20170529_102448A.jpg |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -| +|20170529_102518A.jpg |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102547A.jpg |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102618A.jpg |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102647A.jpg |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102717A.jpg |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102747A.jpg |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102817A.jpg |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102847A.jpg |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102917A.jpg |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102947A.jpg |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103016A.jpg |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103046A.jpg |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103116A.jpg |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103146A.jpg |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103216A.jpg |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -| +|20170529_103246A.jpg |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -| +|20170529_103315A.jpg |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z| | | | | | +|20170529_103345A.jpg |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z| | | | | | +|20170529_103415A.jpg |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z| | | | | | +|20170529_103445A.jpg |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z| | | | | | +|20170529_103515A.jpg |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z| | | | | | +|20170529_103545A.jpg |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z| | | | | | +|20170529_103615A.jpg |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -| +|20170529_103645A.jpg |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -| +|20170529_103714A.jpg |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -| +|20170529_103744A.jpg |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -| +|20170529_103814A.jpg |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -| +|20170529_103844A.jpg |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -| +|20170529_103914A.jpg |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -| +|20170529_103944A.jpg |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -| +|20170529_104014A.jpg |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -| +|20170529_104048A.jpg |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -| +|20170529_104119A.jpg |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050| 793.71| -| -| +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg' +[debug] exifTime = '2017:05:29 10:23:06' <--> '2017:05:29 10:23:06' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg' +[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg' +[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg' +[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg' +[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg' +[debug] exifTime = '2017:05:29 10:24:10' <--> '2017:05:29 10:24:10' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg' +[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg' +[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg' +[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg' +[debug] exifTime = '2017:05:29 10:33:14' <--> '2017:05:29 10:33:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg' +[debug] exifTime = '2017:05:29 10:35:44' <--> '2017:05:29 10:35:44' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg' +[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg' +[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18' + diff --git a/importPicture/testdata/AdjustTime.M1c.separate.log b/importPicture/testdata/AdjustTime.M1c.separate.log new file mode 100644 index 0000000..92f0f3b --- /dev/null +++ b/importPicture/testdata/AdjustTime.M1c.separate.log @@ -0,0 +1,104 @@ +テストパターン : [M1c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado + tarFilePath = testdata/separate.tar.gz + gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml + gpxDestinationPath = testdata/cameradata/separate.gpx + iniFilePath = testdata/AdjustTime.M1c.separate.ini +Param File = 'testdata/AdjustTime.M1c.separate.ini' + - param： IMG.TIME=2017-05-29T01:31:46Z + - param： IMG.BASE_FILE=20170529_103146A.jpg + - param： GPX.BASETIME=EXIF_TIME + - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=true + - param： GPX.OUTPUT_SPEED=true + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx + 時差: 0(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z| +| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z| +| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170529_102305A.jpg |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z| | | | | | +|20170529_102310A.jpg |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z| | | | | | +|20170529_102314A.jpg |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z| | | | | | +|20170529_102318A.jpg |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -| +|20170529_102322A.jpg |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -| +|20170529_102401A.jpg |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035| 685.56| -| -| +|20170529_102405A.jpg |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169| 687.48| -| -| +|20170529_102409A.jpg |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z| | | | | | +|20170529_102414A.jpg |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z| | | | | | +|20170529_102418A.jpg |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z| | | | | | +|20170529_102448A.jpg |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -| +|20170529_102518A.jpg |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102547A.jpg |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102618A.jpg |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102647A.jpg |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102717A.jpg |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102747A.jpg |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102817A.jpg |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102847A.jpg |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102917A.jpg |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102947A.jpg |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103016A.jpg |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103046A.jpg |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103116A.jpg |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103146A.jpg |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103216A.jpg |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -| +|20170529_103246A.jpg |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -| +|20170529_103315A.jpg |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z| | | | | | +|20170529_103345A.jpg |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z| | | | | | +|20170529_103415A.jpg |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z| | | | | | +|20170529_103445A.jpg |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z| | | | | | +|20170529_103515A.jpg |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z| | | | | | +|20170529_103545A.jpg |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z| | | | | | +|20170529_103615A.jpg |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -| +|20170529_103645A.jpg |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -| +|20170529_103714A.jpg |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -| +|20170529_103744A.jpg |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -| +|20170529_103814A.jpg |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -| +|20170529_103844A.jpg |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -| +|20170529_103914A.jpg |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -| +|20170529_103944A.jpg |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -| +|20170529_104014A.jpg |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -| +|20170529_104048A.jpg |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -| +|20170529_104119A.jpg |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639| 793.71| -| -| +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg' +[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg' +[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg' +[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg' +[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg' +[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg' +[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg' +[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19' + diff --git a/importPicture/testdata/AdjustTime.M1d.separate.log b/importPicture/testdata/AdjustTime.M1d.separate.log new file mode 100644 index 0000000..0a41943 --- /dev/null +++ b/importPicture/testdata/AdjustTime.M1d.separate.log @@ -0,0 +1,110 @@ +テストパターン : [M1d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.GarminColorado + tarFilePath = testdata/separate.tar.gz + gpxSourcePath = testdata/muiltiTRK.GarminColorado.gpx.xml + gpxDestinationPath = testdata/cameradata/separate.gpx + iniFilePath = testdata/AdjustTime.M1d.separate.ini +Param File = 'testdata/AdjustTime.M1d.separate.ini' + - param： IMG.TIME=2017-05-29T01:31:46Z + - param： IMG.BASE_FILE=20170529_103146A.jpg + - param： GPX.BASETIME=EXIF_TIME + - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=true + - param： GPX.OUTPUT_SPEED=true + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx + 時差: 0(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z| +| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z| +| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170529_102305A.jpg |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z| | | | | | +|20170529_102310A.jpg |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z| | | | | | +|20170529_102314A.jpg |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z| | | | | | +|20170529_102318A.jpg |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -| +|20170529_102322A.jpg |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -| +|20170529_102401A.jpg |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035| 685.56| -| -| +|20170529_102405A.jpg |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169| 687.48| -| -| +|20170529_102409A.jpg |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z| | | | | | +|20170529_102414A.jpg |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z| | | | | | +|20170529_102418A.jpg |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z| | | | | | +|20170529_102448A.jpg |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -| +|20170529_102518A.jpg |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102547A.jpg |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102618A.jpg |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102647A.jpg |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102717A.jpg |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102747A.jpg |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102817A.jpg |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102847A.jpg |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102917A.jpg |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102947A.jpg |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103016A.jpg |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103046A.jpg |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103116A.jpg |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103146A.jpg |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103216A.jpg |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -| +|20170529_103246A.jpg |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -| +|20170529_103315A.jpg |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z| | | | | | +|20170529_103345A.jpg |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z| | | | | | +|20170529_103415A.jpg |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z| | | | | | +|20170529_103445A.jpg |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z| | | | | | +|20170529_103515A.jpg |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z| | | | | | +|20170529_103545A.jpg |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z| | | | | | +|20170529_103615A.jpg |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -| +|20170529_103645A.jpg |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -| +|20170529_103714A.jpg |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -| +|20170529_103744A.jpg |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -| +|20170529_103814A.jpg |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -| +|20170529_103844A.jpg |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -| +|20170529_103914A.jpg |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -| +|20170529_103944A.jpg |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -| +|20170529_104014A.jpg |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -| +|20170529_104048A.jpg |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -| +|20170529_104119A.jpg |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639| 793.71| -| -| +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg' +[debug] exifTime = '2017:05:29 10:23:05' <--> '2017:05:29 10:23:05' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg' +[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg' +[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg' +[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg' +[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg' +[debug] exifTime = '2017:05:29 10:24:09' <--> '2017:05:29 10:24:09' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg' +[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg' +[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg' +[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg' +[debug] exifTime = '2017:05:29 10:33:15' <--> '2017:05:29 10:33:15' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg' +[debug] exifTime = '2017:05:29 10:35:45' <--> '2017:05:29 10:35:45' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg' +[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg' +[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19' + diff --git a/importPicture/testdata/AdjustTime.M2a.separate.log b/importPicture/testdata/AdjustTime.M2a.separate.log new file mode 100644 index 0000000..5e7d117 --- /dev/null +++ b/importPicture/testdata/AdjustTime.M2a.separate.log @@ -0,0 +1,210 @@ +テストパターン : [M2a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J + tarFilePath = testdata/separate.tar.gz + gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml + gpxDestinationPath = testdata/cameradata/separate.gpx + iniFilePath = testdata/AdjustTime.M2a.separate.ini +Param File = 'testdata/AdjustTime.M2a.separate.ini' + - param： IMG.TIME=2017-05-29T01:31:46Z + - param： IMG.BASE_FILE=20170529_103146A.jpg + - param： GPX.BASETIME=FILE_UPDATE + - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=true + - param： GPX.OUTPUT_SPEED=true + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx + 時差: -32400(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z| +| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z| +| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170529_102305A.jpg |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z| | | | | | +|20170529_102310A.jpg |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z| | | | | | +|20170529_102314A.jpg |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z| | | | | | +|20170529_102318A.jpg |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -| +|20170529_102322A.jpg |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -| +|20170529_102401A.jpg |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493| 685.56| -| -| +|20170529_102405A.jpg |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332| 687.00| -| -| +|20170529_102409A.jpg |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z| | | | | | +|20170529_102414A.jpg |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z| | | | | | +|20170529_102418A.jpg |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z| | | | | | +|20170529_102448A.jpg |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -| +|20170529_102518A.jpg |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102547A.jpg |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102618A.jpg |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102647A.jpg |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102717A.jpg |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102747A.jpg |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102817A.jpg |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102847A.jpg |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102917A.jpg |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102947A.jpg |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103016A.jpg |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103046A.jpg |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103116A.jpg |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103146A.jpg |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103216A.jpg |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -| +|20170529_103246A.jpg |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -| +|20170529_103315A.jpg |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z| | | | | | +|20170529_103345A.jpg |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z| | | | | | +|20170529_103415A.jpg |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z| | | | | | +|20170529_103445A.jpg |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z| | | | | | +|20170529_103515A.jpg |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z| | | | | | +|20170529_103545A.jpg |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z| | | | | | +|20170529_103615A.jpg |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -| +|20170529_103645A.jpg |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -| +|20170529_103714A.jpg |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -| +|20170529_103744A.jpg |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -| +|20170529_103814A.jpg |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -| +|20170529_103844A.jpg |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -| +|20170529_103914A.jpg |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -| +|20170529_103944A.jpg |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -| +|20170529_104014A.jpg |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -| +|20170529_104048A.jpg |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -| +|20170529_104119A.jpg |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050| 793.71| -| -| +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg' +[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg' +[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg' +[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg' +[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg' +[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg' +[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg' +[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18' + + + +テストパターン : [M3a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse + tarFilePath = testdata/separate.tar.gz + gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml + gpxDestinationPath = testdata/cameradata/separate.gpx + iniFilePath = testdata/AdjustTime.M2a.separate.ini +Param File = 'testdata/AdjustTime.M2a.separate.ini' + - param： IMG.TIME=2017-05-29T01:31:46Z + - param： IMG.BASE_FILE=20170529_103146A.jpg + - param： GPX.BASETIME=FILE_UPDATE + - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=true + - param： GPX.OUTPUT_SPEED=true + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx + 時差: -32400(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z| +| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z| +| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170529_102305A.jpg |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z| | | | | | +|20170529_102310A.jpg |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z| | | | | | +|20170529_102314A.jpg |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z| | | | | | +|20170529_102318A.jpg |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -| +|20170529_102322A.jpg |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -| +|20170529_102401A.jpg |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493| 685.56| -| -| +|20170529_102405A.jpg |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332| 687.00| -| -| +|20170529_102409A.jpg |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z| | | | | | +|20170529_102414A.jpg |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z| | | | | | +|20170529_102418A.jpg |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z| | | | | | +|20170529_102448A.jpg |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -| +|20170529_102518A.jpg |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102547A.jpg |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102618A.jpg |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102647A.jpg |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102717A.jpg |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102747A.jpg |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102817A.jpg |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102847A.jpg |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102917A.jpg |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102947A.jpg |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103016A.jpg |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103046A.jpg |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103116A.jpg |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103146A.jpg |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103216A.jpg |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -| +|20170529_103246A.jpg |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -| +|20170529_103315A.jpg |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z| | | | | | +|20170529_103345A.jpg |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z| | | | | | +|20170529_103415A.jpg |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z| | | | | | +|20170529_103445A.jpg |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z| | | | | | +|20170529_103515A.jpg |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z| | | | | | +|20170529_103545A.jpg |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z| | | | | | +|20170529_103615A.jpg |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -| +|20170529_103645A.jpg |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -| +|20170529_103714A.jpg |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -| +|20170529_103744A.jpg |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -| +|20170529_103814A.jpg |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -| +|20170529_103844A.jpg |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -| +|20170529_103914A.jpg |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -| +|20170529_103944A.jpg |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -| +|20170529_104014A.jpg |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -| +|20170529_104048A.jpg |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -| +|20170529_104119A.jpg |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050| 793.71| -| -| +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg' +[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg' +[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg' +[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg' +[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg' +[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg' +[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg' +[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18' + diff --git a/importPicture/testdata/AdjustTime.M2b.separate.log b/importPicture/testdata/AdjustTime.M2b.separate.log new file mode 100644 index 0000000..188ac42 --- /dev/null +++ b/importPicture/testdata/AdjustTime.M2b.separate.log @@ -0,0 +1,222 @@ +テストパターン : [M2b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20J + tarFilePath = testdata/separate.tar.gz + gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml + gpxDestinationPath = testdata/cameradata/separate.gpx + iniFilePath = testdata/AdjustTime.M2b.separate.ini +Param File = 'testdata/AdjustTime.M2b.separate.ini' + - param： IMG.TIME=2017-05-29T01:31:46Z + - param： IMG.BASE_FILE=20170529_103146A.jpg + - param： GPX.BASETIME=FILE_UPDATE + - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=true + - param： GPX.OUTPUT_SPEED=true + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx + 時差: -32400(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z| +| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z| +| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170529_102305A.jpg |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z| | | | | | +|20170529_102310A.jpg |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z| | | | | | +|20170529_102314A.jpg |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z| | | | | | +|20170529_102318A.jpg |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -| +|20170529_102322A.jpg |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -| +|20170529_102401A.jpg |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493| 685.56| -| -| +|20170529_102405A.jpg |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332| 687.00| -| -| +|20170529_102409A.jpg |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z| | | | | | +|20170529_102414A.jpg |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z| | | | | | +|20170529_102418A.jpg |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z| | | | | | +|20170529_102448A.jpg |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -| +|20170529_102518A.jpg |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102547A.jpg |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102618A.jpg |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102647A.jpg |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102717A.jpg |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102747A.jpg |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102817A.jpg |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102847A.jpg |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102917A.jpg |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102947A.jpg |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103016A.jpg |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103046A.jpg |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103116A.jpg |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103146A.jpg |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103216A.jpg |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -| +|20170529_103246A.jpg |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -| +|20170529_103315A.jpg |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z| | | | | | +|20170529_103345A.jpg |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z| | | | | | +|20170529_103415A.jpg |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z| | | | | | +|20170529_103445A.jpg |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z| | | | | | +|20170529_103515A.jpg |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z| | | | | | +|20170529_103545A.jpg |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z| | | | | | +|20170529_103615A.jpg |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -| +|20170529_103645A.jpg |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -| +|20170529_103714A.jpg |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -| +|20170529_103744A.jpg |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -| +|20170529_103814A.jpg |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -| +|20170529_103844A.jpg |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -| +|20170529_103914A.jpg |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -| +|20170529_103944A.jpg |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -| +|20170529_104014A.jpg |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -| +|20170529_104048A.jpg |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -| +|20170529_104119A.jpg |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050| 793.71| -| -| +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg' +[debug] exifTime = '2017:05:29 10:23:06' <--> '2017:05:29 10:23:06' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg' +[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg' +[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg' +[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg' +[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg' +[debug] exifTime = '2017:05:29 10:24:10' <--> '2017:05:29 10:24:10' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg' +[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg' +[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg' +[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg' +[debug] exifTime = '2017:05:29 10:33:14' <--> '2017:05:29 10:33:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg' +[debug] exifTime = '2017:05:29 10:35:44' <--> '2017:05:29 10:35:44' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg' +[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg' +[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18' + + + +テストパターン : [M3b].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.eTrex_20Jreverse + tarFilePath = testdata/separate.tar.gz + gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml + gpxDestinationPath = testdata/cameradata/separate.gpx + iniFilePath = testdata/AdjustTime.M2b.separate.ini +Param File = 'testdata/AdjustTime.M2b.separate.ini' + - param： IMG.TIME=2017-05-29T01:31:46Z + - param： IMG.BASE_FILE=20170529_103146A.jpg + - param： GPX.BASETIME=FILE_UPDATE + - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=true + - param： GPX.OUTPUT_SPEED=true + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx + 時差: -32400(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z| +| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z| +| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170529_102305A.jpg |2017-05-29T10:23:06Z|2017-05-29T01:23:06Z| | | | | | +|20170529_102310A.jpg |2017-05-29T10:23:10Z|2017-05-29T01:23:10Z| | | | | | +|20170529_102314A.jpg |2017-05-29T10:23:14Z|2017-05-29T01:23:14Z| | | | | | +|20170529_102318A.jpg |2017-05-29T10:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -| +|20170529_102322A.jpg |2017-05-29T10:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -| +|20170529_102401A.jpg |2017-05-29T10:24:00Z|2017-05-29T01:24:00Z| 35.8809497673|137.9972837493| 685.56| -| -| +|20170529_102405A.jpg |2017-05-29T10:24:04Z|2017-05-29T01:24:04Z| 35.8808881603|137.9979396332| 687.00| -| -| +|20170529_102409A.jpg |2017-05-29T10:24:10Z|2017-05-29T01:24:10Z| | | | | | +|20170529_102414A.jpg |2017-05-29T10:24:14Z|2017-05-29T01:24:14Z| | | | | | +|20170529_102418A.jpg |2017-05-29T10:24:18Z|2017-05-29T01:24:18Z| | | | | | +|20170529_102448A.jpg |2017-05-29T10:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -| +|20170529_102518A.jpg |2017-05-29T10:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102547A.jpg |2017-05-29T10:25:48Z|2017-05-29T01:25:48Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102618A.jpg |2017-05-29T10:26:18Z|2017-05-29T01:26:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102647A.jpg |2017-05-29T10:26:46Z|2017-05-29T01:26:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102717A.jpg |2017-05-29T10:27:16Z|2017-05-29T01:27:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102747A.jpg |2017-05-29T10:27:46Z|2017-05-29T01:27:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102817A.jpg |2017-05-29T10:28:16Z|2017-05-29T01:28:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102847A.jpg |2017-05-29T10:28:46Z|2017-05-29T01:28:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102917A.jpg |2017-05-29T10:29:16Z|2017-05-29T01:29:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102947A.jpg |2017-05-29T10:29:46Z|2017-05-29T01:29:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103016A.jpg |2017-05-29T10:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103046A.jpg |2017-05-29T10:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103116A.jpg |2017-05-29T10:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103146A.jpg |2017-05-29T10:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103216A.jpg |2017-05-29T10:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -| +|20170529_103246A.jpg |2017-05-29T10:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -| +|20170529_103315A.jpg |2017-05-29T10:33:14Z|2017-05-29T01:33:14Z| | | | | | +|20170529_103345A.jpg |2017-05-29T10:33:44Z|2017-05-29T01:33:44Z| | | | | | +|20170529_103415A.jpg |2017-05-29T10:34:14Z|2017-05-29T01:34:14Z| | | | | | +|20170529_103445A.jpg |2017-05-29T10:34:44Z|2017-05-29T01:34:44Z| | | | | | +|20170529_103515A.jpg |2017-05-29T10:35:14Z|2017-05-29T01:35:14Z| | | | | | +|20170529_103545A.jpg |2017-05-29T10:35:44Z|2017-05-29T01:35:44Z| | | | | | +|20170529_103615A.jpg |2017-05-29T10:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -| +|20170529_103645A.jpg |2017-05-29T10:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -| +|20170529_103714A.jpg |2017-05-29T10:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -| +|20170529_103744A.jpg |2017-05-29T10:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -| +|20170529_103814A.jpg |2017-05-29T10:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -| +|20170529_103844A.jpg |2017-05-29T10:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -| +|20170529_103914A.jpg |2017-05-29T10:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -| +|20170529_103944A.jpg |2017-05-29T10:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -| +|20170529_104014A.jpg |2017-05-29T10:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -| +|20170529_104048A.jpg |2017-05-29T10:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -| +|20170529_104119A.jpg |2017-05-29T10:41:18Z|2017-05-29T01:41:18Z| 35.8339846227|138.0625408050| 793.71| -| -| +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg' +[debug] exifTime = '2017:05:29 10:23:06' <--> '2017:05:29 10:23:06' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg' +[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg' +[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg' +[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg' +[debug] exifTime = '2017:05:29 10:24:04' <--> '2017:05:29 10:24:04' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg' +[debug] exifTime = '2017:05:29 10:24:10' <--> '2017:05:29 10:24:10' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg' +[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg' +[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg' +[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg' +[debug] exifTime = '2017:05:29 10:33:14' <--> '2017:05:29 10:33:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg' +[debug] exifTime = '2017:05:29 10:35:44' <--> '2017:05:29 10:35:44' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg' +[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg' +[debug] exifTime = '2017:05:29 10:41:18' <--> '2017:05:29 10:41:18' + diff --git a/importPicture/testdata/AdjustTime.M2c.separate.log b/importPicture/testdata/AdjustTime.M2c.separate.log new file mode 100644 index 0000000..2a3c808 --- /dev/null +++ b/importPicture/testdata/AdjustTime.M2c.separate.log @@ -0,0 +1,210 @@ +テストパターン : [M2c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J + tarFilePath = testdata/separate.tar.gz + gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml + gpxDestinationPath = testdata/cameradata/separate.gpx + iniFilePath = testdata/AdjustTime.M2c.separate.ini +Param File = 'testdata/AdjustTime.M2c.separate.ini' + - param： IMG.TIME=2017-05-29T01:31:46Z + - param： IMG.BASE_FILE=20170529_103146A.jpg + - param： GPX.BASETIME=EXIF_TIME + - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=true + - param： GPX.OUTPUT_SPEED=true + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx + 時差: 0(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z| +| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z| +| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170529_102305A.jpg |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z| | | | | | +|20170529_102310A.jpg |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z| | | | | | +|20170529_102314A.jpg |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z| | | | | | +|20170529_102318A.jpg |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -| +|20170529_102322A.jpg |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -| +|20170529_102401A.jpg |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035| 685.56| -| -| +|20170529_102405A.jpg |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169| 687.48| -| -| +|20170529_102409A.jpg |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z| | | | | | +|20170529_102414A.jpg |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z| | | | | | +|20170529_102418A.jpg |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z| | | | | | +|20170529_102448A.jpg |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -| +|20170529_102518A.jpg |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102547A.jpg |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102618A.jpg |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102647A.jpg |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102717A.jpg |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102747A.jpg |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102817A.jpg |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102847A.jpg |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102917A.jpg |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102947A.jpg |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103016A.jpg |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103046A.jpg |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103116A.jpg |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103146A.jpg |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103216A.jpg |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -| +|20170529_103246A.jpg |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -| +|20170529_103315A.jpg |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z| | | | | | +|20170529_103345A.jpg |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z| | | | | | +|20170529_103415A.jpg |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z| | | | | | +|20170529_103445A.jpg |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z| | | | | | +|20170529_103515A.jpg |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z| | | | | | +|20170529_103545A.jpg |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z| | | | | | +|20170529_103615A.jpg |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -| +|20170529_103645A.jpg |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -| +|20170529_103714A.jpg |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -| +|20170529_103744A.jpg |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -| +|20170529_103814A.jpg |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -| +|20170529_103844A.jpg |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -| +|20170529_103914A.jpg |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -| +|20170529_103944A.jpg |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -| +|20170529_104014A.jpg |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -| +|20170529_104048A.jpg |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -| +|20170529_104119A.jpg |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639| 793.71| -| -| +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg' +[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg' +[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg' +[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg' +[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg' +[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg' +[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg' +[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19' + + + +テストパターン : [M3c].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse + tarFilePath = testdata/separate.tar.gz + gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml + gpxDestinationPath = testdata/cameradata/separate.gpx + iniFilePath = testdata/AdjustTime.M2c.separate.ini +Param File = 'testdata/AdjustTime.M2c.separate.ini' + - param： IMG.TIME=2017-05-29T01:31:46Z + - param： IMG.BASE_FILE=20170529_103146A.jpg + - param： GPX.BASETIME=EXIF_TIME + - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=true + - param： GPX.OUTPUT_SPEED=true + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx + 時差: 0(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z| +| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z| +| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170529_102305A.jpg |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z| | | | | | +|20170529_102310A.jpg |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z| | | | | | +|20170529_102314A.jpg |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z| | | | | | +|20170529_102318A.jpg |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -| +|20170529_102322A.jpg |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -| +|20170529_102401A.jpg |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035| 685.56| -| -| +|20170529_102405A.jpg |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169| 687.48| -| -| +|20170529_102409A.jpg |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z| | | | | | +|20170529_102414A.jpg |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z| | | | | | +|20170529_102418A.jpg |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z| | | | | | +|20170529_102448A.jpg |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -| +|20170529_102518A.jpg |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102547A.jpg |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102618A.jpg |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102647A.jpg |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102717A.jpg |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102747A.jpg |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102817A.jpg |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102847A.jpg |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102917A.jpg |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102947A.jpg |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103016A.jpg |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103046A.jpg |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103116A.jpg |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103146A.jpg |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103216A.jpg |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -| +|20170529_103246A.jpg |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -| +|20170529_103315A.jpg |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z| | | | | | +|20170529_103345A.jpg |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z| | | | | | +|20170529_103415A.jpg |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z| | | | | | +|20170529_103445A.jpg |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z| | | | | | +|20170529_103515A.jpg |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z| | | | | | +|20170529_103545A.jpg |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z| | | | | | +|20170529_103615A.jpg |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -| +|20170529_103645A.jpg |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -| +|20170529_103714A.jpg |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -| +|20170529_103744A.jpg |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -| +|20170529_103814A.jpg |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -| +|20170529_103844A.jpg |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -| +|20170529_103914A.jpg |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -| +|20170529_103944A.jpg |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -| +|20170529_104014A.jpg |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -| +|20170529_104048A.jpg |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -| +|20170529_104119A.jpg |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639| 793.71| -| -| +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg' +[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg' +[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg' +[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg' +[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg' +[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg' +[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg' +[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19' + diff --git a/importPicture/testdata/AdjustTime.M2d.separate.log b/importPicture/testdata/AdjustTime.M2d.separate.log new file mode 100644 index 0000000..e816976 --- /dev/null +++ b/importPicture/testdata/AdjustTime.M2d.separate.log @@ -0,0 +1,222 @@ +テストパターン : [M2d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20J + tarFilePath = testdata/separate.tar.gz + gpxSourcePath = testdata/multiTRKSEG.eTrex_20J.gpx.xml + gpxDestinationPath = testdata/cameradata/separate.gpx + iniFilePath = testdata/AdjustTime.M2d.separate.ini +Param File = 'testdata/AdjustTime.M2d.separate.ini' + - param： IMG.TIME=2017-05-29T01:31:46Z + - param： IMG.BASE_FILE=20170529_103146A.jpg + - param： GPX.BASETIME=EXIF_TIME + - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=true + - param： GPX.OUTPUT_SPEED=true + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx + 時差: 0(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z| +| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z| +| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170529_102305A.jpg |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z| | | | | | +|20170529_102310A.jpg |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z| | | | | | +|20170529_102314A.jpg |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z| | | | | | +|20170529_102318A.jpg |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -| +|20170529_102322A.jpg |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -| +|20170529_102401A.jpg |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035| 685.56| -| -| +|20170529_102405A.jpg |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169| 687.48| -| -| +|20170529_102409A.jpg |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z| | | | | | +|20170529_102414A.jpg |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z| | | | | | +|20170529_102418A.jpg |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z| | | | | | +|20170529_102448A.jpg |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -| +|20170529_102518A.jpg |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102547A.jpg |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102618A.jpg |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102647A.jpg |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102717A.jpg |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102747A.jpg |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102817A.jpg |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102847A.jpg |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102917A.jpg |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102947A.jpg |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103016A.jpg |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103046A.jpg |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103116A.jpg |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103146A.jpg |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103216A.jpg |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -| +|20170529_103246A.jpg |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -| +|20170529_103315A.jpg |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z| | | | | | +|20170529_103345A.jpg |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z| | | | | | +|20170529_103415A.jpg |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z| | | | | | +|20170529_103445A.jpg |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z| | | | | | +|20170529_103515A.jpg |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z| | | | | | +|20170529_103545A.jpg |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z| | | | | | +|20170529_103615A.jpg |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -| +|20170529_103645A.jpg |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -| +|20170529_103714A.jpg |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -| +|20170529_103744A.jpg |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -| +|20170529_103814A.jpg |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -| +|20170529_103844A.jpg |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -| +|20170529_103914A.jpg |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -| +|20170529_103944A.jpg |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -| +|20170529_104014A.jpg |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -| +|20170529_104048A.jpg |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -| +|20170529_104119A.jpg |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639| 793.71| -| -| +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg' +[debug] exifTime = '2017:05:29 10:23:05' <--> '2017:05:29 10:23:05' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg' +[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg' +[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg' +[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg' +[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg' +[debug] exifTime = '2017:05:29 10:24:09' <--> '2017:05:29 10:24:09' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg' +[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg' +[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg' +[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg' +[debug] exifTime = '2017:05:29 10:33:15' <--> '2017:05:29 10:33:15' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg' +[debug] exifTime = '2017:05:29 10:35:45' <--> '2017:05:29 10:35:45' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg' +[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg' +[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19' + + + + +テストパターン : [M3d].GPXが複数のTRKSEGに分割している場合.EXIF時間を基準.eTrex_20Jreverse + tarFilePath = testdata/separate.tar.gz + gpxSourcePath = testdata/multiTRKSEGreverse.eTrex_20J.gpx.xml + gpxDestinationPath = testdata/cameradata/separate.gpx + iniFilePath = testdata/AdjustTime.M2d.separate.ini +Param File = 'testdata/AdjustTime.M2d.separate.ini' + - param： IMG.TIME=2017-05-29T01:31:46Z + - param： IMG.BASE_FILE=20170529_103146A.jpg + - param： GPX.BASETIME=EXIF_TIME + - param： IMG.SOURCE_FOLDER=testdata/cameradata/separate + - param： IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output + - param： IMG.OUTPUT=true + - param： IMG.OUTPUT_ALL=false + - param： IMG.OUTPUT_EXIF= false + - param： GPX.SOURCE_FOLDER=. + - param： GPX.OUTPUT_WPT=true + - param： GPX.OVERWRITE_MAGVAR=true + - param： GPX.OUTPUT_SPEED=true + - param： GPX.gpxSplit=false + - param： GPX.noFirstNode=true + - param： GPX.REUSE=false +/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx => /home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx + 時差: 0(sec) + Target GPX: [/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/separate.gpx] + EXIF: convert to '/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate' + + +--------------------+--------------------| + GPS logging time | First Time | Last Time | +|--------------------------------+--------------------+--------------------| +| |2017-05-29T01:23:18Z|2017-05-29T01:24:05Z| +| |2017-05-29T01:24:37Z|2017-05-29T01:33:03Z| +| |2017-05-29T01:35:53Z|2017-05-29T01:47:35Z| +|--------------------------------+--------------------+--------------------| + +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +| name | Camera Time | GPStime | Latitude | Longitude | ele |magvar| km/h | +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +|20170529_102305A.jpg |2017-05-29T01:23:05Z|2017-05-29T01:23:05Z| | | | | | +|20170529_102310A.jpg |2017-05-29T01:23:10Z|2017-05-29T01:23:10Z| | | | | | +|20170529_102314A.jpg |2017-05-29T01:23:14Z|2017-05-29T01:23:14Z| | | | | | +|20170529_102318A.jpg |2017-05-29T01:23:18Z|2017-05-29T01:23:18Z| 35.8812697884|137.9952202085| 686.52| -| -| +|20170529_102322A.jpg |2017-05-29T01:23:22Z|2017-05-29T01:23:22Z| 35.8810500987|137.9951669835| 684.60| -| -| +|20170529_102401A.jpg |2017-05-29T01:24:01Z|2017-05-29T01:24:01Z| 35.8809490129|137.9974513035| 685.56| -| -| +|20170529_102405A.jpg |2017-05-29T01:24:05Z|2017-05-29T01:24:05Z| 35.8808641881|137.9981065169| 687.48| -| -| +|20170529_102409A.jpg |2017-05-29T01:24:09Z|2017-05-29T01:24:09Z| | | | | | +|20170529_102414A.jpg |2017-05-29T01:24:14Z|2017-05-29T01:24:14Z| | | | | | +|20170529_102418A.jpg |2017-05-29T01:24:18Z|2017-05-29T01:24:18Z| | | | | | +|20170529_102448A.jpg |2017-05-29T01:24:48Z|2017-05-29T01:24:48Z| 35.8788877353|138.0039562471| 713.92| -| -| +|20170529_102518A.jpg |2017-05-29T01:25:18Z|2017-05-29T01:25:18Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102547A.jpg |2017-05-29T01:25:47Z|2017-05-29T01:25:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102618A.jpg |2017-05-29T01:26:17Z|2017-05-29T01:26:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102647A.jpg |2017-05-29T01:26:47Z|2017-05-29T01:26:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102717A.jpg |2017-05-29T01:27:17Z|2017-05-29T01:27:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102747A.jpg |2017-05-29T01:27:47Z|2017-05-29T01:27:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102817A.jpg |2017-05-29T01:28:17Z|2017-05-29T01:28:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102847A.jpg |2017-05-29T01:28:47Z|2017-05-29T01:28:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102917A.jpg |2017-05-29T01:29:17Z|2017-05-29T01:29:17Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_102947A.jpg |2017-05-29T01:29:47Z|2017-05-29T01:29:47Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103016A.jpg |2017-05-29T01:30:16Z|2017-05-29T01:30:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103046A.jpg |2017-05-29T01:30:46Z|2017-05-29T01:30:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103116A.jpg |2017-05-29T01:31:16Z|2017-05-29T01:31:16Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103146A.jpg |2017-05-29T01:31:46Z|2017-05-29T01:31:46Z| 35.8761689812|138.0041732546| 711.51| -| -| +|20170529_103216A.jpg |2017-05-29T01:32:16Z|2017-05-29T01:32:16Z| 35.8408248425|138.0341358762| 748.52| -| -| +|20170529_103246A.jpg |2017-05-29T01:32:46Z|2017-05-29T01:32:46Z| 35.8405660931|138.0353022180| 747.56| -| -| +|20170529_103315A.jpg |2017-05-29T01:33:15Z|2017-05-29T01:33:15Z| | | | | | +|20170529_103345A.jpg |2017-05-29T01:33:45Z|2017-05-29T01:33:45Z| | | | | | +|20170529_103415A.jpg |2017-05-29T01:34:15Z|2017-05-29T01:34:15Z| | | | | | +|20170529_103445A.jpg |2017-05-29T01:34:45Z|2017-05-29T01:34:45Z| | | | | | +|20170529_103515A.jpg |2017-05-29T01:35:15Z|2017-05-29T01:35:15Z| | | | | | +|20170529_103545A.jpg |2017-05-29T01:35:45Z|2017-05-29T01:35:45Z| | | | | | +|20170529_103615A.jpg |2017-05-29T01:36:14Z|2017-05-29T01:36:14Z| 35.8359798510|138.0600296706| 750.93| -| -| +|20170529_103645A.jpg |2017-05-29T01:36:44Z|2017-05-29T01:36:44Z| 35.8357221074|138.0602352787| 745.64| -| -| +|20170529_103714A.jpg |2017-05-29T01:37:14Z|2017-05-29T01:37:14Z| 35.8346095774|138.0594111700| 751.89| -| -| +|20170529_103744A.jpg |2017-05-29T01:37:44Z|2017-05-29T01:37:44Z| 35.8353867475|138.0606593192| 760.06| -| -| +|20170529_103814A.jpg |2017-05-29T01:38:14Z|2017-05-29T01:38:14Z| 35.8344272710|138.0610287096| 774.96| -| -| +|20170529_103844A.jpg |2017-05-29T01:38:44Z|2017-05-29T01:38:44Z| 35.8348886948|138.0618377309| 792.74| -| -| +|20170529_103914A.jpg |2017-05-29T01:39:14Z|2017-05-29T01:39:14Z| 35.8344262652|138.0623432435| 799.95| -| -| +|20170529_103944A.jpg |2017-05-29T01:39:44Z|2017-05-29T01:39:44Z| 35.8338732272|138.0621989910| 796.59| -| -| +|20170529_104014A.jpg |2017-05-29T01:40:14Z|2017-05-29T01:40:14Z| 35.8334153239|138.0617078952| 794.67| -| -| +|20170529_104048A.jpg |2017-05-29T01:40:48Z|2017-05-29T01:40:48Z| 35.8345361520|138.0619776249| 795.15| -| -| +|20170529_104119A.jpg |2017-05-29T01:41:19Z|2017-05-29T01:41:19Z| 35.8339889813|138.0625394639| 793.71| -| -| +|--------------------------------|--------------------|--------------------|--------------|--------------|--------|------|------| +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/separate_.gpx' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102305A.jpg' +[debug] exifTime = '2017:05:29 10:23:05' <--> '2017:05:29 10:23:05' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102314A.jpg' +[debug] exifTime = '2017:05:29 10:23:14' <--> '2017:05:29 10:23:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102318A.jpg' +[debug] exifTime = '2017:05:29 10:23:18' <--> '2017:05:29 10:23:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102322A.jpg' +[debug] exifTime = '2017:05:29 10:23:22' <--> '2017:05:29 10:23:22' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102405A.jpg' +[debug] exifTime = '2017:05:29 10:24:05' <--> '2017:05:29 10:24:05' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102409A.jpg' +[debug] exifTime = '2017:05:29 10:24:09' <--> '2017:05:29 10:24:09' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102418A.jpg' +[debug] exifTime = '2017:05:29 10:24:18' <--> '2017:05:29 10:24:18' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_102448A.jpg' +[debug] exifTime = '2017:05:29 10:24:48' <--> '2017:05:29 10:24:48' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103246A.jpg' +[debug] exifTime = '2017:05:29 10:32:46' <--> '2017:05:29 10:32:46' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103315A.jpg' +[debug] exifTime = '2017:05:29 10:33:15' <--> '2017:05:29 10:33:15' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103545A.jpg' +[debug] exifTime = '2017:05:29 10:35:45' <--> '2017:05:29 10:35:45' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_103615A.jpg' +[debug] exifTime = '2017:05:29 10:36:14' <--> '2017:05:29 10:36:14' +[JUnit.debug] assert file='/home/yuu/workspace/AdjustTime/importPicture/testdata/output/separate/20170529_104119A.jpg' +[debug] exifTime = '2017:05:29 10:41:19' <--> '2017:05:29 10:41:19'