Metadata updates for release 7.7.2 (#1378)

Author: penmetsaa

cpp/src/phonenumbers/lite_metadata.cc

@@ -1,3 +1 @@
-Code changes:
- - Stop setting empty preferred_domestic_carrier_code, and if we are passed such
-   a number then treat the empty field as if unset.
+

cpp/src/phonenumbers/metadata.cc

@@ -1,3 +1,19 @@
+Oct 06, 2016: libphonenumber-7.7.2
+Code changes:
+ - Stop setting empty preferred_domestic_carrier_code, and if we are passed such
+   a number then treat the empty field as if unset.
+Metadata changes:
+ - Updated phone metadata for region code(s): CL, FR, KE, MU, NG
+ - Updated short number metadata for region code(s):
+   EC, EE, EG, EH, ER, ES, ET, FI, FJ, FK, FM, FO, FR, OM, PA, PE, PF, PG, PH,
+   PK, PL, PM, PR, PT, PW, PY, QA, RE, RO, RS, RU, RW, SA, SB, SC, SD, SE, SG,
+   SH, SI, SJ, SK, SL, SM, SN, SO, SR, ST, SV, SX, SY, SZ, TC, TD, TG, TH, TJ,
+   TL, TM, TN, TO, TR, TT, TV, TW, TZ, UA, UG, US, UY, UZ, VA, VC, VE, VG, VI,
+   VN, VU, WF, WS, YE, YT, ZA, ZM, ZW
+ - Updated geocoding data for country calling code(s): 56 (en, es)
+ - Updated carrier data for country calling code(s):
+   230 (en), 234 (en), 254 (en)
+
 Sep 27, 2016: libphonenumber-7.7.1
 Build changes:
  - OSGi support added to Manifest information when building jar (#1300)

cpp/src/phonenumbers/short_metadata.cc

@@ -1541,7 +1541,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"CL":[,[,,"(?:[2-9]|600|123)\\d{7,8}","\\d{7,11}",,,,,,[9,10,11]
 ,[7,8]
 ]
-,[,,"2(?:1962\\d{4}|2\\d{7}|32[0-2]\\d{5})|(?:3[2-5]|[47][1-35]|5[1-3578]|6[13-57])\\d{7}","\\d{7,9}",,,"221234567",,,[9]
+,[,,"2(?:1962\\d{4}|2\\d{7}|32[0-267]\\d{5})|(?:3[2-5]|[47][1-35]|5[1-3578]|6[13-57])\\d{7}","\\d{7,9}",,,"221234567",,,[9]
 ]
 ,[,,"9[3-9]\\d{7}","\\d{8,9}",,,"961234567",,,[9]
 ]
@@ -2466,7 +2466,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"FR":[,[,,"[1-9]\\d{8}","\\d{9}",,,,,,[9]
 ]
 ,[,,"[1-5]\\d{8}","\\d{9}",,,"123456789"]
-,[,,"6\\d{8}|7(?:00\\d{6}|[3-9]\\d{7})","\\d{9}",,,"612345678"]
+,[,,"(?:6\\d|7[3-9])\\d{7}","\\d{9}",,,"612345678"]
 ,[,,"80[0-5]\\d{6}","\\d{9}",,,"801234567"]
 ,[,,"89[1-37-9]\\d{6}","\\d{9}",,,"891123456"]
 ,[,,"8(?:1[019]|2[0156]|84|90)\\d{6}","\\d{9}",,,"810123456"]
@@ -3652,7 +3652,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"20\\d{6,7}|4(?:[0136]\\d{7}|[245]\\d{5,7})|5(?:[08]\\d{7}|[1-79]\\d{5,7})|6(?:[01457-9]\\d{5,7}|[26]\\d{7})","\\d{7,9}",,,"202012345",,,[7,8,9]
 ]
-,[,,"7(?:[0-36]\\d|5[0-6]|[79][0-7]|8[0-25-9])\\d{6}","\\d{9}",,,"712123456",,,[9]
+,[,,"7(?:[0-369]\\d|4[0-2]|5[0-6]|7[0-7]|8[0-25-9])\\d{6}","\\d{9}",,,"712123456",,,[9]
 ]
 ,[,,"800[24-8]\\d{5,6}","\\d{9,10}",,,"800223456",,,[9,10]
 ]
@@ -4770,7 +4770,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"MU":[,[,,"[2-9]\\d{6,7}","\\d{7,8}",,,,,,[7,8]
 ]
 ,[,,"(?:2(?:[03478]\\d|1[0-7]|6[1-69])|4(?:[013568]\\d|2[4-7])|5(?:44\\d|471)|6\\d{2}|8(?:14|3[129]))\\d{4}","\\d{7,8}",,,"2012345"]
-,[,,"5(?:2[59]\\d|4(?:2[1-389]|4\\d|7[1-9]|9\\d)|7\\d{2}|8(?:[0-2568]\\d|7[15-8])|9[0-8]\\d)\\d{4}","\\d{8}",,,"52512345",,,[8]
+,[,,"5(?:2[59]\\d|4(?:2[1-389]|4\\d|7[1-9]|9\\d)|7\\d{2}|8(?:[0-25689]\\d|7[15-8])|9[0-8]\\d)\\d{4}","\\d{8}",,,"52512345",,,[8]
 ]
 ,[,,"80[012]\\d{4}","\\d{7}",,,"8001234",,,[7]
 ]
@@ -5087,7 +5087,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"[12]\\d{6,7}|9(?:0[3-9]|[1-9]\\d)\\d{5}|(?:3\\d|4[023568]|5[02368]|6[02-469]|7[4-69]|8[2-9])\\d{6}|(?:4[47]|5[14579]|6[1578]|7[0-357])\\d{5,6}|(?:78|41)\\d{5}","\\d{5,8}",,,"12345678",,,[7,8]
 ]
-,[,,"(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689]|90)|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70[1-689]\\d|8(?:0(?:1[01]|[2-9]\\d)|1(?:[0-8]\\d|9[01]))|90[23589]\\d)\\d{6}","\\d{8,10}",,,"8021234567",,,[8,10]
+,[,,"(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689]|90)|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70[1-689]\\d|8(?:0(?:1[01]|[2-9]\\d)|1(?:[0-8]\\d|9[01]))|90[2357-9]\\d)\\d{6}","\\d{8,10}",,,"8021234567",,,[8,10]
 ]
 ,[,,"800\\d{7,11}","\\d{10,14}",,,"80017591759",,,[10,11,12,13,14]
 ]
@@ -5099,9 +5099,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"NA","NA",,,,,,[-1]
 ]
-,"NG",234,"009","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["70|8[01]|90[23589]"]
+,"NG",234,"009","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[12]|9(?:0[3-9]|[1-9])"]
 ,"0$1"]
-,[,"(\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[12]|9(?:0[3-9]|[1-9])"]
+,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["70|8[01]|90[2357-9]"]
 ,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{2,3})","$1 $2 $3",["[3-6]|7(?:[1-79]|0[1-9])|8[2-9]"]
 ,"0$1"]

java/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en

@@ -1541,7 +1541,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"CL":[,[,,"(?:[2-9]|600|123)\\d{7,8}","\\d{7,11}",,,,,,[9,10,11]
 ,[7,8]
 ]
-,[,,"2(?:1962\\d{4}|2\\d{7}|32[0-2]\\d{5})|(?:3[2-5]|[47][1-35]|5[1-3578]|6[13-57])\\d{7}","\\d{7,9}",,,,,,[9]
+,[,,"2(?:1962\\d{4}|2\\d{7}|32[0-267]\\d{5})|(?:3[2-5]|[47][1-35]|5[1-3578]|6[13-57])\\d{7}","\\d{7,9}",,,,,,[9]
 ]
 ,[,,"9[3-9]\\d{7}","\\d{8,9}",,,,,,[9]
 ]
@@ -2466,7 +2466,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"FR":[,[,,"[1-9]\\d{8}","\\d{9}",,,,,,[9]
 ]
 ,[,,"[1-5]\\d{8}","\\d{9}"]
-,[,,"6\\d{8}|7(?:00\\d{6}|[3-9]\\d{7})","\\d{9}"]
+,[,,"(?:6\\d|7[3-9])\\d{7}","\\d{9}"]
 ,[,,"80[0-5]\\d{6}","\\d{9}"]
 ,[,,"89[1-37-9]\\d{6}","\\d{9}"]
 ,[,,"8(?:1[019]|2[0156]|84|90)\\d{6}","\\d{9}"]
@@ -3652,7 +3652,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"20\\d{6,7}|4(?:[0136]\\d{7}|[245]\\d{5,7})|5(?:[08]\\d{7}|[1-79]\\d{5,7})|6(?:[01457-9]\\d{5,7}|[26]\\d{7})","\\d{7,9}",,,,,,[7,8,9]
 ]
-,[,,"7(?:[0-36]\\d|5[0-6]|[79][0-7]|8[0-25-9])\\d{6}","\\d{9}",,,,,,[9]
+,[,,"7(?:[0-369]\\d|4[0-2]|5[0-6]|7[0-7]|8[0-25-9])\\d{6}","\\d{9}",,,,,,[9]
 ]
 ,[,,"800[24-8]\\d{5,6}","\\d{9,10}",,,,,,[9,10]
 ]
@@ -4770,7 +4770,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"MU":[,[,,"[2-9]\\d{6,7}","\\d{7,8}",,,,,,[7,8]
 ]
 ,[,,"(?:2(?:[03478]\\d|1[0-7]|6[1-69])|4(?:[013568]\\d|2[4-7])|5(?:44\\d|471)|6\\d{2}|8(?:14|3[129]))\\d{4}","\\d{7,8}"]
-,[,,"5(?:2[59]\\d|4(?:2[1-389]|4\\d|7[1-9]|9\\d)|7\\d{2}|8(?:[0-2568]\\d|7[15-8])|9[0-8]\\d)\\d{4}","\\d{8}",,,,,,[8]
+,[,,"5(?:2[59]\\d|4(?:2[1-389]|4\\d|7[1-9]|9\\d)|7\\d{2}|8(?:[0-25689]\\d|7[15-8])|9[0-8]\\d)\\d{4}","\\d{8}",,,,,,[8]
 ]
 ,[,,"80[012]\\d{4}","\\d{7}",,,,,,[7]
 ]
@@ -5087,7 +5087,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"[12]\\d{6,7}|9(?:0[3-9]|[1-9]\\d)\\d{5}|(?:3\\d|4[023568]|5[02368]|6[02-469]|7[4-69]|8[2-9])\\d{6}|(?:4[47]|5[14579]|6[1578]|7[0-357])\\d{5,6}|(?:78|41)\\d{5}","\\d{5,8}",,,,,,[7,8]
 ]
-,[,,"(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689]|90)|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70[1-689]\\d|8(?:0(?:1[01]|[2-9]\\d)|1(?:[0-8]\\d|9[01]))|90[23589]\\d)\\d{6}","\\d{8,10}",,,,,,[8,10]
+,[,,"(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689]|90)|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70[1-689]\\d|8(?:0(?:1[01]|[2-9]\\d)|1(?:[0-8]\\d|9[01]))|90[2357-9]\\d)\\d{6}","\\d{8,10}",,,,,,[8,10]
 ]
 ,[,,"800\\d{7,11}","\\d{10,14}",,,,,,[10,11,12,13,14]
 ]
@@ -5099,9 +5099,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"NA","NA",,,,,,[-1]
 ]
-,"NG",234,"009","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["70|8[01]|90[23589]"]
+,"NG",234,"009","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[12]|9(?:0[3-9]|[1-9])"]
 ,"0$1"]
-,[,"(\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[12]|9(?:0[3-9]|[1-9])"]
+,[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["70|8[01]|90[2357-9]"]
 ,"0$1"]
 ,[,"(\\d{2})(\\d{3})(\\d{2,3})","$1 $2 $3",["[3-6]|7(?:[1-79]|0[1-9])|8[2-9]"]
 ,"0$1"]

java/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en

@@ -4882,18 +4882,16 @@
         <!-- In mid-2013, Chile switched from 8 digits to 9 digits for fixed-line numbers, by
              inserting a '2' after the area code (which are 2 digits, with the exception of '2').
              As of Aug. 2014, all of the prefixes have been switched over to the new plan.
-             IMPORTANT: The fact that Santiago numbers have a prefix of "22", and that numbers in
-             other areas have '2' as their third digit, is likely to change in the future. At some
-             stage, Santiago numbers will probably switch to prefix "2\d", and the third digit in
-             other areas will probably be allowed to take on other values.
+             IMPORTANT: Originally after the change Santiago numbers had a prefix of "22", but
+             already numbers with the prefix "23" are being added.
              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
-             -->
+             Added 2326 range based on online evidence. Added prefix 2327 based on user report. -->
         <nationalNumberPattern>
           2(?:
             1962\d{4}|
             2\d{7}|
-            32[0-2]\d{5}
+            32[0-267]\d{5}
           )|
           (?:
             3[2-5]|
@@ -7971,11 +7969,10 @@
       </fixedLine>
       <mobile>
         <nationalNumberPattern>
-          6\d{8}|
-          7(?:
-            00\d{6}|
-            [3-9]\d{7}
-          )
+          (?:
+            6\d|
+            7[3-9]
+          )\d{7}
         </nationalNumberPattern>
         <possibleLengths national="9"/>
         <exampleNumber>612345678</exampleNumber>
@@ -14062,9 +14059,10 @@
       <mobile>
         <nationalNumberPattern>
           7(?:
-            [0-36]\d|
+            [0-369]\d|
+            4[0-2]|
             5[0-6]|
-            [79][0-7]|
+            7[0-7]|
             8[0-25-9]
           )\d{6}
         </nationalNumberPattern>
@@ -17611,7 +17609,7 @@
         <possibleLengths national="7,8"/>
         <exampleNumber>2012345</exampleNumber>
       </fixedLine>
-      <!-- Added prefix 580 and 581 as per information from the carrier. -->
+      <!-- Added prefix 580, 581 and 589 as per information from the carrier. -->
       <mobile>
         <nationalNumberPattern>
           5(?:
@@ -17624,7 +17622,7 @@
             )|
             7\d{2}|
             8(?:
-              [0-2568]\d|
+              [0-25689]\d|
               7[15-8]
             )|
             9[0-8]\d
@@ -18534,18 +18532,10 @@
         <sourceUrl>http://www.itu.int/oth/T020200009C/en</sourceUrl>
         <sourceUrl>http://www.ncc.gov.ng/index.php/index.php?option=com_content&amp;view=article&amp;id=113&amp;Itemid=102</sourceUrl>
       </references>
-      <!-- The first pattern which is for mobile ranges overlaps with the pattern
-           below it and is ordered above it as there are more mobile numbers with
-           the overlapping prefixes than fixed-line prefixes. -->
+      <!-- This pattern is for fixed-line ranges and overlaps with the pattern for mobile ranges
+           below it. It is ordered above that one as its numbers are shorter, to reduce switching
+           back and forth between the two formats as one is typing. -->
       <availableFormats>
-        <numberFormat pattern="(\d{3})(\d{3})(\d{3,4})">
-          <leadingDigits>
-            70|
-            8[01]|
-            90[23589]
-          </leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
         <numberFormat pattern="(\d)(\d{3})(\d{3,4})">
           <leadingDigits>
              [12]|
@@ -18556,6 +18546,14 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{3,4})">
+          <leadingDigits>
+            70|
+            8[01]|
+            90[2357-9]
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{2,3})">
           <leadingDigits>
             [3-6]|
@@ -18619,6 +18617,7 @@
         <exampleNumber>12345678</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Added 907 mobile prefix based on report. -->
         <nationalNumberPattern>
           (?:
             1(?:
@@ -18704,7 +18703,7 @@
                 9[01]
               )
             )|
-            90[23589]\d
+            90[2357-9]\d
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8,10}</possibleNumberPattern>