Imported Upstream version 3.74

diff --git a/ChangeLog b/ChangeLog
index 80ca9ea..1ec301c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+iso-codes 3.74
+--------------
+Dr. Tobias Quathamer <toddy@debian.org>
+Mon, 16 Jan 2017
+
+  [ ISO 3166-2 ]
+  * Remove GB- prefix from parent code for Great Britain.
+    Closes: alioth#315604
+
+
 iso-codes 3.73
 --------------
 Dr. Tobias Quathamer <toddy@debian.org>

diff --git a/configure b/configure
index 996c12e..4f892c7 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for iso-codes 3.73.
+# Generated by GNU Autoconf 2.69 for iso-codes 3.74.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,8 +576,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='iso-codes'
 PACKAGE_TARNAME='iso-codes'
-PACKAGE_VERSION='3.73'
-PACKAGE_STRING='iso-codes 3.73'
+PACKAGE_VERSION='3.74'
+PACKAGE_STRING='iso-codes 3.74'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1219,7 +1219,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures iso-codes 3.73 to adapt to many kinds of systems.
+\`configure' configures iso-codes 3.74 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1286,7 +1286,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of iso-codes 3.73:";;
+     short | recursive ) echo "Configuration of iso-codes 3.74:";;
    esac
   cat <<\_ACEOF
 
@@ -1363,7 +1363,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-iso-codes configure 3.73
+iso-codes configure 3.74
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1380,7 +1380,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by iso-codes $as_me 3.73, which was
+It was created by iso-codes $as_me 3.74, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2244,7 +2244,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='iso-codes'
- VERSION='3.73'
+ VERSION='3.74'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3147,7 +3147,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by iso-codes $as_me 3.73, which was
+This file was extended by iso-codes $as_me 3.74, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3200,7 +3200,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-iso-codes config.status 3.73
+iso-codes config.status 3.74
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 341dfa7..72cd539 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
-AC_INIT([iso-codes],[3.73])
+AC_INIT([iso-codes],[3.74])
 
 AM_INIT_AUTOMAKE([dist-xz no-dist-gzip foreign])
 AM_MAINTAINER_MODE

diff --git a/data/iso_3166-2.json b/data/iso_3166-2.json
index e337c03..8d3e602 100644 (file)
--- a/data/iso_3166-2.json
+++ b/data/iso_3166-2.json
@@ -7362,361 +7362,361 @@
     {
       "code": "GB-ABC",
       "name": "Armagh, Banbridge and Craigavon",
-      "parent": "GB-NIR",
+      "parent": "NIR",
       "type": "District"
     },
     {
       "code": "GB-ABD",
       "name": "Aberdeenshire",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-ABE",
       "name": "Aberdeen City",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-AGB",
       "name": "Argyll and Bute",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-AGY",
       "name": "Isle of Anglesey; Sir Ynys Môn",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-AND",
       "name": "Ards and North Down",
-      "parent": "GB-NIR",
+      "parent": "NIR",
       "type": "District"
     },
     {
       "code": "GB-ANN",
       "name": "Antrim and Newtownabbey",
-      "parent": "GB-NIR",
+      "parent": "NIR",
       "type": "District"
     },
     {
       "code": "GB-ANS",
       "name": "Angus",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-BAS",
       "name": "Bath and North East Somerset",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-BBD",
       "name": "Blackburn with Darwen",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-BDF",
       "name": "Bedford",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-BDG",
       "name": "Barking and Dagenham",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-BEN",
       "name": "Brent",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-BEX",
       "name": "Bexley",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-BFS",
       "name": "Belfast",
-      "parent": "GB-NIR",
+      "parent": "NIR",
       "type": "District"
     },
     {
       "code": "GB-BGE",
       "name": "Bridgend; Pen-y-bont ar Ogwr",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-BGW",
       "name": "Blaenau Gwent",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-BIR",
       "name": "Birmingham",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-BKM",
       "name": "Buckinghamshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-BMH",
       "name": "Bournemouth",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-BNE",
       "name": "Barnet",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-BNH",
       "name": "Brighton and Hove",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-BNS",
       "name": "Barnsley",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-BOL",
       "name": "Bolton",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-BPL",
       "name": "Blackpool",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-BRC",
       "name": "Bracknell Forest",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-BRD",
       "name": "Bradford",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-BRY",
       "name": "Bromley",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-BST",
       "name": "Bristol, City of",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-BUR",
       "name": "Bury",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-CAM",
       "name": "Cambridgeshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-CAY",
       "name": "Caerphilly; Caerffili",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-CBF",
       "name": "Central Bedfordshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-CCG",
       "name": "Causeway Coast and Glens",
-      "parent": "GB-NIR",
+      "parent": "NIR",
       "type": "District"
     },
     {
       "code": "GB-CGN",
       "name": "Ceredigion; Sir Ceredigion",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-CHE",
       "name": "Cheshire East",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-CHW",
       "name": "Cheshire West and Chester",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-CLD",
       "name": "Calderdale",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-CLK",
       "name": "Clackmannanshire",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-CMA",
       "name": "Cumbria",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-CMD",
       "name": "Camden",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-CMN",
       "name": "Carmarthenshire; Sir Gaerfyrddin",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-CON",
       "name": "Cornwall",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-COV",
       "name": "Coventry",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-CRF",
       "name": "Cardiff; Caerdydd",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-CRY",
       "name": "Croydon",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-CWY",
       "name": "Conwy",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-DAL",
       "name": "Darlington",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-DBY",
       "name": "Derbyshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-DEN",
       "name": "Denbighshire; Sir Ddinbych",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-DER",
       "name": "Derby",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-DEV",
       "name": "Devon",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-DGY",
       "name": "Dumfries and Galloway",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-DNC",
       "name": "Doncaster",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-DND",
       "name": "Dundee City",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-DOR",
       "name": "Dorset",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-DRS",
       "name": "Derry and Strabane",
-      "parent": "GB-NIR",
+      "parent": "NIR",
       "type": "District"
     },
     {
       "code": "GB-DUD",
       "name": "Dudley",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-DUR",
       "name": "Durham County",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-EAL",
       "name": "Ealing",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
@@ -7727,37 +7727,37 @@
     {
       "code": "GB-EAY",
       "name": "East Ayrshire",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-EDH",
       "name": "Edinburgh, City of",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-EDU",
       "name": "East Dunbartonshire",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-ELN",
       "name": "East Lothian",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-ELS",
       "name": "Eilean Siar",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-ENF",
       "name": "Enfield",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
@@ -7768,55 +7768,55 @@
     {
       "code": "GB-ERW",
       "name": "East Renfrewshire",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-ERY",
       "name": "East Riding of Yorkshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-ESS",
       "name": "Essex",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-ESX",
       "name": "East Sussex",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-FAL",
       "name": "Falkirk",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-FIF",
       "name": "Fife",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-FLN",
       "name": "Flintshire; Sir y Fflint",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-FMO",
       "name": "Fermanagh and Omagh",
-      "parent": "GB-NIR",
+      "parent": "NIR",
       "type": "District"
     },
     {
       "code": "GB-GAT",
       "name": "Gateshead",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
@@ -7827,331 +7827,331 @@
     {
       "code": "GB-GLG",
       "name": "Glasgow City",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-GLS",
       "name": "Gloucestershire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-GRE",
       "name": "Greenwich",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-GWN",
       "name": "Gwynedd",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-HAL",
       "name": "Halton",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-HAM",
       "name": "Hampshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-HAV",
       "name": "Havering",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-HCK",
       "name": "Hackney",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-HEF",
       "name": "Herefordshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-HIL",
       "name": "Hillingdon",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-HLD",
       "name": "Highland",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-HMF",
       "name": "Hammersmith and Fulham",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-HNS",
       "name": "Hounslow",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-HPL",
       "name": "Hartlepool",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-HRT",
       "name": "Hertfordshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-HRW",
       "name": "Harrow",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-HRY",
       "name": "Haringey",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-IOS",
       "name": "Isles of Scilly",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-IOW",
       "name": "Isle of Wight",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-ISL",
       "name": "Islington",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-IVC",
       "name": "Inverclyde",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-KEC",
       "name": "Kensington and Chelsea",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-KEN",
       "name": "Kent",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-KHL",
       "name": "Kingston upon Hull",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-KIR",
       "name": "Kirklees",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-KTT",
       "name": "Kingston upon Thames",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-KWL",
       "name": "Knowsley",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-LAN",
       "name": "Lancashire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-LBC",
       "name": "Lisburn and Castlereagh",
-      "parent": "GB-NIR",
+      "parent": "NIR",
       "type": "District"
     },
     {
       "code": "GB-LBH",
       "name": "Lambeth",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-LCE",
       "name": "Leicester",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-LDS",
       "name": "Leeds",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-LEC",
       "name": "Leicestershire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-LEW",
       "name": "Lewisham",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-LIN",
       "name": "Lincolnshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-LIV",
       "name": "Liverpool",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-LND",
       "name": "London, City of",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "City corporation"
     },
     {
       "code": "GB-LUT",
       "name": "Luton",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-MAN",
       "name": "Manchester",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-MDB",
       "name": "Middlesbrough",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-MDW",
       "name": "Medway",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-MEA",
       "name": "Mid and East Antrim",
-      "parent": "GB-NIR",
+      "parent": "NIR",
       "type": "District"
     },
     {
       "code": "GB-MIK",
       "name": "Milton Keynes",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-MLN",
       "name": "Midlothian",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-MON",
       "name": "Monmouthshire; Sir Fynwy",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-MRT",
       "name": "Merton",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-MRY",
       "name": "Moray",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-MTY",
       "name": "Merthyr Tydfil; Merthyr Tudful",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-MUL",
       "name": "Mid Ulster",
-      "parent": "GB-NIR",
+      "parent": "NIR",
       "type": "District"
     },
     {
       "code": "GB-NAY",
       "name": "North Ayrshire",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-NBL",
       "name": "Northumberland",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-NEL",
       "name": "North East Lincolnshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-NET",
       "name": "Newcastle upon Tyne",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-NFK",
       "name": "Norfolk",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-NGM",
       "name": "Nottingham",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
@@ -8162,199 +8162,199 @@
     {
       "code": "GB-NLK",
       "name": "North Lanarkshire",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-NLN",
       "name": "North Lincolnshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-NMD",
       "name": "Newry, Mourne and Down",
-      "parent": "GB-NIR",
+      "parent": "NIR",
       "type": "District"
     },
     {
       "code": "GB-NSM",
       "name": "North Somerset",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-NTH",
       "name": "Northamptonshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-NTL",
       "name": "Neath Port Talbot; Castell-nedd Port Talbot",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-NTT",
       "name": "Nottinghamshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-NTY",
       "name": "North Tyneside",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-NWM",
       "name": "Newham",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-NWP",
       "name": "Newport; Casnewydd",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-NYK",
       "name": "North Yorkshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-OLD",
       "name": "Oldham",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-ORK",
       "name": "Orkney Islands",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-OXF",
       "name": "Oxfordshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-PEM",
       "name": "Pembrokeshire; Sir Benfro",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-PKN",
       "name": "Perth and Kinross",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-PLY",
       "name": "Plymouth",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-POL",
       "name": "Poole",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-POR",
       "name": "Portsmouth",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-POW",
       "name": "Powys",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-PTE",
       "name": "Peterborough",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-RCC",
       "name": "Redcar and Cleveland",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-RCH",
       "name": "Rochdale",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-RCT",
       "name": "Rhondda, Cynon, Taff; Rhondda, Cynon, Taf",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-RDB",
       "name": "Redbridge",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-RDG",
       "name": "Reading",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-RFW",
       "name": "Renfrewshire",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-RIC",
       "name": "Richmond upon Thames",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-ROT",
       "name": "Rotherham",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-RUT",
       "name": "Rutland",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-SAW",
       "name": "Sandwell",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-SAY",
       "name": "South Ayrshire",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-SCB",
       "name": "Scottish Borders, The",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
@@ -8365,193 +8365,193 @@
     {
       "code": "GB-SFK",
       "name": "Suffolk",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-SFT",
       "name": "Sefton",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-SGC",
       "name": "South Gloucestershire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-SHF",
       "name": "Sheffield",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-SHN",
       "name": "St. Helens",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-SHR",
       "name": "Shropshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-SKP",
       "name": "Stockport",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-SLF",
       "name": "Salford",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-SLG",
       "name": "Slough",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-SLK",
       "name": "South Lanarkshire",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-SND",
       "name": "Sunderland",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-SOL",
       "name": "Solihull",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-SOM",
       "name": "Somerset",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-SOS",
       "name": "Southend-on-Sea",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-SRY",
       "name": "Surrey",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-STE",
       "name": "Stoke-on-Trent",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-STG",
       "name": "Stirling",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-STH",
       "name": "Southampton",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-STN",
       "name": "Sutton",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-STS",
       "name": "Staffordshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-STT",
       "name": "Stockton-on-Tees",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-STY",
       "name": "South Tyneside",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-SWA",
       "name": "Swansea; Abertawe",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-SWD",
       "name": "Swindon",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-SWK",
       "name": "Southwark",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-TAM",
       "name": "Tameside",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-TFW",
       "name": "Telford and Wrekin",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-THR",
       "name": "Thurrock",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-TOB",
       "name": "Torbay",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-TOF",
       "name": "Torfaen; Tor-faen",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-TRF",
       "name": "Trafford",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-TWH",
       "name": "Tower Hamlets",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
@@ -8562,61 +8562,61 @@
     {
       "code": "GB-VGL",
       "name": "Vale of Glamorgan, The; Bro Morgannwg",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-WAR",
       "name": "Warwickshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-WBK",
       "name": "West Berkshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-WDU",
       "name": "West Dunbartonshire",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
       "code": "GB-WFT",
       "name": "Waltham Forest",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-WGN",
       "name": "Wigan",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-WIL",
       "name": "Wiltshire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-WKF",
       "name": "Wakefield",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-WLL",
       "name": "Walsall",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-WLN",
       "name": "West Lothian",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {
@@ -8627,73 +8627,73 @@
     {
       "code": "GB-WLV",
       "name": "Wolverhampton",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-WND",
       "name": "Wandsworth",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-WNM",
       "name": "Windsor and Maidenhead",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-WOK",
       "name": "Wokingham",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-WOR",
       "name": "Worcestershire",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-WRL",
       "name": "Wirral",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Metropolitan district"
     },
     {
       "code": "GB-WRT",
       "name": "Warrington",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-WRX",
       "name": "Wrexham; Wrecsam",
-      "parent": "GB-WLS",
+      "parent": "WLS",
       "type": "Unitary authority"
     },
     {
       "code": "GB-WSM",
       "name": "Westminster",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "London borough"
     },
     {
       "code": "GB-WSX",
       "name": "West Sussex",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Two-tier county"
     },
     {
       "code": "GB-YOR",
       "name": "York",
-      "parent": "GB-ENG",
+      "parent": "ENG",
       "type": "Unitary authority"
     },
     {
       "code": "GB-ZET",
       "name": "Shetland Islands",
-      "parent": "GB-SCT",
+      "parent": "SCT",
       "type": "Council area"
     },
     {