JAVA/JS/CPP: libphonenumber v5.2.2, metadata updates. Gabon geocoding data added with help from g1smd.

debian/changelog

@@ -1,3 +1,13 @@
+libphonenumber (5.2.2) lucid; urgency=low
+
+  * Metadata changes:
+    - New metadata for region code(s): EH
+    - Updated metadata for region code(s): BR, CL, CR, IN, MA, PG, PK,
+    RO
+    - New geocoding data for country calling code(s): 241 (en)
+
+ -- Lara Rennie <lararennie@google.com>  Thu, 06 Dec 2012 13:27:48 +0100
+
 libphonenumber (5.2.1) lucid; urgency=low
 
   * Metadata changes:

java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java

@@ -257,8 +257,9 @@ public class CountryCodeToRegionCodeMap {
     listWithRegionCode.add("SS");
     countryCodeToRegionCodeMap.put(211, listWithRegionCode);
 
-    listWithRegionCode = new ArrayList<String>(1);
+    listWithRegionCode = new ArrayList<String>(2);
     listWithRegionCode.add("MA");
+    listWithRegionCode.add("EH");
     countryCodeToRegionCodeMap.put(212, listWithRegionCode);
 
     listWithRegionCode = new ArrayList<String>(1);

java/release_notes.txt

@@ -1,3 +1,9 @@
+Dec 06, 2012: libphonenumber-5.2.2
+* Metadata changes:
+ - New metadata for region code(s): EH
+ - Updated metadata for region code(s): BR, CL, CR, IN, MA, PG, PK, RO
+ - New geocoding data for country calling code(s): 241 (en)
+
 Nov 26, 2012: libphonenumber-5.2.1
 * Metadata changes:
  - Updated metadata for region code(s):

javascript/i18n/phonenumbers/metadata.js

@@ -78,7 +78,7 @@ i18n.phonenumbers.metadata.countryCodeToRegionCodeMap = {
 ,95:["MM"]
 ,98:["IR"]
 ,211:["SS"]
-,212:["MA"]
+,212:["MA","EH"]
 ,213:["DZ"]
 ,216:["TN"]
 ,218:["LY"]
@@ -849,7 +849,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"[34]00\\d{5}","\\d{8}",,,"40041234"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"BR",55,"00(?:1[45]|2[135]|[34]1|43)","0",,,"0(?:(1[245]|2[135]|[34]1)(\\d{10,11}))?","$2",,,[[,"(\\d{2})(\\d{5})(\\d{4})","$1 $2-$3",["119"]
+,"BR",55,"00(?:1[45]|2[135]|[34]1|43)","0",,,"0(?:(1[245]|2[135]|[34]1)(\\d{10,11}))?","$2",,,[[,"(\\d{4})(\\d{4})","$1-$2",["[2-9](?:[1-9]|0[1-9])"]
+,"$1","",0]
+,[,"(\\d{5})(\\d{4})","$1-$2",["9(?:[1-9]|0[1-9])"]
+,"$1","",0]
+,[,"(\\d{2})(\\d{5})(\\d{4})","$1 $2-$3",["119"]
 ,"($1)","0 $CC ($1)",0]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2-$3",["[1-9][1-9]"]
 ,"($1)","0 $CC ($1)",0]
@@ -858,7 +862,16 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,"([3589]00)(\\d{2,3})(\\d{4})","$1 $2 $3",["[3589]00"]
 ,"0$1","",0]
 ]
-,,[,,"NA","NA"]
+,[[,"(\\d{2})(\\d{5})(\\d{4})","$1 $2-$3",["119","119"]
+,"($1)","0 $CC ($1)",0]
+,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2-$3",["[1-9][1-9]","[1-9][1-9]"]
+,"($1)","0 $CC ($1)",0]
+,[,"([34]00\\d)(\\d{4})","$1-$2",["[34]00","[34]00"]
+,"","",0]
+,[,"([3589]00)(\\d{2,3})(\\d{4})","$1 $2 $3",["[3589]00","[3589]00"]
+,"0$1","",0]
+]
+,[,,"NA","NA"]
 ,,,[,,"[34]00\\d{5}","\\d{8}",,,"40041234"]
 ,[,,"NA","NA"]
 ,,[,,"1(?:12|28|9[023])|911","\\d{3}",,,"190"]
@@ -1096,14 +1109,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"CL":[,[,,"(?:[2-9]|600|123)\\d{7,8}","\\d{6,11}"]
-,[,,"(?:2|32|41)\\d{7}|(?:3[3-5]|4[235]|5[1-3578]|6[13-57]|7[1-35])\\d{6,7}","\\d{6,9}",,,"21234567"]
+,[,,"(?:22|32|41|58)\\d{7}|(?:3[3-5]|4[235]|5[1-357]|6[13-57]|7[1-35])\\d{6,7}","\\d{6,9}",,,"221234567"]
 ,[,,"9[5-9]\\d{7}","\\d{8,9}",,,"961234567"]
 ,[,,"800\\d{6}|1230\\d{7}","\\d{9,11}",,,"800123456"]
 ,[,,"NA","NA"]
 ,[,,"600\\d{7,8}","\\d{10,11}",,,"6001234567"]
 ,[,,"NA","NA"]
 ,[,,"44\\d{7}","\\d{9}",,,"441234567"]
-,"CL",56,"(?:0|1(?:1[0-69]|2[0-57]|5[13-58]|69|7[0167]|8[018]))0","0",,,"0|(1(?:1[0-69]|2[0-57]|5[13-58]|69|7[0167]|8[018]))",,,,[[,"(2)(\\d{3})(\\d{4})","$1 $2 $3",["2"]
+,"CL",56,"(?:0|1(?:1[0-69]|2[0-57]|5[13-58]|69|7[0167]|8[018]))0","0",,,"0|(1(?:1[0-69]|2[0-57]|5[13-58]|69|7[0167]|8[018]))",,,,[[,"(2)(\\d{3,4})(\\d{4})","$1 $2 $3",["2"]
 ,"($1)","$CC ($1)",0]
 ,[,"(\\d{2})(\\d{2,3})(\\d{4})","$1 $2 $3",["[357]|4[1-35]|6[13-57]"]
 ,"($1)","$CC ($1)",0]
@@ -1223,7 +1236,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"CR":[,[,,"[24-9]\\d{7,9}","\\d{8,10}"]
 ,[,,"2[24-7]\\d{6}","\\d{8}",,,"22123456"]
-,[,,"5(?:0[0-4]|7[01])\\d{5}|[67][01]\\d{6}|8[3-9]\\d{6}","\\d{8}",,,"83123456"]
+,[,,"5(?:0[0-4]|7[01])\\d{5}|[67][0-2]\\d{6}|8[3-9]\\d{6}","\\d{8}",,,"83123456"]
 ,[,,"800\\d{7}","\\d{10}",,,"8001234567"]
 ,[,,"90[059]\\d{7}","\\d{10}",,,"9001234567"]
 ,[,,"NA","NA"]
@@ -1541,6 +1554,20 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"1(?:2[23]|80)","\\d{3}",,,"122"]
 ,[,,"NA","NA"]
 ]
+,"EH":[,[,,"[5689]\\d{8}","\\d{9}"]
+,[,,"528[89]\\d{5}","\\d{9}",,,"528812345"]
+,[,,"6(?:0[0-6]|[14-7]\\d|2[236-9]|3[03458]|8[01]|99)\\d{6}","\\d{9}",,,"650123456"]
+,[,,"80\\d{7}","\\d{9}",,,"801234567"]
+,[,,"89\\d{7}","\\d{9}",,,"891234567"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,"EH",212,"00","0",,,"0",,,,,,[,,"NA","NA"]
+,,"528[89]",[,,"NA","NA"]
+,[,,"NA","NA"]
+,,[,,"1(?:[59]|77)","\\d{2,3}",,,"15"]
+,[,,"NA","NA"]
+]
 ,"ER":[,[,,"[178]\\d{6}","\\d{6,7}"]
 ,[,,"1(?:1[12568]|20|40|55|6[146])\\d{4}|8\\d{6}","\\d{6,7}",,,"8370362"]
 ,[,,"17[1-3]\\d{4}|7\\d{6}","\\d{7}",,,"7123456"]
@@ -2234,13 +2261,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"IN":[,[,,"1\\d{7,12}|[2-9]\\d{9,10}","\\d{6,13}"]
 ,[,,"(?:11|2[02]|33|4[04]|79)[2-7]\\d{7}|80[2-467]\\d{7}|(?:1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6[014]|7[1257]|8[01346])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[126-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:[136][25]|22|4[28]|5[12]|[78]1|9[15])|6(?:12|[2345]1|57|6[13]|7[14]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91))[2-7]\\d{6}|(?:(?:1(?:2[35-8]|3[346-9]|4[236-9]|[59][0235-9]|6[235-9]|7[34689]|8[257-9])|2(?:1[134689]|3[24-8]|4[2-8]|5[25689]|6[2-4679]|7[13-79]|8[2-479]|9[235-9])|3(?:01|1[79]|2[1-5]|4[25-8]|5[125689]|6[235-7]|7[157-9]|8[2-467])|4(?:1[14578]|2[5689]|3[2-467]|5[4-7]|6[35]|73|8[2689]|9[2389])|5(?:[16][146-9]|2[14-8]|3[1346]|4[14-69]|5[46]|7[2-4]|8[2-8]|9[246])|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|[57][2-689]|6[24-58]|8[1-6])|8(?:1[1357-9]|2[235-8]|3[03-57-9]|4[0-24-9]|5\\d|6[2457-9]|7[1-6]|8[1256]|9[2-4]))\\d|7(?:(?:1[013-9]|2[0235-9]|3[2679]|4[1-35689]|5[2-46-9]|[67][02-9]|9\\d)\\d|8(?:2[0-6]|[013-8]\\d)))[2-7]\\d{5}","\\d{6,10}",,,"1123456789"]
-,[,,"(?:7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]\\d|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0\\d|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|[39][5-9]|42|60)|8(?:[03][07-9]|14|2[7-9]|4[25]|6[09]|7\\d|9[013-9]))|8(?:0(?:[01589]\\d|66)|1(?:[024]\\d|1[56]|30|7[19]|97)|2(?:[236-9]\\d|52)|3(?:[037-9]\\d|4[1-9]|5[0-37-9])|[45]\\d{2}|6[02457-9]\\d|7[1-69]\\d|8(?:[0-26-9]\\d|44|5[2-9])|9(?:[035-9]\\d|2[2-9]|4[0-8]))|9\\d{3})\\d{6}","\\d{10}",,,"9123456789"]
+,[,,"(?:7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]\\d|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0\\d|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|[39][5-9]|42|60)|8(?:[03][07-9]|14|2[7-9]|[4-7]\\d|9[013-9]))|8(?:0(?:[01589]\\d|6[67])|1(?:[02-589]\\d|1[0135-9]|7[0-79])|2(?:[236-9]\\d|5[1-9])|3(?:[037-9]\\d|4[1-9]|5[0-37-9])|[45]\\d{2}|6[02457-9]\\d|7[1-69]\\d|8(?:[0-26-9]\\d|44|5[2-9])|9(?:[035-9]\\d|2[2-9]|4[0-8]))|9\\d{3})\\d{6}","\\d{10}",,,"9123456789"]
 ,[,,"1(?:600\\d{6}|80(?:0\\d{4,8}|3\\d{9}))","\\d{8,13}",,,"1800123456"]
 ,[,,"186[12]\\d{9}","\\d{13}",,,"1861123456789"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"IN",91,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{2})(\\d{6})","$1 $2 $3",["7(?:2[0579]|3[057-9]|4[0-389]|5[024-9]|6[0-35-9]|7[03469]|8[0-4679])|8(?:0[01589]|1[0-479]|2[236-9]|3[0-57-9]|[45]|6[0245789]|7[1-69]|8[0124-9]|9[02-9])|9","7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|3[5-9]|42|60|9[5-9])|8(?:[03][07-9]|14|2[7-9]|4[25]|6[09]|7|9[013-9]))|8(?:0[01589]|1(?:[024]|1[56]|30|7[19]|97)|2[236-9]|3(?:[037-9]|4[1-9]|5[0-37-9])|[45]|6[02457-9]|7[1-69]|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|2[2-9]|4[0-8]))|9"]
+,"IN",91,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{2})(\\d{6})","$1 $2 $3",["7(?:2[0579]|3[057-9]|4[0-389]|5[024-9]|6[0-35-9]|7[03469]|8[0-79])|8(?:0[015689]|1[0-57-9]|2[2356-9]|3[0-57-9]|[45]|6[0245789]|7[1-69]|8[0124-9]|9[02-9])|9","7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|3[5-9]|42|60|9[5-9])|8(?:[03][07-9]|14|2[7-9]|[4-7]|9[013-9]))|8(?:0(?:[01589]|6[67])|1(?:[02-589]|1[0135-9]|7[0-79])|2(?:[236-9]|5[1-9])|3(?:[037-9]|4[1-9]|5[0-37-9])|[45]|6[02457-9]|7[1-69]|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|2[2-9]|4[0-8]))|9"]
 ,"0$1","",1]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["11|2[02]|33|4[04]|79|80[2-46]"]
 ,"0$1","",1]
