From 73a08232e65eeeab8304a3e4d7e81cec992b3b4a Mon Sep 17 00:00:00 2001 From: Bibiana Cristofol Amat Date: Fri, 5 Nov 2021 16:45:58 +0000 Subject: [PATCH] additional_data: geo_lookup: Add new data sources Adds data sources for regions, countries, upper tier local authorities and combined authority. Fixes https://github.com/ThreeSixtyGiving/datastore/issues/71 Co-authored-by: Michael Wood --- .../additional_data/sources/geo_lookup.py | 22 ++ .../files/geolookups/cauth_all_codes.csv | 11 + .../tests/files/geolookups/ctry_all_codes.csv | 5 + .../tests/files/geolookups/rgn_all_codes.csv | 10 + .../tests/files/geolookups/utla_all_codes.csv | 218 ++++++++++++++++++ .../tests/test_additional_data_geolookups.py | 6 +- 6 files changed, 269 insertions(+), 3 deletions(-) create mode 100644 datastore/tests/files/geolookups/cauth_all_codes.csv create mode 100644 datastore/tests/files/geolookups/ctry_all_codes.csv create mode 100644 datastore/tests/files/geolookups/rgn_all_codes.csv create mode 100644 datastore/tests/files/geolookups/utla_all_codes.csv diff --git a/datastore/additional_data/sources/geo_lookup.py b/datastore/additional_data/sources/geo_lookup.py index 67e1798b..696d6c77 100644 --- a/datastore/additional_data/sources/geo_lookup.py +++ b/datastore/additional_data/sources/geo_lookup.py @@ -47,6 +47,26 @@ class GeoLookupSource(object): "lad20nm": "ladnm", }, }, + "rgn": { + "url_lookup": "https://raw.githubusercontent.com/drkane/geo-lookups/master/rgn_all_codes.csv", + "field_areacode": "rgncd", + "field_areaname": "rgnnm", + }, + "ctry": { + "url_lookup": "https://raw.githubusercontent.com/drkane/geo-lookups/master/ctry_all_codes.csv", + "field_areacode": "ctrycd", + "field_areaname": "ctrynm", + }, + "utla": { + "url_lookup": "https://raw.githubusercontent.com/drkane/geo-lookups/master/utla_all_codes.csv", + "field_areacode": "utlacd", + "field_areaname": "utlanm", + }, + "cuath": { + "url_lookup": "https://raw.githubusercontent.com/drkane/geo-lookups/master/cauth_all_codes.csv", + "field_areacode": "cauthcd", + "field_areaname": "cauthnm", + }, } def __init__(self): @@ -65,6 +85,7 @@ def clean_fields(row): yield field, value r = requests.get(areadata.get("url_lookup"), stream=True) + r.encoding = "utf-8-sig" area_csv = io.StringIO(r.text) reader = csv.DictReader(area_csv) for r in reader: @@ -75,6 +96,7 @@ def clean_fields(row): if areadata.get("url_latlong"): r = requests.get(areadata.get("url_latlong"), stream=True) + r.encoding = "utf-8-sig" area_csv = io.StringIO(r.text) reader = csv.DictReader(area_csv) for r in reader: diff --git a/datastore/tests/files/geolookups/cauth_all_codes.csv b/datastore/tests/files/geolookups/cauth_all_codes.csv new file mode 100644 index 00000000..866bfd11 --- /dev/null +++ b/datastore/tests/files/geolookups/cauth_all_codes.csv @@ -0,0 +1,11 @@ +CAUTHCD,CAUTHNM,RGNCD,RGNNM,CTRYCD,CTRYNM,EWCD,EWNM,GBCD,GBNM,UKCD,UKNM +E47000001,Greater Manchester,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E47000002,Sheffield City Region,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E47000003,West Yorkshire,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E47000004,Liverpool City Region,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E47000006,Tees Valley,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E47000007,West Midlands,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E47000008,Cambridgeshire and Peterborough,E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E47000009,West of England,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E47000010,North East,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E47000011,North of Tyne,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom diff --git a/datastore/tests/files/geolookups/ctry_all_codes.csv b/datastore/tests/files/geolookups/ctry_all_codes.csv new file mode 100644 index 00000000..e7639fbe --- /dev/null +++ b/datastore/tests/files/geolookups/ctry_all_codes.csv @@ -0,0 +1,5 @@ +CTRYCD,CTRYNM,EWCD,EWNM,GBCD,GBNM,UKCD,UKNM +E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +N92000002,Northern Ireland,,,,,K02000001,United Kingdom +S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom diff --git a/datastore/tests/files/geolookups/rgn_all_codes.csv b/datastore/tests/files/geolookups/rgn_all_codes.csv new file mode 100644 index 00000000..0645f772 --- /dev/null +++ b/datastore/tests/files/geolookups/rgn_all_codes.csv @@ -0,0 +1,10 @@ +RGNCD,RGNNM,CTRYCD,CTRYNM,EWCD,EWNM,GBCD,GBNM,UKCD,UKNM +E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E12000004,East Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom diff --git a/datastore/tests/files/geolookups/utla_all_codes.csv b/datastore/tests/files/geolookups/utla_all_codes.csv new file mode 100644 index 00000000..b2137175 --- /dev/null +++ b/datastore/tests/files/geolookups/utla_all_codes.csv @@ -0,0 +1,218 @@ +UTLACD,UTLANM,CAUTHCD,CAUTHNM,RGNCD,RGNNM,CTRYCD,CTRYNM,EWCD,EWNM,GBCD,GBNM,UKCD,UKNM +E06000001,Hartlepool,E47000006,Tees Valley,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000002,Middlesbrough,E47000006,Tees Valley,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000003,Redcar and Cleveland,E47000006,Tees Valley,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000004,Stockton-on-Tees,E47000006,Tees Valley,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000005,Darlington,E47000006,Tees Valley,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000006,Halton,E47000004,Liverpool City Region,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000007,Warrington,,,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000008,Blackburn with Darwen,,,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000009,Blackpool,,,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000010,"Kingston upon Hull, City of",,,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000011,East Riding of Yorkshire,,,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000012,North East Lincolnshire,,,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000013,North Lincolnshire,,,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000014,York,,,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000015,Derby,,,E12000004,East Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000016,Leicester,,,E12000004,East Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000017,Rutland,,,E12000004,East Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000018,Nottingham,,,E12000004,East Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000019,"Herefordshire, County of",,,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000020,Telford and Wrekin,,,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000021,Stoke-on-Trent,,,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000022,Bath and North East Somerset,E47000009,West of England,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000023,"Bristol, City of",E47000009,West of England,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000024,North Somerset,,,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000025,South Gloucestershire,E47000009,West of England,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000026,Plymouth,,,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000027,Torbay,,,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000030,Swindon,,,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000031,Peterborough,E47000008,Cambridgeshire and Peterborough,E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000032,Luton,,,E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000033,Southend-on-Sea,,,E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000034,Thurrock,,,E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000035,Medway,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000036,Bracknell Forest,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000037,West Berkshire,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000038,Reading,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000039,Slough,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000040,Windsor and Maidenhead,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000041,Wokingham,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000042,Milton Keynes,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000043,Brighton and Hove,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000044,Portsmouth,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000045,Southampton,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000046,Isle of Wight,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000047,County Durham,E47000010,North East,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000049,Cheshire East,,,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000050,Cheshire West and Chester,,,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000051,Shropshire,,,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000052,Cornwall,,,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000053,Isles of Scilly,,,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000054,Wiltshire,,,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000055,Bedford,,,E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000056,Central Bedfordshire,,,E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000057,Northumberland,E47000011,North of Tyne,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000058,"Bournemouth, Christchurch and Poole",,,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000059,Dorset,,,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000060,Buckinghamshire,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000061,North Northamptonshire,,,E12000004,East Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E06000062,West Northamptonshire,,,E12000004,East Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000001,Bolton,E47000001,Greater Manchester,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000002,Bury,E47000001,Greater Manchester,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000003,Manchester,E47000001,Greater Manchester,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000004,Oldham,E47000001,Greater Manchester,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000005,Rochdale,E47000001,Greater Manchester,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000006,Salford,E47000001,Greater Manchester,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000007,Stockport,E47000001,Greater Manchester,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000008,Tameside,E47000001,Greater Manchester,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000009,Trafford,E47000001,Greater Manchester,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000010,Wigan,E47000001,Greater Manchester,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000011,Knowsley,E47000004,Liverpool City Region,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000012,Liverpool,E47000004,Liverpool City Region,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000013,St. Helens,E47000004,Liverpool City Region,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000014,Sefton,E47000004,Liverpool City Region,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000015,Wirral,E47000004,Liverpool City Region,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000016,Barnsley,E47000002,Sheffield City Region,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000017,Doncaster,E47000002,Sheffield City Region,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000018,Rotherham,E47000002,Sheffield City Region,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000019,Sheffield,E47000002,Sheffield City Region,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000021,Newcastle upon Tyne,E47000011,North of Tyne,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000022,North Tyneside,E47000011,North of Tyne,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000023,South Tyneside,E47000010,North East,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000024,Sunderland,E47000010,North East,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000025,Birmingham,E47000007,West Midlands,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000026,Coventry,E47000007,West Midlands,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000027,Dudley,E47000007,West Midlands,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000028,Sandwell,E47000007,West Midlands,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000029,Solihull,E47000007,West Midlands,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000030,Walsall,E47000007,West Midlands,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000031,Wolverhampton,E47000007,West Midlands,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000032,Bradford,E47000003,West Yorkshire,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000033,Calderdale,E47000003,West Yorkshire,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000034,Kirklees,E47000003,West Yorkshire,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000035,Leeds,E47000003,West Yorkshire,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000036,Wakefield,E47000003,West Yorkshire,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E08000037,Gateshead,E47000010,North East,E12000001,North East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000001,City of London,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000002,Barking and Dagenham,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000003,Barnet,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000004,Bexley,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000005,Brent,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000006,Bromley,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000007,Camden,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000008,Croydon,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000009,Ealing,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000010,Enfield,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000011,Greenwich,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000012,Hackney,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000013,Hammersmith and Fulham,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000014,Haringey,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000015,Harrow,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000016,Havering,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000017,Hillingdon,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000018,Hounslow,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000019,Islington,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000020,Kensington and Chelsea,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000021,Kingston upon Thames,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000022,Lambeth,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000023,Lewisham,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000024,Merton,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000025,Newham,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000026,Redbridge,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000027,Richmond upon Thames,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000028,Southwark,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000029,Sutton,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000030,Tower Hamlets,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000031,Waltham Forest,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000032,Wandsworth,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E09000033,Westminster,,,E12000007,London,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000003,Cambridgeshire,E47000008,Cambridgeshire and Peterborough,E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000006,Cumbria,,,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000007,Derbyshire,,,E12000004,East Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000008,Devon,,,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000011,East Sussex,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000012,Essex,,,E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000013,Gloucestershire,,,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000014,Hampshire,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000015,Hertfordshire,,,E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000016,Kent,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000017,Lancashire,,,E12000002,North West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000018,Leicestershire,,,E12000004,East Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000019,Lincolnshire,,,E12000004,East Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000020,Norfolk,,,E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000023,North Yorkshire,,,E12000003,Yorkshire and The Humber,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000024,Nottinghamshire,,,E12000004,East Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000025,Oxfordshire,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000027,Somerset,,,E12000009,South West,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000028,Staffordshire,,,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000029,Suffolk,,,E12000006,East of England,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000030,Surrey,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000031,Warwickshire,,,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000032,West Sussex,,,E12000008,South East,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +E10000034,Worcestershire,,,E12000005,West Midlands,E92000001,England,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +N09000001,Antrim and Newtownabbey,,,,,N92000002,Northern Ireland,,,,,K02000001,United Kingdom +N09000002,"Armagh City, Banbridge and Craigavon",,,,,N92000002,Northern Ireland,,,,,K02000001,United Kingdom +N09000003,Belfast,,,,,N92000002,Northern Ireland,,,,,K02000001,United Kingdom +N09000004,Causeway Coast and Glens,,,,,N92000002,Northern Ireland,,,,,K02000001,United Kingdom +N09000005,Derry City and Strabane,,,,,N92000002,Northern Ireland,,,,,K02000001,United Kingdom +N09000006,Fermanagh and Omagh,,,,,N92000002,Northern Ireland,,,,,K02000001,United Kingdom +N09000007,Lisburn and Castlereagh,,,,,N92000002,Northern Ireland,,,,,K02000001,United Kingdom +N09000008,Mid and East Antrim,,,,,N92000002,Northern Ireland,,,,,K02000001,United Kingdom +N09000009,Mid Ulster,,,,,N92000002,Northern Ireland,,,,,K02000001,United Kingdom +N09000010,"Newry, Mourne and Down",,,,,N92000002,Northern Ireland,,,,,K02000001,United Kingdom +N09000011,Ards and North Down,,,,,N92000002,Northern Ireland,,,,,K02000001,United Kingdom +S12000005,Clackmannanshire,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000006,Dumfries and Galloway,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000008,East Ayrshire,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000010,East Lothian,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000011,East Renfrewshire,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000013,Na h-Eileanan Siar,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000014,Falkirk,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000017,Highland,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000018,Inverclyde,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000019,Midlothian,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000020,Moray,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000021,North Ayrshire,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000023,Orkney Islands,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000026,Scottish Borders,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000027,Shetland Islands,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000028,South Ayrshire,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000029,South Lanarkshire,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000030,Stirling,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000033,Aberdeen City,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000034,Aberdeenshire,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000035,Argyll and Bute,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000036,City of Edinburgh,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000038,Renfrewshire,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000039,West Dunbartonshire,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000040,West Lothian,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000041,Angus,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000042,Dundee City,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000045,East Dunbartonshire,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000047,Fife,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000048,Perth and Kinross,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000049,Glasgow City,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +S12000050,North Lanarkshire,,,,,S92000003,Scotland,,,K03000001,Great Britain,K02000001,United Kingdom +W06000001,Isle of Anglesey,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000002,Gwynedd,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000003,Conwy,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000004,Denbighshire,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000005,Flintshire,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000006,Wrexham,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000008,Ceredigion,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000009,Pembrokeshire,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000010,Carmarthenshire,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000011,Swansea,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000012,Neath Port Talbot,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000013,Bridgend,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000014,Vale of Glamorgan,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000015,Cardiff,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000016,Rhondda Cynon Taf,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000018,Caerphilly,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000019,Blaenau Gwent,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000020,Torfaen,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000021,Monmouthshire,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000022,Newport,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000023,Powys,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom +W06000024,Merthyr Tydfil,,,,,W92000004,Wales,K04000001,England and Wales,K03000001,Great Britain,K02000001,United Kingdom diff --git a/datastore/tests/test_additional_data_geolookups.py b/datastore/tests/test_additional_data_geolookups.py index d30d3413..596cb4fe 100644 --- a/datastore/tests/test_additional_data_geolookups.py +++ b/datastore/tests/test_additional_data_geolookups.py @@ -35,7 +35,7 @@ def test_import_geolookups_with_data(self): geo.import_geo_lookups() - self.assertEqual(len(GeoLookup.objects.all()), 60) + self.assertEqual(len(GeoLookup.objects.all()), 281) # check one example geo_object = GeoLookup.objects.filter(areacode=self.EXISTING_AREA) @@ -85,7 +85,7 @@ def test_import_geolookup_deletes_previous_records(self): geo.import_geo_lookups() - self.assertEqual(len(GeoLookup.objects.all()), 60) + self.assertEqual(len(GeoLookup.objects.all()), 281) # check one example self.assertTrue( @@ -93,7 +93,7 @@ def test_import_geolookup_deletes_previous_records(self): ) geo.import_geo_lookups() - self.assertEqual(len(GeoLookup.objects.all()), 60) + self.assertEqual(len(GeoLookup.objects.all()), 281) def save_mock_data(self): geo = GeoLookupSource()