phonelib 0.2.6 → 0.2.7

data/data/PhoneNumberMetaData.xml

@@ -938,6 +938,11 @@
           <format>$1</format>
           <intlFormat>NA</intlFormat>
         </numberFormat>
+        <numberFormat pattern="(\d{2})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>0</leadingDigits>
+          <format>$1</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
@@ -1461,11 +1466,10 @@
             [0-2]\d|
             3[0-57-9]|
             4[47-9]|
-            5[0-25-9]|
+            5[0-35-9]|
             6[6-9]|
-            7[0457-9]|
-            8[17-9]|
-            9[07-9]
+            [79][07-9]|
+            8[17-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -2039,7 +2043,7 @@
                 3|
                 4\d
               )
-            )
+            )|
           )\d{3}|
           4(?:
             0(?:
@@ -2299,7 +2303,7 @@
         <numberFormat pattern="([15-8]\d)(\d{2})(\d{2})(\d{2})">
           <leadingDigits>
             [156]|
-            7[018]|
+            7[0178]|
             8(?:
               0[1-9]|
               [1-79]
@@ -2322,17 +2326,21 @@
         <possibleNumberPattern>\d{8,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- According to the published Excel document the third digit must be 1-9. -->
+        <!-- Note that 80 is a valid area code, so we explicitly check for this case that the third
+             digit begins with 1-9 -->
         <nationalNumberPattern>
           (?:
             1[0-69]|
+            [23][2-8]|
             [49][23]|
             5\d|
             6[013-57-9]|
-            71|
-            8[0-79]
-          )[1-9]\d{5}|
-          [23][2-8]\d{6}
+            71
+          )\d{6}|
+          8(?:
+            0[1-9]|
+            [1-79]\d
+          )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>12345678</exampleNumber>
@@ -2357,9 +2365,9 @@
       <premiumRate>
         <nationalNumberPattern>
           (?:
-            70[2-7]|
-            90\d
-          )\d{5}
+            90|
+            7[07]
+          )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>90123456</exampleNumber>
@@ -2390,6 +2398,11 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- The prefix 50 48 has been added based on numbers found online, while 40 49 has been
+             deleted since we haven't found any numbers with this prefix and it is not mentioned in
+             the Onatel document.
+             IMPORTANT: Note that the ITU documents of Mar/Apr 2013 seem to have major errors in the
+             fixed-line table, so we have not changed our patterns based on these. -->
         <nationalNumberPattern>
           (?:
             20(?:
@@ -2398,14 +2411,11 @@
               9[016-9]
             )|
             40(?:
-              4[569]|
+              4[56]|
               5[4-6]|
               7[0179]
             )|
-            50(?:
-              [34]\d|
-              50
-            )
+            50[34]\d
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>20491234</exampleNumber>
@@ -2414,9 +2424,8 @@
         <nationalNumberPattern>
           6(?:
             [0-24-6]\d|
-            70|
-            8[0-8]|
-            3[0-3]
+            8[0-5]|
+            3[0-3]|
           )\d{5}|
           7\d{7}
         </nationalNumberPattern>
@@ -2947,7 +2956,7 @@
         <nationalNumberPattern>
           (?:
             318[023]|
-            416[023]|
+            416[0239]|
             7(?:
               1[578]|
               50
@@ -2959,14 +2968,13 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            318[14-68]|
-            416[15-9]|
+            318[1456]|
+            416[15-8]|
             7(?:
               0[01]|
-              7[07]|
               [89]\d
             )\d
-          )\d{3}
+          )\d{3}|
         </nationalNumberPattern>
         <exampleNumber>3181234</exampleNumber>
       </mobile>
@@ -3078,7 +3086,7 @@
           1(?:
             1(?:
               5[347]|
-              [6-9]\d
+              [6-9]\d|
             )|
             [2-9][6-9]\d
           )\d{6}|
@@ -3354,93 +3362,9 @@
                nationalPrefix="8" mobileNumberPortableRegion="true">
       <availableFormats>
         <numberFormat nationalPrefixFormattingRule="$NP 0$FG"
-          pattern="(\d{2})(\d{3})(\d{2})(\d{2})">
-          <leadingDigits>
-            17[0-3589]|
-            2[4-9]|
-            [34]
-          </leadingDigits>
-          <leadingDigits>
-            17(?:
-              [02358]|
-              1[0-2]|
-              9[0189]
-            )|
-            2[4-9]|
-            [34]
-          </leadingDigits>
-          <format>$1 $2-$3-$4</format>
-        </numberFormat>
-        <numberFormat nationalPrefixFormattingRule="$NP 0$FG"
-          pattern="(\d{3})(\d{2})(\d{2})(\d{2})">
-          <leadingDigits>
-            1(?:
-              5[24]|
-              6[235]|
-              7[467]
-            )|
-            2(?:
-              1[246]|
-              2[25]|
-              3[26]
-            )
-          </leadingDigits>
-          <leadingDigits>
-            1(?:
-              5[24]|
-              6(?:
-                2|
-                3[04-9]|
-                5[0346-9]
-              )|
-              7(?:
-                [46]|
-                7[37-9]
-              )
-            )|
-            2(?:
-              1[246]|
-              2[25]|
-              3[26]
-            )
-          </leadingDigits>
-          <format>$1 $2-$3-$4</format>
-        </numberFormat>
-        <numberFormat nationalPrefixFormattingRule="$NP 0$FG"
-          pattern="(\d{4})(\d{2})(\d{3})">
-          <leadingDigits>
-            1(?:
-              5[169]|
-              6[3-5]|
-              7[179]
-            )|
-            2(?:
-              1[35]|
-              2[34]|
-              3[3-5]
-            )
-          </leadingDigits>
-          <leadingDigits>
-            1(?:
-              5[169]|
-              6(?:
-                3[1-3]|
-                4|
-                5[125]
-              )|
-              7(?:
-                1[3-9]|
-                7[0-24-6]|
-                9[2-7]
-              )
-            )|
-            2(?:
-              1[35]|
-              2[34]|
-              3[3-5]
-            )
-          </leadingDigits>
-          <format>$1 $2-$3</format>
+          pattern="([1-4]\d)(\d{3})(\d{4})">
+          <leadingDigits>[1-4]</leadingDigits>
+          <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$NP $FG"
           pattern="([89]\d{2})(\d{3})(\d{4})">
@@ -3468,8 +3392,8 @@
       <noInternationalDialling>
         <nationalNumberPattern>
           8(?:
-            [013]|
-            [12]0
+            [01]|
+            20
           )\d{8}|
           902\d{7}
         </nationalNumberPattern>
@@ -3482,7 +3406,7 @@
             1(?:
               5(?:
                 1[1-5]|
-                [24]\d|
+                2\d|
                 6[2-4]|
                 9[1-7]
               )|
@@ -3503,10 +3427,10 @@
                 4[0-8]
               )|
               3(?:
-                [26]\d|
+                2\d|
                 3[02-79]|
                 4[024-7]|
-                5[03-7]
+                5[0-7]
               )
             )
           )\d{5}
@@ -4024,7 +3948,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[02-7]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>[02-6]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -4049,17 +3973,13 @@
       </fixedLine>
       <mobile>
         <!-- Added the prefixes 4[0-2] (Moov), 5[5-9] & 6[15] because SMS messages have been
-             successfully delivered. Supported by numbers found on the internet. The prefix 56 was
-             assigned to MTN in July 2013:
-             http://www.atci.ci/images/stories/pdf/decisions-dg/decision_002.pdf
-             50 has been removed since Warid seems to have stopped operation in Côte d'Ivoire. -->
-          <nationalNumberPattern>
+             successfully delivered. Supported by numbers found on the internet. -->
+        <nationalNumberPattern>
           (?:
             0[1-9]|
             4[0-24-9]|
-            5[4-9]|
-            6[015-79]|
-            77
+            5[05-9]|
+            6[015679]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>01234567</exampleNumber>
@@ -4725,9 +4645,7 @@
     <!-- Colombia -->
     <!-- http://www.itu.int/oth/T020200002C/en -->
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Colombia -->
-    <!-- Extra international dialling prefixes from www.claro.com.co and www.tigo.com.co. -->
-    <!-- 05 and 005 are for Orbitel: co.orbitel.com -->
-    <territory id="CO" countryCode="57" internationalPrefix="00(?:4(?:[14]4|56)|[579])"
+    <territory id="CO" countryCode="57" internationalPrefix="00[579]|#555|#999"
                nationalPrefix="0" nationalPrefixForParsing="0([3579]|4(?:44|56))?"
                mobileNumberPortableRegion="true">
       <availableFormats>
@@ -4793,11 +4711,12 @@
         <exampleNumber>12345678</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Virgin Mobile Colombia have reported that they are now using the 319 prefix. -->
         <nationalNumberPattern>
           3(?:
-            0[0-5]|
+            0[0-24]|
             1\d|
-            [25][01]
+            2[01]
           )\d{7}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -4823,7 +4742,7 @@
     <!-- Costa Rica -->
     <!-- http://www.itu.int/oth/T0202000030/en -->
     <territory id="CR" countryCode="506" internationalPrefix="00"
-               nationalPrefixForParsing="(19(?:0[01468]|19|20|66|77))"
+               nationalPrefixForParsing="(19(?:0[0-2468]|19|20|66|77))"
                carrierCodeFormattingRule="$CC $FG">
       <availableFormats>
         <numberFormat pattern="(\d{4})(\d{4})">
@@ -4878,7 +4797,10 @@
             0(?:
               [04]0\d{4}|
               10[0-3]\d{3}|
-              2900\d{2}|
+              2(?:
+                00\d|
+                900
+              )\d{2}|
               3[01]\d{4}|
               5\d{5}|
               70[01]\d{3}|
@@ -5006,11 +4928,10 @@
             [48]\d{2}|
             50\d|
             7(?:
-              2[0-24]|
+              2[0-2]|
               [34]\d|
               6[35-7]|
-              77|
-              8[7-9]
+              77
             )
           )\d{4}
         </nationalNumberPattern>
@@ -5024,7 +4945,7 @@
               3[01]
             )|
             6(?:
-              [16-9]\d|
+              [1679]\d|
               3[01]
             )
           )\d{4}
