mapillary-tools 0.12.1__py3-none-any.whl → 0.13.1a1__py3-none-any.whl

mapillary_tools/geotag/geotag_videos_from_exiftool_video.py

@@ -6,8 +6,9 @@ from pathlib import Path
 
 from tqdm import tqdm
 
-from .. import exceptions, exiftool_read, geo, types
+from .. import exceptions, exiftool_read, geo, types, utils
 from ..exiftool_read_video import ExifToolReadVideo
+from ..telemetry import GPSPoint
 from . import gpmf_gps_filter, utils as video_utils
 from .geotag_from_generic import GeotagVideosFromGeneric
 
@@ -45,11 +46,11 @@ class GeotagVideosFromExifToolVideo(GeotagVideosFromGeneric):
             points = geo.extend_deduplicate_points(points)
             assert points, "must have at least one point"
 
-            if all(isinstance(p, geo.PointWithFix) for p in points):
+            if all(isinstance(p, GPSPoint) for p in points):
                 points = T.cast(
                     T.List[geo.Point],
                     gpmf_gps_filter.remove_noisy_points(
-                        T.cast(T.List[geo.PointWithFix], points)
+                        T.cast(T.List[GPSPoint], points)
                     ),
                 )
                 if not points:
@@ -65,6 +66,7 @@ class GeotagVideosFromExifToolVideo(GeotagVideosFromGeneric):
             video_metadata = types.VideoMetadata(
                 video_path,
                 md5sum=None,
+                filesize=utils.get_file_size(video_path),
                 filetype=types.FileType.VIDEO,
                 points=points,
                 make=exif.extract_make(),

mapillary_tools/geotag/geotag_videos_from_video.py

@@ -6,15 +6,11 @@ from pathlib import Path
 
 from tqdm import tqdm
 
-from .. import exceptions, geo, types
-from . import (
-    blackvue_parser,
-    camm_parser,
-    gpmf_gps_filter,
-    gpmf_parser,
-    simple_mp4_parser as parser,
-    utils as video_utils,
-)
+from .. import exceptions, geo, types, utils
+from ..camm import camm_parser
+from ..mp4 import simple_mp4_parser as sparser
+from ..telemetry import GPSPoint
+from . import blackvue_parser, gpmf_gps_filter, gpmf_parser, utils as video_utils
 from .geotag_from_generic import GeotagVideosFromGeneric
 
 LOG = logging.getLogger(__name__)
@@ -77,7 +73,7 @@ class GeotagVideosFromVideo(GeotagVideosFromGeneric):
             with video_path.open("rb") as fp:
                 try:
                     points = camm_parser.extract_points(fp)
-                except parser.ParsingError:
+                except sparser.ParsingError:
                     points = None
 
                 if points is not None:
@@ -86,6 +82,7 @@ class GeotagVideosFromVideo(GeotagVideosFromGeneric):
                     return types.VideoMetadata(
                         filename=video_path,
                         md5sum=None,
+                        filesize=utils.get_file_size(video_path),
                         filetype=types.FileType.CAMM,
                         points=points,
                         make=make,
@@ -100,7 +97,7 @@ class GeotagVideosFromVideo(GeotagVideosFromGeneric):
             with video_path.open("rb") as fp:
                 try:
                     points_with_fix = gpmf_parser.extract_points(fp)
-                except parser.ParsingError:
+                except sparser.ParsingError:
                     points_with_fix = None
 
                 if points_with_fix is not None:
@@ -109,6 +106,7 @@ class GeotagVideosFromVideo(GeotagVideosFromGeneric):
                     return types.VideoMetadata(
                         filename=video_path,
                         md5sum=None,
+                        filesize=utils.get_file_size(video_path),
                         filetype=types.FileType.GOPRO,
                         points=T.cast(T.List[geo.Point], points_with_fix),
                         make=make,
@@ -123,7 +121,7 @@ class GeotagVideosFromVideo(GeotagVideosFromGeneric):
             with video_path.open("rb") as fp:
                 try:
                     points = blackvue_parser.extract_points(fp)
-                except parser.ParsingError:
+                except sparser.ParsingError:
                     points = None
 
                 if points is not None:
@@ -132,6 +130,7 @@ class GeotagVideosFromVideo(GeotagVideosFromGeneric):
                     return types.VideoMetadata(
                         filename=video_path,
                         md5sum=None,
+                        filesize=utils.get_file_size(video_path),
                         filetype=types.FileType.BLACKVUE,
                         points=points,
                         make=make,
@@ -160,11 +159,11 @@ class GeotagVideosFromVideo(GeotagVideosFromGeneric):
             video_metadata.points = geo.extend_deduplicate_points(video_metadata.points)
             assert video_metadata.points, "must have at least one point"
 
-            if all(isinstance(p, geo.PointWithFix) for p in video_metadata.points):
+            if all(isinstance(p, GPSPoint) for p in video_metadata.points):
                 video_metadata.points = T.cast(
                     T.List[geo.Point],
                     gpmf_gps_filter.remove_noisy_points(
-                        T.cast(T.List[geo.PointWithFix], video_metadata.points)
+                        T.cast(T.List[GPSPoint], video_metadata.points)
                     ),
                 )
                 if not video_metadata.points:

mapillary_tools/geotag/gpmf_gps_filter.py

@@ -2,6 +2,7 @@ import logging
 import typing as T
 
 from .. import constants, geo
+from ..telemetry import GPSPoint
 from . import gps_filter
 
 """
@@ -13,8 +14,8 @@ LOG = logging.getLogger(__name__)
 
 
 def remove_outliers(
-    sequence: T.Sequence[geo.PointWithFix],
-) -> T.Sequence[geo.PointWithFix]:
+    sequence: T.Sequence[GPSPoint],
+) -> T.Sequence[GPSPoint]:
     distances = [
         geo.gps_distance((left.lat, left.lon), (right.lat, right.lon))
         for left, right in geo.pairwise(sequence)
@@ -37,9 +38,7 @@ def remove_outliers(
         "Split to %d sequences with max distance %f", len(sequences), max_distance
     )
 
-    ground_speeds = [
-        p.gps_ground_speed for p in sequence if p.gps_ground_speed is not None
-    ]
+    ground_speeds = [p.ground_speed for p in sequence if p.ground_speed is not None]
     if len(ground_speeds) < 2:
         return sequence
 
@@ -50,20 +49,20 @@ def remove_outliers(
     )
 
     return T.cast(
-        T.List[geo.PointWithFix],
+        T.List[GPSPoint],
         gps_filter.find_majority(merged.values()),
     )
 
 
 def remove_noisy_points(
-    sequence: T.Sequence[geo.PointWithFix],
-) -> T.Sequence[geo.PointWithFix]:
+    sequence: T.Sequence[GPSPoint],
+) -> T.Sequence[GPSPoint]:
     num_points = len(sequence)
     sequence = [
         p
         for p in sequence
         # include points **without** GPS fix
-        if p.gps_fix is None or p.gps_fix.value in constants.GOPRO_GPS_FIXES
+        if p.fix is None or p.fix.value in constants.GOPRO_GPS_FIXES
     ]
     if len(sequence) < num_points:
         LOG.debug(
@@ -77,7 +76,7 @@ def remove_noisy_points(
         p
         for p in sequence
         # include points **without** precision
-        if p.gps_precision is None or p.gps_precision <= constants.GOPRO_MAX_DOP100
+        if p.precision is None or p.precision <= constants.GOPRO_MAX_DOP100
     ]
     if len(sequence) < num_points:
         LOG.debug(