diff --git a/importPicture/doc/ImportPicture.class.violet.html b/importPicture/doc/ImportPicture.class.violet.html index 83be5c1..729f5ea 100644 --- a/importPicture/doc/ImportPicture.class.violet.html +++ b/importPicture/doc/ImportPicture.class.violet.html @@ -116,7 +116,7 @@ - + 1 @@ -131,7 +131,7 @@ - + 1 @@ -149,7 +149,7 @@ - + 1 @@ -233,792 +233,807 @@ ]]>

- embedded diagram image + embedded diagram image \ No newline at end of file diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java index d00ef37..7d41feb 100644 --- a/importPicture/src/osm/jp/gpx/ImportPicture.java +++ b/importPicture/src/osm/jp/gpx/ImportPicture.java @@ -11,7 +11,6 @@ import java.util.Calendar; import java.util.Comparator; import java.util.Date; -import java.util.GregorianCalendar; import java.util.Map; import java.util.TimeZone; import java.util.logging.LogManager; @@ -235,7 +234,8 @@ } java.util.Arrays.sort(files, new java.util.Comparator() { - public int compare(File file1, File file2){ + @Override + public int compare(File file1, File file2){ return file1.getName().compareTo(file2.getName()); } }); @@ -581,7 +581,7 @@ //---- EXIF_TAG_DATE_TIME_ORIGINAL / 「撮影日時/オリジナル画像の生成日時」---- TiffOutputDirectory exifDir = outputSet.getOrCreateExifDirectory(); { - Calendar cal = GregorianCalendar.getInstance(); + Calendar cal = Calendar.getInstance(); cal.setTimeZone(TimeZone.getTimeZone("UTC")); cal.setTime(correctedtime); exifDir.removeField(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL); @@ -591,7 +591,7 @@ //---- EXIF GPS_TIME_STAMP ---- TiffOutputDirectory gpsDir = outputSet.getOrCreateGPSDirectory(); { - Calendar cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("UTC")); + Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); cal.setTimeZone(TimeZone.getTimeZone("GMT+00")); cal.setTime(correctedtime); final String yearStr = yearFormatter.format(cal.get(Calendar.YEAR)); @@ -624,7 +624,7 @@ } //---- EXIF GPS_ ---- - outputSet.setGPSInDegrees(Math.abs(trkptT.lon), Math.abs(trkptT.lat)); + outputSet.setGPSInDegrees(trkptT.lon.doubleValue(), trkptT.lat.doubleValue()); } ExifRewriter rewriter = new ExifRewriter(); @@ -821,7 +821,8 @@ * @author yuu */ class JpegFileFilter implements FilenameFilter { - public boolean accept(File dir, String name) { + @Override + public boolean accept(File dir, String name) { if (name.toUpperCase().matches(".*\\.JPG$")) { return true; } diff --git a/importPicture/test/osm/jp/gpx/ImportPictureTest.java b/importPicture/test/osm/jp/gpx/ImportPictureTest.java index 76d0db1..75ad08d 100644 --- a/importPicture/test/osm/jp/gpx/ImportPictureTest.java +++ b/importPicture/test/osm/jp/gpx/ImportPictureTest.java @@ -84,6 +84,7 @@ @DataPoints public static Fixture[] datas = { + // 1 new Fixture( "[A1].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時", "testdata/Sony20170518.tar.gz", @@ -98,6 +99,7 @@ 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), }), + // 2 new Fixture( "[A2].SONYカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時", "testdata/Sony20170518.tar.gz", @@ -112,7 +114,7 @@ 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), }), - + // 3. new Fixture( "[B1].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルはコピー対象外の時", "testdata/WiMiUS20170518.tar.gz", @@ -126,7 +128,7 @@ 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), }), - + // 4. new Fixture( "[B2].WiMiUSカメラの場合.FILE_UPDATE時間を基準にして時間外のファイルもコピーする時", "testdata/WiMiUS20170518.tar.gz", @@ -140,7 +142,7 @@ 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), }), - + // 5. new Fixture( "[M1a].GPXが複数のTRKSEGに分割している場合.FILE_UPDATE時間を基準.GarminColorado", "testdata/separate.tar.gz", @@ -575,7 +577,6 @@ }), }; - @Theory public void パラメータテスト(Fixture dataset) throws Exception { ImportPictureTest.setup(dataset); @@ -611,30 +612,18 @@ // LAT,LON GPSInfo gpsInfo = exif.getGPS(); if (es[i].latD != 90.0D) { - //assertThat(comparePosition(gpsInfo.getLatitudeAsDegreesNorth(), es[i].latD), is(true)); - assertThat(String.format("%.7f", gpsInfo.getLatitudeAsDegreesNorth()), is(comparePosition(es[i].latD))); + assertThat(comparePosition(gpsInfo.getLatitudeAsDegreesNorth()), is(comparePosition(es[i].latD))); } if (es[i].lonD != 180.0D) { - //assertThat(comparePosition(gpsInfo.getLongitudeAsDegreesEast(), es[i].lonD), is(true)); - assertThat(String.format("%.7f", gpsInfo.getLongitudeAsDegreesEast()), is(comparePosition(es[i].lonD))); + assertThat(comparePosition(gpsInfo.getLongitudeAsDegreesEast()), is(comparePosition(es[i].lonD))); } } } } static String comparePosition(double b) { - return String.format("%.7f", b); + return String.format("%.4f", b); } - - /** - * 小数点第８位で四捨五入した文字列 - * @param d - * @return - */ - static String round7(double d) { - return String.format("%.7f", d); - } - } static void setup(Fixture dataset) throws IOException {