GEODATA: Editing file for GB: Removal of 'National Dialling' and 'Expansion' wording...

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@274 ee073f10-1060-11df-b6a4-87a95322a99c

diff --git a/resources/geocoding/en/44.txt b/resources/geocoding/en/44.txt
index 23be16d4d371916ddf5ba4fd39ea8f26b6c1c8ca..3ea29463b2bd9bf6c95ed22901ebc5a3924255fa 100644 (file)
--- a/resources/geocoding/en/44.txt
+++ b/resources/geocoding/en/44.txt
@@ -14,68 +14,15 @@
 \r
 # Originally generated from:\r
 # http://www.ofcom.org.uk/static/numbering/sabc.txt\r
-# Tidied Ofcom SABC data (with place names corrected).\r
+# Tidied Ofcom SABC data (with removal of "National Dialling" and "Expansion"\r
+# wording and reduction of 4411x and 441x1 data to one line per place name).\r
 \r
-441130|Leeds National Dialling\r
-441131|Leeds National Dialling\r
-441132|Leeds\r
-441133|Leeds\r
-441134|Leeds\r
-441135|Leeds expansion\r
-441136|Leeds expansion\r
-441137|Leeds expansion\r
-441138|Leeds\r
-441139|Leeds expansion\r
-441140|Sheffield National Dialling\r
-441141|Sheffield National Dialling\r
-441142|Sheffield\r
-441143|Sheffield\r
-441144|Sheffield\r
-441145|Sheffield expansion\r
-441146|Sheffield expansion\r
-441147|Sheffield expansion\r
-441148|Sheffield expansion\r
-441149|Sheffield expansion\r
-441150|Nottingham National Dialling\r
-441151|Nottingham National Dialling\r
-441152|Nottingham\r
-441153|Nottingham expansion\r
-441154|Nottingham expansion\r
-441155|Nottingham expansion\r
-441156|Nottingham expansion\r
-441157|Nottingham\r
-441158|Nottingham\r
-441159|Nottingham\r
-441160|Leicester National Dialling\r
-441161|Leicester National Dialling\r
-441162|Leicester\r
-441163|Leicester\r
-441164|Leicester\r
-441165|Leicester expansion\r
-441166|Leicester expansion\r
-441167|Leicester expansion\r
-441168|Leicester expansion\r
-441169|Leicester expansion\r
-441170|Bristol National Dialling\r
-441171|Bristol National Dialling\r
-441172|Bristol\r
-441173|Bristol\r
-441174|Bristol expansion\r
-441175|Bristol expansion\r
-441176|Bristol expansion\r
-441177|Bristol expansion\r
-441178|Bristol expansion\r
-441179|Bristol\r
-441180|Reading National Dialling\r
-441181|Reading National Dialling\r
-441182|Reading expansion\r
-441183|Reading\r
-441184|Reading\r
-441185|Reading expansion\r
-441186|Reading expansion\r
-441187|Reading expansion\r
-441188|Reading expansion\r
-441189|Reading\r
+44113|Leeds\r
+44114|Sheffield\r
+44115|Nottingham\r
+44116|Leicester\r
+44117|Bristol\r
+44118|Reading\r
 441200|Clitheroe\r
 441202|Bournemouth\r
 441204|Bolton\r
@@ -84,24 +31,15 @@
 441207|Consett\r
 441208|Bodmin\r
 441209|Redruth\r
-441210|Birmingham National Dialling\r
-441211|Birmingham National Dialling\r
-441212|Birmingham\r
-441213|Birmingham\r
-441214|Birmingham\r
-441215|Birmingham\r
-441216|Birmingham\r
-441217|Birmingham\r
-441218|Birmingham expansion\r
-441219|Birmingham expansion\r
+44121|Birmingham\r
 441223|Cambridge\r
 441224|Aberdeen\r
 441225|Bath\r
 441226|Barnsley\r
 441227|Canterbury\r
 441228|Carlisle\r
-4412290|Barrow-in-Furness/Millom National Dialling\r
-4412291|Barrow-in-Furness/Millom National Dialling\r
+4412290|Barrow-in-Furness/Millom\r
+4412291|Barrow-in-Furness/Millom\r
 4412292|Barrow-in-Furness\r
 4412293|Millom\r
 4412294|Barrow-in-Furness\r
