geopic-tag-reader 1.1.5__tar.gz → 1.3.0__tar.gz

{geopic_tag_reader-1.1.5 → geopic_tag_reader-1.3.0}/.gitlab-ci.yml

@@ -38,20 +38,20 @@ tests-writer:
     - make i18n-po2code
     - pytest -s -vv
 
-tests-deploy_pypi:
-  stage: deploy
-  image: python:3.8
-  variables:
-    FLIT_INDEX_URL: https://test.pypi.org/legacy/
-    FLIT_USERNAME: $TEST_FLIT_USERNAME
-    FLIT_PASSWORD: $TEST_FLIT_PASSWORD
-  script:
-    - apt update && apt install -y gcc git gettext
-    - pip install .[build]
-    - make i18n-po2code
-    - flit publish
-  only:
-    - develop
+# tests-deploy_pypi:
+#   stage: deploy
+#   image: python:3.8
+#   variables:
+#     FLIT_INDEX_URL: https://test.pypi.org/legacy/
+#     FLIT_USERNAME: $TEST_FLIT_USERNAME
+#     FLIT_PASSWORD: $TEST_FLIT_PASSWORD
+#   script:
+#     - apt update && apt install -y gcc git gettext
+#     - pip install .[build]
+#     - make i18n-po2code
+#     - flit publish
+#   only:
+#     - develop
 
 deploy_pypi:
   stage: deploy

{geopic_tag_reader-1.1.5 → geopic_tag_reader-1.3.0}/CHANGELOG.md

