AM.yaml in countries-2.0.0.pre.3

- old
+ new
@@ -1,92 +1,137 @@
 ---
 AG:
+  unofficial_names: Aragac?otn
+  translations:
+    en: Aragac?otn
+  geo:
+    latitude: 
+    longitude: 
+    min_latitude: 
+    min_longitude: 
+    max_latitude: 
+    max_longitude: 
   name: Aragac?otn
-  names: Aragac?otn
 AR:
+  unofficial_names: Ararat
+  translations:
+    en: Ararat
+  geo:
+    latitude: 39.9753273
+    longitude: 44.8338058
+    min_latitude: 39.713722
+    min_longitude: 44.3149281
+    max_latitude: 40.189931
+    max_longitude: 45.11704899999999
   name: Ararat
-  names: Ararat
-  latitude: 39.9753273
-  longitude: 44.8338058
-  min_latitude: 39.713722
-  min_longitude: 44.3149281
-  max_latitude: 40.189931
-  max_longitude: 45.11704899999999
 AV:
+  unofficial_names: Armavir
+  translations:
+    en: Armavir
+  geo:
+    latitude: 40.1315615
+    longitude: 43.8325355
+    min_latitude: 40.01846700000001
+    min_longitude: 43.6464811
+    max_latitude: 40.283289
+    max_longitude: 44.4403099
   name: Armavir
-  names: Armavir
-  latitude: 40.1315615
-  longitude: 43.8325355
-  min_latitude: 40.01846700000001
-  min_longitude: 43.6464811
-  max_latitude: 40.283289
-  max_longitude: 44.4403099
 ER:
+  unofficial_names: Erevan
+  translations:
+    en: Erevan
+  geo:
+    latitude: 40.183333
+    longitude: 44.516667
+    min_latitude: 40.0641141
+    min_longitude: 44.3620849
+    max_latitude: 40.2426667
+    max_longitude: 44.6150493
   name: Erevan
-  names: Erevan
-  latitude: 40.183333
-  longitude: 44.516667
-  min_latitude: 40.0641141
-  min_longitude: 44.3620849
-  max_latitude: 40.2426667
-  max_longitude: 44.6150493
 GR:
-  name: Gegark'unik'
-  names:
+  unofficial_names:
   - Gegharkunick
+  translations:
+    en: Gegark'unik'
+  geo:
+    latitude: 
+    longitude: 
+    min_latitude: 
+    min_longitude: 
+    max_latitude: 
+    max_longitude: 
+  name: Gegark'unik'
 KT:
-  name: Kotayk'
-  names:
+  unofficial_names:
   - Kotaik
-  latitude: 40.4277896
-  longitude: 44.6641741
-  min_latitude: 40.0972899
-  min_longitude: 44.398311
-  max_latitude: 40.71982999999999
-  max_longitude: 45.043105
+  translations:
+    en: Kotayk'
+  geo:
+    latitude: 40.4277896
+    longitude: 44.6641741
+    min_latitude: 40.0972899
+    min_longitude: 44.398311
+    max_latitude: 40.71982999999999
+    max_longitude: 45.043105
+  name: Kotayk'
 LO:
-  name: Lo?y
-  names:
+  unofficial_names:
   - Lorri
-  latitude: 37.7530632
-  longitude: -1.1994507
-  min_latitude: 37.7527809
-  min_longitude: -1.1999395
-  max_latitude: 37.7532447
-  max_longitude: -1.1986907
+  translations:
+    en: Lo?y
+  geo:
+    latitude: 37.7530632
+    longitude: -1.1994507
+    min_latitude: 37.7527809
+    min_longitude: -1.1999395
+    max_latitude: 37.7532447
+    max_longitude: -1.1986907
+  name: Lo?y
 SH:
-  name: "Širak"
-  names: "Širak"
-  latitude: 40.9630814
-  longitude: 43.8102461
-  min_latitude: 40.439465
-  min_longitude: 43.4497797
-  max_latitude: 41.1808931
-  max_longitude: 44.2037191
+  unofficial_names: Širak
+  translations:
+    en: Širak
+  geo:
+    latitude: 40.9630814
+    longitude: 43.8102461
+    min_latitude: 40.439465
+    min_longitude: 43.4497797
+    max_latitude: 41.1808931
+    max_longitude: 44.2037191
+  name: Širak
 SU:
+  unofficial_names: Syunik'
+  translations:
+    en: Syunik'
+  geo:
+    latitude: 39.3194392
+    longitude: 46.14609189999999
+    min_latitude: 38.830521
+    min_longitude: 45.70893909999999
+    max_latitude: 39.854328
+    max_longitude: 46.630035
   name: Syunik'
-  names: Syunik'
-  latitude: 39.3194392
-  longitude: 46.14609189999999
-  min_latitude: 38.830521
-  min_longitude: 45.70893909999999
-  max_latitude: 39.854328
-  max_longitude: 46.630035
 TV:
-  name: Tavuš
-  names:
+  unofficial_names:
   - Tavoush
-  latitude: 40.8866296
-  longitude: 45.339349
-  min_latitude: 40.648954
-  min_longitude: 44.766082
-  max_latitude: 41.3018379
-  max_longitude: 45.5956799
+  translations:
+    en: Tavuš
+  geo:
+    latitude: 40.8866296
+    longitude: 45.339349
+    min_latitude: 40.648954
+    min_longitude: 44.766082
+    max_latitude: 41.3018379
+    max_longitude: 45.5956799
+  name: Tavuš
 VD:
+  unofficial_names: Vayoc Jor
+  translations:
+    en: Vayoc Jor
+  geo:
+    latitude: 39.8107912
+    longitude: 45.4967174
+    min_latitude: 39.502243
+    min_longitude: 45.066502
+    max_latitude: 40.01380899999999
+    max_longitude: 45.825905
   name: Vayoc Jor
-  names: Vayoc Jor
-  latitude: 39.8107912
-  longitude: 45.4967174
-  min_latitude: 39.502243
-  min_longitude: 45.066502
-  max_latitude: 40.01380899999999
-  max_longitude: 45.825905