@@ -6165,7 +6086,10 @@
          </numberFormat>
          <numberFormat pattern="(\d{2})(\d{6,7})">
            <leadingDigits>
-             1[35]|
+             1(?:
+               3|
+               5[23]
+             )|
              [4-6]|
              [89][2-9]
            </leadingDigits>
@@ -6184,7 +6108,7 @@
       <fixedLine>
         <!-- Short numbers used for businesses (starting with 16 or 19) are covered here. Note also
              that the plan says numbers starting with 15 should be followed by seven digit
-             subscriber numbers, but some numbers we have found online are in fact six digit.
+             subscriber numbers, but all numbers we have found online are in fact six digit.
              Subscriber numbers starting with 5 are also permitted for the area codes 040, with 5, 6
              and 7 for the area code 050, with 5 and 7 for 082, with 6 for 084, with 7 for 086 and
              092 and with 5 and 6 for 96. -->
@@ -6192,10 +6116,7 @@
           (?:
             1(
               3[23]\d|
-              5(?:
-                [23]|
-                9\d
-              )
+              5[23]
             )|
             2[2-4]\d{2}|
             3\d{2}|
@@ -6274,12 +6195,15 @@
       <!-- 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-578], 62[01457-9], 63[04-8] and 68[01] are from numbers found online,
