Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

migrate country:uk ids to country:gb v2 #188

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

migrate country:uk ids to country:gb v2 #188

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fe84bd3
revert changes from PR #181
chris48s Nov 6, 2019
a999fd0
move build scripts from scripts/country-uk to scripts/country-gb
chris48s Nov 6, 2019
adb4f14
update build scripts/docs: uk --> gb
chris48s Nov 6, 2019
38ea2cf
delete the old country-uk IDs
chris48s Nov 6, 2019
ad9825e
manually add top-level identifier for country in country-gb
chris48s Nov 6, 2019
fe9203a
re-run the new build scripts
chris48s Nov 6, 2019
6410f39
rename country-uk.csv to country-gb.csv
chris48s Nov 14, 2019
6f59a09
manually add constituent nations to country-gb.csv
chris48s Nov 14, 2019
4c369fd
include constituent nation clause when generating ids
chris48s Nov 14, 2019
09a5a9a
rebuild/compile IDs with constituent nation clause
chris48s Nov 14, 2019
664605f
uk --> gb in EU identifiers
chris48s Mar 17, 2020
c7da0ed
update dead link
chris48s Mar 19, 2020
cf2b828
update scripts to add 'use_nation_clause' option
chris48s Mar 19, 2020
1c87a1c
re-run build and compile scripts
chris48s Mar 19, 2020
048a014
spelling
chris48s Mar 21, 2020
140a525
re-compile
chris48s Mar 21, 2020
ccf1895
all constituencies are 'con', all regions are 'reg', re-build, re-com…
chris48s Mar 22, 2020
a6004e7
update the docs
chris48s Mar 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion identifiers/country-eu.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ ocd-division/country:ro,Romania
ocd-division/country:se,Sweden
ocd-division/country:si,Slovenia
ocd-division/country:sk,Slovakia
ocd-division/country:uk,United Kingdom
ocd-division/country:gb,United Kingdom
ocd-division/region:eu,European Union
2 changes: 1 addition & 1 deletion identifiers/country-eu/countries.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ ocd-division/country:ro,Romania
ocd-division/country:se,Sweden
ocd-division/country:si,Slovenia
ocd-division/country:sk,Slovakia
ocd-division/country:uk,United Kingdom
ocd-division/country:gb,United Kingdom
846 changes: 181 additions & 665 deletions identifiers/country-gb.csv
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions identifiers/country-gb/combined_authorities.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
id,name,gss_code
ocd-division/country:gb/cauth:greater_manchester,Greater Manchester,E47000001
ocd-division/country:gb/cauth:sheffield_city_region,Sheffield City Region,E47000002
ocd-division/country:gb/cauth:west_yorkshire,West Yorkshire,E47000003
ocd-division/country:gb/cauth:liverpool_city_region,Liverpool City Region,E47000004
ocd-division/country:gb/cauth:north_east,North East,E47000005
ocd-division/country:gb/cauth:tees_valley,Tees Valley,E47000006
ocd-division/country:gb/cauth:west_midlands,West Midlands,E47000007
ocd-division/country:gb/cauth:cambridgeshire_and_peterborough,Cambridgeshire and Peterborough,E47000008
ocd-division/country:gb/cauth:west_of_england,West of England,E47000009
651 changes: 0 additions & 651 deletions identifiers/country-gb/constituencies.csv
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions identifiers/country-gb/country-gb.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
id,name,gss_code
ocd-division/country:gb,United Kingdom,K02000001
ocd-division/country:gb/part:eng,England,E92000001
ocd-division/country:gb/part:nir,Northern Ireland,N92000002
ocd-division/country:gb/part:sct,Scotland,S92000003
ocd-division/country:gb/part:wls,Wales,W92000004
chris48s marked this conversation as resolved.
Show resolved Hide resolved
41 changes: 41 additions & 0 deletions identifiers/country-gb/naw_consitituencies.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
id,name,gss_code
chris48s marked this conversation as resolved.
Show resolved Hide resolved
ocd-division/country:gb/part:wls/nawc:ynys_mon,Ynys Mon,W09000001
chris48s marked this conversation as resolved.
Show resolved Hide resolved
ocd-division/country:gb/part:wls/nawc:arfon,Arfon,W09000002
ocd-division/country:gb/part:wls/nawc:aberconwy,Aberconwy,W09000003
ocd-division/country:gb/part:wls/nawc:clwyd_west,Clwyd West,W09000004
ocd-division/country:gb/part:wls/nawc:vale_of_clwyd,Vale of Clwyd,W09000005
ocd-division/country:gb/part:wls/nawc:delyn,Delyn,W09000006
ocd-division/country:gb/part:wls/nawc:alyn_and_deeside,Alyn and Deeside,W09000007
ocd-division/country:gb/part:wls/nawc:wrexham,Wrexham,W09000008
ocd-division/country:gb/part:wls/nawc:clwyd_south,Clwyd South,W09000009
ocd-division/country:gb/part:wls/nawc:dwyfor_meirionnydd,Dwyfor Meirionnydd,W09000010
ocd-division/country:gb/part:wls/nawc:montgomeryshire,Montgomeryshire,W09000011
ocd-division/country:gb/part:wls/nawc:ceredigion,Ceredigion,W09000012
ocd-division/country:gb/part:wls/nawc:preseli_pembrokeshire,Preseli Pembrokeshire,W09000014
ocd-division/country:gb/part:wls/nawc:carmarthen_east_and_dinefwr,Carmarthen East and Dinefwr,W09000015
ocd-division/country:gb/part:wls/nawc:carmarthen_west_and_south_pembrokeshire,Carmarthen West and South Pembrokeshire,W09000016
ocd-division/country:gb/part:wls/nawc:llanelli,Llanelli,W09000017
ocd-division/country:gb/part:wls/nawc:gower,Gower,W09000018
ocd-division/country:gb/part:wls/nawc:rhondda,Rhondda,W09000025
ocd-division/country:gb/part:wls/nawc:cynon_valley,Cynon Valley,W09000026
ocd-division/country:gb/part:wls/nawc:cardiff_west,Cardiff West,W09000029
ocd-division/country:gb/part:wls/nawc:cardiff_central,Cardiff Central,W09000031
ocd-division/country:gb/part:wls/nawc:monmouth,Monmouth,W09000034
ocd-division/country:gb/part:wls/nawc:caerphilly,Caerphilly,W09000035
ocd-division/country:gb/part:wls/nawc:islwyn,Islwyn,W09000036
ocd-division/country:gb/part:wls/nawc:torfaen,Torfaen,W09000037
ocd-division/country:gb/part:wls/nawc:blaenau_gwent,Blaenau Gwent,W09000038
ocd-division/country:gb/part:wls/nawc:newport_west,Newport West,W09000039
ocd-division/country:gb/part:wls/nawc:newport_east,Newport East,W09000040
ocd-division/country:gb/part:wls/nawc:brecon_and_radnorshire,Brecon and Radnorshire,W09000041
ocd-division/country:gb/part:wls/nawc:cardiff_north,Cardiff North,W09000042
ocd-division/country:gb/part:wls/nawc:cardiff_south_and_penarth,Cardiff South and Penarth,W09000043
ocd-division/country:gb/part:wls/nawc:merthyr_tydfil_and_rhymney,Merthyr Tydfil and Rhymney,W09000044
ocd-division/country:gb/part:wls/nawc:ogmore,Ogmore,W09000045
ocd-division/country:gb/part:wls/nawc:pontypridd,Pontypridd,W09000046
ocd-division/country:gb/part:wls/nawc:vale_of_glamorgan,Vale of Glamorgan,W09000047
ocd-division/country:gb/part:wls/nawc:swansea_west,Swansea West,W09000019
ocd-division/country:gb/part:wls/nawc:swansea_east,Swansea East,W09000020
ocd-division/country:gb/part:wls/nawc:neath,Neath,W09000021
ocd-division/country:gb/part:wls/nawc:aberavon,Aberavon,W09000022
ocd-division/country:gb/part:wls/nawc:bridgend,Bridgend,W09000023
6 changes: 6 additions & 0 deletions identifiers/country-gb/naw_regions.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
id,name,gss_code
ocd-division/country:gb/part:wls/nawr:north_wales,North Wales,W10000001
ocd-division/country:gb/part:wls/nawr:mid_and_west_wales,Mid and West Wales,W10000006
ocd-division/country:gb/part:wls/nawr:south_wales_central,South Wales Central,W10000007
ocd-division/country:gb/part:wls/nawr:south_wales_east,South Wales East,W10000008
ocd-division/country:gb/part:wls/nawr:south_wales_west,South Wales West,W10000009
6 changes: 0 additions & 6 deletions identifiers/country-gb/parts.csv
View file
Open in desktop

