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

geopic_tag_reader/main.py

@@ -25,6 +25,7 @@ def read(
         _ = i18n_init(lang)
         print(_("Latitude:"), metadata.lat)
         print(_("Longitude:"), metadata.lon)
+        print(_("GPS accuracy:"), str(metadata.gps_accuracy) + "m" if metadata.gps_accuracy is not None else _("not set"))
         print(_("Timestamp:"), metadata.ts)
         if metadata.ts_by_source is not None:
             print("  -", (metadata.ts_by_source.gps or _("not set")), _("(GPS)"))
@@ -34,6 +35,8 @@ def read(
         print(_("Make:"), metadata.make)
         print(_("Model:"), metadata.model)
         print(_("Focal length:"), metadata.focal_length)
+        print(_("Field of view:"), metadata.field_of_view)
+        print(_("Sensor width:"), metadata.sensor_width)
         print(_("Crop parameters:"), metadata.crop)
         print(_("Pitch:"), metadata.pitch)
         print(_("Roll:"), metadata.roll)

geopic_tag_reader/reader.py

@@ -10,6 +10,7 @@ from geopic_tag_reader import camera
 import timezonefinder  # type: ignore
 import pytz
 from geopic_tag_reader.i18n import init as i18n_init
+import math
 
 # This is a fix for invalid MakerNotes leading to picture not read at all
 # https://github.com/LeoHsiao1/pyexiv2/issues/58
@@ -86,6 +87,9 @@ class GeoPicTags:
         roll (float): Picture roll angle, on a right/left axis (in degrees, left-arm down = -90°, flat = 0°, right-arm down = 90°)
         yaw (float): Picture yaw angle, on a vertical axis (in degrees, front = 0°, right = 90°, rear = 180°, left = 270°). This offsets the center image from GPS direction for a correct 360° sphere correction
         ts_by_source (TimeBySource): all read timestamps from image, for finer processing.
+        sensor_width (float): The camera sensor width, that can be used to compute field of view (combined with focal length)
+        field_of_view (int): How large picture is showing of horizon (in degrees)
+        gps_accuracy (float): How precise the GPS position is (in meters)
 
 
     Implementation note: this needs to be sync with the PartialGeoPicTags structure
@@ -107,6 +111,9 @@ class GeoPicTags:
     roll: Optional[float] = None
     yaw: Optional[float] = None
     ts_by_source: Optional[TimeBySource] = None
+    sensor_width: Optional[float] = None
+    field_of_view: Optional[int] = None
+    gps_accuracy: Optional[float] = None
 
 
 class InvalidExifException(Exception):
@@ -143,6 +150,9 @@ class PartialGeoPicTags:
     roll: Optional[float] = None
     yaw: Optional[float] = None
     ts_by_source: Optional[TimeBySource] = None
+    sensor_width: Optional[float] = None
+    field_of_view: Optional[int] = None
+    gps_accuracy: Optional[float] = None
 
 
 class PartialExifException(Exception):
@@ -320,14 +330,7 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
     if make is None and model is None:
         warnings.append(_("No make and model value found, no assumption on focal length or GPS precision can be made"))
 
-    # Focal length
-    focalLength = None
-    if isExifTagUsable(data, "Exif.Image.FocalLength", Fraction):
-        focalLength = float(Fraction(data["Exif.Image.FocalLength"]))
-    elif isExifTagUsable(data, "Exif.Photo.FocalLength", Fraction):
-        focalLength = float(Fraction(data["Exif.Photo.FocalLength"]))
-    if focalLength is None:
-        warnings.append(_("No focal length value was found, this prevents calculating field of view"))
+    cameraMetadata = camera.find_camera(make, model)
 
     # Cropped pano data
     crop = None
@@ -369,6 +372,28 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
     else:
         pic_type = "flat"
 
+    # Focal length
+    focalLength = decodeFloat(data, ["Exif.Image.FocalLength", "Exif.Photo.FocalLength"])
+    focalLength35mm = decodeFloat(data, ["Exif.Image.FocalLengthIn35mmFilm", "Exif.Photo.FocalLengthIn35mmFilm"])
+    scaleFactor35efl = focalLength35mm / focalLength if focalLength and focalLength35mm else None
+
+    if focalLength is None and pic_type != "equirectangular":
+        warnings.append(_("No focal length value was found, this prevents calculating field of view"))
+
+    # Sensor width
+    sensorWidth = None
+    if cameraMetadata is not None:
+        sensorWidth = cameraMetadata.sensor_width
+
+    # Field of view
+    fieldOfView = None
+    if pic_type == "equirectangular":  # 360°
+        fieldOfView = 360
+    elif sensorWidth is not None and focalLength is not None:  # Based on camera metadata
+        fieldOfView = round(math.degrees(2 * math.atan(sensorWidth / (2 * focalLength))))
+    elif focalLength is not None and scaleFactor35efl is not None:  # Using EXIF Tags
+        fieldOfView = compute_fov(focalLength, scaleFactor35efl)
+
     # Altitude
     altitude = None
     if isExifTagUsable(data, "Exif.GPSInfo.GPSAltitude", Fraction):
@@ -376,19 +401,40 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
         ref = -1 if data.get("Exif.GPSInfo.GPSAltitudeRef") == "1" else 1
         altitude = altitude_raw * ref
 
-    # GPS accuracy (only for warning display)
-    gpshpos = isExifTagUsable(data, "Exif.GPSInfo.GPSHPositioningError", float) or isExifTagUsable(
-        data, "Xmp.exif.GPSHPositioningError", float
-    )
-    gpsdop = isExifTagUsable(data, "Exif.GPSInfo.GPSDOP", float) or isExifTagUsable(data, "Xmp.exif.GPSDOP", float)
-    gpsdiff = isExifTagUsable(data, "Exif.GPSInfo.GPSDifferential", int) or isExifTagUsable(data, "Xmp.exif.GPSDifferential", int)
-
-    if not gpshpos:
-        if not gpsdop and not gpsdiff:
-            warnings.append(_("No GPS accuracy value found, this prevents computing a quality score"))
-        else:
-            warnings.append(_("No GPS horizontal positioning error value found, GPS accuracy can only be estimated"))
-
+    # GPS accuracy
+    gpshposEstimated = False
+    gpshpos = decodeFloat(data, ["Exif.GPSInfo.GPSHPositioningError", "Xmp.exif.GPSHPositioningError"], 2)
+    gpsdop = decodeFloat(data, ["Exif.GPSInfo.GPSDOP", "Xmp.exif.GPSDOP"], 2)
+
+    gpsdiff = None
+    if isExifTagUsable(data, "Exif.GPSInfo.GPSDifferential", int):
+        gpsdiff = int(data["Exif.GPSInfo.GPSDifferential"])
+    elif isExifTagUsable(data, "Xmp.exif.GPSDifferential", int):
+        gpsdiff = int(data["Xmp.exif.GPSDifferential"])
+
+    if gpshpos is None:
+        if gpsdop is not None and gpsdop > 0:
+            gpshposEstimated = True
+            if gpsdiff == 1:  # DOP with a DGPS -> consider GPS nominal error as 1 meter
+                gpshpos = gpsdop
+            else:  # DOP without DGPS -> consider GPS nominal error as 3 meters in average
+                gpshpos = round(3 * gpsdop, 2)
+        elif gpsdiff == 1:  # DGPS only -> return 2 meters precision
+            gpshpos = 2
+            gpshposEstimated = True
+        elif cameraMetadata is not None and cameraMetadata.gps_accuracy is not None:  # Estimate based on model
+            gpshpos = cameraMetadata.gps_accuracy
+            gpshposEstimated = True
+        elif make is not None and make.lower() in camera.GPS_ACCURACY_MAKE:
+            gpshpos = camera.GPS_ACCURACY_MAKE[make.lower()]
+            gpshposEstimated = True
+
+    if gpshpos is None:
+        warnings.append(_("No GPS accuracy value found, this prevents computing a quality score"))
+    elif gpshposEstimated:
+        warnings.append(_("No GPS horizontal positioning error value found, GPS accuracy can only be estimated"))
+
+    # Errors display
     errors = []
     missing_fields = set()
     if lat is None or lon is None or (lat == 0 and lon == 0):
@@ -430,6 +476,9 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
                 roll=roll,
                 yaw=yaw,
                 ts_by_source=tsSources,
+                sensor_width=sensorWidth,
+                field_of_view=fieldOfView,
+                gps_accuracy=gpshpos,
             ),
         )
 
