geopic-tag-reader 1.7.0__tar.gz → 1.8.1__tar.gz

{geopic_tag_reader-1.7.0 → geopic_tag_reader-1.8.1}/CHANGELOG.md

@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.8.1] - 2026-01-24
+
+### Added
+
+- Default GPS precision for DJI devices is estimated to 4 meters.
+
+### Fixed
+
+- Pictures with partial crop metadata which corresponds to a full 360° picture (crop width = full width & crop height = full height) are now accepted.
+- Bad assertion, making `0` an invalid value for `MergeParams.maxDistance` parameter.
+
+## [1.8.0] - 2025-05-25
+
+### Changed
+
+- Improved duplicates detection, now the whole sequence is deduplicated, not only the consecutive pictures
+- **Breaking Change** Now the `duplicate_pictures` in the report is a list of `Duplicate` (instead of `Picture`), so we can get more information about the duplicate.
+
 ## [1.7.0] - 2025-05-25
 
 ### Changed
@@ -291,7 +309,9 @@ 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.7.0...main
+[Unreleased]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.8.1...main
+[1.8.1]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.8.0...1.8.1
+[1.8.0]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.7.0...1.8.0
 [1.7.0]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.6.0...1.7.0
 [1.6.0]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.5.0...1.6.0
 [1.5.0]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.4.2...1.5.0

