geopic-tag-reader 1.1.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

geopic_tag_reader/__init__.py

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

geopic_tag_reader/main.py

@@ -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/reader.py

@@ -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.dist-info → geopic_tag_reader-1.1.1.dist-info}/METADATA

@@ -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.1.dist-info/RECORD

@@ -0,0 +1,12 @@
+geopic_tag_reader/__init__.py,sha256=7hT1At7Ce4FtNeMuBZa7cDah_cJoIhJrnQWbEAF0BE8,47
+geopic_tag_reader/camera.py,sha256=2Sr0jAt3RXUWazYMnkwF6J6lVnKvSp7Ac8g7yOHehVA,1643
+geopic_tag_reader/main.py,sha256=ZEZaZEeaDxRjrVMwhR5lUYJWKkUcjd8avjqm7JxJdhM,3219
+geopic_tag_reader/model.py,sha256=rsWVE3T1kpNsKXX8iv6xb_3PCVY6Ea7iU9WOqUgXklU,129
+geopic_tag_reader/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+geopic_tag_reader/reader.py,sha256=4yoQU-ljOgLmaH_hc1m4o1YkSNgaPfM38NVmiM7rpbE,24543
+geopic_tag_reader/writer.py,sha256=QmQqQpWgb6AL3Y0Kuzy7PF1asUsTVDq9buwJXfFSRq8,8672
+geopic_tag_reader-1.1.1.dist-info/entry_points.txt,sha256=c9YwjCNhxveDf-61_aSRlzcpoutvM6KQCerlzaVt_JU,64
+geopic_tag_reader-1.1.1.dist-info/LICENSE,sha256=oHWDwXkJJb9zJzThMN3F9Li4yFhz1qxOUByouY7L3bI,1070
+geopic_tag_reader-1.1.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+geopic_tag_reader-1.1.1.dist-info/METADATA,sha256=iMhClAI5r1h2jpB_o-dwcSP3QVz4PuBPf4jWmZ_10Ks,6303
+geopic_tag_reader-1.1.1.dist-info/RECORD,,

geopic_tag_reader-1.1.0.dist-info/RECORD

@@ -1,12 +0,0 @@
-geopic_tag_reader/__init__.py,sha256=o8d20yL96tGKyj_0NXyBn_HJ2i1hofM-qTuKouf4ZkE,47
-geopic_tag_reader/camera.py,sha256=2Sr0jAt3RXUWazYMnkwF6J6lVnKvSp7Ac8g7yOHehVA,1643
-geopic_tag_reader/main.py,sha256=a0RmJIA0R5dTK1vzDZD3Q4MFFAiDv6pnRiFHjfIjeJU,3141
-geopic_tag_reader/model.py,sha256=rsWVE3T1kpNsKXX8iv6xb_3PCVY6Ea7iU9WOqUgXklU,129
-geopic_tag_reader/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geopic_tag_reader/reader.py,sha256=w19zJ9CvdJyk_UxWcYX2T0DkhdQmw2xMzlAo1sR1ir0,22867
-geopic_tag_reader/writer.py,sha256=QmQqQpWgb6AL3Y0Kuzy7PF1asUsTVDq9buwJXfFSRq8,8672
-geopic_tag_reader-1.1.0.dist-info/entry_points.txt,sha256=c9YwjCNhxveDf-61_aSRlzcpoutvM6KQCerlzaVt_JU,64
-geopic_tag_reader-1.1.0.dist-info/LICENSE,sha256=oHWDwXkJJb9zJzThMN3F9Li4yFhz1qxOUByouY7L3bI,1070
-geopic_tag_reader-1.1.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-geopic_tag_reader-1.1.0.dist-info/METADATA,sha256=DJ9OiZyvVGNMdveGev-V33kO9sqPPo-V9SADIezd0I4,6303
-geopic_tag_reader-1.1.0.dist-info/RECORD,,