chore: remove deprecated code and usage

Author: ptpt

mapillary_tools/commands/__init__.py

@@ -5,7 +5,6 @@
     process_and_upload,
     sample_video,
     upload,
-    upload_camm,
     video_process,
     video_process_and_upload,
 )

mapillary_tools/commands/__main__.py

@@ -12,9 +12,6 @@
     process_and_upload,
     sample_video,
     upload,
-    upload_blackvue,
-    upload_camm,
-    upload_zip,
     video_process,
     video_process_and_upload,
     zip,
@@ -23,9 +20,6 @@
 mapillary_tools_commands = [
     process,
     upload,
-    upload_camm,
-    upload_blackvue,
-    upload_zip,
     sample_video,
     video_process,
     authenticate,

mapillary_tools/commands/process.py

@@ -107,18 +107,6 @@ def add_basic_arguments(self, parser: argparse.ArgumentParser):
             default=None,
             required=False,
         )
-        group_metadata.add_argument(
-            "--add_file_name",
-            help="[DEPRECATED since v0.9.4] Add original file name to EXIF.",
-            action="store_true",
-            required=False,
-        )
-        group_metadata.add_argument(
-            "--add_import_date",
-            help="[DEPRECATED since v0.10.0] Add import date.",
-            action="store_true",
-            required=False,
-        )
         group_metadata.add_argument(
             "--orientation",
             help="Specify the image orientation in degrees. Note this might result in image rotation. Note this input has precedence over the input read from the import source file.",
@@ -139,12 +127,6 @@ def add_basic_arguments(self, parser: argparse.ArgumentParser):
             default=None,
             required=False,
         )
-        group_metadata.add_argument(
-            "--custom_meta_data",
-            help='[DEPRECATED since v0.10.0] Add custom meta data to all images. Required format of input is a string, consisting of the meta data name, type and value, separated by a comma for each entry, where entries are separated by semicolon. Supported types are long, double, string, boolean, date. Example for two meta data entries "random_name1,double,12.34;random_name2,long,1234".',
-            default=None,
-            required=False,
-        )
 
         group_geotagging = parser.add_argument_group(
             f"{constants.ANSI_BOLD}PROCESS GEOTAGGING OPTIONS{constants.ANSI_RESET_ALL}"

mapillary_tools/commands/sample_video.py

@@ -28,13 +28,6 @@ def add_basic_arguments(self, parser: argparse.ArgumentParser):
             type=float,
             required=False,
         )
