Skip to content

Allowed for duplicated tags in the raw data #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 21, 2015
Merged

Allowed for duplicated tags in the raw data #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5af2fa
Allowed for duplicated tags in the raw data (grouped by family).
Aug 21, 2015
4425ee3
Updated tests.
Aug 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/PHPExif/Adapter/Exiftool.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public function getExifFromFile($file)
{
$result = $this->getCliOutput(
sprintf(
'%1$s%3$s -j -c %4$s %2$s',
'%1$s%3$s -j -a -G0 -c %4$s %2$s',
$this->getToolPath(),
escapeshellarg($file),
$this->numeric ? ' -n' : '',
Expand Down
66 changes: 34 additions & 32 deletions lib/PHPExif/Mapper/Exiftool.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,34 +24,34 @@
*/
class Exiftool implements MapperInterface
{
const APERTURE = 'Aperture';
const APPROXIMATEFOCUSDISTANCE = 'ApproximateFocusDistance';
const ARTIST = 'Artist';
const CAPTION = 'Caption';
const CAPTIONABSTRACT = 'Caption-Abstract';
const COLORSPACE = 'ColorSpace';
const COPYRIGHT = 'Copyright';
const CREATEDATE = 'CreateDate';
const CREDIT = 'Credit';
const EXPOSURETIME = 'ExposureTime';
const FILESIZE = 'FileSize';
const FOCALLENGTH = 'FocalLength';
const HEADLINE = 'Headline';
const IMAGEHEIGHT = 'ImageHeight';
const IMAGEWIDTH = 'ImageWidth';
const ISO = 'ISO';
const JOBTITLE = 'JobTitle';
const KEYWORDS = 'Keywords';
const MIMETYPE = 'MIMEType';
const MODEL = 'Model';
const ORIENTATION = 'Orientation';
const SOFTWARE = 'Software';
const SOURCE = 'Source';
const TITLE = 'Title';
const XRESOLUTION = 'XResolution';
const YRESOLUTION = 'YResolution';
const GPSLATITUDE = 'GPSLatitude';
const GPSLONGITUDE = 'GPSLongitude';
const APERTURE = 'Composite:Aperture';
const APPROXIMATEFOCUSDISTANCE = 'XMP:ApproximateFocusDistance';
const ARTIST = 'EXIF:Artist';
const CAPTION = 'XMP:Caption';
const CAPTIONABSTRACT = 'IPTC:Caption-Abstract';
const COLORSPACE = 'EXIF:ColorSpace';
const COPYRIGHT = 'EXIF:Copyright';
const CREATEDATE = 'EXIF:CreateDate';
const CREDIT = 'IPTC:Credit';
const EXPOSURETIME = 'EXIF:ExposureTime';
const FILESIZE = 'File:FileSize';
const FOCALLENGTH = 'EXIF:FocalLength';
const HEADLINE = 'IPTC:Headline';
const IMAGEHEIGHT = 'File:ImageHeight';
const IMAGEWIDTH = 'File:ImageWidth';
const ISO = 'EXIF:ISO';
const JOBTITLE = 'IPTC:By-lineTitle';
const KEYWORDS = 'IPTC:Keywords';
const MIMETYPE = 'File:MIMEType';
const MODEL = 'EXIF:Model';
const ORIENTATION = 'EXIF:Orientation';
const SOFTWARE = 'EXIF:Software';
const SOURCE = 'IPTC:Source';
const TITLE = 'IPTC:ObjectName';
const XRESOLUTION = 'EXIF:XResolution';
const YRESOLUTION = 'EXIF:YResolution';
const GPSLATITUDE = 'EXIF:GPSLatitude';
const GPSLONGITUDE = 'EXIF:GPSLongitude';

/**
* Maps the ExifTool fields to the fields of
Expand Down Expand Up @@ -153,8 +153,10 @@ public function mapRawData(array $data)
}
break;
case self::FOCALLENGTH:
$focalLengthParts = explode(' ', $value);
$value = (int) reset($focalLengthParts);
if (!$this->numeric || strpos($value, ' ') !== false) {
$focalLengthParts = explode(' ', $value);
$value = reset($focalLengthParts);
}
break;
case self::GPSLATITUDE:
$gpsData['lat'] = $this->extractGPSCoordinates($value);
Expand All @@ -170,8 +172,8 @@ public function mapRawData(array $data)

// add GPS coordinates, if available
if (count($gpsData) === 2 && $gpsData['lat'] !== false && $gpsData['lon'] !== false) {
$latitudeRef = empty($data['GPSLatitudeRef'][0]) ? 'N' : $data['GPSLatitudeRef'][0];
$longitudeRef = empty($data['GPSLongitudeRef'][0]) ? 'E' : $data['GPSLongitudeRef'][0];
$latitudeRef = empty($data['EXIF:GPSLatitudeRef'][0]) ? 'N' : $data['EXIF:GPSLatitudeRef'][0];
$longitudeRef = empty($data['EXIF:GPSLongitudeRef'][0]) ? 'E' : $data['EXIF:GPSLongitudeRef'][0];

$gpsLocation = sprintf(
'%s,%s',
Expand Down
28 changes: 14 additions & 14 deletions tests/PHPExif/Mapper/ExiftoolMapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,10 @@ public function testMapRawDataCorrectlyFormatsGPSData()
$this->mapper->setNumeric(false);
$result = $this->mapper->mapRawData(
array(
'GPSLatitude' => '40 deg 20\' 0.42857" N',
'GPSLatitudeRef' => 'North',
'GPSLongitude' => '20 deg 10\' 2.33333" W',
'GPSLongitudeRef' => 'West',
'EXIF:GPSLatitude' => '40 deg 20\' 0.42857" N',
'EXIF:GPSLatitudeRef' => 'North',
'EXIF:GPSLongitude' => '20 deg 10\' 2.33333" W',
'EXIF:GPSLongitudeRef' => 'West',
)
);

Expand All @@ -197,10 +197,10 @@ public function testMapRawDataCorrectlyFormatsNumericGPSData()
{
$result = $this->mapper->mapRawData(
array(
'GPSLatitude' => '40.333452381',
'GPSLatitudeRef' => 'North',
'GPSLongitude' => '20.167314814',
'GPSLongitudeRef' => 'West',
'EXIF:GPSLatitude' => '40.333452381',
'EXIF:GPSLatitudeRef' => 'North',
'EXIF:GPSLongitude' => '20.167314814',
'EXIF:GPSLongitudeRef' => 'West',
)
);

Expand All @@ -218,10 +218,10 @@ public function testMapRawDataCorrectlyIgnoresIncorrectGPSData()
$this->mapper->setNumeric(false);
$result = $this->mapper->mapRawData(
array(
'GPSLatitude' => '40.333452381',
'GPSLatitudeRef' => 'North',
'GPSLongitude' => '20.167314814',
'GPSLongitudeRef' => 'West',
'EXIF:GPSLatitude' => '40.333452381',
'EXIF:GPSLatitudeRef' => 'North',
'EXIF:GPSLongitude' => '20.167314814',
'EXIF:GPSLongitudeRef' => 'West',
)
);

Expand All @@ -236,8 +236,8 @@ public function testMapRawDataCorrectlyIgnoresIncompleteGPSData()
{
$result = $this->mapper->mapRawData(
array(
'GPSLatitude' => '40.333452381',
'GPSLatitudeRef' => 'North',
'EXIF:GPSLatitude' => '40.333452381',
'EXIF:GPSLatitudeRef' => 'North',
)
);

Expand Down