carmen 1.0.1 → 1.0.2

data/iso_data/base/world/sm.yml

@@ -13,7 +13,7 @@
   type: municipalities
 - code: '07'
   type: municipalities
-- code: '08'
+- code: 08
   type: municipalities
-- code: '09'
+- code: 09
   type: municipalities

data/iso_data/base/world/ss.yml

@@ -0,0 +1,21 @@
+---
+- code: BN
+  type: state
+- code: BW
+  type: state
+- code: EC
+  type: state
+- code: EE8
+  type: state
+- code: EW
+  type: state
+- code: JG
+  type: state
+- code: LK
+  type: state
+- code: NU
+  type: state
+- code: UY
+  type: state
+- code: WR
+  type: state

data/iso_data/base/world/tr.yml

@@ -13,9 +13,9 @@
   type: province
 - code: '07'
   type: province
-- code: '08'
+- code: 08
   type: province
-- code: '09'
+- code: 09
   type: province
 - code: '10'
   type: province

data/iso_data/base/world/tv.yml

@@ -3,8 +3,6 @@
   type: town council
 - code: NIT
   type: island council
-- code: NIU
-  type: island council
 - code: NKF
   type: island council
 - code: NKL
@@ -13,5 +11,7 @@
   type: island council
 - code: NMG
   type: island council
+- code: NUI
+  type: island council
 - code: VAI
   type: island council

data/iso_data/base/world/tz.yml

@@ -13,9 +13,9 @@
   type: region
 - code: '07'
   type: region
-- code: '08'
+- code: 08
   type: region
-- code: '09'
+- code: 09
   type: region
 - code: '10'
   type: region

data/iso_data/base/world/ua.yml

@@ -3,7 +3,7 @@
   type: province
 - code: '07'
   type: province
-- code: '09'
+- code: 09
   type: province
 - code: '12'
   type: province

data/iso_data/base/world/vn.yml

@@ -13,7 +13,7 @@
   type: province
 - code: '07'
   type: province
-- code: '09'
+- code: 09
   type: province
 - code: '13'
   type: province
@@ -75,8 +75,6 @@
   type: province
 - code: '47'
   type: province
-- code: '48'
-  type: province
 - code: '49'
   type: province
 - code: '50'
@@ -99,18 +97,10 @@
   type: province
 - code: '59'
   type: province
-- code: '60'
-  type: province
 - code: '61'
   type: province
-- code: '62'
-  type: province
 - code: '63'
   type: province
-- code: '64'
-  type: province
-- code: '65'
-  type: province
 - code: '66'
   type: province
 - code: '67'
@@ -127,3 +117,13 @@
   type: province
 - code: '73'
   type: province
+- code: CT
+  type: municipality
+- code: DN
+  type: municipality
+- code: HN
+  type: municipality
+- code: HP
+  type: municipality
+- code: SG
+  type: municipality

data/iso_data/base/world/za.yml

@@ -3,7 +3,7 @@
   type: province
 - code: FS
   type: province
-- code: GT
+- code: GP
   type: province
 - code: LP
   type: province
@@ -11,9 +11,9 @@
   type: province
 - code: NC
   type: province
-- code: NL
-  type: province
 - code: NW
   type: province
 - code: WC
   type: province
+- code: ZN
+  type: province

data/iso_data/base/world/zm.yml

@@ -13,7 +13,7 @@
   type: province
 - code: '07'
   type: province
-- code: '08'
+- code: 08
   type: province
-- code: '09'
+- code: 09
   type: province

data/iso_data/overlay/world.yml

@@ -1,3 +1,5 @@
 ---
 - alpha_2_code: PR
   _enabled: false
+- alpha_2_code: SG
+  numeric_code: '534'

data/iso_data/overlay/world/gb.yml

@@ -0,0 +1,3 @@
+---
+- code: WIL
+  type: province

data/lib/carmen/querying.rb

@@ -1,4 +1,4 @@
-require 'unicode_utils'
+require 'active_support/core_ext/string'
 
 module Carmen
   module Querying
@@ -32,12 +32,12 @@ module Carmen
     def named(name, options={})
       case_fold = !options[:case] && name.respond_to?(:each_codepoint)
       # These only need to be built once
-      name = case_fold ? UnicodeUtils.casefold(name) : name
+      name = case_fold ? name.mb_chars.downcase.normalize : name
       # For now, "fuzzy" just means substring, optionally case-insensitive (the second argument looks for nil, not falseness)
       regexp = options[:fuzzy] ? Regexp.new(name, options[:case] ? nil : true) : nil
 
       query_collection.find do |region|
-        found_literal = name === (case_fold && region.name ? UnicodeUtils.casefold(region.name) : region.name)
+        found_literal = name === (case_fold && region.name ? region.name.mb_chars.downcase.normalize : region.name)
         found_literal || options[:fuzzy] && regexp === region.name
       end
     end

