Changeset 25801 for trunk

Timestamp:

Dec 6, 2013, 8:14:44 PM (10 years ago)

Author:

mistic100

Message:

feature 3009: Add 'latitude' and 'longitude' fields in images table

Location:

trunk

Files:

• admin/include/functions_metadata.php (modified) (1 diff)
• include/functions_metadata.inc.php (modified) (3 diffs)
• install/db/139-database.php (added)
• install/piwigo_structure-mysql.sql (modified) (2 diffs)

trunk/admin/include/functions_metadata.php

@@ -123 +123 @@
       array_merge(
         $update_fields,
-        array_keys($conf['use_exif_mapping'])
+        array_keys($conf['use_exif_mapping']),
+        array('latitude', 'longitude')
         );
   }

trunk/include/functions_metadata.inc.php

@@ -153 +153 @@
   if ($exif = @read_exif_data($filename))
   {
-    $exif = trigger_event('format_exif_data', $exif, $filename, $map );
+    $exif = trigger_event('format_exif_data', $exif, $filename, $map);
+
+    // configured fields
     foreach ($map as $key => $field)
     {
@@ -170 +172 @@
           $result[$key] = $exif[$tokens[0]][$tokens[1]];
         }
+      }
+    }
+
+    // GPS data
+    $gps_exif = array_intersect_key($exif, array_flip(array('GPSLatitudeRef', 'GPSLatitude', 'GPSLongitudeRef', 'GPSLongitude')));
+    if (count($gps_exif) == 4)
+    {
+      if (
+        is_array($gps_exif['GPSLatitude'])  and in_array($gps_exif['GPSLatitudeRef'], array('S', 'N')) and
+        is_array($gps_exif['GPSLongitude']) and in_array($gps_exif['GPSLongitudeRef'], array('W', 'E'))
+        )
+      {
+        $result['latitude'] = parse_exif_gps_data($gps_exif['GPSLatitude'], $gps_exif['GPSLatitudeRef']);
+        $result['longitude'] = parse_exif_gps_data($gps_exif['GPSLongitude'], $gps_exif['GPSLongitudeRef']);
       }
     }
@@ -187 +203 @@
 }
 
+
+/**
+ * Converts EXIF GPS format to a float value.
+ * @since 2.6
+ *
+ * @param string[] $raw eg:
+ *    - 41/1
+ *    - 54/1
+ *    - 9843/500
+ * @param string $ref 'S', 'N', 'E', 'W'. eg: 'N'
+ * @return float eg: 41.905468
+ */
+function parse_exif_gps_data($raw, $ref)
+{
+  foreach ($raw as &$i)
+  {
+    $i = explode('/', $i);
+    $i = $i[1]==0 ? 0 : $i[0]/$i[1];
+  }
+  unset($i);
+
+  $v = $raw[0] + $raw[1]/60 + $raw[2]/3600;
+
+  $ref = strtoupper($ref);
+  if ($ref == 'S' or $ref == 'W') $v= -$v;
+
+  return $v;
+}
+
 ?>

trunk/install/piwigo_structure-mysql.sql

@@ -197 +197 @@
   `md5sum` char(32) default NULL,
   `added_by` smallint(5) NOT NULL default '0',
-  `rotation` tinyint unsigned default null,
+  `rotation` tinyint unsigned default NULL,
+  `latitude` double(8, 6) default NULL,
+  `longitude` double(9, 6) default NULL,
   PRIMARY KEY  (`id`),
   KEY `images_i2` (`date_available`),
@@ -203 +205 @@
   KEY `images_i4` (`hit`),
   KEY `images_i5` (`date_creation`),
-  KEY `images_i1` (`storage_category_id`)
+  KEY `images_i1` (`storage_category_id`),
+  KEY `images_i6` (`latitude`)
 ) ENGINE=MyISAM;