Skip to content

Commit 63b90ce

Browse files
mikeqfumikeqfu
authored
Bump version to 1.0.1 (#43)
1 parent ee31fcf commit 63b90ce

20 files changed

+995
-732
lines changed

‎CHANGELOG.md

+64-50
Large diffs are not rendered by default.

‎docs/source/requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
furo==2024.8.6
2-
pyhelpers==2.1.0
2+
pyhelpers==2.2.0
33
sphinx-copybutton==0.5.2
4-
sphinx-new-tab-link==0.6.1
4+
sphinx-new-tab-link==0.7.0
55
sphinx-toggleprompt==0.6.0

‎pyrcs/__init__.py

+7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import json
77
import pkgutil
88

9+
from . import collector, converter, line_data, other_assets, parser, utils
910
from .collector import LineData, OtherAssets
1011
from .line_data import Bridges, ELRMileages, Electrification, LOR, LineNames, LocationIdentifiers, \
1112
TrackDiagrams
@@ -29,6 +30,12 @@
2930
__first_release__ = metadata['First release']
3031

3132
__all__ = [
33+
'collector',
34+
'converter',
35+
'parser',
36+
'utils',
37+
'line_data',
38+
'other_assets',
3239
'LineData',
3340
'OtherAssets',
3441
'Electrification',

‎pyrcs/data/.metadata

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"Author": "Qian Fu",
66
"Affiliation": "School of Engineering, University of Birmingham",
77
"Email": "q.fu@bham.ac.uk",
8-
"Version": "1.0.0",
8+
"Version": "1.0.1",
99
"License": "MIT License",
1010
"First release": "August 2019"
1111
}

‎pyrcs/data/location-names-errata-regex.json

+148-147
Original file line numberDiff line numberDiff line change
@@ -1,149 +1,150 @@
11
{
2-
" \\(DC lines\\)": " [DC lines]",
3-
" And | \\+ ": " & ",
4-
"-By-": "-by-",
5-
"-In-": "-in-",
6-
"-En-Le-": "-en-le-",
7-
"-La-": "-la-",
8-
"-Le-": "-le-",
9-
"-On-": "-on-",
10-
"-The-": "-the-",
11-
" Of ": " of ",
12-
"-Super-": "-super-",
13-
"-Upon-": "-upon-",
14-
"-Under-": "-under-",
15-
"-Y-": "-y-",
16-
" A\\.C\\.C\\.": " Avon County Council",
17-
" A\\.B\\.P\\.": " Associated British Ports",
18-
" A C E ": " Area Civil Engineer's ",
19-
" Bardon Aggs": " Bardon Aggregates",
20-
"Bordsley": "Bordesley",
21-
" B\\.T\\.P\\.": " British Tar Products",
22-
" C\\. Sidings| C\\.S\\.$| Cs$": " Carriage Sidings",
23-
" C\\.C\\.E\\.": " Chief Civil Engineer's Sidings",
24-
" C\\.E\\.Sdgs": " Civil Engineer's Sidings",
25-
" Car\\. ?M\\.D\\.?| Cmd": " Carriage Maintenance Depot",
26-
" C\\.H\\.S\\.?| C H S": " Carriage Holding Sidings",
27-
" Charrgtn": " Charrington Coal Concentration Depot",
28-
"CLAPS47|CLAPJ 147": "Clapham Junction Signal T147",
29-
" Cm$": " CM",
30-
" C\\.O\\.D\\.": " Central Ordnance Depot",
31-
" C\\.P\\.A\\.": " Clyde Ports Authority",
32-
" C\\.Pt\\. ": " Crown Point ",
33-
" C\\.S\\.M\\.D\\.": " Carriage Servicing & Maintenance Depot",
34-
" C\\.S\\.D\\.": " Carriage Servicing Depot",
35-
" \\(DBS\\)": " DB Schenker",
36-
" Depot\\.": " Depot",
37-
" D&U\\.G\\.L\\.": " Down & Up Goods Loop",
38-
" D\\.D\\. H\\.S\\.": " Diesel Depot Holding Sidings",
39-
" D\\.G\\.L\\.?| D G L": " Down Goods Loop",
40-
" D\\.H\\.S\\.": " Down Holding Sidings",
41-
" D\\.?P\\.?L\\.?": " Down Passenger Loop",
42-
" D\\.M\\.U\\.D\\.?| DMU Depot": " Diesel Multiple Unit Depot",
43-
" D\\.R\\.S\\.": " Down Refuge Siding",
44-
" Dn ": " Down ",
45-
" Dsn": " Down Sidings North",
46-
" Dss": " Down Sidings South",
47-
"\\. E\\. ": " East ",
48-
"Earls ": "Earl's ",
49-
" Eccq ": " ECC Quarries ",
50-
" Emd$": " Electric Maintenance Depot",
51-
" E\\.M\\.U\\.D\\.?": " Electric Multiple Unit Depot",
52-
" E\\.M\\.U\\. ": " Electric Multiple Unit ",
53-
" E\\.P\\.S\\.": " European Passenger Services",
54-
" \\(EWS\\)": " English Welsh & Scottish Railway",
55-
" Eur Frt Ops Cntre": " European Freight Operations Centre",
56-
" F\\.C\\.": " Flat Crossing",
57-
" F\\.D\\.": " Freight Depot",
58-
" F\\.O\\.B\\.": " Foreign Ore Branch",
59-
" Ept": " Europort",
60-
"\\(F'Liners\\)|F/L": "Freightliner",
61-
"\\(Ff\\)": " Fastline Freight",
62-
" F[Ll]?[Hh][Hh]| \\(F[Ll]?[Hh][Hh]\\)| Fliner HH": " Freightliner Heavy Haul",
63-
" F\\.L\\.T\\.| FLT| \\(FLT\\)|\\.\\.F\\.L\\.T\\.": " Freightliner Terminal",
64-
" \\(F[Ll][Tt]\\)": " Freightliner",
65-
" Ryans F\\.W\\.": " Ryans Fletchers Wharf",
66-
" GBR[Ff]| \\(GBR[Ff]\\)| Gbf": " GB Railfreight",
67-
" G\\.C\\.": " Garden City",
68-
" G\\.F\\.": " Ground Frame",
69-
" Gp ": " Group ",
70-
" G\\.S\\.P\\.": " Ground Shunt Panel",
71-
" Gds Lp| Gds Loop": " Goods Loop",
72-
" H\\.L\\.": " High Level",
73-
" H\\.S\\.": " Holding Sidings",
74-
" Ntl Pwr": " National Power",
75-
" Nth\\.? ": " North ",
76-
" I\\.B\\.": " Intermediate Block",
77-
" I\\.C\\.I\\.": " ICI",
78-
" I\\.?R\\.?F\\.?T\\.?": " International Rail Freight Terminal",
79-
" I[Ss][Uu]": " Infrastructure Servicing Unit",
80-
" Isu \\(CE\\)": " Civil Engineer's Sidings",
81-
" Int Rft Recep ": " International Rail Freight Reception ",
82-
" Intl E": " International East",
83-
" Intl W": " International West",
84-
" Jn\\.?| Jcn": " Junction",
85-
" JN HL ": " Junction High Level ",
86-
" J\\.Yd ": " Junction Yard ",
87-
" L\\.C\\.| L Xing": " Level Crossing",
88-
" L\\.D\\.C\\.? ": " Local Distribution Centre ",
89-
" L\\.H\\.S\\.": " Loco Holding Siding",
90-
" L[. ]I[. ]P\\.? ?": " Loco Inspection Point",
91-
" L\\.L\\.| Ll": " Low Level",
92-
" Lmd| L\\.M\\.D\\.": " Light Maintenance Depot",
93-
" Ln": " Lane",
94-
" L\\.N\\.W\\. Junction Derby": " Derby LNW Junction",
95-
" Loco Hs": " Loco Holding Sidings",
96-
" M\\.C\\.T\\.": " Marine Container Terminal",
97-
" M\\.& E\\.E\\.": " Mechanical & Electrical Engineer",
98-
" M\\.R\\.C\\.": " Midland Railway Centre",
99-
" N\\.L\\.F\\.C\\.": " North London FC",
100-
" Ntl ": " National ",
101-
" N\\.R\\.M\\.": " National Railway Museum",
102-
" N\\.Y\\.| NY| N\\. Y\\.": " New Yard",
103-
" P\\.A\\.D\\.": " Pre-Assembly Depot",
104-
" P\\.S\\.| P Stn| Power Stn": " Power Station",
105-
" P'Way": " Permanent Way",
106-
" Pwr ": " Power ",
107-
" Prdc": " Princess Royal Distribution Centre",
108-
" R\\.C\\.T\\.": " Riverside Container Terminal",
109-
" Rd.?": " Road",
110-
" Recp\\.": " Reception",
111-
" \\(?RFD\\)?": " Railfreight Distribution",
112-
" R\\.T\\.S\\.?": " Refuse Transfer Station",
113-
" R\\.S GB ": " Refuge Siding GB ",
114-
" S\\.B\\.?| Sb| S B| Ss": " Signal Box",
115-
" S\\.S\\.": " Sorting Sidings",
116-
" S C C E": " Sandiacre Chief Civil Engineer's",
117-
" Sdg\\.?| Siding\\.": " Siding",
118-
" Sdgs": " Sidings",
119-
" Sdgs ": " Sidings ",
120-
" S[Ii][Gg]\\.? ": " Signal ",
121-
"Sig\\.Ty357": "Signal TY357",
122-
" Sth\\.? ": " South ",
123-
" South C\\.E\\.": " South Civil Engineer's Sidings",
124-
" \\(S\\.Yorks\\)": "Swinton (South Yorks)",
125-
" Steetley Coy": " Steetley Company",
126-
" Terml| Terminal\\.": " Terminal",
127-
" T\\.C\\.": " Terminal Complex",
128-
" T\\.?M\\.?D\\.?": " Traction Maintenance Depot",
129-
" T\\.?& ?R\\.S\\.M\\.D\\.?": " Traction & Rolling Stock Maintenance Depot",
130-
" U&Dgl": " Up & Down Goods Loop",
131-
" U\\.C\\.H\\.S\\.": " Up Carriage Holding Sidings",
132-
" U\\.G\\.L\\.": " Up Goods Loop",
133-
" U\\.P\\.L\\.": " Up Passenger Loop",
134-
" U\\.R\\.S\\.": " Up Relief Siding",
135-
" Usn": " Up Sidings North",
136-
" Uss": " Up Sidings South",
137-
" \\(VWL\\)": " Victa Westlink Rail",
138-
" \\(Vq\\)": " Virtual Quarry",
139-
" \\(West Mids\\)": " (West Midlands)",
140-
" W\\.R\\.D\\.": " Wagon Repair Depot",
141-
" W Yard": " West Yard",
142-
"west533": "Westerton Signal YH533",
143-
" Wks Lafarg": " Works Lafarge",
144-
" TURNBACK": " Turnback Siding",
145-
" Wtr Wh?f ": " Water Wharf ",
146-
"Warrington C\\.E\\. Sidings": "Warrington NCL/Civil Engineer's Sidings",
147-
" Wm Csd\\.": " West Marina Carriage Servicing Depot",
148-
" Yd ": " Yard "
2+
" \\(DC lines\\)": " [DC lines]",
3+
" And | \\+ ": " & ",
4+
"-By-": "-by-",
5+
"-In-": "-in-",
6+
"-En-Le-": "-en-le-",
7+
"-La-": "-la-",
8+
"-Le-": "-le-",
9+
"-On-": "-on-",
10+
"-The-": "-the-",
11+
" Of ": " of ",
12+
"-Super-": "-super-",
13+
"-Upon-": "-upon-",
14+
"-Under-": "-under-",
15+
"-Y-": "-y-",
16+
" A\\.C\\.C\\.": " Avon County Council",
17+
" A\\.B\\.P\\.": " Associated British Ports",
18+
" A C E ": " Area Civil Engineer's ",
19+
" Bardon Aggs": " Bardon Aggregates",
20+
"Bordsley": "Bordesley",
21+
" B\\.T\\.P\\.": " British Tar Products",
22+
" C\\. Sidings| C\\.S\\.$| Cs$": " Carriage Sidings",
23+
" C\\.C\\.E\\.": " Chief Civil Engineer's Sidings",
24+
" C\\.E\\.Sdgs": " Civil Engineer's Sidings",
25+
" Car\\. ?M\\.D\\.?| Cmd": " Carriage Maintenance Depot",
26+
" C\\.H\\.S\\.?| C H S": " Carriage Holding Sidings",
27+
" Charrgtn": " Charrington Coal Concentration Depot",
28+
"CLAPS47|CLAPJ 147": "Clapham Junction Signal T147",
29+
" Cm$": " CM",
30+
" C\\.O\\.D\\.": " Central Ordnance Depot",
31+
" C\\.P\\.A\\.": " Clyde Ports Authority",
32+
" C\\.Pt\\. ": " Crown Point ",
33+
" C\\.S\\.M\\.D\\.": " Carriage Servicing & Maintenance Depot",
34+
" C\\.S\\.D\\.": " Carriage Servicing Depot",
35+
" \\(DBS\\)": " DB Schenker",
36+
" Depot\\.": " Depot",
37+
" D&U\\.G\\.L\\.": " Down & Up Goods Loop",
38+
" D\\.D\\. H\\.S\\.": " Diesel Depot Holding Sidings",
39+
" D\\.G\\.L\\.?| D G L": " Down Goods Loop",
40+
" D\\.H\\.S\\.": " Down Holding Sidings",
41+
" D\\.?P\\.?L\\.?": " Down Passenger Loop",
42+
" D\\.M\\.U\\.D\\.?| DMU Depot": " Diesel Multiple Unit Depot",
43+
" D\\.R\\.S\\.": " Down Refuge Siding",
44+
" Dn ": " Down ",
45+
" Dsn": " Down Sidings North",
46+
" Dss": " Down Sidings South",
47+
"\\. E\\. ": " East ",
48+
"Earls ": "Earl's ",
49+
" Eccq ": " ECC Quarries ",
50+
" Emd$": " Electric Maintenance Depot",
51+
" E\\.M\\.U\\.D\\.?": " Electric Multiple Unit Depot",
52+
" E\\.M\\.U\\. ": " Electric Multiple Unit ",
53+
" E\\.P\\.S\\.": " European Passenger Services",
54+
" \\(EWS\\)": " English Welsh & Scottish Railway",
55+
" Eur Frt Ops Cntre": " European Freight Operations Centre",
56+
" F\\.C\\.": " Flat Crossing",
57+
" F\\.D\\.": " Freight Depot",
58+
" F\\.O\\.B\\.": " Foreign Ore Branch",
59+
" Ept": " Europort",
60+
"\\(F'Liners\\)|F/L": "Freightliner",
61+
"\\(Ff\\)": " Fastline Freight",
62+
" F[Ll]?[Hh][Hh]| \\(F[Ll]?[Hh][Hh]\\)| Fliner HH": " Freightliner Heavy Haul",
63+
" F\\.L\\.T\\.| FLT| \\(FLT\\)|\\.\\.F\\.L\\.T\\.": " Freightliner Terminal",
64+
" \\(F[Ll][Tt]\\)": " Freightliner",
65+
" Ryans F\\.W\\.": " Ryans Fletchers Wharf",
66+
" GBR[Ff]| \\(GBR[Ff]\\)| Gbf": " GB Railfreight",
67+
" G\\.C\\.": " Garden City",
68+
" G\\.F\\.": " Ground Frame",
69+
" Gp ": " Group ",
70+
" G\\.S\\.P\\.": " Ground Shunt Panel",
71+
" Gds Lp| Gds Loop": " Goods Loop",
72+
" H\\.L\\.": " High Level",
73+
" H\\.S\\.": " Holding Sidings",
74+
" Ntl Pwr": " National Power",
75+
" Nth\\.? ": " North ",
76+
" I\\.B\\.": " Intermediate Block",
77+
" I\\.C\\.I\\.": " ICI",
78+
" I\\.?R\\.?F\\.?T\\.?": " International Rail Freight Terminal",
79+
" I[Ss][Uu]": " Infrastructure Servicing Unit",
80+
" Isu \\(CE\\)": " Civil Engineer's Sidings",
81+
" Int Rft Recep ": " International Rail Freight Reception ",
82+
" Intl E": " International East",
83+
" Intl W": " International West",
84+
" Jn\\.?| Jcn": " Junction",
85+
" JN HL ": " Junction High Level ",
86+
" J\\.Yd ": " Junction Yard ",
87+
" L\\.C\\.| L Xing": " Level Crossing",
88+
" L\\.D\\.C\\.? ": " Local Distribution Centre ",
89+
" L\\.H\\.S\\.": " Loco Holding Siding",
90+
" L[. ]I[. ]P\\.? ?": " Loco Inspection Point",
91+
" L\\.L\\.| Ll": " Low Level",
92+
" Lmd| L\\.M\\.D\\.": " Light Maintenance Depot",
93+
" Ln": " Lane",
94+
" L\\.N\\.W\\. Junction Derby": " Derby LNW Junction",
95+
" Loco Hs": " Loco Holding Sidings",
96+
" M\\.C\\.T\\.": " Marine Container Terminal",
97+
" M\\.& E\\.E\\.": " Mechanical & Electrical Engineer",
98+
" M\\.R\\.C\\.": " Midland Railway Centre",
99+
" N\\.L\\.F\\.C\\.": " North London FC",
100+
" Ntl ": " National ",
101+
" N\\.R\\.M\\.": " National Railway Museum",
102+
" N\\.Y\\.| NY| N\\. Y\\.": " New Yard",
103+
" P\\.A\\.D\\.": " Pre-Assembly Depot",
104+
" P\\.S\\.| P Stn| Power Stn": " Power Station",
105+
" P'Way": " Permanent Way",
106+
" Pwr ": " Power ",
107+
" Prdc": " Princess Royal Distribution Centre",
108+
" R\\.C\\.T\\.": " Riverside Container Terminal",
109+
" Rd.?": " Road",
110+
" Recp\\.": " Reception",
111+
" \\(?RFD\\)?": " Railfreight Distribution",
112+
" R\\.T\\.S\\.?": " Refuse Transfer Station",
113+
" R\\.S GB ": " Refuge Siding GB ",
114+
" S\\.B\\.?| Sb| S B| Ss": " Signal Box",
115+
" S\\.S\\.": " Sorting Sidings",
116+
" S C C E": " Sandiacre Chief Civil Engineer's",
117+
" Sdg\\.?| Siding\\.": " Siding",
118+
" Sdgs": " Sidings",
119+
" Sdgs ": " Sidings ",
120+
" S[Ii][Gg]\\.? ": " Signal ",
121+
"Sig\\.Ty357": "Signal TY357",
122+
" Sth\\.? ": " South ",
123+
" South C\\.E\\.": " South Civil Engineer's Sidings",
124+
" \\(S\\.Yorks\\)": "Swinton (South Yorks)",
125+
" Steetley Coy": " Steetley Company",
126+
" Terml| Terminal\\.": " Terminal",
127+
" T\\.C\\.": " Terminal Complex",
128+
" T\\.?M\\.?D\\.?": " Traction Maintenance Depot",
129+
" T\\.?& ?R\\.S\\.M\\.D\\.?": " Traction & Rolling Stock Maintenance Depot",
130+
" U&Dgl": " Up & Down Goods Loop",
131+
" U\\.C\\.H\\.S\\.": " Up Carriage Holding Sidings",
132+
" U\\.G\\.L\\.": " Up Goods Loop",
133+
" U\\.P\\.L\\.": " Up Passenger Loop",
134+
" U\\.R\\.S\\.": " Up Relief Siding",
135+
" Usn": " Up Sidings North",
136+
" Uss": " Up Sidings South",
137+
" \\(VWL\\)": " Victa Westlink Rail",
138+
" \\(Vq\\)": " Virtual Quarry",
139+
" \\(West Mids\\)": " (West Midlands)",
140+
" W\\.R\\.D\\.": " Wagon Repair Depot",
141+
" W Yard": " West Yard",
142+
"west533": "Westerton Signal YH533",
143+
" Wks Lafarg": " Works Lafarge",
144+
" TURNBACK": " Turnback Siding",
145+
" Wtr Wh?f ": " Water Wharf ",
146+
"Warrington C\\.E\\. Sidings": "Warrington NCL/Civil Engineer's Sidings",
147+
" Wm Csd\\.": " West Marina Carriage Servicing Depot",
148+
" Yd ": " Yard ",
149+
"Leeds Balm Rd Loco (Fhh)": "Leeds Balm Road Loco Freightliner Heavy Haul"
149150
}

0 commit comments

Comments
 (0)