From 8703c0794367c68a747a96a671b7f172ee3428ca Mon Sep 17 00:00:00 2001 From: Quentin Godfroy Date: Thu, 26 Sep 2024 16:53:40 +0200 Subject: [PATCH] Fix Ashford There are two Ashford stations. Both are called Ashford International but one is for national rail services (CRS AFK, as in AshFord Kent) and one is for international rail services (CRS ASI AShford International). Various mix-up occured in the data. - 7968 was probably intended to be the international services station. Adding the proper SNCF code to it. Removing the same_as column and add the CRS code for it. - 8154 is the meta station. It has ATOC group code 386. SNCF knows it by code GBASD. - 8155 was intended to be Ashford International *national* services, guessing from the normalised code. It has CRS code AFK and SNCF code GBAJC. - 22673 was deleted. It has a same_as, generally indicating a misunderstanding of the subtelties. It did not contain meaningful information. Also - remove DB and Bene ids on Ashford as they're not served by these carriers and until the situation is made clearer - add the remaining normalised codes corresponding to each station / group Finally, there is some confusion in the UIC data and the NLOCs, did my best to collate the data. --- stations.csv | 7 +++---- test_data.rb | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/stations.csv b/stations.csv index c15699f..92837f6 100644 --- a/stations.csv +++ b/stations.csv @@ -6344,7 +6344,7 @@ id;name;slug;uic;uic8_sncf;latitude;longitude;parent_station_id;country;time_zon 7965;Worcester Foregate Street;worcester-foregate-street;7048930;70489302;52.194801;-2.220885;26815;GB;Europe/London;f;t;f;t;f;f;GBAIZ;;f;;f;7002348;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;WOF;t;GBAIZ;f;;f;f;;;;;;;;;;;;ウスター;우스터;;;Вустер;;;伍斯特;urn:trainline:public:nloc:at001068; 7966;Whimple;whimple;7057590;70575902;50.768253;-3.354243;;GB;Europe/London;f;f;f;t;f;f;GBAJA;;f;;f;7002389;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;WHM;t;GBAJA;f;;f;f;;;;;;;;;;;;;;;;;;;;urn:trainline:public:nloc:at002778; 7967;Andover;andover;7055100;70551002;51.212048;-1.493167;;GB;Europe/London;f;f;f;t;f;f;GBAJB;;f;;f;7000079;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;ADV;t;GBAJB;f;;f;f;;;;;;;;;;;;アンドーヴァー;앤도버;;;Андовер;;;;urn:trainline:public:nloc:at000071; -7968;Ashford International;ashford-international;;;51.143434;0.875153;8154;GB;Europe/London;f;f;f;f;f;f;GBAJC;;f;;f;7000107;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;;f;GBAJC;f;;f;f;8155;;;;;;;;;;;;;;;;;;;; +7968;Ashford International;ashford-international;7054660;70546606;51.142943;0.874444;8154;GB;Europe/London;f;f;f;f;f;f;GBASI;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;ASI;f;;f;;f;f;;;;;;;;;;;;;;;;;;;;urn:trainline:public:nloc:at005476; 7969;Harlech;harlech;7044580;70445809;52.861309;-4.109248;;GB;Europe/London;f;f;f;t;f;f;GBAJD;;f;;f;7001126;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;HRL;t;GBAJD;f;;f;f;;;;;;;;;;;;ハーレック;;;;;;;;urn:trainline:public:nloc:at001254; 7970;Tisbury;tisbury;7057980;70579805;51.060257;-2.078456;;GB;Europe/London;f;f;f;t;f;f;GBAJE;;f;;f;7002241;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;TIS;t;GBAJE;f;;f;f;;;;;;;;;;;;;;;;;;;;urn:trainline:public:nloc:at002602; 7971;Minffordd;minffordd;7044690;70446906;52.926464;-4.085625;;GB;Europe/London;f;f;f;t;f;f;GBAJF;;f;;f;7001493;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;MFF;t;GBAJF;f;;f;f;;;;;;;;;;;;;;;;;;;;urn:trainline:public:nloc:at001831; @@ -6530,8 +6530,8 @@ id;name;slug;uic;uic8_sncf;latitude;longitude;parent_station_id;country;time_zon 8151;Tunbridge Wells;tunbridge-wells;7052300;70523001;51.130119;0.262435;;GB;Europe/London;f;f;f;t;f;f;GBAQG;;f;;f;7002209;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;TBW;t;GBAQG;f;;f;f;;;;;;;;;;;;;;;;;;;皇家唐橋井;urn:trainline:public:nloc:at002638; 8152;Belfast Central;belfast-central;;;54.5953;-5.9172;;GB;Europe/London;f;f;f;t;f;f;;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;BFC;t;;f;;f;f;;;;;;;;;;;;ベルファスト;벨파스트;;;Белфаст;;;貝爾法斯特;urn:trainline:public:nloc:at000246; 8153;Arbroath;arbroath;7090790;70907907;56.559628;-2.588928;;GB;Europe/London;f;f;f;t;f;f;GBARB;;f;;f;7000087;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;ARB;t;GBARB;f;;f;f;;;;;;;;;;;;;;;;Арброт;;;阿布羅斯;urn:trainline:public:nloc:at000086; -8154;Ashford;ashford;7070512;70705129;;;;GB;Europe/London;t;f;f;f;f;f;GBASD;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;;f;;f;;f;f;;;;;;;;;;;;;애슈퍼드;;;Эшфорд;;;阿什福德;; -8155;Ashford International;ashford-international;7054660;70546606;51.143353;0.875167;8154;GB;Europe/London;f;t;f;t;f;f;GBASI;;f;;f;7098107;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;7000512;f;AFK;t;GBASI;f;;f;f;;;;;;;;;;;;;;;;;;;;urn:trainline:public:nloc:at000113; +8154;Ashford;ashford;;;51.14334;0.87516;;GB;Europe/London;t;f;f;f;f;f;GBASD;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;386;f;;f;;f;f;;;;;;;;;;;;;애슈퍼드;;;Эшфорд;;;阿什福德;urn:trainline:public:nloc:at000115; +8155;Ashford International;ashford-international;7050040;70500405;51.143785;0.876446;8154;GB;Europe/London;f;t;f;t;f;f;GBAJC;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;AFK;t;;f;;f;f;;;;;;;;;;;;;;;;;;;;urn:trainline:public:nloc:at000113; 8156;Aberystwyth;aberystwyth;7043030;70430306;52.414017;-4.081946;;GB;Europe/London;f;f;f;t;f;f;GBAWY;;f;;f;7000021;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;AYW;t;GBAWY;f;;f;f;;;;;;;;;;;;アベリストウィス;에버리스트위스;;;Аберистуит;;;阿伯里斯特威斯;urn:trainline:public:nloc:at000014; 8157;London St-Pancras;london-st-pancras;7015550;70155507;51.531831;-0.126747;8267;GB;Europe/London;f;f;f;f;f;f;GBBAA;;f;;f;7001424;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;;f;;f;;f;f;5892;;;;;;;;;;;;;;;;;;;; 8158;Tilbury Town;tilbury-town;7074620;70746206;51.462879;0.353724;26797;GB;Europe/London;f;t;f;t;f;f;GBBAB;;f;;f;7002236;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;TIL;t;;f;;f;f;;;;;;;;;;;;;;;;;;;;urn:trainline:public:nloc:at002596; @@ -20658,7 +20658,6 @@ id;name;slug;uic;uic8_sncf;latitude;longitude;parent_station_id;country;time_zon 22670;Hannover Hbf;hannover-hbf;;;;;;DE;Europe/Berlin;f;f;f;f;f;f;;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;;f;;f;;f;f;6921;;;;;;;;;;;;;;;;;;;urn:trainline:public:nloc:csv6921; 22671;Torino Porta Susa;torino-porta-susa;;;;;;IT;Europe/Rome;f;f;f;f;f;f;;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;;f;;f;;f;f;8568;;;;;;;;;;;;;;;;;;;urn:trainline:public:nloc:csv8568; 22672;Torino Porta Susa;torino-porta-susa;;;;;;IT;Europe/Rome;f;f;f;f;f;f;;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;;f;;f;;f;f;8568;;;;;;;;;;;;;;;;;;;urn:trainline:public:nloc:csv8568; -22673;Ashford International;ashford-international;7050040;70500405;51.143673;0.873628;;GB;Europe/London;f;f;f;f;f;f;;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;;f;;f;;f;f;8155;;;;;;;;;;;;;;;;;;;; 22674;Ebbsfleet International;ebbsfleet-international;7055660;70556605;51.442961;0.320921;;GB;Europe/London;f;f;f;f;f;f;;;f;;f;7004712;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;;f;;f;;f;f;8224;;;;;;;;;;;;;;;;;;;; 22675;Tübingen Hbf;tubingen-hbf;;;;;;DE;Europe/Berlin;f;f;f;f;f;f;;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;f;;;;;f;;f;;f;;f;;f;;f;f;7343;;;Tubinga;;Tubinga;;;;;;テュービンゲン;튀빙겐;Tybinga;Tubinga;Тюбинген;;;蒂宾根;urn:trainline:public:nloc:csv7343; 22676;Zaragoza Delicias;zaragoza-delicias;7104040;71040402;41.658439;-0.909906;24575;ES;Europe/Madrid;f;t;f;t;f;f;ESZAA;;t;;f;7175506;f;;f;;f;;f;;f;;f;;f;ESZAA;t;;f;;;;;f;;f;04040;t;;f;ESZAD;f;;f;f;;Saragossa;;;Saragosse;Saragozza;;;;;;サラゴサ;사라고사;Saragossa;Saragoça;;;;萨拉戈萨;urn:trainline:public:nloc:csv22676; diff --git a/test_data.rb b/test_data.rb index a5a4bba..850d1e8 100644 --- a/test_data.rb +++ b/test_data.rb @@ -575,7 +575,7 @@ def test_normalised_code end end end - assert_equal(29, gb_stations_without_normalised_codes.length, "There should be 29 GB stations without a normalised code") + assert_equal(26, gb_stations_without_normalised_codes.length, "There should be 26 GB stations without a normalised code") end # [TEMP] To be removed