geopic-tag-reader 1.2.0__py3-none-any.whl → 1.3.1__py3-none-any.whl

geopic_tag_reader/__init__.py

@@ -2,4 +2,4 @@
 GeoPicTagReader
 """
 
-__version__ = "1.2.0"
+__version__ = "1.3.1"

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)

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
@@ -59,6 +85,7 @@ class GeoPicTags:
         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
@@ -79,6 +106,7 @@ class GeoPicTags:
     pitch: Optional[float] = None
     roll: Optional[float] = None
     yaw: Optional[float] = None
+    ts_by_source: Optional[TimeBySource] = None
 
 
 class InvalidExifException(Exception):
@@ -114,6 +142,7 @@ class PartialGeoPicTags:
     pitch: Optional[float] = None
     roll: Optional[float] = None
     yaw: Optional[float] = None
+    ts_by_source: Optional[TimeBySource] = None
 
 
 class PartialExifException(Exception):
@@ -145,7 +174,10 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
     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()
 
     imgComment = img.read_comment()
     if imgComment is not None and len(imgComment.strip()) > 0:
@@ -187,35 +219,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,
@@ -229,6 +247,25 @@ 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"]))
 
+    # 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)
+
+        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
+
     # GPS Heading
     heading = None
     if isExifTagUsable(data, "Exif.GPSInfo.GPSImgDirection", Fraction):
@@ -318,7 +355,7 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
     if isExifTagUsable(data, "Xmp.GPano.ProjectionType"):
         pic_type = data["Xmp.GPano.ProjectionType"]
     # 360° based on known models
-    elif camera.is_360(make, model, data.get("Exif.Photo.PixelXDimension"), data.get("Exif.Photo.PixelYDimension")):
+    elif camera.is_360(make, model, width, height):
         pic_type = "equirectangular"
     # Flat by default
     else:
@@ -370,6 +407,7 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
                 pitch=pitch,
                 roll=roll,
                 yaw=yaw,
+                ts_by_source=tsSources,
             ),
         )
 
@@ -390,6 +428,7 @@ def readPictureMetadata(picture: bytes, lang_code: str = "en") -> GeoPicTags:
         pitch=pitch,
         roll=roll,
         yaw=yaw,
+        ts_by_source=tsSources,
     )
 
 
@@ -480,20 +519,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
@@ -510,7 +557,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)
 
@@ -531,9 +578,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)
@@ -571,7 +616,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
                     _,
                 )
 

geopic_tag_reader/sequence.py

@@ -143,7 +143,35 @@ def sort_pictures(pictures: List[Picture], method: Optional[SortMethod] = SortMe
 
     # Sort based on picture ts
     elif strat == "time":
-        pictures.sort(key=lambda p: p.metadata.ts.isoformat() if p.metadata is not None else "0000-00-00T00:00:00Z")
+        # Check if all pictures have GPS ts set
+        missingGpsTs = next(
+            (p for p in pictures if p.metadata is None or p.metadata.ts_by_source is None or p.metadata.ts_by_source.gps is None), None
+        )
+        if missingGpsTs:
+            # Check if all pictures have camera ts set
+            missingCamTs = next(
+                (p for p in pictures if p.metadata is None or p.metadata.ts_by_source is None or p.metadata.ts_by_source.camera is None),
+                None,
+            )
+            # Sort by best ts available
+            if missingCamTs:
+                pictures.sort(key=lambda p: p.metadata.ts.isoformat() if p.metadata is not None else "0000-00-00T00:00:00Z")
+            # Sort by camera ts
+            else:
+                pictures.sort(
+                    key=lambda p: (
+                        p.metadata.ts_by_source.camera.isoformat(),  # type: ignore
+                        p.metadata.ts_by_source.gps.isoformat() if p.metadata.ts_by_source.gps else "0000-00-00T00:00:00Z",  # type: ignore
+                    )
+                )
+        # Sort by GPS ts
+        else:
+            pictures.sort(
+                key=lambda p: (
+                    p.metadata.ts_by_source.gps.isoformat(),  # type: ignore
+                    p.metadata.ts_by_source.camera.isoformat() if p.metadata.ts_by_source.camera else "0000-00-00T00:00:00Z",  # type: ignore
+                )
+            )
 
     if order == "desc":
         pictures.reverse()
@@ -244,9 +272,22 @@ def split_in_sequences(pictures: List[Picture], splitParams: Optional[SplitParam
                 continue
 
             # Time delta
-            timeOutOfDelta = (
-                False if splitParams.maxTime is None else (abs(lastPic.metadata.ts - pic.metadata.ts)).total_seconds() > splitParams.maxTime
-            )
+            timeDelta = lastPic.metadata.ts - pic.metadata.ts
+            if (
+                lastPic.metadata.ts_by_source
+                and lastPic.metadata.ts_by_source.gps
+                and pic.metadata.ts_by_source
+                and pic.metadata.ts_by_source.gps
+            ):
+                timeDelta = lastPic.metadata.ts_by_source.gps - pic.metadata.ts_by_source.gps
+            elif (
+                lastPic.metadata.ts_by_source
+                and lastPic.metadata.ts_by_source.camera
+                and pic.metadata.ts_by_source
+                and pic.metadata.ts_by_source.camera
+            ):
+                timeDelta = lastPic.metadata.ts_by_source.camera - pic.metadata.ts_by_source.camera
+            timeOutOfDelta = False if splitParams.maxTime is None else (abs(timeDelta)).total_seconds() > splitParams.maxTime
 
             # Distance delta
             distance = lastPic.distance_to(pic)

geopic_tag_reader/translations/de/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-07-10 13:05+0200\n"
-"PO-Revision-Date: 2024-07-13 20:42+0000\n"
+"PO-Revision-Date: 2024-08-07 13:42+0000\n"
 "Last-Translator: Bastian Greshake Tzovaras <bastian@gedankenstuecke.de>\n"
 "Language-Team: German <http://weblate.panoramax.xyz/projects/panoramax/"
 "tag-reader/de/>\n"
@@ -163,3 +163,7 @@ msgstr ""
 #, python-brace-format
 msgid "Unsupported key in additional tags ({k})"
 msgstr "Nicht unterstützter Schlüssel in den zusätzlichen Attributen ({k})"
+
+#: geopic_tag_reader/main.py:37
+msgid "Yaw:"
+msgstr "Gierwinkel:"

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: 2024-07-30 16:49+0200\n"
-"PO-Revision-Date: 2024-07-30 16:49+0200\n"
+"POT-Creation-Date: 2024-10-09 10:49+0200\n"
+"PO-Revision-Date: 2024-10-09 10:49+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -29,88 +29,100 @@ msgstr "Longitude:"
 msgid "Timestamp:"
 msgstr "Timestamp:"
 
-#: geopic_tag_reader/main.py:29
+#: geopic_tag_reader/main.py:30 geopic_tag_reader/main.py:31
+msgid "not set"
+msgstr "not set"
+
+#: geopic_tag_reader/main.py:30
+msgid "(GPS)"
+msgstr "(GPS)"
+
+#: geopic_tag_reader/main.py:31
+msgid "(Camera)"
+msgstr "(Camera)"
+
+#: geopic_tag_reader/main.py:32
 msgid "Heading:"
 msgstr "Heading:"
 
-#: geopic_tag_reader/main.py:30
+#: geopic_tag_reader/main.py:33
 msgid "Type:"
 msgstr "Type:"
 
-#: geopic_tag_reader/main.py:31
+#: geopic_tag_reader/main.py:34
 msgid "Make:"
 msgstr "Make:"
 
-#: geopic_tag_reader/main.py:32
+#: geopic_tag_reader/main.py:35
 msgid "Model:"
 msgstr "Model:"
 
-#: geopic_tag_reader/main.py:33
+#: geopic_tag_reader/main.py:36
 msgid "Focal length:"
 msgstr "Focal length:"
 
-#: geopic_tag_reader/main.py:34
+#: geopic_tag_reader/main.py:37
 msgid "Crop parameters:"
 msgstr "Crop parameters:"
 
-#: geopic_tag_reader/main.py:35
+#: geopic_tag_reader/main.py:38
 msgid "Pitch:"
 msgstr "Pitch:"
 
-#: geopic_tag_reader/main.py:36
+#: geopic_tag_reader/main.py:39
 msgid "Roll:"
 msgstr "Roll:"
 
-#: geopic_tag_reader/main.py:37
+#: geopic_tag_reader/main.py:40
 msgid "Yaw:"
 msgstr "Yaw:"
 
-#: geopic_tag_reader/main.py:40
+#: geopic_tag_reader/main.py:43
 msgid "Warnings raised by reader:"
 msgstr "Warnings raised by reader:"
 
-#: geopic_tag_reader/reader.py:186
+#: geopic_tag_reader/reader.py:218
 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:188
+#: geopic_tag_reader/reader.py:220
 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:230
+#: geopic_tag_reader/reader.py:248
 #, 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:337
+#: geopic_tag_reader/reader.py:374
 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:343
+#: geopic_tag_reader/reader.py:380
 msgid "No valid date in picture EXIF tags"
 msgstr "No valid date in picture EXIF tags"
 
-#: geopic_tag_reader/reader.py:348
+#: geopic_tag_reader/reader.py:385
 msgid "The picture is missing mandatory metadata:"
 msgstr "The picture is missing mandatory metadata:"
 
-#: geopic_tag_reader/reader.py:437 geopic_tag_reader/reader.py:466
+#: geopic_tag_reader/reader.py:476 geopic_tag_reader/reader.py:505
 msgid "GPSLatitudeRef not found, assuming GPSLatitudeRef is North"
 msgstr "GPSLatitudeRef not found, assuming GPSLatitudeRef is North"
 
-#: geopic_tag_reader/reader.py:445
+#: geopic_tag_reader/reader.py:484
 msgid "Broken GPS coordinates in picture EXIF tags"
 msgstr "Broken GPS coordinates in picture EXIF tags"
 
-#: geopic_tag_reader/reader.py:448 geopic_tag_reader/reader.py:472
+#: geopic_tag_reader/reader.py:487 geopic_tag_reader/reader.py:511
 msgid "GPSLongitudeRef not found, assuming GPSLongitudeRef is East"
 msgstr "GPSLongitudeRef not found, assuming GPSLongitudeRef is East"
 
-#: geopic_tag_reader/reader.py:525
+#: geopic_tag_reader/reader.py:572
 msgid "Precise timezone information not found, fallback to UTC"
 msgstr "Precise timezone information not found, fallback to UTC"
 
-#: geopic_tag_reader/reader.py:530
+#: geopic_tag_reader/reader.py:577
 msgid ""
 "Precise timezone information not found (and no GPS coordinates to help), "
 "fallback to UTC"
@@ -118,14 +130,14 @@ msgstr ""
 "Precise timezone information not found (and no GPS coordinates to help), "
 "fallback to UTC"
 
-#: geopic_tag_reader/reader.py:534
+#: geopic_tag_reader/reader.py:581
 #, 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:568
+#: geopic_tag_reader/reader.py:613
 #, python-brace-format
 msgid ""
 "GPSTimeStamp and GPSDateTime don't contain supported time format (in {group} "
@@ -134,12 +146,12 @@ msgstr ""
 "GPSTimeStamp and GPSDateTime don't contain supported time format (in {group} "
 "group)"
 
-#: geopic_tag_reader/reader.py:599
+#: geopic_tag_reader/reader.py:644
 #, 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:625
+#: geopic_tag_reader/reader.py:670
 #, python-brace-format
 msgid ""
 "Microseconds read from decimal seconds value ({microsecondsFromSeconds}) is "