@@ -451,6 +500,9 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
         roll=roll,
         yaw=yaw,
         ts_by_source=tsSources,
+        sensor_width=sensorWidth,
+        field_of_view=fieldOfView,
+        gps_accuracy=gpshpos,
     )
 
 
@@ -485,6 +537,23 @@ def decodeManyFractions(value: str) -> List[Fraction]:
         raise InvalidFractionException()
 
 
+def decodeFloat(data: dict, tags: List[str], precision: Optional[int] = None) -> Optional[float]:
+    """
+    Tries to read float-like value from many EXIF tags (looks for decimal value and fraction)
+    """
+
+    for tag in tags:
+        v = None
+        if isExifTagUsable(data, tag, float):
+            v = float(data[tag])
+        elif isExifTagUsable(data, tag, Fraction):
+            v = float(Fraction(data[tag]))
+        if v is not None:
+            return round(v, precision) if precision is not None else v
+
+    return None
+
+
 def decodeLatLon(data: dict, group: str, _: Callable[[str], str]) -> Tuple[Optional[float], Optional[float], List[str]]:
     """Reads GPS info from given group to get latitude/longitude as float coordinates"""
 
@@ -744,3 +813,32 @@ def isExifTagUsable(exif, tag, expectedType: Any = str) -> bool:
             return True
     except ValueError:
         return False