data/lib/carmen/region.rb

@@ -49,6 +49,10 @@ module Carmen
     def inspect
       "<##{self.class} name=\"#{name}\" type=\"#{type}\">"
     end
+    
+    def to_s
+      name
+    end
 
     # Clears the subregion cache
     def reset!
@@ -101,15 +105,10 @@ module Carmen
     #
     # Returns a single merged array of hashes.
     def flatten_data(arrays)
-
       keys = %w(code alpha_2_code)
-      flattened = Utils.merge_arrays_by_keys(arrays, keys)
-
-      flattened.each do |hash|
-        flattened.delete(hash) if hash['_enabled'] == false
+      Utils.merge_arrays_by_keys(arrays, keys).reject do |hash|
+        hash['_enabled'] == false
       end
-
-      flattened
     end
   end
 end

data/lib/carmen/utils.rb

@@ -8,7 +8,7 @@ module Carmen
     #   - if either doesn't respond_to? :merge, then the new value is used if
     #   it is not nil. If the new value is nil, the old value is used.
     #
-    # Returns a meged hash.
+    # Returns a merged hash.
     def self.deep_hash_merge(hashes)
       return hashes.first if hashes.size == 1
 

data/lib/carmen/version.rb

@@ -1,3 +1,3 @@
 module Carmen
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/locale/base/en/world.yml

@@ -2,555 +2,555 @@
 en:
   world:
     ad:
-      common_name: !!null 
+      common_name: 
       name: Andorra
       official_name: Principality of Andorra
     ae:
-      common_name: !!null 
+      common_name: 
       name: United Arab Emirates
-      official_name: !!null 
+      official_name: 
     af:
-      common_name: !!null 
+      common_name: 
       name: Afghanistan
       official_name: Islamic Republic of Afghanistan
     ag:
-      common_name: !!null 
+      common_name: 
       name: Antigua and Barbuda
-      official_name: !!null 
+      official_name: 
     ai:
-      common_name: !!null 
+      common_name: 
       name: Anguilla
-      official_name: !!null 
+      official_name: 
     al:
-      common_name: !!null 
+      common_name: 
       name: Albania
       official_name: Republic of Albania
     am:
-      common_name: !!null 
+      common_name: 
       name: Armenia
       official_name: Republic of Armenia
     ao:
-      common_name: !!null 
+      common_name: 
       name: Angola
       official_name: Republic of Angola
     aq:
-      common_name: !!null 
+      common_name: 
       name: Antarctica
-      official_name: !!null 
+      official_name: 
     ar:
-      common_name: !!null 
+      common_name: 
       name: Argentina
       official_name: Argentine Republic
     as:
-      common_name: !!null 
+      common_name: 
       name: American Samoa
-      official_name: !!null 
+      official_name: 
     at:
-      common_name: !!null 
+      common_name: 
       name: Austria
       official_name: Republic of Austria
     au:
-      common_name: !!null 
+      common_name: 
       name: Australia
-      official_name: !!null 
+      official_name: 
     aw:
-      common_name: !!null 
+      common_name: 
       name: Aruba
-      official_name: !!null 
+      official_name: 
     ax:
-      common_name: !!null 
-      name: Åland Islands
-      official_name: !!null 
+      common_name: 
+      name: "Åland Islands"
+      official_name: 
     az:
-      common_name: !!null 
+      common_name: 
       name: Azerbaijan
       official_name: Republic of Azerbaijan
     ba:
-      common_name: !!null 
+      common_name: 
       name: Bosnia and Herzegovina
       official_name: Republic of Bosnia and Herzegovina
     bb:
-      common_name: !!null 
+      common_name: 
       name: Barbados
-      official_name: !!null 
+      official_name: 
     bd:
-      common_name: !!null 
+      common_name: 
       name: Bangladesh
       official_name: People's Republic of Bangladesh
     be:
-      common_name: !!null 
+      common_name: 
       name: Belgium
       official_name: Kingdom of Belgium
     bf:
-      common_name: !!null 
+      common_name: 
       name: Burkina Faso
-      official_name: !!null 
+      official_name: 
     bg:
-      common_name: !!null 
+      common_name: 
       name: Bulgaria
       official_name: Republic of Bulgaria
     bh:
-      common_name: !!null 
+      common_name: 
       name: Bahrain
       official_name: Kingdom of Bahrain
     bi:
-      common_name: !!null 
+      common_name: 
       name: Burundi
       official_name: Republic of Burundi
     bj:
-      common_name: !!null 
+      common_name: 
       name: Benin
       official_name: Republic of Benin
     bl:
-      common_name: !!null 
+      common_name: 
       name: Saint Barthélemy