+             bug-reports, and information provided directly by the carriers. -->
         <nationalNumberPattern>
           6(?:
             0[0-8]|
-            [12-7]\d|
+            [124-7]\d|
+            3[03-8]|
             8[01]|
-            9[27-9]
+            99
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>650123456</exampleNumber>
@@ -6595,8 +6519,8 @@
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{4,10})">
           <leadingDigits>
-            [14]|
             2[09]|
+            [14]|
             50|
             7[135]
           </leadingDigits>
@@ -6742,12 +6666,12 @@
         <exampleNumber>3212345</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 7[5-8], 8[0367], and 9[034678] from numbers found online and numbers where SMSs
+        <!-- Adding 7[67], 8[367], and 9[034678] from numbers found online and numbers where SMSs
              have been received from. Adding 9[15] and 84 from Vodafone Fiji IR21. -->
         <nationalNumberPattern>
           (?:
-            7[0-8]|
-            8[03467]|
+            7[0-467]|
+            8[3467]|
             9\d
           )\d{5}
         </nationalNumberPattern>
@@ -7964,15 +7888,8 @@
     </territory>
 
     <!-- Gibraltar -->
-    <!-- http://www.gra.gi/index.php?topic=numbering+plan&section=legislation&site=communications -->
     <territory id="GI" countryCode="350" internationalPrefix="00">
