Added two more cities

Daoortor · Dec 9, 2024 · c8b2d2c · c8b2d2c
1 parent 3f49228
commit c8b2d2c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/data/raw/gtfs_milan.zip b/data/raw/gtfs_milan.zip
diff --git a/data/raw/gtfs_stockholm.zip b/data/raw/gtfs_stockholm.zip
diff --git a/scripts/bot.py b/scripts/bot.py
@@ -16,6 +16,10 @@
 SELECTED_DATASET = {}  # {user_id: dataset_name}
 
 
+def parse_message(message: str) -> str:
+    return message.replace('—', '--')
+
+
 def run_command(dataset: str, command: str) -> str:
     print(f'Running command: {command}')
     result = ""
@@ -99,6 +103,8 @@ def route_command(message):
 
     user_input = message.text.strip().removeprefix('/')
 
+    user_input = parse_message(user_input)
+
     result = run_command(SELECTED_DATASET[message.chat.id], user_input)
 
     bot.send_message(message.chat.id, result)

diff --git a/scripts/convert.py b/scripts/convert.py
@@ -18,8 +18,9 @@
 
 cities = [
     ('hamburg', date(2020, 3, 20)),  # GTFS data date: 20 March 2020
-    # ('rome', date(2020, 3, 24)),  # GTFS data date: 24 March 2020
-    ('paris', date(2021, 3, 25))  # GTFS data date: 25 March 2021
+    ('milan', date(2021, 9, 8)),  # GTFS data date: 8 September 2021
+    ('paris', date(2021, 3, 25)),  # GTFS data date: 25 March 2021
+    ('stockholm', date(2020, 2, 24)),  # GTFS data date: 24 February 2020
 ]
 
 # ====================================================== Settings ======================================================

diff --git a/scripts/src/convert_trips.py b/scripts/src/convert_trips.py
@@ -18,10 +18,10 @@
 }
 TRIPS_COLUMNS = {
     'route_id': str,
-    'trip_id': 'int64'
+    'trip_id': str
 }
 STOP_TIMES_COLUMNS = {
-    'trip_id': 'int64',
+    'trip_id': str,
     'stop_id': str,
     'arrival_time': str,
     'departure_time': str,

diff --git a/test/main.cpp b/test/main.cpp
@@ -99,6 +99,20 @@ TEST_CASE("Pathfinder test") {
             ).check();
         }
     }
+
+    SUBCASE("Milan") {
+        TransportSystem milan(QDir(PROJECT_ROOT_PATH "/data/gtfs_milan"));
+        QDate milanDate(2020, 03, 24);
+
+        REQUIRE(milan.isValid());
+    }
+
+    SUBCASE("Stockholm") {
+        TransportSystem stockholm(QDir(PROJECT_ROOT_PATH "/data/gtfs_stockholm"));
+        QDate stockholmDate(2020, 03, 24);
+
+        REQUIRE(stockholm.isValid());
+    }
 }
 
 TEST_CASE("Substring find test") {