PyPI - geopic-tag-reader - Versions diffs - 1.1.0__tar.gz → 1.1.1__tar.gz - Mend

geopic-tag-reader 1.1.0tar.gz → 1.1.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (66) hide show

{geopic_tag_reader-1.1.0 → geopic_tag_reader-1.1.1}/CHANGELOG.md RENAMED Viewed

@@ -7,6 +7,12 @@ 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
@@ -160,7 +166,8 @@ 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.1.0...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

{geopic_tag_reader-1.1.0 → geopic_tag_reader-1.1.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geopic-tag-reader
-Version: 1.1.0
+Version: 1.1.1
 Summary: GeoPicTagReader
 Author-email: Adrien PAVIE <panieravide@riseup.net>
 Requires-Python: >=3.8

{geopic_tag_reader-1.1.0 → geopic_tag_reader-1.1.1}/docs/reader.md RENAMED Viewed

@@ -10,7 +10,7 @@
 ---
-<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>
+<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#L355"><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#L366"><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#L373"><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#L386"><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,7 +92,7 @@ Reads GPS info from given group to get latitude/longitude as float coordinates
 ---
-<a href="../geopic_tag_reader/reader.py#L441"><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`
@@ -112,7 +112,7 @@ decodeDateTimeOriginal(
 ---
-<a href="../geopic_tag_reader/reader.py#L495"><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`
@@ -127,7 +127,7 @@ decodeTimeOffset(data: dict, offsetTimeField: str) → Optional[tzinfo]
 ---
-<a href="../geopic_tag_reader/reader.py#L501"><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`
@@ -147,7 +147,7 @@ decodeGPSDateTime(
 ---
-<a href="../geopic_tag_reader/reader.py#L552"><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`
@@ -165,7 +165,7 @@ decodeSecondsAndMicroSeconds(
 ---
-<a href="../geopic_tag_reader/reader.py#L578"><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`
@@ -245,7 +245,7 @@ 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> (datetime):  The capture date (date & time with timezone)
- - <b>`heading`</b> (int):  Picture heading (in degrees, North = 0°, East = 90°, South = 180°, West = 270°)
+ - <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
@@ -254,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°)
@@ -276,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
 ```
@@ -290,12 +294,12 @@ __init__(
 ---
-<a href="../geopic_tag_reader/reader.py#L77"><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#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#L84"><img align="right" style="float:right;" src="https://img.shields.io/badge/-source-cccccc?style=flat-square"></a>
 ### <kbd>method</kbd> `__init__`
@@ -313,7 +317,7 @@ __init__(msg)
 ---
-<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>
+<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
@@ -337,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
 ```
@@ -351,14 +357,14 @@ __init__(
 ---
-<a href="../geopic_tag_reader/reader.py#L105"><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#L112"><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.1.0 → geopic_tag_reader-1.1.1}/geopic_tag_reader/__init__.py RENAMED Viewed

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

{geopic_tag_reader-1.1.0 → geopic_tag_reader-1.1.1}/geopic_tag_reader/main.py RENAMED Viewed

@@ -29,6 +29,8 @@ def read(
         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.1.0 → geopic_tag_reader-1.1.1}/geopic_tag_reader/reader.py RENAMED Viewed

@@ -46,7 +46,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 (in degrees, North = 0°, East = 90°, South = 180°, West = 270°)
+        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
@@ -55,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
@@ -72,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):
@@ -100,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):
@@ -213,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"]))))
@@ -236,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")
@@ -332,6 +367,8 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
                 exif=data,
                 tagreader_warnings=warnings,
                 altitude=altitude,
+                pitch=pitch,
+                roll=roll,
             ),
         )
@@ -349,6 +386,8 @@ def readPictureMetadata(picture: bytes) -> GeoPicTags:
         exif=data,
         tagreader_warnings=warnings,
         altitude=altitude,
+        pitch=pitch,
+        roll=roll,
     )

{geopic_tag_reader-1.1.0 → geopic_tag_reader-1.1.1}/tests/test_reader.py RENAMED Viewed

@@ -13,6 +13,8 @@ def assertGeoPicTagsEquals(gpt, expectedDict):
     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
@@ -49,6 +51,8 @@ def test_readPictureMetadata(datafiles):
             "model": "Max",
             "focal_length": 3,
             "altitude": 93,
+            "roll": 0,
+            "pitch": 0,
         },
     )
@@ -68,6 +72,8 @@ def test_readPictureMetadata_negCoords(datafiles):
             "model": "Max",
             "focal_length": 3,
             "altitude": 79,
+            "roll": 0,
+            "pitch": 0,
         },
     )
@@ -161,6 +167,8 @@ def test_readPictureMetadata_ricoh_theta(datafiles):
                 "model": "THETA m15",
                 "ts": "2016-03-25T14:12:13+01:00",
                 "type": "equirectangular",
+                "roll": 3,
+                "pitch": 1,
             },
         )
@@ -602,6 +610,8 @@ def test_readPictureMetadata_datetime_offset(datafiles):
             "model": "Max",
             "focal_length": 3,
             "altitude": 79,
+            "roll": 0,
+            "pitch": 0,
         },
     )