From 70848e1ff6def928b052271b47c1697c23a8c73f Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Sat, 13 Feb 2021 18:57:50 -0800 Subject: [PATCH] Removed orientation from XMP, #378 --- osxphotos/_version.py | 2 +- osxphotos/templates/xmp_sidecar.mako | 11 ----------- osxphotos/templates/xmp_sidecar_beta.mako | 13 +------------ tests/sidecars/15uNd7%8RguTEgNPKHfTWw.xmp | 4 ---- .../15uNd7%8RguTEgNPKHfTWw_albums_as_keywords.xmp | 4 ---- tests/sidecars/15uNd7%8RguTEgNPKHfTWw_ext.xmp | 4 ---- .../15uNd7%8RguTEgNPKHfTWw_keyword_template.xmp | 4 ---- .../15uNd7%8RguTEgNPKHfTWw_persons_as_keywords.xmp | 4 ---- tests/sidecars/3Jn73XpSQQCluzRBMWRsMA.xmp | 4 ---- .../3Jn73XpSQQCluzRBMWRsMA_albums_as_keywords.xmp | 4 ---- tests/sidecars/3Jn73XpSQQCluzRBMWRsMA_ext.xmp | 4 ---- .../3Jn73XpSQQCluzRBMWRsMA_keyword_template.xmp | 4 ---- .../3Jn73XpSQQCluzRBMWRsMA_persons_as_keywords.xmp | 4 ---- .../6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.xmp | 4 ---- ...B8-4D4C-92BE-9BBBA308AAC4_albums_as_keywords.xmp | 4 ---- .../6191423D-8DB8-4D4C-92BE-9BBBA308AAC4_ext.xmp | 4 ---- ...8DB8-4D4C-92BE-9BBBA308AAC4_keyword_template.xmp | 4 ---- ...8-4D4C-92BE-9BBBA308AAC4_persons_as_keywords.xmp | 4 ---- tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ.xmp | 4 ---- .../6bxcNnzRQKGnK4uPrCJ9UQ_albums_as_keywords.xmp | 4 ---- tests/sidecars/6bxcNnzRQKGnK4uPrCJ9UQ_ext.xmp | 4 ---- .../6bxcNnzRQKGnK4uPrCJ9UQ_keyword_template.xmp | 4 ---- .../6bxcNnzRQKGnK4uPrCJ9UQ_persons_as_keywords.xmp | 4 ---- tests/sidecars/8SOE9s0XQVGsuq4ONohTng.xmp | 4 ---- .../8SOE9s0XQVGsuq4ONohTng_albums_as_keywords.xmp | 4 ---- tests/sidecars/8SOE9s0XQVGsuq4ONohTng_ext.xmp | 4 ---- .../8SOE9s0XQVGsuq4ONohTng_keyword_template.xmp | 4 ---- .../8SOE9s0XQVGsuq4ONohTng_persons_as_keywords.xmp | 4 ---- .../A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C.xmp | 4 ---- ...CD-431F-9AC9-5AFEFE2D3A5C_albums_as_keywords.xmp | 4 ---- .../A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C_ext.xmp | 4 ---- ...2ECD-431F-9AC9-5AFEFE2D3A5C_keyword_template.xmp | 4 ---- ...D-431F-9AC9-5AFEFE2D3A5C_persons_as_keywords.xmp | 4 ---- .../D79B8D77-BFFC-460B-9312-034F2877D35B.xmp | 4 ---- ...FC-460B-9312-034F2877D35B_albums_as_keywords.xmp | 4 ---- .../D79B8D77-BFFC-460B-9312-034F2877D35B_ext.xmp | 4 ---- ...BFFC-460B-9312-034F2877D35B_keyword_template.xmp | 4 ---- ...C-460B-9312-034F2877D35B_persons_as_keywords.xmp | 4 ---- .../DC99FBDD-7A52-4100-A5BB-344131646C30.xmp | 4 ---- ...52-4100-A5BB-344131646C30_albums_as_keywords.xmp | 4 ---- .../DC99FBDD-7A52-4100-A5BB-344131646C30_ext.xmp | 4 ---- ...7A52-4100-A5BB-344131646C30_keyword_template.xmp | 4 ---- ...2-4100-A5BB-344131646C30_persons_as_keywords.xmp | 4 ---- .../E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.xmp | 4 ---- ...D1-40A1-A72B-8B8FAC227D51_albums_as_keywords.xmp | 4 ---- .../E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51_ext.xmp | 4 ---- ...7CD1-40A1-A72B-8B8FAC227D51_keyword_template.xmp | 4 ---- ...1-40A1-A72B-8B8FAC227D51_persons_as_keywords.xmp | 4 ---- .../F12384F6-CD17-4151-ACBA-AE0E3688539E.xmp | 4 ---- ...17-4151-ACBA-AE0E3688539E_albums_as_keywords.xmp | 4 ---- .../F12384F6-CD17-4151-ACBA-AE0E3688539E_ext.xmp | 4 ---- ...CD17-4151-ACBA-AE0E3688539E_keyword_template.xmp | 4 ---- ...7-4151-ACBA-AE0E3688539E_persons_as_keywords.xmp | 4 ---- 53 files changed, 2 insertions(+), 224 deletions(-) diff --git a/osxphotos/_version.py b/osxphotos/_version.py index 272790b3..2cdc6cf7 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.40.15" +__version__ = "0.40.16" diff --git a/osxphotos/templates/xmp_sidecar.mako b/osxphotos/templates/xmp_sidecar.mako index 21853a68..dc96f640 100644 --- a/osxphotos/templates/xmp_sidecar.mako +++ b/osxphotos/templates/xmp_sidecar.mako @@ -99,12 +99,6 @@ % endif -<%def name="orientation(orientation)"> - % if orientation is not None: - ${orientation} - % endif - - <%def name="mwg_face_regions(photo)"> % if photo.face_info: @@ -185,11 +179,6 @@ ${gps_info(*location)} - - ${orientation(photo.orientation)} - - -<%def name="orientation(orientation)"> - % if orientation is not None: - ${orientation} - % endif - - <%def name="mwg_face_regions(photo)"> % if photo.face_info: @@ -182,12 +176,7 @@ - ${gps_info(*photo.location)} - - - - ${orientation(photo.orientation)} + ${gps_info(*location)} - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - 0,7.908329999999999W 51,30.21430019999997N - - 1 - 0,7.908329999999999W 51,30.21430019999997N - - 1 - 0,7.908329999999999W 51,30.21430019999997N - - 1 - 0,7.908329999999999W 51,30.21430019999997N - - 1 - 0,7.908329999999999W 51,30.21430019999997N - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - 95,56.415420000000154W 41,15.393959999999964N - - 1 - 95,56.415420000000154W 41,15.393959999999964N - - 1 - 95,56.415420000000154W 41,15.393959999999964N - - 1 - 95,56.415420000000154W 41,15.393959999999964N - - 1 - 95,56.415420000000154W 41,15.393959999999964N - - 1 - 0,7.908329999999999W 51,30.21430019999997N - - 1 - 0,7.908329999999999W 51,30.21430019999997N - - 1 - 0,7.908329999999999W 51,30.21430019999997N - - 1 - 0,7.908329999999999W 51,30.21430019999997N - - 1 - 0,7.908329999999999W 51,30.21430019999997N - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 - - - 1 -