phonelib 0.6.3 → 0.6.4

data/data/libphonenumber/resources/PhoneNumberMetadata.xml

@@ -5335,12 +5335,13 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>12345678</exampleNumber>
       </fixedLine>
+      <!-- Added prefix 323 based on user report and online evidences. -->
       <mobile>
         <nationalNumberPattern>
           3(?:
             0[0-5]|
             1\d|
-            2[0-2]|
+            2[0-3]|
             5[01]
           )\d{7}
         </nationalNumberPattern>
@@ -6931,7 +6932,7 @@
       <!-- Uses MA formatting rules and shares general description
            (non-geographical numbers for Morocco are still valid). -->
       <generalDesc>
-        <nationalNumberPattern>[5689]\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>[5-9]\d{8}</nationalNumberPattern>
         <!-- Closed numbering plan. -->
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
       </generalDesc>
@@ -6943,10 +6944,15 @@
            numbers to be recognized as available from within Western Sahara. -->
       <mobile>
         <nationalNumberPattern>
-          6(?:
-            0[0-8]|
-            [12-79]\d|
-            8[017]
+          (?:
+            6(?:
+              [0-79]\d|
+              8[0-247-9]
+            )|
+            7(?:
+              [07][07]|
+              6[12]
+            )
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>650123456</exampleNumber>
@@ -6959,6 +6965,12 @@
         <nationalNumberPattern>89\d{7}</nationalNumberPattern>
         <exampleNumber>891234567</exampleNumber>
       </premiumRate>
+      <voip>
+        <!-- Putting VSAT numbers here. -->
+        <nationalNumberPattern>5924[01]\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>592401234</exampleNumber>
+      </voip>
     </territory>
 
     <!-- Eritrea -->
@@ -7244,10 +7256,10 @@
         <!-- The data here is not regularly updated by the Ethiopian authorities, and many more
              numbers are visible online than are reported in the ITU document. This pattern is
              therefore somewhat more relaxed than in the ITU document. According to the ETC,
-             95[89] is assigned to some CDMA providers. Prefix 9[46] added after a user report.-->
+             95[89] is assigned to some CDMA providers. Prefix 9[468] added after a user report.-->
         <nationalNumberPattern>
           9(?:
-            [1-46]\d|
+            [1-468]\d|
             5[89]
           )\d{6}
         </nationalNumberPattern>
@@ -10639,12 +10651,11 @@
                 9[015689]
               )|
               4(?:
-                [02][1-9]|
+                0[1-9]|
                 1[014-9]|
-                3\d|
+                [2389]|
                 [47][017-9]|
-                5[059]|
-                [89]
+                5[059]
               )|
               5(?:
                 [034678]|
@@ -10743,6 +10754,7 @@
                   4[08]
                 )|
                 2(?:
+                  09|
                   [1-7][089]|
                   [89]
                 )|
@@ -11228,8 +11240,8 @@
              numbers. It seems almost impossible to know for some of these numbers whether they are
              land-line or mobile, since the ranges overlap. We go to a maximum depth of five where
              necessary to distinguish between mobile and fixed-line numbers. Extra prefixes added:
-             72878, 74599, 7601, 768[56], 7695, 8299, 8309. New prefixes were also added based on
-             the document provided from mobile carriers:
+             72878, 74209, 74599, 7601, 768[56], 7695, 8299, 8309. New prefixes were also added
+             based on the document provided from mobile carriers:
              https://github.com/googlei18n/libphonenumber/issues/260 and
              https://github.com/googlei18n/libphonenumber/pull/692/ -->
         <nationalNumberPattern>
@@ -11273,6 +11285,7 @@
                   4[08]
                 )|
                 2(?:
+                  09|
                   [1-7][089]|
                   [89]\d
                 )|
@@ -12213,14 +12226,16 @@
       <mobile>
         <!-- Adding 27, 28, 299, 31, 508, 527 and 566 as extra prefixes, as they have been found to
              be valid by sending SMSs and looking at online number lookup sites. Also added 50[3-79]
-             as we have found information online that the 50[3-9] range has been assigned to Digicel.
-
-             Numbers have been found online for the following ranges 26x, 29x, 53x, 54x, 55x, 56x.
-             Most have mobile numbers online so we have put them under mobile but is possible
-             they are a mixture of fixed line and mobile. -->
+             as we have found information online that the 50[3-9] range has been assigned to
+             Digicel. Numbers have been found online for the following ranges 258, 26x, 29x, 53x,
+             54x, 55x, 56x. Most have mobile numbers online so we have put them under mobile but is
+             possible they are a mixture of fixed line and mobile. -->
         <nationalNumberPattern>
           876(?:
-            2[16-9]\d|
+            2(?:
+              [16-9]\d|
+              58
+            )|
             [348]\d{2}|
             5(?:
               0[3-9]|
@@ -15465,15 +15480,16 @@
       <references>
         <sourceUrl>http://www.itu.int/oth/T0202000090/en</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/+212</sourceUrl>
+        <sourceUrl>https://www.anrt.ma/sites/default/files/blocs_de_numeros_par_operateur_juillet_2016.pdf</sourceUrl>
       </references>
       <availableFormats>
-        <numberFormat pattern="([56]\d{2})(\d{6})">
+        <numberFormat pattern="([5-7]\d{2})(\d{6})">
           <leadingDigits>
             5(?:
               2[015-7]|
               3[0-4]
             )|
-            6
+            [67]
           </leadingDigits>
           <format>$1-$2</format>
         </numberFormat>
@@ -15481,7 +15497,8 @@
           <leadingDigits>
             5(?:
               2[2-489]|
-              3[5-9]
+              3[5-9]|
+              92
             )|
             892
           </leadingDigits>
@@ -15494,7 +15511,8 @@
               3(?:
                 [5-79]|
                 80
-              )
+              )|
+              924
             )|
             892
           </leadingDigits>