+
+
+def compute_fov(focal_length, scale_factor_35efl, focus_distance=None) -> int:
+    """
+    Computes horizontal field of view (only for rectilinear sensors)
+    Based on ExifTool computation.
+
+    Args:
+        focal_length (float): focal length (in mm)
+        scale_factor_35efl (float): scale factor for 35mm-equivalent sensor
+        focus_distance (float, optional): focus distance
+
+    Returns:
+        int: the computed field of view
+    """
+
+    if not focal_length or not scale_factor_35efl:
+        raise Exception("Missing focal length or scale factor")
+
+    correction_factor = 1.0
+    if focus_distance:
+        d = 1000 * focus_distance - focal_length
+        if d > 0:
+            correction_factor += focal_length / d
+
+    fd2 = math.atan2(36, 2 * focal_length * scale_factor_35efl * correction_factor)
+    fov_degrees = fd2 * 360 / math.pi
+
+    return round(fov_degrees)

geopic_tag_reader/translations/da/LC_MESSAGES/geopic_tag_reader.po

@@ -0,0 +1,221 @@
+# 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: 2024-11-24 15:36+0100\n"
+"PO-Revision-Date: 2025-01-07 15:14+0000\n"
+"Last-Translator: ERYpTION <eryption.ar9q2@slmail.me>\n"
+"Language-Team: Danish <http://weblate.panoramax.xyz/projects/panoramax/"
+"tag-reader/da/>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.4.3\n"
+
+#: geopic_tag_reader/main.py:26
+msgid "Latitude:"
+msgstr "Breddegrad:"
+
+#: geopic_tag_reader/main.py:27
+msgid "Longitude:"
+msgstr "Længdegrad:"
+
+#: geopic_tag_reader/main.py:28
+msgid "Timestamp:"
+msgstr "Tidsstempel:"
+
+#: geopic_tag_reader/main.py:30 geopic_tag_reader/main.py:31
+msgid "not set"
+msgstr "ikke indstillet"
+
+#: geopic_tag_reader/main.py:30
+msgid "(GPS)"
+msgstr "(GPS)"
+
+#: geopic_tag_reader/main.py:31
+msgid "(Camera)"
+msgstr "(Kamera)"
+
+#: geopic_tag_reader/main.py:32
+msgid "Heading:"
+msgstr "Retning:"
+
+#: geopic_tag_reader/main.py:33
+msgid "Type:"
+msgstr "Type:"
+
+#: geopic_tag_reader/main.py:34
+msgid "Make:"
+msgstr "Fabrikat:"
+
+#: geopic_tag_reader/main.py:35
+msgid "Model:"
+msgstr "Model:"
+
+#: geopic_tag_reader/main.py:36
+msgid "Focal length:"
+msgstr "Brændvidde:"
+
+#: geopic_tag_reader/main.py:37
+msgid "Crop parameters:"
+msgstr "Beskæringsparametre:"
+
+#: geopic_tag_reader/main.py:38
+msgid "Pitch:"
+msgstr "Skråstilling:"
+
+#: geopic_tag_reader/main.py:39
+msgid "Roll:"
+msgstr "Rul:"
+
+#: geopic_tag_reader/main.py:40
+msgid "Yaw:"
+msgstr "Giring (rotation):"
+
+#: geopic_tag_reader/main.py:43
+msgid "Warnings raised by reader:"
+msgstr "Advarsler fremsat af læser:"
+
+#: geopic_tag_reader/reader.py:218
+msgid "Read latitude is out of WGS84 bounds (should be in [-90, 90])"
+msgstr ""
+"Den læste breddegrad er uden for WGS84-grænserne (bør være inden for [-90, "
+"90])"
+
+#: geopic_tag_reader/reader.py:220
+msgid "Read longitude is out of WGS84 bounds (should be in [-180, 180])"
+msgstr ""
+"Den læste længdegrad er uden for WGS84-grænserne (bør være i [-180, 180])"
+
+#: geopic_tag_reader/reader.py:248
+#, python-brace-format
+msgid "Skipping Mapillary date/time as it was not recognized: {v}"
+msgstr "Mapillary-dato/tid springes over, da den ikke blev genkendt: {v}"
+
+#: geopic_tag_reader/reader.py:278
+msgid "No heading value was found, this reduces usability of picture"
+msgstr ""
+"Der blev ikke fundet nogen retningsværdi, hvilket reducerer billedets "
+"anvendelighed"
+
+#: geopic_tag_reader/reader.py:321
+msgid ""
+"No make and model value found, no assumption on focal length or GPS "
+"precision can be made"
+msgstr ""
+"Ingen fabrikat- og modelværdi fundet, ingen antagelse om brændvidde eller "
+"GPS-præcision kan foretages"
+
+#: geopic_tag_reader/reader.py:330
+msgid ""
+"No focal length value was found, this prevents calculating field of view"
+msgstr ""
+"Der blev ikke fundet nogen brændviddeværdi, hvilket forhindrer beregning af "
+"synsfelt"
+
+#: geopic_tag_reader/reader.py:388
+msgid "No GPS accuracy value found, this prevents computing a quality score"
+msgstr ""
+"Ingen GPS-nøjagtighedsværdi fundet, dette forhindrer beregning af en "
+"kvalitetsscore"
+
+#: geopic_tag_reader/reader.py:390
+msgid ""
+"No GPS horizontal positioning error value found, GPS accuracy can only be "
+"estimated"
+msgstr ""
+"Ingen værdi for horisontal GPS-positioneringsfejl fundet, GPS-nøjagtighed "
+"kan kun estimeres"
+
+#: geopic_tag_reader/reader.py:396
+msgid "No GPS coordinates or broken coordinates in picture EXIF tags"
+msgstr "Ingen GPS-koordinater eller defekte koordinater i billedets EXIF-tags"
+
+#: geopic_tag_reader/reader.py:402
+msgid "No valid date in picture EXIF tags"
+msgstr "Ingen gyldig dato i billedets EXIF-tags"
+
+#: geopic_tag_reader/reader.py:407
+msgid "The picture is missing mandatory metadata:"
+msgstr "Billedet mangler obligatoriske metadata:"
+
+#: geopic_tag_reader/reader.py:498 geopic_tag_reader/reader.py:527
+msgid "GPSLatitudeRef not found, assuming GPSLatitudeRef is North"
+msgstr "GPSLatitudeRef ikke fundet, antager at GPSLatitudeRef er nord"
+
+#: geopic_tag_reader/reader.py:506
+msgid "Broken GPS coordinates in picture EXIF tags"
+msgstr "Defekte GPS-koordinater i billedets EXIF-tags"
+
+#: geopic_tag_reader/reader.py:509 geopic_tag_reader/reader.py:533
+msgid "GPSLongitudeRef not found, assuming GPSLongitudeRef is East"
+msgstr "GPSLongitudeRef ikke fundet, det antages, at GPSLongitudeRef er øst"
+
+#: geopic_tag_reader/reader.py:594
+msgid "Precise timezone information not found, fallback to UTC"
+msgstr "Præcise tidszoneoplysninger ikke fundet, går tilbage til UTC"
+
+#: geopic_tag_reader/reader.py:599
+msgid ""
+"Precise timezone information not found (and no GPS coordinates to help), "
+"fallback to UTC"
+msgstr ""
+"Præcise tidszoneoplysninger ikke fundet (og ingen GPS-koordinater til at "
+"hjælpe), går tilbage til UTC"
+
+#: geopic_tag_reader/reader.py:603
+#, python-brace-format
+msgid ""
+"Skipping original date/time (from {datefield}) as it was not recognized: {v}"
+msgstr ""
+"Springer original dato/tid (fra {datefield}) over, da den ikke blev genkendt:"
+" {v}"
+
+#: geopic_tag_reader/reader.py:635
+#, python-brace-format
+msgid ""
+"GPSTimeStamp and GPSDateTime don't contain supported time format (in {group} "
+"group)"
+msgstr ""
+"GPSTimeStamp og GPSDateTime indeholder ikke understøttet tidsformat (i "
+"{group}-gruppe)"
+
+#: geopic_tag_reader/reader.py:666
+#, python-brace-format
+msgid "Skipping GPS date/time ({group} group) as it was not recognized: {v}"
+msgstr ""
+"GPS-dato/tid ({group} gruppe) springes over, da den ikke blev genkendt: {v}"
+
+#: geopic_tag_reader/reader.py:692
+#, 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 ""
+"Mikrosekunder læst fra decimalsekunders værdi ({microsecondsFromSeconds}) "
+"svarer ikke til værdien fra EXIF-feltet ({microseconds}). Den maksimale "
+"værdi bevares."
+
+#: geopic_tag_reader/writer.py:132
+#, python-brace-format
+msgid "Unsupported key in additional tags ({k})"
+msgstr "Ikke-understøttet nøgle i ekstra tags ({k})"
+
+#: geopic_tag_reader/main.py:28
+msgid "GPS accuracy:"
+msgstr "GPS-nøjagtighed:"
+
+#: geopic_tag_reader/main.py:38
+msgid "Field of view:"
+msgstr "Synsfelt:"
+
+#: geopic_tag_reader/main.py:39
+msgid "Sensor width:"
+msgstr "Sensor-bredde:"

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: 2024-11-23 22:10+0000\n"
-"Last-Translator: Bastian Greshake Tzovaras <bastian@gedankenstuecke.de>\n"
+"PO-Revision-Date: 2025-01-09 08:14+0000\n"
+"Last-Translator: mcliquid <weblate@mcliquid.de>\n"
 "Language-Team: German <http://weblate.panoramax.xyz/projects/panoramax/"
 "tag-reader/de/>\n"
 "Language: de\n"
@@ -210,3 +210,15 @@ msgid ""
 msgstr ""
 "Kein Hersteller und Modell gefunden, keine Annahmen zu Brennweite oder GPS-"
 "Genauigkeit können angestellt werden"
+
+#: geopic_tag_reader/main.py:28
+msgid "GPS accuracy:"
+msgstr "GPS-Genauigkeit:"
+
+#: geopic_tag_reader/main.py:38
+msgid "Field of view:"
+msgstr "Sichtbereich:"
+
+#: geopic_tag_reader/main.py:39
+msgid "Sensor width:"
+msgstr "Sensorbreite:"