Bugfixes

Author: tmp-hallenser

lib/PHPExif/Mapper/Exiftool.php

@@ -215,14 +215,14 @@ public function mapRawData(array $data)
                     $value  = $this->extractGPSCoordinates($value);
                     break;
                 case self::GPSLATITUDE:
-                    $latitudeRef = empty($data['GPS:GPSLatitudeRef']) ? 'N' : $data['GPS:GPSLatitudeRef'];
+                    $latitudeRef = empty($data['GPS:GPSLatitudeRef']) ? 'N' : $data['GPS:GPSLatitudeRef'][0];
                     $value = (strtoupper($latitudeRef) === 'S' ? -1.0 : 1.0)*$this->extractGPSCoordinates($value);
                     break;
                 case self::GPSLONGITUDE_QUICKTIME:
                     $value  = $this->extractGPSCoordinates($value);
                     break;
                 case self::GPSLONGITUDE:
-                    $longitudeRef = empty($data['GPS:GPSLongitudeRef']) ? 'E' : $data['GPS:GPSLongitudeRef'];
+                    $longitudeRef = empty($data['GPS:GPSLongitudeRef']) ? 'E' : $data['GPS:GPSLongitudeRef'][0];
                     $value  = (strtoupper($longitudeRef) === 'W' ? -1 : 1) * $this->extractGPSCoordinates($value);
                     break;
                 case self::GPSALTITUDE:
@@ -289,7 +289,7 @@ public function mapRawData(array $data)
      */
     protected function extractGPSCoordinates($coordinates)
     {
-        if (is_numeric($coordinates) === true) {
+        if (is_numeric($coordinates) === true or $this->numeric === true) {) {
             return ((float) $coordinates);
         } else {
             if (!preg_match('!^([0-9.]+) deg ([0-9.]+)\' ([0-9.]+)"!', $coordinates, $matches)) {

lib/PHPExif/Mapper/Native.php

@@ -206,14 +206,12 @@ public function mapRawData(array $data)
                     $value = (int) reset($resolutionParts);
                     break;
                 case self::GPSLATITUDE:
-                    if(!(empty($data['GPSLatitudeRef'][0]))) {
-                      $value = $this->extractGPSCoordinate($value, $data['GPSLatitudeRef'][0]);
-                    }
+                    $GPSLatitudeRef = (!(empty($data['GPSLatitudeRef'][0]))) ? $data['GPSLatitudeRef'][0] : '';
+                    $value = $this->extractGPSCoordinate((array)$value, $GPSLatitudeRef);
                     break;
                 case self::GPSLONGITUDE:
-                    if(!(empty($data['GPSLongitudeRef'][0]))) {
-                      $value = $this->extractGPSCoordinate($value, $data['GPSLongitudeRef'][0]);
-                    }
+                    $GPSLongitudeRef = (!(empty($data['GPSLongitudeRef'][0]))) ? $data['GPSLongitudeRef'][0] : '';
+                    $value = $this->extractGPSCoordinate((array)$value, $GPSLongitudeRef);
                     break;
                 case self::GPSALTITUDE:
                     $flip = 1;
@@ -298,6 +296,7 @@ protected function isFieldKnown(&$field)
      */
     protected function extractGPSCoordinate(array $coordinate, string $ref)
     {
+
         $degrees = count($coordinate) > 0 ? $this->normalizeComponent($coordinate[0]) : 0;
     		$minutes = count($coordinate) > 1 ? $this->normalizeComponent($coordinate[1]) : 0;
     		$seconds = count($coordinate) > 2 ? $this->normalizeComponent($coordinate[2]) : 0;