@@ -179,16 +117,7 @@
 441307|Forfar\r
 441308|Bridport\r
 441309|Forres\r
-441310|Edinburgh National Dialling\r
-441311|Edinburgh National Dialling\r
-441312|Edinburgh\r
-441313|Edinburgh\r
-441314|Edinburgh\r
-441315|Edinburgh\r
-441316|Edinburgh\r
-441317|Edinburgh\r
-441318|Edinburgh\r
-441319|Edinburgh expansion\r
+44131|Edinburgh\r
 441320|Fort Augustus\r
 441322|Dartford\r
 441323|Eastbourne\r
@@ -204,8 +133,8 @@
 441334|St Andrews\r
 441335|Ashbourne\r
 441337|Ladybank\r
-4413390|Aboyne/Ballater National Dialling\r
-4413391|Aboyne/Ballater National Dialling\r
+4413390|Aboyne/Ballater\r
+4413391|Aboyne/Ballater\r
 4413392|Aboyne\r
 4413393|Aboyne\r
 4413394|Ballater\r
@@ -254,8 +183,8 @@
 441383|Dunfermline\r
 441384|Dudley\r
 441386|Evesham\r
-4413870|Dumfries National Dialling\r
-4413871|Dumfries National Dialling\r
+4413870|Dumfries\r
+4413871|Dumfries\r
 4413872|Dumfries\r
 4413873|Langholm\r
 4413874|Dumfries\r
@@ -264,8 +193,8 @@
 4413877|Dumfries\r
 4413878|Dumfries\r
 4413879|Dumfries\r
-4413880|Bishop Auckland/Stanhope (Eastgate) National Dialling\r
-4413881|Bishop Auckland/Stanhope (Eastgate) National Dialling\r
+4413880|Bishop Auckland/Stanhope (Eastgate)\r
+4413881|Bishop Auckland/Stanhope (Eastgate)\r
 4413882|Stanhope (Eastgate)\r
 4413883|Bishop Auckland\r
 4413884|Bishop Auckland\r
@@ -288,20 +217,11 @@
 441407|Holyhead\r
 441408|Golspie\r
 441409|Holsworthy\r
-441410|Glasgow National Dialling\r
-441411|Glasgow National Dialling\r
-441412|Glasgow\r
-441413|Glasgow\r
-441414|Glasgow\r
-441415|Glasgow\r
-441416|Glasgow\r
-441417|Glasgow\r
-441418|Glasgow\r
-441419|Glasgow\r
+44141|Glasgow\r
 441420|Alton\r
 441422|Halifax\r
-4414230|Harrogate/Boroughbridge National Dialling\r
-4414231|Harrogate/Boroughbridge National Dialling\r
+4414230|Harrogate/Boroughbridge\r
+4414231|Harrogate/Boroughbridge\r
 4414232|Harrogate\r
 4414233|Boroughbridge\r
 4414234|Boroughbridge\r
@@ -315,8 +235,8 @@
 441427|Gainsborough\r
 441428|Haslemere\r
 441429|Hartlepool\r
-4414300|North Cave/Market Weighton National Dialling\r
-4414301|North Cave/Market Weighton National Dialling\r
+4414300|North Cave/Market Weighton\r
+4414301|North Cave/Market Weighton\r
 4414302|North Cave\r
 4414303|North Cave\r
 4414304|North Cave\r
@@ -328,8 +248,8 @@
 441431|Helmsdale\r
 441432|Hereford\r
 441433|Hathersage\r
-4414340|Bellingham/Haltwhistle/Hexham National Dialling\r
-4414341|Bellingham/Haltwhistle/Hexham National Dialling\r
+4414340|Bellingham/Haltwhistle/Hexham\r
+4414341|Bellingham/Haltwhistle/Hexham\r
 4414342|Bellingham\r
 4414343|Haltwhistle\r
 4414344|Bellingham\r
@@ -340,8 +260,8 @@
 4414349|Bellingham\r
 441435|Heathfield\r
 441436|Helensburgh\r
