phonelib 0.6.0 → 0.6.1

data/data/libphonenumber/resources/PhoneNumberMetadata.xml

@@ -185,7 +185,7 @@
           <leadingDigits>[2-4679][2-8]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(5[0256])(\d{3})(\d{4})">
+        <numberFormat pattern="(5\d)(\d{3})(\d{4})">
           <leadingDigits>5</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -213,8 +213,9 @@
         <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
         <exampleNumber>22345678</exampleNumber>
       </fixedLine>
+      <!-- Added 9 digit 54 range to mobile as per online evidences. -->
       <mobile>
-        <nationalNumberPattern>5[0256]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>5[024-6]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>501234567</exampleNumber>
       </mobile>
@@ -1576,6 +1577,7 @@
       <references>
         <sourceUrl>http://www.itu.int/oth/T020200000D/en</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/Telephone_numbers_in_Australia</sourceUrl>
+        <sourceUrl>https://www.thenumberingsystem.com.au/#/number-register/search</sourceUrl>
       </references>
       <availableFormats>
         <numberFormat nationalPrefixFormattingRule="($NP$FG)"
@@ -1625,7 +1627,7 @@
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$FG"
           pattern="(19\d{2})(\d{4})">
-          <leadingDigits>19[67]</leadingDigits>
+          <leadingDigits>19[679]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$FG"
@@ -1642,9 +1644,10 @@
         <nationalNumberPattern>
           1(?:
             3(?:
-              \d{4}|
-              00\d{6}
-            )|
+              00\d{3}|
+              45[0-4]|
+              \d
+            )\d{3}|
             80(?:
               0\d{6}|
               2\d{3}
@@ -1655,12 +1658,13 @@
         <exampleNumber>1300123456</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
-        <!-- Excludes prefixes used by Cocos Islands and Christmas Islands -->
+        <!-- Note: For prefix 877 and 878 the pattern could be stricter.
+             Only 87[78]000\d{3} are assigned.
+             Excludes prefixes used by Cocos Islands and Christmas Islands. -->
         <nationalNumberPattern>
           [237]\d{8}|
           8(?:
-            [68]\d{3}|
-            7[0-69]\d{2}|
+            [6-8]\d{3}|
             9(?:
               [02-9]\d{2}|
               1(?:
@@ -1683,8 +1687,7 @@
             71
           )\d{5}|
           4(?:
-            [0-2]\d|
-            3[0-57-9]|
+            [0-3]\d|
             4[47-9]|
             5[0-25-9]|
             6[6-9]|
@@ -1712,8 +1715,13 @@
         <exampleNumber>1800123456</exampleNumber>
       </tollFree>
       <premiumRate>
-        <nationalNumberPattern>190[0126]\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <nationalNumberPattern>
+          19(?:
+            0[0126]\d|
+            [679]
+          )\d{5}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{8,10}</possibleNumberPattern>
         <exampleNumber>1900123456</exampleNumber>
       </premiumRate>
       <sharedCost>
@@ -1722,8 +1730,10 @@
            or 1300. -->
         <nationalNumberPattern>
           13(?:
-            00\d{2}
-          )?\d{4}
+            00\d{3}|
+            45[0-4]|
+            \d
+          )\d{3}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{6,10}</possibleNumberPattern>
         <exampleNumber>1300123456</exampleNumber>
@@ -3353,7 +3363,7 @@
             carrierCodeFormattingRule="$NP $CC ($FG)">
           <leadingDigits>
             (?:
-              [189][1-9]|
+              [1689][1-9]|
               2[12478]|
               3[1-578]|
               7[13-579]
@@ -3370,11 +3380,11 @@
         <numberFormat pattern="(\d{4})(\d{4})">
           <leadingDigits>
             (?:
-             300|
-             40(?:
+              300|
+              40(?:
                 0|
                 20
-             )
+              )
             )
           </leadingDigits>
           <format>$1-$2</format>
@@ -3406,15 +3416,9 @@
         <exampleNumber>40041234</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
-        <!-- According to this publication, the prefixes 11 53, 11 54 and 11 57 are to be used for
-             mobile phones prior to the introduction of a ninth digit. It is not clear whether they
-             are still valid as fixed-line numbers, so we are leaving them here in the meantime:
-             http://www.anatel.gov.br/Portal/exibirPortalNoticias.do?acao=carregaNoticia&codigo=22406
-             -->
         <nationalNumberPattern>
-          1[1-9][2-5]\d{7}|
           (?:
-            [4689][1-9]|
+            [14689][1-9]|
             2[12478]|
             3[1-578]|
             5[1-5]|
@@ -3425,11 +3429,14 @@
       </fixedLine>
       <mobile>
         <!-- Since 2012, Brazil has been migrating from 10 to 11 digits by inserting a 9 before the
-             last 8 digits. The following pattern is divided into 3 sections: ranges for which the
-             migration has been completed, ranges which are in transition, and ranges which are
-             still in the old format. (Ranges which were supposed to have been deprecated in
-             Oct. 2013 are still working as of Oct. 2015.) Note that mobile radio services are
-             still 10 digits, with the subscriber number (the last 8 digits) beginning with 7. -->
+             last 8 digits. Although initially the 9 will be followed by [6-9], as new numbers are
+             issued the digit following the 9 may be something else and since the transition period
+             is long, we err on the side of caution and already allow any digit here. Mobile radio
+             services are still 10 digits, where the 3rd digit is 7.
+             The following pattern is divided into 3 sections: ranges for which the migration is
+             complete, ranges which are in transition, and ranges which are still in the old format.
+             Generally we keep ranges in transition until a few months after we are notified that
+             they are not in use (b/28458993). -->
         <nationalNumberPattern>
           1[1-9](?:
             7|
@@ -3438,11 +3445,14 @@
           (?:
             2[12478]|
             3[1-578]|
-            7[13-579]|
-            [89][1-9]
-          )9?[6-9]\d{7}|
+            [689][1-9]|
+            7[13-579]
+          )(?:
+            [6-8]|
+            9\d?
+          )\d{7}|
           (?:
-            [46][1-9]|
+            4[1-9]|
             5[1-5]
           )[6-9]\d{7}
         </nationalNumberPattern>
@@ -3454,20 +3464,25 @@
         <exampleNumber>800123456</exampleNumber>
       </tollFree>
       <premiumRate>
-        <nationalNumberPattern>[359]00\d{6,7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            300|
+            [59]00\d?
+          )\d{6}
+        </nationalNumberPattern>
         <exampleNumber>300123456</exampleNumber>
       </premiumRate>
       <sharedCost>
         <nationalNumberPattern>
           (?:
-           300\d|
+           300\d(?:\d{2})?|
            40(?:
               0\d|
               20
            )
           )\d{4}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <possibleNumberPattern>\d{8,10}</possibleNumberPattern>
         <exampleNumber>40041234</exampleNumber>
       </sharedCost>
     </territory>
@@ -3975,7 +3990,20 @@
         <possibleNumberPattern>\d{7}(?:\d{4})?</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>[234578][02]\d{5}</nationalNumberPattern>
+        <!-- Wikipedia and ITU seem out of date, but say that for a number in the format ZNY-XXXX
+             Z represents the district code (or 6 for mobile), N the type of number and Y the first
+             digit of the customer's number. Only N = 0 and 2 are supposedly in use, but we have
+             found many numbers starting with 732 online. No evidence has been found about the
+             category of 732 numbers. -->
+        <nationalNumberPattern>
+          (?:
+            [23458][02]\d|
+            7(?:
+              [02]\d|
+              32
+            )
+          )\d{4}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>2221234</exampleNumber>
       </fixedLine>
@@ -5938,13 +5966,6 @@
           <leadingDigits>800</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <!-- Voicemail access numbers for the carrier Blau. -->
-        <numberFormat pattern="(177)(99)(\d{7,8})">
-          <leadingDigits>177</leadingDigits>
-          <leadingDigits>1779</leadingDigits>
-          <leadingDigits>17799</leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
         <numberFormat pattern="(\d{3})(\d)(\d{4,10})">
           <leadingDigits>
             (?:
@@ -5992,6 +6013,23 @@
           <leadingDigits>138</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <numberFormat pattern="(15[013-68])(\d{2})(\d{8})">
+          <leadingDigits>15[013-68]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="(15[279]\d)(\d{2})(\d{7})">
+          <leadingDigits>15[279]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="(1[67]\d)(\d{2})(\d{7,8})">
+          <leadingDigits>
+            1(?:
+              6[023]|
+              7
+            )
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <!-- When deciding whether to assume a leading 49 is a country code or not, the number is
@@ -6055,7 +6093,8 @@
              numbers beginning with 162, 163 and 17 can all be 10 or 11 digits long.
              The ranges 15[056] have been removed from the ITU doc, but information found online
              indicates that they may still be working.
-             -->
+             Note corresponding voicemail prefixes should be updated as well if new prefixes are
+             added to this section. -->
         <nationalNumberPattern>
           1(?:
             5[0-25-9]\d{8}|
@@ -6136,7 +6175,34 @@
         <exampleNumber>18500123456</exampleNumber>
       </uan>
       <voicemail>
-        <nationalNumberPattern>17799\d{7,8}</nationalNumberPattern>
+        <!-- Note corresponding mobile prefixes should be updated as well if new prefixes are added
+             to this section. -->
+        <nationalNumberPattern>
+          1(?:
+            5(?:
+              (?:
+                2\d55|
+                7\d99|
+                9\d33
+              )\d{7}|
+              (?:
+                [034568]00|
+                113
+              )\d{8}
+            )|
+            6(?:
+              013|
+              255|
+              399
+            )\d{7,8}|
+            7(?:
+              [015]13|
+              [234]55|
+              [69]33|
+              [78]99
+            )\d{7,8}
+          )
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{12,13}</possibleNumberPattern>
         <exampleNumber>177991234567</exampleNumber>
       </voicemail>
@@ -6167,12 +6233,8 @@
         <exampleNumber>21360003</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>
-          77(?:
-            08|
-            [6-8]\d
-          )\d{4}
-        </nationalNumberPattern>
+        <!-- 77[0-2] added from numbers found online and user reports. -->
+        <nationalNumberPattern>77[0-26-8]\d{5}</nationalNumberPattern>
         <exampleNumber>77831001</exampleNumber>
       </mobile>
     </territory>
@@ -7167,12 +7229,11 @@
         <!-- 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 94 added after a user report.-->
+             95[89] is assigned to some CDMA providers. Prefix 9[46] added after a user report.-->
         <nationalNumberPattern>
           9(?:
-            [1-4]\d|
-            5[89]|
-            66
+            [1-46]\d|
+            5[89]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -7531,7 +7592,7 @@
         <exampleNumber>612345678</exampleNumber>
       </mobile>
       <tollFree>
-        <nationalNumberPattern>80\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>80[0-5]\d{6}</nationalNumberPattern>
         <exampleNumber>801234567</exampleNumber>
       </tollFree>
       <premiumRate>
@@ -7554,6 +7615,12 @@
         <nationalNumberPattern>9\d{8}</nationalNumberPattern>
         <exampleNumber>912345678</exampleNumber>
       </voip>
+      <uan>
+        <!-- 80[6-9] numbers cost the same as fixed-line calls, but are not geographically assigned,
+             so we classify them as UAN. -->
+        <nationalNumberPattern>80[6-9]\d{6}</nationalNumberPattern>
+        <exampleNumber>806123456</exampleNumber>
+      </uan>
     </territory>
 
     <!-- Gabon -->
@@ -9137,6 +9204,7 @@
               [079]7|
               2[0167]|
               3[45]|
+              47|
               8[789]
             )|
             8(?:
@@ -9187,6 +9255,7 @@
               [079]7|
               2[0167]|
               3[45]|
+              47|
               8[789]
             )|
             8(?:
@@ -10306,7 +10375,7 @@
       <mobile>
         <!-- The ITU document has only some of these prefixes - wikipedia lists more. We are fairly
              sure wikipedia is accurate based on news coverage of the launch of these numbers. Also
-             added 5570 and 5571 prefixes based on confirmation from the carrier. -->
+             added 5570, 5571, and 5594 prefixes based on confirmations from the carriers. -->
         <nationalNumberPattern>
           5(?:
             [02-47-9]\d{2}|
@@ -10318,7 +10387,8 @@
               5[5689]|
               6[67]|
               7[0178]|
-              [89][6-9]
+              8[6-9]|
+              9[4-9]
             )|
             6[2-9]\d
           )\d{5}
@@ -10514,11 +10584,11 @@
         <numberFormat pattern="(\d{5})(\d{5})">
           <leadingDigits>
             7(?:
-              [0257]|
-              3[013-57-9]|
+              [02357]|
               4[0-389]|
               6[0-35-9]|
-              8[0-79]
+              8[0-79]|
+              99
             )|
             8(?:
               0[015689]|
@@ -10543,16 +10613,111 @@
                 9[389]
               )|
               3(?:
-                [058]|
-                1[09]|
-                31|
-                48|
-                7[3679]|
-                9[689]
+                [05-8]|
+                1[07-9]|
+                2[015-8]|
+                3[17-9]|
+                4[017-9]|
+                9[01689]
+              )|
+              4(?:
+                0[1-9]|
+                1[014-9]|
+                [29][89]|
+                39|
+                8[389]
+              )|
+              5(?:
+                [034678]|
+                2[03-9]|
+                5[017-9]|
+                9[7-9]
+              )|
+              6(?:
+                0[0-47]|
+                1[0-257-9]|
+                2[0-4]|
+                3[19]|
+                5[4589]|
+                [6-9]
+              )|
+              7(?:
+                0[2-9]|
+                [1-79]|
+                8[1-9]
+              )|
+              8[0-79]|
+              99[4-9]
+            )|
+            8(?:
+              0(?:
+                [01589]|
+                6[67]
+              )|
+              1(?:
+                [02-57-9]|
+                1[0135-9]
+              )|
+              2(?:
+                [236-9]|
+                5[1-9]
+              )|
+              3(?:
+                [0357-9]|
+                4[1-9]
+              )|
+              [45]|
+              6[02457-9]|
+              7(?:
+                07|
+                [1-69]
+              )|
+              8(?:
+                [0-26-9]|
+                44|
+                5[2-9]
+              )|
+              9(?:
+                [035-9]|
+                2[2-9]|
+                4[0-8]
+              )
+            )|
+            9
+          </leadingDigits>
+          <!-- For 5 digit prefix mobile numbers. -->
+          <leadingDigits>
+            7(?:
+              0|
+              2(?:
+                [0235679]|
+                [14][017-9]|
+                8[0-59]|
+                9[389]
+              )|
+              3(?:
+                [05-8]|
+                1(?:
+                  [089]|
+                  7[5-9]
+                )|
+                2(?:
+                  [5-8]|
+                  [01][089]
+                )|
+                3[17-9]|
+                4(?:
+                  [07-9]|
+                  11
+                )|
+                9[01689]
               )|
               4(?:
                 0[1-9]|
-                1[015-9]|
+                1(?:
+                  [015-9]|
+                  4[08]
+                )|
                 [29][89]|
                 39|
                 8[389]
@@ -10576,7 +10741,8 @@
                 [1-79]|
                 8[1-9]
               )|
-              8[0-79]
+              8[0-79]|
+              99[4-9]
             )|
             8(?:
               0(?:
@@ -10997,41 +11163,54 @@
         <!-- 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: 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/ -->
+             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:
+             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>
           (?:
             7(?:
-              0\d{2}|
+              0\d{3}|
               2(?:
                 [0235679]\d|
                 [14][017-9]|
                 8[0-59]|
                 9[389]
-              )|
+              )\d|
               3(?:
-                [058]\d|
-                1[09]|
-                31|
-                48|
-                7[3679]|
-                9[689]
+                [05-8]\d{2}|
+                1(?:
+                  [089]\d|
+                  7[5-8]
+                )|
+                2(?:
+                  [5-8]\d|
+                  [01][089]
+                )|
+                3[17-9]\d|
+                4(?:
+                  [07-9]\d|
+                  11
+                )|
+                9[01689]\d
               )|
               4(?:
-                0[1-9]|
-                1[015-9]|
-                [29][89]|
-                39|
-                8[389]
+                0[1-9]\d|
+                1(?:
+                  [015-9]\d|
+                  4[08]
+                )|
+                [29][89]\d|
+                39\d|
+                8[389]\d
               )|
               5(?:
                 [034678]\d|
                 2[03-9]|
                 5[017-9]|
                 9[7-9]
-              )|
+              )\d|
               6(?:
                 0[0-47]|
                 1[0-257-9]|
@@ -11039,13 +11218,14 @@
                 3[19]|
                 5[4589]|
                 [6-9]\d
-              )|
+              )\d|
               7(?:
                 0[2-9]|
                 [1-79]\d|
                 8[1-9]
-              )|
-              8[0-79]\d
+              )\d|
+              8[0-79]\d{2}|
+              99[4-9]\d
             )|
             8(?:
               0(?:
@@ -11080,9 +11260,9 @@
                 2[2-9]|
                 4[0-8]
               )
-            )|
-            9\d{3}
-          )\d{6}
+            )\d|
+            9\d{4}
+          )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>9123456789</exampleNumber>
@@ -13386,30 +13566,40 @@
              Mobitel uses 01[1247].
              Cellcard uses 0857 and 061.
              Extra prefixes found online: 088, 097.
-             Allowing 9-digit 12, 31, 38 and 76 numbers based on information from Cambodia Yellow
+             Allowing 9-digit 1[28], 31, 38 and 76 numbers based on information from Cambodia Yellow
              Pages and online search. Allowing 71 based on open-source report and online search. -->
         <nationalNumberPattern>
           (?:
             1(?:
-              [013-9]|
-              2\d?
+              [013-79]\d|
+              [28]\d{1,2}
+            )|
+            2[3-6]48|
+            3(?:
+              [18]\d{2}|
+              [2-6]48
+            )|
+            4[2-4]48|
+            5[2-5]48|
+            6(?:
+              [016-9]\d|
+              [2-5]48
             )|
-            3[18]\d|
-            6[016-9]|
             7(?:
-              [07-9]|
-              [16]\d
+              [07-9]\d|
+              [16]\d{2}|
+              [2-5]48
             )|
             8(?:
-              [013-79]|
-              8\d
+              [013-79]\d|
+              8\d{2}
             )|
             9(?:
-              6\d|
-              7\d?|
-              [0-589]
+              6\d{2}|
+              7\d{1,2}|
+              [0-589]\d
             )
-          )\d{6}
+          )\d{5}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8,9}</possibleNumberPattern>
         <exampleNumber>91234567</exampleNumber>
