X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2FJpegLoader.java;h=672cd02d3cfe74fb32e537eb173d5377f5d239cf;hb=a6197ddcaac11c0b943183da7d46169742d024af;hp=8a376d8e6367b81aff9a9fca9f2c1f4edd1bafaa;hpb=649c5da6ee1bbc590699e11a92316ece2ea8512d;p=GpsPrune.git diff --git a/tim/prune/load/JpegLoader.java b/tim/prune/load/JpegLoader.java index 8a376d8..672cd02 100644 --- a/tim/prune/load/JpegLoader.java +++ b/tim/prune/load/JpegLoader.java @@ -20,6 +20,7 @@ import tim.prune.data.Latitude; import tim.prune.data.Longitude; import tim.prune.data.Photo; import tim.prune.data.Timestamp; +import tim.prune.data.UnitSetLibrary; import tim.prune.function.Cancellable; import tim.prune.jpeg.ExifGateway; import tim.prune.jpeg.JpegData; @@ -257,7 +258,7 @@ public class JpegLoader implements Runnable, Cancellable // Apply timestamp to photo and its point (if any) photo.setTimestamp(timestamp); if (photo.getDataPoint() != null) { - photo.getDataPoint().setFieldValue(Field.TIMESTAMP, timestamp.getText(Timestamp.FORMAT_ISO_8601), false); + photo.getDataPoint().setFieldValue(Field.TIMESTAMP, timestamp.getText(Timestamp.Format.ISO8601), false); } return photo; } @@ -318,7 +319,7 @@ public class JpegLoader implements Runnable, Cancellable Longitude longitude = new Longitude(lonval, Longitude.FORMAT_DEG_MIN_SEC); Altitude altitude = null; if (inData.hasAltitude()) { - altitude = new Altitude(inData.getAltitude(), Altitude.Format.METRES); + altitude = new Altitude(inData.getAltitude(), UnitSetLibrary.UNITS_METRES); } return new DataPoint(latitude, longitude, altitude); }