-      official_name: !!null 
+      official_name: 
     bm:
-      common_name: !!null 
+      common_name: 
       name: Bermuda
-      official_name: !!null 
+      official_name: 
     bn:
-      common_name: !!null 
+      common_name: 
       name: Brunei Darussalam
-      official_name: !!null 
+      official_name: 
     bo:
       common_name: Bolivia
       name: Bolivia, Plurinational State of
       official_name: Plurinational State of Bolivia
     bq:
-      common_name: !!null 
+      common_name: 
       name: Bonaire, Sint Eustatius and Saba
       official_name: Bonaire, Sint Eustatius and Saba
     br:
-      common_name: !!null 
+      common_name: 
       name: Brazil
       official_name: Federative Republic of Brazil
     bs:
-      common_name: !!null 
+      common_name: 
       name: Bahamas
       official_name: Commonwealth of the Bahamas
     bt:
-      common_name: !!null 
+      common_name: 
       name: Bhutan
       official_name: Kingdom of Bhutan
     bv:
-      common_name: !!null 
+      common_name: 
       name: Bouvet Island
-      official_name: !!null 
+      official_name: 
     bw:
-      common_name: !!null 
+      common_name: 
       name: Botswana
       official_name: Republic of Botswana
     by:
-      common_name: !!null 
+      common_name: 
       name: Belarus
       official_name: Republic of Belarus
     bz:
-      common_name: !!null 
+      common_name: 
       name: Belize
-      official_name: !!null 
+      official_name: 
     ca:
-      common_name: !!null 
+      common_name: 
       name: Canada
-      official_name: !!null 
+      official_name: 
     cc:
-      common_name: !!null 
+      common_name: 
       name: Cocos (Keeling) Islands
-      official_name: !!null 
+      official_name: 
     cd:
-      common_name: !!null 
+      common_name: 
       name: Congo, The Democratic Republic of the
-      official_name: !!null 
+      official_name: 
     cf:
-      common_name: !!null 
+      common_name: 
       name: Central African Republic
-      official_name: !!null 
+      official_name: 
     cg:
-      common_name: !!null 
+      common_name: 
       name: Congo
       official_name: Republic of the Congo
     ch:
-      common_name: !!null 
+      common_name: 
       name: Switzerland
       official_name: Swiss Confederation
     ci:
-      common_name: !!null 
+      common_name: 
       name: Côte d'Ivoire
       official_name: Republic of Côte d'Ivoire
     ck:
-      common_name: !!null 
+      common_name: 
       name: Cook Islands
-      official_name: !!null 
+      official_name: 
     cl:
-      common_name: !!null 
+      common_name: 
       name: Chile
       official_name: Republic of Chile
     cm:
-      common_name: !!null 
+      common_name: 
       name: Cameroon
       official_name: Republic of Cameroon
     cn:
-      common_name: !!null 
+      common_name: 
       name: China
       official_name: People's Republic of China
     co:
-      common_name: !!null 
+      common_name: 
       name: Colombia
       official_name: Republic of Colombia
     cr:
-      common_name: !!null 
+      common_name: 
       name: Costa Rica
       official_name: Republic of Costa Rica
     cu:
-      common_name: !!null 
+      common_name: 
       name: Cuba
       official_name: Republic of Cuba
     cv:
-      common_name: !!null 
+      common_name: 
       name: Cape Verde
       official_name: Republic of Cape Verde
     cw:
-      common_name: !!null 
+      common_name: 
       name: Curaçao
       official_name: Curaçao
     cx:
-      common_name: !!null 
+      common_name: 
       name: Christmas Island
-      official_name: !!null 
+      official_name: 
     cy:
-      common_name: !!null 
+      common_name: 
       name: Cyprus
       official_name: Republic of Cyprus
     cz:
-      common_name: !!null 
+      common_name: 
       name: Czech Republic
-      official_name: !!null 
+      official_name: 
     de:
-      common_name: !!null 
+      common_name: 
       name: Germany
       official_name: Federal Republic of Germany
     dj:
-      common_name: !!null 
+      common_name: 
       name: Djibouti
       official_name: Republic of Djibouti
     dk:
-      common_name: !!null 
+      common_name: 
       name: Denmark
       official_name: Kingdom of Denmark
     dm:
-      common_name: !!null 
+      common_name: 
       name: Dominica
       official_name: Commonwealth of Dominica
     do:
-      common_name: !!null 
+      common_name: 
       name: Dominican Republic
-      official_name: !!null 
+      official_name: 
     dz:
-      common_name: !!null 
+      common_name: 
       name: Algeria
       official_name: People's Democratic Republic of Algeria
     ec:
-      common_name: !!null 
+      common_name: 
       name: Ecuador
       official_name: Republic of Ecuador
     ee:
