moving old parsing style out, adding tests for the new style

Author: rok

ssim/regexes.py

@@ -128,14 +128,14 @@
     '\s'
     '(?P<days_of_operation>\d{7}){0,1}'
     '\s'
-    '(?P<number_of_seats>\d{3})*'
+    '(?P<seats>\d{3})*'
     '(?P<aircraft_type>\w{3})'
     '\s'
     '(?P<origin_station>[A-Z0-9]{3}){0,1}'
     '(?P<previous_station>[A-Z0-9]{3})'
-    '(?P<scheduled_time_of_arrival>\d{4})*'
+    '(?P<scheduled_time_of_arrival_utc>\d{4})*'
     '\s'
-    '(?P<scheduled_time_of_departure>\d{4})*'
+    '(?P<scheduled_time_of_departure_utc>\d{4})*'
     '(?P<overnight_indicator>[0-6]){0,1}'
     '(?P<next_station>[A-Z0-9]{3})'
     '(?P<destination_station>[A-Z0-9]{3}){0,1}'
@@ -158,12 +158,12 @@
     '(?P<days_of_operation>\d{7}){0,1}'
     '\s'
     '){0,1}'
-    '(?P<number_of_seats>\d{3})*'
+    '(?P<seats>\d{3})*'
     '(?P<aircraft_type>\w{3})'
     '\s'
     '(?P<origin_station>[A-Z0-9]{3}){0,1}'
     '(?P<previous_station>[A-Z0-9]{3})'
-    '(?P<scheduled_time_of_arrival>\d{4})*'
+    '(?P<scheduled_time_of_arrival_utc>\d{4})*'
     '\s'
     '(?P<arrival_service_type>[A-Z])'
     '(?P<frequency_rate>\d){0,1}'
@@ -183,10 +183,10 @@
     '(?P<days_of_operation>\d{7})'
     '\s'
     '){0,1}'
-    '(?P<number_of_seats>\d{3})*'
+    '(?P<seats>\d{3})*'
     '(?P<aircraft_type>\w{3})'
     '\s'
-    '(?P<scheduled_time_of_departure>\d{4})*'
+    '(?P<scheduled_time_of_departure_utc>\d{4})*'
     '(?P<next_station>[A-Z0-9]{3})'
     '(?P<destination_station>[A-Z0-9]{3}){0,1}'
     '\s'

ssim/ssim.py

@@ -184,13 +184,13 @@ def _uniformize_sir(slot):
             'service_type': slot['arrival_service_type'],
             'days_of_operation': slot['days_of_operation'],
             'frequency_rate': slot['frequency_rate'],
-            'number_of_seats': slot['number_of_seats'],
+            'seats': slot['seats'],
             'second_station': slot['origin_station'],
             'period_of_operation_from': slot['period_of_operation_from'],
             'period_of_operation_to': slot['period_of_operation_to'],
             'station': slot['previous_station'],
             'raw': slot['raw'],
-            'scheduled_time': slot['scheduled_time_of_arrival']})
+            'scheduled_time': slot['scheduled_time_of_arrival_utc']})
 
     if 'departure_airline_designator' in slot:
         uniform_slots.append({
@@ -206,11 +206,11 @@ def _uniformize_sir(slot):
             'second_station': slot['destination_station'],
             'frequency_rate': slot['frequency_rate'],
             'station': slot['next_station'],
-            'number_of_seats': slot['number_of_seats'],
+            'seats': slot['seats'],
             'period_of_operation_from': slot['period_of_operation_from'],
             'period_of_operation_to': slot['period_of_operation_to'],
             'raw': slot['raw'],
-            'scheduled_time': slot['scheduled_time_of_departure']})
+            'scheduled_time': slot['scheduled_time_of_departure_utc']})
 
     return uniform_slots
 
@@ -456,4 +456,4 @@ def _explode_aircraft_configuration_string(aircraft_configuration_string: str, r
             log_text += '\n Raw slot line: ' + raw_line
         logging.warning(log_text)
 
-    return acv_info
+    return acv_info