geopic-tag-reader 1.4.1__tar.gz → 1.4.2__tar.gz

{geopic_tag_reader-1.4.1 → geopic_tag_reader-1.4.2}/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.4.2] - 2025-02-10
+
+### Fixed
+
+- Change the relative angle computation for capture duplicates detection. This new computation is more accurate and should detect more duplicates.
+
 ## [1.4.1] - 2025-02-03
 
 ### Added
@@ -261,7 +267,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - EXIF tag reading methods extracted from [Panoramax/GeoVisio API](https://gitlab.com/panoramax/server/api)
 
-[Unreleased]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.4.1...main
+[Unreleased]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.4.2...main
+[1.4.2]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.4.1...1.4.2
 [1.4.1]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.4.0...1.4.1
 [1.4.0]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.3.3...1.4.0
 [1.3.3]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.3.2...1.3.3

{geopic_tag_reader-1.4.1 → geopic_tag_reader-1.4.2}/PKG-INFO

@@ -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 → geopic_tag_reader-1.4.2}/geopic_tag_reader/__init__.py

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

{geopic_tag_reader-1.4.1 → geopic_tag_reader-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-1.4.1 → geopic_tag_reader-1.4.2}/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-1.4.1 → geopic_tag_reader-1.4.2}/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 → geopic_tag_reader-1.4.2}/pyproject.toml

@@ -56,6 +56,7 @@ exclude = ["tests"]
 [tool.pytest.ini_options]
 addopts = [
     "--import-mode=importlib",
+    "--doctest-modules",
 ]
 
 [tool.black]