This file was deleted.

41 changes: 41 additions & 0 deletions identifiers/country-gb/police_force_areas.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
id,name,gss_code
ocd-division/country:gb/pfa:cumbria,Cumbria,E23000002
ocd-division/country:gb/pfa:lancashire,Lancashire,E23000003
ocd-division/country:gb/pfa:merseyside,Merseyside,E23000004
ocd-division/country:gb/pfa:cheshire,Cheshire,E23000006
ocd-division/country:gb/pfa:northumbria,Northumbria,E23000007
ocd-division/country:gb/pfa:durham,Durham,E23000008
ocd-division/country:gb/pfa:north_yorkshire,North Yorkshire,E23000009
ocd-division/country:gb/pfa:west_yorkshire,West Yorkshire,E23000010
ocd-division/country:gb/pfa:south_yorkshire,South Yorkshire,E23000011
ocd-division/country:gb/pfa:humberside,Humberside,E23000012
ocd-division/country:gb/pfa:cleveland,Cleveland,E23000013
ocd-division/country:gb/pfa:west_midlands,West Midlands,E23000014
ocd-division/country:gb/pfa:staffordshire,Staffordshire,E23000015
ocd-division/country:gb/pfa:west_mercia,West Mercia,E23000016
ocd-division/country:gb/pfa:warwickshire,Warwickshire,E23000017
ocd-division/country:gb/pfa:derbyshire,Derbyshire,E23000018
ocd-division/country:gb/pfa:nottinghamshire,Nottinghamshire,E23000019
ocd-division/country:gb/pfa:lincolnshire,Lincolnshire,E23000020
ocd-division/country:gb/pfa:leicestershire,Leicestershire,E23000021
ocd-division/country:gb/pfa:northamptonshire,Northamptonshire,E23000022
ocd-division/country:gb/pfa:cambridgeshire,Cambridgeshire,E23000023
ocd-division/country:gb/pfa:norfolk,Norfolk,E23000024
ocd-division/country:gb/pfa:suffolk,Suffolk,E23000025
ocd-division/country:gb/pfa:bedfordshire,Bedfordshire,E23000026
ocd-division/country:gb/pfa:hertfordshire,Hertfordshire,E23000027
ocd-division/country:gb/pfa:essex,Essex,E23000028
ocd-division/country:gb/pfa:thames_valley,Thames Valley,E23000029
ocd-division/country:gb/pfa:hampshire,Hampshire,E23000030
ocd-division/country:gb/pfa:surrey,Surrey,E23000031
ocd-division/country:gb/pfa:kent,Kent,E23000032
ocd-division/country:gb/pfa:sussex,Sussex,E23000033
ocd-division/country:gb/pfa:devon_and_cornwall,Devon and Cornwall,E23000035
ocd-division/country:gb/pfa:avon_and_somerset,Avon and Somerset,E23000036
ocd-division/country:gb/pfa:gloucestershire,Gloucestershire,E23000037
ocd-division/country:gb/pfa:wiltshire,Wiltshire,E23000038
ocd-division/country:gb/pfa:dorset,Dorset,E23000039
ocd-division/country:gb/pfa:north_wales,North Wales,W15000001
ocd-division/country:gb/pfa:gwent,Gwent,W15000002
ocd-division/country:gb/pfa:south_wales,South Wales,W15000003
ocd-division/country:gb/pfa:dyfed-powys,Dyfed-Powys,W15000004
10 changes: 0 additions & 10 deletions identifiers/country-gb/regions-eng.csv
View file
Open in desktop