@@ -2911,7 +2938,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"MA":[,[,,"[5689]\\d{8}","\\d{9}"]
-,[,,"5(?:2(?:(?:[015-7]\\d|2[2-9]|3[2-57]|4[2-8]|8[235-9])\\d|9(?:0\\d|[89]0))|3(?:(?:[0-4]\\d|[57][2-9]|6[235-8]|9[3-9])\\d|8(?:0\\d|[89]0)))\\d{4}","\\d{9}",,,"520123456"]
+,[,,"5(?:2(?:(?:[015-7]\\d|2[2-9]|3[2-57]|4[2-8]|8[235-7])\\d|9(?:0\\d|[89]0))|3(?:(?:[0-4]\\d|[57][2-9]|6[235-8]|9[3-9])\\d|8(?:0\\d|[89]0)))\\d{4}","\\d{9}",,,"520123456"]
 ,[,,"6(?:0[0-6]|[14-7]\\d|2[236-9]|3[03458]|8[01]|99)\\d{6}","\\d{9}",,,"650123456"]
 ,[,,"80\\d{7}","\\d{9}",,,"801234567"]
 ,[,,"89\\d{7}","\\d{9}",,,"891234567"]
@@ -2928,7 +2955,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1","",0]
 ]
 ,,[,,"NA","NA"]
