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

geopic_tag_reader/__init__.py

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

geopic_tag_reader/camera.py

@@ -19,6 +19,7 @@ GPS_ACCURACY_MAKE = {
     "blackvue": 4,
     "tectectec": 4,
     "arashi vision": 4,
+    "qoocam": 4,
     # Smartphone GPS
     "samsung": 5,
     "xiaomi": 5,
@@ -118,7 +119,7 @@ def find_camera(make: Optional[str] = None, model: Optional[str] = None) -> Opti
     return next((cameras[matchMake][matchModel] for matchModel in cameras[matchMake].keys() if model.lower().startswith(matchModel)), None)
 
 
-def is_360(make: Optional[str] = None, model: Optional[str] = None, width: Optional[str] = None, height: Optional[str] = None) -> bool:
+def is_360(make: Optional[str] = None, model: Optional[str] = None, width: Optional[int] = None, height: Optional[int] = None) -> bool:
     """
     Checks if given camera is equirectangular (360°) based on its make, model and dimensions (width, height).
 
@@ -128,11 +129,11 @@ def is_360(make: Optional[str] = None, model: Optional[str] = None, width: Optio
     False
     >>> is_360("GoPro", "Max 360")
     True
-    >>> is_360("GoPro", "Max 360", "2048", "1024")
+    >>> is_360("GoPro", "Max 360", 2048, 1024)
     True
-    >>> is_360("GoPro", "Max 360", "1024", "768")
+    >>> is_360("GoPro", "Max 360", 1024, 768)
     False
-    >>> is_360("RICOH", "THETA S", "5376", "2688")
+    >>> is_360("RICOH", "THETA S", 5376, 2688)
     True
     """
 
@@ -142,7 +143,7 @@ def is_360(make: Optional[str] = None, model: Optional[str] = None, width: Optio
         return False
 
     # Check width and height are equirectangular
-    if not ((width is None or height is None) or int(width) == 2 * int(height)):
+    if not ((width is None or height is None) or width == 2 * height):
         return False
 
     return camera.is_360

geopic_tag_reader/cameras.csv

@@ -1167,6 +1167,8 @@
 "Gopro";"HD3";"5.76";;
 "GoPro";"HERO10 Black";"6.17";;
 "GoPro";"HERO11 Black";"6.74";;
+"GoPro";"HERO12 Black";"6.74";;
+"GoPro";"HERO13 Black";"6.74";;
 "GoPro";"HERO4 Black";"6.17";;
 "GoPro";"HERO4 Silver";"6.17";;
 "GoPro";"HERO5 Black";"6.17";;
@@ -1309,8 +1311,8 @@
 "Jenoptik";"JD C 5.0 SL";"7.11";;
 "JVC";"GC-QX3HD";"7.11";;
 "JVC";"GC-QX5HD";"7.11";;
-"Kandao";"Qoocam 3";;"1";
-"Kandao";"Qoocam 3 Ultra";;"1";
+"Kandao";"Qoocam 3";;"1";"4"
+"Kandao";"Qoocam 3 Ultra";;"1";"4"
 "Kodak";"DC200";"7.27";;
 "Kodak";"DC200 plus";"7.27";;
 "Kodak";"DC210 plus";"7.27";;

geopic_tag_reader/reader.py

@@ -179,20 +179,17 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
         GeoPicTags: Extracted metadata from picture
     """
 
-    _ = i18n_init(lang_code)
-    warnings = []
-    img = pyexiv2.ImageData(picture)
     data = {}
-    data.update(img.read_exif())
-    data.update(img.read_iptc())
-    data.update(img.read_xmp())
-    width = img.get_pixel_width()
-    height = img.get_pixel_height()
+    with pyexiv2.ImageData(picture) as img:
+        data.update(img.read_exif())
+        data.update(img.read_iptc())
+        data.update(img.read_xmp())
+        width = img.get_pixel_width()
+        height = img.get_pixel_height()
 
-    imgComment = img.read_comment()
-    if imgComment is not None and len(imgComment.strip()) > 0:
-        data["Exif.Photo.UserComment"] = imgComment
-    img.close()
+        imgComment = img.read_comment()
+        if imgComment is not None and len(imgComment.strip()) > 0:
+            data["Exif.Photo.UserComment"] = imgComment
 
     # Read Mapillary tags
     if "Exif.Image.ImageDescription" in data:
@@ -204,6 +201,27 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
         except:
             pass
 
+    return getPictureMetadata(data, width, height, lang_code)
+
+
+def getPictureMetadata(data: dict, width: int, height: int, lang_code: str = "en") -> GeoPicTags:
+    """Extracts metadata from already read metadata.
+
+    This method is useful when you already have the metadata read by `readPictureMetadata` and you want to extract the metadata from it.
+
+    Args:
+        data (dict): Raw EXIF tags / iptc / xmp / description from picture. MUST be comming from a previsou parse by the `readPictureMetadata` method.
+        width (int): Picture width
+        height (int): Picture height
+        lang_code (str): Language code for translating error labels
+
+    Returns:
+        GeoPicTags: Extracted metadata from picture
+    """
+
+    _ = i18n_init(lang_code)
+    warnings = []
+
     # Sanitize charset information
     for k, v in data.items():
         if isinstance(v, str):

geopic_tag_reader/translations/br/LC_MESSAGES/geopic_tag_reader.po

@@ -0,0 +1,196 @@
+# 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-02-10 11:04+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: br\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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 ""
+
+#: 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 ""
+
+#: 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:228
+msgid "Read latitude is out of WGS84 bounds (should be in [-90, 90])"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:230
+msgid "Read longitude is out of WGS84 bounds (should be in [-180, 180])"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:258
+#, python-brace-format
+msgid "Skipping Mapillary date/time as it was not recognized: {v}"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:288
+msgid "No heading value was found, this reduces usability of picture"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:331
+msgid ""
+"No make and model value found, no assumption on focal length or GPS "
+"precision can be made"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:381
+msgid ""
+"No focal length value was found, this prevents calculating field of view"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:433
+msgid "No GPS accuracy value found, this prevents computing a quality score"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:435
+msgid ""
+"No GPS horizontal positioning error value found, GPS accuracy can only be "
+"estimated"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:442
+msgid "No GPS coordinates or broken coordinates in picture EXIF tags"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:448
+msgid "No valid date in picture EXIF tags"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:453
+msgid "The picture is missing mandatory metadata:"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:567 geopic_tag_reader/reader.py:596
+msgid "GPSLatitudeRef not found, assuming GPSLatitudeRef is North"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:575
+msgid "Broken GPS coordinates in picture EXIF tags"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:578 geopic_tag_reader/reader.py:602
+msgid "GPSLongitudeRef not found, assuming GPSLongitudeRef is East"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:663
+msgid "Precise timezone information not found, fallback to UTC"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:668
+msgid ""
+"Precise timezone information not found (and no GPS coordinates to help), "
+"fallback to UTC"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:672
+#, python-brace-format
+msgid ""
+"Skipping original date/time (from {datefield}) as it was not recognized: {v}"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:704
+#, python-brace-format
+msgid ""
+"GPSTimeStamp and GPSDateTime don't contain supported time format (in {group} "
+"group)"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:735
+#, python-brace-format
+msgid "Skipping GPS date/time ({group} group) as it was not recognized: {v}"
+msgstr ""
+
+#: geopic_tag_reader/reader.py:761
+#, 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 ""
+
+#: geopic_tag_reader/writer.py:132
+#, python-brace-format
+msgid "Unsupported key in additional tags ({k})"
+msgstr ""

geopic_tag_reader/translations/da/LC_MESSAGES/geopic_tag_reader.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-24 15:36+0100\n"
-"PO-Revision-Date: 2025-01-07 15:14+0000\n"
+"PO-Revision-Date: 2025-04-16 08:21+0000\n"
 "Last-Translator: ERYpTION <eryption.ar9q2@slmail.me>\n"
 "Language-Team: Danish <http://weblate.panoramax.xyz/projects/panoramax/"
 "tag-reader/da/>\n"

geopic_tag_reader/translations/de/LC_MESSAGES/geopic_tag_reader.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-07-10 13:05+0200\n"
-"PO-Revision-Date: 2025-01-09 08:14+0000\n"
-"Last-Translator: mcliquid <weblate@mcliquid.de>\n"
+"PO-Revision-Date: 2025-04-15 07:48+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: German <http://weblate.panoramax.xyz/projects/panoramax/"
 "tag-reader/de/>\n"
 "Language: de\n"
@@ -40,6 +40,7 @@ msgid "Type:"
 msgstr "Typ:"
 
 #: geopic_tag_reader/main.py:31
+#, fuzzy
 msgid "Make:"
 msgstr "Hersteller:"
 

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-10 11:04+0100\n"
-"PO-Revision-Date: 2025-02-10 11:04+0100\n"
+"POT-Creation-Date: 2025-05-09 12:12+0200\n"
+"PO-Revision-Date: 2025-05-09 12:12+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -94,24 +94,24 @@ msgstr "Yaw:"
 msgid "Warnings raised by reader:"
 msgstr "Warnings raised by reader:"
 
-#: geopic_tag_reader/reader.py:228
+#: geopic_tag_reader/reader.py:246
 msgid "Read latitude is out of WGS84 bounds (should be in [-90, 90])"
 msgstr "Read latitude is out of WGS84 bounds (should be in [-90, 90])"
 
-#: geopic_tag_reader/reader.py:230
+#: geopic_tag_reader/reader.py:248
 msgid "Read longitude is out of WGS84 bounds (should be in [-180, 180])"
 msgstr "Read longitude is out of WGS84 bounds (should be in [-180, 180])"
 
-#: geopic_tag_reader/reader.py:258
+#: geopic_tag_reader/reader.py:276
 #, python-brace-format
 msgid "Skipping Mapillary date/time as it was not recognized: {v}"
 msgstr "Skipping Mapillary date/time as it was not recognized: {v}"
 
-#: geopic_tag_reader/reader.py:288
+#: geopic_tag_reader/reader.py:306
 msgid "No heading value was found, this reduces usability of picture"
 msgstr "No heading value was found, this reduces usability of picture"
 
-#: geopic_tag_reader/reader.py:331
+#: geopic_tag_reader/reader.py:349
 msgid ""
 "No make and model value found, no assumption on focal length or GPS "
 "precision can be made"
@@ -119,17 +119,17 @@ msgstr ""
 "No make and model value found, no assumption on focal length or GPS "
 "precision can be made"
 
-#: geopic_tag_reader/reader.py:381
+#: geopic_tag_reader/reader.py:399
 msgid ""
 "No focal length value was found, this prevents calculating field of view"
 msgstr ""
 "No focal length value was found, this prevents calculating field of view"
 
-#: geopic_tag_reader/reader.py:433
+#: geopic_tag_reader/reader.py:451
 msgid "No GPS accuracy value found, this prevents computing a quality score"
 msgstr "No GPS accuracy value found, this prevents computing a quality score"
 
-#: geopic_tag_reader/reader.py:435
+#: geopic_tag_reader/reader.py:453
 msgid ""
 "No GPS horizontal positioning error value found, GPS accuracy can only be "
 "estimated"
@@ -137,35 +137,35 @@ msgstr ""
 "No GPS horizontal positioning error value found, GPS accuracy can only be "
 "estimated"
 
-#: geopic_tag_reader/reader.py:442
+#: geopic_tag_reader/reader.py:460
 msgid "No GPS coordinates or broken coordinates in picture EXIF tags"
 msgstr "No GPS coordinates or broken coordinates in picture EXIF tags"
 
-#: geopic_tag_reader/reader.py:448
+#: geopic_tag_reader/reader.py:466
 msgid "No valid date in picture EXIF tags"
 msgstr "No valid date in picture EXIF tags"
 
-#: geopic_tag_reader/reader.py:453
+#: geopic_tag_reader/reader.py:471
 msgid "The picture is missing mandatory metadata:"
 msgstr "The picture is missing mandatory metadata:"
 
-#: geopic_tag_reader/reader.py:567 geopic_tag_reader/reader.py:596
+#: geopic_tag_reader/reader.py:585 geopic_tag_reader/reader.py:614
 msgid "GPSLatitudeRef not found, assuming GPSLatitudeRef is North"
 msgstr "GPSLatitudeRef not found, assuming GPSLatitudeRef is North"
 
-#: geopic_tag_reader/reader.py:575
+#: geopic_tag_reader/reader.py:593
 msgid "Broken GPS coordinates in picture EXIF tags"
 msgstr "Broken GPS coordinates in picture EXIF tags"
 
-#: geopic_tag_reader/reader.py:578 geopic_tag_reader/reader.py:602
+#: geopic_tag_reader/reader.py:596 geopic_tag_reader/reader.py:620
 msgid "GPSLongitudeRef not found, assuming GPSLongitudeRef is East"
 msgstr "GPSLongitudeRef not found, assuming GPSLongitudeRef is East"
 
-#: geopic_tag_reader/reader.py:663
+#: geopic_tag_reader/reader.py:681
 msgid "Precise timezone information not found, fallback to UTC"
 msgstr "Precise timezone information not found, fallback to UTC"
 
-#: geopic_tag_reader/reader.py:668
+#: geopic_tag_reader/reader.py:686
 msgid ""
 "Precise timezone information not found (and no GPS coordinates to help), "
 "fallback to UTC"
@@ -173,14 +173,14 @@ msgstr ""
 "Precise timezone information not found (and no GPS coordinates to help), "
 "fallback to UTC"
 
-#: geopic_tag_reader/reader.py:672
+#: geopic_tag_reader/reader.py:690
 #, python-brace-format
 msgid ""
 "Skipping original date/time (from {datefield}) as it was not recognized: {v}"
 msgstr ""
 "Skipping original date/time (from {datefield}) as it was not recognized: {v}"
 
-#: geopic_tag_reader/reader.py:704
+#: geopic_tag_reader/reader.py:722
 #, python-brace-format
 msgid ""
 "GPSTimeStamp and GPSDateTime don't contain supported time format (in {group} "
@@ -189,12 +189,12 @@ msgstr ""
 "GPSTimeStamp and GPSDateTime don't contain supported time format (in {group} "
 "group)"
 
-#: geopic_tag_reader/reader.py:735
+#: geopic_tag_reader/reader.py:753
 #, python-brace-format
 msgid "Skipping GPS date/time ({group} group) as it was not recognized: {v}"
 msgstr "Skipping GPS date/time ({group} group) as it was not recognized: {v}"
 
-#: geopic_tag_reader/reader.py:761
+#: geopic_tag_reader/reader.py:779
 #, python-brace-format
 msgid ""
 "Microseconds read from decimal seconds value ({microsecondsFromSeconds}) is "

geopic_tag_reader/translations/eo/LC_MESSAGES/geopic_tag_reader.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-11-24 15:36+0100\n"
-"PO-Revision-Date: 2025-01-17 15:11+0000\n"
+"PO-Revision-Date: 2025-04-26 18:21+0000\n"
 "Last-Translator: Rémi Simonnin <remisimonnin@orange.fr>\n"
 "Language-Team: Esperanto <http://weblate.panoramax.xyz/projects/panoramax/"
 "tag-reader/eo/>\n"

geopic_tag_reader/translations/es/LC_MESSAGES/geopic_tag_reader.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-07-10 13:05+0200\n"
-"PO-Revision-Date: 2024-10-02 08:07+0000\n"
-"Last-Translator: DaniCS <daniel.callejas.sevilla@gmail.com>\n"
+"PO-Revision-Date: 2025-02-27 12:33+0000\n"
+"Last-Translator: PanierAvide <adrien@pavie.info>\n"
 "Language-Team: Spanish <http://weblate.panoramax.xyz/projects/panoramax/"
 "tag-reader/es/>\n"
 "Language: es\n"
@@ -40,6 +40,7 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: geopic_tag_reader/main.py:31
+#, fuzzy
 msgid "Make:"
 msgstr "Marca:"
 

geopic_tag_reader/translations/fr/LC_MESSAGES/geopic_tag_reader.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-10-28 11:05+0100\n"
-"PO-Revision-Date: 2025-01-10 14:14+0000\n"
-"Last-Translator: PanierAvide <adrien@pavie.info>\n"
+"PO-Revision-Date: 2025-04-15 07:48+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: French <http://weblate.panoramax.xyz/projects/panoramax/"
 "tag-reader/fr/>\n"
 "Language: fr\n"
@@ -52,6 +52,7 @@ msgid "Type:"
 msgstr "Type :"
 
 #: geopic_tag_reader/main.py:34
+#, fuzzy
 msgid "Make:"
 msgstr "Fabriquant :"