phonelib 0.5.6 → 0.6.0

data/data/libphonenumber/javascript/i18n/phonenumbers/phonenumberutil.js

@@ -175,6 +175,22 @@ i18n.phonenumbers.PhoneNumberUtil.MOBILE_TOKEN_MAPPINGS_ = {
 };
 
 
+/**
+ * Set of country calling codes that have geographically assigned mobile
+ * numbers. This may not be complete; we add calling codes case by case, as we
+ * find geographical mobile numbers or hear from user reports.
+ *
+ * @const
+ * @type {!Array.<number>}
+ * @private
+ */
+i18n.phonenumbers.PhoneNumberUtil.GEO_MOBILE_COUNTRIES_ = [
+  52,  // Mexico
+  54,  // Argentina
+  55  // Brazil
+];
+
+
 /**
  * The PLUS_SIGN signifies the international prefix.
  *
@@ -1371,10 +1387,13 @@ i18n.phonenumbers.PhoneNumberUtil.prototype.isNumberGeographical =
     function(phoneNumber) {
   /** @type {i18n.phonenumbers.PhoneNumberType} */
   var numberType = this.getNumberType(phoneNumber);
-  // TODO: Include mobile phone numbers from countries like Indonesia, which
-  // has some mobile numbers that are geographical.
+
   return numberType == i18n.phonenumbers.PhoneNumberType.FIXED_LINE ||
-      numberType == i18n.phonenumbers.PhoneNumberType.FIXED_LINE_OR_MOBILE;
+      numberType == i18n.phonenumbers.PhoneNumberType.FIXED_LINE_OR_MOBILE ||
+      (goog.array.contains(
+          i18n.phonenumbers.PhoneNumberUtil.GEO_MOBILE_COUNTRIES_,
+          phoneNumber.getCountryCodeOrDefault()) &&
+       numberType == i18n.phonenumbers.PhoneNumberType.MOBILE);
 };
 
 