-,,,[,,"NA","NA"]
+,1,,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,,[,,"1(?:[59]|77)","\\d{2,3}",,,"15"]
 ,[,,"NA","NA"]
@@ -3682,7 +3709,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"PG":[,[,,"[1-9]\\d{6,7}","\\d{7,8}"]
 ,[,,"(?:3\\d{2}|4[257]\\d|5[34]\\d|6(?:29|4[1-9])|85[02-46-9]|9[78]\\d)\\d{4}","\\d{7}",,,"3123456"]
-,[,,"(?:68|7[1236]\\d)\\d{5}","\\d{7,8}",,,"6812345"]
+,[,,"(?:68|7[0-36]\\d)\\d{5}","\\d{7,8}",,,"6812345"]
 ,[,,"180\\d{4}","\\d{7}",,,"1801234"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -3690,7 +3717,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"275\\d{4}","\\d{7}",,,"2751234"]
 ,"PG",675,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[1-689]"]
 ,"","",0]
-,[,"(7[1-36]\\d)(\\d{2})(\\d{3})","$1 $2 $3",["7[1-36]"]
+,[,"(7\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["7"]
 ,"","",0]
 ]
 ,,[,,"NA","NA"]
@@ -3730,7 +3757,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"PK":[,[,,"1\\d{8}|[2-8]\\d{5,11}|9(?:[013-9]\\d{4,9}|2\\d(?:111\\d{6}|\\d{3,7}))","\\d{6,12}"]
 ,[,,"(?:21|42)[2-9]\\d{7}|(?:2[25]|4[0146-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)[2-9]\\d{6}|(?:2(?:3[2358]|4[2-4]|9[2-8])|45[3479]|54[2-467]|60[468]|72[236]|8(?:2[2-689]|3[23578]|4[3478]|5[2356])|9(?:1|2[2-8]|3[27-9]|4[2-6]|6[3569]|9[25-8]))[2-9]\\d{5,6}|58[126]\\d{7}","\\d{6,10}",,,"2123456789"]
-,[,,"3(?:0\\d|[12][1-5]|3[1-6]|4[1-7]|55|64)\\d{7}","\\d{10}",,,"3012345678"]
+,[,,"3(?:0\\d|1[1-5]|2[0-5]|3[1-6]|4[1-7]|55|64)\\d{7}","\\d{10}",,,"3012345678"]
 ,[,,"800\\d{5}","\\d{8}",,,"80012345"]
 ,[,,"900\\d{5}","\\d{8}",,,"90012345"]
 ,[,,"NA","NA"]
@@ -3935,11 +3962,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"801\\d{6}","\\d{9}",,,"801123456"]
 ,[,,"802\\d{6}","\\d{9}",,,"802123456"]
 ,[,,"NA","NA"]
-,"RO",40,"00","0"," int ",,"0",,,,[[,"([237]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[23]1|7"]
+,"RO",40,"00","0"," int ",,"0",,,,[[,"([237]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[23]1"]
 ,"0$1","",0]
 ,[,"(21)(\\d{4})","$1 $2",["21"]
 ,"0$1","",0]
-,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[23][3-7]|[89]"]
+,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[23][3-7]|[7-9]"]
 ,"0$1","",0]
 ,[,"(2\\d{2})(\\d{3})","$1 $2",["2[3-6]"]
 ,"0$1","",0]