-      <availableFormats>
-        <!-- Most numbers are formatted as a block -->
-        <numberFormat pattern="(\d{3})(\d{5})">
-          <leadingDigits>2</leadingDigits>
-          <format>$1 $2</format>
-        </numberFormat>
-      </availableFormats>
+      <!-- No formatting rules - numbers are always formatted as a block. -->
       <generalDesc>
         <nationalNumberPattern>[2568]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
@@ -7981,14 +7898,8 @@
         <nationalNumberPattern>
           2(?:
             00\d|
-            1(?:
-              6[24-7]|
-              9\d
-            )|
-            2(?:
-              00|
-              2[2457]
-            )
+            16[0-7]|
+            22[2457]
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>20012345</exampleNumber>
@@ -7996,8 +7907,8 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            5[46-8]|
-            62
+            5[4-8]|
+            60
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>57123456</exampleNumber>
@@ -8097,7 +8008,7 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            2[0-6]|
+            2[0-2]|
             [3679]\d
           )\d{5}
         </nationalNumberPattern>
@@ -8138,9 +8049,15 @@
         <exampleNumber>30241234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Prefixes here match those assigned to carriers, as per the ITU communication Jan 23rd
-             2013. -->
-        <nationalNumberPattern>6[02356]\d{7}</nationalNumberPattern>
+        <!-- Limited to the new 9-digit mobile ranges, which came into effect March 29th 2013. -->
+        <nationalNumberPattern>
+          6(?:
+            [03]1|
+            2[128]|
+            5[57]|
+            6[2469]
+          )\d{6}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>601123456</exampleNumber>
       </mobile>
