diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000000..58807032f3 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,43 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Current File", + "request": "launch", + "mainClass": "${file}" + }, + { + "type": "java", + "name": "ProjectionCLI", + "request": "launch", + "mainClass": "org.openstreetmap.josm.data.projection.ProjectionCLI", + "projectName": "josm" + }, + { + "type": "java", + "name": "ProjectionRefTest", + "request": "launch", + "mainClass": "org.openstreetmap.josm.data.projection.ProjectionRefTest", + "projectName": "josm" + }, + { + "type": "java", + "name": "ProjectionRegressionTest", + "request": "launch", + "mainClass": "org.openstreetmap.josm.data.projection.ProjectionRegressionTest", + "projectName": "josm" + }, + { + "type": "java", + "name": "MainApplication", + "request": "launch", + "mainClass": "org.openstreetmap.josm.gui.MainApplication", + "projectName": "josm", + "vmArgs": "-Djosm.dir.name=JOSM-dev --add-exports=java.base/sun.security.action=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED", + } + ] +} \ No newline at end of file diff --git a/nodist/data/exif-position-error.jpg b/nodist/data/exif-position-error.jpg new file mode 100644 index 0000000000000000000000000000000000000000..db8edf752efa8b0274e7f89a20534da20e122219 GIT binary patch literal 47012 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 Sd`idhJ9(nE<}muSkN?>xYR41+ literal 0 HcmV?d00001 diff --git a/src/org/openstreetmap/josm/data/ImageData.java b/src/org/openstreetmap/josm/data/ImageData.java index 232ecc6588..7a0ae4a3f4 100644 --- a/src/org/openstreetmap/josm/data/ImageData.java +++ b/src/org/openstreetmap/josm/data/ImageData.java @@ -365,6 +365,83 @@ public class ImageData implements Data { afterImageUpdated(img); } + /** + * Update the GPS track direction of the image and trigger update. + * @param img the image to update + * @param trackDirection the new GPS track direction + * @since xxx + */ + public void updateImageGpsTrack(ImageEntry img, double trackDirection) { + img.setExifGpsTrack(trackDirection); + afterImageUpdated(img); + } + + /** + * Update the image horizontal positioning error and trigger update. + * @param img the image to update + * @param hposerr the new horizontal positionning error + * @since xxx + */ + public void updateImageHPosErr(ImageEntry img, double hposerr) { + img.setExifHPosErr(hposerr); + afterImageUpdated(img); + } + + /** + * Update the image GPS differential mode and trigger update. + * @param img the image to update + * @param gpsDiffMode the new GPS differential mode + * @since xxx + */ + public void updateImageGpsDiffMode(ImageEntry img, Integer gpsDiffMode) { + img.setGpsDiffMode(gpsDiffMode); + afterImageUpdated(img); + } + + /** + * Update the image GPS 2d/3d mode value and trigger update. + * @param img the image to update + * @param gps2d3dMode the new 2d/3d GPS mode + * @since xxx + */ + public void updateImageGps2d3dMode(ImageEntry img, Integer gps2d3dMode) { + img.setGps2d3dMode(gps2d3dMode); + afterImageUpdated(img); + } + + /** + * Update the image GPS DOP value and trigger update. + * @param img the image to update + * @param exifGpsDop the new GPS DOP value + * @since xxx + */ + public void updateImageExifGpsDop(ImageEntry img, Double exifGpsDop) { + img.setExifGpsDop(exifGpsDop); + afterImageUpdated(img); + } + + /** + * Update the image GPS datum and trigger update. + * @param img the image to update + * @param exifGpsDatum the new datum string value + * @since xxx + */ + public void updateImageExifGpsDatum(ImageEntry img, String exifGpsDatum) { + img.setExifGpsDatum(exifGpsDatum); + afterImageUpdated(img); + } + + /** + * Update the image GPS processing method and trigger update. + * @param img the image to update + * @param exifGpsProcMethod the new GPS processing method + * @since xxx + */ + public void updateImageExifGpsProcMethod(ImageEntry img, String exifGpsProcMethod) { + img.setExifGpsProcMethod(exifGpsProcMethod); + afterImageUpdated(img); + } + /** * Manually trigger the {@link ImageDataUpdateListener#imageDataUpdated(ImageData)} */ diff --git a/src/org/openstreetmap/josm/data/gpx/GpxConstants.java b/src/org/openstreetmap/josm/data/gpx/GpxConstants.java index 543cdfebce..bfaff9f7e2 100644 --- a/src/org/openstreetmap/josm/data/gpx/GpxConstants.java +++ b/src/org/openstreetmap/josm/data/gpx/GpxConstants.java @@ -145,6 +145,11 @@ public interface GpxConstants { * Fractional seconds are allowed for millisecond timing in tracklogs. */ String PT_TIME = "time"; + /** True Course/Bearing angle over ground. + * @since xxx + */ + String PT_COURSE = "course"; + /** Magnetic variation (in degrees) at the point. 0.0 <= value < 360.0 */ String PT_MAGVAR = "magvar"; @@ -188,8 +193,8 @@ public interface GpxConstants { * Ordered list of all possible waypoint keys. */ List WPT_KEYS = Collections.unmodifiableList(Arrays.asList(PT_ELE, PT_TIME, PT_MAGVAR, PT_GEOIDHEIGHT, - GPX_NAME, GPX_CMT, GPX_DESC, GPX_SRC, META_LINKS, PT_SYM, PT_TYPE, - PT_FIX, PT_SAT, PT_HDOP, PT_VDOP, PT_PDOP, PT_AGEOFDGPSDATA, PT_DGPSID, PT_STD_HDEV, PT_STD_VDEV)); + GPX_NAME, GPX_CMT, GPX_DESC, GPX_SRC, META_LINKS, PT_SYM, PT_TYPE, PT_FIX, PT_SAT, PT_COURSE, + PT_HDOP, PT_VDOP, PT_PDOP, PT_AGEOFDGPSDATA, PT_DGPSID, PT_STD_HDEV, PT_STD_VDEV)); /** * Ordered list of all possible route and track keys. diff --git a/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java b/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java index 023c495be3..be3f29beaf 100644 --- a/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java +++ b/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelation.java @@ -1,6 +1,7 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.data.gpx; +import java.util.Arrays; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -72,6 +73,7 @@ public final class GpxImageCorrelation { } final GpxImageDirectionPositionSettings dirpos = settings.getDirectionPositionSettings(); + final GpxImageExtendedSettings extSettings = settings.getExtendedSettings(); final long offset = settings.getOffset(); boolean isFirst = true; @@ -141,14 +143,14 @@ public final class GpxImageCorrelation { } } WayPoint nextWp = i < size - 1 ? wps.get(i + 1) : null; - ret += matchPoints(images, prevWp, prevWpTime, curWp, curWpTime, offset, interpolate, tagTime, nextWp, dirpos); + ret += matchPoints(images, prevWp, prevWpTime, curWp, curWpTime, offset, interpolate, tagTime, nextWp, dirpos, extSettings); prevWp = curWp; prevWpTime = curWpTime; } } } if (trkTag && prevWp != null) { - ret += matchPoints(images, prevWp, prevWpTime, prevWp, prevWpTime, offset, false, trkTagTime, null, dirpos); + ret += matchPoints(images, prevWp, prevWpTime, prevWp, prevWpTime, offset, false, trkTagTime, null, dirpos, extSettings); } Logging.debug("Correlated {0} total points", ret); return ret; @@ -209,8 +211,110 @@ public final class GpxImageCorrelation { return null; } - private static int matchPoints(List images, WayPoint prevWp, long prevWpTime, WayPoint curWp, long curWpTime, - long offset, boolean interpolate, int tagTime, WayPoint nextWp, GpxImageDirectionPositionSettings dirpos) { + static Double getHPosErr(WayPoint wp) { + if (wp != null) { + if (wp.attr.get(GpxConstants.PT_STD_HDEV) instanceof Float) { + Float hposerr = (Float) wp.attr.get(GpxConstants.PT_STD_HDEV); + if (hposerr != null) { + return hposerr.doubleValue(); + } + } else if (wp.attr.get(GpxConstants.PT_STD_HDEV) instanceof Double) { + Double hposerr = (Double) wp.attr.get(GpxConstants.PT_STD_HDEV); + if (hposerr != null) { + return hposerr; + } + } + } + return null; + } + + static Double getGpsDop(WayPoint wp) { + if (wp != null) { + if (wp.attr.get(GpxConstants.PT_PDOP) != null) { + if (wp.attr.get(GpxConstants.PT_PDOP) instanceof Float) { + Float pdopvalue = (Float) wp.attr.get(GpxConstants.PT_PDOP); + return pdopvalue.doubleValue(); + } else if (wp.attr.get(GpxConstants.PT_PDOP) instanceof Double) { + Double pdopvalue = (Double) wp.attr.get(GpxConstants.PT_PDOP); + return pdopvalue.doubleValue(); + } + } else if (wp.attr.get(GpxConstants.PT_HDOP) != null) { + if (wp.attr.get(GpxConstants.PT_HDOP) instanceof Float) { + Float hdopvalue = (Float) wp.attr.get(GpxConstants.PT_HDOP); + return hdopvalue.doubleValue(); + } else if (wp.attr.get(GpxConstants.PT_HDOP) instanceof Double) { + Double hdopvalue = (Double) wp.attr.get(GpxConstants.PT_HDOP); + return hdopvalue.doubleValue(); + } + } + } + return null; + } + + static Double getGpsTrack(WayPoint wp) { + if (wp != null) { + String trackvalue = wp.getString(GpxConstants.PT_COURSE); + Logging.debug("track angle value: {0}", trackvalue); + if (!Utils.isEmpty(trackvalue)) { + try { + return Double.valueOf(trackvalue); + } catch (NumberFormatException e) { + Logging.warn(e); + } + } + } + return null; + } + + static String getGpsProcMethod(String prevGpsFixMode, final String curGpsFixMode, + final List positioningModes) { + String gpsProcMethod = null; + Integer lowestProcIndex = null; + int lowestGnssModeIdx = 3; // 2d or higher index in positioningModes list are Gnss methods + try { + lowestProcIndex = Math.min(positioningModes.indexOf(prevGpsFixMode), positioningModes.indexOf(curGpsFixMode)); + if (lowestProcIndex < 0) { + return null; + } + gpsProcMethod = "GNSS" + " " + positioningModes.get(lowestProcIndex).toUpperCase() + " " + "CORRELATION"; + if (lowestProcIndex < lowestGnssModeIdx) { + gpsProcMethod = positioningModes.get(lowestProcIndex).toUpperCase() + " " + "CORRELATION"; + } else { + gpsProcMethod = "GNSS" + " " + positioningModes.get(lowestProcIndex).toUpperCase() + " " + "CORRELATION"; + } + gpsProcMethod = gpsProcMethod.replace("FLOAT RTK", "RTK_FLOAT"); + gpsProcMethod = gpsProcMethod.replace(" RTK ", " RTK_FIX "); + } catch (ArrayIndexOutOfBoundsException ex) { + Logging.warn(ex); + } + return gpsProcMethod; + } + + static Integer getGps2d3dMode(String prevGpsFixMode, final String curGpsFixMode, + final List positioningModes) { + Integer lowestMode = null; + lowestMode = Math.min(positioningModes.indexOf(prevGpsFixMode), positioningModes.indexOf(curGpsFixMode)); + if (lowestMode > 3) { + return 3; + } + if (lowestMode > 2) { + return 2; + } + return null; + } + + private static int matchPoints(List + images, + WayPoint prevWp, + long prevWpTime, + WayPoint curWp, + long curWpTime, + long offset, + boolean interpolate, + int tagTime, + WayPoint nextWp, + GpxImageDirectionPositionSettings dirpos, + GpxImageExtendedSettings extSetting) { final boolean isLast = nextWp == null; @@ -236,6 +340,15 @@ public final class GpxImageCorrelation { int ret = 0; Double speed = null; Double prevElevation = null; + Double prevHPosErr = null; + Double prevGpsDop = null; + Double prevGpsTrack = null; + String prevGpsFixMode = null; + //list of differential GPS mode + //TODO move these lists in Gpx.Constants? + final List diffMode = Arrays.asList("dgps", "float rtk", "rtk"); + final List positioningModes = Arrays.asList("none", "manual", "estimated", "2d", "3d", "dgps", "float rtk", "rtk"); + if (prevWp != null && interpolate) { double distance = prevWp.greatCircleDistance(curWp); @@ -244,9 +357,17 @@ public final class GpxImageCorrelation { speed = 3600 * distance / (curWpTime - prevWpTime); } prevElevation = getElevation(prevWp); + prevHPosErr = getHPosErr(prevWp); + prevGpsDop = getGpsDop(prevWp); + prevGpsTrack = getGpsTrack(prevWp); + prevGpsFixMode = prevWp.getString(GpxConstants.PT_FIX); } final Double curElevation = getElevation(curWp); + final Double curHPosErr = getHPosErr(curWp); + final Double curGpsDop = getGpsDop(curWp); + final Double curGpsTrack = getGpsTrack(curWp); + final String curGpsFixMode = curWp.getString(GpxConstants.PT_FIX); if (!interpolate || isLast) { final long half = Math.abs(curWpTime - prevWpTime) / 2; @@ -266,6 +387,7 @@ public final class GpxImageCorrelation { } else { curTmp.setPos(curWp.getCoor()); } + //TODO fix this, nextWp doesn't exist here if (nextWp != null && dirpos.isSetImageDirection()) { double direction = curWp.bearing(nextWp); curTmp.setExifImgDir(computeDirection(direction, dirpos.getImageDirectionAngleOffset())); @@ -317,6 +439,62 @@ public final class GpxImageCorrelation { if (curElevation != null && prevElevation != null) { curTmp.setElevation(prevElevation + (curElevation - prevElevation) * timeDiff + dirpos.getElevationShift()); } + + // Add exif GpsHPositioningerror interpolated value + if (curHPosErr != null && prevHPosErr != null) { + Double interpolatedValue = prevHPosErr + (curHPosErr - prevHPosErr) * timeDiff; + curTmp.setExifHPosErr(Math.round(interpolatedValue*10000)/10000.0); + } + + // Add exif GpsDifferentialMode + // Get previous and current waypoint differential. As no interpolation is possible, + // set differential mode to 0 if any waypoint isn't in differential mode. + if (prevGpsFixMode != null) { + if (diffMode.contains(prevGpsFixMode) && diffMode.contains(curGpsFixMode)) { + curTmp.setGpsDiffMode(1); + } else { + curTmp.setGpsDiffMode(0); + } + } + + // Add exif GpsMeasureMode + if (prevGpsFixMode != null && curGpsFixMode != null) { + Integer gps2d3dMode = getGps2d3dMode(prevGpsFixMode, curGpsFixMode, positioningModes); + if (gps2d3dMode != null) { + curTmp.setGps2d3dMode(gps2d3dMode); + } + } + + // Add exif GpsProcessingMethod. As no interpolation is possible, + // set processing method to the "lowest" previous and current processing method value. + if (prevGpsFixMode != null && curGpsFixMode != null) { + String gpsProcMethod = getGpsProcMethod(prevGpsFixMode, curGpsFixMode, positioningModes); + if (gpsProcMethod != null) { + curTmp.setExifGpsProcMethod(gpsProcMethod); + } + } + + // Add Exif GpsDop with interpolated GPS DOP value + if (curGpsDop != null && prevGpsDop != null) { + Double interpolatedValue = prevGpsDop + (curGpsDop - prevGpsDop) * timeDiff; + curTmp.setExifGpsDop(Math.round(interpolatedValue*100)/100.0); + } + + // Add Exif GpsTrack tag + if (dirpos.isSetGpxTrackDirection()) { + if (curGpsTrack != null && prevGpsTrack != null) { + curTmp.setExifGpsTrack(prevGpsTrack + (curGpsTrack - prevGpsTrack) * timeDiff); + } + } + + // Add GpsDatum tag + if (extSetting.isSetImageGpsDatum()) { + if (diffMode.contains(prevGpsFixMode) && diffMode.contains(curGpsFixMode)) { + curTmp.setExifGpsDatum(extSetting.getImageGpsDatum()); + } else //without differential mode, datum is WGS-84 + curTmp.setExifGpsDatum("WGS-84"); + } + curTmp.setGpsTime(curImg.getExifInstant().minusMillis(offset)); curTmp.flagNewGpsData(); curImg.tmpUpdated(); diff --git a/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelationSettings.java b/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelationSettings.java index 079d69f99c..aa08ec4f7e 100644 --- a/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelationSettings.java +++ b/src/org/openstreetmap/josm/data/gpx/GpxImageCorrelationSettings.java @@ -12,6 +12,7 @@ public class GpxImageCorrelationSettings { private final long offset; private final boolean forceTags; private final GpxImageDirectionPositionSettings directionPositionSettings; + private final GpxImageExtendedSettings extendedSettings; /** * Constructs a new {@code GpxImageCorrelationSettings}. @@ -19,7 +20,10 @@ public class GpxImageCorrelationSettings { * @param forceTags force tagging of all photos, otherwise prefs are used */ public GpxImageCorrelationSettings(long offset, boolean forceTags) { - this(offset, forceTags, new GpxImageDirectionPositionSettings(false, 0, 0, 0, 0)); + this(offset, forceTags, + new GpxImageDirectionPositionSettings(false, 0, false, 0, 0, 0), + new GpxImageExtendedSettings(false, null) + ); } /** @@ -30,11 +34,27 @@ public class GpxImageCorrelationSettings { */ public GpxImageCorrelationSettings(long offset, boolean forceTags, GpxImageDirectionPositionSettings directionPositionSettings) { + this(offset, forceTags, directionPositionSettings, + new GpxImageExtendedSettings(false, null)); + } + + /** + * Constructs a new {@code GpxImageCorrelationSettings}. + * @param offset offset in milliseconds + * @param forceTags force tagging of all photos, otherwise prefs are used + * @param directionPositionSettings direction/position settings + * @param extendedSettings GPS datum settings + * @since xxx @extendedSettings was added + */ + public GpxImageCorrelationSettings(long offset, boolean forceTags, + GpxImageDirectionPositionSettings directionPositionSettings, + GpxImageExtendedSettings extendedSettings) { this.offset = offset; this.forceTags = forceTags; this.directionPositionSettings = Objects.requireNonNull(directionPositionSettings); + this.extendedSettings = Objects.requireNonNull(extendedSettings); } - + /** * Returns the offset in milliseconds. * @return the offset in milliseconds @@ -59,9 +79,19 @@ public class GpxImageCorrelationSettings { return directionPositionSettings; } + /** + * Returns the extended exif metadata settings. + * @return the extended exif metadata settings + * @since xxx + */ + public GpxImageExtendedSettings getExtendedSettings() { + return extendedSettings; + } + @Override public String toString() { return "[offset=" + offset + ", forceTags=" + forceTags - + ", directionPositionSettings=" + directionPositionSettings + ']'; + + ", directionPositionSettings=" + directionPositionSettings + + ", extendedSettings=" + extendedSettings + ']'; } } diff --git a/src/org/openstreetmap/josm/data/gpx/GpxImageDirectionPositionSettings.java b/src/org/openstreetmap/josm/data/gpx/GpxImageDirectionPositionSettings.java index 20dd5e0f73..53483c2e4f 100644 --- a/src/org/openstreetmap/josm/data/gpx/GpxImageDirectionPositionSettings.java +++ b/src/org/openstreetmap/josm/data/gpx/GpxImageDirectionPositionSettings.java @@ -9,6 +9,7 @@ public class GpxImageDirectionPositionSettings { private final boolean setImageDirection; private final double imageDirectionAngleOffset; + private final boolean setGpxTrackDirection; private final double shiftImageX; private final double shiftImageY; private final double elevationShift; @@ -17,14 +18,18 @@ public class GpxImageDirectionPositionSettings { * Constructs a new {@code GpxImageDirectionPositionSettings}. * @param setImageDirection determines if image direction must be set towards the next GPX waypoint * @param imageDirectionAngleOffset direction angle offset in degrees + * @param setGpxTrackDirection determines if image course direction must be set * @param shiftImageX image shift on X axis relative to the direction in meters * @param shiftImageY image shift on Y axis relative to the direction in meters * @param elevationShift image elevation shift in meters + * @since xxx @setGpsTrackDirection was added */ public GpxImageDirectionPositionSettings( - boolean setImageDirection, double imageDirectionAngleOffset, double shiftImageX, double shiftImageY, double elevationShift) { + boolean setImageDirection, double imageDirectionAngleOffset, boolean setGpxTrackDirection, + double shiftImageX, double shiftImageY, double elevationShift) { this.setImageDirection = setImageDirection; this.imageDirectionAngleOffset = imageDirectionAngleOffset; + this.setGpxTrackDirection = setGpxTrackDirection; this.shiftImageX = shiftImageX; this.shiftImageY = shiftImageY; this.elevationShift = elevationShift; @@ -46,6 +51,15 @@ public class GpxImageDirectionPositionSettings { return imageDirectionAngleOffset; } + /** + * Determines if GPS course direction must be set. Angle value is from the gpx trace. + * @return {@code true} if image GPS course must be set + * @since xxx + */ + public boolean isSetGpxTrackDirection() { + return setGpxTrackDirection; + } + /** * Returns image shift on X axis relative to the direction in meters * @return image shift on X axis relative to the direction in meters @@ -73,7 +87,10 @@ public class GpxImageDirectionPositionSettings { @Override public String toString() { return "[setImageDirection=" + setImageDirection - + ", imageDirectionAngleOffset=" + imageDirectionAngleOffset + ", shiftImageX=" + shiftImageX - + ", shiftImageY=" + shiftImageY + ", elevationShift=" + elevationShift + ']'; + + ", imageDirectionAngleOffset=" + imageDirectionAngleOffset + + ", setImageGpxTrackDirection=" + setGpxTrackDirection + + ", shiftImageX=" + shiftImageX + + ", shiftImageY=" + shiftImageY + + ", elevationShift=" + elevationShift + ']'; } } diff --git a/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java b/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java index f4161cd78f..4886980cdd 100644 --- a/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java +++ b/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java @@ -32,6 +32,9 @@ public class GpxImageEntry implements Comparable, IQuadBucketType private Integer exifOrientation; private LatLon exifCoor; private Double exifImgDir; + private Double exifGpsTrack; + private Double exifHPosErr; + private Double exifGpsDop; private Instant exifTime; private Projections cameraProjection = Projections.UNKNOWN; /** @@ -57,6 +60,14 @@ public class GpxImageEntry implements Comparable, IQuadBucketType private Double speed; /** Elevation (altitude) in meters */ private Double elevation; + /** GPS Differential mode */ + private Integer gpsDiffMode; + /** GPS Measure mode */ + private Integer gps2d3dMode; + /** GPS Datum */ + private String exifGpsDatum; + /** GPS processing method */ + private String exifGpsProcMethod; /** The time after correlation with a gpx track */ private Instant gpsTime; @@ -88,6 +99,13 @@ public class GpxImageEntry implements Comparable, IQuadBucketType exifOrientation = other.exifOrientation; exifCoor = other.exifCoor; exifImgDir = other.exifImgDir; + exifGpsTrack = other.exifGpsTrack; + exifHPosErr = other.exifHPosErr; + gpsDiffMode = other.gpsDiffMode; + gps2d3dMode = other.gps2d3dMode; + exifGpsDop = other.exifGpsDop; + exifGpsDatum = other.exifGpsDatum; + exifGpsProcMethod = other.exifGpsProcMethod; exifTime = other.exifTime; isNewGpsData = other.isNewGpsData; exifGpsTime = other.exifGpsTime; @@ -169,6 +187,69 @@ public class GpxImageEntry implements Comparable, IQuadBucketType return elevation; } + /** + * Return the GPS Differential mode value. The GPS Differential mode value from the temporary + * copy is returned if that copy exists. + * @return the differential mode value + * @since xxx + */ + @Override + public Integer getGpsDiffMode() { + if (tmp != null) + return tmp.gpsDiffMode; + return gpsDiffMode; + } + + /** + * Return the GPS 2d or 3d mode value. The GPS mode value form the temporary + * copy is returned if that copy exists. + * @return the GPS 2d/3d mode value + * @since xxx + */ + @Override + public Integer getGps2d3dMode() { + if (tmp != null) + return tmp.gps2d3dMode; + return gps2d3dMode; + } + + /** + * Return the GPS DOP value. The GPS DOP value from the temporary + * copy is returned if that copy exists. + * @return the DOP value + * @since xxx + */ + @Override + public Double getExifGpsDop() { + if (tmp != null) + return tmp.exifGpsDop; + return exifGpsDop; + } + + /** + * Return the exif GPS coordinates datum value. + * @return The datum value + * @since xxx + */ + @Override + public String getExifGpsDatum() { + if (tmp != null) + return tmp.exifGpsDatum; + return exifGpsDatum; + } + + /** + * Return the exif GPS processing method string + * @return the processing method string + * @since xxx + */ + @Override + public String getExifGpsProcMethod() { + if (tmp != null) + return tmp.exifGpsProcMethod; + return exifGpsProcMethod; + } + /** * Returns the GPS time value. The GPS time value from the temporary copy * is returned if that copy exists. @@ -272,6 +353,32 @@ public class GpxImageEntry implements Comparable, IQuadBucketType return tmp.exifImgDir; return exifImgDir; } + + /** + * Convenient way to determine if this entry has a EXIF GPS track angle value, + * without the cost of building a defensive copy. + * @return {@code true} if this entry has a EXIF track angle value + * @since xxx + */ + @Override + public Double getExifGpsTrack() { + if (tmp != null) + return tmp.exifGpsTrack; + return exifGpsTrack; + } + + /** + * Convenient way to determine if this entry has a EXIF GPS horizontal positionning error value, + * without the cost of building a defensive copy. + * @return {@code true} if this entry has a EXIF GPS horizontal positionning error value + * @since xxx + */ + @Override + public Double getExifHPosErr() { + if (tmp != null) + return tmp.exifHPosErr; + return exifHPosErr; + } @Override public Instant getLastModified() { @@ -345,6 +452,56 @@ public class GpxImageEntry implements Comparable, IQuadBucketType this.elevation = elevation; } + /** + * Sets GPS Differential mode. + * @param gpsDiffMode GPS Differential mode + * @since xxx + */ + @Override + public void setGpsDiffMode(Integer gpsDiffMode) { + this.gpsDiffMode = gpsDiffMode; + } + + /** + * Sets GPS 2d/3d mode. + * @param gps2d3dMode GPS 2d/3d mode value + * @since xxx + */ + @Override + public void setGps2d3dMode(Integer gps2d3dMode) { + this.gps2d3dMode = gps2d3dMode; + } + + /** + * Sets GPS DOP value. + * @param exifGpsDop GPS DOP value + * @since xxx + */ + @Override + public void setExifGpsDop(Double exifGpsDop) { + this.exifGpsDop = exifGpsDop; + } + + /** + * Sets the GPS Datum. + * @param exifGpsDatum GPS Datum + * @since xxx + */ + @Override + public void setExifGpsDatum(String exifGpsDatum) { + this.exifGpsDatum = exifGpsDatum; + } + + /** + * Sets the GPS Processing Method. + * @param exifGpsProcMethod GPS Processing Method + * @since xxx + */ + @Override + public void setExifGpsProcMethod(String exifGpsProcMethod) { + this.exifGpsProcMethod = exifGpsProcMethod; + } + /** * Sets associated file. * @param file associated file @@ -412,6 +569,26 @@ public class GpxImageEntry implements Comparable, IQuadBucketType this.exifImgDir = exifDir; } + /** + * Sets the exif GPS track (move direction angle) + * @param exifGpsTrack the exif GPS track angle + * @since xxx + */ + @Override + public void setExifGpsTrack(Double exifGpsTrack) { + this.exifGpsTrack = exifGpsTrack; + } + + /** + * Sets the exif horizontal positioning error + * @param exifHposErr the Exif horizontal positionning error + * @since xxx + */ + @Override + public void setExifHPosErr(Double exifHPosErr) { + this.exifHPosErr = exifHPosErr; + } + /** * Sets the IPTC caption. * @param iptcCaption the IPTC caption @@ -507,9 +684,10 @@ public class GpxImageEntry implements Comparable, IQuadBucketType @Override public int hashCode() { return Objects.hash(height, width, isNewGpsData, - elevation, exifCoor, exifGpsTime, exifImgDir, exifOrientation, exifTime, - iptcCaption, iptcHeadline, iptcKeywords, iptcObjectName, - file, gpsTime, pos, speed, tmp, cameraProjection); + elevation, exifCoor, exifGpsTime, exifImgDir, exifGpsTrack, exifHPosErr, + exifGpsDop, gpsDiffMode, gps2d3dMode, exifGpsDatum, exifGpsProcMethod, + exifOrientation, exifTime, iptcCaption, iptcHeadline, iptcKeywords, + iptcObjectName, file, gpsTime, pos, speed, tmp, cameraProjection); } @Override @@ -526,6 +704,13 @@ public class GpxImageEntry implements Comparable, IQuadBucketType && Objects.equals(exifCoor, other.exifCoor) && Objects.equals(exifGpsTime, other.exifGpsTime) && Objects.equals(exifImgDir, other.exifImgDir) + && Objects.equals(exifGpsTrack, other.exifGpsTrack) + && Objects.equals(exifHPosErr, other.exifHPosErr) + && Objects.equals(gpsDiffMode, other.gpsDiffMode) + && Objects.equals(gps2d3dMode, other.gps2d3dMode) + && Objects.equals(exifGpsDop, other.exifGpsDop) + && Objects.equals(exifGpsDatum, other.exifGpsDatum) + && Objects.equals(exifGpsProcMethod, other.exifGpsProcMethod) && Objects.equals(exifOrientation, other.exifOrientation) && Objects.equals(exifTime, other.exifTime) && Objects.equals(iptcCaption, other.iptcCaption) @@ -570,6 +755,7 @@ public class GpxImageEntry implements Comparable, IQuadBucketType * Copy the values from the temporary variable to the main instance. The * temporary variable is deleted. * @see #discardTmp() + * @since xxx exifGpsTrack, exifHPosErr, gpsDiffMode, gps2d3dMode, exifGpsDop, exifGpsDatum, exifGpsProcMethod added */ public void applyTmp() { if (tmp != null) { @@ -578,6 +764,13 @@ public class GpxImageEntry implements Comparable, IQuadBucketType elevation = tmp.elevation; gpsTime = tmp.gpsTime; exifImgDir = tmp.exifImgDir; + exifGpsTrack = tmp.exifGpsTrack; + exifHPosErr = tmp.exifHPosErr; + gpsDiffMode = tmp.gpsDiffMode; + gps2d3dMode = tmp.gps2d3dMode; + exifGpsDop = tmp.exifGpsDop; + exifGpsDatum = tmp.exifGpsDatum; + exifGpsProcMethod = tmp.exifGpsProcMethod; isNewGpsData = isNewGpsData || tmp.isNewGpsData; tmp = null; } diff --git a/src/org/openstreetmap/josm/data/gpx/GpxImageExtendedSettings.java b/src/org/openstreetmap/josm/data/gpx/GpxImageExtendedSettings.java new file mode 100644 index 0000000000..b7e88ec695 --- /dev/null +++ b/src/org/openstreetmap/josm/data/gpx/GpxImageExtendedSettings.java @@ -0,0 +1,39 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.data.gpx; + +/** + * Image extended exif metadata settings used by {@link GpxImageCorrelationSettings}. + * @since xxx + */ +public class GpxImageExtendedSettings { + + private final boolean setImageGpsDatum; + private final String imageGpsDatum; + + /** + * Construcs a new {@code GpxImageExtendedSettings}. + * @param setImageGpsDatum determines if images GPS datum must be set + * @param imageGpsDatum determines the GPS coordinates datum value to be set + */ + public GpxImageExtendedSettings( + boolean setImageGpsDatum, String imageGpsDatum) { + this.setImageGpsDatum = setImageGpsDatum; + this.imageGpsDatum = imageGpsDatum; + } + + /** + * Determines if image GPS datum must be set + * @return if the GPS datum must be set + */ + public boolean isSetImageGpsDatum() { + return setImageGpsDatum; + } + + /** + * Return the GPS coordinates datum code. + * @return the datum code + */ + public String getImageGpsDatum() { + return imageGpsDatum; + } +} diff --git a/src/org/openstreetmap/josm/data/imagery/street_level/IImageEntry.java b/src/org/openstreetmap/josm/data/imagery/street_level/IImageEntry.java index 3dcd79705d..04a9504e95 100644 --- a/src/org/openstreetmap/josm/data/imagery/street_level/IImageEntry.java +++ b/src/org/openstreetmap/josm/data/imagery/street_level/IImageEntry.java @@ -218,13 +218,69 @@ public interface IImageEntry> { */ Double getElevation(); + /** + * Return the GPS Differential mode value. The differential mode value from the temporary + * copy is returned if that copy exists. + * @return the fix mode value + * @since xxx + */ + Integer getGpsDiffMode(); + + /** + * Return the GPS 2d/3d mode value. The 2d/3d mode value from the temporary + * copy is returned if that copy exists. + * @return the 2d/3d mode value + * @since xxx + */ + Integer getGps2d3dMode(); + + /** + * Return the GPS DOP value. The GPS DOP value from the temporary + * copy is return if that copy exists. + * @return the GPS DOP value + * @since xxx + */ + Double getExifGpsDop(); + + /** + * Return the GPS datum value. The GPS datum value from the temporary + * copy is return if that copy exists. + * @return the GPS datum value + * @since xxx + */ + String getExifGpsDatum(); + + /** + * Return the GPS processing method. The processing method value from the temporary + * copy is return if that copy exists. + * @return the GPS processing method + * @since xxx + */ + String getExifGpsProcMethod(); + /** * Returns the image direction. The image direction from the temporary * copy is returned if that copy exists. * @return The image camera angle */ Double getExifImgDir(); + + /** + * Returns the image GPS track direction. The GPS track direction from the temporary + * copy is returned if that copy exists. + * @return the image GPS track direction angle + * @since xxx + */ + Double getExifGpsTrack(); + /** + * Returns the image horizontal positionning error. The image positionning error + * from the temporary copy is returned if that copy exists. + * @return the image horizontal positionning error + * @since xxx + */ + Double getExifHPosErr(); + /** * Convenient way to determine if this entry has a EXIF time, without the cost of building a defensive copy. * @return {@code true} if this entry has a EXIF time @@ -251,6 +307,14 @@ public interface IImageEntry> { */ Instant getGpsInstant(); + /** + * Returns the Exif GPS Time value. The Exif GPS time value from the temporary copy + * is returned if that copy exists. + * @return the Exif GPS time value + * @since xxx + */ + Instant getExifGpsInstant(); + /** * Returns the IPTC caption. * @return the IPTC caption diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java index 92d16c1ed1..faaaf50268 100644 --- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java +++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java @@ -978,12 +978,17 @@ public class OsmDataLayer extends AbstractOsmDataLayer addStringIfPresent(wpt, n, gpxPrefix, GpxConstants.PT_SYM, "wpt_symbol", null); addStringIfPresent(wpt, n, gpxPrefix, GpxConstants.PT_TYPE, null, null); + // Angle info + addDoubleIfPresent(wpt, n, gpxPrefix, GpxConstants.PT_COURSE, "gps:course"); + // Accuracy info addStringIfPresent(wpt, n, gpxPrefix, GpxConstants.PT_FIX, "gps:fix", null); addIntegerIfPresent(wpt, n, gpxPrefix, GpxConstants.PT_SAT, "gps:sat"); addDoubleIfPresent(wpt, n, gpxPrefix, GpxConstants.PT_HDOP, "gps:hdop"); addDoubleIfPresent(wpt, n, gpxPrefix, GpxConstants.PT_VDOP, "gps:vdop"); addDoubleIfPresent(wpt, n, gpxPrefix, GpxConstants.PT_PDOP, "gps:pdop"); + addDoubleIfPresent(wpt, n, gpxPrefix, GpxConstants.PT_STD_HDEV, "gps:stdhdev"); + addDoubleIfPresent(wpt, n, gpxPrefix, GpxConstants.PT_STD_VDEV, "gps:stdvdev"); addDoubleIfPresent(wpt, n, gpxPrefix, GpxConstants.PT_AGEOFDGPSDATA, "gps:ageofdgpsdata"); addIntegerIfPresent(wpt, n, gpxPrefix, GpxConstants.PT_DGPSID, "gps:dgpsid"); diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java index a47b4bb734..a3478fbea2 100644 --- a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java +++ b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java @@ -53,6 +53,7 @@ import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener; import org.openstreetmap.josm.data.gpx.GpxDataContainer; import org.openstreetmap.josm.data.gpx.GpxImageCorrelation; import org.openstreetmap.josm.data.gpx.GpxImageCorrelationSettings; +import org.openstreetmap.josm.data.gpx.GpxImageExtendedSettings; import org.openstreetmap.josm.data.gpx.GpxTimeOffset; import org.openstreetmap.josm.data.gpx.GpxTimezone; import org.openstreetmap.josm.data.gpx.WayPoint; @@ -168,6 +169,7 @@ public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode Config.getPref().put("geoimage.timezone", timezone.formatTimezone()); Config.getPref().put("geoimage.delta", delta.formatOffset()); Config.getPref().putBoolean("geoimage.showThumbs", yLayer.useThumbs); + Config.getPref().put("geoimage.datum", tfDatum.getText()); yLayer.useThumbs = cbShowThumbs.isSelected(); yLayer.startLoadThumbs(); @@ -246,6 +248,7 @@ public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode private ExtendedDialog syncDialog; private JPanel outerPanel; + private JPanel expertPanel; private JosmComboBox cbGpx; private JButton buttonSupport; private JosmTextField tfTimezone; @@ -253,9 +256,14 @@ public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode private JCheckBox cbExifImg; private JCheckBox cbTaggedImg; private JCheckBox cbShowThumbs; + private JSeparator sepExtendedTags; + private JLabel labelExtTags; + private JLabel labelDatum; private JLabel statusBarText; private JSeparator sepDirectionPosition; private ImageDirectionPositionPanel pDirectionPosition; + private JCheckBox cbAddGpsDatum; + private JosmTextField tfDatum; // remember the last number of matched photos private int lastNumMatched; @@ -472,6 +480,11 @@ public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode } } + static String loadGpsDatum() { + String gpsDatum = Config.getPref().get("geoimage.datum", "WGS-84"); + return gpsDatum; + } + @Override public void actionPerformed(ActionEvent ae) { NoGpxDataWrapper nogdw = new NoGpxDataWrapper(); @@ -619,6 +632,7 @@ public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode gbc.gridy = y++; panelTf.add(cbShowThumbs, gbc); + //Image direction and position offset GUI gbc = GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 12, 0, 0); sepDirectionPosition = new JSeparator(SwingConstants.HORIZONTAL); gbc.gridy = y++; @@ -630,6 +644,51 @@ public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode pDirectionPosition = ImageDirectionPositionPanel.forGpxTrace(); panelTf.add(pDirectionPosition, gbc); + //Extended tags GUI panel + expertPanel = new JPanel(new GridBagLayout()); + gbc = GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 12, 0, 0); + sepExtendedTags = new JSeparator(SwingConstants.HORIZONTAL); + gbc.gridx = 0; + gbc.gridy = 0; + expertPanel.add(sepExtendedTags, gbc); + + labelExtTags = new JLabel(tr("Extended tags")); + cbAddGpsDatum = new JCheckBox(tr("Set datum for images coordinates")); + cbAddGpsDatum.addActionListener(e -> tfDatum.setEnabled(!tfDatum.isEnabled())); + + labelDatum = new JLabel(tr("Datum: ")); + //TODO An AutoCompComboBox would be nice to list the recent datum values. I don't have the skill to add it. + tfDatum = new JosmTextField(loadGpsDatum(), 8); + tfDatum.setToolTipText(tr("Enter the datum for your images coordinates. Default value is WGS-84.
" + + "For RTK it could be your local CRS epsg code.
(e.g. EPSG:9782 for France mainland.)")); + tfDatum.setEnabled(false); + + gbc = GBC.eol(); + gbc.gridx = 0; + gbc.gridy = 1; + expertPanel.add(labelExtTags, gbc); + + gbc = GBC.eol(); + gbc.gridx = 0; + gbc.gridy = 2; + expertPanel.add(cbAddGpsDatum, gbc); + + //TODO move this line a little more to the right + gbc = GBC.std(); + gbc.gridx = 1; + gbc.gridy = 3; + expertPanel.add(labelDatum); + + gbc = GBC.eol(); + gbc.gridx = 2; + gbc.gridy = 3; + expertPanel.add(tfDatum, gbc); + + //Add expertPanel to panelTf + gbc = GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 12, 0, 0); + gbc.gridy = y++; + panelTf.add(expertPanel, gbc); + final JPanel statusPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 10, 10)); statusPanel.setBorder(BorderFactory.createLoweredBevelBorder()); statusBarText = new JLabel(" "); @@ -651,6 +710,8 @@ public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode tfOffset.getDocument().addDocumentListener(statusBarUpdater); cbExifImg.addItemListener(statusBarUpdaterWithRepaint); cbTaggedImg.addItemListener(statusBarUpdaterWithRepaint); + cbAddGpsDatum.addItemListener(statusBarUpdaterWithRepaint); + tfDatum.getDocument().addDocumentListener(statusBarUpdater); pDirectionPosition.addChangeListenerOnComponents(statusBarUpdaterWithRepaint); pDirectionPosition.addItemListenerOnComponents(statusBarUpdaterWithRepaint); @@ -678,6 +739,12 @@ public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode } } + public GpxImageExtendedSettings getSettings() { + return new GpxImageExtendedSettings( + cbAddGpsDatum.isSelected(), + tfDatum.getText()); + } + @Override public void expertChanged(boolean isExpert) { if (buttonSupport != null) { @@ -689,6 +756,9 @@ public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode if (pDirectionPosition != null) { pDirectionPosition.setVisible(isExpert); } + if (expertPanel != null) { + expertPanel.setVisible(isExpert); + } if (syncDialog != null) { syncDialog.pack(); } @@ -786,7 +856,8 @@ public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode final long offsetMs = ((long) (timezone.getHours() * TimeUnit.HOURS.toMillis(1))) + delta.getMilliseconds(); // in milliseconds lastNumMatched = GpxImageCorrelation.matchGpxTrack(dateImgLst, selGpx.data, pDirectionPosition.isVisible() ? - new GpxImageCorrelationSettings(offsetMs, forceTags, pDirectionPosition.getSettings()) : + new GpxImageCorrelationSettings(offsetMs, forceTags, pDirectionPosition.getSettings(), + new GpxImageExtendedSettings(cbAddGpsDatum.isSelected(), tfDatum.getText())) : new GpxImageCorrelationSettings(offsetMs, forceTags)); return trn("Matched {0} of {1} photo to GPX track.", diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDirectionPositionPanel.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDirectionPositionPanel.java index 1d998b0795..9057240185 100644 --- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDirectionPositionPanel.java +++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDirectionPositionPanel.java @@ -28,6 +28,7 @@ public class ImageDirectionPositionPanel extends JPanel { private final JCheckBox cChangeImageDirection = new JCheckBox(); private final JSpinner sOffsetDegrees = new JSpinner(new SpinnerNumberModel(0, -360, 360, 1)); + private final JCheckBox cSetGpxTrackTag = new JCheckBox(); private final JSpinner sX = new JSpinner(new SpinnerNumberModel(0.0, -50.0, 50.0, 0.1)); private final JSpinner sY = new JSpinner(new SpinnerNumberModel(0.0, -50.0, 50.0, 0.1)); @@ -37,7 +38,7 @@ public class ImageDirectionPositionPanel extends JPanel { * Constructs a new {@code ImageMetadataModificationPanel} * @param changeDirectionText the text displayed for the change image direction combobox */ - protected ImageDirectionPositionPanel(String changeDirectionText) { + protected ImageDirectionPositionPanel(String changeDirectionText, boolean hideGpxTrack) { super(new GridBagLayout()); cChangeImageDirection.setText(changeDirectionText); @@ -45,6 +46,12 @@ public class ImageDirectionPositionPanel extends JPanel { cChangeImageDirection.addActionListener(e -> sOffsetDegrees.setEnabled(!sOffsetDegrees.isEnabled())); addSetting(tr("Offset angle in degrees:"), sOffsetDegrees); sOffsetDegrees.setEnabled(false); + if (!hideGpxTrack) { + cChangeImageDirection.addActionListener(e -> cSetGpxTrackTag.setEnabled(!cSetGpxTrackTag.isEnabled())); + cSetGpxTrackTag.setText(tr("Set image course direction (from gpx track)")); + add(cSetGpxTrackTag, GBC.eol().insets(0, 0, 0, 5)); + cSetGpxTrackTag.setEnabled(false); + } add(new JSeparator(SwingConstants.HORIZONTAL), GBC.eol().fill(GBC.HORIZONTAL).insets(0, 12, 0, 12)); @@ -61,7 +68,7 @@ public class ImageDirectionPositionPanel extends JPanel { * @return a new {@code ImageMetadataModificationPanel} in a GPX trace context */ public static ImageDirectionPositionPanel forGpxTrace() { - return new ImageDirectionPositionPanel(tr("Set image direction towards the next GPX waypoint")); + return new ImageDirectionPositionPanel(tr("Set image direction towards the next GPX waypoint"), false); } /** @@ -69,7 +76,7 @@ public class ImageDirectionPositionPanel extends JPanel { * @return a new {@code ImageMetadataModificationPanel} in an image sequence context */ public static ImageDirectionPositionPanel forImageSequence() { - return new ImageDirectionPositionPanel(tr("Set image direction towards the next one")); + return new ImageDirectionPositionPanel(tr("Set image direction towards the next one"), true); } protected void addSetting(String text, JComponent component) { @@ -86,6 +93,7 @@ public class ImageDirectionPositionPanel extends JPanel { return new GpxImageDirectionPositionSettings( cChangeImageDirection.isSelected(), (Integer) sOffsetDegrees.getValue(), + cSetGpxTrackTag.isSelected(), (Double) sX.getValue(), (Double) sY.getValue(), (Double) sZ.getValue()); @@ -109,6 +117,7 @@ public class ImageDirectionPositionPanel extends JPanel { */ public void addItemListenerOnComponents(ItemListener listener) { cChangeImageDirection.addItemListener(listener); + cSetGpxTrackTag.addItemListener(listener); } /** diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageMetadata.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageMetadata.java index 473e8e5752..c7eb8d3b77 100644 --- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageMetadata.java +++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageMetadata.java @@ -128,7 +128,56 @@ public interface ImageMetadata { Double getExifImgDir(); /** - * Get the last time the source was modified + * Get the exif GPS track direction. + * @return The GPS track direction + * @since xxx + */ + Double getExifGpsTrack(); + + /** + * Get the exif Horizontal positioning error. + * @return The image horizontal positioning error + * @since xxx + */ + Double getExifHPosErr(); + + /** + * Get the GPS Differential mode. + * @return The image gnss fix mode + * @since xxx + */ + Integer getGpsDiffMode(); + + /** + * Get the GPS 2d/3d mode. + * @return The image gnss 2d/3d mode + * @since xxx + */ + Integer getGps2d3dMode(); + + /** + * Get the exif GPS DOP value. + * @return The image GPS DOP value + * @since xxx + */ + Double getExifGpsDop(); + + /** + * Get the GPS datum value. + * @return The image GPS datum value + * @since xxx + */ + String getExifGpsDatum(); + + /** + * Get the exif GPS processing method. + * @return The image GPS processing method + * @since xxx + */ + String getExifGpsProcMethod(); + + /** + * Get the last time the source was modified. * @return The last time the source was modified */ Instant getLastModified(); @@ -193,17 +242,66 @@ public interface ImageMetadata { void setGpsTime(Instant gpsTime); /** - * Set the exif coordinates + * Sets the exif coordinates * @param exifCoor The exif coordinates */ void setExifCoor(ILatLon exifCoor); /** - * Set the exif direction + * Sets the exif direction * @param exifDir The direction */ void setExifImgDir(Double exifDir); + /** + * Sets the exif GPS track direction. + * @param exifGpsTrack The GPS track direction + * @since xxx + */ + void setExifGpsTrack(Double exifGpsTrack); + + /** + * Sets the exif horizontal positioning error. + * @param exifHposErr the exif horizontal positionning error + * @since xxx + */ + void setExifHPosErr(Double exifHPosErr); + + /** + * Sets the exif GPS DOP value. + * @param exifGpsDop the exif GPS DOP value + * @since xxx + */ + void setExifGpsDop(Double exifGpsDop); + + /** + * Sets the GPS Differential mode. + * @param gpsDiffMode GPS Differential mode + * @since xxx + */ + void setGpsDiffMode(Integer gpsDiffMode); + + /** + * Sets the GPS 2d/3d mode. + * @param gps2d3dMode GPS 2d/3d mode + * @since xxx + */ + void setGps2d3dMode(Integer gps2d3dMode); + + /** + * Sets the GPS datum value. + * @param exifGpsDatum GPS datum + * @since xxx + */ + void setExifGpsDatum(String exifGpsDatum); + + /** + * Sets the GPS processing method. + * @param exifGpsProcMethod GPS processing method + * @since xxx + */ + void setExifGpsProcMethod(String exifGpsProcMethod); + /** * Sets the IPTC caption. * @param iptcCaption the IPTC caption diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageUtils.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageUtils.java index abe9e1f12c..19f0390c12 100644 --- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageUtils.java +++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageUtils.java @@ -191,6 +191,48 @@ public final class ImageUtils { Logging.debug(ex); } + try { + ifNotNull(ExifReader.readGpsTrackDirection(dirGps), image::setExifGpsTrack); + } catch (IndexOutOfBoundsException ex) { + Logging.debug(ex); + } + + try { + ifNotNull(ExifReader.readHpositioningError(dirGps), image::setExifHPosErr); + } catch (IndexOutOfBoundsException ex) { + Logging.debug(ex); + } + + try { + ifNotNull(ExifReader.readGpsDiffMode(dirGps), image::setGpsDiffMode); + } catch (IndexOutOfBoundsException ex) { + Logging.debug(ex); + } + + try { + ifNotNull(ExifReader.readGpsMeasureMode(dirGps), image::setGps2d3dMode); + } catch (IndexOutOfBoundsException ex) { + Logging.debug(ex); + } + + try { + ifNotNull(ExifReader.readGpsDop(dirGps), image::setExifGpsDop); + } catch (IndexOutOfBoundsException ex) { + Logging.debug(ex); + } + + try { + ifNotNull(ExifReader.readGpsDatum(dirGps), image::setExifGpsDatum); + } catch (IndexOutOfBoundsException ex) { + Logging.debug(ex); + } + + try { + ifNotNull(ExifReader.readGpsProcessingMethod(dirGps), image::setExifGpsProcMethod); + } catch (IndexOutOfBoundsException ex) { + Logging.debug(ex); + } + ifNotNull(dirGps.getGpsDate(), d -> image.setExifGpsTime(d.toInstant())); } diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java index d4b402296b..1ce375f9a4 100644 --- a/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java +++ b/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java @@ -88,6 +88,7 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange private final ImageZoomAction imageZoomAction = new ImageZoomAction(); private final ImageCenterViewAction imageCenterViewAction = new ImageCenterViewAction(); + private final ImageExtendedInfoAction imageExtendedInfoAction = new ImageExtendedInfoAction(); private final ImageNextAction imageNextAction = new ImageNextAction(); private final ImageRemoveAction imageRemoveAction = new ImageRemoveAction(); private final ImageRemoveFromDiskAction imageRemoveFromDiskAction = new ImageRemoveFromDiskAction(); @@ -103,6 +104,7 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange private final ImageDisplay imgDisplay = new ImageDisplay(imageryFilterSettings); private Future imgLoadingFuture; private boolean centerView; + private boolean extendedImgInfo; // Only one instance of that class is present at one time private static volatile ImageViewerDialog dialog; @@ -163,6 +165,7 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange private JButton btnOpenExternal; private JButton btnDeleteFromDisk; private JToggleButton tbCentre; + private JToggleButton tbImgExtInfo; /** The layer tab (used to select images when multiple layers provide images, makes for easy switching) */ private final HideableTabbedPane layers = new HideableTabbedPane(); @@ -234,6 +237,11 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange tbCentre.setSelected(centerView); tbCentre.setPreferredSize(buttonDim); + extendedImgInfo = Config.getPref().getBoolean("geoimage.viewer.extendedinfo", false); + tbImgExtInfo = new JToggleButton(imageExtendedInfoAction); + tbImgExtInfo.setSelected(extendedImgInfo); + tbImgExtInfo.setPreferredSize(buttonDim); + JButton btnZoomBestFit = new JButton(imageZoomAction); btnZoomBestFit.setPreferredSize(buttonDim); @@ -242,7 +250,7 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange JPanel buttons = new JPanel(); addButtonGroup(buttons, this.btnFirst, this.btnPrevious, this.btnNext, this.btnLast); - addButtonGroup(buttons, this.tbCentre, btnZoomBestFit); + addButtonGroup(buttons, this.tbCentre, btnZoomBestFit, this.tbImgExtInfo); addButtonGroup(buttons, this.btnDelete, this.btnDeleteFromDisk); addButtonGroup(buttons, this.btnCopyPath, this.btnOpenExternal); addButtonGroup(buttons, createButton(visibilityAction, buttonDim)); @@ -583,6 +591,23 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange } } + private class ImageExtendedInfoAction extends JosmAction { + ImageExtendedInfoAction() { + super(null, new ImageProvider("info"), tr("Display image extended metadata"), Shortcut.registerShortcut( + "geoimage:extendedinfos", tr(GEOIMAGE_FILLER, tr("Toggle Osd extended informations")), + KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), + false, null, false); + } + + @Override + public void actionPerformed(ActionEvent e) { + final JToggleButton button = (JToggleButton) e.getSource(); + extendedImgInfo = button.isEnabled() && button.isSelected(); + Config.getPref().putBoolean("geoimage.viewer.extendedinfo", extendedImgInfo); + refresh(false); + } + } + private class ImageRemoveAction extends JosmAction { ImageRemoveAction() { super(null, new ImageProvider(DIALOG_FOLDER, "delete"), tr("Remove photo from layer"), Shortcut.registerShortcut( @@ -999,20 +1024,49 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange if (entry.getSpeed() != null) { osd.append(tr("\nSpeed: {0} km/h", Math.round(entry.getSpeed()))); } - if (entry.getExifImgDir() != null) { - osd.append(tr("\nDirection {0}\u00b0", Math.round(entry.getExifImgDir()))); - } - DateTimeFormatter dtf = DateUtils.getDateTimeFormatter(FormatStyle.SHORT, FormatStyle.MEDIUM) - // Set timezone to UTC since UTC is assumed when parsing the EXIF timestamp, - // see see org.openstreetmap.josm.tools.ExifReader.readTime(com.drew.metadata.Metadata) - .withZone(ZoneOffset.UTC); - + // Set timezone to UTC since UTC is assumed when parsing the EXIF timestamp, + // see see org.openstreetmap.josm.tools.ExifReader.readTime(com.drew.metadata.Metadata) + .withZone(ZoneOffset.UTC); if (entry.hasExifTime()) { - osd.append(tr("\nEXIF time: {0}", dtf.format(entry.getExifInstant()))); + if (Config.getPref().getBoolean("geoimage.viewer.extendedinfo", false)) { + osd.append(tr("\nEXIF DTO time: {0}", dtf.format(entry.getExifInstant()))); + } else { + osd.append(tr("\nEXIF time: {0}", dtf.format(entry.getExifInstant()))); + } } - if (entry.hasGpsTime()) { - osd.append(tr("\nGPS time: {0}", dtf.format(entry.getGpsInstant()))); + + if (Config.getPref().getBoolean("geoimage.viewer.extendedinfo", false)) { + if (entry.getExifGpsInstant() != null) { + osd.append(tr("\nEXIF GPS time: {0}", dtf.format(entry.getExifGpsInstant()))); + } + if (entry.hasGpsTime()) { + osd.append(tr("\nCorr GPS time: {0}", dtf.format(entry.getGpsInstant()))); + } + if (entry.getExifImgDir() != null) { + osd.append(tr("\nDirection {0}\u00b0", Math.round(entry.getExifImgDir()))); + } + if (entry.getExifGpsTrack() != null) { + osd.append(tr("\nGPS direction: {0}\u00b0", Math.round(entry.getExifGpsTrack()))); + } + if (entry.getExifHPosErr() != null) { + osd.append(tr("\nHpos errror: {0}m", entry.getExifHPosErr())); + } + if (entry.getGps2d3dMode() != null) { + osd.append(tr("\n2d/3d mode: {0}d", entry.getGps2d3dMode())); + } + if (entry.getGpsDiffMode() != null) { + osd.append(tr("\nDifferential: {0}", entry.getGpsDiffMode())); + } + if (entry.getExifGpsDop() != null) { + osd.append(tr("\nDOP: {0}", entry.getExifGpsDop())); + } + if (entry.getExifGpsDatum() != null) { + osd.append(tr("\nDatum: {0}", entry.getExifGpsDatum().toString())); + } + if (entry.getExifGpsProcMethod() != null) { + osd.append(tr("\nProc. method: {0}", entry.getExifGpsProcMethod().toString())); + } } Optional.ofNullable(entry.getIptcCaption()).map(s -> tr("\nCaption: {0}", s)).ifPresent(osd::append); Optional.ofNullable(entry.getIptcHeadline()).map(s -> tr("\nHeadline: {0}", s)).ifPresent(osd::append); @@ -1145,6 +1199,19 @@ public final class ImageViewerDialog extends ToggleDialog implements LayerChange } } + /** + * Reload the image or reload only the image info. Call this if want to update the OSD. + * @param imageChanged reload the image if true. Reload only the OSD if false. + * @since xxx + */ + public void refresh(boolean imageChanged) { + if (SwingUtilities.isEventDispatchThread()) { + this.updateButtonsNonNullEntry(currentEntry, imageChanged); + } else { + GuiHelper.runInEDT(this::refresh); + } + } + private void registerOnLayer(Layer layer) { if (layer instanceof IGeoImageLayer) { layer.addPropertyChangeListener(l -> { diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntry.java b/src/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntry.java index ab87cd8c05..e2b5cd3c4c 100644 --- a/src/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntry.java +++ b/src/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntry.java @@ -37,8 +37,15 @@ public class RemoteEntry implements IImageEntry, ImageMetadata { private ILatLon pos; private Integer exifOrientation; private Double elevation; + private Integer gpsDiffMode; + private Integer gps2d3dMode; + private Double exifHPosErr; + private Double exifGpsDop; + private String exifGpsDatum; + private String exifGpsProcMethod; private Double speed; private Double exifImgDir; + private Double exifGpsTrack; private ILatLon exifCoor; private Instant exifTime; private Instant exifGpsTime; @@ -117,6 +124,38 @@ public class RemoteEntry implements IImageEntry, ImageMetadata { this.speed = speed; } + /** + * @since xxx + */ + @Override + public void setGpsDiffMode(Integer gpsDiffMode) { + this.gpsDiffMode = gpsDiffMode; + } + + /** + * @since xxx + */ + @Override + public void setGps2d3dMode(Integer gps2d3dMode) { + this.gps2d3dMode = gps2d3dMode; + } + + /** + * @since xxx + */ + @Override + public void setExifGpsDatum(String exifGpsDatum) { + this.exifGpsDatum = exifGpsDatum; + } + + /** + * @since xxx + */ + @Override + public void setExifGpsProcMethod(String exifGpsProcMethod) { + this.exifGpsProcMethod = exifGpsProcMethod; + } + @Override public void setElevation(Double elevation) { this.elevation = elevation; @@ -152,6 +191,30 @@ public class RemoteEntry implements IImageEntry, ImageMetadata { this.exifImgDir = exifDir; } + /** + * @since xxx + */ + @Override + public void setExifGpsTrack(Double exifGpsTrack) { + this.exifGpsTrack = exifGpsTrack; + } + + /** + * @since xxx + */ + @Override + public void setExifHPosErr(Double exifHPosError) { + this.exifHPosErr = exifHPosError; + } + + /** + * @since xxx + */ + @Override + public void setExifGpsDop(Double exifGpsDop) { + this.exifGpsDop = exifGpsDop; + } + @Override public void setIptcCaption(String iptcCaption) { this.iptcCaption = iptcCaption; @@ -212,11 +275,70 @@ public class RemoteEntry implements IImageEntry, ImageMetadata { return this.elevation; } + /** + * @since xxx + */ + @Override + public Integer getGpsDiffMode() { + return this.gpsDiffMode; + } + + /** + * @since xxx + */ + @Override + public Integer getGps2d3dMode() { + return this.gps2d3dMode; + } + + /** + * @since xxx + */ + @Override + public String getExifGpsDatum() { + return this.exifGpsDatum; + } + + /** + * @since xxx + */ + @Override + public String getExifGpsProcMethod() { + return this.exifGpsProcMethod; + } + + /** + * @since xxx + */ @Override public Double getExifImgDir() { return this.exifImgDir; } + /** + * @since xxx + */ + @Override + public Double getExifGpsTrack() { + return this.exifGpsTrack; + } + + /** + * @since xxx + */ + @Override + public Double getExifHPosErr() { + return this.exifHPosErr; + } + + /** + * @since xxx + */ + @Override + public Double getExifGpsDop() { + return this.exifGpsDop; + } + @Override public Instant getLastModified() { if ("file".equals(this.getImageURI().getScheme())) { @@ -335,9 +457,11 @@ public class RemoteEntry implements IImageEntry, ImageMetadata { public int hashCode() { return Objects.hash(this.uri, this.pos, this.exifOrientation, this.elevation, this.speed, this.exifImgDir, - this.exifCoor, this.exifTime, this.exifGpsTime, this.gpsTime, - this.iptcObjectName, this.iptcCaption, this.iptcHeadline, this.iptcKeywords, - this.projection, this.title); + this.exifGpsTrack, this.exifCoor, this.exifTime, this.exifGpsTime, + this.gpsTime, this.exifHPosErr, this.exifGpsDop, this.gpsDiffMode, + this.gps2d3dMode, this.exifGpsDatum, this.exifGpsProcMethod, + this.iptcObjectName, this.iptcCaption, this.iptcHeadline, + this.iptcKeywords, this.projection, this.title); } @Override @@ -352,6 +476,9 @@ public class RemoteEntry implements IImageEntry, ImageMetadata { && Objects.equals(this.exifCoor, other.exifCoor) && Objects.equals(this.exifGpsTime, other.exifGpsTime) && Objects.equals(this.exifImgDir, other.exifImgDir) + && Objects.equals(this.exifGpsTrack, other.exifGpsTrack) + && Objects.equals(this.exifHPosErr, other.exifHPosErr) + && Objects.equals(this.exifGpsDop, other.exifGpsDop) && Objects.equals(this.exifOrientation, other.exifOrientation) && Objects.equals(this.exifTime, other.exifTime) && Objects.equals(this.gpsTime, other.gpsTime) @@ -362,6 +489,10 @@ public class RemoteEntry implements IImageEntry, ImageMetadata { && Objects.equals(this.pos, other.pos) && Objects.equals(this.projection, other.projection) && Objects.equals(this.speed, other.speed) + && Objects.equals(this.gpsDiffMode, other.gpsDiffMode) + && Objects.equals(this.gps2d3dMode, other.gps2d3dMode) + && Objects.equals(this.exifGpsDatum, other.exifGpsDatum) + && Objects.equals(this.exifGpsProcMethod, other.exifGpsProcMethod) && Objects.equals(this.title, other.title); } return false; diff --git a/src/org/openstreetmap/josm/io/nmea/NmeaParser.java b/src/org/openstreetmap/josm/io/nmea/NmeaParser.java index 3c6b82e12c..9631df402e 100644 --- a/src/org/openstreetmap/josm/io/nmea/NmeaParser.java +++ b/src/org/openstreetmap/josm/io/nmea/NmeaParser.java @@ -466,7 +466,7 @@ public class NmeaParser { accu = e[VTG.COURSE.position]; if (!accu.isEmpty() && currentwp != null) { Double.parseDouble(accu); - currentwp.put("course", accu); + currentwp.put(GpxConstants.PT_COURSE, accu); } } // SPEED @@ -542,7 +542,7 @@ public class NmeaParser { accu = e[RMC.COURSE.position]; if (!accu.isEmpty() && !currentwp.attr.containsKey("course")) { Double.parseDouble(accu); - currentwp.put("course", accu); + currentwp.put(GpxConstants.PT_COURSE, accu); } // TODO fix? diff --git a/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java b/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java index fa24a4d66a..47ff8ebb8d 100644 --- a/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java +++ b/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java @@ -22,6 +22,7 @@ import org.w3c.dom.Element; /** * Session exporter for {@link GeoImageLayer}. * @since 5505 + * @since xxx exifGpsTrack, exifHPosErr, gpsDiffMode, gps2d3dMode, exifGpsDop, exifGpsDatum, exifGpsProcMethod exporter added */ public class GeoImageSessionExporter extends AbstractSessionExporter { @@ -105,6 +106,27 @@ public class GeoImageSessionExporter extends AbstractSessionExporter + *
  • 0 : no differential correction
    • + *
  • 1 : differential correction
    • + *
  • or {@code null} if not found
    • + * + * @since xxx + */ + public static Integer readGpsDiffMode(File filename) { + try { + final Metadata metadata = JpegMetadataReader.readMetadata(filename); + final GpsDirectory dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class); + return readGpsDiffMode(dirGps); + } catch (JpegProcessingException | IOException e) { + Logging.error(e); + } + return null; + } + + /** + * Returns the GPS differential mode of the given EXIF GPS directory. + * @param dirGps The EXIF GPS directory + * @return The GPS differential mode of the camera when the image was captured, + *
      + *
    • 0 : no differential correction
      • + *
    • 1 : differential correction
      • + *
    • or {@code null} if missing or if {@code dirGps} is null
      • + *
    + * @since xxx + */ + public static Integer readGpsDiffMode(GpsDirectory dirGps) { + if (dirGps != null) { + Integer gpsDiffMode = dirGps.getInteger(GpsDirectory.TAG_DIFFERENTIAL); + if (gpsDiffMode != null) { + return gpsDiffMode.intValue(); + } + } + return null; + } + + /** + * Returns the GPS 2d/3d mode of the given JPEG file. + * @param filename The JPEG file to read + * @return The GPS 2d/3d mode of the camera when the image was captured, + *
      + *
    • 2 : 2d mode
      • + *
    • 2 : 3d mode
      • + *
    • or {@code null} if not found
      • + *
    + * @since xxx + */ + public static Integer readGpsMeasureMode(File filename) { + try { + final Metadata metadata = JpegMetadataReader.readMetadata(filename); + final GpsDirectory dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class); + return readGpsMeasureMode(dirGps); + } catch (JpegProcessingException | IOException e) { + Logging.error(e); + } + return null; + } + + /** + * Returns the GPS 2d/3d mode of the given EXIF GPS directory. + * @param dirGps The EXIF GPS directory + * @return The 2d/3d mode of the camera when the image was captured, + *
      + *
    • 2 : 2d mode
      • + *
    • 3 : 3d mode
      • + *
    • or {@code null} if missing or if {@code dirGps} is null
      • + *
    + * @since xxx + */ + public static Integer readGpsMeasureMode(GpsDirectory dirGps) { + if (dirGps != null) { + Integer gps2d3dMode = dirGps.getInteger(GpsDirectory.TAG_MEASURE_MODE); + if (gps2d3dMode != null) { + return gps2d3dMode.intValue(); + } + } + return null; + } + + /** + * Returns the GPS DOP value of the given JPEG file. + * @param filename The JPEG file to read + * @return The GPS DOP value of the camera when the image was captured, + * or {@code null} if not found + * @since xxx + */ + public static Double readGpsDop(File filename) { + try { + final Metadata metadata = JpegMetadataReader.readMetadata(filename); + final GpsDirectory dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class); + return readGpsDop(dirGps); + } catch (JpegProcessingException | IOException e) { + Logging.error(e); + } + return null; + } + + /** + * Returns the GPS DOP value of the given EXIF GPS directory. + * @param dirGps The EXIF GPS directory + * @return The GPS DOP value of the camera when the image was captured, + * or {@code null} if missing or if {@code dirGps} is null + * @since xxx + */ + public static Double readGpsDop(GpsDirectory dirGps) { + if (dirGps != null) { + Double gpsDop = dirGps.getDoubleObject(GpsDirectory.TAG_DOP); + if (gpsDop != null) { + return gpsDop.doubleValue(); + } + } + return null; + } + + /** + * Returns the GPS datum value of the given JPEG file. + * @param filename The JPEG file to read + * @return The GPS datum value of the camera when the image was captured, + * or {@code null} if not found + * @since xxx + */ + public static String readGpsDatum(File filename) { + try { + final Metadata metadata = JpegMetadataReader.readMetadata(filename); + final GpsDirectory dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class); + return readGpsDatum(dirGps); + } catch (JpegProcessingException | IOException e) { + Logging.error(e); + } + return null; + } + + /** + * Returns the GPS datum value of the given EXIF GPS directory. + * @param dirGps The EXIF GPS directory + * @return The GPS datum value of the camera when the image was captured, + * or {@code null} if missing or if {@code dirGps} is null + * @since xxx + */ + public static String readGpsDatum(GpsDirectory dirGps) { + if (dirGps != null) { + String gpsDatum = dirGps.getString(GpsDirectory.TAG_MAP_DATUM); + if (gpsDatum != null) { + return gpsDatum.toString(); + } + } + return null; + } + + /** + * Return the GPS processing method of the given JPEG file. + * @param filename The JPEG file to read + * @return The GPS processing method. Possible values from the EXIF specs are: + *
      + *
    • GPS
      • + *
    • QZSS
      • + *
    • GALILEO
      • + *
    • GLONASS
      • + *
    • BEIDOU
      • + *
    • NAVIC
      • + *
    • CELLID
      • + *
    • WLAN
      • + *
    • MANUAL
      • + *
    + * Other values, and combined space separated values are possible too. + * or {@code null} if missing + * @since xxx + */ + public static String readGpsProcessingMethod(File filename) { + try { + final Metadata metadata = JpegMetadataReader.readMetadata(filename); + final GpsDirectory dirGps = metadata.getFirstDirectoryOfType(GpsDirectory.class); + return readGpsProcessingMethod(dirGps); + } catch (JpegProcessingException | IOException e) { + Logging.error(e); + } + return null; + } + + /** + * Return the GPS processing method of the given EXIF GPS directory. + * @param dirGps The EXIF GPS directory + * @return The GPS processing method. Possible values from the EXIF specs are: + *
      + *
    • GPS
      • + *
    • QZSS
      • + *
    • GALILEO
      • + *
    • GLONASS
      • + *
    • BEIDOU
      • + *
    • NAVIC
      • + *
    • CELLID
      • + *
    • WLAN
      • + *
    • MANUAL
      • + *
    + * Other values, and combined space separated values are possible too. + * or {@code null} if missing or if {@code dirGps} is null + * @since xxx + */ + public static String readGpsProcessingMethod(GpsDirectory dirGps) { + if (dirGps != null) { + String gpsProcessingMethod = dirGps.getDescription(GpsDirectory.TAG_PROCESSING_METHOD); + if (gpsProcessingMethod != null) { + return gpsProcessingMethod.toString(); + } + } + return null; + } + /** * Returns the caption of the given IPTC directory. * @param dirIptc The IPTC directory diff --git a/test/unit/org/openstreetmap/josm/data/ImageDataTest.java b/test/unit/org/openstreetmap/josm/data/ImageDataTest.java index 22dd7eff9f..3618721d8e 100644 --- a/test/unit/org/openstreetmap/josm/data/ImageDataTest.java +++ b/test/unit/org/openstreetmap/josm/data/ImageDataTest.java @@ -444,6 +444,90 @@ class ImageDataTest { data.updateImageDirection(list.get(0), 0); } + @Test + void testUpdateHPosErr() { + List list = getOneImage(); + ImageData data = new ImageData(list); + + new Expectations(list.get(0)) {{ + list.get(0).setExifHPosErr(1.23); + list.get(0).flagNewGpsData(); + }}; + data.updateImageHPosErr(list.get(0), 1.23); + } + + @Test + void testUpdateGpsDatum() { + List list = getOneImage(); + ImageData data = new ImageData(list); + + new Expectations(list.get(0)) {{ + list.get(0).setExifGpsDatum("WGS-84"); + list.get(0).flagNewGpsData(); + }}; + data.updateImageExifGpsDatum(list.get(0), "WGS-84"); + } + + @Test + void testUpdateGpsTrack() { + List list = getOneImage(); + ImageData data = new ImageData(list); + + new Expectations(list.get(0)) {{ + list.get(0).setExifGpsTrack(180.5); + list.get(0).flagNewGpsData(); + }}; + data.updateImageGpsTrack(list.get(0), 180.5); + } + + @Test + void testUpdateGpsDop() { + List list = getOneImage(); + ImageData data = new ImageData(list); + + new Expectations(list.get(0)) {{ + list.get(0).setExifGpsDop(1.9); + list.get(0).flagNewGpsData(); + }}; + data.updateImageExifGpsDop(list.get(0), 1.9); + } + + @Test + void testUpdateGpsProcMethod() { + List list = getOneImage(); + ImageData data = new ImageData(list); + + new Expectations(list.get(0)) {{ + list.get(0).setExifGpsProcMethod("GNSS RTK CORRELATION"); + list.get(0).flagNewGpsData(); + }}; + data.updateImageExifGpsProcMethod(list.get(0), "GNSS RTK CORRELATION"); + } + + @Test + void testUpdateGpsDifferentialMode() { + List list = getOneImage(); + ImageData data = new ImageData(list); + + new Expectations(list.get(0)) {{ + list.get(0).setGpsDiffMode(1); + list.get(0).flagNewGpsData(); + }}; + data.updateImageGpsDiffMode(list.get(0), 1); + } + + @Test + void testUpdateGps2d3dMode() { + List list = getOneImage(); + ImageData data = new ImageData(list); + + new Expectations(list.get(0)) {{ + list.get(0).setGps2d3dMode(3); + list.get(0).flagNewGpsData(); + }}; + data.updateImageGps2d3dMode(list.get(0), 3); + } + @Test void testTriggerListenerOnUpdate() { List list = getOneImage(); diff --git a/test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java b/test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java index ad5029fba3..74b9316a31 100644 --- a/test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java +++ b/test/unit/org/openstreetmap/josm/data/gpx/GpxImageCorrelationTest.java @@ -350,4 +350,81 @@ class GpxImageCorrelationTest { wp.put(GpxConstants.PT_ELE, "150.0"); assertEquals(Double.valueOf(150.0d), GpxImageCorrelation.getElevation(wp)); } + + /** + * Unit test of {@link GpxImageCorrelation#getHPosErr} + */ + @Test + void testGetHorizontalPosError() { + assertNull(GpxImageCorrelation.getHPosErr(null)); + WayPoint wp = new WayPoint(LatLon.ZERO); + assertNull(GpxImageCorrelation.getHPosErr(wp)); + wp.put(GpxConstants.PT_STD_HDEV, 1.5f); + assertEquals(1.5f, GpxImageCorrelation.getHPosErr(wp)); + } + + /** + * Unit test of {@link GpxImageCorrelation#getGpsDop} + */ + @Test + void testGetGpsDop() { + assertNull(GpxImageCorrelation.getGpsDop(null)); + WayPoint wp = new WayPoint(LatLon.ZERO); + assertNull(GpxImageCorrelation.getGpsDop(wp)); + wp.put(GpxConstants.PT_HDOP, 2.1f); + assertEquals(2.1f, GpxImageCorrelation.getGpsDop(wp)); + wp.put(GpxConstants.PT_PDOP, 0.9f); + assertEquals(0.9f, GpxImageCorrelation.getGpsDop(wp)); + wp.put(GpxConstants.PT_PDOP, 1.2d); + assertEquals(1.2d, GpxImageCorrelation.getGpsDop(wp)); + } + + /** + * Unit test of {@link GpxImageCorrelation#getGpsTrack} + */ + @Test + void testGetGpsTrack() { + assertNull(GpxImageCorrelation.getHPosErr(null)); + WayPoint wp = new WayPoint(LatLon.ZERO); + assertNull(GpxImageCorrelation.getGpsTrack(wp)); + wp.put(GpxConstants.PT_COURSE, ""); + assertNull(GpxImageCorrelation.getGpsTrack(wp)); + wp.put(GpxConstants.PT_COURSE, "not a number"); + assertNull(GpxImageCorrelation.getGpsTrack(wp)); + wp.put(GpxConstants.PT_COURSE, "167.0"); + assertEquals(Double.valueOf(167.0d), GpxImageCorrelation.getGpsTrack(wp), 0.01d); + } + + /** + * Unit test of {@link GpxImageCorrelation#getGpsProcMethod} + */ + @Test + void testGetGpsProcMethod() { + final List positionningModes = Arrays.asList("none", "manual", "estimated", "2d", "3d", "dgps", "float rtk", "rtk"); + assertNull(GpxImageCorrelation.getGpsProcMethod(null, null, positionningModes)); + assertNull(GpxImageCorrelation.getGpsProcMethod("", "", positionningModes)); + assertNull(GpxImageCorrelation.getGpsProcMethod("3d", null, positionningModes)); + assertNull(GpxImageCorrelation.getGpsProcMethod("", "dgps", positionningModes)); + assertEquals("MANUAL CORRELATION", GpxImageCorrelation.getGpsProcMethod("manual", "rtk", positionningModes)); + assertEquals("ESTIMATED CORRELATION", GpxImageCorrelation.getGpsProcMethod("estimated", "2d", positionningModes)); + assertEquals("GNSS DGPS CORRELATION", GpxImageCorrelation.getGpsProcMethod("rtk", "dgps", positionningModes)); + assertEquals("GNSS RTK_FLOAT CORRELATION", GpxImageCorrelation.getGpsProcMethod("float rtk", "rtk", positionningModes)); + assertEquals("GNSS RTK_FIX CORRELATION", GpxImageCorrelation.getGpsProcMethod("rtk", "rtk", positionningModes)); + } + + /** + * Unit test of {@link GpxImageCorrelation#getGps2d3dMode} + */ + @Test + void testGetGps2d3dMode() { + final List positionningModes = Arrays.asList("none", "manual", "estimated", "2d", "3d", "dgps", "float rtk", "rtk"); + assertNull(GpxImageCorrelation.getGps2d3dMode(null, null, positionningModes)); + assertNull(GpxImageCorrelation.getGps2d3dMode("", "", positionningModes)); + assertNull(GpxImageCorrelation.getGps2d3dMode("3d", null, positionningModes)); + assertNull(GpxImageCorrelation.getGps2d3dMode("", "dgps", positionningModes)); + assertNull(GpxImageCorrelation.getGps2d3dMode("estimated", "rtk", positionningModes)); + assertEquals(2, GpxImageCorrelation.getGps2d3dMode("2d", "2d", positionningModes)); + assertEquals(2, GpxImageCorrelation.getGps2d3dMode("2d", "3d", positionningModes)); + assertEquals(3, GpxImageCorrelation.getGps2d3dMode("3d", "dgps", positionningModes)); + } } diff --git a/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java b/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java index 285acd9d55..9dcad6ca38 100644 --- a/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java +++ b/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java @@ -21,7 +21,7 @@ import org.openstreetmap.josm.data.coor.conversion.DMSCoordinateFormat; * @since 6209 */ class ExifReaderTest { - private File orientationSampleFile, directionSampleFile; + private File orientationSampleFile, directionSampleFile, positionErrorSampleFile; /** * Setup test @@ -30,6 +30,7 @@ class ExifReaderTest { public void setUp() { directionSampleFile = new File("nodist/data/exif-example_direction.jpg"); orientationSampleFile = new File("nodist/data/exif-example_orientation=6.jpg"); + positionErrorSampleFile = new File("nodist/data/exif-position-error.jpg"); } /** @@ -55,6 +56,15 @@ class ExifReaderTest { assertEquals(Instant.parse(expectedDate), date); } + /** + * Test reading GPS date and time + */ + @Test + void testReadGpsDateTime() { + Instant date = ExifReader.readGpsInstant(positionErrorSampleFile); + assertEquals(Instant.parse("2024-04-30T16:36:42Z"), date); + } + /** * Test orientation extraction */ @@ -100,6 +110,62 @@ class ExifReaderTest { assertEquals(Double.valueOf(23.4), ExifReader.readElevation(new File("nodist/data/exif-example_speed_ele.jpg"))); } + /** + * Test horizontal position error extraction + */ + @Test + void testReadHorPosError() { + assertEquals(Double.valueOf(0.014), ExifReader.readHpositioningError(positionErrorSampleFile)); + } + + /** + * Test GPS track course extraction + */ + @Test + void testReadGpsTrack() { + assertEquals(Double.valueOf(298), ExifReader.readGpsTrackDirection(positionErrorSampleFile)); + } + + /** + * Test GPS differential mode extraction + */ + @Test + void testReadGpsDiffmode() { + assertEquals(Integer.valueOf(1), ExifReader.readGpsDiffMode(positionErrorSampleFile)); + } + + /** + * Test GPS DOP value extraction + */ + @Test + void testReadGpsDop() { + assertEquals(Double.valueOf(0.92), ExifReader.readGpsDop(positionErrorSampleFile)); + } + + /** + * Test GPS measure mode (2D/3D) extraction + */ + @Test + void testReadGps2d3dMode() { + assertEquals(Integer.valueOf(3), ExifReader.readGpsMeasureMode(positionErrorSampleFile)); + } + + /** + * Test GPS datum extraction + */ + @Test + void testReadGpsDatum() { + assertEquals(String.valueOf("EPSG:9782"), ExifReader.readGpsDatum(positionErrorSampleFile)); + } + + /** + * Test GPS processing method extraction + */ + @Test + void testReadGpsProcMethod() { + assertEquals(String.valueOf("GNSS RTK_FIX CORRELATION"), ExifReader.readGpsProcessingMethod(positionErrorSampleFile)); + } + /** * Non-regression test for ticket #11685 * @throws IOException if an error occurs during reading