geopic-tag-reader 1.0.6__tar.gz → 1.1.1__tar.gz

{geopic_tag_reader-1.0.6 → geopic_tag_reader-1.1.1}/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.1] - 2024-04-26
+
+### Added
+
+- Reader now handles pitch & roll values from various EXIF/XMP tags.
+
+## [1.1.0] - 2024-04-17
+
+### Changed
+
+- Encoding information (`charset=...`) is now stripped out of text EXIF tags.
+- `GeoPicTags` objects returns `ts` as a Python `datetime` object (instead of decimal epoch).
+- Improved timezone handling in reader, GPS coordinates are used to find appropriate timezone when no timezone is defined in EXIF tags. If a UTC fallback is done, a warning is thrown.
+
 ## [1.0.6] - 2024-04-02
 
 ### Changed
@@ -152,7 +166,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/geovisio/api)
 
-[Unreleased]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.0.6...main
+[Unreleased]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.1.1...main
+[1.1.1]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.1.0...1.1.1
+[1.1.0]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.0.6...1.1.0
 [1.0.6]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.0.5...1.0.6
 [1.0.5]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.0.4...1.0.5
 [1.0.4]: https://gitlab.com/geovisio/geo-picture-tag-reader/-/compare/1.0.3...1.0.4

{geopic_tag_reader-1.0.6 → geopic_tag_reader-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geopic-tag-reader
-Version: 1.0.6
+Version: 1.1.1
 Summary: GeoPicTagReader
 Author-email: Adrien PAVIE <panieravide@riseup.net>
 Requires-Python: >=3.8
@@ -9,6 +9,9 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Dist: typer ~= 0.12
 Requires-Dist: xmltodict ~= 0.13
 Requires-Dist: pyexiv2 == 2.8.3
+Requires-Dist: timezonefinder == 6.2.0
+Requires-Dist: pytz ~= 2023.3
+Requires-Dist: types-pytz ~= 2023.3.0.1
 Requires-Dist: flit ~= 3.8.0 ; extra == "build"
 Requires-Dist: black ~= 24.3 ; extra == "dev"
 Requires-Dist: mypy ~= 1.9 ; extra == "dev"
@@ -17,9 +20,6 @@ Requires-Dist: pytest-datafiles ~= 3.0 ; extra == "dev"
 Requires-Dist: lazydocs ~= 0.4.8 ; extra == "dev"
 Requires-Dist: types-xmltodict ~= 0.13 ; extra == "dev"
 Requires-Dist: pre-commit ~= 3.3.3 ; extra == "dev"
-Requires-Dist: timezonefinder == 6.2.0 ; extra == "write-exif"
-Requires-Dist: pytz ~= 2023.3 ; extra == "write-exif"
-Requires-Dist: types-pytz ~= 2023.3.0.1 ; extra == "write-exif"
 Requires-Dist: python-dateutil ~= 2.8.2 ; extra == "write-exif"
 Project-URL: Home, https://gitlab.com/geovisio/geo-picture-tag-reader
 Provides-Extra: build

{geopic_tag_reader-1.0.6 → geopic_tag_reader-1.1.1}/docs/API_USAGE.md

@@ -11,7 +11,7 @@
 
 ## Classes
 
-- [`model.PictureType`](./model.md#class-picturetype): An enumeration.
+- [`model.PictureType`](./model.md#class-picturetype)
 - [`reader.CropValues`](./reader.md#class-cropvalues): Cropped equirectangular pictures metadata
 - [`reader.GeoPicTags`](./reader.md#class-geopictags): Tags associated to a geolocated picture
 - [`reader.InvalidExifException`](./reader.md#class-invalidexifexception): Exception for invalid EXIF information from image

{geopic_tag_reader-1.0.6 → geopic_tag_reader-1.1.1}/docs/model.md

@@ -14,7 +14,9 @@
 <a href="../geopic_tag_reader/model.py#L4"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>class</kbd> `PictureType`
-An enumeration. 
+
+
+
 
 
 

{geopic_tag_reader-1.0.6 → geopic_tag_reader-1.1.1}/docs/reader.md

@@ -10,7 +10,7 @@
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L114"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L124"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>function</kbd> `readPictureMetadata`
 
@@ -35,7 +35,7 @@ Extracts metadata from picture file
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L346"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L394"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>function</kbd> `decodeMakeModel`
 
@@ -48,7 +48,7 @@ Python 2/3 compatible decoding of make/model field.
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L357"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L405"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>function</kbd> `isValidManyFractions`
 
@@ -63,7 +63,7 @@ isValidManyFractions(value: str) → bool
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L364"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L412"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>function</kbd> `decodeManyFractions`
 
@@ -76,7 +76,7 @@ Try to decode a list of fractions, separated by spaces
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L377"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L425"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>function</kbd> `decodeLatLon`
 
@@ -92,14 +92,16 @@ Reads GPS info from given group to get latitude/longitude as float coordinates
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L432"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L480"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>function</kbd> `decodeDateTimeOriginal`
 
 ```python
 decodeDateTimeOriginal(
     data: dict,
-    datetimeField: str
+    datetimeField: str,
+    lat: Optional[float] = None,
+    lon: Optional[float] = None
 ) → Tuple[Optional[datetime], List[str]]
 ```
 
@@ -110,7 +112,7 @@ decodeDateTimeOriginal(
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L464"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L534"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>function</kbd> `decodeTimeOffset`
 
@@ -125,12 +127,17 @@ decodeTimeOffset(data: dict, offsetTimeField: str) → Optional[tzinfo]
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L470"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L540"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>function</kbd> `decodeGPSDateTime`
 
 ```python
-decodeGPSDateTime(data: dict, group: str) → Tuple[Optional[datetime], List[str]]
+decodeGPSDateTime(
+    data: dict,
+    group: str,
+    lat: Optional[float] = None,
+    lon: Optional[float] = None
+) → Tuple[Optional[datetime], List[str]]
 ```
 
 
@@ -140,7 +147,7 @@ decodeGPSDateTime(data: dict, group: str) → Tuple[Optional[datetime], List[str
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L513"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L591"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>function</kbd> `decodeSecondsAndMicroSeconds`
 
@@ -158,7 +165,7 @@ decodeSecondsAndMicroSeconds(
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L539"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L617"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>function</kbd> `isExifTagUsable`
 
@@ -185,7 +192,7 @@ Is a given EXIF tag usable (not null and not an empty string)
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L16"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L20"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>class</kbd> `CropValues`
 Cropped equirectangular pictures metadata 
@@ -226,7 +233,7 @@ __init__(
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L37"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L41"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>class</kbd> `GeoPicTags`
 Tags associated to a geolocated picture 
@@ -237,8 +244,8 @@ Tags associated to a geolocated picture
  
  - <b>`lat`</b> (float):  GPS Latitude (in WGS84) 
  - <b>`lon`</b> (float):  GPS Longitude (in WGS84) 
- - <b>`ts`</b> (float):  The capture date (as POSIX timestamp) 
- - <b>`heading`</b> (int):  Picture heading (in degrees, North = 0°, East = 90°, South = 180°, West = 270°) 
+ - <b>`ts`</b> (datetime):  The capture date (date & time with timezone) 
+ - <b>`heading`</b> (int):  Picture heading/yaw (in degrees, North = 0°, East = 90°, South = 180°, West = 270°) 
  - <b>`type`</b> (str):  The kind of picture (flat, equirectangular) 
  - <b>`make`</b> (str):  The camera manufacturer name 
  - <b>`model`</b> (str):  The camera model name 
@@ -247,6 +254,8 @@ Tags associated to a geolocated picture
  - <b>`exif`</b> (dict[str, str]):  Raw EXIF tags from picture (following Exiv2 naming scheme, see https://exiv2.org/metadata.html) 
  - <b>`tagreader_warnings`</b> (list[str]):  List of thrown warnings during metadata reading 
  - <b>`altitude`</b> (float):  altitude (in m) (optional) 
+ - <b>`pitch`</b> (float):  Picture pitch angle, compared to horizon (in degrees, bottom = -90°, horizon = 0°, top = 90°) 
+ - <b>`roll`</b> (float):  Picture roll angle, on a right/left axis (in degrees, left-arm down = -90°, flat = 0°, right-arm down = 90°) 
 
 
 
@@ -260,7 +269,7 @@ Implementation note: this needs to be sync with the PartialGeoPicTags structure
 __init__(
     lat: float,
     lon: float,
-    ts: float,
+    ts: datetime,
     heading: Optional[int],
     type: str,
     make: Optional[str],
@@ -269,7 +278,9 @@ __init__(
     crop: Optional[CropValues],
     exif: Dict[str, str] = <factory>,
     tagreader_warnings: List[str] = <factory>,
-    altitude: Optional[float] = None
+    altitude: Optional[float] = None,
+    pitch: Optional[float] = None,
+    roll: Optional[float] = None
 ) → None
 ```
 
@@ -283,12 +294,12 @@ __init__(
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L73"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L81"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>class</kbd> `InvalidExifException`
 Exception for invalid EXIF information from image 
 
-<a href="../geopic_tag_reader/reader.py#L76"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L84"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ### <kbd>method</kbd> `__init__`
 
@@ -306,7 +317,7 @@ __init__(msg)
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L80"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L88"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>class</kbd> `PartialGeoPicTags`
 Tags associated to a geolocated picture when not all tags have been found 
@@ -321,7 +332,7 @@ Implementation note: this needs to be sync with the GeoPicTags structure
 __init__(
     lat: Optional[float] = None,
     lon: Optional[float] = None,
-    ts: Optional[float] = None,
+    ts: Optional[datetime] = None,
     heading: Optional[int] = None,
     type: Optional[str] = None,
     make: Optional[str] = None,
@@ -330,7 +341,9 @@ __init__(
     crop: Optional[CropValues] = None,
     exif: Dict[str, str] = <factory>,
     tagreader_warnings: List[str] = <factory>,
-    altitude: Optional[float] = None
+    altitude: Optional[float] = None,
+    pitch: Optional[float] = None,
+    roll: Optional[float] = None
 ) → None
 ```
 
@@ -344,14 +357,14 @@ __init__(
 
 ---
 
-<a href="../geopic_tag_reader/reader.py#L101"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L111"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ## <kbd>class</kbd> `PartialExifException`
 Exception for partial / missing EXIF information from image 
 
 Contains a PartialGeoPicTags with all tags that have been read and the list of missing tags 
 
-<a href="../geopic_tag_reader/reader.py#L108"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
+<a href="../geopic_tag_reader/reader.py#L118"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 
 ### <kbd>method</kbd> `__init__`
 

{geopic_tag_reader-1.0.6 → geopic_tag_reader-1.1.1}/geopic_tag_reader/__init__.py

@@ -2,4 +2,4 @@
 GeoPicTagReader
 """
 
-__version__ = "1.0.6"
+__version__ = "1.1.1"

{geopic_tag_reader-1.0.6 → geopic_tag_reader-1.1.1}/geopic_tag_reader/main.py

@@ -22,13 +22,15 @@ def read(
 
         print("Latitude:", metadata.lat)
         print("Longitude:", metadata.lon)
-        print("Timestamp:", metadata.ts)
+        print("Timestamp:", metadata.ts.isoformat())
         print("Heading:", metadata.heading)
         print("Type:", metadata.type)
         print("Make:", metadata.make)
         print("Model:", metadata.model)
         print("Focal length:", metadata.focal_length)
         print("Crop parameters:", metadata.crop)
+        print("Pitch:", metadata.pitch)
+        print("Roll:", metadata.roll)
 
         if len(metadata.tagreader_warnings) > 0:
             print("Warnings raised by reader:")

{geopic_tag_reader-1.0.6 → geopic_tag_reader-1.1.1}/geopic_tag_reader/reader.py

@@ -7,11 +7,15 @@ import re
 import json
 from fractions import Fraction
 from geopic_tag_reader import camera
+import timezonefinder  # type: ignore
+import pytz
 
 # This is a fix for invalid MakerNotes leading to picture not read at all
 # https://github.com/LeoHsiao1/pyexiv2/issues/58
 pyexiv2.set_log_level(4)
 
+tz_finder = timezonefinder.TimezoneFinder()
+
 
 @dataclass
 class CropValues:
@@ -41,8 +45,8 @@ class GeoPicTags:
     Attributes:
         lat (float): GPS Latitude (in WGS84)
         lon (float): GPS Longitude (in WGS84)
-        ts (float): The capture date (as POSIX timestamp)
-        heading (int): Picture heading (in degrees, North = 0°, East = 90°, South = 180°, West = 270°)
+        ts (datetime): The capture date (date & time with timezone)
+        heading (int): Picture heading/yaw (in degrees, North = 0°, East = 90°, South = 180°, West = 270°)
         type (str): The kind of picture (flat, equirectangular)
         make (str): The camera manufacturer name
         model (str): The camera model name
@@ -51,6 +55,8 @@ class GeoPicTags:
         exif (dict[str, str]): Raw EXIF tags from picture (following Exiv2 naming scheme, see https://exiv2.org/metadata.html)
         tagreader_warnings (list[str]): List of thrown warnings during metadata reading
         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°)
 
 
     Implementation note: this needs to be sync with the PartialGeoPicTags structure
@@ -58,7 +64,7 @@ class GeoPicTags:
 
     lat: float
     lon: float
-    ts: float
+    ts: datetime.datetime
     heading: Optional[int]
     type: str
     make: Optional[str]
@@ -68,6 +74,8 @@ class GeoPicTags:
     exif: Dict[str, str] = field(default_factory=lambda: {})
     tagreader_warnings: List[str] = field(default_factory=lambda: [])
     altitude: Optional[float] = None
+    pitch: Optional[float] = None
+    roll: Optional[float] = None
 
 
 class InvalidExifException(Exception):
@@ -86,7 +94,7 @@ class PartialGeoPicTags:
 
     lat: Optional[float] = None
     lon: Optional[float] = None
-    ts: Optional[float] = None
+    ts: Optional[datetime.datetime] = None
     heading: Optional[int] = None
     type: Optional[str] = None
     make: Optional[str] = None
@@ -96,6 +104,8 @@ class PartialGeoPicTags:
     exif: Dict[str, str] = field(default_factory=lambda: {})
     tagreader_warnings: List[str] = field(default_factory=lambda: [])
     altitude: Optional[float] = None
+    pitch: Optional[float] = None
+    roll: Optional[float] = None
 
 
 class PartialExifException(Exception):
@@ -142,6 +152,11 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
         except:
             pass
 
+    # Sanitize charset information
+    for k, v in data.items():
+        if isinstance(v, str):
+            data[k] = re.sub(r"charset=[^\s]+", "", v).strip()
+
     # Parse latitude/longitude
     lat, lon, llw = decodeLatLon(data, "Exif.GPSInfo")
     if len(llw) > 0:
@@ -163,13 +178,13 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
         raise InvalidExifException("Read longitude is out of WGS84 bounds (should be in [-180, 180])")
 
     # Parse date/time
-    d, llw = decodeGPSDateTime(data, "Exif.GPSInfo")
+    d, llw = decodeGPSDateTime(data, "Exif.GPSInfo", lat, lon)
 
     if len(llw) > 0:
         warnings.extend(llw)
 
     if d is None:
-        d, llw = decodeGPSDateTime(data, "Xmp.exif")
+        d, llw = decodeGPSDateTime(data, "Xmp.exif", lat, lon)
         if len(llw) > 0:
             warnings.extend(llw)
 
@@ -180,7 +195,7 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
         "Xmp.GPano.SourceImageCreateTime",
     ]:
         if d is None:
-            d, llw = decodeDateTimeOriginal(data, exifField)
+            d, llw = decodeDateTimeOriginal(data, exifField, lat, lon)
             if len(llw) > 0:
                 warnings.extend(llw)
 
@@ -204,7 +219,7 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
         except Exception as e:
             warnings.append("Skipping Mapillary date/time as it was not recognized:\n\t" + str(e))
 
-    # Heading
+    # 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"]))))
@@ -227,6 +242,35 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
     elif "MAPCompassHeading" in data and isExifTagUsable(data["MAPCompassHeading"], "TrueHeading", float):
         heading = int(round(float(data["MAPCompassHeading"]["TrueHeading"])))
 
+    # Pitch & roll
+    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)
+            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]))
+
+            # Save to correct variable (if not already set)
+            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
+
     # Make and model
     make = data.get("Exif.Image.Make") or data.get("MAPDeviceMake")
     model = data.get("Exif.Image.Model") or data.get("MAPDeviceModel")
@@ -313,7 +357,7 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
             PartialGeoPicTags(
                 lat,
                 lon,
-                d.timestamp() if d else None,
+                d,
                 heading,
                 pic_type,
                 make,
@@ -323,6 +367,8 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
                 exif=data,
                 tagreader_warnings=warnings,
                 altitude=altitude,
+                pitch=pitch,
+                roll=roll,
             ),
         )
 
@@ -330,7 +376,7 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
     return GeoPicTags(
         lat,
         lon,
-        d.timestamp(),
+        d,
         heading,
         pic_type,
         make,
@@ -340,6 +386,8 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
         exif=data,
         tagreader_warnings=warnings,
         altitude=altitude,
+        pitch=pitch,
+        roll=roll,
     )
 
 
@@ -429,7 +477,9 @@ def decodeLatLon(data: dict, group: str) -> Tuple[Optional[float], Optional[floa
     return (lat, lon, warnings)
 
 
-def decodeDateTimeOriginal(data: dict, datetimeField: str) -> Tuple[Optional[datetime.datetime], List[str]]:
+def decodeDateTimeOriginal(
+    data: dict, datetimeField: str, lat: Optional[float] = None, lon: Optional[float] = None
+) -> Tuple[Optional[datetime.datetime], List[str]]:
     d = None
     warnings = []
 
@@ -442,7 +492,6 @@ def decodeDateTimeOriginal(data: dict, datetimeField: str) -> Tuple[Optional[dat
             secondsRaw, microsecondsRaw, msw = decodeSecondsAndMicroSeconds(
                 timeRaw[2], data["Exif.Photo.SubSecTimeOriginal"] if isExifTagUsable(data, "Exif.Photo.SubSecTimeOriginal", float) else "0"
             )
-            tz = decodeTimeOffset(data, f"Exif.Photo.OffsetTime{'Original' if 'DateTimeOriginal' in datetimeField else ''}")
             warnings += msw
 
             d = datetime.datetime.combine(
@@ -452,9 +501,30 @@ def decodeDateTimeOriginal(data: dict, datetimeField: str) -> Tuple[Optional[dat
                     minutesRaw,
                     secondsRaw,
                     microsecondsRaw,
-                    tzinfo=tz or datetime.timezone.utc,
                 ),
             )
+
+            # Timezone handling
+            # Try to read from EXIF
+            tz = decodeTimeOffset(data, f"Exif.Photo.OffsetTime{'Original' if 'DateTimeOriginal' in datetimeField else ''}")
+            if tz is not None:
+                d = d.replace(tzinfo=tz)
+
+            # Otherwise, try to deduct from coordinates
+            elif lon is not None and lat is not None:
+                tz_name = tz_finder.timezone_at(lng=lon, lat=lat)
+                if tz_name is not None:
+                    d = pytz.timezone(tz_name).localize(d)
+                # Otherwise, default to UTC + warning
+                else:
+                    d = d.replace(tzinfo=datetime.timezone.utc)
+                    warnings.append("Precise timezone information not found, fallback to UTC")
+
+            # Otherwise, default to UTC + warning
+            else:
+                d = d.replace(tzinfo=datetime.timezone.utc)
+                warnings.append("Precise timezone information not found (and no GPS coordinates to help), fallback to UTC")
+
         except ValueError as e:
             warnings.append("Skipping original date/time (from " + datetimeField + ") as it was not recognized:\n\t" + str(e))
 
@@ -467,7 +537,9 @@ def decodeTimeOffset(data: dict, offsetTimeField: str) -> Optional[datetime.tzin
     return None
 
 
-def decodeGPSDateTime(data: dict, group: str) -> Tuple[Optional[datetime.datetime], List[str]]:
+def decodeGPSDateTime(
+    data: dict, group: str, lat: Optional[float] = None, lon: Optional[float] = None
+) -> Tuple[Optional[datetime.datetime], List[str]]:
     d = None
     warnings = []
 
@@ -504,6 +576,12 @@ def decodeGPSDateTime(data: dict, group: str) -> Tuple[Optional[datetime.datetim
                     ),
                 )
 
+                # Set timezone from coordinates
+                if lon is not None and lat is not None:
+                    tz_name = tz_finder.timezone_at(lng=lon, lat=lat)
+                    if tz_name is not None:
+                        d = d.astimezone(pytz.timezone(tz_name))
+
         except ValueError as e:
             warnings.append(f"Skipping GPS date/time ({group} group) as it was not recognized:\n\t{str(e)}")
 

{geopic_tag_reader-1.0.6 → geopic_tag_reader-1.1.1}/geopic_tag_reader/writer.py

@@ -3,11 +3,11 @@ from datetime import datetime, timedelta
 from dataclasses import dataclass
 from geopic_tag_reader.model import PictureType
 from enum import Enum
+import timezonefinder  # type: ignore
+import pytz
 
 try:
     import pyexiv2  # type: ignore
-    import timezonefinder  # type: ignore
-    import pytz
 except ImportError:
     raise Exception(
         """Impossible to write the exif tags without the '[write-exif]' dependency (that will need to install libexiv2).

{geopic_tag_reader-1.0.6 → geopic_tag_reader-1.1.1}/tests/test_reader.py

@@ -7,16 +7,23 @@ from .conftest import FIXTURE_DIR, openImg
 def assertGeoPicTagsEquals(gpt, expectedDict):
     assert gpt.lat == expectedDict.get("lat")
     assert gpt.lon == expectedDict.get("lon")
-    assert gpt.ts == expectedDict.get("ts")
     assert gpt.heading == expectedDict.get("heading")
     assert gpt.type == expectedDict.get("type")
     assert gpt.make == expectedDict.get("make")
     assert gpt.model == expectedDict.get("model")
     assert gpt.focal_length == expectedDict.get("focal_length")
     assert gpt.altitude == expectedDict.get("altitude")
+    assert gpt.pitch == expectedDict.get("pitch")
+    assert gpt.roll == expectedDict.get("roll")
     assert gpt.tagreader_warnings == expectedDict.get("tagreader_warnings", [])
     assert len(gpt.exif) > 0
 
+    if expectedDict.get("ts") is not None:
+        assert gpt.ts is not None
+        assert gpt.ts.isoformat() == expectedDict["ts"]
+    else:
+        assert gpt.ts is None
+
     if gpt.crop:
         assert expectedDict.get("crop") is not None
         assert gpt.crop.fullWidth == expectedDict["crop"].get("fullWidth")
@@ -37,13 +44,15 @@ def test_readPictureMetadata(datafiles):
         {
             "lat": 49.00688961988304,
             "lon": 1.9191854417991367,
-            "ts": 1627550214.0,
+            "ts": "2021-07-29T11:16:54+02:00",
             "heading": 349,
             "type": "equirectangular",
             "make": "GoPro",
             "model": "Max",
             "focal_length": 3,
             "altitude": 93,
+            "roll": 0,
+            "pitch": 0,
         },
     )
 
@@ -56,13 +65,15 @@ def test_readPictureMetadata_negCoords(datafiles):
         {
             "lat": 48.33756428166505,
             "lon": -1.9331088333333333,
-            "ts": 1652453580.0,
+            "ts": "2022-05-13T16:53:00+02:00",
             "heading": 32,
             "type": "equirectangular",
             "make": "GoPro",
             "model": "Max",
             "focal_length": 3,
             "altitude": 79,
+            "roll": 0,
+            "pitch": 0,
         },
     )
 
@@ -75,7 +86,7 @@ def test_readPictureMetadata_flat(datafiles):
         {
             "lat": 48.139852239480945,
             "lon": -1.9499731060073981,
-            "ts": 1429976268.0,
+            "ts": "2015-04-25T15:37:48+02:00",
             "heading": 155,
             "type": "flat",
             "make": "OLYMPUS IMAGING CORP.",
@@ -93,7 +104,7 @@ def test_readPictureMetadata_flat2(datafiles):
         {
             "lat": 48.85779642035038,
             "lon": 2.3392783047650747,
-            "ts": 1430744932.0,
+            "ts": "2015-05-04T13:08:52+02:00",
             "heading": 302,
             "type": "flat",
             "make": "Canon",
@@ -111,7 +122,7 @@ def test_readPictureMetadata_xmpHeading(datafiles):
         {
             "lat": 50.87070833333333,
             "lon": -1.5260916666666666,
-            "ts": 1600008019.767,
+            "ts": "2020-09-13T15:40:19.767000+01:00",
             "heading": 67,
             "type": "equirectangular",
             "make": "Google",
@@ -130,7 +141,7 @@ def test_readPictureMetadata_noHeading(datafiles):
         {
             "lat": 48.15506638888889,
             "lon": -1.6844680555555556,
-            "ts": 1666166194.0,
+            "ts": "2022-10-19T09:56:34+02:00",
             "heading": None,
             "type": "flat",
             "make": "SONY",
@@ -154,8 +165,10 @@ def test_readPictureMetadata_ricoh_theta(datafiles):
                 "lon": 2.3205357914890987,
                 "make": "RICOH",
                 "model": "THETA m15",
-                "ts": 1458911533.0,
+                "ts": "2016-03-25T14:12:13+01:00",
                 "type": "equirectangular",
+                "roll": 3,
+                "pitch": 1,
             },
         )
 
@@ -173,7 +186,7 @@ def test_readPictureMetadata_v4mpack(datafiles):
                 "lon": -1.2761512389983616,
                 "make": "STFMANI",
                 "model": "V4MPOD 1",
-                "ts": 1555417213.0,
+                "ts": "2019-04-16T14:20:13+02:00",
                 "type": "equirectangular",
                 "altitude": 34,
             },
@@ -192,7 +205,7 @@ def test_readPictureMetadata_a5000(datafiles):
             "lon": 2.51197323068765,
             "make": "OnePlus",
             "model": "ONEPLUS A5000",
-            "ts": 1626797632.199995,
+            "ts": "2021-07-20T16:13:52.199995+02:00",
             "type": "flat",
             "altitude": 0,
         },
@@ -227,7 +240,7 @@ def test_readPictureMetadata_int_long_tag(datafiles):
             "lon": 4.700622,
             "make": None,
             "model": None,
-            "ts": 1673515020.0,
+            "ts": "2023-01-12T09:17:00+01:00",
             "type": "flat",
             "tagreader_warnings": ["GPSLongitudeRef not found, assuming GPSLongitudeRef is East"],
         },
@@ -249,7 +262,7 @@ def test_readPictureMetadata_invalidGpsDate(datafiles):
             "lon": 2.358506155368721,
             "make": "samsung",
             "model": None,
-            "ts": 1631101437.0754,
+            "ts": "2021-09-08T11:43:57.075400+02:00",
             "type": "flat",
             "altitude": 73,
             "tagreader_warnings": [
@@ -271,7 +284,7 @@ def test_readPictureMetadata_gpsDateStamp(datafiles):
             "lon": 2.4833194444444446,
             "make": "Apple",
             "model": "iPhone 12 Pro",
-            "ts": 1682785851.565,
+            "ts": "2023-04-29T18:30:51.565000+02:00",
             "type": "flat",
             "altitude": 36,
             "tagreader_warnings": [
@@ -293,7 +306,7 @@ def test_readPictureMetadata_gpsDateString(datafiles):
             "lon": -1.0015555555555555,
             "make": "Apple",
             "model": "iPhone 8 Plus",
-            "ts": 1564313142.529,
+            "ts": "2019-07-28T13:25:42.529000+02:00",
             "type": "flat",
             "altitude": 19,
             "tagreader_warnings": [
@@ -322,7 +335,7 @@ def test_readPictureMetadata_cropped(datafiles):
             "lon": 1.919185441804927,
             "make": "GoPro",
             "model": "Max",
-            "ts": 1627550214.0,
+            "ts": "2021-07-29T11:16:54+02:00",
             "type": "equirectangular",
             "altitude": 93,
             "crop": {"fullWidth": 4032, "fullHeight": 2016, "width": 2150, "height": 1412, "top": 134, "left": 538},
@@ -341,7 +354,7 @@ def test_readPictureMetadata_datetimeoriginal(datafiles):
             "lon": -1.382302762883527,
             "make": "Motorola",
             "model": "XT1052",
-            "ts": 1598866588.0,
+            "ts": "2020-08-31T09:36:28+02:00",
             "type": "flat",
             "altitude": 72,
             "tagreader_warnings": [
@@ -362,7 +375,7 @@ def test_readPictureMetadata_datetimeoriginal_decimal_milliseconds(datafiles):
             "lon": 121.15072633333334,
             "make": "BlackVue",
             "model": "DR900S-1CH",
-            "ts": 1699748719.023,
+            "ts": "2023-11-12T00:25:19.023000+08:00",
             "type": "flat",
             "altitude": 29,
             "tagreader_warnings": [],
@@ -401,7 +414,7 @@ def test_readPictureWithoutCoord(datafiles):
             "lon": None,
             "make": "Apple",
             "model": "iPhone 12 Pro",
-            "ts": 1682785851.565,
+            "ts": "2023-04-29T16:30:51.565000+00:00",
             "type": "flat",
             "altitude": 36,
             "tagreader_warnings": [
@@ -472,7 +485,7 @@ def test_readPictureWithLatitudeAsFloat(datafiles):
             "lon": 7.683081,
             "make": None,
             "model": "PULSAR",
-            "ts": 1637075896.89,
+            "ts": "2021-11-16T16:18:16.890000+01:00",
             "type": "equirectangular",
             "altitude": None,
             "tagreader_warnings": [],
@@ -492,7 +505,7 @@ def test_readPictureMetadata_gps_date_time_stamp(datafiles):
             "lon": 7.683081,
             "make": None,
             "model": "PULSAR",
-            "ts": 1637075896.89,
+            "ts": "2021-11-16T16:18:16.890000+01:00",
             "type": "equirectangular",
             "altitude": None,
             "tagreader_warnings": [],
@@ -512,7 +525,7 @@ def test_readPictureMetadata_insta360(datafiles):
             "lon": 3.482755555555556,
             "make": "Insta360",
             "model": "One X2.PHOTO_NORMAL",
-            "ts": 1700662669.0,
+            "ts": "2023-11-22T14:17:49+01:00",
             "type": "equirectangular",
             "altitude": 84,
             "tagreader_warnings": [],
@@ -532,7 +545,7 @@ def test_readPictureMetadata_ricoh_noproj(datafiles):
             "lon": -1.5464416503906249,
             "make": "Ricoh",
             "model": "Theta S",
-            "ts": 1672575342.0,
+            "ts": "2023-01-01T13:15:42+01:00",
             "type": "equirectangular",
             "altitude": None,
             "tagreader_warnings": [],
@@ -549,7 +562,7 @@ def test_readPictureMetadata_gopromax_flat(datafiles):
         {
             "lat": 47.22555109997222,
             "lon": -1.5631604999722222,
-            "ts": 1708173992.0,
+            "ts": "2024-02-17T13:46:32+01:00",
             "heading": None,
             "type": "flat",
             "make": "GoPro",
@@ -572,7 +585,7 @@ def test_readPictureMetadata_broken_makernotes(datafiles):
             "lon": -1.7841980555555554,
             "make": "SONY",
             "model": "FDR-X1000V",
-            "ts": 1599115820.0,
+            "ts": "2020-09-03T08:50:20+02:00",
             "type": "flat",
             "altitude": 99,
             "focal_length": 2.8,
@@ -590,13 +603,15 @@ def test_readPictureMetadata_datetime_offset(datafiles):
         {
             "lat": 48.33756428166505,
             "lon": -1.9331088333333333,
-            "ts": 1652453651.0,
+            "ts": "2022-05-13T16:54:11+02:00",
             "heading": 32,
             "type": "equirectangular",
             "make": "GoPro",
             "model": "Max",
             "focal_length": 3,
             "altitude": 79,
+            "roll": 0,
+            "pitch": 0,
         },
     )
 
@@ -610,7 +625,7 @@ def test_readPictureMetadata_gps_date_slash(datafiles):
         {
             "lat": 43.42541569992266,
             "lon": 1.3766216000638112,
-            "ts": 1686640500.0,
+            "ts": "2023-06-13T09:15:00+02:00",
             "heading": None,
             "type": "flat",
             "make": None,
@@ -623,3 +638,9 @@ def test_readPictureMetadata_gps_date_slash(datafiles):
             ],
         },
     )
+
+
+@pytest.mark.datafiles(os.path.join(FIXTURE_DIR, "charset.jpg"))
+def test_readPictureMetadata_charset(datafiles):
+    result = reader.readPictureMetadata(openImg(str(datafiles) + "/charset.jpg"))
+    assert result.exif["Exif.Photo.UserComment"] == "CD31 31_D0003_51_600"

{geopic_tag_reader-1.0.6 → geopic_tag_reader-1.1.1}/tests/test_writer.py

@@ -18,7 +18,7 @@ def test_writePictureMetadata_capture_time(datafiles):
     image_file_upd = writer.writePictureMetadata(img_orig, writer.PictureMetadata(capture_time=capture_time))
     tags = reader.readPictureMetadata(image_file_upd)
 
-    assert datetime.fromtimestamp(tags.ts, tz=pytz.UTC) == capture_time
+    assert tags.ts == capture_time
 
     # we also check specific tags:
     assert tags.exif["Exif.Photo.DateTimeOriginal"] == "2023-06-01 12:48:01"
@@ -36,7 +36,7 @@ def test_writePictureMetadata_capture_time_no_timezone(datafiles):
     tags = reader.readPictureMetadata(image_file_upd)
 
     paris = pytz.timezone("Europe/Paris")
-    assert datetime.fromtimestamp(tags.ts, tz=pytz.UTC) == paris.localize(capture_time).astimezone(pytz.UTC)
+    assert tags.ts == paris.localize(capture_time).astimezone(pytz.UTC)
 
     # DateTimeOriginal should be a local time, so 12:48:01 localized in Europe/Paris timezome (since it's where the picture has been taken)
     assert tags.exif["Exif.Photo.DateTimeOriginal"] == "2023-06-01 12:48:01"
@@ -78,7 +78,7 @@ def test_writePictureMetadata_capture_time_no_position_in_file_but_overriden(dat
     tags = reader.readPictureMetadata(image_file_upd)
 
     paris = pytz.timezone("Europe/Paris")
-    assert datetime.fromtimestamp(tags.ts, tz=pytz.UTC) == paris.localize(capture_time).astimezone(pytz.UTC)
+    assert tags.ts == paris.localize(capture_time).astimezone(pytz.UTC)
 
     # DateTimeOriginal should be a local time, so 12:48:01 localized in Europe/Paris timezome (since it's where the picture has been taken)
     assert tags.exif["Exif.Photo.DateTimeOriginal"] == "2023-06-01 12:48:01"

{geopic_tag_reader-1.0.6 → geopic_tag_reader-1.1.1}/pyproject.toml

@@ -11,6 +11,9 @@ dependencies = [
     "typer ~= 0.12",
     "xmltodict ~= 0.13",
     "pyexiv2 == 2.8.3",
+    "timezonefinder == 6.2.0",
+    "pytz ~= 2023.3",
+    "types-pytz ~= 2023.3.0.1",
 ]
 requires-python = ">=3.8"
 
@@ -33,9 +36,6 @@ dev = [
 build = ["flit ~= 3.8.0"]
 # optional dependencies to be able to write exif tags
 write-exif = [
-    "timezonefinder == 6.2.0",
-    "pytz ~= 2023.3",
-    "types-pytz ~= 2023.3.0.1",
     "python-dateutil ~= 2.8.2",
 ]