@@ -15515,6 +15533,16 @@
           </leadingDigits>
           <format>$1-$2</format>
         </numberFormat>
+        <!-- This format is added based on online references found. -->
+        <numberFormat pattern="([5]\d{2})(\d{2})(\d{2})(\d{2})">
+          <leadingDigits>
+            5(?:
+              4[067]|
+              5[03]
+            )
+          </leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
         <numberFormat pattern="(8[09])(\d{7})">
           <leadingDigits>
             8(?:
@@ -15526,7 +15554,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[5689]\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>[5-9]\d{8}</nationalNumberPattern>
         <!-- Closed numbering plan. -->
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
       </generalDesc>
@@ -15557,21 +15585,27 @@
                 0\d|
                 [89]0
               )
-            )
+            )|
+            (?:
+              4[067]|
+              5[03]
+            )\d{2}
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>520123456</exampleNumber>
       </fixedLine>
       <!-- Also duplicated in Western Sahara, please ensure you update both. -->
       <mobile>
-        <!-- http://www.anrt.ma/sites/default/files/Blocs_de_numeros_par_operateur.pdf
-             Prefixes 69[0136] added based on numbers found online. -->
-        <!-- Added prefix 982 as per IR21 from the carrier. -->
         <nationalNumberPattern>
-          6(?:
-            0[0-8]|
-            [12-79]\d|
-            8[017]
+          (?:
+            6(?:
+              [0-79]\d|
+              8[0-247-9]
+            )|
+            7(?:
+              [07][07]|
+              6[12]
+            )
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>650123456</exampleNumber>
@@ -15584,6 +15618,12 @@
         <nationalNumberPattern>89\d{7}</nationalNumberPattern>
         <exampleNumber>891234567</exampleNumber>
       </premiumRate>
+      <voip>
+        <!-- Putting VSAT numbers here. -->
+        <nationalNumberPattern>5924[01]\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>592401234</exampleNumber>
+      </voip>
     </territory>
 
     <!-- Monaco -->
@@ -15822,12 +15862,10 @@
         <exampleNumber>30234567</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Mobile numbers start with 600, 632, 661, 67, 68 or 69. -->
         <nationalNumberPattern>
           6(?:
             00\d|
-            32\d|
-            [89]\d{2}|
+            3[24]\d|
             61\d|
             7(?:
               [0-8]\d|
@@ -15835,7 +15873,8 @@
                 [3-9]|
                 [0-2]\d
               )
-            )
+            )|
+            [89]\d{2}
           )\d{4}
         </nationalNumberPattern>
         <!-- According to ITU it is possible for the numbers to be between length 4-12
@@ -21373,7 +21412,7 @@
       <mobile>
         <!-- 948 isn't in the number pattern, but many examples using this have been found, so
              deeming it valid for now. 909[1-9] is assigned to carrier Juro as per online
-             references found. -->
+             references found. 945 is assigned to Orange as per its carrier doc.-->
         <nationalNumberPattern>
           9(?:
             0(?:
@@ -21382,7 +21421,7 @@
             )|
             (?:
               1[0-24-9]|
-              4[0489]|
+              4[04589]|
               50
             )\d
           )\d{5}
@@ -21541,7 +21580,7 @@
     <territory id="SN" countryCode="221" internationalPrefix="00">
       <references>
         <sourceUrl>http://www.itu.int/oth/T02020000B8/en</sourceUrl>
-        <sourceUrl>http://www.artpsenegal.net</sourceUrl>
+        <sourceUrl>http://www.artpsenegal.net/index.php?option=com_content&amp;view=article&amp;id=50</sourceUrl>
       </references>
       <availableFormats>
         <!-- Using yellow pages and online telecom company formatting, rather than that implied in
@@ -21580,9 +21619,8 @@
       <mobile>
         <nationalNumberPattern>
           7(?:
-            [067]\d|
+            [06-8]\d|
             21|
-            8[0-46]|
             90
           )\d{6}
         </nationalNumberPattern>