-4414370|Haverfordwest/Clynderwen (Clunderwen) National Dialling\r
-4414371|Haverfordwest/Clynderwen (Clunderwen) National Dialling\r
+4414370|Haverfordwest/Clynderwen (Clunderwen)\r
+4414371|Haverfordwest/Clynderwen (Clunderwen)\r
 4414372|Clynderwen (Clunderwen)\r
 4414373|Clynderwen (Clunderwen)\r
 4414374|Clynderwen (Clunderwen)\r
@@ -410,8 +330,8 @@
 441503|Looe\r
 441505|Johnstone\r
 441506|Bathgate\r
-4415070|Louth/Alford/Spilsby (Horncastle) National Dialling\r
-4415071|Louth/Alford/Spilsby (Horncastle) National Dialling\r
+4415070|Louth/Alford/Spilsby (Horncastle)\r
+4415071|Louth/Alford/Spilsby (Horncastle)\r
 4415072|Spilsby (Horncastle)\r
 4415073|Louth\r
 4415074|Alford (Lincs)\r
@@ -422,20 +342,11 @@
 4415079|Alford (Lincs)\r
 441508|Brooke\r
 441509|Loughborough\r
-441510|Liverpool National Dialling\r
-441511|Liverpool National Dialling\r
-441512|Liverpool\r
-441513|Liverpool\r
-441514|Liverpool\r
-441515|Liverpool\r
-441516|Liverpool\r
-441517|Liverpool\r
-441518|Liverpool\r
-441519|Liverpool\r
+44151|Liverpool\r
 441520|Lochcarron\r
 441522|Lincoln\r
-4415240|Lancaster National Dialling\r
-4415241|Lancaster National Dialling\r
+4415240|Lancaster\r
+4415241|Lancaster\r
 4415242|Hornby\r
 4415243|Lancaster\r
 4415244|Lancaster\r
@@ -455,8 +366,8 @@
 441535|Keighley\r
 441536|Kettering\r
 441538|Ipstones\r
-4415390|Kendal National Dialling\r
-4415391|Kendal National Dialling\r
+4415390|Kendal\r
+4415391|Kendal\r
 4415392|Kendal\r
 4415393|Kendal\r
 4415394|Hawkshead\r
@@ -523,16 +434,7 @@
 441606|Northwich\r
 441608|Chipping Norton\r
 441609|Northallerton\r
-441610|Manchester National Dialling\r
-441611|Manchester National Dialling\r
-441612|Manchester\r
-441613|Manchester\r
-441614|Manchester\r
-441615|Manchester expansion\r
-441616|Manchester\r
-441617|Manchester\r
-441618|Manchester\r
-441619|Manchester\r
+44161|Manchester\r
 441620|North Berwick\r
 441621|Maldon\r
 441622|Maidstone\r
@@ -587,8 +489,8 @@
 441683|Moffat\r
 441684|Malvern\r
 441685|Merthyr Tydfil\r
-4416860|Newtown/Llanidloes National Dialling\r
-4416861|Newtown/Llanidloes National Dialling\r
+4416860|Newtown/Llanidloes\r
+4416861|Newtown/Llanidloes\r
 4416862|Llanidloes\r
 4416863|Llanidloes\r
 4416864|Llanidloes\r
@@ -605,8 +507,8 @@
 441692|North Walsham\r
 441694|Church Stretton\r
 441695|Skelmersdale\r
-4416970|Brampton National Dialling\r
-4416971|Brampton National Dialling\r
+4416970|Brampton\r
+4416971|Brampton\r
 4416972|Brampton\r
 4416973|Wigton\r
 4416974|Raughton Head\r
@@ -663,8 +565,8 @@
 441765|Ripon\r
 441766|Porthmadog\r
 441767|Sandy\r
-4417680|Penrith National Dialling\r
-4417681|Penrith National Dialling\r
+4417680|Penrith\r
+4417681|Penrith\r
 4417682|Penrith\r
 4417683|Appleby\r
 4417684|Pooley Bridge\r
@@ -727,8 +629,8 @@
 441843|Thanet\r
 441844|Thame\r
 441845|Thirsk\r
