mapillary-tools 0.14.4__py3-none-any.whl → 0.14.5__py3-none-any.whl

mapillary_tools/__init__.py

@@ -1 +1 @@
-VERSION = "0.14.4"
+VERSION = "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/utils.py

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

{mapillary_tools-0.14.4.dist-info → mapillary_tools-0.14.5.dist-info}/METADATA

@@ -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.dist-info → mapillary_tools-0.14.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mapillary_tools/__init__.py,sha256=SlLq3LO5ZN4Ap8_XR8x6nXyckJ4qcIktiWVQg34oqMY,19
+mapillary_tools/__init__.py,sha256=QPwHkhbn32xwJH7B6GBDJs1faHBKSuZUsKugKUv8LXk,19
 mapillary_tools/api_v4.py,sha256=bckAU_atUs0pSuqySeY4W0Rs011a21ClJHo_mbbcXXw,4864
 mapillary_tools/authenticate.py,sha256=mmaOwjQ444DcX4lRw2ms3naBg5Y_xwIJAIWeVdsQfqM,11742
 mapillary_tools/blackvue_parser.py,sha256=ea2JtU9MWU6yB0bQlF970_Of0bJVofSTRq1P30WKW-0,5623
@@ -6,7 +6,7 @@ mapillary_tools/config.py,sha256=LDxQoL2StjLGPefCN0y67nhIDN3xSE6Qn8G-tWC-oGA,342
 mapillary_tools/constants.py,sha256=fk5HBczTBGyDOKQy-grzlf0SafiGwggdF8Ota13Rk0k,6235
 mapillary_tools/exceptions.py,sha256=uxTgBEfXgGxT0XNGRIAZ5mjtdqsCYfP6gnaXAK_ewBM,2483
 mapillary_tools/exif_read.py,sha256=nAbZDYAIBx3g4n6QIGKXX3s-A3SkfuvZQBInDrXMlKk,32220
-mapillary_tools/exif_write.py,sha256=I9GSs8KRd28QyKPVNHuxesSVbBvahHqKBS3nw9HoLsg,8830
+mapillary_tools/exif_write.py,sha256=XX-DZiWDClk50Pbq7qyn-7mzaGxfFqEsx-kHFfQzAN0,9932
 mapillary_tools/exiftool_read.py,sha256=5uatYE9mgbg2d9NAnPfX22nSRBjXhJ9ayMqNMd4QwGM,15779
 mapillary_tools/exiftool_read_video.py,sha256=23O_bjUOVq6j7i3xMz6fY-XIEsjinsCejK_0nrbFyOM,16084
 mapillary_tools/exiftool_runner.py,sha256=g4gSyqeh3D6EnMJ-c3s-RnO2EP_jD354Qkaz0Y-4D04,1658
@@ -24,7 +24,7 @@ mapillary_tools/types.py,sha256=pIU2wcxiOUWT5Pd05pgNzY9EVEDlwoldtlF2IIYYvE0,5909
 mapillary_tools/upload.py,sha256=XejAgmVW4Y33MiQ2g-shvHZA_zXTekEsOUHUHNx2AE4,24047
 mapillary_tools/upload_api_v4.py,sha256=VgOf7RhfUuzmlSBUp5CpekKIJ0xQrC0r-r0Ds9-wU4I,7344
 mapillary_tools/uploader.py,sha256=T2BNlncuFibg5RJ7c2qweUXDAg6-zYc-rdgbV_JEKDU,46636
-mapillary_tools/utils.py,sha256=HjTZ01GQv_UNGySaTZ_Mc1Gn_Y0x3knQf7Vh17whDFw,8108
+mapillary_tools/utils.py,sha256=jKId-E1n1rfuFOjMIIRgkvm6CxkvFWvfg6rqjsoa_6g,8124
 mapillary_tools/camm/camm_builder.py,sha256=ub6Z9ijep8zAo1NOlU51Gxk95kQ2vfN58YgVCLmNMRk,9211
 mapillary_tools/camm/camm_parser.py,sha256=aNHP65hNXYQBWBTfhaj_S5XYzmAHhjwcAfGhbm83__o,18043
 mapillary_tools/commands/__init__.py,sha256=41CFrPLGlG3566uhxssEF3TGAtSpADFPPcDMHbViU0E,171
@@ -69,9 +69,9 @@ mapillary_tools/mp4/simple_mp4_builder.py,sha256=9TUGk1hzI6mQFN1P30jwHL3dCYz3Zz7
 mapillary_tools/mp4/simple_mp4_parser.py,sha256=g3vvPhBoNu7anhVzC5_XQCV7IwfRWro1vJ6d6GyDkHE,6315
 mapillary_tools/serializer/description.py,sha256=ECnQxC-1LOgkAKE5qFi9Y2KuCeH8KPUjjNFDiwebjvo,18647
 mapillary_tools/serializer/gpx.py,sha256=_xx6gHjaWHrlXaUpB5GGBrbRKzbExFyIzWWAH-CvksI,4383
-mapillary_tools-0.14.4.dist-info/licenses/LICENSE,sha256=l2D8cKfFmmJq_wcVq_JElPJrlvWQOzNWx7gMLINucxc,1292
-mapillary_tools-0.14.4.dist-info/METADATA,sha256=DmtexHTWyoTovIswRtvkT638DbdPNXcfVfPcaCflu4w,22200
-mapillary_tools-0.14.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mapillary_tools-0.14.4.dist-info/entry_points.txt,sha256=A3f3LP-BO_P-U8Y29QfpT4jx6Mjk3sXjTi2Yew4bvj8,75
-mapillary_tools-0.14.4.dist-info/top_level.txt,sha256=FbDkMgOrt1S70ho1WSBrOwzKOSkJFDwwqFOoY5-527s,16
-mapillary_tools-0.14.4.dist-info/RECORD,,
+mapillary_tools-0.14.5.dist-info/licenses/LICENSE,sha256=l2D8cKfFmmJq_wcVq_JElPJrlvWQOzNWx7gMLINucxc,1292
+mapillary_tools-0.14.5.dist-info/METADATA,sha256=DId1oYdgfsgoOtZyp7J3Nnu5TyIY6aaGpGsPGuCWv9k,22200
+mapillary_tools-0.14.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mapillary_tools-0.14.5.dist-info/entry_points.txt,sha256=A3f3LP-BO_P-U8Y29QfpT4jx6Mjk3sXjTi2Yew4bvj8,75
+mapillary_tools-0.14.5.dist-info/top_level.txt,sha256=FbDkMgOrt1S70ho1WSBrOwzKOSkJFDwwqFOoY5-527s,16
+mapillary_tools-0.14.5.dist-info/RECORD,,