Fix 'Station' KeyError in Stations.collect_locations() (#52) (Closes #51)

Author: mikeqfu

docs/source/requirements.txt

@@ -1,4 +1,4 @@
-furo==2024.8.6
+furo==2025.7.19
 pyhelpers==2.3.0
 sphinx-copybutton==0.5.2
 sphinx-new-tab-link==0.8.0

pyrcs/other_assets/station.py

@@ -84,8 +84,6 @@ def _check_row_spans(dat):
     dat0[['ELR', 'Mileage']] = dat0[['ELR', 'Mileage']].map(lambda x: x.split(' &&& '))
     dat0 = dat0.explode(['ELR', 'Mileage'], ignore_index=True)
 
-    dat0.sort_values(['Station'], ignore_index=True, inplace=True)
-
     return dat0
 
 
@@ -122,22 +120,28 @@ def _parse_station_column(dat):
         x = 'Heathrow Junction [sometimes referred to as Heathrow Interchange]\t\t / [no CRS?]'
     """
 
-    temp1 = dat['Station'].str.split('\t\t', n=1, expand=True)
-    temp1.columns = ['Station', 'CRS']
-    dat['Station'] = temp1['Station'].str.rstrip(' / ').str.strip()
+    stn_col_name = [col for col in dat.columns if 'Station' in col][0]
+    temp1 = dat[stn_col_name].str.split('\t\t', n=1, expand=True)
+
+    if stn_col_name != 'Station':
+        dat.rename(columns={stn_col_name: 'Station'}, inplace=True)
+        stn_col_name = 'Station'
+
+    temp1.columns = [stn_col_name, 'CRS']
+    dat[stn_col_name] = temp1[stn_col_name].str.rstrip(' / ').str.strip()
 
     # Get notes for stations
     stn_note_ = pd.Series('', index=dat.index)
-    for i, x in enumerate(temp1['Station']):
+    for i, x in enumerate(temp1[stn_col_name]):
         if '[' in x and ']' in x:
             y = re.search(r' \[(.*)](✖.*)?', x).group(0)  # Station Note
-            dat.loc[i, 'Station'] = x.replace(y, '').strip()
+            dat.loc[i, stn_col_name] = str(x).replace(y, '').strip()
             if '✖' in y:
                 stn_note_[i] = '; '.join([y_.strip(' []') for y_ in y.split('✖')])
             else:
                 stn_note_[i] = y.strip(' []')
 
-    dat.insert(loc=dat.columns.get_loc('Station') + 1, column='Station Note', value=stn_note_)
+    dat.insert(loc=dat.columns.get_loc(stn_col_name) + 1, column='Station Note', value=stn_note_)
 
     temp2 = temp1['CRS'].str.replace(' / /', ' &&& ').str.split(
         r'  | / ', regex=True, expand=True).fillna('')
@@ -154,7 +158,7 @@ def _parse_station_column(dat):
         lambda z: ' and '.join(['{} [{}]'.format(*z_.split('✖')) for z_ in z.split(' &&& ')])
         if ' &&& ' in z else z).str.strip()
 
-    dat = pd.concat([dat, temp2], axis=1)
+    dat = pd.concat([dat, temp2], axis=1).sort_values(stn_col_name)
 
     return dat
 

requirements.txt

@@ -1,10 +1,11 @@
-build==1.2.2.post1
+build==1.3.0
 fqdn==1.5.1
-furo==2024.8.6
+furo==2025.7.19
 isoduration==20.11.0
 jaraco.collections==5.1.0
 jsonpointer==3.0.0
-notebook==7.4.4
+notebook==7.4.5
+pandas-stubs==2.3.2.250827
 pip-chill==1.0.3
 pkginfo==1.12.1.2
 pyhelpers==2.3.0
@@ -15,6 +16,6 @@ sphinx-new-tab-link==0.8.0
 sphinx-toggleprompt==0.6.0
 tinycss2==1.4.0
 tomli==2.0.1
-twine==6.1.0
+twine==6.2.0
 uri-template==1.3.0
 webcolors==24.11.1