-4418470|Thurso/Tongue National Dialling\r
-4418471|Thurso/Tongue National Dialling\r
+4418470|Thurso/Tongue\r
+4418471|Thurso/Tongue\r
 4418472|Thurso\r
 4418473|Thurso\r
 4418474|Thurso\r
@@ -738,8 +640,8 @@
 4418478|Thurso\r
 4418479|Tongue\r
 441848|Thornhill\r
-4418510|Great Bernera/Stornoway National Dialling\r
-4418511|Great Bernera/Stornoway National Dialling\r
+4418510|Great Bernera/Stornoway\r
+4418511|Great Bernera/Stornoway\r
 4418512|Stornoway\r
 4418513|Stornoway\r
 4418514|Great Bernera\r
@@ -780,8 +682,8 @@
 441887|Aberfeldy\r
 441888|Turriff\r
 441889|Rugeley\r
-4418900|Coldstream/Ayton National Dialling\r
-4418901|Coldstream/Ayton National Dialling\r
+4418900|Coldstream/Ayton\r
+4418901|Coldstream/Ayton\r
 4418902|Coldstream\r
 4418903|Coldstream\r
 4418904|Coldstream\r
@@ -801,8 +703,8 @@
 441905|Worcester\r
 441908|Milton Keynes\r
 441909|Worksop\r
-441910|Tyneside/Durham/Sunderland National Dialling\r
-441911|Tyneside/Durham/Sunderland National Dialling\r
+441910|Tyneside/Durham/Sunderland\r
+441911|Tyneside/Durham/Sunderland\r
 441912|Tyneside\r
 441913|Durham\r
 441914|Tyneside\r
@@ -831,8 +733,8 @@
 441943|Guiseley\r
 441944|West Heslerton\r
 441945|Wisbech\r
-4419460|Whitehaven National Dialling\r
-4419461|Whitehaven National Dialling\r
+4419460|Whitehaven\r
+4419461|Whitehaven\r
 4419462|Whitehaven\r
 4419463|Whitehaven\r
 4419464|Whitehaven\r
@@ -854,8 +756,8 @@
 441959|Westerham\r
 441962|Winchester\r
 441963|Wincanton\r
-4419640|Hornsea/Patrington National Dialling\r
-4419641|Hornsea/Patrington National Dialling\r
+4419640|Hornsea/Patrington\r
+4419641|Hornsea/Patrington\r
 4419642|Hornsea\r
 4419643|Patrington\r
 4419644|Patrington\r
@@ -871,8 +773,8 @@
 441971|Scourie\r
 441972|Glenborrodale\r
 441974|Llanon\r
-4419750|Alford (Aberdeen)/Strathdon National Dialling\r
-4419751|Alford (Aberdeen)/Strathdon National Dialling\r
+4419750|Alford (Aberdeen)/Strathdon\r
+4419751|Alford (Aberdeen)/Strathdon\r
 4419752|Alford (Aberdeen)\r
 4419753|Strathdon\r
 4419754|Alford (Aberdeen)\r
@@ -898,18 +800,18 @@
 441994|St Clears\r
 441995|Garstang\r
 441997|Strathpeffer\r
-44200|London National Dialling\r
-44201|London National Dialling\r
+44200|London\r
+44201|London\r
 44203|London\r
 44207|London\r
 44208|London\r
-442310|Portsmouth National Dialling\r
-442311|Southampton National Dialling\r
+442310|Portsmouth\r
+442311|Southampton\r
 44238|Southampton\r
 44239|Portsmouth\r
-44241|Coventry National Dialling\r
+44241|Coventry\r
 44247|Coventry\r
-44281|Northern Ireland National Dialling\r
+44281|Northern Ireland\r
 442820|Ballycastle\r
 442821|Martinstown\r
 442825|Ballymena\r
@@ -944,8 +846,8 @@
 442893|Ballyclare\r
 442894|Antrim\r
 442895|Belfast\r
-442896|Belfast expansion\r
+442896|Belfast\r
 442897|Saintfield\r
-442898|Belfast expansion\r
-44291|Cardiff National Dialling\r
+442898|Belfast\r
+44291|Cardiff\r
 44292|Cardiff\r