Changeset 5237 for extensions/AMetaData/JpegMetaData/Readers/XmpReader.class.php

Timestamp:

Mar 21, 2010, 11:58:42 PM (15 years ago)

Author:

grum

Message:

fix GPS managment with XMP metadata ; and fix some minor bugs

File:

• extensions/AMetaData/JpegMetaData/Readers/XmpReader.class.php (modified) (2 diffs)

extensions/AMetaData/JpegMetaData/Readers/XmpReader.class.php

@@ -451 +451 @@
           $returned=explode(":", $value);
           break;
+        case "exif:GPSLatitude":
+        case "exif:GPSLongitude":
+        case "exif:GPSDestLatitude":
+        case "exif:GPSDestLongitude":
+          $returned=Array('coord' => "", 'card'=>"");
+          preg_match_all('/(\d{1,3}),(\d{1,2})(?:\.(\d*)){0,1}(N|S|E|W)/', $value, $result);
+          $returned['coord']=$result[1][0]."° ".$result[2][0]."' ";
+          if(trim($result[3][0])!="")
+          {
+            $returned['coord'].= round(("0.".$result[3][0])*60,2)."\"";
+          }
+          switch($result[4][0])
+          {
+            case "N":
+              $returned['card']="North";
+              break;
+            case "S":
+              $returned['card']="South";
+              break;
+            case "E":
+              $returned['card']="East";
+              break;
+            case "W":
+              $returned['card']="West";
+              break;
+          }
+          $type=ByteType::UNDEFINED;
+          break;
         case "xmp:CreateDate":
         case "xmp:ModifyDate":
@@ -604 +632 @@
         case "exif:CFAPattern":
         case "exif:DeviceSettingDescription":
-        case "exif:GPSLatitude":
-        case "exif:GPSLongitude":
-        case "exif:GPSDestLatitude":
-        case "exif:GPSDestLongitude":
           $returned=$xmpValue;
           $type=ByteType::UNDEFINED;