From 97e939767ff05780998e94496ea76525fbb01b9b Mon Sep 17 00:00:00 2001 From: hayashi Date: Fri, 30 Jun 2017 16:01:22 +0900 Subject: [PATCH] =?utf8?q?green:=20=E5=87=BA=E5=8A=9B=E3=81=95=E3=82=8C?= =?utf8?q?=E3=81=9F=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AEEXIF?= =?utf8?q?=E6=97=A5=E6=99=82=E3=81=8C=E6=9B=B8=E3=81=8D=E6=8F=9B=E3=82=8F?= =?utf8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B=E3=81=93=E3=81=A8=E3=82=92?= =?utf8?q?=E7=A2=BA=E8=AA=8D=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- importPicture/src/osm/jp/gpx/ImportPicture.java | 2 - .../test/osm/jp/gpx/ImportPictureTest.java | 52 +++++++++++----------- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java index 1c2367a..e7baaa2 100644 --- a/importPicture/src/osm/jp/gpx/ImportPicture.java +++ b/importPicture/src/osm/jp/gpx/ImportPicture.java @@ -160,7 +160,6 @@ public class ImportPicture extends Thread { return; } String dateTimeOriginal = exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0]; - System.out.println("[ImportPicture.debug] EXIF Date and Time (orignal) = '"+ dateTimeOriginal +"'"); long lastModifyTime = ImportPicture.toEXIFDate(dateTimeOriginal).getTime(); imgtime = new Date(lastModifyTime); } @@ -450,7 +449,6 @@ public class ImportPicture extends Thread { continue; } String dateTimeOriginal = exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0]; - System.out.println("[ImportPicture.debug] EXIF Date and Time (orignal) = '"+ dateTimeOriginal +"'"); itime = ImportPicture.toEXIFDate(dateTimeOriginal); } System.out.print(String.format("%20s|", toUTCString(itime))); diff --git a/importPicture/test/osm/jp/gpx/ImportPictureTest.java b/importPicture/test/osm/jp/gpx/ImportPictureTest.java index d6967d7..7f9bb42 100644 --- a/importPicture/test/osm/jp/gpx/ImportPictureTest.java +++ b/importPicture/test/osm/jp/gpx/ImportPictureTest.java @@ -198,7 +198,7 @@ public class ImportPictureTest { // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:14",true), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 10:35:45",true), + new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:44",true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), @@ -222,7 +222,7 @@ public class ImportPictureTest { // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:04",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:05",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, false), @@ -238,7 +238,7 @@ public class ImportPictureTest { // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:18",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:19",true), }), new Fixture( @@ -252,16 +252,16 @@ public class ImportPictureTest { new Expecter("separate/separate_.gpx", true, null, true), // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 01:23:06", true), + new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 01:23:05", true), new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 01:23:14", true), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:04",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:05",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) - new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 01:24:10",true), + new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 01:24:09",true), new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 01:24:18",true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) @@ -269,12 +269,12 @@ public class ImportPictureTest { new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) - new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:14",true), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:44",true), + new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:15",true), + new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:45",true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:18",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:19",true), }), @@ -367,7 +367,7 @@ public class ImportPictureTest { // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:04",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:05",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, false), @@ -383,7 +383,7 @@ public class ImportPictureTest { // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:18",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:19",true), }), new Fixture( @@ -397,16 +397,16 @@ public class ImportPictureTest { new Expecter("separate/separate_.gpx", true, null, true), // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 01:23:06", true), + new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 01:23:05", true), new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 01:23:14", true), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:04",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:05",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) - new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 01:24:10",true), + new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 01:24:09",true), new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 01:24:18",true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) @@ -414,12 +414,12 @@ public class ImportPictureTest { new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) - new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:14",true), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:44",true), + new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:15",true), + new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:45",true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:18",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:19",true), }), new Fixture( @@ -511,7 +511,7 @@ public class ImportPictureTest { // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:04",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:05",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) new Expecter("separate/20170529_102409A.jpg", false, null, false), @@ -527,7 +527,7 @@ public class ImportPictureTest { // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:18",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:19",true), }), new Fixture( @@ -541,16 +541,16 @@ public class ImportPictureTest { new Expecter("separate/separate_.gpx", true, null, true), // out of time ( - 2017-05-29T01:23:18) - new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 01:23:06", true), + new Expecter("separate/20170529_102305A.jpg", true, "2017:05:29 01:23:05", true), new Expecter("separate/20170529_102314A.jpg", true, "2017:05:29 01:23:14", true), // in TRKSEG(1) (2017-05-29T01:23:18 - 2017-05-29T01:24:05) new Expecter("separate/20170529_102318A.jpg", true, "2017:05:29 01:23:18",true), new Expecter("separate/20170529_102322A.jpg", true, "2017:05:29 01:23:22",true), - new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:04",true), + new Expecter("separate/20170529_102405A.jpg", true, "2017:05:29 01:24:05",true), // out of time (2017-05-29T01:24:05 - 2017-05-29T01:24:37) - new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 01:24:10",true), + new Expecter("separate/20170529_102409A.jpg", true, "2017:05:29 01:24:09",true), new Expecter("separate/20170529_102418A.jpg", true, "2017:05:29 01:24:18",true), // in TRKSEG(2) (2017-05-29T01:24:37 - 2017-05-29T01:33:03) @@ -558,12 +558,12 @@ public class ImportPictureTest { new Expecter("separate/20170529_103246A.jpg", true, "2017:05:29 01:32:46",true), // out of time (2017-05-29T01:33:03 - 2017-05-29T01:35:53) - new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:14",true), - new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:44",true), + new Expecter("separate/20170529_103315A.jpg", true, "2017:05:29 01:33:15",true), + new Expecter("separate/20170529_103545A.jpg", true, "2017:05:29 01:35:45",true), // in TRKSEG(3) (2017-05-29T01:35:53 - 2017-05-29T01:47:35) new Expecter("separate/20170529_103615A.jpg", true, "2017:05:29 01:36:14",true), - new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:18",true), + new Expecter("separate/20170529_104119A.jpg", true, "2017:05:29 01:41:19",true), }), }; @@ -597,7 +597,7 @@ public class ImportPictureTest { // EXIF-TIME が正しく設定されていること String exifTime = ImportPicture.toEXIFString(ImportPicture.toEXIFDate(exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0])); - System.out.println("[debug] exifTime = '"+ exifTime +"'"); + System.out.println("[debug] exifTime = '"+ exifTime +"' <--> '"+ es[i].timeStr +"'"); assertThat(exifTime, is(es[i].timeStr)); } } -- 2.11.0