TV.yaml in countries-5.1.0

- old
+ new

@@ -1,9 +1,9 @@
 ---
 FUN:
   name: Funafuti
-  code:
+  code: FUN
   unofficial_names: Funafuti
   geo:
     latitude: -8.516667
     longitude: 179.216667
     min_latitude:
@@ -72,13 +72,14 @@
     uz: Funafuti
     bs: Funafuti
     mk: Фунафути
     'no': Funafuti
   comments:
+  type: town_council
 NIT:
   name: Niutao
-  code:
+  code: NIT
   unofficial_names: Niutao
   geo:
     latitude: -6.106425799999999
     longitude: 177.3438429
     min_latitude: -6.1153794
@@ -116,27 +117,14 @@
     zh: 紐陶島
     ccp: "\U0001111A\U00011128\U00011105\U0001112A\U00011111\U00011103\U0001112E"
     mk: Ниутао
     'no': Niutao
   comments:
-NIU:
-  name: Nui
-  code:
-  unofficial_names: Nui
-  geo:
-    latitude: -7.2426288
-    longitude: 177.1485716
-    min_latitude: -7.246044599999999
-    min_longitude: 177.1461329
-    max_latitude: -7.1889099
-    max_longitude: 177.16564
-  translations:
-    en: Nui
-  comments:
+  type: island_council
 NKF:
   name: Nukufetau
-  code:
+  code: NKF
   unofficial_names: Nukufetau
   geo:
     latitude: -8
     longitude: 178.5
     min_latitude:
@@ -173,13 +161,14 @@
     zh: 努庫費陶環礁
     ccp: "\U0001111A\U0001112A\U00011107\U0001112A\U0001111C\U0001112C\U00011111\U00011105\U0001112A"
     mk: Нукуфетау
     'no': Nukufetau
   comments:
+  type: island_council
 NKL:
   name: Nukulaelae
-  code:
+  code: NKL
   unofficial_names:
   - Nukulailai
   geo:
     latitude: -9.381110999999999
     longitude: 179.852222
@@ -220,13 +209,14 @@
     zh: 努庫萊萊環礁
     ccp: "\U0001111A\U0001112A\U00011107\U0001112A\U00011123\U00011120\U0001112C\U00011123\U00011120\U0001112C"
     mk: Нукулаелае
     'no': Nukulaelae
   comments:
+  type: island_council
 NMA:
   name: Nanumea
-  code:
+  code: NMA
   unofficial_names: Nanumea
   geo:
     latitude: -5.681538799999999
     longitude: 176.1281065
     min_latitude: -5.7013769
@@ -267,13 +257,14 @@
     zh: 納努梅阿環礁
     ccp: "\U0001111A\U0001112A\U0001111A\U0001112A\U0001111F\U00011128\U00011120"
     mk: Нанумеја
     'no': Nanumea
   comments:
+  type: island_council
 NMG:
   name: Nanumanga
-  code:
+  code: NMG
   unofficial_names:
   - Nanumaga
   geo:
     latitude: -6.2910708
     longitude: 176.314856
@@ -311,13 +302,57 @@
     zh: 纳努曼加岛
     ccp: "\U0001111A\U0001111A\U0001112A\U0001111F\U0001111A\U00011134\U00011109"
     mk: Нануманга
     'no': Nanumanga
   comments:
+  type: island_council
+NUI:
+  name: Nui
+  code: NUI
+  unofficial_names:
+  geo:
+    latitude: -7.2426288
+    longitude: 177.1485716
+    min_latitude: -7.246044599999999
+    min_longitude: 177.1461329
+    max_latitude: -7.1889099
+    max_longitude: 177.16564
+  translations:
+    be: Атол Нуі
+    ca: Nui
+    cs: Nui
+    de: Nui
+    en: Nui
+    es: Nui
+    fa: نوئی (آب‌سنگ حلقوی)
+    fi: Nui
+    fr: Nui
+    gl: Nui
+    hu: Nui
+    it: Nui
+    ja: ヌイ環礁
+    ka: ნუი
+    ko: 누이 환초
+    lt: Nui
+    nb: Nui
+    nl: Nui
+    pl: Nui
+    pt: Nui
+    ro: Nui
+    ru: Нуи
+    sk: Nui
+    sv: Nui
+    ur: نوئی
+    zh: 努伊環礁
+    ccp: "\U0001111A\U0001112D\U0001112A"
+    mk: Нуи
+    'no': Nui
+  comments:
+  type: island_council
 VAI:
   name: Vaitupu
-  code:
+  code: VAI
   unofficial_names: Vaitupu
   geo:
     latitude: -7.476732699999999
     longitude: 178.6747675
     min_latitude: -7.4991106
@@ -355,47 +390,6 @@
     zh: 婓伊托波
     ccp: "\U0001111E\U0001112D\U00011111\U0001112A\U0001111B\U0001112A"
     mk: Ваитупу
     'no': Vaitupu
   comments:
-NUI:
-  name: Nui
-  code:
-  unofficial_names:
-  geo:
-    latitude:
-    longitude:
-    min_latitude:
-    min_longitude:
-    max_latitude:
-    max_longitude:
-  translations:
-    be: Атол Нуі
-    ca: Nui
-    cs: Nui
-    de: Nui
-    en: Nui
-    es: Nui
-    fa: نوئی (آب‌سنگ حلقوی)
-    fi: Nui
-    fr: Nui
-    gl: Nui
-    hu: Nui
-    it: Nui
-    ja: ヌイ環礁
-    ka: ნუი
-    ko: 누이 환초
-    lt: Nui
-    nb: Nui
-    nl: Nui
-    pl: Nui
-    pt: Nui
-    ro: Nui
-    ru: Нуи
-    sk: Nui
-    sv: Nui
-    ur: نوئی
-    zh: 努伊環礁
-    ccp: "\U0001111A\U0001112D\U0001112A"
-    mk: Нуи
-    'no': Nui
-  comments:
+  type: island_council