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

Timestamp:

2015-03-10T01:17:39+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #11162 - update to metadata-extractor 2.7.2

File:

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

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

@@ -1 +1 @@
 /*
- * Copyright 2002-2012 Drew Noakes
+ * Copyright 2002-2015 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -16 +16 @@
  * More information about this project is available at:
  *
- *    http://drewnoakes.com/code/exif/
- *    http://code.google.com/p/metadata-extractor/
+ *    https://drewnoakes.com/code/exif/
+ *    https://github.com/drewnoakes/metadata-extractor
  */
 package com.drew.metadata.exif;
@@ -29 +29 @@
 import java.text.DecimalFormat;
 
+import static com.drew.metadata.exif.GpsDirectory.*;
+
 /**
- * Provides human-readable string representations of tag values stored in a <code>GpsDirectory</code>.
- *
- * @author Drew Noakes http://drewnoakes.com
+ * Provides human-readable string representations of tag values stored in a {@link GpsDirectory}.
+ *
+ * @author Drew Noakes https://drewnoakes.com
  */
 public class GpsDescriptor extends TagDescriptor<GpsDirectory>
@@ -41 +43 @@
     }
 
+    @Override
     @Nullable
     public String getDescription(int tagType)
     {
         switch (tagType) {
-            case GpsDirectory.TAG_GPS_VERSION_ID:
+            case TAG_VERSION_ID:
                 return getGpsVersionIdDescription();
-            case GpsDirectory.TAG_GPS_ALTITUDE:
+            case TAG_ALTITUDE:
                 return getGpsAltitudeDescription();
-            case GpsDirectory.TAG_GPS_ALTITUDE_REF:
+            case TAG_ALTITUDE_REF:
                 return getGpsAltitudeRefDescription();
-            case GpsDirectory.TAG_GPS_STATUS:
+            case TAG_STATUS:
                 return getGpsStatusDescription();
-            case GpsDirectory.TAG_GPS_MEASURE_MODE:
+            case TAG_MEASURE_MODE:
                 return getGpsMeasureModeDescription();
-            case GpsDirectory.TAG_GPS_SPEED_REF:
+            case TAG_SPEED_REF:
                 return getGpsSpeedRefDescription();
-            case GpsDirectory.TAG_GPS_TRACK_REF:
-            case GpsDirectory.TAG_GPS_IMG_DIRECTION_REF:
-            case GpsDirectory.TAG_GPS_DEST_BEARING_REF:
+            case TAG_TRACK_REF:
+            case TAG_IMG_DIRECTION_REF:
+            case TAG_DEST_BEARING_REF:
                 return getGpsDirectionReferenceDescription(tagType);
-            case GpsDirectory.TAG_GPS_TRACK:
-            case GpsDirectory.TAG_GPS_IMG_DIRECTION:
-            case GpsDirectory.TAG_GPS_DEST_BEARING:
+            case TAG_TRACK:
+            case TAG_IMG_DIRECTION:
+            case TAG_DEST_BEARING:
                 return getGpsDirectionDescription(tagType);
-            case GpsDirectory.TAG_GPS_DEST_DISTANCE_REF:
+            case TAG_DEST_DISTANCE_REF:
                 return getGpsDestinationReferenceDescription();
-            case GpsDirectory.TAG_GPS_TIME_STAMP:
+            case TAG_TIME_STAMP:
                 return getGpsTimeStampDescription();
-            case GpsDirectory.TAG_GPS_LONGITUDE:
+            case TAG_LONGITUDE:
                 // three rational numbers -- displayed in HH"MM"SS.ss
                 return getGpsLongitudeDescription();
-            case GpsDirectory.TAG_GPS_LATITUDE:
+            case TAG_LATITUDE:
                 // three rational numbers -- displayed in HH"MM"SS.ss
                 return getGpsLatitudeDescription();
-            case GpsDirectory.TAG_GPS_DIFFERENTIAL:
+            case TAG_DIFFERENTIAL:
                 return getGpsDifferentialDescription();
             default:
@@ -85 +88 @@
     private String getGpsVersionIdDescription()
     {
-        return convertBytesToVersionString(_directory.getIntArray(GpsDirectory.TAG_GPS_VERSION_ID), 1);
+        return getVersionBytesDescription(TAG_VERSION_ID, 1);
     }
 
@@ -92 +95 @@
     {
         GeoLocation location = _directory.getGeoLocation();
-
-        if (location == null)
-            return null;
-
-        return GeoLocation.decimalToDegreesMinutesSecondsString(location.getLatitude());
+        return location == null ? null : GeoLocation.decimalToDegreesMinutesSecondsString(location.getLatitude());
     }
 
@@ -103 +102 @@
     {
         GeoLocation location = _directory.getGeoLocation();
-
-        if (location == null)
-            return null;
-
-        return GeoLocation.decimalToDegreesMinutesSecondsString(location.getLongitude());
+        return location == null ? null : GeoLocation.decimalToDegreesMinutesSecondsString(location.getLongitude());
     }
 
@@ -114 +109 @@
     {
         // time in hour, min, sec
-        int[] timeComponents = _directory.getIntArray(GpsDirectory.TAG_GPS_TIME_STAMP);
-        if (timeComponents==null)
-            return null;
-        StringBuilder description = new StringBuilder();
-        description.append(timeComponents[0]);
-        description.append(":");
-        description.append(timeComponents[1]);
-        description.append(":");
-        description.append(timeComponents[2]);
-        description.append(" UTC");
-        return description.toString();
+        int[] timeComponents = _directory.getIntArray(TAG_TIME_STAMP);
+        return timeComponents == null ? null : String.format("%d:%d:%d UTC", timeComponents[0], timeComponents[1], timeComponents[2]);
     }
 
@@ -130 +116 @@
     public String getGpsDestinationReferenceDescription()
     {
-        final String value = _directory.getString(GpsDirectory.TAG_GPS_DEST_DISTANCE_REF);
-        if (value==null)
+        final String value = _directory.getString(TAG_DEST_DISTANCE_REF);
+        if (value == null)
             return null;
         String distanceRef = value.trim();
@@ -151 +137 @@
         // provide a decimal version of rational numbers in the description, to avoid strings like "35334/199 degrees"
         String value = angle != null
-                ? new DecimalFormat("0.##").format(angle.doubleValue())
-                : _directory.getString(tagType);
-        if (value==null || value.trim().length()==0)
-            return null;
-        return value.trim() + " degrees";
+            ? new DecimalFormat("0.##").format(angle.doubleValue())
+            : _directory.getString(tagType);
+        return value == null || value.trim().length() == 0 ? null : value.trim() + " degrees";
     }
 
@@ -162 +146 @@
     {
         final String value = _directory.getString(tagType);
-        if (value==null)
+        if (value == null)
             return null;
         String gpsDistRef = value.trim();
@@ -177 +161 @@
     public String getGpsSpeedRefDescription()
     {
-        final String value = _directory.getString(GpsDirectory.TAG_GPS_SPEED_REF);
-        if (value==null)
+        final String value = _directory.getString(TAG_SPEED_REF);
+        if (value == null)
             return null;
         String gpsSpeedRef = value.trim();
@@ -195 +179 @@
     public String getGpsMeasureModeDescription()
     {
-        final String value = _directory.getString(GpsDirectory.TAG_GPS_MEASURE_MODE);
-        if (value==null)
+        final String value = _directory.getString(TAG_MEASURE_MODE);
+        if (value == null)
             return null;
         String gpsSpeedMeasureMode = value.trim();
@@ -211 +195 @@
     public String getGpsStatusDescription()
     {
-        final String value = _directory.getString(GpsDirectory.TAG_GPS_STATUS);
-        if (value==null)
+        final String value = _directory.getString(TAG_STATUS);
+        if (value == null)
             return null;
         String gpsStatus = value.trim();
@@ -227 +211 @@
     public String getGpsAltitudeRefDescription()
     {
-        Integer value = _directory.getInteger(GpsDirectory.TAG_GPS_ALTITUDE_REF);
-        if (value==null)
-            return null;
-        if (value == 0)
-            return "Sea level";
-        if (value == 1)
-            return "Below sea level";
-        return "Unknown (" + value + ")";
+        return getIndexedDescription(TAG_ALTITUDE_REF, "Sea level", "Below sea level");
     }
 
@@ -240 +217 @@
     public String getGpsAltitudeDescription()
     {
-        final Rational value = _directory.getRational(GpsDirectory.TAG_GPS_ALTITUDE);
-        if (value==null)
-            return null;
-        return value.intValue() + " metres";
+        final Rational value = _directory.getRational(TAG_ALTITUDE);
+        return value == null ? null : value.intValue() + " metres";
     }
 
@@ -249 +224 @@
     public String getGpsDifferentialDescription()
     {
-        final Integer value = _directory.getInteger(GpsDirectory.TAG_GPS_DIFFERENTIAL);
-        if (value==null)
-            return null;
-        if (value == 0)
-            return "No Correction";
-        if (value == 1)
-            return "Differential Corrected";
-        return "Unknown (" + value + ")";
+        return getIndexedDescription(TAG_DIFFERENTIAL, "No Correction", "Differential Corrected");
     }
 
@@ -263 +231 @@
     {
         GeoLocation location = _directory.getGeoLocation();
-
-        if (location == null)
-            return null;
-
-        return location.toDMSString();
+        return location == null ? null : location.toDMSString();
     }
 }