test that logs skipped route_types

aequilibrae/transit/lib_gtfs.py

@@ -7,7 +7,8 @@
 from pyproj import Transformer
 from shapely.geometry import Point, MultiLineString
 
-from aequilibrae.context import get_active_project, get_logger
+from aequilibrae.log import logger
+from aequilibrae.context import get_active_project
 from aequilibrae.project.database_connection import database_connection
 from aequilibrae.transit.constants import Constants, PATTERN_ID_MULTIPLIER
 from aequilibrae.transit.functions.get_srid import get_srid
@@ -39,7 +40,7 @@ def __init__(
         self.project = get_active_project(False)
         self.archive_dir = None  # type: str
         self.day = day
-        self.logger = get_logger()
+        self.logger = logger
         self.gtfs_data = GTFSReader()
 
         self.srid = get_srid()
@@ -123,7 +124,7 @@ def set_allow_map_match(self, allow=True):
 
         self.__do_execute_map_matching = allow
 
-    def map_match(self, route_types=[3]) -> None:  # noqa: B006
+    def map_match(self, route_types=(3)) -> None:  # noqa: B006
         """Performs map-matching for all routes of one or more types.
 
         Defaults to map-matching Bus routes (type 3) only.
@@ -139,6 +140,13 @@ def map_match(self, route_types=[3]) -> None:  # noqa: B006
         if any(not isinstance(item, int) for item in route_types):
             raise TypeError("All route types must be integers")
 
+        if any(e not in mode_correspondence for e in route_types):
+            missing_route_types = [e for e in route_types if e not in mode_correspondence]
+            logger.warning(
+                f"Skipping the following route_types as they have no corresponding road mode: {missing_route_types}"
+            )
+            route_types = [e for e in route_types if e in mode_correspondence]
+
         self.signal.emit(["start", len(self.select_patterns), "Map-matching patterns"])
         for i, pat in enumerate(self.select_patterns.values()):
             self.signal.emit(["update", i, f"Map-matching pattern {pat.pattern_id}"])

aequilibrae/transit/transit_elements/mode_correspondence.py

@@ -7,6 +7,6 @@
     # 5: '',
     # 6: '',
     # 7: '',
-    11: 't',
+    11: "t",
     # 12: "R",
 }

tests/aequilibrae/transit/test_lib_gtfs.py

@@ -47,10 +47,12 @@ def test_map_match_int_exception(system_builder):
         system_builder.map_match(route_types=[3.5])
 
 
-def test_map_match(transit_conn, system_builder):
+def test_map_match(transit_conn, system_builder, caplog):
     system_builder.load_date("2016-04-13")
     system_builder.set_allow_map_match(True)
-    system_builder.map_match()
+    system_builder.map_match([3, 1, 2])
+    assert "Skipping the following route_types as they have no corresponding road mode: [1, 2]" in caplog.text
+
     system_builder.save_to_disk()
 
     assert transit_conn.execute("SELECT * FROM pattern_mapping;").fetchone()[0] > 1