mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 03:39:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@25801 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2013-12-06 19:14:44 +00:00
parent 1e69be0b7a
commit 4fca6a259e
4 changed files with 125 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

47
include/functions_metadata.inc.php
View file

@ -152,7 +152,9 @@ function get_exif_data($filename, $map)
// Read EXIF data
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)
{
if (strpos($field, ';') === false)
@ -171,6 +173,20 @@ function get_exif_data($filename, $map)
}
}
}
// 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']);
}
}
}
if (!$conf['allow_html_in_metadata'])
@ -186,4 +202,33 @@ function get_exif_data($filename, $map)
return $result;
}
/**
* 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;
}
?>