geopic-tag-reader 1.4.1__py3-none-any.whl → 1.4.2__py3-none-any.whl

geopic_tag_reader/__init__.py

@@ -2,4 +2,4 @@
 GeoPicTagReader
 """
 
-__version__ = "1.4.1"
+__version__ = "1.4.2"

geopic_tag_reader/sequence.py

@@ -50,6 +50,29 @@ class Picture:
         distance = R * c
         return distance
 
+    def rotation_angle(self, other) -> Optional[float]:
+        return rotation_angle(self.metadata.heading, other.metadata.heading)
+
+
+def rotation_angle(heading1: Optional[int], heading2: Optional[int]) -> Optional[int]:
+    """Computes relative heading between two headings
+
+    >>> rotation_angle(120, 120)
+    0
+    >>> rotation_angle(120, 240)
+    120
+    >>> rotation_angle(15, 335)
+    40
+    >>> rotation_angle(335, 15)
+    40
+    >>> rotation_angle(None, 15)
+
+    """
+    if heading1 is None or heading2 is None:
+        return None
+    diff = (heading1 - heading2) % 360
+    return min(diff, 360 - diff)
+
 
 class SplitReason(str, Enum):
     time = "time"
@@ -212,21 +235,19 @@ def find_duplicates(pictures: List[Picture], params: Optional[MergeParams] = Non
             nonDups.append(currentPic)
             continue
 
+        is_duplicate = False
+
         # Compare distance
         dist = prevPic.distance_to(currentPic)
 
-        if dist <= params.maxDistance:  # type: ignore
+        if params.maxDistance is not None and dist <= params.maxDistance:
             # Compare angle (if available on both images)
-            if params.maxRotationAngle is not None and prevPic.metadata.heading is not None and currentPic.metadata.heading is not None:
-                deltaAngle = abs(currentPic.metadata.heading - prevPic.metadata.heading)
-
-                if deltaAngle <= params.maxRotationAngle:
-                    dups.append(currentPic)
-                else:
-                    lastNonDuplicatedPicId = i
-                    nonDups.append(currentPic)
-            else:
-                dups.append(currentPic)
+            angle = prevPic.rotation_angle(currentPic)
+            if angle is None or params.maxRotationAngle is None or angle <= params.maxRotationAngle:
+                is_duplicate = True
+
+        if is_duplicate:
+            dups.append(currentPic)
         else:
             lastNonDuplicatedPicId = i
             nonDups.append(currentPic)

geopic_tag_reader/translations/en/LC_MESSAGES/geopic_tag_reader.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-03 14:04+0100\n"
-"PO-Revision-Date: 2025-02-03 14:04+0100\n"
+"POT-Creation-Date: 2025-02-10 11:04+0100\n"
+"PO-Revision-Date: 2025-02-10 11:04+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"

geopic_tag_reader/translations/geopic_tag_reader.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-03 14:04+0100\n"
+"POT-Creation-Date: 2025-02-10 11:04+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

{geopic_tag_reader-1.4.1.dist-info → geopic_tag_reader-1.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: geopic-tag-reader
-Version: 1.4.1
+Version: 1.4.2
 Summary: GeoPicTagReader
 Author-email: Adrien PAVIE <panieravide@riseup.net>
 Requires-Python: >=3.8

{geopic_tag_reader-1.4.1.dist-info → geopic_tag_reader-1.4.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-geopic_tag_reader/__init__.py,sha256=c207yJughXGK1Geiv-VN-gE9vE98ljuh3fLvoZXl140,47
+geopic_tag_reader/__init__.py,sha256=N92-AzYKKUkUHQxQeY5xLVd_xDvHF1DYYG0JfR4rz9s,47
 geopic_tag_reader/camera.py,sha256=PBLyM_f9_wfv7kcFRm-7rBrrB99IibjhTPiokwskYGQ,4136
 geopic_tag_reader/cameras.csv,sha256=F_cE45CY4ocEsWb_9WfgGkumJzmspiK4ZL2LURgbigc,120406
 geopic_tag_reader/i18n.py,sha256=LOLBj7eB_hpHTc5XdMP97EoWdD2kgmkP_uvJJDKEVsU,342
@@ -6,15 +6,15 @@ geopic_tag_reader/main.py,sha256=xeEXMq-fFu0CtUiAgAeS9mb872D65OAQup3UeF6w050,403
 geopic_tag_reader/model.py,sha256=rsWVE3T1kpNsKXX8iv6xb_3PCVY6Ea7iU9WOqUgXklU,129
 geopic_tag_reader/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geopic_tag_reader/reader.py,sha256=6BNvBEZOWDjFPi-jCaDuL_yGRB8fXSp31ikml_nUM6k,31842
-geopic_tag_reader/sequence.py,sha256=5jQKnYDVQq4VDa09e8xTW9Gf-CvqsijEtx5OCSnvGMU,11180
+geopic_tag_reader/sequence.py,sha256=ybHLIZyRWEw0I-sO6DDeXq8p9o1diuvRYyxmZwRVQoo,11595
 geopic_tag_reader/writer.py,sha256=HdZenoY_5Qv1Kq0jedCJhVFDYsv0iQaCzB6necU_LrY,8793
-geopic_tag_reader/translations/geopic_tag_reader.pot,sha256=vATNccMqU2jZ9gkrdK4Y-IvIgGwQUa2TcCbld-Zi8IM,4622
+geopic_tag_reader/translations/geopic_tag_reader.pot,sha256=cnKqknkWlVx3apGCtchh3NbKjbYdowC5577L2clDAHk,4622
 geopic_tag_reader/translations/da/LC_MESSAGES/geopic_tag_reader.mo,sha256=AdDcKqSs1t1RaN7toVGQvFVsTvgqx5FAhTnT0-MsdTA,4855
 geopic_tag_reader/translations/da/LC_MESSAGES/geopic_tag_reader.po,sha256=5rxRuYVVqVhfNwYa8X2hPX6BO5Qsgl78OLLWUU5bdRw,6635
 geopic_tag_reader/translations/de/LC_MESSAGES/geopic_tag_reader.mo,sha256=ZR8Oei98aHfeFtFvPQ_R5LkiybdO8VZ1zKf07y8hCRk,5104
 geopic_tag_reader/translations/de/LC_MESSAGES/geopic_tag_reader.po,sha256=xd37XFYDMHCwhvBFYhVSfNAc22tuym9rW9IJ2yTEjFk,6918
-geopic_tag_reader/translations/en/LC_MESSAGES/geopic_tag_reader.mo,sha256=0pDCjKAenaVQ2fVZXDq2C4BvMmkof60smKkdcvechow,4504
-geopic_tag_reader/translations/en/LC_MESSAGES/geopic_tag_reader.po,sha256=yKCQTKTyxNWYwraR72EI0pxV959qUtPKfcxxzJ_X1Vs,6289
+geopic_tag_reader/translations/en/LC_MESSAGES/geopic_tag_reader.mo,sha256=om08-vzA74kcVq6sHqZq7n9r2ENdj7_g_yOzp6N0wqA,4504
+geopic_tag_reader/translations/en/LC_MESSAGES/geopic_tag_reader.po,sha256=uzkEXaovdrV9VWevwr4n6wEf-ZhJqLxmdUikhfo3Cng,6289
 geopic_tag_reader/translations/eo/LC_MESSAGES/geopic_tag_reader.mo,sha256=07EPHLmZWEcaQJ77yQs4kw929D6q74HHIhJcxHBMX-o,4860
 geopic_tag_reader/translations/eo/LC_MESSAGES/geopic_tag_reader.po,sha256=qWFtKuS0qHQOzBegXQycuHxH-ghAou3-eiL_UZ85bXo,6634
 geopic_tag_reader/translations/es/LC_MESSAGES/geopic_tag_reader.mo,sha256=MXMSCqwwP6HEs8R2NuLPA3YBENij2dK8jSsTExPeOrI,3883
@@ -37,8 +37,8 @@ geopic_tag_reader/translations/pl/LC_MESSAGES/geopic_tag_reader.mo,sha256=M3yThM
 geopic_tag_reader/translations/pl/LC_MESSAGES/geopic_tag_reader.po,sha256=v_bCCSYZ4mQZsVcItz8fO12m9X9f_PxdoMj4hwIcgpY,6384
 geopic_tag_reader/translations/zh_Hant/LC_MESSAGES/geopic_tag_reader.mo,sha256=6bKHZnihlDOQQ5IQMKIgWViL5BorECqJ2ERFkE4LC6s,326
 geopic_tag_reader/translations/zh_Hant/LC_MESSAGES/geopic_tag_reader.po,sha256=QIiHRmrEHny4njQPBsj07fqtK2QFTgrAFc-E3s7ddJU,4600
-geopic_tag_reader-1.4.1.dist-info/entry_points.txt,sha256=c9YwjCNhxveDf-61_aSRlzcpoutvM6KQCerlzaVt_JU,64
-geopic_tag_reader-1.4.1.dist-info/LICENSE,sha256=OCZiFd7ok-n5jly2LwP7hEjuUukkvSt5iMkK_cY_00o,1076
-geopic_tag_reader-1.4.1.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-geopic_tag_reader-1.4.1.dist-info/METADATA,sha256=RYQn5vhNvc_vlZyomQvpfttYvmwSGiEABTyk5b0YPCw,4617
-geopic_tag_reader-1.4.1.dist-info/RECORD,,
+geopic_tag_reader-1.4.2.dist-info/entry_points.txt,sha256=c9YwjCNhxveDf-61_aSRlzcpoutvM6KQCerlzaVt_JU,64
+geopic_tag_reader-1.4.2.dist-info/LICENSE,sha256=OCZiFd7ok-n5jly2LwP7hEjuUukkvSt5iMkK_cY_00o,1076
+geopic_tag_reader-1.4.2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+geopic_tag_reader-1.4.2.dist-info/METADATA,sha256=Rjq9t0DklfK2vIMg-87oOO7N7tPWgRXNSpVRe7R6SiE,4617
+geopic_tag_reader-1.4.2.dist-info/RECORD,,