feat(fixers): stop names with double spaces before number, converted …

…to comma+space before number
David-Lor · May 2, 2024 · 645b968 · 645b968
1 parent eecc5f7
commit 645b968
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/vigobus/datasources/fixers.py b/vigobus/datasources/fixers.py
@@ -32,8 +32,11 @@ class Buses:
     @classmethod
     def stop_name(cls, original_name: str) -> str:
 
+        # Replace double spaces between a number, with a comma
+        name = re.sub(r'\s{2}(\d)', r', \1', original_name)
+
         # Remove double spaces
-        name = re.sub(' +', ' ', original_name)
+        name = re.sub(' +', ' ', name)
 
         # Replace - with commas
         name = name.replace("-", ",")

diff --git a/vigobus/datasources/test_fixers.py b/vigobus/datasources/test_fixers.py
@@ -17,17 +17,19 @@ def test_fix_bus_line_route(line, route, expected_line, expected_route):
 @pytest.mark.parametrize("name, expected_name", [
     # TODO Update after implementing "Replace double spaces present before a number at the end, with a comma+space"
     # If expected_name=True, expect it to be equal to name
-    ("Rúa de Jenaro de la Fuente  29", "Rúa de Jenaro de la Fuente 29"),
-    ("Estrada de Moledo  6", "Estrada de Moledo 6"),
+    ("Rúa de Jenaro de la Fuente  29", "Rúa de Jenaro de la Fuente, 29"),
+    ("Estrada de Moledo  6", "Estrada de Moledo, 6"),
     ("Estrada de Moledo, 6", True),
-    ("Rúa de Tomás Paredes  4", "Rúa de Tomás Paredes 4"),
+    ("Estrada de  Moledo  6", "Estrada de Moledo, 6"),
+    ("Estrada de Moledo 6", True),
+    ("Rúa de Tomás Paredes  4", "Rúa de Tomás Paredes, 4"),
     ("Rúa da Pedra Seixa (Colexio)", True),
     ("Rúa de Pi i Margall (fronte 5)", "Rúa de Pi i Margall (Fronte 5)"),
     ("Subida á Madroa (fronte Campo Fútbol)", "Subida á Madroa (Fronte Campo Fútbol)"),
     ("Rúa de Manuel Álvarez (fronte cruce Camiño Sulevada)", "Rúa de Manuel Álvarez (Fronte Cruce Camiño Sulevada)"),
     ("Estrada de Fragoselo (cruce Camiño Río da Barxa)", "Estrada de Fragoselo (Cruce Camiño Río da Barxa)"),
     ("Rúa Castañal (cruce Camiño das Presas)", "Rúa Castañal (Cruce Camiño das Presas)"),
-    ("Rúa das Teixugueiras  19-Portal 5", "Rúa das Teixugueiras 19, Portal 5"),
+    ("Rúa das Teixugueiras  19-Portal 5", "Rúa das Teixugueiras, 19, Portal 5"),
     ("Rúa de Santo Amaro (Praza de España)", True),
     ("Rúa do Gaiteiro de Ricardo Portela (fronte Pavillón)", "Rúa do Gaiteiro de Ricardo Portela (Fronte Pavillón)"),
     ("Telecomunicacións (CUVI)", "Telecomunicacións (Universidade)"),