@@ -8761,7 +8678,7 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Extra prefixes 227[01389], 228X, 2292 & 260X were added from numbers found online. -->
+        <!-- Extra prefixes 227[01389], 228X and 2292 were added from numbers found online. -->
         <nationalNumberPattern>
           2(?:
             2(?:
@@ -8787,8 +8704,8 @@
               74
             )|
             6(?:
-              [056]\d|
               4[0-378]|
+              [56]\d|
               [78][0-8]|
               9[01]
             )|
@@ -9709,6 +9626,7 @@
     </territory>
 
     <!-- India -->
+    <!-- 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 -->
@@ -9726,8 +9644,9 @@
                2[0579]|
                3[057-9]|
                4[0-389]|
+               5[024-9]|
                6[0-35-9]|
-               [57]|
+               7|
                8[0-79]
              )|
              8(?:
@@ -9736,7 +9655,7 @@
                2[2356-9]|
                3[0-57-9]|
                [45]|
-               6[02457-9]|
+               6[0245789]|
                7[1-69]|
                8[0124-9]|
                9[02-9]
@@ -9765,19 +9684,21 @@
                  8[389]
                )|
                5(?:
-                 [034678]|
-                 2[03-9]|
-                 5[017-9]|
-                 9[7-9]
+                 0|
+                 [47]9|
+                 [25]0|
+                 6[6-9]|
+                 [89][7-9]
                )|
                6(?:
                  0[027]|
-                 1[0-257-9]|
-                 2[0-4]|
+                 12|
+                 20|
                  3[19]|
-                 5[4589]|
-                 [679]|
-                 8[0-589]
+                 5[45]|
+                 6[5-9]|
+                 7[679]|
+                 9[1-46-9]
                )|
                7(?:
                  0[2-9]|
@@ -10199,8 +10120,8 @@
         <!-- 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
              numbers. It seems almost impossible to know for some of these numbers whether they are
-             land-line or mobile, since the ranges overlap. Extra prefixes added: 76[89]5, 8299,
-             8309. New prefixes were also added based on the document provided from mobile carriers:
+             land-line or mobile, since the ranges overlap. Extra prefixes added: 8299, 8309.
+             New prefixes were added based on the document provided from mobile carriers:
              https://code.google.com/p/libphonenumber/issues/detail?id=260 -->
         <nationalNumberPattern>
           (?:
@@ -10225,19 +10146,21 @@
                 8[389]
               )|
               5(?:
-                [034678]\d|
-                2[03-9]|
-                5[017-9]|
-                9[7-9]
+                0\d|
+                [47]9|
+                [25]0|
+                6[6-9]|
+                [89][7-9]
               )|
               6(?:
                 0[027]|
-                1[0-257-9]|
-                2[0-4]|
+                12|
+                20|
                 3[19]|
-                5[4589]|
-                [679]\d|
-                8[0-589]
+                5[45]|
+                6[5-9]|
+                7[679]|
+                9[1-46-9]
               )|
               7(?:
                 0[2-9]|
@@ -10636,7 +10559,7 @@
       <mobile>
         <!-- TETRA = TErrestrial Trunked RAdio is included under mobile. -->
         <nationalNumberPattern>
-          38[589]\d{6}|
+          38[59]\d{6}|
           (?:
             6(?:
               1[0-8]|
@@ -10661,9 +10584,6 @@
         <exampleNumber>6101234</exampleNumber>
       </mobile>
       <tollFree>
-        <!-- The UIFN numbers mentioned in the Excel document are not yet included since no real
-             numbers can be found online, and it is not clear what these are; the standard
-             definition would have them under the +800 country code instead of Iceland. -->
         <nationalNumberPattern>800\d{4}</nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>8001234</exampleNumber>
@@ -10680,6 +10600,7 @@
       </voip>
       <voicemail>
         <nationalNumberPattern>
+          388\d{6}|
           (?:
             6(?:
               2[0-8]|
@@ -10695,8 +10616,7 @@
             95[48]
           )\d{4}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7}</possibleNumberPattern>
-        <exampleNumber>6201234</exampleNumber>
+        <exampleNumber>388123456</exampleNumber>
       </voicemail>
     </territory>
 
@@ -11265,8 +11185,7 @@
                 3[0-57-8]|
                 4[24-7]|
                 5[0-24-8]|
-                [6-8][02]|
-                9[0-2]
+                [6-9][02]
               )|
               7(?:
                 0[1-79]|
@@ -11282,13 +11201,11 @@
               1[1-35-7]|
               2[024-7]|
               3\d|
-              4[0-2]|
-              [57][02]|
+              [457][02]|
               60
             )|
             53(?:
-              0[0-2]|
-              [13][02]|
+              [013][02]|
               2[0-59]|
               49|
               5[0-35-9]|
@@ -11337,8 +11254,8 @@
           7(?:
             55|
             7[25-9]|
-            8[05-9]|
-            9[015-9]
+            8[5-9]|
+            9[05-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -12654,42 +12571,36 @@
     <!-- Kiribati -->
     <!-- http://www.itu.int/oth/T0202000071/en -->
     <!-- We include the national prefix for parsing here just in case numbers can be dialled with a
-         leading 0 - no numbers online have been found formatted this way, but the ITU document
-         lists it as a national dialling prefix. -->
+         leading 0 - the main ITU document says this is not the case and no numbers online have been
+         found formatted this way, but Kiribati's own document lists it as a national dialling
+         prefix. -->
     <territory id="KI" countryCode="686" internationalPrefix="00"
                nationalPrefixForParsing="0">
       <!-- Numbers should be formatted as a block." -->
       <generalDesc>
-        <nationalNumberPattern>
-          [2-58]\d{4}|
-          7\d{7}
-        </nationalNumberPattern>
-        <possibleNumberPattern>\d{5,8}</possibleNumberPattern>
+        <nationalNumberPattern>[2-689]\d{4}</nationalNumberPattern>
+        <possibleNumberPattern>\d{5}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>
           (?:
-            [24]\d|
-            3[1-9]|
+            [234]\d|
             50|
-            8[0-5]
+            8[1-5]
           )\d{3}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{5}</possibleNumberPattern>
         <exampleNumber>31234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- North Tarawa is listed as 720XXXXX-729XXXXX but considering that this deviates from the
-             pattern followed by every other place, we are assuming 731XXXXX-732XXXXX for now. -->
+        <!-- Exclude 99[2349] from mobile since these are emergency numbers. -->
         <nationalNumberPattern>
-          7(?:
-            [24]\d|
-            3[1-9]|
-            8[0-5]
-          )\d{5}
+          6\d{4}|
+          9(?:
+            [0-8]\d|
+            9[015-8]
+          )\d{2}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{8}</possibleNumberPattern>
-        <exampleNumber>72012345</exampleNumber>
+        <exampleNumber>61234</exampleNumber>
       </mobile>
     </territory>
 
@@ -13129,7 +13040,7 @@
         <nationalNumberPattern>
           (?:
             5(?:
-              1[0-5]|
+              1[0-35]|
               [05]\d
             )|
             6(?:
@@ -13144,7 +13055,7 @@
               4[049]|
               6[069]|
               [79]\d|
-              8[08]
+              88
             )
           )\d{5}
         </nationalNumberPattern>
@@ -14386,13 +14297,15 @@
       </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 60[1-578], 62[01457-9], 63[04-8] and 68[01], 698 are from numbers found
+             online, bug-reports, and information provided directly by the carriers. -->
         <nationalNumberPattern>
           6(?:
             0[0-8]|
-            [12-7]\d|
+            [124-7]\d|
+            3[013-8]|
             8[01]|
-            9[27-9]
+            9[89]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>650123456</exampleNumber>
@@ -14748,9 +14661,14 @@
       <mobile>
         <!-- The numbering plan suggests the third digit, Z, should be 24-9, but this is not borne
              out by reality. -->
-        <nationalNumberPattern>3[2-49]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          3(?:
+            [02-4]\d|
+            90
+          )\d{6}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
-        <exampleNumber>321234567</exampleNumber>
+        <exampleNumber>301234567</exampleNumber>
       </mobile>
       <!-- Putting VSAT numbers here. -->
       <voip>
@@ -14853,11 +14771,9 @@
       <mobile>
         <nationalNumberPattern>
           7(?:
-            [0-25-8]\d{2}|
-            32\d|
-            421
-          )\d{4}
-        </nationalNumberPattern>
+            [0-25-8]\d|
+            33
+          )\d{5}</nationalNumberPattern>
         <exampleNumber>72345678</exampleNumber>
       </mobile>
       <tollFree>
@@ -14980,8 +14896,7 @@
         <numberFormat pattern="(9)(\d{3})(\d{4,5})">
           <leadingDigits>
             9(?:
-              2[0-4]|
-              [35-9]|
+              [235-9]|
               4[13789]
             )
           </leadingDigits>
@@ -14991,19 +14906,13 @@
           <leadingDigits>94[0245]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- Following majority of numbers found online. -->
-        <numberFormat pattern="(9)(\d{3})(\d{3})(\d{3})">
-          <leadingDigits>925</leadingDigits>
-          <format>$1 $2 $3 $4</format>
-        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           [14578]\d{5,7}|
           [26]\d{5,8}|
           9(?:
-            2\d{0,2}|
-            [58]|
+            [258]|
             3\d|
             4\d{1,2}|
             [679]\d?
@@ -15093,10 +15002,7 @@
         <nationalNumberPattern>
           17[01]\d{4}|
           9(?:
-            2(?:
-              [0-4]|
-              5\d{2}
-            )|
+            2[0-4]|
             3[136]\d|
             4(?:
               0[0-4]\d|
@@ -15521,7 +15427,6 @@
           2(?:
             0(?:
               1[0-6]|
-              3[1-4]|
               [69]\d
             )|
             [1-357]\d{2}
@@ -15530,8 +15435,6 @@
         <exampleNumber>21001234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- 7210 and 92XX come from the allocations listed on www.mca.org.mt, but they are not
-             listed in the latest ITU document. -->
         <nationalNumberPattern>
           (?:
             7(?:
@@ -15649,7 +15552,7 @@
             )|
             7\d{2}|
             8(?:
-              [256]\d|
+              [26]\d|
               7[15-8]
             )|
             9[0-8]\d
@@ -16214,8 +16117,8 @@
                 7\d?
               )|
               3(?:
-                [01378]|
-                2\d
+                2\d|
+                3[378]
               )|
               4[01]|
               69|
@@ -16223,6 +16126,7 @@
             )|
             2(?:
               17|
+              25|
               5(?:
                 [0-36-8]|
                 4\d?
@@ -16487,7 +16391,7 @@
           <leadingDigits>[129]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(\d{2})(\d{3})(\d{2,3})">
+        <numberFormat pattern="([3-8]\d)(\d{3})(\d{2,3})">
           <leadingDigits>
             [3-6]|
             7(?:
@@ -16498,11 +16402,10 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{3})(\d{3,4})">
+        <numberFormat pattern="([78]\d{2})(\d{3})(\d{3,4})">
           <leadingDigits>
             70|
-            8[01]|
-            909
+            8[01]
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -16521,8 +16424,7 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          [1-6]\d{5,8}|
-          9\d{5,9}|
+          [1-69]\d{5,8}|
           [78]\d{5,13}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{5,14}</possibleNumberPattern>
@@ -16530,10 +16432,7 @@
       <fixedLine>
         <nationalNumberPattern>
           [12]\d{6,7}|
-          9(?:
-            0[3-9]|
-            [1-9]\d
-          )\d{5}|
+          9\d{7}|
           (?:
             3\d|
             4[023568]|
@@ -16561,7 +16460,7 @@
              from Etisalat, 814 MTN and 811 from Glo. Furthermore, the fixed-line prefixes owned by
              Starcomms have apparently, according to the company, been used for mobile numbers too,
              despite the ITU plan, so we list them here as well. 701 has been added for Airtel/Zain.
-             9091 has been added for Etisalat. -->
+             -->
         <nationalNumberPattern>
           (?:
             1(?:
@@ -16643,8 +16542,7 @@
             8(?:
               0[2-9]|
               1\d
-            )\d|
-            9091
+            )\d
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8,10}</possibleNumberPattern>
@@ -16672,7 +16570,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[12578]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>[1258]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -16681,14 +16579,9 @@
       </fixedLine>
       <mobile>
         <!-- Online users have reported seeing 5500 used by Claro; until we can find actual numbers
-             or any documentation about it, we restrict this pattern to this prefix exactly. 57 and
-             78 were added from bug reports/numbers found online. -->
+             or any documentation about it, we restrict this pattern to this prefix exactly. -->
         <nationalNumberPattern>
-          5(?:
-            500\d{4}|
-            7\d{6}
-          )|
-          78\d{6}|
+          5500\d{4}|
           8\d{7}
         </nationalNumberPattern>
         <exampleNumber>81234567</exampleNumber>
@@ -17979,7 +17872,8 @@
             0\d|
             1[1-5]|
             2[0-5]|
-            [34][1-7]|
+            3[1-6]|
+            4[1-7]|
             55|
             64
           )\d{7}
@@ -19724,7 +19618,7 @@
         <numberFormat pattern="([3-7]\d)(\d{3})(\d{3})">
           <leadingDigits>
             [37][01]|
-            4[0139]|
+            4[019]|
             51|
             6
           </leadingDigits>
@@ -19763,13 +19657,14 @@
         <exampleNumber>11234567</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- We include 043 and 049 here - it is VoIP in the plan, but is actually used to provide
-             mobile coverage to Kosovo. Also added 068, which is used by the mobile operator bob.si
-         -->
+        <!-- We include 049 here - it is VoIP in the plan, but SMS messages have been successfully
+             delivered - and it is run by Mobitel. There are also mobile numbers found on the
+             internet with this prefix - it is apparently used in Kosovo. Also
+             added 068, which is used by the mobile operator bob.si -->
         <nationalNumberPattern>
           (?:
             [37][01]|
-            4[0139]|
+            4[019]|
             51|
             6[48]
           )\d{6}
@@ -20069,37 +19964,29 @@
 
     <!-- Senegal -->
     <!-- http://www.itu.int/oth/T02020000B8/en -->
-    <!-- http://www.artpsenegal.net -->
     <territory id="SN" countryCode="221" internationalPrefix="00">
       <availableFormats>
         <!-- Using yellow pages and online telecom company formatting, rather than that implied in
              the national numbering plan. -->
         <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})">
-          <leadingDigits>[37]</leadingDigits>
-          <format>$1 $2 $3 $4</format>
-        </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{2})(\d{2})(\d{2})">
-          <leadingDigits>8</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[378]\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>[37]\d{8}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>
           3(?:
             0(?:
-              1[0-2]|
+              1[01]|
               80
             )|
-            211|
             3(?:
               8[1-9]|
               9[2-9]
-            )|
-            90[1-5]
+            )
           )\d{5}
         </nationalNumberPattern>
         <exampleNumber>301012345</exampleNumber>
@@ -20107,34 +19994,36 @@
       <mobile>
         <nationalNumberPattern>
           7(?:
-            [07]\d|
-            21|
-            6[1-9]|
-            8[0-26]|
-            90
-          )\d{6}
+            0(?:
+              [01279]0|
+              3[03]|
+              4[05]|
+              5[06]|
+              6[03-5]|
+              8[029]
+            )|
+            6(?:
+              1[23]|
+              2[89]|
+              3[3489]|
+              4[6-9]|
+              5\d|
+              6[3-9]|
+              7[45]|
+              8[3-8]
+            )|
+            7\d{2}|
+            8(?:
+              01|
+              1[01]
+            )
+          )\d{5}
         </nationalNumberPattern>
-        <exampleNumber>701234567</exampleNumber>
+        <exampleNumber>701012345</exampleNumber>
       </mobile>
-      <tollFree>
-        <nationalNumberPattern>800\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{9}</possibleNumberPattern>
-        <exampleNumber>800123456</exampleNumber>
-      </tollFree>
-      <premiumRate>
-        <!-- Revenu Partagé in the plan. -->
-        <nationalNumberPattern>88[4689]\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{9}</possibleNumberPattern>
-        <exampleNumber>884123456</exampleNumber>
-      </premiumRate>
-      <sharedCost>
-        <nationalNumberPattern>81[02468]\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{9}</possibleNumberPattern>
-        <exampleNumber>810123456</exampleNumber>
-      </sharedCost>
       <voip>
-        <nationalNumberPattern>391\d{6}</nationalNumberPattern>
-        <exampleNumber>391011234</exampleNumber>
+        <nationalNumberPattern>33301\d{4}</nationalNumberPattern>
+        <exampleNumber>333011234</exampleNumber>
       </voip>
     </territory>
 
@@ -20262,14 +20151,12 @@
         <exampleNumber>211234</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Adding 74 from numbers found online. -->
         <nationalNumberPattern>
           (?:
-            7(?:
-              [1-357]\d|
-              4[0-5]
-            )|
-            8[1-9]\d
-          )\d{4}
+            7[1-57]|
+            8[1-9]
+          )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>7412345</exampleNumber>
@@ -20617,7 +20504,7 @@
               3[1-389]|
               4[1-7]
             )|
-            4[34][1-3]
+            4[34][12]
           )\d{4}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -21046,9 +20933,8 @@
         <!-- According to feedback from users, the carrier Altyn Asyr is the only one currently
              operating, with the numbers 6[3-5]\d{6}. MTS used to operate the ranges 6[6-8] but this
              has been suspended. It is unclear whether it will resume. We support both ranges in the
-             meantime. The range 62 seems also now to be in use, according to numbers found online.
-             -->
-        <nationalNumberPattern>6[2-8]\d{6}</nationalNumberPattern>
+             meantime. -->
+        <nationalNumberPattern>6[3-8]\d{6}</nationalNumberPattern>
         <exampleNumber>66123456</exampleNumber>
       </mobile>
       <!-- No tollFree or premiumRate information can be found. -->
@@ -21295,12 +21181,11 @@
         <exampleNumber>8682211234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 48X & 70X from the IR21 published by TSTT. 288 seems to be used based on numbers
-             found online. -->
+        <!-- Adding 48X & 70X from the IR21 published by TSTT. -->
         <nationalNumberPattern>
           868(?:
             2(?:
-              8[5-9]|
+              8[59]|
               9\d
             )|
             3(?:
@@ -21731,7 +21616,7 @@
             )|
             3[23]\d|
             5[0-4]\d|
-            6[03]\d|
+            60\d|
             8[0-2]\d
           )\d{4}|
           [34]\d{8}