From 6ab0ad7e8625304ae321ed6fdd3a8a96a5f5236e Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull+git@gmail.com>
Date: Fri, 3 Jul 2020 09:04:23 -0700
Subject: [PATCH] Added GPS location to XMP sidecar, closes #175

---
 osxphotos/_version.py                         |   2 +-
 osxphotos/photoinfo/_photoinfo_export.py      |   1 -
 osxphotos/templates/xmp_sidecar.mako          |  19 +++-
 tests/test_export_catalina_10_15_1.py         | 100 ++++++++++++++++--
 ...xport_keyword_template_catalina_10_15_4.py |   9 +-
 tests/test_export_mojave_10_14_6.py           |  19 ++--
 6 files changed, 125 insertions(+), 25 deletions(-)

diff --git a/osxphotos/_version.py b/osxphotos/_version.py
index d5a09a87..e522448a 100644
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.30.3"
+__version__ = "0.30.4"
diff --git a/osxphotos/photoinfo/_photoinfo_export.py b/osxphotos/photoinfo/_photoinfo_export.py
index b4ee0c0b..6cb42324 100644
--- a/osxphotos/photoinfo/_photoinfo_export.py
+++ b/osxphotos/photoinfo/_photoinfo_export.py
@@ -1103,7 +1103,6 @@ def _exiftool_json_sidecar(
         lat_str, lon_str = dd_to_dms_str(lat, lon)
         exif["EXIF:GPSLatitude"] = lat_str
         exif["EXIF:GPSLongitude"] = lon_str
-        exif["Composite:GPSPosition"] = f"{lat_str}, {lon_str}"
         lat_ref = "North" if lat >= 0 else "South"
         lon_ref = "East" if lon >= 0 else "West"
         exif["EXIF:GPSLatitudeRef"] = lat_ref
diff --git a/osxphotos/templates/xmp_sidecar.mako b/osxphotos/templates/xmp_sidecar.mako
index 3b9badb2..7f081523 100644
--- a/osxphotos/templates/xmp_sidecar.mako
+++ b/osxphotos/templates/xmp_sidecar.mako
@@ -71,6 +71,15 @@
     % endif
 </%def>
 
+<%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>
+    % endif
+</%def>
+
 <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
     <!-- mirrors Photos 5 "Export IPTC as XMP" option -->
     <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
@@ -82,18 +91,22 @@
             ${dc_subject(subjects)}
             ${dc_datecreated(photo.date)}
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about=""  
             xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
             ${iptc_personinimage(persons)}
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
             ${dk_tagslist(keywords)}
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
             ${adobe_createdate(photo.date)}
             ${adobe_modifydate(photo.date)}
         </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+            ${gps_info(*photo.location)}
+        </rdf:Description>
    </rdf:RDF>
 </x:xmpmeta>
\ No newline at end of file
diff --git a/tests/test_export_catalina_10_15_1.py b/tests/test_export_catalina_10_15_1.py
index 25e4477c..826a8969 100644
--- a/tests/test_export_catalina_10_15_1.py
+++ b/tests/test_export_catalina_10_15_1.py
@@ -455,7 +455,6 @@ def test_exiftool_json_sidecar():
     "XMP:Subject": ["London 2018", "St. James\'s Park", "England", "United Kingdom", "UK", "London"], 
     "EXIF:GPSLatitude": "51 deg 30\' 12.86\\" N", 
     "EXIF:GPSLongitude": "0 deg 7\' 54.50\\" W", 
-    "Composite:GPSPosition": "51 deg 30\' 12.86\\" N, 0 deg 7\' 54.50\\" W", 
     "EXIF:GPSLatitudeRef": "North", "EXIF:GPSLongitudeRef": "West", 
     "EXIF:DateTimeOriginal": "2018:10:13 09:18:12",
     "EXIF:OffsetTimeOriginal": "-04:00",
@@ -586,7 +585,7 @@ def test_xmp_sidecar():
         </dc:subject>
         <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
         <Iptc4xmpExt:PersonInImage>
             <rdf:Bag>
@@ -595,7 +594,7 @@ def test_xmp_sidecar():
             </rdf:Bag>
         </Iptc4xmpExt:PersonInImage>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
         <digiKam:TagsList>
             <rdf:Seq>
@@ -603,10 +602,13 @@ def test_xmp_sidecar():
             </rdf:Seq>
         </digiKam:TagsList>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
         <xmp:CreateDate>2018-09-28T15:35:49</xmp:CreateDate>
         <xmp:ModifyDate>2018-09-28T15:35:49</xmp:ModifyDate>
+        </rdf:Description>
+         <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
         </rdf:Description>
         </rdf:RDF>
     </x:xmpmeta>"""
@@ -647,7 +649,7 @@ def test_xmp_sidecar_use_persons_keyword():
         </dc:subject>
         <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
         <Iptc4xmpExt:PersonInImage>
             <rdf:Bag>
@@ -656,7 +658,7 @@ def test_xmp_sidecar_use_persons_keyword():
             </rdf:Bag>
         </Iptc4xmpExt:PersonInImage>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
         <digiKam:TagsList>
             <rdf:Seq>
@@ -666,11 +668,14 @@ def test_xmp_sidecar_use_persons_keyword():
             </rdf:Seq>
         </digiKam:TagsList>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
         <xmp:CreateDate>2018-09-28T15:35:49</xmp:CreateDate>
         <xmp:ModifyDate>2018-09-28T15:35:49</xmp:ModifyDate>
         </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+        </rdf:Description>
         </rdf:RDF>
     </x:xmpmeta>"""
 
@@ -710,7 +715,7 @@ def test_xmp_sidecar_use_albums_keyword():
         </dc:subject>
         <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
         <Iptc4xmpExt:PersonInImage>
             <rdf:Bag>
@@ -719,7 +724,7 @@ def test_xmp_sidecar_use_albums_keyword():
             </rdf:Bag>
         </Iptc4xmpExt:PersonInImage>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
         <digiKam:TagsList>
             <rdf:Seq>
@@ -729,11 +734,14 @@ def test_xmp_sidecar_use_albums_keyword():
             </rdf:Seq>
         </digiKam:TagsList>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
         <xmp:CreateDate>2018-09-28T15:35:49</xmp:CreateDate>
         <xmp:ModifyDate>2018-09-28T15:35:49</xmp:ModifyDate>
         </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+        </rdf:Description>
         </rdf:RDF>
     </x:xmpmeta>"""
 
@@ -746,3 +754,75 @@ def test_xmp_sidecar_use_albums_keyword():
         sorted(xmp_expected_lines), sorted(xmp_got_lines)
     ):
         assert line_expected == line_got
+
+
+def test_xmp_sidecar_gps():
+    """ Test export XMP sidecar with GPS info """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["location"]])
+
+    xmp_expected = """<!-- Created with osxphotos https://github.com/RhetTbull/osxphotos -->
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
+    <!-- mirrors Photos 5 "Export IPTC as XMP" option -->
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+        <rdf:Description rdf:about="" 
+            xmlns:dc="http://purl.org/dc/elements/1.1/" 
+            xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
+        <dc:description></dc:description>
+        <dc:title>St. James's Park</dc:title>
+        <!-- keywords and persons listed in <dc:subject> as Photos does -->
+        <dc:subject>
+            <rdf:Seq>
+                <rdf:li>UK</rdf:li>
+                <rdf:li>England</rdf:li>
+                <rdf:li>London</rdf:li>
+                <rdf:li>United Kingdom</rdf:li>
+                <rdf:li>London 2018</rdf:li>
+                <rdf:li>St. James's Park</rdf:li>
+            </rdf:Seq>
+        </dc:subject>
+        <photoshop:DateCreated>2018-10-13T09:18:12.501000-04:00</photoshop:DateCreated>
+        </rdf:Description>
+        <rdf:Description rdf:about=""  
+            xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
+        </rdf:Description>
+        <rdf:Description rdf:about="" 
+            xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
+        <digiKam:TagsList>
+            <rdf:Seq>
+                <rdf:li>UK</rdf:li>
+                <rdf:li>England</rdf:li>
+                <rdf:li>London</rdf:li>
+                <rdf:li>United Kingdom</rdf:li>
+                <rdf:li>London 2018</rdf:li>
+                <rdf:li>St. James's Park</rdf:li>
+            </rdf:Seq>
+        </digiKam:TagsList>
+        </rdf:Description>
+        <rdf:Description rdf:about="" 
+            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
+        <xmp:CreateDate>2018-10-13T09:18:12</xmp:CreateDate>
+        <xmp:ModifyDate>2018-10-13T09:18:12</xmp:ModifyDate>
+        </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>
+        </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>"""
+
+    xmp_expected_lines = [line.strip() for line in xmp_expected.split("\n")]
+
+    xmp_got = photos[0]._xmp_sidecar()
+    xmp_got_lines = [line.strip() for line in xmp_got.split("\n")]
+
+    for line_expected, line_got in zip(
+        sorted(xmp_expected_lines), sorted(xmp_got_lines)
+    ):
+        assert line_expected == line_got
+
diff --git a/tests/test_export_keyword_template_catalina_10_15_4.py b/tests/test_export_keyword_template_catalina_10_15_4.py
index 9d7633ec..c4737a16 100644
--- a/tests/test_export_keyword_template_catalina_10_15_4.py
+++ b/tests/test_export_keyword_template_catalina_10_15_4.py
@@ -178,7 +178,7 @@ def test_xmp_sidecar_keyword_template():
         </dc:subject>
         <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
         <Iptc4xmpExt:PersonInImage>
             <rdf:Bag>
@@ -187,7 +187,7 @@ def test_xmp_sidecar_keyword_template():
             </rdf:Bag>
         </Iptc4xmpExt:PersonInImage>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
         <digiKam:TagsList>
             <rdf:Seq>
@@ -198,11 +198,14 @@ def test_xmp_sidecar_keyword_template():
             </rdf:Seq>
         </digiKam:TagsList>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about=""
             xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
         <xmp:CreateDate>2018-09-28T15:35:49</xmp:CreateDate>
         <xmp:ModifyDate>2018-09-28T15:35:49</xmp:ModifyDate>
         </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+        </rdf:Description>
     </rdf:RDF>
     </x:xmpmeta>"""
 
diff --git a/tests/test_export_mojave_10_14_6.py b/tests/test_export_mojave_10_14_6.py
index ee9810f3..59b45977 100644
--- a/tests/test_export_mojave_10_14_6.py
+++ b/tests/test_export_mojave_10_14_6.py
@@ -380,7 +380,6 @@ def test_exiftool_json_sidecar():
     "XMP:Subject": ["London 2018", "St. James\'s Park", "England", "United Kingdom", "UK", "London"], 
     "EXIF:GPSLatitude": "51 deg 30\' 12.86\\" N", 
     "EXIF:GPSLongitude": "0 deg 7\' 54.50\\" W", 
-    "Composite:GPSPosition": "51 deg 30\' 12.86\\" N, 0 deg 7\' 54.50\\" W", 
     "EXIF:GPSLatitudeRef": "North", "EXIF:GPSLongitudeRef": "West", 
     "EXIF:DateTimeOriginal": "2018:10:13 09:18:12",
     "EXIF:OffsetTimeOriginal": "-04:00",
@@ -431,7 +430,7 @@ def test_xmp_sidecar():
         </dc:subject>
         <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
         <Iptc4xmpExt:PersonInImage>
             <rdf:Bag>
@@ -440,7 +439,7 @@ def test_xmp_sidecar():
             </rdf:Bag>
         </Iptc4xmpExt:PersonInImage>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
         <digiKam:TagsList>
             <rdf:Seq>
@@ -448,11 +447,14 @@ def test_xmp_sidecar():
             </rdf:Seq>
         </digiKam:TagsList>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
         <xmp:CreateDate>2018-09-28T15:35:49</xmp:CreateDate>
         <xmp:ModifyDate>2018-09-28T15:35:49</xmp:ModifyDate>
         </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+        </rdf:Description>
         </rdf:RDF>
         </x:xmpmeta>"""
 
@@ -490,7 +492,7 @@ def test_xmp_sidecar_keyword_template():
         </dc:subject>
         <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
         <Iptc4xmpExt:PersonInImage>
             <rdf:Bag>
@@ -499,7 +501,7 @@ def test_xmp_sidecar_keyword_template():
             </rdf:Bag>
         </Iptc4xmpExt:PersonInImage>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
         <digiKam:TagsList>
             <rdf:Seq>
@@ -510,11 +512,14 @@ def test_xmp_sidecar_keyword_template():
             </rdf:Seq>
         </digiKam:TagsList>
         </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
             xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
         <xmp:CreateDate>2018-09-28T15:35:49</xmp:CreateDate>
         <xmp:ModifyDate>2018-09-28T15:35:49</xmp:ModifyDate>
         </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+        </rdf:Description>
     </rdf:RDF>
     </x:xmpmeta>"""