Changeset 15217 in josm for trunk/src/com/drew/metadata/exif/GpsDescriptor.java

Timestamp:

2019-07-07T01:56:46+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17848 - update to metadata-extractor 2.12.0

File:

• trunk/src/com/drew/metadata/exif/GpsDescriptor.java (modified) (11 diffs)

trunk/src/com/drew/metadata/exif/GpsDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -59 +59 @@
             case TAG_MEASURE_MODE:
                 return getGpsMeasureModeDescription();
+            case TAG_DOP:
+                return getGpsDopDescription();
             case TAG_SPEED_REF:
                 return getGpsSpeedRefDescription();
+            case TAG_SPEED:
+                return getGpsSpeedDescription();
             case TAG_TRACK_REF:
             case TAG_IMG_DIRECTION_REF:
@@ -69 +73 @@
             case TAG_DEST_BEARING:
                 return getGpsDirectionDescription(tagType);
+            case TAG_DEST_LATITUDE:
+                return getGpsDestLatitudeDescription();
+            case TAG_DEST_LONGITUDE:
+                return getGpsDestLongitudeDescription();
             case TAG_DEST_DISTANCE_REF:
                 return getGpsDestinationReferenceDescription();
+            case TAG_DEST_DISTANCE:
+                return getGpsDestDistanceDescription();
             case TAG_TIME_STAMP:
                 return getGpsTimeStampDescription();
@@ -79 +89 @@
                 // three rational numbers -- displayed in HH"MM"SS.ss
                 return getGpsLatitudeDescription();
+            case TAG_PROCESSING_METHOD:
+                return getGpsProcessingMethodDescription();
+            case TAG_AREA_INFORMATION:
+                return getGpsAreaInformationDescription();
             case TAG_DIFFERENTIAL:
                 return getGpsDifferentialDescription();
+            case TAG_H_POSITIONING_ERROR:
+                return getGpsHPositioningErrorDescription();
             default:
                 return super.getDescription(tagType);
@@ -121 +137 @@
 
     @Nullable
+    public String getGpsDestLatitudeDescription()
+    {
+        Rational[] latitudes = _directory.getRationalArray(TAG_DEST_LATITUDE);
+        String latitudeRef = _directory.getString(TAG_DEST_LATITUDE_REF);
+
+        if (latitudes == null || latitudes.length != 3 || latitudeRef == null)
+            return null;
+
+        Double lat = GeoLocation.degreesMinutesSecondsToDecimal(
+            latitudes[0], latitudes[1], latitudes[2], latitudeRef.equalsIgnoreCase("S"));
+
+        return lat == null ? null : GeoLocation.decimalToDegreesMinutesSecondsString(lat);
+    }
+
+    @Nullable
+    public String getGpsDestLongitudeDescription()
+    {
+        Rational[] longitudes = _directory.getRationalArray(TAG_LONGITUDE);
+        String longitudeRef = _directory.getString(TAG_LONGITUDE_REF);
+
+        if (longitudes == null || longitudes.length != 3 || longitudeRef == null)
+            return null;
+
+        Double lon = GeoLocation.degreesMinutesSecondsToDecimal(
+            longitudes[0], longitudes[1], longitudes[2], longitudeRef.equalsIgnoreCase("W"));
+
+        return lon == null ? null : GeoLocation.decimalToDegreesMinutesSecondsString(lon);
+    }
+
+    @Nullable
     public String getGpsDestinationReferenceDescription()
     {
@@ -139 +185 @@
 
     @Nullable
+    public String getGpsDestDistanceDescription()
+    {
+        final Rational value = _directory.getRational(TAG_DEST_DISTANCE);
+        if (value == null)
+            return null;
+        final String unit = getGpsDestinationReferenceDescription();
+        return String.format("%s %s",
+            new DecimalFormat("0.##").format(value.doubleValue()),
+            unit == null ? "unit" : unit.toLowerCase());
+    }
+
+    @Nullable
     public String getGpsDirectionDescription(int tagType)
     {
@@ -166 +224 @@
 
     @Nullable
+    public String getGpsDopDescription()
+    {
+        final Rational value = _directory.getRational(TAG_DOP);
+        return value == null ? null : new DecimalFormat("0.##").format(value.doubleValue());
+    }
+
+    @Nullable
     public String getGpsSpeedRefDescription()
     {
@@ -173 +238 @@
         String gpsSpeedRef = value.trim();
         if ("K".equalsIgnoreCase(gpsSpeedRef)) {
-            return "kph";
+            return "km/h";
         } else if ("M".equalsIgnoreCase(gpsSpeedRef)) {
             return "mph";
@@ -181 +246 @@
             return "Unknown (" + gpsSpeedRef + ")";
         }
+    }
+
+    @Nullable
+    public String getGpsSpeedDescription()
+    {
+        final Rational value = _directory.getRational(TAG_SPEED);
+        if (value == null)
+            return null;
+        final String unit = getGpsSpeedRefDescription();
+        return String.format("%s %s",
+            new DecimalFormat("0.##").format(value.doubleValue()),
+            unit == null ? "unit" : unit.toLowerCase());
     }
 
@@ -225 +302 @@
     {
         final Rational value = _directory.getRational(TAG_ALTITUDE);
-        return value == null ? null : value.intValue() + " metres";
+        return value == null ? null : new DecimalFormat("0.##").format(value.doubleValue()) + " metres";
+    }
+
+    @Nullable
+    public String getGpsProcessingMethodDescription()
+    {
+        return getEncodedTextDescription(TAG_PROCESSING_METHOD);
+    }
+
+    @Nullable
+    public String getGpsAreaInformationDescription()
+    {
+        return getEncodedTextDescription(TAG_AREA_INFORMATION);
     }
 
@@ -232 +321 @@
     {
         return getIndexedDescription(TAG_DIFFERENTIAL, "No Correction", "Differential Corrected");
+    }
+
+    @Nullable
+    public String getGpsHPositioningErrorDescription()
+    {
+        final Rational value = _directory.getRational(TAG_H_POSITIONING_ERROR);
+        return value == null ? null : new DecimalFormat("0.##").format(value.doubleValue()) + " metres";
     }