Changeset 18252 in josm for trunk/src/org

Timestamp:

2021-10-05T23:47:54+02:00 (3 years ago)

Author:

Don-vip

Message:

see #16472 - Move xmp and iptc parsing to before gps short circuit (patch by taylor.smock)

File:

• trunk/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/gpx/GpxImageEntry.java

@@ -694 +694 @@
         }
 
+        IptcDirectory dirIptc = metadata.getFirstDirectoryOfType(IptcDirectory.class);
+        if (dirIptc != null) {
+            ifNotNull(ExifReader.readCaption(dirIptc), this::setIptcCaption);
+            ifNotNull(ExifReader.readHeadline(dirIptc), this::setIptcHeadline);
+            ifNotNull(ExifReader.readKeywords(dirIptc), this::setIptcKeywords);
+            ifNotNull(ExifReader.readObjectName(dirIptc), this::setIptcObjectName);
+        }
+
+        for (XmpDirectory xmpDirectory : metadata.getDirectoriesOfType(XmpDirectory.class)) {
+            Map<String, String> properties = xmpDirectory.getXmpProperties();
+            final String projectionType = "GPano:ProjectionType";
+            if (properties.containsKey(projectionType)) {
+                Stream.of(Projections.values()).filter(p -> p.name().equalsIgnoreCase(properties.get(projectionType)))
+                        .findFirst().ifPresent(projection -> this.cameraProjection = projection);
+                break;
+            }
+        }
+
         // Changed to silently cope with no time info in exif. One case
         // of person having time that couldn't be parsed, but valid GPS info
@@ -756 +774 @@
 
         ifNotNull(dirGps.getGpsDate(), d -> setExifGpsTime(d.toInstant()));
-
-        IptcDirectory dirIptc = metadata.getFirstDirectoryOfType(IptcDirectory.class);
-        if (dirIptc != null) {
-            ifNotNull(ExifReader.readCaption(dirIptc), this::setIptcCaption);
-            ifNotNull(ExifReader.readHeadline(dirIptc), this::setIptcHeadline);
-            ifNotNull(ExifReader.readKeywords(dirIptc), this::setIptcKeywords);
-            ifNotNull(ExifReader.readObjectName(dirIptc), this::setIptcObjectName);
-        }
-
-        for (XmpDirectory xmpDirectory : metadata.getDirectoriesOfType(XmpDirectory.class)) {
-            Map<String, String> properties = xmpDirectory.getXmpProperties();
-            final String projectionType = "GPano:ProjectionType";
-            if (properties.containsKey(projectionType)) {
-                Stream.of(Projections.values()).filter(p -> p.name().equalsIgnoreCase(properties.get(projectionType)))
-                        .findFirst().ifPresent(projection -> this.cameraProjection = projection);
-                break;
-            }
-        }
     }