mapillary-tools 0.14.4__tar.gz → 0.14.5__tar.gz

{mapillary_tools-0.14.4 → mapillary_tools-0.14.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapillary_tools
-Version: 0.14.4
+Version: 0.14.5
 Summary: Mapillary Image/Video Import Pipeline
 Author-email: Mapillary <support@mapillary.com>
 License: BSD

mapillary_tools-0.14.5/mapillary_tools/__init__.py

@@ -0,0 +1 @@
+VERSION = "0.14.5"

{mapillary_tools-0.14.4 → mapillary_tools-0.14.5}/mapillary_tools/exif_write.py

@@ -6,6 +6,7 @@ import io
 import json
 import logging
 import math
+from fractions import Fraction
 from pathlib import Path
 
 import piexif
@@ -29,16 +30,19 @@ class ExifEdit:
 
     @staticmethod
     def decimal_to_dms(
-        value: float, precision: int
-    ) -> tuple[tuple[float, int], tuple[float, int], tuple[float, int]]:
-        """
-        Convert decimal position to degrees, minutes, seconds in a fromat supported by EXIF
-        """
-        deg = math.floor(value)
-        min = math.floor((value - deg) * 60)
-        sec = math.floor((value - deg - min / 60) * 3600 * precision)
-
-        return (deg, 1), (min, 1), (sec, precision)
+        value: float,
+    ) -> tuple[tuple[int, int], tuple[int, int], tuple[int, int]]:
+        """Convert decimal position to Exif degrees, minutes, and seconds rationals"""
+
+        deg: int = int(value)
+        min: int = int(value := (value - deg) * 60)
+        sec: float = (value - min) * 60
+
+        return (
+            (deg, 1),
+            (min, 1),
+            (Fraction.from_float(sec).limit_denominator().as_integer_ratio()),
+        )
 
     def add_image_description(self, data: dict) -> None:
         """Add a dict to image description."""
@@ -83,41 +87,69 @@ class ExifEdit:
         self._ef["GPS"][piexif.GPSIFD.GPSTimeStamp] = (
             (dt.hour, 1),
             (dt.minute, 1),
-            # num / den = (dt.second * 1e6 + dt.microsecond) / 1e6
-            (int(dt.second * 1e6 + dt.microsecond), int(1e6)),
+            (
+                Fraction.from_float(dt.second + dt.microsecond / 1e6)
+                .limit_denominator()
+                .as_integer_ratio()
+            ),
         )
-
-    def add_lat_lon(self, lat: float, lon: float, precision: float = 1e7) -> None:
+        if LOG.isEnabledFor(logging.DEBUG):
+            LOG.debug(
+                'GPSDateStamp: "%s"\tGPSTimeStamp: %s',
+                self._ef["GPS"][piexif.GPSIFD.GPSDateStamp],
+                self._ef["GPS"][piexif.GPSIFD.GPSTimeStamp],
+            )
+
+    def add_lat_lon(self, lat: float, lon: float) -> None:
         """Add lat, lon to gps (lat, lon in float)."""
+
         self._ef["GPS"][piexif.GPSIFD.GPSLatitudeRef] = "N" if lat > 0 else "S"
+        self._ef["GPS"][piexif.GPSIFD.GPSLatitude] = ExifEdit.decimal_to_dms(
+            math.fabs(lat)
+        )
         self._ef["GPS"][piexif.GPSIFD.GPSLongitudeRef] = "E" if lon > 0 else "W"
         self._ef["GPS"][piexif.GPSIFD.GPSLongitude] = ExifEdit.decimal_to_dms(
-            abs(lon), int(precision)
-        )
-        self._ef["GPS"][piexif.GPSIFD.GPSLatitude] = ExifEdit.decimal_to_dms(
-            abs(lat), int(precision)
+            math.fabs(lon)
         )
+        if LOG.isEnabledFor(logging.DEBUG):
+            LOG.debug(
+                "GPSLatitude: %s\tGPSLongitude: %s",
+                self._ef["GPS"][piexif.GPSIFD.GPSLatitude],
+                self._ef["GPS"][piexif.GPSIFD.GPSLongitude],
+            )
+
+    def add_altitude(self, altitude: float) -> None:
+        """Add altitude."""
 
-    def add_altitude(self, altitude: float, precision: int = 100) -> None:
-        """Add altitude (pre is the precision)."""
         ref = 0 if altitude > 0 else 1
         self._ef["GPS"][piexif.GPSIFD.GPSAltitude] = (
-            int(abs(altitude) * precision),
-            precision,
+            Fraction.from_float(math.fabs(altitude))
+            .limit_denominator()
+            .as_integer_ratio()
         )
         self._ef["GPS"][piexif.GPSIFD.GPSAltitudeRef] = ref
-
-    def add_direction(
-        self, direction: float, ref: str = "T", precision: int = 100
-    ) -> None:
+        if LOG.isEnabledFor(logging.DEBUG):
+            LOG.debug(
+                'GPSAltitudeRef: "%s"\tGPSAltitude: %s',
+                self._ef["GPS"][piexif.GPSIFD.GPSAltitudeRef],
+                self._ef["GPS"][piexif.GPSIFD.GPSAltitude],
+            )
+
+    def add_direction(self, direction: float, ref: str = "T") -> None:
         """Add image direction."""
+
         # normalize direction
-        direction = direction % 360.0
+        direction = math.fmod(direction, 360.0)
         self._ef["GPS"][piexif.GPSIFD.GPSImgDirection] = (
-            int(abs(direction) * precision),
-            precision,
+            Fraction.from_float(direction).limit_denominator().as_integer_ratio()
         )
         self._ef["GPS"][piexif.GPSIFD.GPSImgDirectionRef] = ref
+        if LOG.isEnabledFor(logging.DEBUG):
+            LOG.debug(
+                'GPSImgDirectionRef: "%s"\tGPSImgDirection: %s',
+                self._ef["GPS"][piexif.GPSIFD.GPSImgDirectionRef],
+                self._ef["GPS"][piexif.GPSIFD.GPSImgDirection],
+            )
 
     def add_make(self, make: str) -> None:
         if not make:

{mapillary_tools-0.14.4 → mapillary_tools-0.14.5}/mapillary_tools/utils.py

@@ -31,6 +31,7 @@ def is_image_file(path: Path) -> bool:
         ".tiff",
         ".pgm",
         ".pnm",
+        ".36p",
     )
 
 

{mapillary_tools-0.14.4 → mapillary_tools-0.14.5}/mapillary_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapillary_tools
-Version: 0.14.4
+Version: 0.14.5
 Summary: Mapillary Image/Video Import Pipeline
 Author-email: Mapillary <support@mapillary.com>
 License: BSD

mapillary_tools-0.14.4/mapillary_tools/__init__.py

@@ -1 +0,0 @@
-VERSION = "0.14.4"