+44 geocoding data SABC data with corrected place names

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

diff --git a/resources/geocoding/en/44.txt b/resources/geocoding/en/44.txt
index 8e7f98f..cdf0561 100755 (executable)
--- a/resources/geocoding/en/44.txt
+++ b/resources/geocoding/en/44.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and\r
 # limitations under the License.\r
 \r
-# Ofcom SABC data [2011-01-25] (with errors). \r
+# Based on Ofcom SABC data but with place names corrected.\r
 \r
 441130|Leeds \r
 441131|Leeds \r
@@ -98,8 +98,8 @@
 441226|Barnsley\r
 441227|Canterbury\r
 441228|Carlisle\r
-4412290|Barrow-in-Furness \r
-4412291|Barrow-in-Furness \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
@@ -108,7 +108,7 @@
 4412297|Millom\r
 4412298|Barrow-in-Furness\r
 4412299|Millom\r
-441233|Ashford\r
+441233|Ashford (Kent)\r
 441234|Bedford\r
 441235|Abingdon\r
 441236|Coatbridge\r
@@ -198,7 +198,7 @@
 441329|Fareham\r
 441330|Banchory\r
 441332|Derby\r
-441333|Peat Inn\r
+441333|Peat Inn (Leven (Fife))\r
 441334|St Andrews\r
 441335|Ashbourne\r
 441337|Ladybank\r
@@ -212,7 +212,7 @@
 4413397|Ballater\r
 4413398|Aboyne\r
 4413399|Ballater\r
-441340|Craigellachie\r
+441340|Craigellachie (Aberlour)\r
 441341|Barmouth\r
 441342|East Grinstead\r
 441343|Elgin\r
@@ -264,10 +264,10 @@
 4413879|Dumfries\r
 4413880|Bishop Auckland/Stanhope \r
 4413881|Bishop Auckland/Stanhope \r
-4413882|Stanhope\r
+4413882|Stanhope (Eastgate)\r
 4413883|Bishop Auckland\r
 4413884|Bishop Auckland\r
-4413885|Stanhope\r
+4413885|Stanhope (Eastgate)\r
 4413886|Bishop Auckland\r
 4413887|Bishop Auckland\r
 4413888|Bishop Auckland\r
@@ -338,12 +338,12 @@
 4414349|Bellingham\r
 441435|Heathfield\r
 441436|Helensburgh\r
-4414370|Haverfordwest/Clynderwen \r
-4414371|Haverfordwest/Clynderwen \r
-4414372|Clynderwen\r
-4414373|Clynderwen\r
-4414374|Clynderwen\r
-4414375|Clynderwen\r
+4414370|Haverfordwest/Clynderwen (Clunderwen) \r
+4414371|Haverfordwest/Clynderwen (Clunderwen) \r
+4414372|Clynderwen (Clunderwen)\r
+4414373|Clynderwen (Clunderwen)\r
+4414374|Clynderwen (Clunderwen)\r
+4414375|Clynderwen (Clunderwen)\r
 4414376|Haverfordwest\r
 4414377|Haverfordwest\r
 4414378|Haverfordwest\r
@@ -387,7 +387,7 @@
 441479|Grantown-on-Spey\r
 441480|Huntingdon\r
 441481|Guernsey\r
-441482|Hull\r
+441482|Kingston-upon-Hull\r
 441483|Guildford\r
 441484|Huddersfield\r
 441485|Hunstanton\r
@@ -410,10 +410,10 @@
 441506|Bathgate\r
 4415070|Louth/Alford/Spilsby \r
 4415071|Louth/Alford/Spilsby \r
-4415072|Spilsby\r
+4415072|Spilsby (Horncastle)\r
 4415073|Louth\r
 4415074|Alford (Lincs)\r
-4415075|Spilsby\r
+4415075|Spilsby (Horncastle)\r
 4415076|Louth\r
 4415077|Louth\r
 4415078|Alford (Lincs)\r
@@ -516,7 +516,7 @@
 441598|Lynton\r
 441599|Kyle\r
 441600|Monmouth\r
-441603|Norwich \r
+441603|Norwich\r
 441604|Northampton\r
 441606|Northwich\r
 441608|Chipping Norton\r
@@ -545,7 +545,7 @@
 441633|Newport\r
 441634|Medway\r
 441635|Newbury\r
-441636|Newark\r
+441636|Newark-on-Trent\r
 441637|Newquay\r
 441638|Newmarket\r
 441639|Neath\r
@@ -720,7 +720,7 @@
 441837|Okehampton\r
 441838|Dalmally\r
 441840|Camelford\r
-441841|Newquay\r
+441841|Newquay (Padstow)\r
 441842|Thetford\r
 441843|Thanet\r
 441844|Thame\r
@@ -755,7 +755,7 @@
 441859|Harris\r
 441862|Tain\r
 441863|Ardgay\r
-441864|Abington\r
+441864|Abington (Crawford)\r
 441865|Oxford\r
 441866|Kilchrenan\r
 441869|Bicester\r
@@ -774,7 +774,7 @@
 441883|Caterham\r
 441884|Tiverton\r
 441885|Pencombe\r
-441886|Bromyard\r
+441886|Bromyard (Knightwick/Leigh Sinton)\r
 441887|Aberfeldy\r
 441888|Turriff\r
 441889|Rugeley\r
@@ -820,7 +820,7 @@
 441931|Shap\r
 441932|Weybridge\r
 441933|Wellingborough\r
-441934|Weston-Super-Mare\r
+441934|Weston-super-Mare\r
 441935|Yeovil\r
 441937|Wetherby\r
 441938|Welshpool\r
@@ -836,7 +836,7 @@
 4419464|Whitehaven\r
 4419465|Whitehaven\r
 4419466|Whitehaven\r
-4419467|Gosforth (Mixed)\r
+4419467|Gosforth\r
 4419468|Whitehaven\r
 4419469|Whitehaven\r
 441947|Whitby\r
@@ -885,7 +885,7 @@
 441981|Wormbridge\r
 441982|Builth Wells\r
 441983|Isle of Wight\r
-441984|Watchet\r
+441984|Watchet (Williton)\r
 441985|Warminster\r
 441986|Bungay\r
 441987|Ebbsfleet\r
@@ -901,20 +901,12 @@
 44203|London\r
 44207|London\r
 44208|London\r
-442099|London Emergency Services\r
-442199|Emergency Services\r
-442299|Emergency Services\r
 442310|Portsmouth \r
 442311|Southampton \r
 44238|Southampton\r
 44239|Portsmouth\r
-442399|Portsmouth/Southampton Emergency Services\r
 44241|Coventry \r
 44247|Coventry\r
-442499|Coventry Emergency Services\r
-442599|Emergency Services\r
-442699|Emergency Services\r
-442799|Emergency Services\r
 44281|Northern Ireland \r
 442820|Ballycastle\r
 442821|Martinstown\r
@@ -944,7 +936,7 @@
 442886|Cookstown\r
 442887|Dungannon\r
 442889|Fivemiletown\r
-442890|Belfast City\r
+442890|Belfast\r
 442891|Bangor (Co. Down)\r
 442892|Lisburn\r
 442893|Ballyclare\r
@@ -953,7 +945,5 @@
 442896|Belfast\r
 442897|Saintfield\r
 442898|Belfast\r
-442899|Northern Ireland Emergency Services\r
 44291|Cardiff \r
 44292|Cardiff\r
-442999|Cardiff Emergency Services\r