{geopic_tag_reader-1.7.0 → geopic_tag_reader-1.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geopic-tag-reader
-Version: 1.7.0
+Version: 1.8.1
 Summary: GeoPicTagReader
 Author-email: Adrien PAVIE <panieravide@riseup.net>
 Requires-Python: >=3.9
@@ -14,6 +14,7 @@ Requires-Dist: timezonefinder == 6.5.9
 Requires-Dist: pytz ~= 2025.2
 Requires-Dist: types-pytz ~= 2025.2.0
 Requires-Dist: types-python-dateutil ~= 2.9.0
+Requires-Dist: rtree ~= 1.4.0
 Requires-Dist: flit ~= 3.8.0 ; extra == "build"
 Requires-Dist: black ~= 25.1.0 ; extra == "dev"
 Requires-Dist: mypy ~= 1.15.0 ; extra == "dev"

{geopic_tag_reader-1.7.0 → geopic_tag_reader-1.8.1}/geopic_tag_reader/__init__.py

@@ -2,4 +2,4 @@
 GeoPicTagReader
 """
 
-__version__ = "1.7.0"
+__version__ = "1.8.1"

{geopic_tag_reader-1.7.0 → geopic_tag_reader-1.8.1}/geopic_tag_reader/camera.py

@@ -20,6 +20,7 @@ GPS_ACCURACY_MAKE = {
     "tectectec": 4,
     "arashi vision": 4,
     "qoocam": 4,
+    "dji": 4,
     # Smartphone GPS
     "samsung": 5,
     "xiaomi": 5,

{geopic_tag_reader-1.7.0 → geopic_tag_reader-1.8.1}/geopic_tag_reader/cameras.csv

@@ -1094,7 +1094,14 @@
 "Fujifilm";"X-M1";"23.6";;
 "Fujifilm";"X-Pro1";"23.6";;
 "Fujifilm";"X-S1";"8.8";;
+"Fujifilm";"X-S10";"23.5";;
+"Fujifilm";"X-S20";"23.5";;
 "Fujifilm";"X-T1";"23.6";;
+"Fujifilm";"X-T2";"23.5";;
+"Fujifilm";"X-T3";"23.5";;
+"Fujifilm";"X-T30";"23.5";;
+"Fujifilm";"X-T4";"23.5";;
+"Fujifilm";"X-T5";"23.5";;
 "Fujifilm";"X10";"8.8";;
 "Fujifilm";"X100S";"23.6";;
 "Fujifilm";"X100T";"23.6";;
@@ -2298,6 +2305,7 @@
 "oneplu";"A000";"4.8";;
 "OnePlus";"A3003";"6.4";;
 "OnePlus";"A5000";"5.22";;
+"OnePlus";"EB2103";"6.51";;
 "Panasonic";"Lumix DMC-LZ20";"6.08";;
 "Panasonic";"D-snap SV-AS10";"4.5";;
 "Panasonic";"D-snap SV-AS3";"4.5";;

{geopic_tag_reader-1.7.0 → geopic_tag_reader-1.8.1}/geopic_tag_reader/reader.py

@@ -385,6 +385,17 @@ def getPictureMetadata(data: dict, width: int, height: int, lang_code: str = "en
         if fw > w or fh > h:
             crop = CropValues(fw, fh, w, h, l, t)
 
+    # Skip images where crop width/height equals full width/length
+    elif (
+        isExifTagUsable(data, "Xmp.GPano.CroppedAreaImageWidthPixels", int)
+        and isExifTagUsable(data, "Xmp.GPano.CroppedAreaImageHeightPixels", int)
+        and isExifTagUsable(data, "Xmp.GPano.FullPanoWidthPixels", int)
+        and isExifTagUsable(data, "Xmp.GPano.FullPanoHeightPixels", int)
+        and int(data["Xmp.GPano.FullPanoHeightPixels"]) == int(data["Xmp.GPano.CroppedAreaImageHeightPixels"])
+        and int(data["Xmp.GPano.FullPanoWidthPixels"]) == int(data["Xmp.GPano.CroppedAreaImageWidthPixels"])
+    ):
+        pass
+
     elif (
         isExifTagUsable(data, "Xmp.GPano.CroppedAreaImageWidthPixels", int)
         or isExifTagUsable(data, "Xmp.GPano.CroppedAreaImageHeightPixels", int)

{geopic_tag_reader-1.7.0 → geopic_tag_reader-1.8.1}/geopic_tag_reader/sequence.py

@@ -1,9 +1,10 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from enum import Enum
 from typing import Optional, List, Tuple
 from pathlib import PurePath
 from geopic_tag_reader.reader import GeoPicTags
 import datetime
+from rtree import index
 import math
 
 
@@ -37,6 +38,7 @@ class SplitParams:
 class Picture:
     filename: str
     metadata: GeoPicTags
+    heading_computed: bool = False
 
     def distance_to(self, other) -> float:
         """Computes distance in meters based on Haversine formula"""
@@ -50,7 +52,7 @@ class Picture:
         distance = R * c
         return distance
 
-    def rotation_angle(self, other) -> Optional[float]:
+    def rotation_angle(self, other) -> Optional[int]:
         return rotation_angle(self.metadata.heading, other.metadata.heading)
 
 
@@ -116,11 +118,19 @@ class Sequence:
         return (otherSeq.from_ts() - self.to_ts(), otherSeq.pictures[0].distance_to(self.pictures[-1]))  # type: ignore
 
 
+@dataclass
+class Duplicate:
+    picture: Picture
+    duplicate_of: Picture
+    distance: float
+    angle: Optional[int]
+
+
 @dataclass
 class DispatchReport:
     sequences: List[Sequence]
-    duplicate_pictures: Optional[List[Picture]] = None
-    sequences_splits: Optional[List[Split]] = None
+    duplicate_pictures: List[Duplicate] = field(default_factory=list)
+    sequences_splits: List[Split] = field(default_factory=list)
 
 
 def sort_pictures(pictures: List[Picture], method: Optional[SortMethod] = SortMethod.time_asc) -> List[Picture]:
@@ -202,7 +212,38 @@ def sort_pictures(pictures: List[Picture], method: Optional[SortMethod] = SortMe
     return pictures
 
 
-def find_duplicates(pictures: List[Picture], params: Optional[MergeParams] = None) -> Tuple[List[Picture], List[Picture]]:
+def are_duplicates(a: Picture, b: Picture, params: MergeParams) -> Optional[Tuple[float, Optional[int]]]:
+    """
+    Check if 2 pictures are too similar and should be considered duplicates
+
+    They are duplicates if they are close to each other, and for non 360 pictures, if they are roughly in the same direction.
+
+    Note that we only consider the direction (also called heading) if it is provided by the camera (and not computed with the sequences geometries)
+    since GPS can drift a bit resulting in erratic direction when waiting at a traffic light cf https://gitlab.com/panoramax/server/api/-/issues/231#note_2329723526
+
+    Return None if not duplicates, or the distance/angle if they are
+    """
+    dist = a.distance_to(b)
+
+    if params.maxDistance is None or dist > params.maxDistance:
+        return None
+
+    # Compare angle (if available on both images)
+    angle = a.rotation_angle(b)
+    # if one of the heading has been computed, we cannot rely on this angle being correct, so we don't consider it for the deduplication
+    # it's especially important when stopped and the GPS drift a bit, cf https://gitlab.com/panoramax/server/api/-/issues/231#note_2329723526
+    angle_computed = b.heading_computed or a.heading_computed
+    if angle is None or angle_computed or params.maxRotationAngle is None:
+        return (dist, None)
+    if angle <= params.maxRotationAngle:
+        return (dist, angle)
+    return None
+
+
+APPROX_DEGREE_TO_METER = 0.00001  # this is roughly 1m
+
+
+def find_duplicates(pictures: List[Picture], params: Optional[MergeParams] = None) -> Tuple[List[Picture], List[Duplicate]]:
     """
     Finds too similar pictures.
     Note that input list should be properly sorted.
@@ -217,42 +258,51 @@ def find_duplicates(pictures: List[Picture], params: Optional[MergeParams] = Non
     (Non-duplicates pictures, Duplicates pictures)
     """
 
-    if params is None or not params.is_merge_needed():
+    if params is None or not params.is_merge_needed() or not pictures:
         return (pictures, [])
+    assert params.maxDistance is not None
 
     nonDups: List[Picture] = []
-    dups: List[Picture] = []
-    lastNonDuplicatedPicId = 0
+    duplicates = []
+    duplicates_idx = set()
 
-    for i, currentPic in enumerate(pictures):
-        if i == 0:
-            nonDups.append(currentPic)
-            continue
+    rtree_index = index.Index(((i, (p.metadata.lon, p.metadata.lat, p.metadata.lon, p.metadata.lat), None) for i, p in enumerate(pictures)))
 
-        prevPic = pictures[lastNonDuplicatedPicId]
+    # the rtree will give us all the neighbors in an approximated bounding box,
+    # and will check, for all those pictures if some pictures are really closed, using a real haversine distance
+    # we do a rough conversion between the maxDistance (in m) to degree, since it's only for the initial bounding box
+    # and we use a bbox bigger than necessary (could be half by direction) to not miss duplicates due to the degree to meter approximation
 
-        if prevPic.metadata is None or currentPic.metadata is None:
-            nonDups.append(currentPic)
+    bounding_box_tolerance_approx = params.maxDistance * APPROX_DEGREE_TO_METER
+    for i, currentPic in enumerate(pictures):
+        if i in duplicates_idx:
+            # the picture has already been flagged as duplicate by one of its neighbor, we can skip it
             continue
 
-        is_duplicate = False
+        bounding_box = (
+            currentPic.metadata.lon - bounding_box_tolerance_approx,
+            currentPic.metadata.lat - bounding_box_tolerance_approx,
+            currentPic.metadata.lon + bounding_box_tolerance_approx,
+            currentPic.metadata.lat + bounding_box_tolerance_approx,
+        )
 
-        # Compare distance
-        dist = prevPic.distance_to(currentPic)
+        near_pics_idx = rtree_index.nearest(bounding_box, num_results=100, objects=False)
 
-        if params.maxDistance is not None and dist <= params.maxDistance:
-            # Compare angle (if available on both images)
-            angle = prevPic.rotation_angle(currentPic)
-            if angle is None or params.maxRotationAngle is None or angle <= params.maxRotationAngle:
-                is_duplicate = True
+        for neighbor_idx in near_pics_idx:
+            if neighbor_idx == i:
+                continue
+            if neighbor_idx in duplicates_idx:
+                continue
+            neighbor = pictures[neighbor_idx]
+            duplicate_details = are_duplicates(currentPic, neighbor, params)
+            if duplicate_details:
+                distance, angle = duplicate_details
+                duplicates_idx.add(neighbor_idx)
+                duplicates.append(Duplicate(picture=neighbor, duplicate_of=currentPic, distance=round(distance, 2), angle=angle))
 
-        if is_duplicate:
-            dups.append(currentPic)
-        else:
-            lastNonDuplicatedPicId = i
-            nonDups.append(currentPic)
+        nonDups.append(currentPic)
 
-    return (nonDups, dups)
+    return (nonDups, duplicates)
 
 
 def split_in_sequences(pictures: List[Picture], splitParams: Optional[SplitParams] = SplitParams()) -> Tuple[List[Sequence], List[Split]]:
@@ -354,10 +404,14 @@ def dispatch_pictures(
     # Sort
     myPics = sort_pictures(pictures, sortMethod)
 
-    # De-duplicate
-    (myPics, dupsPics) = find_duplicates(myPics, mergeParams)
-
     # Split in sequences
     (mySeqs, splits) = split_in_sequences(myPics, splitParams)
 
-    return DispatchReport(mySeqs, dupsPics if len(dupsPics) > 0 else None, splits if len(splits) > 0 else None)
+    # De-duplicate inside each sequences
+    dups_pics = []
+    for s in mySeqs:
+        (myPics, dups) = find_duplicates(s.pictures, mergeParams)
+        s.pictures = myPics
+        dups_pics.extend(dups)
+
+    return DispatchReport(sequences=mySeqs, duplicate_pictures=dups_pics, sequences_splits=splits)

geopic_tag_reader-1.8.1/geopic_tag_reader/translations/be/LC_MESSAGES/geopic_tag_reader.po

@@ -0,0 +1,216 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-08-25 15:35+0200\n"
+"PO-Revision-Date: 2025-11-04 18:45+0000\n"
+"Last-Translator: Jordjio Minchane <bigopenmac@gmail.com>\n"
+"Language-Team: Belarusian <http://weblate.panoramax.xyz/projects/panoramax/"
+"tag-reader/be/>\n"
+"Language: be\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 5.4.3\n"
+
+#: geopic_tag_reader/main.py:26
+msgid "Latitude:"
+msgstr "Шырата:"
+
+#: geopic_tag_reader/main.py:27
+msgid "Longitude:"
+msgstr "Даўгата:"
+
+#: geopic_tag_reader/main.py:28
+msgid "GPS accuracy:"
+msgstr "Дакладнасць GPS:"
+
+#: geopic_tag_reader/main.py:28 geopic_tag_reader/main.py:31
+#: geopic_tag_reader/main.py:32
+msgid "not set"
+msgstr "не зададзена"
+
+#: geopic_tag_reader/main.py:29
+msgid "Timestamp:"
+msgstr "Метка часу:"
+
+#: geopic_tag_reader/main.py:31
+msgid "(GPS)"
+msgstr "(GPS)"
+
+#: geopic_tag_reader/main.py:32
+msgid "(Camera)"
+msgstr "(Фотакамера)"
+
+#: geopic_tag_reader/main.py:33
+msgid "Heading:"
+msgstr "Напрамак:"
+
+#: geopic_tag_reader/main.py:34
+msgid "Type:"
+msgstr "Тып:"
+
+#: geopic_tag_reader/main.py:35
+msgid "Make:"
+msgstr "Вытворца:"
+
+#: geopic_tag_reader/main.py:36
+msgid "Model:"
+msgstr "Мадэль:"
+
+#: geopic_tag_reader/main.py:37
+msgid "Focal length:"
+msgstr "Факусная адлегласць:"
+
+#: geopic_tag_reader/main.py:38
+msgid "Field of view:"
+msgstr "Поле зроку:"
+
+#: geopic_tag_reader/main.py:39
+msgid "Sensor width:"
+msgstr "Шырыня сэнсара:"
+
+#: geopic_tag_reader/main.py:40
+msgid "Crop parameters:"
+msgstr "Параметры абрэзкі:"
+
+#: geopic_tag_reader/main.py:41
+msgid "Pitch:"
+msgstr "Нахіл:"
+
+#: geopic_tag_reader/main.py:42
+msgid "Roll:"
+msgstr "Крэн:"
+
+#: geopic_tag_reader/main.py:43
+msgid "Yaw:"
+msgstr "Адхіленне:"
+
+#: geopic_tag_reader/main.py:46
+msgid "Warnings raised by reader:"
+msgstr "Папярэджанні чытальніка:"
+
+#: geopic_tag_reader/reader.py:246
+msgid "Read latitude is out of WGS84 bounds (should be in [-90, 90])"
+msgstr "Шырата па-за межамі WGS84 (павінна быць у дыяпазоне [-90, 90])"
+
+#: geopic_tag_reader/reader.py:248
+msgid "Read longitude is out of WGS84 bounds (should be in [-180, 180])"
+msgstr "Даўгата па-за межамі WGS84 (павінна быць у дыяпазоне [-180, 180])"
+
+#: geopic_tag_reader/reader.py:276
+#, python-brace-format
+msgid "Skipping Mapillary date/time as it was not recognized: {v}"
+msgstr "Прапускаем дату/час Mapillary, бо яны не распазнаны: {v}"
+
+#: geopic_tag_reader/reader.py:306
+msgid "No heading value was found, this reduces usability of picture"
+msgstr "Значэнне напрамку не знойдзена, гэта пагаршае выкарыстальнасць выявы"
+
+#: geopic_tag_reader/reader.py:349
+msgid ""
+"No make and model value found, no assumption on focal length or GPS "
+"precision can be made"
+msgstr ""
+"Не знойдзены вытворца і мадэль, немагчыма зрабіць здагадкі пра факусную "
+"адлегласць або дакладнасць GPS"
+
+#: geopic_tag_reader/reader.py:418
+msgid ""
+"No focal length value was found, this prevents calculating field of view"
+msgstr ""
+"Значэнне факуснай адлегласці не знойдзена, гэта перашкаджае разліку поля "
+"зроку"
+
+#: geopic_tag_reader/reader.py:470
+msgid "No GPS accuracy value found, this prevents computing a quality score"
+msgstr ""
+"Значэнне дакладнасці GPS не знойдзена, гэта перашкаджае разліку адзнакі "
+"якасці"
+
+#: geopic_tag_reader/reader.py:472
+msgid ""
+"No GPS horizontal positioning error value found, GPS accuracy can only be "
+"estimated"
+msgstr ""
+"Значэнне памылкі гарызантальнага пазіцыянавання GPS не знойдзена, "
+"дакладнасць GPS можна толькі ацаніць"
+
+#: geopic_tag_reader/reader.py:479
+msgid "No GPS coordinates or broken coordinates in picture EXIF tags"
+msgstr "Адсутнічаюць GPS-каардынаты або яны пашкоджаныя ў EXIF тэгах выявы"
+
+#: geopic_tag_reader/reader.py:485
+msgid "No valid date in picture EXIF tags"
+msgstr "У EXIF тэгах выявы адсутнічае сапраўдная дата"
+
+#: geopic_tag_reader/reader.py:490
+msgid "The picture is missing mandatory metadata:"
+msgstr "Выяве не хапае абавязковых метаданых:"
+
+#: geopic_tag_reader/reader.py:604 geopic_tag_reader/reader.py:633
+msgid "GPSLatitudeRef not found, assuming GPSLatitudeRef is North"
+msgstr "GPSLatitudeRef не знойдзены, мяркуем што GPSLatitudeRef - Поўнач"
+
+#: geopic_tag_reader/reader.py:612
+msgid "Broken GPS coordinates in picture EXIF tags"
+msgstr "Пашкоджаныя GPS каардынаты ў EXIF тэгах выявы"
+
+#: geopic_tag_reader/reader.py:615 geopic_tag_reader/reader.py:639
+msgid "GPSLongitudeRef not found, assuming GPSLongitudeRef is East"
+msgstr "GPSLongitudeRef не знойдзены, мяркуем што GPSLongitudeRef - Усход"
+
+#: geopic_tag_reader/reader.py:700
+msgid "Precise timezone information not found, fallback to UTC"
+msgstr "Дакладная інфармацыя пра часавы пояс не знойдзена, пераходзім на UTC"
+
+#: geopic_tag_reader/reader.py:705
+msgid ""
+"Precise timezone information not found (and no GPS coordinates to help), "
+"fallback to UTC"
+msgstr ""
+"Дакладная інфармацыя пра часавы пояс не знойдзена (і няма GPS-каардынат для "
+"дапамогі), пераходзім на UTC"
+
+#: geopic_tag_reader/reader.py:709
+#, python-brace-format
+msgid ""
+"Skipping original date/time (from {datefield}) as it was not recognized: {v}"
+msgstr ""
+"Прапускаем арыгінальную дату/час (з {datefield}), бо яны не распазнаны: {v}"
+
+#: geopic_tag_reader/reader.py:741
+#, python-brace-format
+msgid ""
+"GPSTimeStamp and GPSDateTime don't contain supported time format (in {group} "
+"group)"
+msgstr ""
+"GPSTimeStamp і GPSDateTime не ўтрымліваюць падтрыманы фармат часу (у групе "
+"{group})"
+
+#: geopic_tag_reader/reader.py:772
+#, python-brace-format
+msgid "Skipping GPS date/time ({group} group) as it was not recognized: {v}"
+msgstr "Прапускаем GPS дату/час (група {group}), бо яны не распазнаны: {v}"
+
+#: geopic_tag_reader/reader.py:798
+#, python-brace-format
+msgid ""
+"Microseconds read from decimal seconds value ({microsecondsFromSeconds}) is "
+"not matching value from EXIF field ({microseconds}). Max value will be kept."
+msgstr ""
+"Мікрасекунды, прачытаныя з дзесятковага значэння секунд "
+"({microsecondsFromSeconds}), не супадаюць са значэннем з поля EXIF "
+"({microseconds}). Будзе захавана максімальнае значэнне."
+
+#: geopic_tag_reader/writer.py:132
+#, python-brace-format
+msgid "Unsupported key in additional tags ({k})"
+msgstr "Непадтрыманы ключ у дадатковых тэгах ({k})"