@@ -3663,11 +3682,20 @@ i18n.phonenumbers.PhoneNumberUtil.prototype.checkRegionForParsing_ = function(
 
 
 /**
- * Parses a string and returns it in proto buffer format. This method will throw
- * a {@link i18n.phonenumbers.Error} if the number is not considered to be a
- * possible number. Note that validation of whether the number is actually a
- * valid number for a particular region is not performed. This can be done
- * separately with {@link #isValidNumber}.
+ * Parses a string and returns it as a phone number in proto buffer format. The
+ * method is quite lenient and looks for a number in the input text (raw input)
+ * and does not check whether the string is definitely only a phone number. To
+ * do this, it ignores punctuation and white-space, as well as any text before
+ * the number (e.g. a leading “Tel: ”) and trims the non-number bits.  It will
+ * accept a number in any format (E164, national, international etc), assuming
+ * it can be interpreted with the defaultRegion supplied. It also attempts to
+ * convert any alpha characters into digits if it thinks this is a vanity number
+ * of the type "1800 MICROSOFT".
+ *
+ * This method will throw a {@link i18n.phonenumbers.Error} if the number is not
+ * considered to be a possible number. Note that validation of whether the
+ * number is actually a valid number for a particular region is not performed.
+ * This can be done separately with {@link #isValidNumber}.
  *
  * @param {?string} numberToParse number that we are attempting to parse. This
  *     can contain formatting such as +, ( and -, as well as a phone number
@@ -3681,8 +3709,9 @@ i18n.phonenumbers.PhoneNumberUtil.prototype.checkRegionForParsing_ = function(
  * @return {i18n.phonenumbers.PhoneNumber} a phone number proto buffer filled
  *     with the parsed number.
  * @throws {i18n.phonenumbers.Error} if the string is not considered to be a
- *     viable phone number or if no default region was supplied and the number
- *     is not in international format (does not start with +).
+ *     viable phone number (e.g. too few or too many digits) or if no default
+ *     region was supplied and the number is not in international format (does
+ *     not start with +).
  */
 i18n.phonenumbers.PhoneNumberUtil.prototype.parse = function(numberToParse,
                                                              defaultRegion) {

data/data/libphonenumber/javascript/i18n/phonenumbers/phonenumberutil_test.js

@@ -323,6 +323,14 @@ function testIsNumberGeographical() {
   assertTrue(phoneUtil.isNumberGeographical(AU_NUMBER));
   // International toll free number.
   assertFalse(phoneUtil.isNumberGeographical(INTERNATIONAL_TOLL_FREE));
+  // We test that mobile phone numbers in relevant regions are indeed considered
+  // geographical.
+  // Argentina, mobile phone number.
+  assertTrue(phoneUtil.isNumberGeographical(AR_MOBILE));
+  // Mexico, mobile phone number.
+  assertTrue(phoneUtil.isNumberGeographical(MX_MOBILE1));
+  // Mexico, another mobile phone number.
+  assertTrue(phoneUtil.isNumberGeographical(MX_MOBILE2));
 }
 
 function testIsLeadingZeroPossible() {

data/data/libphonenumber/resources/PhoneNumberMetadata.xml

@@ -3029,12 +3029,13 @@
       </fixedLine>
       <mobile>
         <!-- We have restricted the pattern here to the first two digits, as beyond this the data
-             seems to be no longer accurate. The prefixes 9[46] have also been added, along with
-             6[167] (seemingly prefixes for Mobile MTN), and 64 for BeninCell. Glo Mobile has been
-             reported as having prefixes 68 and 9[89]. -->
+             seems to be no longer accurate. The latest ITU doc (2005) lists 9[0357] and lists
+             other 9x and the complete 6x range as reserved. The prefixes 9[46] have also been
+             added, along with 6[1267] (seemingly prefixes for Mobile MTN), and 6[3-5] for Moov.
+             Glo Mobile has been reported as having prefixes 68 and 9[89]. -->
         <nationalNumberPattern>
           (?:
-            6[146-8]|
+            6[1-8]|
             9[03-9]
           )\d{6}
         </nationalNumberPattern>
@@ -3979,9 +3980,9 @@
         <exampleNumber>2221234</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- 62[6-9], 63X and 6[67][2-9] were added as we have been able to successfully send SMSs
-             to these numbers or many numbers have been found online. -->
-        <nationalNumberPattern>6[0-367]\d{5}</nationalNumberPattern>
+        <!-- 62[6-9], 63X, 65X and 6[67][2-9] were added as we have been able to successfully
+              send SMSs to these numbers or many numbers have been found online. -->
+        <nationalNumberPattern>6[0-35-7]\d{5}</nationalNumberPattern>
         <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>6221234</exampleNumber>
       </mobile>
@@ -4494,7 +4495,7 @@
           (?:
             0[1-9]|
             4\d|
-            5[4-9]|
+            5[14-9]|
             6[015-79]|
             7[578]|
             87
@@ -4634,12 +4635,9 @@
              -->
         <nationalNumberPattern>
           2(?:
+            1962\d{4}|
             2\d{7}|
-            3(?:
-              20|
-              22
-            )\d{5}|
-            1962\d{4}
+            32[0-2]\d{5}
           )|
           (?:
             3[2-5]|
@@ -4864,39 +4862,6 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(\d{3})(\d{4})(\d{4})"
-                      nationalPrefixOptionalWhenFormatting="true"
-                      carrierCodeFormattingRule="$CC $FG">
-          <leadingDigits>
-            3(?:
-              11|
-              7[179]
-            )|
-            4(?:
-              [15]1|
-              3[12]
-            )|
-            5(?:
-              1|
-              2[37]|
-              3[12]|
-              51|
-              7[13-79]|
-              9[15]
-            )|
-            7(?:
-              31|
-              5[457]|
-              6[09]|
-              91
-            )|
-            8(?:
-              [57]1|
-              98
-            )
-          </leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(\d{3})(\d{3})(\d{4})"
                       nationalPrefixOptionalWhenFormatting="true"
                       carrierCodeFormattingRule="$CC $FG">
@@ -4943,7 +4908,7 @@
               1[236-8]|
               2[5-7]|
               3|
-              5[4-9]|
+              5[1-9]|
               7[02-9]|
               8[3678]|
               9[1-7]
@@ -4958,6 +4923,46 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(\d{3})(\d{4})(\d{4})"
+                      nationalPrefixOptionalWhenFormatting="true"
+                      carrierCodeFormattingRule="$CC $FG">
+          <leadingDigits>
+            3(?:
+              11|
+              7[179]
+            )|
+            4(?:
+              [15]1|
+              3[1-35]
+            )|
+            5(?:
+              1|
+              2[37]|
+              3[12]|
+              51|
+              7[13-79]|
+              9[15]
+            )|
+            7(?:
+              31|
+              5[457]|
+              6[09]|
+              91
+            )|
+            8(?:
+              [57]1|
+              98
+            )
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(\d{4})(\d{3})(\d{4})"
+                      nationalPrefixOptionalWhenFormatting="true"
+                      carrierCodeFormattingRule="$CC $FG">
+          <leadingDigits>807</leadingDigits>
+          <leadingDigits>8078</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="(\d{3})(\d{4})(\d{4})" carrierCodeFormattingRule="$CC $FG">
           <leadingDigits>1[3-578]</leadingDigits>
           <format>$1 $2 $3</format>
@@ -5018,7 +5023,7 @@
             )|
             4(?:
               [15]1|
-              3[12]
+              3[1-35]
             )|
             5(?:
               1\d|
@@ -5081,15 +5086,16 @@
               2[248]|
               3[04-9]|
               4[3-6]|
-              5[0-3689]|
+              5[0-4689]|
               6[2368]|
               9[02-9]
             )|
             8(?:
+              078|
               1[236-8]|
               2[5-7]|
               3\d|
-              5[4-9]|
+              5[1-9]|
               7[02-9]|
               8[3678]|
               9[1-7]
@@ -5122,7 +5128,7 @@
             [38]\d|
             4[57]|
             5[0-35-9]|
-            7[06-8]
+            7[036-8]
           )\d{8}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{11}</possibleNumberPattern>
@@ -7070,7 +7076,7 @@
                 6[5-8]
               )|
               5(?:
-                1[57]|
+                1[578]|
                 44|
                 5[0-4]
               )|
@@ -7450,9 +7456,8 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            2[1-9]|
-            5\d|
-            7[1-79]
+            [27][1-9]|
+            5\d
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>211234</exampleNumber>
@@ -7467,7 +7472,7 @@
             [1345][15-7]|
             2[125-7]|
             99
-            )\d{2}
+          )\d{2}
         </nationalNumberPattern>
         <exampleNumber>901123</exampleNumber>
       </premiumRate>
@@ -8897,7 +8902,7 @@
         <nationalNumberPattern>
           (?:
             222|
-            551
+            55[15]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>222123456</exampleNumber>
@@ -10502,6 +10507,7 @@
         <sourceUrl>http://www.itu.int/oth/T0202000063/en</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/%2B91</sourceUrl>
         <sourceUrl>http://www.coai.in/msccodes.php</sourceUrl>
+        <sourceUrl>http://www.dot.gov.in/access-services/allotment-msc-codes</sourceUrl>
       </references>
       <availableFormats>
         <!-- Mobile numbers. -->
@@ -10509,7 +10515,7 @@
           <leadingDigits>
             7(?:
               [0257]|
-              3[0157-9]|
+              3[013-57-9]|
               4[0-389]|
               6[0-35-9]|
               8[0-79]
@@ -10539,6 +10545,8 @@
               3(?:
                 [058]|
                 1[09]|
+                31|
+                48|
                 7[3679]|
                 9[689]
               )|
@@ -11006,6 +11014,8 @@
               3(?:
                 [058]\d|
                 1[09]|
+                31|
+                48|
                 7[3679]|
                 9[689]
               )|
@@ -13134,9 +13144,9 @@
     <!-- Kenya -->
     <territory id="KE" countryCode="254" internationalPrefix="000"
                nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG"
-               mobileNumberPortableRegion="true">
+               mobileNumberPortableRegion="true" nationalPrefixForParsing="005|0">
       <references>
-        <sourceUrl>http://www.cck.go.ke/licensing/numbering/plan.html</sourceUrl>
+        <sourceUrl>http://www.ca.go.ke/images/downloads/NUMBERING/Telecommunication%20Numbering%20Plan%20For%20Kenya%20Feb%202016.Pdf</sourceUrl>
         <sourceUrl>http://en.wikipedia.org/wiki/+254</sourceUrl>
       </references>
       <availableFormats>
@@ -13187,9 +13197,8 @@
           7(?:
             [0-36]\d|
             5[0-6]|
-            7[0-5]|
-            8[0-25-9]|
-            9[0-4]
+            [79][0-7]|
+            8[0-25-9]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
@@ -13898,16 +13907,20 @@
         <!-- Format is from ITU. -->
         <numberFormat pattern="(\d{4})(\d{3,4})">
           <leadingDigits>
-            [126]|
-            9[04-9]|
+            [16]|
+            2(?:
+              [0-35-9]|
+              4[0-35-9]
+            )|
+            9[024-9]|
             52[25]
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{5})">
           <leadingDigits>
-            5[015]|
-            92
+            244|
+            5[015]
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -13946,7 +13959,7 @@
               1[0-7]\d|
               2(?:
                 22|
-                55
+                5[25]
               )
             )|
             6(?:
@@ -15801,8 +15814,11 @@
              reported by open-source users, although the exact possible second digits are uncertain.
              -->
         <nationalNumberPattern>
-          [67]\d{7}|
-          9[0-25-9]\d{6}
+          (?:
+            [67]\d|
+            8[23]|
+            9[0-25-9]
+          )\d{6}
         </nationalNumberPattern>
         <exampleNumber>65012345</exampleNumber>
       </mobile>
@@ -16163,7 +16179,7 @@
         <nationalNumberPattern>
           6(?:
             [2356]\d|
-            8[18]
+            8[158]
           )\d{5}
         </nationalNumberPattern>
         <exampleNumber>66123456</exampleNumber>
@@ -17846,7 +17862,7 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            4[015-8]|
+            4[015-9]|
             5[89]|
             9\d
           )\d{6}
@@ -18184,8 +18200,8 @@
           <leadingDigits>2</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <numberFormat pattern="(9\d{3})(\d{4})">
-          <leadingDigits>9</leadingDigits>
+        <numberFormat pattern="([79]\d{3})(\d{4})">
+          <leadingDigits>[79]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="([58]00)(\d{4,6})">
@@ -18196,9 +18212,8 @@
       <generalDesc>
         <nationalNumberPattern>
           (?:
-            2[2-6]|
             5|
-            9\d
+            [279]\d
           )\d{6}|
           800\d{5,6}
         </nationalNumberPattern>
@@ -18211,6 +18226,7 @@
       </fixedLine>
       <mobile>
         <nationalNumberPattern>
+          7[19]\d{6}|
           9(?:
             0[1-9]|
             [1-9]\d
@@ -18219,15 +18235,6 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>92123456</exampleNumber>
       </mobile>
-      <premiumRate>
-        <nationalNumberPattern>
-          (?:
-            900
-          )\d{5}
-        </nationalNumberPattern>
-        <possibleNumberPattern>\d{8}</possibleNumberPattern>
-        <exampleNumber>90012345</exampleNumber>
-      </premiumRate>
       <tollFree>
         <!-- Link to document about toll-free numbers on http://www.tra.gov.om, which suggests they
              should be 8007 followed by 4 digits. However, the only examples I can find, including
@@ -18242,7 +18249,11 @@
         <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
         <exampleNumber>80071234</exampleNumber>
       </tollFree>
-      <!-- No premiumRate information can be found. -->
+      <premiumRate>
+        <nationalNumberPattern>900\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>90012345</exampleNumber>
+      </premiumRate>
     </territory>
 
     <!-- Panama -->
@@ -20396,13 +20407,12 @@
           <format>$1-$2 $3 $4</format>
           <intlFormat>$1 $2 $3 $4</intlFormat>
         </numberFormat>
-        <numberFormat pattern="([1-69]\d)(\d{3})(\d{2})">
+        <numberFormat pattern="([1-469]\d)(\d{3})(\d{2})">
           <leadingDigits>
-            1[13689]|
+            1[136]|
             2[136]|
-            3[1356]|
+            3[356]|
             4[0246]|
-            54|
             6[03]|
             90
           </leadingDigits>
@@ -20412,11 +20422,17 @@
         <numberFormat pattern="(\d{3})(\d{2})(\d{2})(\d{2})">
           <leadingDigits>
             1[2457]|
-            2[2457-9]|
+            2(?:
+              [247-9]|
+              5[0138]
+            )|
             3[0247-9]|
             4[1357-9]|
             5[0-35-9]|
-            6[124-9]|
+            6(?:
+              [124-689]|
+              7[0-2]
+            )|
             9(?:
               [125-8]|
               3[0-5]|
@@ -20429,11 +20445,17 @@
         <numberFormat pattern="(\d{3})(\d{2,3})(\d{2})">
           <leadingDigits>
             1[2457]|
-            2[2457-9]|
+            2(?:
+              [247-9]|
+              5[0138]
+            )|
             3[0247-9]|
             4[1357-9]|
             5[0-35-9]|
-            6[124-9]|
+            6(?:
+              [124-689]|
+              7[0-2]
+            )|
             9(?:
               [125-8]|
               3[0-5]|
@@ -20468,6 +20490,14 @@
           <format>$1-$2</format>
           <intlFormat>$1 $2</intlFormat>
         </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{2})(\d{3})(\d{2})(\d{2})">
+          <leadingDigits>
+            25[245]|
+            67[3-6]
+          </leadingDigits>
+          <format>$1-$2 $3 $4 $5</format>
+          <intlFormat>$1 $2 $3 $4 $5</intlFormat>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
@@ -20574,6 +20604,21 @@
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>740123456</exampleNumber>
       </pager>
+      <personalNumber>
+        <nationalNumberPattern>75[1-8]\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>751234567</exampleNumber>
+      </personalNumber>
+      <voicemail>
+        <nationalNumberPattern>
+          (?:
+            25[245]|
+            67[3-6]
+          )\d{9}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{12}</possibleNumberPattern>
+        <exampleNumber>254123456789</exampleNumber>
+      </voicemail>
       <tollFree>
         <nationalNumberPattern>20\d{4,7}</nationalNumberPattern>
         <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
@@ -20601,21 +20646,6 @@
         <possibleNumberPattern>\d{6}(?:\d{3})?</possibleNumberPattern>
         <exampleNumber>771234567</exampleNumber>
       </sharedCost>
-      <personalNumber>
-        <nationalNumberPattern>75[1-8]\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{9}</possibleNumberPattern>
-        <exampleNumber>751234567</exampleNumber>
-      </personalNumber>
-      <voicemail>
-        <nationalNumberPattern>
-          (?:
-            25[245]|
-            67[3-6]
-          )\d{9}
-        </nationalNumberPattern>
-        <possibleNumberPattern>\d{12}</possibleNumberPattern>
-        <exampleNumber>254123456789</exampleNumber>
-      </voicemail>
     </territory>
 
     <!-- Singapore -->
@@ -21295,8 +21325,8 @@
              by Nationlink Somalia, 67 by Nationlink Puntland, and 61 by Hormuud. 7X is used by
              Somtel. 6 followed by only 7 digits is used by Telecom. Note that in June 2014 many
              ranges were suspended by the government. 90\d{6} was listed as one of the ranges to be
-             suspended, but open-source contributors confirm that 907\d{6} is still in use, even if
-             the shorter 90 ranges are no longer. -->
+             suspended, but open-source contributors confirm that 90[67]\d{6} is still in use, even
+             if the shorter 90 ranges are no longer. -->
         <nationalNumberPattern>
           (?:
             15\d|
@@ -21310,7 +21340,7 @@
              99?\d
             )|
             9(?:
-              07|
+              0[67]|
               [2-9]
             )\d
           )\d{5}
@@ -22047,17 +22077,25 @@
         <sourceUrl>http://www.itu.int/oth/T02020000D2/en</sourceUrl>
       </references>
       <generalDesc>
-        <nationalNumberPattern>[2-9]\d{3}</nationalNumberPattern>
-        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+        <nationalNumberPattern>[2-47]\d{3,6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{4,7}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>[2-4]\d{3}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            2[2-4]|
+            [34]\d
+          )\d{2,5}
+        </nationalNumberPattern>
         <!-- The example number is the contact number from the ITU document. -->
-        <exampleNumber>3010</exampleNumber>
+        <exampleNumber>3101</exampleNumber>
       </fixedLine>
+      <!-- No evidence has been found for prefixes 5, 6, 8, and 9 which are
+           described as non-geographic service numbers, so these prefixes are
+           excluded until more information is found. -->
       <mobile>
-        <nationalNumberPattern>[5-9]\d{3}</nationalNumberPattern>
-        <exampleNumber>5190</exampleNumber>
+        <nationalNumberPattern>7[2-4]\d{2,5}</nationalNumberPattern>
+        <exampleNumber>7290</exampleNumber>
       </mobile>
     </territory>
 
@@ -24130,7 +24168,13 @@
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="([48])(\d{4})(\d{4})">
-          <leadingDigits>[48]</leadingDigits>
+          <leadingDigits>
+            4|
+            8(?:
+              [1-57]|
+              [689][0-79]
+            )
+          </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="([235-7]\d)(\d{4})(\d{3})">
@@ -24161,8 +24205,11 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(9\d)(\d{3})(\d{2})(\d{2})">
-          <leadingDigits>9</leadingDigits>
+        <numberFormat pattern="([89]\d)(\d{3})(\d{2})(\d{2})">
+          <leadingDigits>
+            8[689]8|
+            9
+          </leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
         <numberFormat pattern="(1[2689]\d)(\d{3})(\d{4})">
@@ -24221,9 +24268,12 @@
             7(?:
               [02-79]|
               [18][01]
-            )|
-            8[1-9]
-          )\d{7}
+            )
+          )\d{7}|
+          8(?:
+            [1-57]\d|
+            [689][0-79]
+          )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
         <exampleNumber>2101234567</exampleNumber>
@@ -24238,7 +24288,8 @@
               8[68]|
               99
             )
-          )\d{7}
+          )\d{7}|
+          8[689]8\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
         <exampleNumber>912345678</exampleNumber>