@@ -13670,8 +13860,10 @@
         internationalPrefix
             0031, 0033, 0071, 0073 - Special services of KT and DACOM, ignorable
         nationalPrefix
-            1[4-6]XX-YYYY - Country-wide common number services, display as it is without hyphens -->
-    <territory id="KR" countryCode="82" internationalPrefix="00(?:[124-68]|[37]\d{2})"
+            1[4-6]XX-YYYY - Country-wide common number services, display as it is without hyphens.
+        00798 is an ITFS range. So it doesn't appear here as internationalPrefix. -->
+    <territory id="KR" countryCode="82"
+               internationalPrefix="00(?:[124-68]|3\d{2}|7(?:[0-8]\d|9[0-79]))"
                nationalPrefix="0" nationalPrefixForParsing="0(8[1-46-8]|85\d{2})?"
                nationalPrefixFormattingRule="$NP$FG" carrierCodeFormattingRule="$NP$CC-$FG"
                mobileNumberPortableRegion="true">
@@ -13683,6 +13875,18 @@
         <sourceUrl>http://www.telecentro.co.kr/sub/index.php?job=detail&amp;ebcf_id=faq&amp;page=1&amp;mid=0503&amp;eb_seq=36</sourceUrl>
       </references>
       <availableFormats>
+        <numberFormat pattern="(\d{5})(\d{3,4})(\d{4})"
+          nationalPrefixFormattingRule="$FG" leadingZeroPossible="true">
+          <leadingDigits>00798</leadingDigits>
+          <format>$1 $2 $3</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
+        <numberFormat pattern="(\d{5})(\d{2})(\d{3})(\d{4})"
+          nationalPrefixFormattingRule="$FG" leadingZeroPossible="true">
+          <leadingDigits>00798</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
         <numberFormat pattern="(\d{2})(\d{4})(\d{4})">
           <leadingDigits>
             1(?:
@@ -13781,7 +13985,7 @@
             1(?:
               5[46-9]|
               6[04678]|
-              8[0579]
+              8[03579]
             )
           </leadingDigits>
           <leadingDigits>
@@ -13802,6 +14006,7 @@
               )|
               8(?:
                 00|
+                33|
                 55|
                 77|
                 99
@@ -13813,11 +14018,18 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
+          007\d{9,11}|
           [1-7]\d{3,9}|
           8\d{8}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{4,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{4,14}</possibleNumberPattern>
       </generalDesc>
+      <noInternationalDialling>
+        <!-- 00798 ITFS numbers can't be dialled internationally. -->
+        <nationalNumberPattern>00798\d{7,9}</nationalNumberPattern>
+        <possibleNumberPattern>\d{12,14}</possibleNumberPattern>
+        <exampleNumber>007981234567</exampleNumber>
+      </noInternationalDialling>
       <fixedLine>
         <!-- We omit 049, supposedly for Kaesong Industrial Region, since real numbers can't be
              found, and it is in North Korea anyway. We support 7-8 digits long subscriber numbers
@@ -13847,8 +14059,13 @@
         <exampleNumber>1523456789</exampleNumber>
       </pager>
       <tollFree>
-        <nationalNumberPattern>80\d{7}</nationalNumberPattern>
-        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            00798\d{0,2}|
+            80
+          )\d{7}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{9,14}</possibleNumberPattern>
         <exampleNumber>801234567</exampleNumber>
       </tollFree>
       <!-- The information below is provided by a Korean person. -->
@@ -13887,6 +14104,7 @@
             )|
             8(?:
               00|
+              33|
               55|
               77|
               99
@@ -15786,46 +16004,46 @@
         <nationalNumberPattern>[246-9]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
       </generalDesc>
+      <noInternationalDialling>
+        <nationalNumberPattern>80\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>80012345</exampleNumber>
+      </noInternationalDialling>
       <fixedLine>
-        <!-- Patterns from ITU with extra ranges 20 25, 20 7[13-9] and 217 provided by Sotelma and
-             confirmed by searches online. -->
         <nationalNumberPattern>
           (?:
             2(?:
               0(?:
-                2[0-589]|
-                7\d
+                2\d|
+                7[0-8]
               )|
               1(?:
                 2[5-7]|
-                [3-689]\d|
-                7[2-4689]
+                [3-689]\d
               )
             )|
-            44[239]\d
+            44[1239]\d
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>20212345</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Orange Mali have updated their numbering plan, though this is not reflected in the ITU
-             document (which is very stale). All mobile numbers starting with 7 are now Orange.
-             Includes 6x from Malitel IR21. Numbers beginning with 9 have been found online and
-             reported by open-source users, although the exact possible second digits are uncertain.
-             -->
         <nationalNumberPattern>
           (?:
-            [67]\d|
-            8[23]|
-            9[0-25-9]
-          )\d{6}
+            2(?:
+              079|
+              17\d
+            )|
+            [679]\d{3}|
+            8[239]\d{2}
+          )\d{4}
         </nationalNumberPattern>
         <exampleNumber>65012345</exampleNumber>
       </mobile>
       <tollFree>
         <!-- Online examples have not been found, but this seems to follow the prescriptions in the
              plan. -->
-        <nationalNumberPattern>800\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>80\d{6}</nationalNumberPattern>
         <exampleNumber>80012345</exampleNumber>
       </tollFree>
     </territory>
@@ -17860,10 +18078,15 @@
         <exampleNumber>21234567</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Note: Consider adding one more digit for stricter validation
+             (e.g. for 87[89] and 580).
+             TETRA (TErrestrial Trunked RAdio) and GSM - R (Global System for Mobile
+             communications – Railway or GSM-Railway) is included under mobile. -->
         <nationalNumberPattern>
           (?:
-            4[015-9]|
+            4[015-8]|
             5[89]|
+            87|
             9\d
           )\d{6}
         </nationalNumberPattern>
@@ -19223,11 +19446,11 @@
         <possibleNumberPattern>\d{6}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>41\d{4} </nationalNumberPattern>
+        <nationalNumberPattern>41\d{4}</nationalNumberPattern>
         <exampleNumber>411234</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>55\d{4} </nationalNumberPattern>
+        <nationalNumberPattern>55\d{4}</nationalNumberPattern>
         <exampleNumber>551234</exampleNumber>
       </mobile>
     </territory>
@@ -20273,7 +20496,7 @@
             5[025-9]|
             9[0-5]
           )\d{4}|