-        group.add_argument(
-            "--video_duration_ratio",
-            help="[DEPRECATED since v0.10.0] Real time video duration ratio of the under or oversampled video duration. [default: %(default)s]",
-            type=float,
-            default=constants.VIDEO_DURATION_RATIO,
-            required=False,
-        )
         group.add_argument(
             "--video_start_time",
             help="Video start time specified in YYYY_MM_DD_HH_MM_SS_sss in UTC. For example 2020_12_28_12_36_36_508 represents 2020-12-28T12:36:36.508Z.",

mapillary_tools/commands/upload_blackvue.py

@@ -46,31 +46,6 @@ class PointWithFix(Point):
     gps_ground_speed: T.Optional[float]
 
 
-def _ecef_from_lla_DEPRECATED(
-    lat: float, lon: float, alt: float
-) -> T.Tuple[float, float, float]:
-    """
-    Deprecated because it is slow. Keep here for reference and comparison.
-    Use _ecef_from_lla2 instead.
-
-    Compute ECEF XYZ from latitude, longitude and altitude.
-
-    All using the WGS94 model.
-    Altitude is the distance to the WGS94 ellipsoid.
-    Check results here http://www.oc.nps.edu/oc2902w/coord/llhxyz.htm
-
-    """
-    a2 = WGS84_a**2
-    b2 = WGS84_b**2
-    lat = math.radians(lat)
-    lon = math.radians(lon)
-    L = 1.0 / math.sqrt(a2 * math.cos(lat) ** 2 + b2 * math.sin(lat) ** 2)
-    x = (a2 * L + alt) * math.cos(lat) * math.cos(lon)
-    y = (a2 * L + alt) * math.cos(lat) * math.sin(lon)
-    z = (b2 * L + alt) * math.sin(lat)
-    return x, y, z
-
-
 def _ecef_from_lla2(lat: float, lon: float) -> T.Tuple[float, float, float]:
     """
     Compute ECEF XYZ from latitude, longitude and altitude.

mapillary_tools/commands/upload_camm.py

@@ -17,7 +17,6 @@
     config,
     constants,
     exceptions,
-    geo,
     history,
     ipc,
     types,
@@ -27,11 +26,8 @@
     VERSION,
 )
 from .geotag import (
-    blackvue_parser,
     camm_builder,
-    camm_parser,
     simple_mp4_builder,
-    utils as video_utils,
 )
 from .types import FileType
 
@@ -682,22 +678,6 @@ def upload(
                         raise UploadError(ex) from ex
                     LOG.debug("Uploaded to cluster: %s", cluster_id)
 
-        if DirectUploadFileType.RAW_BLACKVUE in filetypes:
-            video_paths = utils.find_videos(
-                import_paths,
-                skip_subfolders=skip_subfolders,
-                check_file_suffix=check_file_suffix,
-            )
-            _upload_raw_blackvues_DEPRECATED(mly_uploader, video_paths)
-
-        if DirectUploadFileType.RAW_CAMM in filetypes:
-            video_paths = utils.find_videos(
-                import_paths,
-                skip_subfolders=skip_subfolders,
-                check_file_suffix=check_file_suffix,
-            )
-            _upload_raw_camm_DEPRECATED(mly_uploader, video_paths)
-
         if DirectUploadFileType.ZIP in filetypes:
             zip_paths = utils.find_zipfiles(
                 import_paths,
@@ -743,111 +723,6 @@ def upload(
         LOG.info("Nothing uploaded. Bye.")
 
 
-def _check_blackvue_DEPRECATED(video_path: Path) -> None:
-    # Skip in tests only because we don't have valid sample blackvue for tests
-    if os.getenv("MAPILLARY__DISABLE_BLACKVUE_CHECK") == "YES":
-        return
-
-    points = blackvue_parser.parse_gps_points(video_path)
-    if not points:
-        raise exceptions.MapillaryGPXEmptyError("No GPS found in the BlackVue video")
-
-    stationary = video_utils.is_video_stationary(
-        geo.get_max_distance_from_start([(p.lat, p.lon) for p in points])
-    )
-    if stationary:
-        raise exceptions.MapillaryStationaryVideoError("Stationary BlackVue video")
-
-
-def _upload_raw_blackvues_DEPRECATED(
-    mly_uploader: uploader.Uploader,
-    video_paths: T.Sequence[Path],
-) -> None:
-    for idx, video_path in enumerate(video_paths):
-        event_payload: uploader.Progress = {
-            "total_sequence_count": len(video_paths),
-            "sequence_idx": idx,
-            "file_type": DirectUploadFileType.RAW_BLACKVUE.value,
-            "import_path": str(video_path),
-        }
-
-        try:
-            _check_blackvue_DEPRECATED(video_path)
-        except Exception as ex:
-            LOG.warning(
-                "Skipping %s %s due to: %s",
-                DirectUploadFileType.RAW_BLACKVUE.value.upper(),
-                video_path.name,
-                ex,
-            )
-            continue
-
-        with video_path.open("rb") as fp:
-            upload_md5sum = utils.md5sum_fp(fp).hexdigest()
-            try:
-                cluster_id = mly_uploader.upload_stream(
-                    fp,
-                    upload_api_v4.ClusterFileType.BLACKVUE,
-                    upload_md5sum,
-                    event_payload=event_payload,
-                )
-            except Exception as ex:
-                raise UploadError(ex) from ex
-        LOG.debug("Uploaded to cluster: %s", cluster_id)
-
-
-def _check_camm_DEPRECATED(video_path: Path) -> None:
-    # Skip in tests only because we don't have valid sample CAMM for tests
-    if os.getenv("MAPILLARY__DISABLE_CAMM_CHECK") == "YES":
-        return
-
-    points = camm_parser.parse_gpx(video_path)
-    if not points:
-        raise exceptions.MapillaryGPXEmptyError("No GPS found in the CAMM video")
-
-    stationary = video_utils.is_video_stationary(
-        geo.get_max_distance_from_start([(p.lat, p.lon) for p in points])
-    )
-    if stationary:
-        raise exceptions.MapillaryStationaryVideoError("Stationary CAMM video")
-
-
-def _upload_raw_camm_DEPRECATED(
-    mly_uploader: uploader.Uploader,
-    video_paths: T.Sequence[Path],
-) -> None:
-    for idx, video_path in enumerate(video_paths):
-        event_payload: uploader.Progress = {
-            "total_sequence_count": len(video_paths),
-            "sequence_idx": idx,
-            "file_type": DirectUploadFileType.RAW_CAMM.value,
-            "import_path": str(video_path),
-        }
-        try:
-            _check_camm_DEPRECATED(video_path)
-        except Exception as ex:
-            LOG.warning(
-                "Skipping %s %s due to: %s",
-                DirectUploadFileType.RAW_CAMM.value.upper(),
-                video_path.name,
-                ex,
-            )
-            continue
-        try:
-            with video_path.open("rb") as fp:
-                upload_md5sum = utils.md5sum_fp(fp).hexdigest()
-                cluster_id = mly_uploader.upload_stream(
-                    fp,
-                    upload_api_v4.ClusterFileType.CAMM,
-                    upload_md5sum,
-                    event_payload=event_payload,
-                )
-        except Exception as ex:
-            raise UploadError(ex) from ex
-
-        LOG.debug("Uploaded to cluster: %s", cluster_id)
-
-
 def _upload_zipfiles(
     mly_uploader: uploader.Uploader,
     zip_paths: T.Sequence[Path],

mapillary_tools/commands/upload_zip.py

@@ -21,7 +21,7 @@
 )
 
 
-PROCESS_FLAGS = "--add_import_date"
+PROCESS_FLAGS = ""
 
 _DEFAULT_EXPECTED_DESCS = {
     "DSC00001.JPG": {