From ad144da8a030ee0a7cbf7172b042d30d18b21a68 Mon Sep 17 00:00:00 2001
From: Jonathan Strine <jostrine@cisco.com>
Date: Wed, 25 Nov 2020 18:09:38 -0500
Subject: [PATCH 1/2] Use GPSCoordinate format for geolocation

---
 osxphotos/templates/xmp_sidecar.mako | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osxphotos/templates/xmp_sidecar.mako b/osxphotos/templates/xmp_sidecar.mako
index f34c1b9b..3bc564ee 100644
--- a/osxphotos/templates/xmp_sidecar.mako
+++ b/osxphotos/templates/xmp_sidecar.mako
@@ -81,10 +81,8 @@
 
 <%def name="gps_info(latitude, longitude)">
     % if latitude is not None and longitude is not None:
-        <exif:GPSLongitudeRef>${"E" if longitude >= 0 else "W"}</exif:GPSLongitudeRef>
-        <exif:GPSLongitude>${abs(longitude)}</exif:GPSLongitude>
-        <exif:GPSLatitude>${abs(latitude)}</exif:GPSLatitude>
-        <exif:GPSLatitudeRef>${"N" if latitude >= 0 else "S"}</exif:GPSLatitudeRef>
+        <exif:GPSLongitude>${int(abs(longitude))},${(abs(longitude) % 1) * 60}${"E" if longitude >= 0 else "W"}</exif:GPSLongitude>
+        <exif:GPSLatitude>${int(abs(latitude))},${(abs(latitude) % 1) * 60}${"N" if latitude >= 0 else "S"}</exif:GPSLatitude>
     % endif
 </%def>
 

From c27cfb1223fa82b9e5549b93c283e9444693270a Mon Sep 17 00:00:00 2001
From: Jonathan Strine <jostrine@cisco.com>
Date: Wed, 25 Nov 2020 19:24:56 -0500
Subject: [PATCH 2/2] Fix test for XMP sidecar with GPS info

---
 tests/test_export_catalina_10_15_7.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/test_export_catalina_10_15_7.py b/tests/test_export_catalina_10_15_7.py
index 2d9c2e7a..87d13f35 100644
--- a/tests/test_export_catalina_10_15_7.py
+++ b/tests/test_export_catalina_10_15_7.py
@@ -1066,10 +1066,8 @@ def test_xmp_sidecar_gps():
         </rdf:Description>
         <rdf:Description rdf:about=""
             xmlns:exif='http://ns.adobe.com/exif/1.0/'>
-        <exif:GPSLongitudeRef>W</exif:GPSLongitudeRef>
-        <exif:GPSLongitude>0.1318055</exif:GPSLongitude>
-        <exif:GPSLatitude>51.50357167</exif:GPSLatitude>
-        <exif:GPSLatitudeRef>N</exif:GPSLatitudeRef>
+        <exif:GPSLongitude>0,7.908329999999999W</exif:GPSLongitude>
+        <exif:GPSLatitude>51,30.21430019999997N</exif:GPSLatitude>
         </rdf:Description>
    </rdf:RDF>
 </x:xmpmeta>"""