-          8[4-8]\d{5}|
+          8[4-9]\d{5}|
           9(?:
             1[2-9]|
             2[013-9]|
@@ -22000,10 +22223,10 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="([459]\d)(\d{3})(\d{4})">
+        <numberFormat pattern="([4589]\d)(\d{3})(\d{4})">
           <leadingDigits>
-            4[48]|
-            5|
+            4[148]|
+            [58]|
             9(?:
               1[59]|
               [0235-9]
@@ -22033,7 +22256,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[3-59]\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>[3-589]\d{8}</nationalNumberPattern>
         <possibleNumberPattern>\d{3,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -22061,7 +22284,9 @@
              numbers, and 50[12] for TCell from bug reports. -->
         <nationalNumberPattern>
           (?:
+            41[18]|
             50[125]|
+            88\d|
             9[0-35-9]\d
           )\d{6}
         </nationalNumberPattern>
@@ -23104,7 +23329,7 @@
               1[02-9]|
               2[0457]|
               3[1247]|
-              4[07]|
+              4[037]|
               5[47]|
               6[02359]|
               7[02-59]|
@@ -23196,7 +23421,7 @@
               1[02-9]|
               2[0457]|
               3[1247]|
-              4[07]|
+              4[037]|
               5[47]|
               6[02359]|
               7[02-59]|