Addition of South Sudan, Myanmar and Iran to the address widget.
Info:
Myanmar:
http://www.upu.int/fileadmin/documentsFiles/activities/addressingUnit/mmrEn.pdf
Iran:
http://www.upu.int/fileadmin/documentsFiles/activities/addressingUnit/irnEn.pdf
Note we aren't following the UPU doc for Iran completely; province has
been moved according to advice from Mina (from Iran) and online
addresses.
diff --git a/cpp/src/region_data_constants.cc b/cpp/src/region_data_constants.cc
index b9e0f41..cd2217c 100644
--- a/cpp/src/region_data_constants.cc
+++ b/cpp/src/region_data_constants.cc
@@ -619,6 +619,11 @@
"\"zipex\":\"31001\","
"\"languages\":\"ar\""
"}"));
+ region_data.insert(std::make_pair("IR", "{"
+ "\"languages\":\"fa\","
+ "\"fmt\":\"%O%n%N%n%S%n%C, %D%n%A%n%Z\","
+ "\"sublocality_name_type\":\"neighborhood\""
+ "}"));
region_data.insert(std::make_pair("IS", "{"
"\"fmt\":\"%N%n%O%n%A%n%Z %C\","
"\"zipex\":\"320,121,220,110\","
@@ -823,6 +828,9 @@
region_data.insert(std::make_pair("ML", "{"
"\"languages\":\"fr\""
"}"));
+ region_data.insert(std::make_pair("MM", "{"
+ "\"languages\":\"my\""
+ "}"));
region_data.insert(std::make_pair("MN", "{"
"\"fmt\":\"%N%n%O%n%A%n%S %C-%X%n%Z\","
"\"zipex\":\"65030,65270\","
@@ -1170,6 +1178,9 @@
"\"fmt\":\"%N%n%O%n%A%n%C %X%n%S\","
"\"languages\":\"nl\""
"}"));
+ region_data.insert(std::make_pair("SS", "{"
+ "\"languages\":\"en\""
+ "}"));
region_data.insert(std::make_pair("ST", "{"
"\"fmt\":\"%N%n%O%n%A%n%C %X\","
"\"languages\":\"pt\""
diff --git a/testdata/countryinfo.txt b/testdata/countryinfo.txt
index 5dff5a2..0ece319 100644
--- a/testdata/countryinfo.txt
+++ b/testdata/countryinfo.txt
@@ -10171,6 +10171,7 @@
data/IN/West Bengal={"id":"data/IN/West Bengal","key":"West Bengal","name":"West Bengal","lang":"en","zip":"7[0-4]","isoid":"WB"}
data/IO={"id":"data/IO","key":"IO","name":"BRITISH INDIAN OCEAN TERRITORY","fmt":"%N%n%O%n%A%n%X%n%C%n%Z","require":"ACZ","upper":"CZ","zip":"BBND 1ZZ","zipex":"BBND 1ZZ"}
data/IQ={"id":"data/IQ","key":"IQ","name":"IRAQ","fmt":"%O%n%N%n%A%n%C, %S%n%Z","require":"ACS","upper":"CS","zip":"\\d{5}"}
+data/IR={"id":"data/IR","key":"IR","name":"IRAN","fmt":"%O%n%N%n%S%n%C, %D%n%A%n%Z","zip":"\\d{5}-?\\d{5}","zipex":"11936-12345","sublocality_name_type":"neighborhood"}
data/IS={"id":"data/IS","key":"IS","name":"ICELAND","fmt":"%N%n%O%n%A%n%Z %C","zip":"\\d{3}","zipex":"320,121,220,110","posturl":"http://www.postur.is/cgi-bin/hsrun.exe/Distributed/vefur/vefur.htx;start=HS_landakort_postnumer"}
data/IT={"id":"data/IT","key":"IT","name":"ITALY","lang":"it","languages":"it","fmt":"%N%n%O%n%A%n%Z %C %S","require":"ACSZ","upper":"CS","zip":"\\d{5}","zipex":"00144,47037,39049","posturl":"http://www.poste.it/online/cercacap/","sub_keys":"AG~AL~AN~AR~AP~AT~AV~BA~BT~BL~BN~BG~BI~BO~BZ~BS~BR~CA~CL~CB~CI~CE~CT~CZ~CH~CO~CS~CR~KR~CN~EN~FM~FE~FI~FG~FC~FR~GE~GO~GR~IM~IS~AQ~SP~LT~LE~LC~LI~LO~LU~MC~MN~MS~MT~VS~ME~MI~MO~MB~NA~NO~NU~OG~OT~OR~PD~PA~PR~PV~PG~PU~PE~PC~PI~PT~PN~PZ~PO~RG~RA~RC~RE~RI~RN~RM~RO~SA~SS~SV~SI~SR~SO~TA~TE~TR~TO~TP~TN~TV~TS~UD~AO~VA~VE~VB~VC~VR~VV~VI~VT","sub_names":"Agrigento~Alessandria~Ancona~Arezzo~Ascoli Piceno~Asti~Avellino~Bari~Barletta-Andria-Trani~Belluno~Benevento~Bergamo~Biella~Bologna~Bolzano~Brescia~Brindisi~Cagliari~Caltanissetta~Campobasso~Carbonia-Iglesias~Caserta~Catania~Catanzaro~Chieti~Como~Cosenza~Cremona~Crotone~Cuneo~Enna~Fermo~Ferrara~Firenze~Foggia~Forlì-Cesena~Frosinone~Genova~Gorizia~Grosseto~Imperia~Isernia~L'Aquila~La Spezia~Latina~Lecce~Lecco~Livorno~Lodi~Lucca~Macerata~Mantova~Massa-Carrara~Matera~Medio Campidano~Messina~Milano~Modena~Monza e della Brianza~Napoli~Novara~Nuoro~Ogliastra~Olbia-Tempio~Oristano~Padova~Palermo~Parma~Pavia~Perugia~Pesaro e Urbino~Pescara~Piacenza~Pisa~Pistoia~Pordenone~Potenza~Prato~Ragusa~Ravenna~Reggio Calabria~Reggio nell'Emilia~Rieti~Rimini~Roma~Rovigo~Salerno~Sassari~Savona~Siena~Siracusa~Sondrio~Taranto~Teramo~Terni~Torino~Trapani~Trento~Treviso~Trieste~Udine~Valle d'Aosta~Varese~Venezia~Verbano-Cusio-Ossola~Vercelli~Verona~Vibo Valentia~Vicenza~Viterbo","sub_zips":"92~15~60~52~63~14~83~70~76[01]~32~82~24~13[89]~40~39~25~72~0912[1-9]|0913[0-4]|0901[0289]|0902[03468]|0903[0234]|0904|0803[035]|08043~93~860[1-4]|86100~0901[013-7]~81~95~88[01]~66~22~87~26[01]~88[89]~12|18025~94~638|63900~44~50~71~47[015]~03~16~34[01]7~58~18~860[7-9]|86170~67~19~04~73~23[89]~57~26[89]~55~62~46~54~75~0902[012579]|0903[015-9]|09040~98~20~41~208|20900~80~28[01]~080[1-3]|08100~08037|0804[024-9]~08020|0702|0703[08]~090[7-9]|09170|0801[039]|0803[04]~35~90~43~27~06~61~65~29~56~51~330[7-9]|33170~85~59~97~48~89[01]~42~02~47[89]~00~45~84~070[14]|0703[0-79]|07100~17|12071~53~96~23[01]~74~64~05~10~91~38~31~3401|341[0-689]|34062~330[1-5]|33100~11~21~30~28[89]~13[01]~37~89[89]~36~01"}
data/IT/AG={"id":"data/IT/AG","key":"AG","name":"Agrigento","lang":"it","zip":"92"}
@@ -10662,6 +10663,7 @@
data/MH={"id":"data/MH","key":"MH","name":"MARSHALL ISLANDS","fmt":"%N%n%O%n%A%n%C %S %Z","require":"ACSZ","upper":"ACNOS","zip":"969[67]\\d([ \\-]\\d{4})?","zipex":"96960,96970","posturl":"http://zip4.usps.com/zip4/welcome.jsp","zip_name_type":"zip","state_name_type":"state"}
data/MK={"id":"data/MK","key":"MK","name":"MACEDONIA","fmt":"%N%n%O%n%A%n%Z %C","zip":"\\d{4}","zipex":"1314,1321,1443,1062"}
data/ML={"id":"data/ML","key":"ML","name":"MALI"}
+data/MM={"id":"data/MM","key":"MM","name":"MYANMAR","fmt":"%N%n%O%n%A%n%C, %Z","zip":"\\d{5}","zipex":"11181"}
data/MN={"id":"data/MN","key":"MN","name":"MONGOLIA","fmt":"%N%n%O%n%A%n%S %C-%X%n%Z","zip":"\\d{5}","zipex":"65030,65270","posturl":"http://www.zipcode.mn/"}
data/MO={"id":"data/MO","key":"MO","name":"MACAO","fmt":"%A%n%O%n%N","lfmt":"%N%n%O%n%A","require":"A"}
data/MP={"id":"data/MP","key":"MP","name":"NORTHERN MARIANA ISLANDS","fmt":"%N%n%O%n%A%n%C %S %Z","require":"ACSZ","upper":"ACNOS","zip":"9695[012]([ \\-]\\d{4})?","zipex":"96950,96951,96952","posturl":"http://zip4.usps.com/zip4/welcome.jsp","zip_name_type":"zip","state_name_type":"state"}
@@ -10947,6 +10949,7 @@
data/SR/SARAMACCA={"id":"data/SR/SARAMACCA","key":"SARAMACCA","lang":"nl","isoid":"SA"}
data/SR/SIPALIWINI={"id":"data/SR/SIPALIWINI","key":"SIPALIWINI","lang":"nl","isoid":"SI"}
data/SR/WANICA={"id":"data/SR/WANICA","key":"WANICA","lang":"nl","isoid":"WA"}
+data/SS={"id":"data/SS","key":"SS","name":"SOUTH SUDAN"}
data/ST={"id":"data/ST","key":"ST","name":"SAO TOME AND PRINCIPE","fmt":"%N%n%O%n%A%n%C %X"}
data/SV={"id":"data/SV","key":"SV","name":"EL SALVADOR","lang":"es","languages":"es","fmt":"%N%n%O%n%A%n%Z-%C%n%S","require":"ACS","upper":"CSZ","zip":"CP [1-3][1-7][0-2]\\d","zipex":"CP 1101","sub_keys":"AHUACHAPAN~CABANAS~CALATENANGO~CUSCATLAN~LA LIBERTAD~LA PAZ~LA UNION~MORAZAN~SAN MIGUEL~SAN SALVADOR~SAN VICENTE~SANTA ANA~SONSONATE~USULUTAN","sub_names":"Ahuachapán~Cabañas~Chalatenango~Cuscatlán~La Libertad~La Paz~La Unión~Morazán~San Miguel~San Salvador~San Vicente~Santa Ana~Sonsonate~Usulután","sub_zips":"CP 21~CP 12~CP 13~CP 14~CP 15~CP 16~CP 31~CP 32~CP 33~CP 11~CP 17~CP 22~CP 23~CP 34","sub_zipexs":"CP 2101~CP 1201~CP 1301~CP 1401~CP 1501~CP 1601~CP 3101~CP 3201~CP 3301~CP 1101~CP 1701~CP 2201~CP 2301~CP 3401","sub_isoids":"AH~CA~CH~CU~LI~PA~UN~MO~SM~SS~SV~SA~SO~US"}
data/SV/AHUACHAPAN={"id":"data/SV/AHUACHAPAN","key":"AHUACHAPAN","name":"Ahuachapán","lang":"es","zip":"CP 21","zipex":"CP 2101","isoid":"AH"}
