forked/osxphotos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #270 from jstrine/fix_gps_xmp

Browse Source 
Fix EXIF GPS format for XMP sidecar, thanks to @jstrine for the fix!
This commit is contained in:
Rhet Turnbull
2020-11-25 17:51:57 -08:00
committed by GitHub
parent df7d45659a c27cfb1223
commit 0633814ab2
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osxphotos/templates/xmp_sidecar.mako
View File

@@ -81,10 +81,8 @@
<%def name="gps_info(latitude, longitude)"> <%def name="gps_info(latitude, longitude)">
% if latitude is not None and longitude is not None: % if latitude is not None and longitude is not None:
<exif:GPSLongitudeRef>${"E" if longitude >= 0 else "W"}</exif:GPSLongitudeRef> <exif:GPSLongitude>${int(abs(longitude))},${(abs(longitude) % 1) * 60}${"E" if longitude >= 0 else "W"}</exif:GPSLongitude>
<exif:GPSLongitude>${abs(longitude)}</exif:GPSLongitude> <exif:GPSLatitude>${int(abs(latitude))},${(abs(latitude) % 1) * 60}${"N" if latitude >= 0 else "S"}</exif:GPSLatitude>
<exif:GPSLatitude>${abs(latitude)}</exif:GPSLatitude>
<exif:GPSLatitudeRef>${"N" if latitude >= 0 else "S"}</exif:GPSLatitudeRef>
% endif % endif
</%def> </%def>

6
tests/test_export_catalina_10_15_7.py
View File

@@ -1066,10 +1066,8 @@ def test_xmp_sidecar_gps():
</rdf:Description> </rdf:Description>
<rdf:Description rdf:about="" <rdf:Description rdf:about=""
xmlns:exif='http://ns.adobe.com/exif/1.0/'> xmlns:exif='http://ns.adobe.com/exif/1.0/'>
<exif:GPSLongitudeRef>W</exif:GPSLongitudeRef> <exif:GPSLongitude>0,7.908329999999999W</exif:GPSLongitude>
<exif:GPSLongitude>0.1318055</exif:GPSLongitude> <exif:GPSLatitude>51,30.21430019999997N</exif:GPSLatitude>
<exif:GPSLatitude>51.50357167</exif:GPSLatitude>
<exif:GPSLatitudeRef>N</exif:GPSLatitudeRef>
</rdf:Description> </rdf:Description>
</rdf:RDF> </rdf:RDF>
</x:xmpmeta>""" </x:xmpmeta>"""