-      common_name: !!null 
+      common_name: 
       name: Estonia
       official_name: Republic of Estonia
     eg:
-      common_name: !!null 
+      common_name: 
       name: Egypt
       official_name: Arab Republic of Egypt
     eh:
-      common_name: !!null 
+      common_name: 
       name: Western Sahara
-      official_name: !!null 
+      official_name: 
     er:
-      common_name: !!null 
+      common_name: 
       name: Eritrea
-      official_name: !!null 
+      official_name: the State of Eritrea
     es:
-      common_name: !!null 
+      common_name: 
       name: Spain
       official_name: Kingdom of Spain
     et:
-      common_name: !!null 
+      common_name: 
       name: Ethiopia
       official_name: Federal Democratic Republic of Ethiopia
     fi:
-      common_name: !!null 
+      common_name: 
       name: Finland
       official_name: Republic of Finland
     fj:
-      common_name: !!null 
+      common_name: 
       name: Fiji
       official_name: Republic of Fiji
     fk:
-      common_name: !!null 
+      common_name: 
       name: Falkland Islands (Malvinas)
-      official_name: !!null 
+      official_name: 
     fm:
-      common_name: !!null 
+      common_name: 
       name: Micronesia, Federated States of
       official_name: Federated States of Micronesia
     fo:
-      common_name: !!null 
+      common_name: 
       name: Faroe Islands
-      official_name: !!null 
+      official_name: 
     fr:
-      common_name: !!null 
+      common_name: 
       name: France
       official_name: French Republic
     ga:
-      common_name: !!null 
+      common_name: 
       name: Gabon
       official_name: Gabonese Republic
     gb:
-      common_name: !!null 
+      common_name: 
       name: United Kingdom
       official_name: United Kingdom of Great Britain and Northern Ireland
     gd:
-      common_name: !!null 
+      common_name: 
       name: Grenada
-      official_name: !!null 
+      official_name: 
     ge:
-      common_name: !!null 
+      common_name: 
       name: Georgia
-      official_name: !!null 
+      official_name: 
     gf:
-      common_name: !!null 
+      common_name: 
       name: French Guiana
-      official_name: !!null 
+      official_name: 
     gg:
-      common_name: !!null 
+      common_name: 
       name: Guernsey
-      official_name: !!null 
+      official_name: 
     gh:
-      common_name: !!null 
+      common_name: 
       name: Ghana
       official_name: Republic of Ghana
     gi:
-      common_name: !!null 
+      common_name: 
       name: Gibraltar
-      official_name: !!null 
+      official_name: 
     gl:
-      common_name: !!null 
+      common_name: 
       name: Greenland
-      official_name: !!null 
+      official_name: 
     gm:
-      common_name: !!null 
+      common_name: 
       name: Gambia
       official_name: Republic of the Gambia
     gn:
-      common_name: !!null 
+      common_name: 
       name: Guinea
       official_name: Republic of Guinea
     gp:
-      common_name: !!null 
+      common_name: 
       name: Guadeloupe
-      official_name: !!null 
+      official_name: 
     gq:
-      common_name: !!null 
+      common_name: 
       name: Equatorial Guinea
       official_name: Republic of Equatorial Guinea
     gr:
-      common_name: !!null 
+      common_name: 
       name: Greece
       official_name: Hellenic Republic
     gs:
-      common_name: !!null 
+      common_name: 
       name: South Georgia and the South Sandwich Islands
-      official_name: !!null 
+      official_name: 
     gt:
-      common_name: !!null 
+      common_name: 
       name: Guatemala
       official_name: Republic of Guatemala
     gu:
-      common_name: !!null 
+      common_name: 
       name: Guam
-      official_name: !!null 
+      official_name: 
     gw:
-      common_name: !!null 
+      common_name: 
       name: Guinea-Bissau
       official_name: Republic of Guinea-Bissau
     gy:
-      common_name: !!null 
+      common_name: 
       name: Guyana
       official_name: Republic of Guyana
     hk:
-      common_name: !!null 
+      common_name: 
       name: Hong Kong
       official_name: Hong Kong Special Administrative Region of China
     hm:
-      common_name: !!null 
+      common_name: 
       name: Heard Island and McDonald Islands
-      official_name: !!null 
+      official_name: 
     hn:
-      common_name: !!null 
+      common_name: 
       name: Honduras
       official_name: Republic of Honduras
     hr:
-      common_name: !!null 
+      common_name: 
       name: Croatia
       official_name: Republic of Croatia
     ht:
-      common_name: !!null 
+      common_name: 
       name: Haiti
       official_name: Republic of Haiti
     hu:
-      common_name: !!null 
+      common_name: 
       name: Hungary
       official_name: Hungary
     id:
-      common_name: !!null 
+      common_name: 
       name: Indonesia
       official_name: Republic of Indonesia
     ie:
-      common_name: !!null 
+      common_name: 
       name: Ireland
-      official_name: !!null 
+      official_name: 
     il:
-      common_name: !!null 
+      common_name: 
       name: Israel
       official_name: State of Israel
     im:
-      common_name: !!null 
+      common_name: 
       name: Isle of Man
-      official_name: !!null 
+      official_name: 
     in:
-      common_name: !!null 
+      common_name: 
       name: India
       official_name: Republic of India
     io:
-      common_name: !!null 
+      common_name: 
       name: British Indian Ocean Territory
-      official_name: !!null 
+      official_name: 
     iq:
-      common_name: !!null 
+      common_name: 
       name: Iraq
       official_name: Republic of Iraq
     ir:
-      common_name: !!null 
+      common_name: 
       name: Iran, Islamic Republic of
       official_name: Islamic Republic of Iran
     is:
-      common_name: !!null 
+      common_name: 
       name: Iceland
       official_name: Republic of Iceland
     it:
-      common_name: !!null 
+      common_name: 
       name: Italy
       official_name: Italian Republic
     je:
-      common_name: !!null 
+      common_name: 
       name: Jersey
-      official_name: !!null 
+      official_name: 
     jm:
-      common_name: !!null 
+      common_name: 
       name: Jamaica
-      official_name: !!null 
+      official_name: 
     jo:
-      common_name: !!null 
+      common_name: 
       name: Jordan
       official_name: Hashemite Kingdom of Jordan
     jp:
-      common_name: !!null 
+      common_name: 
       name: Japan
-      official_name: !!null 
+      official_name: 
     ke:
-      common_name: !!null 
+      common_name: 
       name: Kenya
       official_name: Republic of Kenya
     kg:
-      common_name: !!null 
+      common_name: 
       name: Kyrgyzstan
       official_name: Kyrgyz Republic
     kh:
-      common_name: !!null 
+      common_name: 
       name: Cambodia
       official_name: Kingdom of Cambodia
     ki:
-      common_name: !!null 
+      common_name: 
       name: Kiribati
       official_name: Republic of Kiribati
     km:
-      common_name: !!null 
+      common_name: 
       name: Comoros
       official_name: Union of the Comoros
     kn:
-      common_name: !!null 
+      common_name: 
       name: Saint Kitts and Nevis
-      official_name: !!null 
+      official_name: 
     kp:
-      common_name: !!null 
+      common_name: 
       name: Korea, Democratic People's Republic of
       official_name: Democratic People's Republic of Korea
     kr:
-      common_name: !!null 
+      common_name: 
       name: Korea, Republic of
-      official_name: !!null 
+      official_name: 
     kw:
-      common_name: !!null 
+      common_name: 
       name: Kuwait
       official_name: State of Kuwait
     ky:
-      common_name: !!null 
+      common_name: 
       name: Cayman Islands
-      official_name: !!null 
+      official_name: 
     kz:
-      common_name: !!null 
+      common_name: 
       name: Kazakhstan
       official_name: Republic of Kazakhstan
     la:
-      common_name: !!null 
+      common_name: 
       name: Lao People's Democratic Republic
-      official_name: !!null 
+      official_name: 
     lb:
-      common_name: !!null 
+      common_name: 
       name: Lebanon
       official_name: Lebanese Republic
     lc:
-      common_name: !!null 
+      common_name: 
       name: Saint Lucia
-      official_name: !!null 
+      official_name: 
     li:
-      common_name: !!null 
+      common_name: 
       name: Liechtenstein
       official_name: Principality of Liechtenstein
     lk:
-      common_name: !!null 
+      common_name: 
       name: Sri Lanka
       official_name: Democratic Socialist Republic of Sri Lanka
     lr:
-      common_name: !!null 
+      common_name: 
       name: Liberia
       official_name: Republic of Liberia
     ls:
-      common_name: !!null 
+      common_name: 
       name: Lesotho
       official_name: Kingdom of Lesotho
     lt:
-      common_name: !!null 
+      common_name: 
       name: Lithuania
       official_name: Republic of Lithuania
     lu:
-      common_name: !!null 
+      common_name: 
       name: Luxembourg
       official_name: Grand Duchy of Luxembourg
     lv:
-      common_name: !!null 
+      common_name: 
       name: Latvia
       official_name: Republic of Latvia
     ly:
-      common_name: !!null 
+      common_name: 
       name: Libya
       official_name: Libya
     ma:
-      common_name: !!null 
+      common_name: 
       name: Morocco
       official_name: Kingdom of Morocco
     mc:
-      common_name: !!null 
+      common_name: 
       name: Monaco
       official_name: Principality of Monaco
     md:
@@ -558,442 +558,442 @@ en:
       name: Moldova, Republic of
       official_name: Republic of Moldova
     me:
-      common_name: !!null 
+      common_name: 
       name: Montenegro
       official_name: Montenegro
     mf:
-      common_name: !!null 
+      common_name: 
       name: Saint Martin (French part)
-      official_name: !!null 
+      official_name: 
     mg:
-      common_name: !!null 
+      common_name: 
       name: Madagascar
       official_name: Republic of Madagascar
     mh:
-      common_name: !!null 
+      common_name: 
       name: Marshall Islands
       official_name: Republic of the Marshall Islands
     mk:
-      common_name: !!null 
+      common_name: 
       name: Macedonia, Republic of
       official_name: The Former Yugoslav Republic of Macedonia
     ml:
-      common_name: !!null 
+      common_name: 
       name: Mali
       official_name: Republic of Mali
     mm:
-      common_name: !!null 
+      common_name: 
       name: Myanmar
       official_name: Republic of Myanmar
     mn:
-      common_name: !!null 
+      common_name: 
       name: Mongolia
-      official_name: !!null 
+      official_name: 
     mo:
-      common_name: !!null 
+      common_name: 
       name: Macao
       official_name: Macao Special Administrative Region of China
     mp:
-      common_name: !!null 
+      common_name: 
       name: Northern Mariana Islands
       official_name: Commonwealth of the Northern Mariana Islands
     mq:
-      common_name: !!null 
+      common_name: 
       name: Martinique
-      official_name: !!null 
+      official_name: 
     mr:
-      common_name: !!null 
+      common_name: 
       name: Mauritania
       official_name: Islamic Republic of Mauritania
     ms:
-      common_name: !!null 
+      common_name: 
       name: Montserrat
-      official_name: !!null 
+      official_name: 
     mt:
-      common_name: !!null 
+      common_name: 
       name: Malta
       official_name: Republic of Malta
     mu:
-      common_name: !!null 
+      common_name: 
       name: Mauritius
       official_name: Republic of Mauritius
     mv:
-      common_name: !!null 
+      common_name: 
       name: Maldives
       official_name: Republic of Maldives
     mw:
-      common_name: !!null 
+      common_name: 
       name: Malawi
       official_name: Republic of Malawi
     mx:
-      common_name: !!null 
+      common_name: 
       name: Mexico
       official_name: United Mexican States
     my:
-      common_name: !!null 
+      common_name: 
       name: Malaysia
-      official_name: !!null 
+      official_name: 
     mz:
-      common_name: !!null 
+      common_name: 
       name: Mozambique
       official_name: Republic of Mozambique
     na:
-      common_name: !!null 
+      common_name: 
       name: Namibia
       official_name: Republic of Namibia
     nc:
-      common_name: !!null 
+      common_name: 
       name: New Caledonia
-      official_name: !!null 
+      official_name: 
     ne:
-      common_name: !!null 
+      common_name: 
       name: Niger
       official_name: Republic of the Niger
     nf:
-      common_name: !!null 
+      common_name: 
       name: Norfolk Island
-      official_name: !!null 
+      official_name: 
     ng:
-      common_name: !!null 
+      common_name: 
       name: Nigeria
       official_name: Federal Republic of Nigeria
     ni:
-      common_name: !!null 
+      common_name: 
       name: Nicaragua
       official_name: Republic of Nicaragua
     nl:
-      common_name: !!null 
+      common_name: 
       name: Netherlands
       official_name: Kingdom of the Netherlands
     'no':
-      common_name: !!null 
+      common_name: 
       name: Norway
       official_name: Kingdom of Norway
     np:
-      common_name: !!null 
+      common_name: 
       name: Nepal
       official_name: Federal Democratic Republic of Nepal
     nr:
-      common_name: !!null 
+      common_name: 
       name: Nauru
       official_name: Republic of Nauru
     nu:
-      common_name: !!null 
+      common_name: 
       name: Niue
       official_name: Niue
     nz:
-      common_name: !!null 
+      common_name: 
       name: New Zealand
-      official_name: !!null 
+      official_name: 
     om:
-      common_name: !!null 
+      common_name: 
       name: Oman
       official_name: Sultanate of Oman
     pa:
-      common_name: !!null 
+      common_name: 
       name: Panama
       official_name: Republic of Panama
     pe:
-      common_name: !!null 
+      common_name: 
       name: Peru
       official_name: Republic of Peru
     pf:
-      common_name: !!null 
+      common_name: 
       name: French Polynesia
-      official_name: !!null 
+      official_name: 
     pg:
-      common_name: !!null 
+      common_name: 
       name: Papua New Guinea