javascript/i18n/phonenumbers/metadatalite.js

@@ -78,7 +78,7 @@ i18n.phonenumbers.metadata.countryCodeToRegionCodeMap = {
 ,95:["MM"]
 ,98:["IR"]
 ,211:["SS"]
-,212:["MA"]
+,212:["MA","EH"]
 ,213:["DZ"]
 ,216:["TN"]
 ,218:["LY"]
@@ -849,7 +849,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"[34]00\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"BR",55,"00(?:1[45]|2[135]|[34]1|43)","0",,,"0(?:(1[245]|2[135]|[34]1)(\\d{10,11}))?","$2",,,[[,"(\\d{2})(\\d{5})(\\d{4})","$1 $2-$3",["119"]
+,"BR",55,"00(?:1[45]|2[135]|[34]1|43)","0",,,"0(?:(1[245]|2[135]|[34]1)(\\d{10,11}))?","$2",,,[[,"(\\d{4})(\\d{4})","$1-$2",["[2-9](?:[1-9]|0[1-9])"]
+,"$1","",0]
+,[,"(\\d{5})(\\d{4})","$1-$2",["9(?:[1-9]|0[1-9])"]
+,"$1","",0]
+,[,"(\\d{2})(\\d{5})(\\d{4})","$1 $2-$3",["119"]
 ,"($1)","0 $CC ($1)",0]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2-$3",["[1-9][1-9]"]
 ,"($1)","0 $CC ($1)",0]
@@ -858,7 +862,16 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,"([3589]00)(\\d{2,3})(\\d{4})","$1 $2 $3",["[3589]00"]
 ,"0$1","",0]
 ]