@@ -22012,8 +22050,8 @@
         <nationalNumberPattern>
           9(?:
             22|
-            [35][0-8]|
-            4\d|
+            3[0-8]|
+            [45]\d|
             6[024-9]|
             88|
             9[0-489]
@@ -25051,12 +25089,12 @@
         <!-- Adding extra prefixes 50 and 6[1-57-9] since SMS messages have been successfully
              delivered to these numbers, and numbers like this can be found on the Internet. Adding
              prefix 960 based on information received from MTN Zambia. The 97 range has been
-             expanded based on their IR21 document, which states the range 97[1-9] is used. -->
+             expanded based on their IR21 document, which states the range 97[1-9] is used.
+             Added 95[3489] and 970 prefixes based on numbers found online. -->
         <nationalNumberPattern>
           9(?:
-            5[05]|
-            6\d|
-            7[1-9]
+            5[034589]|
+            [67]\d
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>955123456</exampleNumber>

data/data/libphonenumber/resources/PhoneNumberMetadataForTesting.xml

@@ -236,8 +236,9 @@
     </territory>
 
     <!-- China -->
-    <!-- Used to test as-you-type-formatter with complicated number format patterns. -->
-    <territory id="CN" countryCode="86">
+    <!-- Used to test as-you-type-formatter with complicated number format patterns. Also used to
+         test that not all geographical mobile numbers have an area code. -->
+    <territory id="CN" countryCode="86" nationalPrefix="0">
       <availableFormats>
         <numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(\d{3})(\d{5,6})"
                       carrierCodeFormattingRule="$CC $FG">
@@ -251,7 +252,37 @@
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <!-- Note that mobile numbers do not get formatted with the national prefix. -->
+        <numberFormat nationalPrefixFormattingRule="$FG" pattern="(\d{3})(\d{8})">
+          <leadingDigits>1</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
       </availableFormats>
+      <generalDesc>
+        <nationalNumberPattern>
+          [1-7]\d{6,11}|
+          8[0-357-9]\d{6,9}|
+          9\d{7,10}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{4,12}</possibleNumberPattern>
+      </generalDesc>
+      <fixedLine>
+        <nationalNumberPattern>[2-9]\d{10}</nationalNumberPattern>
+        <possibleNumberPattern>\d{11}</possibleNumberPattern>
+        <exampleNumber>91234567</exampleNumber>
+      </fixedLine>
+      <mobile>
+        <nationalNumberPattern>
+          1(?:
+            [38]\d|
+            4[57]|
+            5[0-35-9]|
+            7[0136-8]
+          )\d{8}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{11}</possibleNumberPattern>
+        <exampleNumber>13123456789</exampleNumber>
+      </mobile>
     </territory>
 
     <!-- Christmas Islands -->

data/data/libphonenumber/resources/ShortNumberMetadata.xml

@@ -4831,7 +4831,10 @@
           )|
           2611|
           5(?:
-            143[46]|
+            14(?:
+              2[5-9]|
+              [34]\d
+            )|
             3000|
             757555
           )
@@ -4844,10 +4847,13 @@
         <possibleNumberPattern>\d{5}</possibleNumberPattern>
       </carrierSpecific>
       <standardRate>
-        <!-- Cost of SMS to 51434, 51436 and 5757555 is of standard rate. -->
+        <!-- Cost of SMS to 5142[5-9], 514[34]\d and 5757555 is of standard rate. -->
         <nationalNumberPattern>
           5(?:
-            143[46]|
+            14(?:
+              2[5-9]|
+              [34]\d
+            )|
             757555
           )
         </nationalNumberPattern>
@@ -4869,7 +4875,10 @@
       <smsServices>
         <nationalNumberPattern>
           5(?:
-            143[46]|
+            14(?:
+              2[5-9]|
+              [34]\d
+            )|
             757555
           )
         </nationalNumberPattern>
@@ -9723,7 +9732,7 @@
          information. -->
     <territory id="ZA">
       <generalDesc>
-        <nationalNumberPattern>[14]\d{2,4}</nationalNumberPattern>
+        <nationalNumberPattern>[134]\d{2,4}</nationalNumberPattern>
         <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
       </generalDesc>
       <shortCode>
@@ -9735,12 +9744,16 @@
             )|
             12
           )|
+          37567|
           47751
         </nationalNumberPattern>
         <exampleNumber>10111</exampleNumber>
       </shortCode>
       <standardRate>
-        <nationalNumberPattern>47751</nationalNumberPattern>
+        <nationalNumberPattern>
+          37567|
+          47751
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{5}</possibleNumberPattern>
         <exampleNumber>47751</exampleNumber>
       </standardRate>
@@ -9757,8 +9770,11 @@
         <exampleNumber>10111</exampleNumber>
       </emergency>
       <smsServices>
-        <!-- Added SMS service short code 47751 as per online evidences found. -->
-        <nationalNumberPattern>47751</nationalNumberPattern>
+        <!-- Added SMS service short code 37567 and 47751 as per online evidences found. -->
+        <nationalNumberPattern>
+          37567|
+          47751
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{5}</possibleNumberPattern>
         <exampleNumber>47751</exampleNumber>
       </smsServices>