This file was deleted.

74 changes: 74 additions & 0 deletions identifiers/country-gb/scottish_parliament_consitituencies.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
id,name,gss_code
ocd-division/country:gb/part:sct/spc:aberdeen_central,Aberdeen Central,S16000074
ocd-division/country:gb/part:sct/spc:aberdeen_donside,Aberdeen Donside,S16000075
ocd-division/country:gb/part:sct/spc:aberdeen_south_and_north_kincardine,Aberdeen South and North Kincardine,S16000076
ocd-division/country:gb/part:sct/spc:aberdeenshire_east,Aberdeenshire East,S16000077
ocd-division/country:gb/part:sct/spc:aberdeenshire_west,Aberdeenshire West,S16000078
ocd-division/country:gb/part:sct/spc:airdrie_and_shotts,Airdrie and Shotts,S16000079
ocd-division/country:gb/part:sct/spc:almond_valley,Almond Valley,S16000080
ocd-division/country:gb/part:sct/spc:angus_north_and_mearns,Angus North and Mearns,S16000081
ocd-division/country:gb/part:sct/spc:angus_south,Angus South,S16000082
ocd-division/country:gb/part:sct/spc:argyll_and_bute,Argyll and Bute,S16000083
ocd-division/country:gb/part:sct/spc:ayr,Ayr,S16000084
ocd-division/country:gb/part:sct/spc:banffshire_and_buchan_coast,Banffshire and Buchan Coast,S16000085
ocd-division/country:gb/part:sct/spc:caithness_sutherland_and_ross,"Caithness, Sutherland and Ross",S16000086
ocd-division/country:gb/part:sct/spc:carrick_cumnock_and_doon_valley,"Carrick, Cumnock and Doon Valley",S16000087
ocd-division/country:gb/part:sct/spc:clackmannanshire_and_dunblane,Clackmannanshire and Dunblane,S16000088
ocd-division/country:gb/part:sct/spc:clydebank_and_milngavie,Clydebank and Milngavie,S16000089
ocd-division/country:gb/part:sct/spc:clydesdale,Clydesdale,S16000090
ocd-division/country:gb/part:sct/spc:coatbridge_and_chryston,Coatbridge and Chryston,S16000091
ocd-division/country:gb/part:sct/spc:cowdenbeath,Cowdenbeath,S16000092
ocd-division/country:gb/part:sct/spc:cumbernauld_and_kilsyth,Cumbernauld and Kilsyth,S16000093
ocd-division/country:gb/part:sct/spc:cunninghame_north,Cunninghame North,S16000094
ocd-division/country:gb/part:sct/spc:cunninghame_south,Cunninghame South,S16000095
ocd-division/country:gb/part:sct/spc:dumbarton,Dumbarton,S16000096
ocd-division/country:gb/part:sct/spc:dumfriesshire,Dumfriesshire,S16000097
ocd-division/country:gb/part:sct/spc:glasgow_kelvin,Glasgow Kelvin,S16000117
ocd-division/country:gb/part:sct/spc:glasgow_maryhill_and_springburn,Glasgow Maryhill and Springburn,S16000118
ocd-division/country:gb/part:sct/spc:glasgow_pollok,Glasgow Pollok,S16000119
ocd-division/country:gb/part:sct/spc:glasgow_provan,Glasgow Provan,S16000147
ocd-division/country:gb/part:sct/spc:glasgow_shettleston,Glasgow Shettleston,S16000121
ocd-division/country:gb/part:sct/spc:glasgow_southside,Glasgow Southside,S16000122
ocd-division/country:gb/part:sct/spc:greenock_and_inverclyde,Greenock and Inverclyde,S16000123
ocd-division/country:gb/part:sct/spc:hamilton_larkhall_and_stonehouse,"Hamilton, Larkhall and Stonehouse",S16000124
ocd-division/country:gb/part:sct/spc:inverness_and_nairn,Inverness and Nairn,S16000125
ocd-division/country:gb/part:sct/spc:kilmarnock_and_irvine_valley,Kilmarnock and Irvine Valley,S16000126
ocd-division/country:gb/part:sct/spc:kirkcaldy,Kirkcaldy,S16000127
ocd-division/country:gb/part:sct/spc:linlithgow,Linlithgow,S16000128
ocd-division/country:gb/part:sct/spc:mid_fife_and_glenrothes,Mid Fife and Glenrothes,S16000129
ocd-division/country:gb/part:sct/spc:midlothian_north_and_musselburgh,Midlothian North and Musselburgh,S16000130
ocd-division/country:gb/part:sct/spc:midlothian_south_tweeddale_and_lauderdale,"Midlothian South, Tweeddale and Lauderdale",S16000131
ocd-division/country:gb/part:sct/spc:moray,Moray,S16000132
ocd-division/country:gb/part:sct/spc:motherwell_and_wishaw,Motherwell and Wishaw,S16000133
ocd-division/country:gb/part:sct/spc:north_east_fife,North East Fife,S16000134
ocd-division/country:gb/part:sct/spc:orkney_islands,Orkney Islands,S16000135
ocd-division/country:gb/part:sct/spc:paisley,Paisley,S16000136
ocd-division/country:gb/part:sct/spc:perthshire_north,Perthshire North,S16000137
ocd-division/country:gb/part:sct/spc:perthshire_south_and_kinross-shire,Perthshire South and Kinross-shire,S16000138
ocd-division/country:gb/part:sct/spc:renfrewshire_north_and_west,Renfrewshire North and West,S16000139
ocd-division/country:gb/part:sct/spc:renfrewshire_south,Renfrewshire South,S16000140
ocd-division/country:gb/part:sct/spc:rutherglen,Rutherglen,S16000141
ocd-division/country:gb/part:sct/spc:shetland_islands,Shetland Islands,S16000142
ocd-division/country:gb/part:sct/spc:skye_lochaber_and_badenoch,"Skye, Lochaber and Badenoch",S16000143
ocd-division/country:gb/part:sct/spc:stirling,Stirling,S16000144
ocd-division/country:gb/part:sct/spc:strathkelvin_and_bearsden,Strathkelvin and Bearsden,S16000148
ocd-division/country:gb/part:sct/spc:uddingston_and_bellshill,Uddingston and Bellshill,S16000146
ocd-division/country:gb/part:sct/spc:dundee_city_east,Dundee City East,S16000098
ocd-division/country:gb/part:sct/spc:dundee_city_west,Dundee City West,S16000099
ocd-division/country:gb/part:sct/spc:dunfermline,Dunfermline,S16000100
ocd-division/country:gb/part:sct/spc:east_kilbride,East Kilbride,S16000101
ocd-division/country:gb/part:sct/spc:east_lothian,East Lothian,S16000102
ocd-division/country:gb/part:sct/spc:eastwood,Eastwood,S16000103
ocd-division/country:gb/part:sct/spc:edinburgh_central,Edinburgh Central,S16000104
ocd-division/country:gb/part:sct/spc:edinburgh_eastern,Edinburgh Eastern,S16000105
ocd-division/country:gb/part:sct/spc:edinburgh_northern_and_leith,Edinburgh Northern and Leith,S16000106
ocd-division/country:gb/part:sct/spc:edinburgh_pentlands,Edinburgh Pentlands,S16000107
ocd-division/country:gb/part:sct/spc:edinburgh_southern,Edinburgh Southern,S16000108
ocd-division/country:gb/part:sct/spc:edinburgh_western,Edinburgh Western,S16000109
ocd-division/country:gb/part:sct/spc:na_h-eileanan_an_iar,Na h-Eileanan an Iar,S16000110
ocd-division/country:gb/part:sct/spc:ettrick_roxburgh_and_berwickshire,"Ettrick, Roxburgh and Berwickshire",S16000111
ocd-division/country:gb/part:sct/spc:falkirk_east,Falkirk East,S16000112
ocd-division/country:gb/part:sct/spc:falkirk_west,Falkirk West,S16000113
ocd-division/country:gb/part:sct/spc:galloway_and_west_dumfries,Galloway and West Dumfries,S16000114
ocd-division/country:gb/part:sct/spc:glasgow_anniesland,Glasgow Anniesland,S16000115
ocd-division/country:gb/part:sct/spc:glasgow_cathcart,Glasgow Cathcart,S16000116
9 changes: 9 additions & 0 deletions identifiers/country-gb/scottish_parliament_regions.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
id,name,gss_code
ocd-division/country:gb/part:sct/spr:central_scotland,Central Scotland,S17000009
ocd-division/country:gb/part:sct/spr:highlands_and_islands,Highlands and Islands,S17000011
ocd-division/country:gb/part:sct/spr:lothian,Lothian,S17000012
ocd-division/country:gb/part:sct/spr:mid_scotland_and_fife,Mid Scotland and Fife,S17000013
ocd-division/country:gb/part:sct/spr:north_east_scotland,North East Scotland,S17000014
ocd-division/country:gb/part:sct/spr:south_scotland,South Scotland,S17000015
ocd-division/country:gb/part:sct/spr:glasgow,Glasgow,S17000017
ocd-division/country:gb/part:sct/spr:west_scotland,West Scotland,S17000018
Loading