-,,[,,"NA","NA"]
+,[[,"(\\d{2})(\\d{5})(\\d{4})","$1 $2-$3",["119","119"]
+,"($1)","0 $CC ($1)",0]
+,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2-$3",["[1-9][1-9]","[1-9][1-9]"]
+,"($1)","0 $CC ($1)",0]
+,[,"([34]00\\d)(\\d{4})","$1-$2",["[34]00","[34]00"]
+,"","",0]
+,[,"([3589]00)(\\d{2,3})(\\d{4})","$1 $2 $3",["[3589]00","[3589]00"]
+,"0$1","",0]
+]
+,[,,"NA","NA"]
 ,,,[,,"[34]00\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,,[,,"1(?:12|28|9[023])|911","\\d{3}"]
@@ -1096,14 +1109,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"CL":[,[,,"(?:[2-9]|600|123)\\d{7,8}","\\d{6,11}"]
-,[,,"(?:2|32|41)\\d{7}|(?:3[3-5]|4[235]|5[1-3578]|6[13-57]|7[1-35])\\d{6,7}","\\d{6,9}"]
+,[,,"(?:22|32|41|58)\\d{7}|(?:3[3-5]|4[235]|5[1-357]|6[13-57]|7[1-35])\\d{6,7}","\\d{6,9}"]
 ,[,,"9[5-9]\\d{7}","\\d{8,9}"]
 ,[,,"800\\d{6}|1230\\d{7}","\\d{9,11}"]
 ,[,,"NA","NA"]
 ,[,,"600\\d{7,8}","\\d{10,11}"]
 ,[,,"NA","NA"]
 ,[,,"44\\d{7}","\\d{9}"]
-,"CL",56,"(?:0|1(?:1[0-69]|2[0-57]|5[13-58]|69|7[0167]|8[018]))0","0",,,"0|(1(?:1[0-69]|2[0-57]|5[13-58]|69|7[0167]|8[018]))",,,,[[,"(2)(\\d{3})(\\d{4})","$1 $2 $3",["2"]
+,"CL",56,"(?:0|1(?:1[0-69]|2[0-57]|5[13-58]|69|7[0167]|8[018]))0","0",,,"0|(1(?:1[0-69]|2[0-57]|5[13-58]|69|7[0167]|8[018]))",,,,[[,"(2)(\\d{3,4})(\\d{4})","$1 $2 $3",["2"]
 ,"($1)","$CC ($1)",0]
 ,[,"(\\d{2})(\\d{2,3})(\\d{4})","$1 $2 $3",["[357]|4[1-35]|6[13-57]"]
 ,"($1)","$CC ($1)",0]
@@ -1223,7 +1236,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"CR":[,[,,"[24-9]\\d{7,9}","\\d{8,10}"]
 ,[,,"2[24-7]\\d{6}","\\d{8}"]
-,[,,"5(?:0[0-4]|7[01])\\d{5}|[67][01]\\d{6}|8[3-9]\\d{6}","\\d{8}"]
+,[,,"5(?:0[0-4]|7[01])\\d{5}|[67][0-2]\\d{6}|8[3-9]\\d{6}","\\d{8}"]
 ,[,,"800\\d{7}","\\d{10}"]
 ,[,,"90[059]\\d{7}","\\d{10}"]
 ,[,,"NA","NA"]
@@ -1541,6 +1554,20 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"1(?:2[23]|80)","\\d{3}"]
 ,[,,"NA","NA"]
 ]
+,"EH":[,[,,"[5689]\\d{8}","\\d{9}"]
+,[,,"528[89]\\d{5}","\\d{9}"]
+,[,,"6(?:0[0-6]|[14-7]\\d|2[236-9]|3[03458]|8[01]|99)\\d{6}","\\d{9}"]
+,[,,"80\\d{7}","\\d{9}"]
+,[,,"89\\d{7}","\\d{9}"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,"EH",212,"00","0",,,"0",,,,,,[,,"NA","NA"]
+,,"528[89]",[,,"NA","NA"]
+,[,,"NA","NA"]
+,,[,,"1(?:[59]|77)","\\d{2,3}"]
+,[,,"NA","NA"]
+]
 ,"ER":[,[,,"[178]\\d{6}","\\d{6,7}"]
 ,[,,"1(?:1[12568]|20|40|55|6[146])\\d{4}|8\\d{6}","\\d{6,7}"]
 ,[,,"17[1-3]\\d{4}|7\\d{6}","\\d{7}"]
@@ -2234,13 +2261,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"IN":[,[,,"1\\d{7,12}|[2-9]\\d{9,10}","\\d{6,13}"]
 ,[,,"(?:11|2[02]|33|4[04]|79)[2-7]\\d{7}|80[2-467]\\d{7}|(?:1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6[014]|7[1257]|8[01346])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[1-3]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[126-9]|7[0-24-9]|8[013-57]|9[014-7])|5(?:[136][25]|22|4[28]|5[12]|[78]1|9[15])|6(?:12|[2345]1|57|6[13]|7[14]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1|88)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91))[2-7]\\d{6}|(?:(?:1(?:2[35-8]|3[346-9]|4[236-9]|[59][0235-9]|6[235-9]|7[34689]|8[257-9])|2(?:1[134689]|3[24-8]|4[2-8]|5[25689]|6[2-4679]|7[13-79]|8[2-479]|9[235-9])|3(?:01|1[79]|2[1-5]|4[25-8]|5[125689]|6[235-7]|7[157-9]|8[2-467])|4(?:1[14578]|2[5689]|3[2-467]|5[4-7]|6[35]|73|8[2689]|9[2389])|5(?:[16][146-9]|2[14-8]|3[1346]|4[14-69]|5[46]|7[2-4]|8[2-8]|9[246])|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|[57][2-689]|6[24-58]|8[1-6])|8(?:1[1357-9]|2[235-8]|3[03-57-9]|4[0-24-9]|5\\d|6[2457-9]|7[1-6]|8[1256]|9[2-4]))\\d|7(?:(?:1[013-9]|2[0235-9]|3[2679]|4[1-35689]|5[2-46-9]|[67][02-9]|9\\d)\\d|8(?:2[0-6]|[013-8]\\d)))[2-7]\\d{5}","\\d{6,10}"]
-,[,,"(?:7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]\\d|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0\\d|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|[39][5-9]|42|60)|8(?:[03][07-9]|14|2[7-9]|4[25]|6[09]|7\\d|9[013-9]))|8(?:0(?:[01589]\\d|66)|1(?:[024]\\d|1[56]|30|7[19]|97)|2(?:[236-9]\\d|52)|3(?:[037-9]\\d|4[1-9]|5[0-37-9])|[45]\\d{2}|6[02457-9]\\d|7[1-69]\\d|8(?:[0-26-9]\\d|44|5[2-9])|9(?:[035-9]\\d|2[2-9]|4[0-8]))|9\\d{3})\\d{6}","\\d{10}"]
+,[,,"(?:7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]\\d|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0\\d|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|[39][5-9]|42|60)|8(?:[03][07-9]|14|2[7-9]|[4-7]\\d|9[013-9]))|8(?:0(?:[01589]\\d|6[67])|1(?:[02-589]\\d|1[0135-9]|7[0-79])|2(?:[236-9]\\d|5[1-9])|3(?:[037-9]\\d|4[1-9]|5[0-37-9])|[45]\\d{2}|6[02457-9]\\d|7[1-69]\\d|8(?:[0-26-9]\\d|44|5[2-9])|9(?:[035-9]\\d|2[2-9]|4[0-8]))|9\\d{3})\\d{6}","\\d{10}"]
 ,[,,"1(?:600\\d{6}|80(?:0\\d{4,8}|3\\d{9}))","\\d{8,13}"]
 ,[,,"186[12]\\d{9}","\\d{13}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"IN",91,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{2})(\\d{6})","$1 $2 $3",["7(?:2[0579]|3[057-9]|4[0-389]|5[024-9]|6[0-35-9]|7[03469]|8[0-4679])|8(?:0[01589]|1[0-479]|2[236-9]|3[0-57-9]|[45]|6[0245789]|7[1-69]|8[0124-9]|9[02-9])|9","7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|3[5-9]|42|60|9[5-9])|8(?:[03][07-9]|14|2[7-9]|4[25]|6[09]|7|9[013-9]))|8(?:0[01589]|1(?:[024]|1[56]|30|7[19]|97)|2[236-9]|3(?:[037-9]|4[1-9]|5[0-37-9])|[45]|6[02457-9]|7[1-69]|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|2[2-9]|4[0-8]))|9"]
+,"IN",91,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{2})(\\d{6})","$1 $2 $3",["7(?:2[0579]|3[057-9]|4[0-389]|5[024-9]|6[0-35-9]|7[03469]|8[0-79])|8(?:0[015689]|1[0-57-9]|2[2356-9]|3[0-57-9]|[45]|6[0245789]|7[1-69]|8[0124-9]|9[02-9])|9","7(?:2(?:0[04-9]|5[09]|7[5-8]|9[389])|3(?:0[1-9]|[58]|7[3679]|9[689])|4(?:0[1-9]|1[15-9]|[29][89]|39|8[389])|5(?:0|[47]9|[25]0|6[6-9]|[89][7-9])|6(?:0[027]|12|20|3[19]|5[45]|6[5-9]|7[679]|9[6-9])|7(?:0[27-9]|3[5-9]|42|60|9[5-9])|8(?:[03][07-9]|14|2[7-9]|[4-7]|9[013-9]))|8(?:0(?:[01589]|6[67])|1(?:[02-589]|1[0135-9]|7[0-79])|2(?:[236-9]|5[1-9])|3(?:[037-9]|4[1-9]|5[0-37-9])|[45]|6[02457-9]|7[1-69]|8(?:[0-26-9]|44|5[2-9])|9(?:[035-9]|2[2-9]|4[0-8]))|9"]
 ,"0$1","",1]
 ,[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["11|2[02]|33|4[04]|79|80[2-46]"]
 ,"0$1","",1]
@@ -2911,7 +2938,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"MA":[,[,,"[5689]\\d{8}","\\d{9}"]
-,[,,"5(?:2(?:(?:[015-7]\\d|2[2-9]|3[2-57]|4[2-8]|8[235-9])\\d|9(?:0\\d|[89]0))|3(?:(?:[0-4]\\d|[57][2-9]|6[235-8]|9[3-9])\\d|8(?:0\\d|[89]0)))\\d{4}","\\d{9}"]
+,[,,"5(?:2(?:(?:[015-7]\\d|2[2-9]|3[2-57]|4[2-8]|8[235-7])\\d|9(?:0\\d|[89]0))|3(?:(?:[0-4]\\d|[57][2-9]|6[235-8]|9[3-9])\\d|8(?:0\\d|[89]0)))\\d{4}","\\d{9}"]
 ,[,,"6(?:0[0-6]|[14-7]\\d|2[236-9]|3[03458]|8[01]|99)\\d{6}","\\d{9}"]
 ,[,,"80\\d{7}","\\d{9}"]
 ,[,,"89\\d{7}","\\d{9}"]
@@ -2928,7 +2955,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"0$1","",0]
 ]
 ,,[,,"NA","NA"]
-,,,[,,"NA","NA"]
+,1,,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,,[,,"1(?:[59]|77)","\\d{2,3}"]
 ,[,,"NA","NA"]
@@ -3682,7 +3709,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"PG":[,[,,"[1-9]\\d{6,7}","\\d{7,8}"]
 ,[,,"(?:3\\d{2}|4[257]\\d|5[34]\\d|6(?:29|4[1-9])|85[02-46-9]|9[78]\\d)\\d{4}","\\d{7}"]
-,[,,"(?:68|7[1236]\\d)\\d{5}","\\d{7,8}"]
+,[,,"(?:68|7[0-36]\\d)\\d{5}","\\d{7,8}"]
 ,[,,"180\\d{4}","\\d{7}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -3690,7 +3717,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"275\\d{4}","\\d{7}"]
 ,"PG",675,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[1-689]"]
 ,"","",0]
-,[,"(7[1-36]\\d)(\\d{2})(\\d{3})","$1 $2 $3",["7[1-36]"]
+,[,"(7\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["7"]
 ,"","",0]
 ]
 ,,[,,"NA","NA"]
@@ -3730,7 +3757,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"PK":[,[,,"1\\d{8}|[2-8]\\d{5,11}|9(?:[013-9]\\d{4,9}|2\\d(?:111\\d{6}|\\d{3,7}))","\\d{6,12}"]
 ,[,,"(?:21|42)[2-9]\\d{7}|(?:2[25]|4[0146-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)[2-9]\\d{6}|(?:2(?:3[2358]|4[2-4]|9[2-8])|45[3479]|54[2-467]|60[468]|72[236]|8(?:2[2-689]|3[23578]|4[3478]|5[2356])|9(?:1|2[2-8]|3[27-9]|4[2-6]|6[3569]|9[25-8]))[2-9]\\d{5,6}|58[126]\\d{7}","\\d{6,10}"]
-,[,,"3(?:0\\d|[12][1-5]|3[1-6]|4[1-7]|55|64)\\d{7}","\\d{10}"]
+,[,,"3(?:0\\d|1[1-5]|2[0-5]|3[1-6]|4[1-7]|55|64)\\d{7}","\\d{10}"]
 ,[,,"800\\d{5}","\\d{8}"]
 ,[,,"900\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
@@ -3935,11 +3962,11 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"801\\d{6}","\\d{9}"]
 ,[,,"802\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
-,"RO",40,"00","0"," int ",,"0",,,,[[,"([237]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[23]1|7"]
+,"RO",40,"00","0"," int ",,"0",,,,[[,"([237]\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[23]1"]
 ,"0$1","",0]
 ,[,"(21)(\\d{4})","$1 $2",["21"]
 ,"0$1","",0]
-,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[23][3-7]|[89]"]
+,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[23][3-7]|[7-9]"]
 ,"0$1","",0]
 ,[,"(2\\d{2})(\\d{3})","$1 $2",["2[3-6]"]
 ,"0$1","",0]

resources/PhoneNumberMetaData.xml

@@ -3049,6 +3049,29 @@
            the number after capturing. We also need a nationalTransformRule to repopulate with the
            number without the carrier code. -->
       <availableFormats>
+        <!-- Numbers can be dialled without an area code on mobile phones in Brazil. The first two
+             rules here handle this case. The leading digits pattern must be specific enough such
+             that it doesn't match X00 numbers (e.g. toll-free). -->
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{4})(\d{4})">
+          <leadingDigits>
+            [2-9](?:
+              [1-9]|
+              0[1-9]
+            )
+          </leadingDigits>
+          <format>$1-$2</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{5})(\d{4})">
+          <leadingDigits>
+            9(?:
+              [1-9]|
+              0[1-9]
+            )
+          </leadingDigits>
+          <format>$1-$2</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
         <numberFormat nationalPrefixFormattingRule="($FG)"
           pattern="(\d{2})(\d{5})(\d{4})"
           carrierCodeFormattingRule="$NP $CC ($FG)">
@@ -4117,7 +4140,7 @@
       we strip here. National destinations may be dialled with a carrier if they are not local so
       we extract these carrier codes as well. -->
       <availableFormats>
-        <numberFormat pattern="(2)(\d{3})(\d{4})"
+        <numberFormat pattern="(2)(\d{3,4})(\d{4})"
           nationalPrefixFormattingRule="($FG)"
           carrierCodeFormattingRule="$CC ($FG)">
           <leadingDigits>2</leadingDigits>
@@ -4176,24 +4199,43 @@
         <exampleNumber>6001234567</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
+        <!-- Nov 2012: The prefixing of '2' to all fixed line numbers, which is being rolled
+             out between October 2012 and June 2013 means that temporarily the regular
+             expressions for areas will get very messy as some adopt the leading '2' but
+             others do not. Eventually when the conversion is complete things should simplify
+             again. Note that area codes 32 or 41 were transitioned in 2007.
+             IMPORTANT: A literal reading of the transition rules suggest that all numbers get
+             a '2' prefix, but some numbers are already 7 digits long (but these always start
+             with a '2'). The prefixing seems almost certain to only apply to 6-digit numbers and
+             will unify all fixed line numbers to be 9 digits in total. The fact that the new seven
+             digit numbers currently only start with a '2' is likely to change in the future.
+             Note also that at some stage it is likely that Santiago numbers (area code '2') will
+             have a prefix of "2\d" and not "22" (it's like 10 2-digit area codes wrapped into one).
+             See: http://www.gob.cl/especiales/informate-de-la-nueva-forma-de-marcar/
+                  http://www.subtel.cl/index.php?option=com_content&view=article&id=3081:&catid=3:noticias
+             -->
         <nationalNumberPattern>
           (?:
-            2|
+            22|
             32|
-            41
+            41|
+            58
           )\d{7}|
           (?:
             3[3-5]|
             4[235]|
-            5[1-3578]|
+            5[1-357]|
             6[13-57]|
             7[1-35]
           )\d{6,7}
         </nationalNumberPattern>
         <!-- Area codes do not need to be dialled when dialling within the same area, so the
              smallest possible number is length 6. -->
+        <!-- Nov 2012: The prefixing of '2' to all 6-digit fixed line numbers means that while
+             the maximum possible number length stays as 9, the minimum length will become '7'
+             when all area codes are migrated. -->
         <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
-        <exampleNumber>21234567</exampleNumber>
+        <exampleNumber>221234567</exampleNumber>
       </fixedLine>
       <mobile>
         <nationalNumberPattern>9[5-9]\d{7}</nationalNumberPattern>
@@ -4750,7 +4792,7 @@
             0[0-4]|
             7[01]
           )\d{5}|
-          [67][01]\d{6}|
+          [67][0-2]\d{6}|
           8[3-9]\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
@@ -6347,6 +6389,60 @@
       </emergency>
     </territory>
 
+    <!-- Western Sahara -->
+    <!-- Country calling code shared with Morocco (MA). -->
+    <!-- Two area codes are defined in the Morocco ITU document; 05288 XXXXX and 05289 XXXXX -->
+    <!-- http://www.itu.int/oth/T0202000090/en -->
+    <territory id="EH" countryCode="212" leadingDigits="528[89]" internationalPrefix="00"
+               nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
+      <!-- Uses MA formatting rules and shares general description
+           (non-geographical numbers for Morocco are still valid). -->
+      <generalDesc>
+        <nationalNumberPattern>[5689]\d{8}</nationalNumberPattern>
+        <!-- Closed numbering plan. -->
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+      </generalDesc>
+      <fixedLine>
+        <nationalNumberPattern>528[89]\d{5}</nationalNumberPattern>
+        <exampleNumber>528812345</exampleNumber>
+      </fixedLine>
+      <!-- The following sections are copied verbatim from Morocco to allow these non-geographical
+           numbers to be recognized as available from within Western Sahara. -->
+      <mobile>
+        <!-- Prefixes 60[1-5], 62[7-9], 63[0458] and 68[01] are from numbers found online,
+             bug-reports, and information provided directly by the carriers. -->
+        <nationalNumberPattern>
+          6(?:
+            0[0-6]|
+            [14-7]\d|
+            2[236-9]|
+            3[03458]|
+            8[01]|
+            99
+          )\d{6}
+        </nationalNumberPattern>
+        <exampleNumber>650123456</exampleNumber>
+      </mobile>
+      <tollFree>
+        <nationalNumberPattern>80\d{7}</nationalNumberPattern>
+        <exampleNumber>801234567</exampleNumber>
+      </tollFree>
+      <premiumRate>
+        <nationalNumberPattern>89\d{7}</nationalNumberPattern>
+        <exampleNumber>891234567</exampleNumber>
+      </premiumRate>
+      <emergency>
+        <nationalNumberPattern>
+          1(?:
+            [59]|
+            77
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{2,3}</possibleNumberPattern>
+        <exampleNumber>15</exampleNumber>
+      </emergency>
+    </territory>
+
     <!-- Eritrea -->
     <!-- http://www.itu.int/oth/T0202000042/en -->
     <territory id="ER" countryCode="291" internationalPrefix="00"
@@ -10213,6 +10309,7 @@
     <!-- http://www.dot.gov.in/numbering_plan/numberplanindex.htm -->
     <!-- http://www.itu.int/oth/T0202000063/en -->
     <!-- http://en.wikipedia.org/wiki/%2B91 -->
+    <!-- http://www.coai.in/msccodes.php -->
     <!-- Note that several changes in area codes have occurred since the numbering plan was released
          - fixed line changes are notified on the www.bsnl.co.in website. Area codes can be verified
            here at http://dq.ndc.bsnl.co.in/bsnl-web/stdSearch.seam. -->
@@ -10229,12 +10326,12 @@
                5[024-9]|
                6[0-35-9]|
                7[03469]|
-               8[0-4679]
+               8[0-79]
              )|
              8(?:
-               0[01589]|
-               1[0-479]|
-               2[236-9]|
+               0[015689]|
+               1[0-57-9]|
+               2[2356-9]|
                3[0-57-9]|
                [45]|
                6[0245789]|
@@ -10293,22 +10390,24 @@
                  [03][07-9]|
                  14|
                  2[7-9]|
-                 4[25]|
-                 6[09]|
-                 7|
+                 [4-7]|
                  9[013-9]
                )
              )|
              8(?:
-               0[01589]|
+               0(?:
+                 [01589]|
+                 6[67]
+               )|
                1(?:
-                 [024]|
-                 1[56]|
-                 30|
-                 7[19]|
-                 97
+                 [02-589]|
+                 1[0135-9]|
+                 7[0-79]
+               )|
+               2(?:
+                 [236-9]|
+                 5[1-9]
                )|
-               2[236-9]|
                3(?:
                  [037-9]|
                  4[1-9]|
@@ -10699,6 +10798,9 @@
         <exampleNumber>1123456789</exampleNumber>
       </fixedLine>
       <!-- http://en.wikipedia.org/wiki/Mobile_telephone_numbering_in_India -->
+      <!-- The document titled "List of MSC codes" linked off
+           http://www.dot.gov.in/numbering_plan/numberplanindex.htm is the best source for these.
+           -->
       <mobile>
         <!-- A couple of additional prefixes found neither on the wikipedia page nor in the MSC
              codes list, are added because SMS messages have been successfully sent to these
@@ -10754,27 +10856,23 @@
                 [03][07-9]|
                 14|
                 2[7-9]|
-                4[25]|
-                6[09]|
-                7\d|
+                [4-7]\d|
                 9[013-9]
               )
             )|
             8(?:
               0(?:
                 [01589]\d|
-                66
+                6[67]
               )|
               1(?:
-                [024]\d|
-                1[56]|
-                30|
-                7[19]|
-                97
+                [02-589]\d|
+                1[0135-9]|
+                7[0-79]
               )|
               2(?:
                 [236-9]\d|
-                52
+                5[1-9]
               )|
               3(?:
                 [037-9]\d|
@@ -15092,10 +15190,11 @@
     </territory>
 
     <!-- Morocco -->
+    <!-- Shares formatting and some metadata with Western Sahara. -->
     <!-- http://www.itu.int/oth/T0202000090/en -->
     <!-- http://en.wikipedia.org/wiki/+212 -->
     <territory id="MA" countryCode="212" internationalPrefix="00" nationalPrefix="0"
-               nationalPrefixFormattingRule="$NP$FG">
+               nationalPrefixFormattingRule="$NP$FG" mainCountryForCode="true">
       <availableFormats>
         <numberFormat pattern="([56]\d{2})(\d{6})">
           <leadingDigits>
@@ -15169,7 +15268,7 @@
                 2[2-9]|
                 3[2-57]|
                 4[2-8]|
-                8[235-9]
+                8[235-7]
               )\d|
               9(?:
                 0\d|
@@ -15192,6 +15291,7 @@
         </nationalNumberPattern>
         <exampleNumber>520123456</exampleNumber>
       </fixedLine>
+      <!-- Also duplicated in Western Sahara, please ensure you update both. -->
       <mobile>
         <!-- Prefixes 60[1-5], 62[7-9], 63[0458] and 68[01] are from numbers found online,
              bug-reports, and information provided directly by the carriers. -->
@@ -18616,8 +18716,8 @@
           <leadingDigits>[1-689]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <numberFormat pattern="(7[1-36]\d)(\d{2})(\d{3})">
-          <leadingDigits>7[1-36]</leadingDigits>
+        <numberFormat pattern="(7\d{2})(\d{2})(\d{3})">
+          <leadingDigits>7</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
       </availableFormats>
@@ -18646,12 +18746,14 @@
         <exampleNumber>3123456</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Mobile number patterns from the numbering plan are included here, as well as 68x from
-             Wikipedia and 730 from online numbers. -->
+        <!-- Mobile number patterns from the numbering plan are included here, as well as 68X from
+             Wikipedia and 730 from online numbers. The prefix 70X is added since open-source users
+             have reported it as now being in use, although no real numbers can be found as of yet.
+             -->
         <nationalNumberPattern>
           (?:
             68|
-            7[1236]\d
+            7[0-36]\d
           )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
@@ -19061,12 +19163,13 @@
         <exampleNumber>2123456789</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 311 & 325 as SMSs have been successfully sent to these numbers and numbers can
-             be found online with these prefixes. -->
+        <!-- Adding 311, 325 and 320 as SMSs have been successfully sent to these numbers and numbers
+             can be found online with these prefixes. -->
         <nationalNumberPattern>
           3(?:
             0\d|
-            [12][1-5]|
+            1[1-5]|
+            2[0-5]|
             3[1-6]|
             4[1-7]|
             55|
@@ -19859,10 +19962,7 @@
                preferredExtnPrefix=" int ">
       <availableFormats>
         <numberFormat pattern="([237]\d)(\d{3})(\d{4})">
-          <leadingDigits>
-            [23]1|
-            7
-          </leadingDigits>
+          <leadingDigits>[23]1</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(21)(\d{4})">
@@ -19870,9 +19970,12 @@
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
+          <!-- We format mobile numbers like this, even though ITU and wikipedia hint at
+               \d{2}\d{3}\d{4} grouping, since the yellow pages (http://en.paginiaurii.ro/) and the
+               majority of numbers found online follow this convention. -->
           <leadingDigits>
             [23][3-7]|
-            [89]
+            [7-9]
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>

resources/geocoding/en/241.txt

@@ -0,0 +1,48 @@
+# Copyright (C) 2012 The Libphonenumber Authors
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Generated from:
+# http://www.itu.int/oth/T020200004E/en [2012-07-04]
+# http://en.wikipedia.org/wiki/+241 [503030636]
+
+241140|Kango
+2411420|Ntoum
+2411424|Cocobeach
+241144|Libreville
+241145|Libreville
+241146|Libreville
+241147|Libreville
+241148|Libreville
+241150|Gamba
+241154|Omboué
+241155|Port-Gentil
+241156|Port-Gentil
+241158|Lambaréné
+241159|Ndjolé
+241160|Ngouoni
+241162|Mounana
+241164|Lastourville
+241165|Koulamoutou
+241166|Moanda
+241167|Franceville
+241169|Léconi/Akiéni/Okondja
+24117|Libreville
+241182|Tchibanga
+241183|Mayumba
+241186|Mouila
+241190|Makokou
+241192|Mékambo
+241193|Booué
+241196|Bitam
+241198|Oyem