@@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.3.0] - 2024-09-30
+
+### Changed
+
+- Reader offers a new property `ts_by_source` to distinguish read datetime from GPS and camera.
+- Sequence sorting uses same timestamp source through all pictures (GPS if available, camera else, fallback with other value if two timestamps are identical).
+- Sequence splits uses whenever possible same timestamp source.
+
+### Fixed
+
+- Documentation links were not up-to-date in README file.
+- Sub-seconds values and time offset are applied only if part of the same EXIF group.
+
+## [1.2.0] - 2024-07-30
+
+### Added
+
+- A new module `sequence` is available through Python to dispatch a set of pictures (based on their metadata) into several sequences, based on de-duplicate and split parameters. This is based on existing code previously stored in [command-line client](https://gitlab.com/panoramax/clients/cli), moved here to be shared between API and CLI.
+
+### Changed
+
+- Reader offers a `yaw` value (360° sphere correction), distinct from `heading` (GPS direction). EXIF tags are read a bit differently to reflect this : `yaw` comes from `Xmp.Camera.Yaw & Xmp.GPano.PoseHeadingDegrees`, `heading` from `Exif.GPSInfo.GPSImgDirection & MAPCompassHeading`.
+
+### Removed
+- Previously used values `Exif.GPSInfo.GPS(Pitch|Roll)` and `Xmp.GPano.InitialView(Pitch|Roll)Degrees` are dropped, first one for not being standard, second one for not being correct to use for pitch/roll (prefer `Xmp.GPano.Pose(Pitch|Roll)Degrees`).
+
 ## [1.1.5] - 2024-07-10
 
 ### Fixed
@@ -199,7 +225,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - EXIF tag reading methods extracted from [GeoVisio API](https://gitlab.com/panoramax/server/api)
 
-[Unreleased]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.1.5...main
+[Unreleased]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.3.0...main
+[1.3.0]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.2.0...1.3.0
+[1.2.0]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.1.5...1.2.0
 [1.1.5]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.1.4...1.1.5
 [1.1.4]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.1.3...1.1.4
 [1.1.3]: https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/compare/1.1.2...1.1.3

{geopic_tag_reader-1.1.5 → geopic_tag_reader-1.3.0}/Makefile

@@ -11,7 +11,7 @@ type-check: ## Check all python types
 	mypy geopic_tag_reader/
 
 fmt: ## Format code
-	black --fast .
+	python -m black --fast .
 
 ci: type-check fmt test ## Run all check like the ci
 

{geopic_tag_reader-1.1.5 → geopic_tag_reader-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geopic-tag-reader
-Version: 1.1.5
+Version: 1.3.0
 Summary: GeoPicTagReader
 Author-email: Adrien PAVIE <panieravide@riseup.net>
 Requires-Python: >=3.8
@@ -31,7 +31,7 @@ Provides-Extra: write-exif
 
 # ![Panoramax](https://upload.wikimedia.org/wikipedia/commons/thumb/a/a9/Panoramax.svg/40px-Panoramax.svg.png) Panoramax
 
-__Panoramax__ is a digital resource for sharing and exploiting 📍📷 field photos. Anyone can take photographs of places visible from the public streets and contribute them to the Panoramax database. This data is then freely accessible and reusable by all. More information available at [gitlab.com/panoramax](https://gitlab.com/panoramax) and [panoramax.fr](https://panoramax.fr/).
+__Panoramax__ is a digital resource for sharing and using 📍📷 field photos. Anyone can take photographs of places visible from the public streets and contribute them to the Panoramax database. This data is then freely accessible and reusable by all. More information available at [gitlab.com/panoramax](https://gitlab.com/panoramax) and [panoramax.fr](https://panoramax.fr/).
 
 
 # 📷 GeoPic Tag Reader
@@ -56,7 +56,7 @@ pip install geopic_tag_reader
 geopic-tag-reader --help
 ```
 
-To know more about install and other options, see [install documentation](./docs/Install.md).
+To know more about install and other options, see [install documentation](./docs/install.md).
 
 If at some point you're lost or need help, you can contact us through [issues](https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/issues) or by [email](mailto:panieravide@riseup.net).
 
@@ -88,7 +88,7 @@ geopic-tag-reader write \
 	--output /path/to/edited_image.jpg
 ```
 
-[Full documentation is also available here](./docs/CLI_USAGE.md).
+[Full documentation is also available here](./docs/index.md).
 
 ### As Python library
 
@@ -119,14 +119,14 @@ editedImg.write(editedImgBytes)
 editedImg.close()
 ```
 
-[Full documentation is also available here](./docs/API_USAGE.md).
+[Full documentation is also available here](./docs/tech/api_reference.md).
 
 
 ## Contributing
 
 Pull requests are welcome. For major changes, please open an [issue](https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/issues) first to discuss what you would like to change.
 
-More information about developing is available in [documentation](./docs/Develop.md).
+More information about developing is available in [documentation](./docs/develop.md).
 
 
 ## ⚖️ License

{geopic_tag_reader-1.1.5 → geopic_tag_reader-1.3.0}/README.md

@@ -1,6 +1,6 @@
 # ![Panoramax](https://upload.wikimedia.org/wikipedia/commons/thumb/a/a9/Panoramax.svg/40px-Panoramax.svg.png) Panoramax
 
-__Panoramax__ is a digital resource for sharing and exploiting 📍📷 field photos. Anyone can take photographs of places visible from the public streets and contribute them to the Panoramax database. This data is then freely accessible and reusable by all. More information available at [gitlab.com/panoramax](https://gitlab.com/panoramax) and [panoramax.fr](https://panoramax.fr/).
+__Panoramax__ is a digital resource for sharing and using 📍📷 field photos. Anyone can take photographs of places visible from the public streets and contribute them to the Panoramax database. This data is then freely accessible and reusable by all. More information available at [gitlab.com/panoramax](https://gitlab.com/panoramax) and [panoramax.fr](https://panoramax.fr/).
 
 
 # 📷 GeoPic Tag Reader
@@ -25,7 +25,7 @@ pip install geopic_tag_reader
 geopic-tag-reader --help
 ```
 
-To know more about install and other options, see [install documentation](./docs/Install.md).
+To know more about install and other options, see [install documentation](./docs/install.md).
 
 If at some point you're lost or need help, you can contact us through [issues](https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/issues) or by [email](mailto:panieravide@riseup.net).
 
@@ -57,7 +57,7 @@ geopic-tag-reader write \
 	--output /path/to/edited_image.jpg
 ```
 
-[Full documentation is also available here](./docs/CLI_USAGE.md).
+[Full documentation is also available here](./docs/index.md).
 
 ### As Python library
 
@@ -88,14 +88,14 @@ editedImg.write(editedImgBytes)
 editedImg.close()
 ```
 
-[Full documentation is also available here](./docs/API_USAGE.md).
+[Full documentation is also available here](./docs/tech/api_reference.md).
 
 
 ## Contributing
 
 Pull requests are welcome. For major changes, please open an [issue](https://gitlab.com/panoramax/server/geo-picture-tag-reader/-/issues) first to discuss what you would like to change.
 
-More information about developing is available in [documentation](./docs/Develop.md).
+More information about developing is available in [documentation](./docs/develop.md).
 
 
 ## ⚖️ License

{geopic_tag_reader-1.1.5 → geopic_tag_reader-1.3.0}/docs/index.md

@@ -50,7 +50,6 @@ The following EXIF tags are recognized and used if defined, but are **optional**
 Image orientation is read from
 
 - `GPSImgDirection`
-- `GPano:PoseHeadingDegrees`
 - or in [Mapillary](https://www.mapillary.com/) tags: `MAPCompassHeading`
 
 #### :material-timer: Milliseconds in date
@@ -80,21 +79,22 @@ Camera focal length (to get precise field of view) is read from:
 - `Exif.Image.FocalLength`
 - `Exif.Photo.FocalLength`
 
-#### :octicons-horizontal-rule-16: Pitch and roll
+#### :octicons-horizontal-rule-16: Yaw, Pitch and Roll
+
+Yaw value is read from:
+
+- `Xmp.Camera.Yaw`
+- `Xmp.GPano.PoseHeadingDegrees`
 
 Pitch value is read from:
 
 - `Xmp.Camera.Pitch`
-- `Exif.GPSInfo.GPSPitch`
 - `Xmp.GPano.PosePitchDegrees`
-- `Xmp.GPano.InitialViewPitchDegrees`
 
 Roll value is read from:
 
 - `Xmp.Camera.Roll`
-- `Exif.GPSInfo.GPSRoll`
 - `Xmp.GPano.PoseRollDegrees`
-- `Xmp.GPano.InitialViewRollDegrees`
 
 #### ⛰️ Altitude
 

{geopic_tag_reader-1.1.5 → geopic_tag_reader-1.3.0}/docs/tech/api_reference.md

@@ -16,6 +16,10 @@
 
 ::: geopic_tag_reader.writer
 
+## Sequence
+
+::: geopic_tag_reader.sequence
+
 ## Camera
 
 ::: geopic_tag_reader.camera

{geopic_tag_reader-1.1.5 → geopic_tag_reader-1.3.0}/geopic_tag_reader/__init__.py

@@ -2,4 +2,4 @@
 GeoPicTagReader
 """
 
-__version__ = "1.1.5"
+__version__ = "1.3.0"

{geopic_tag_reader-1.1.5 → geopic_tag_reader-1.3.0}/geopic_tag_reader/main.py

@@ -25,7 +25,10 @@ def read(
         _ = i18n_init(lang)
         print(_("Latitude:"), metadata.lat)
         print(_("Longitude:"), metadata.lon)
-        print(_("Timestamp:"), metadata.ts.isoformat())
+        print(_("Timestamp:"), metadata.ts)
+        if metadata.ts_by_source is not None:
+            print("  -", (metadata.ts_by_source.gps or _("not set")), _("(GPS)"))
+            print("  -", (metadata.ts_by_source.camera or _("not set")), _("(Camera)"))
         print(_("Heading:"), metadata.heading)
         print(_("Type:"), metadata.type)
         print(_("Make:"), metadata.make)
@@ -34,6 +37,7 @@ def read(
         print(_("Crop parameters:"), metadata.crop)
         print(_("Pitch:"), metadata.pitch)
         print(_("Roll:"), metadata.roll)
+        print(_("Yaw:"), metadata.yaw)
 
         if len(metadata.tagreader_warnings) > 0:
             print(_("Warnings raised by reader:"))

{geopic_tag_reader-1.1.5 → geopic_tag_reader-1.3.0}/geopic_tag_reader/reader.py

@@ -39,6 +39,32 @@ class CropValues:
     top: int
 
 
+@dataclass
+class TimeBySource:
+    """All datetimes read from available sources
+
+    Attributes:
+        gps (datetime): Time read from GPS clock
+        camera (datetime): Time read from camera clock (DateTimeOriginal)
+    """
+
+    gps: Optional[datetime.datetime] = None
+    camera: Optional[datetime.datetime] = None
+
+    def getBest(self) -> Optional[datetime.datetime]:
+        """Get the best available datetime to use"""
+        if self.gps is not None and self.camera is None:
+            return self.gps
+        elif self.gps is None and self.camera is not None:
+            return self.camera
+        elif self.gps is None and self.camera is None:
+            return None
+        elif self.camera.microsecond > 0 and self.gps.microsecond == 0:  # type: ignore
+            return self.camera
+        else:
+            return self.gps
+
+
 @dataclass
 class GeoPicTags:
     """Tags associated to a geolocated picture
@@ -47,7 +73,7 @@ class GeoPicTags:
         lat (float): GPS Latitude (in WGS84)
         lon (float): GPS Longitude (in WGS84)
         ts (datetime): The capture date (date & time with timezone)
-        heading (int): Picture heading/yaw (in degrees, North = 0°, East = 90°, South = 180°, West = 270°)
+        heading (int): Picture GPS heading (in degrees, North = 0°, East = 90°, South = 180°, West = 270°). Value is computed based on image center (if yaw=0°)
         type (str): The kind of picture (flat, equirectangular)
         make (str): The camera manufacturer name
         model (str): The camera model name
@@ -58,6 +84,8 @@ class GeoPicTags:
         altitude (float): altitude (in m) (optional)
         pitch (float): Picture pitch angle, compared to horizon (in degrees, bottom = -90°, horizon = 0°, top = 90°)
         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.
 
 
     Implementation note: this needs to be sync with the PartialGeoPicTags structure
@@ -77,6 +105,8 @@ class GeoPicTags:
     altitude: Optional[float] = None
     pitch: Optional[float] = None
     roll: Optional[float] = None
+    yaw: Optional[float] = None
+    ts_by_source: Optional[TimeBySource] = None
 
 
 class InvalidExifException(Exception):
@@ -111,6 +141,8 @@ class PartialGeoPicTags:
     altitude: Optional[float] = None
     pitch: Optional[float] = None
     roll: Optional[float] = None
+    yaw: Optional[float] = None
+    ts_by_source: Optional[TimeBySource] = None
 
 
 class PartialExifException(Exception):
@@ -184,35 +216,21 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
     if lon is not None and (lon < -180 or lon > 180):
         raise InvalidExifException(_("Read longitude is out of WGS84 bounds (should be in [-180, 180])"))
 
-    # Parse date/time
-    d, llw = decodeGPSDateTime(data, "Exif.GPSInfo", _, lat, lon)
+    # Parse GPS date/time
+    gpsTs, llw = decodeGPSDateTime(data, "Exif.GPSInfo", _, lat, lon)
 
     if len(llw) > 0:
         warnings.extend(llw)
 
-    if d is None:
-        d, llw = decodeGPSDateTime(data, "Xmp.exif", _, lat, lon)
+    if gpsTs is None:
+        gpsTs, llw = decodeGPSDateTime(data, "Xmp.exif", _, lat, lon)
         if len(llw) > 0:
             warnings.extend(llw)
 
-    for exifField in [
-        "Exif.Image.DateTimeOriginal",
-        "Exif.Photo.DateTimeOriginal",
-        "Exif.Image.DateTime",
-        "Xmp.GPano.SourceImageCreateTime",
-    ]:
-        if d is None:
-            d, llw = decodeDateTimeOriginal(data, exifField, _, lat, lon)
-            if len(llw) > 0:
-                warnings.extend(llw)
-
-        if d is not None:
-            break
-
-    if d is None and isExifTagUsable(data, "MAPGpsTime"):
+    if gpsTs is None and isExifTagUsable(data, "MAPGpsTime"):
         try:
             year, month, day, hour, minutes, seconds, milliseconds = [int(dp) for dp in data["MAPGpsTime"].split("_")]
-            d = datetime.datetime(
+            gpsTs = datetime.datetime(
                 year,
                 month,
                 day,
@@ -226,57 +244,59 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
         except Exception as e:
             warnings.append(_("Skipping Mapillary date/time as it was not recognized: {v}").format(v=data["MAPGpsTime"]))
 
-    # Heading/Yaw
-    heading = None
-    if isExifTagUsable(data, "Xmp.GPano.PoseHeadingDegrees", float) and isExifTagUsable(data, "Exif.GPSInfo.GPSImgDirection", Fraction):
-        gpsDir = int(round(float(Fraction(data["Exif.GPSInfo.GPSImgDirection"]))))
-        gpanoHeading = int(round(float(data["Xmp.GPano.PoseHeadingDegrees"])))
-        if gpsDir > 0 and gpanoHeading == 0:
-            heading = gpsDir
-        elif gpsDir == 0 and gpanoHeading > 0:
-            heading = gpanoHeading
-        else:
-            if gpsDir != gpanoHeading:
-                warnings.append(_("Contradicting heading values found, GPSImgDirection value is used"))
-            heading = gpsDir
+    # Parse camera date/time
+    cameraTs = None
+    for exifGroup, dtField, subsecField in [
+        ("Exif.Photo", "DateTimeOriginal", "SubSecTimeOriginal"),
+        ("Exif.Image", "DateTimeOriginal", "SubSecTimeOriginal"),
+        ("Exif.Image", "DateTime", "SubSecTimeOriginal"),
+        ("Xmp.GPano", "SourceImageCreateTime", "SubSecTimeOriginal"),
+        ("Xmp.exif", "DateTimeOriginal", "SubsecTimeOriginal"),  # Case matters
+    ]:
+        if cameraTs is None:
+            cameraTs, llw = decodeDateTimeOriginal(data, exifGroup, dtField, subsecField, _, lat, lon)
+            if len(llw) > 0:
+                warnings.extend(llw)
 
-    elif isExifTagUsable(data, "Xmp.GPano.PoseHeadingDegrees", float):
-        heading = int(round(float(data["Xmp.GPano.PoseHeadingDegrees"])))
+        if cameraTs is not None:
+            break
+    tsSources = TimeBySource(gps=gpsTs, camera=cameraTs) if gpsTs or cameraTs else None
+    d = tsSources.getBest() if tsSources is not None else None
 
-    elif isExifTagUsable(data, "Exif.GPSInfo.GPSImgDirection", Fraction):
+    # GPS Heading
+    heading = None
+    if isExifTagUsable(data, "Exif.GPSInfo.GPSImgDirection", Fraction):
         heading = int(round(float(Fraction(data["Exif.GPSInfo.GPSImgDirection"]))))
 
     elif "MAPCompassHeading" in data and isExifTagUsable(data["MAPCompassHeading"], "TrueHeading", float):
         heading = int(round(float(data["MAPCompassHeading"]["TrueHeading"])))
 
-    # Pitch & roll
+    # Yaw / Pitch / roll
+    yaw = None
     pitch = None
     roll = None
-    exifPRFields = ["Xmp.Camera.$$", "Exif.GPSInfo.GPS$$", "Xmp.GPano.Pose$$Degrees", "Xmp.GPano.InitialView$$Degrees"]
-    # For each potential EXIF field
-    for exifField in exifPRFields:
-        # Try out both Pitch & Roll variants
-        for checkField in ["Pitch", "Roll"]:
-            exifCheckField = exifField.replace("$$", checkField)
+    exifYPRFields = {
+        "yaw": ["Xmp.Camera.Yaw", "Xmp.GPano.PoseHeadingDegrees"],
+        "pitch": ["Xmp.Camera.Pitch", "Xmp.GPano.PosePitchDegrees"],
+        "roll": ["Xmp.Camera.Roll", "Xmp.GPano.PoseRollDegrees"],
+    }
+    for ypr in exifYPRFields:
+        for exifTag in exifYPRFields[ypr]:
             foundValue = None
             # Look for float or fraction
-            if isExifTagUsable(data, exifCheckField, float):
-                foundValue = float(data[exifCheckField])
-            elif isExifTagUsable(data, exifCheckField, Fraction):
-                foundValue = float(Fraction(data[exifCheckField]))
+            if isExifTagUsable(data, exifTag, float):
+                foundValue = float(data[exifTag])
+            elif isExifTagUsable(data, exifTag, Fraction):
+                foundValue = float(Fraction(data[exifTag]))
 
-            # Save to correct variable (if not already set)
+            # Save found value
             if foundValue is not None:
-                if checkField == "Pitch":
-                    if pitch is None:
-                        pitch = foundValue
-                    else:
-                        continue
-                elif checkField == "Roll":
-                    if roll is None:
-                        roll = foundValue
-                    else:
-                        continue
+                if ypr == "yaw" and yaw is None:
+                    yaw = foundValue
+                elif ypr == "pitch" and pitch is None:
+                    pitch = foundValue
+                elif ypr == "roll" and roll is None:
+                    roll = foundValue
 
     # Make and model
     make = data.get("Exif.Image.Make") or data.get("MAPDeviceMake")
@@ -383,6 +403,8 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
                 altitude=altitude,
                 pitch=pitch,
                 roll=roll,
+                yaw=yaw,
+                ts_by_source=tsSources,
             ),
         )
 
@@ -402,6 +424,8 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
         altitude=altitude,
         pitch=pitch,
         roll=roll,
+        yaw=yaw,
+        ts_by_source=tsSources,
     )
 
 
@@ -492,20 +516,28 @@ def decodeLatLon(data: dict, group: str, _: Callable[[str], str]) -> Tuple[Optio
 
 
 def decodeDateTimeOriginal(
-    data: dict, datetimeField: str, _: Callable[[str], str], lat: Optional[float] = None, lon: Optional[float] = None
+    data: dict,
+    exifGroup: str,
+    datetimeField: str,
+    subsecField: str,
+    _: Callable[[str], str],
+    lat: Optional[float] = None,
+    lon: Optional[float] = None,
 ) -> Tuple[Optional[datetime.datetime], List[str]]:
     d = None
     warnings = []
+    dtField = f"{exifGroup}.{datetimeField}"
+    ssField = f"{exifGroup}.{subsecField}"
 
-    if d is None and isExifTagUsable(data, datetimeField):
+    if d is None and isExifTagUsable(data, dtField):
         try:
-            dateRaw = data[datetimeField][:10].replace(":", "-")
-            timeRaw = data[datetimeField][11:].split(":")
+            dateRaw = data[dtField][:10].replace(":", "-")
+            timeRaw = data[dtField][11:].split(":")
             hourRaw = int(timeRaw[0])
             minutesRaw = int(timeRaw[1])
             secondsRaw, microsecondsRaw, msw = decodeSecondsAndMicroSeconds(
-                timeRaw[2],
-                data["Exif.Photo.SubSecTimeOriginal"] if isExifTagUsable(data, "Exif.Photo.SubSecTimeOriginal", float) else "0",
+                timeRaw[2] if len(timeRaw) >= 3 else "0",
+                data[ssField] if isExifTagUsable(data, ssField, float) else "0",
                 _,
             )
             warnings += msw
@@ -522,7 +554,7 @@ def decodeDateTimeOriginal(
 
             # Timezone handling
             # Try to read from EXIF
-            tz = decodeTimeOffset(data, f"Exif.Photo.OffsetTime{'Original' if 'DateTimeOriginal' in datetimeField else ''}")
+            tz = decodeTimeOffset(data, f"{exifGroup}.OffsetTime{'Original' if 'DateTimeOriginal' in dtField else ''}")
             if tz is not None:
                 d = d.replace(tzinfo=tz)
 
@@ -543,9 +575,7 @@ def decodeDateTimeOriginal(
 
         except ValueError as e:
             warnings.append(
-                _("Skipping original date/time (from {datefield}) as it was not recognized: {v}").format(
-                    datefield=datetimeField, v=data[datetimeField]
-                )
+                _("Skipping original date/time (from {datefield}) as it was not recognized: {v}").format(datefield=dtField, v=data[dtField])
             )
 
     return (d, warnings)
@@ -583,7 +613,7 @@ def decodeGPSDateTime(
             if timeRaw:
                 seconds, microseconds, msw = decodeSecondsAndMicroSeconds(
                     str(float(timeRaw[2])),
-                    data["Exif.Photo.SubSecTimeOriginal"] if isExifTagUsable(data, "Exif.Photo.SubSecTimeOriginal", float) else "0",
+                    "0",  # No SubSecTimeOriginal, it's only for DateTimeOriginal
                     _,
                 )