-      official_name: !!null 
+      official_name: Independent State of Papua New Guinea
     ph:
-      common_name: !!null 
+      common_name: 
       name: Philippines
       official_name: Republic of the Philippines
     pk:
-      common_name: !!null 
+      common_name: 
       name: Pakistan
       official_name: Islamic Republic of Pakistan
     pl:
-      common_name: !!null 
+      common_name: 
       name: Poland
       official_name: Republic of Poland
     pm:
-      common_name: !!null 
+      common_name: 
       name: Saint Pierre and Miquelon
-      official_name: !!null 
+      official_name: 
     pn:
-      common_name: !!null 
+      common_name: 
       name: Pitcairn
-      official_name: !!null 
+      official_name: 
     pr:
-      common_name: !!null 
+      common_name: 
       name: Puerto Rico
-      official_name: !!null 
+      official_name: 
     ps:
-      common_name: !!null 
-      name: Palestinian Territory, Occupied
-      official_name: Occupied Palestinian Territory
+      common_name: 
+      name: Palestine, State of
+      official_name: the State of Palestine
     pt:
-      common_name: !!null 
+      common_name: 
       name: Portugal
       official_name: Portuguese Republic
     pw:
-      common_name: !!null 
+      common_name: 
       name: Palau
       official_name: Republic of Palau
     py:
-      common_name: !!null 
+      common_name: 
       name: Paraguay
       official_name: Republic of Paraguay
     qa:
-      common_name: !!null 
+      common_name: 
       name: Qatar
       official_name: State of Qatar
     re:
-      common_name: !!null 
+      common_name: 
       name: Réunion
-      official_name: !!null 
+      official_name: 
     ro:
-      common_name: !!null 
+      common_name: 
       name: Romania
-      official_name: !!null 
+      official_name: 
     rs:
-      common_name: !!null 
+      common_name: 
       name: Serbia
       official_name: Republic of Serbia
     ru:
-      common_name: !!null 
+      common_name: 
       name: Russian Federation
-      official_name: !!null 
+      official_name: 
     rw:
-      common_name: !!null 
+      common_name: 
       name: Rwanda
       official_name: Rwandese Republic
     sa:
-      common_name: !!null 
+      common_name: 
       name: Saudi Arabia
       official_name: Kingdom of Saudi Arabia
     sb:
-      common_name: !!null 
+      common_name: 
       name: Solomon Islands
-      official_name: !!null 
+      official_name: 
     sc:
-      common_name: !!null 
+      common_name: 
       name: Seychelles
       official_name: Republic of Seychelles
     sd:
-      common_name: !!null 
+      common_name: 
       name: Sudan
       official_name: Republic of the Sudan
     se:
-      common_name: !!null 
+      common_name: 
       name: Sweden
       official_name: Kingdom of Sweden
     sg:
-      common_name: !!null 
+      common_name: 
       name: Singapore
       official_name: Republic of Singapore
     sh:
-      common_name: !!null 
+      common_name: 
       name: Saint Helena, Ascension and Tristan da Cunha
-      official_name: !!null 
+      official_name: 
     si:
-      common_name: !!null 
+      common_name: 
       name: Slovenia
       official_name: Republic of Slovenia
     sj:
-      common_name: !!null 
+      common_name: 
       name: Svalbard and Jan Mayen
-      official_name: !!null 
+      official_name: 
     sk:
-      common_name: !!null 
+      common_name: 
       name: Slovakia
       official_name: Slovak Republic
     sl:
-      common_name: !!null 
+      common_name: 
       name: Sierra Leone
       official_name: Republic of Sierra Leone
     sm:
-      common_name: !!null 
+      common_name: 
       name: San Marino
       official_name: Republic of San Marino
     sn:
-      common_name: !!null 
+      common_name: 
       name: Senegal
       official_name: Republic of Senegal
     so:
-      common_name: !!null 
+      common_name: 
       name: Somalia
-      official_name: Somali Republic
+      official_name: Federal Republic of Somalia
     sr:
-      common_name: !!null 
+      common_name: 
       name: Suriname
       official_name: Republic of Suriname
     ss:
-      common_name: !!null 
+      common_name: 
       name: South Sudan
       official_name: Republic of South Sudan
     st:
-      common_name: !!null 
+      common_name: 
       name: Sao Tome and Principe
       official_name: Democratic Republic of Sao Tome and Principe
     sv:
-      common_name: !!null 
+      common_name: 
       name: El Salvador
       official_name: Republic of El Salvador
     sx:
-      common_name: !!null 
+      common_name: 
       name: Sint Maarten (Dutch part)
       official_name: Sint Maarten (Dutch part)
     sy:
-      common_name: !!null 
+      common_name: 
       name: Syrian Arab Republic
-      official_name: !!null 
+      official_name: 
     sz:
-      common_name: !!null 
+      common_name: 
       name: Swaziland
       official_name: Kingdom of Swaziland
     tc:
-      common_name: !!null 
+      common_name: 
       name: Turks and Caicos Islands
-      official_name: !!null 
+      official_name: 
     td:
-      common_name: !!null 
+      common_name: 
       name: Chad
       official_name: Republic of Chad
     tf:
-      common_name: !!null 
+      common_name: 
       name: French Southern Territories
-      official_name: !!null 
+      official_name: 
     tg:
-      common_name: !!null 
+      common_name: 
       name: Togo
       official_name: Togolese Republic
     th:
-      common_name: !!null 
+      common_name: 
       name: Thailand
       official_name: Kingdom of Thailand
     tj:
-      common_name: !!null 
+      common_name: 
       name: Tajikistan
       official_name: Republic of Tajikistan
     tk:
-      common_name: !!null 
+      common_name: 
       name: Tokelau
-      official_name: !!null 
+      official_name: 
     tl:
-      common_name: !!null 
+      common_name: 
       name: Timor-Leste
       official_name: Democratic Republic of Timor-Leste
     tm:
-      common_name: !!null 
+      common_name: 
       name: Turkmenistan
-      official_name: !!null 
+      official_name: 
     tn:
-      common_name: !!null 
+      common_name: 
       name: Tunisia
       official_name: Republic of Tunisia
     to:
-      common_name: !!null 
+      common_name: 
       name: Tonga
       official_name: Kingdom of Tonga
     tr:
-      common_name: !!null 
+      common_name: 
       name: Turkey
       official_name: Republic of Turkey
     tt:
-      common_name: !!null 
+      common_name: 
       name: Trinidad and Tobago
       official_name: Republic of Trinidad and Tobago
     tv:
-      common_name: !!null 
+      common_name: 
       name: Tuvalu
-      official_name: !!null 
+      official_name: 
     tw:
       common_name: Taiwan
       name: Taiwan, Province of China
       official_name: Taiwan, Province of China
     tz:
-      common_name: !!null 
+      common_name: 
       name: Tanzania, United Republic of
       official_name: United Republic of Tanzania
     ua:
-      common_name: !!null 
+      common_name: 
       name: Ukraine
-      official_name: !!null 
+      official_name: 
     ug:
-      common_name: !!null 
+      common_name: 
       name: Uganda
       official_name: Republic of Uganda
     um:
-      common_name: !!null 
+      common_name: 
       name: United States Minor Outlying Islands
-      official_name: !!null 
+      official_name: 
     us:
-      common_name: !!null 
+      common_name: 
       name: United States
       official_name: United States of America
     uy:
-      common_name: !!null 
+      common_name: 
       name: Uruguay
       official_name: Eastern Republic of Uruguay
     uz:
-      common_name: !!null 
+      common_name: 
       name: Uzbekistan
       official_name: Republic of Uzbekistan
     va:
-      common_name: !!null 
+      common_name: 
       name: Holy See (Vatican City State)
-      official_name: !!null 
+      official_name: 
     vc:
-      common_name: !!null 
+      common_name: 
       name: Saint Vincent and the Grenadines
-      official_name: !!null 
+      official_name: 
     ve:
       common_name: Venezuela
       name: Venezuela, Bolivarian Republic of
       official_name: Bolivarian Republic of Venezuela
     vg:
-      common_name: !!null 
+      common_name: 
       name: Virgin Islands, British
       official_name: British Virgin Islands
     vi:
-      common_name: !!null 
+      common_name: 
       name: Virgin Islands, U.S.
       official_name: Virgin Islands of the United States
     vn:
-      common_name: !!null 
+      common_name: 
       name: Viet Nam
       official_name: Socialist Republic of Viet Nam
     vu:
-      common_name: !!null 
+      common_name: 
       name: Vanuatu
       official_name: Republic of Vanuatu
     wf:
-      common_name: !!null 
+      common_name: 
       name: Wallis and Futuna
-      official_name: !!null 
+      official_name: 
     ws:
-      common_name: !!null 
+      common_name: 
       name: Samoa
       official_name: Independent State of Samoa
     ye:
-      common_name: !!null 
+      common_name: 
       name: Yemen
       official_name: Republic of Yemen
     yt:
-      common_name: !!null 
+      common_name: 
       name: Mayotte
-      official_name: !!null 
+      official_name: 
     za:
-      common_name: !!null 
+      common_name: 
       name: South Africa
       official_name: Republic of South Africa
     zm:
-      common_name: !!null 
+      common_name: 
       name: Zambia
       official_name: Republic of Zambia
     zw:
-      common_name: !!null 
+      common_name: 
       name: Zimbabwe
       official_name: Republic of Zimbabwe