phonelib 0.4.9 → 0.5.0

data/data/libphonenumber/resources/PhoneNumberMetadata.xml

@@ -883,7 +883,6 @@
                - XXXX (usage count as 3-digit code:usage count as 4-digit code)
                - 2646 (7:15)   - excluded
                - 3435 (39:63)  - excluded
-               - 3436 (16:54)  - excluded
                - 3454 (90:48)
                - 3455 (13:94)  - excluded
                - 3456 (3:93)   - excluded
@@ -925,7 +924,61 @@
                 36|
                 4(?:
                   [12]|
-                  [358]4
+                  3[456]|
+                  [58]4
+                )|
+                5(?:
+                  1|
+                  3[0-24-689]|
+                  8[46]
+                )|
+                6|
+                7[069]|
+                8(?:
+                  [01]|
+                  34|
+                  [578][45]
+                )
+              )
+            )
+          </leadingDigits>
+          <!-- If modified, copy this expression into the section below, minus the leading '9'. -->
+          <!-- We go to 6-digit on a case-by-case basis. Below are the prefixes we have added
+               support up to 6-digit: 9343. -->
+          <leadingDigits>
+            9(?:
+              2(?:
+                2(?:
+                  0[013-9]|
+                  [13]
+                )|
+                3(?:
+                  0[013-9]|
+                  [67]
+                )|
+                49|
+                6(?:
+                  [0136]|
+                  4[0-59]
+                )|
+                8|
+                9(?:
+                  [19]|
+                  44|
+                  7[013-9]|
+                  8[14]
+                )
+              )|
+              3(?:
+                36|
+                4(?:
+                  [12]|
+                  3(?:
+                    4|
+                    5[014]|
+                    6[1239]
+                   )|
+                  [58]4
                 )|
                 5(?:
                   1|
@@ -1005,7 +1058,8 @@
               36|
               4(?:
                 [12]|
-                [358]4
+                3[456]|
+                [58]4
               )|
               5(?:
                 1|
@@ -1021,6 +1075,54 @@
               )
             )
           </leadingDigits>
+          <leadingDigits>
+              2(?:
+                2(?:
+                  0[013-9]|
+                  [13]
+                )|
+                3(?:
+                  0[013-9]|
+                  [67]
+                )|
+                49|
+                6(?:
+                  [0136]|
+                  4[0-59]
+                )|
+                8|
+                9(?:
+                  [19]|
+                  44|
+                  7[013-9]|
+                  8[14]
+                )
+              )|
+              3(?:
+                36|
+                4(?:
+                  [12]|
+                  3(?:
+                    4|
+                    5[014]|
+                    6[1239]
+                   )|
+                  [58]4
+                )|
+                5(?:
+                  1|
+                  3[0-24-689]|
+                  8[46]
+                )|
+                6|
+                7[069]|
+                8(?:
+                  [01]|
+                  34|
+                  [578][45]
+                )
+              )
+          </leadingDigits>
           <format>$1 $2-$3</format>
         </numberFormat>
         <numberFormat pattern="(\d{4})(\d{2})(\d{4})" nationalPrefixOptionalWhenFormatting="true">
@@ -1581,7 +1683,7 @@
             5[0-25-9]|
             6[6-9]|
             7[03-9]|
-            8[17-9]|
+            8[147-9]|
             9[017-9]
           )\d{6}
         </nationalNumberPattern>
@@ -3628,18 +3730,29 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$NP $FG"
-          pattern="(8\d{2})(\d{4})(\d{4})">
+          pattern="(82\d)(\d{4})(\d{4})">
           <leadingDigits>82</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$NP $FG"
+          pattern="(800)(\d{3})">
+          <leadingDigits>800</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$NP $FG"
+          pattern="(800)(\d{2})(\d{2,4})">
+          <leadingDigits>800</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           [1-4]\d{8}|
+          800\d{3,7}|
           [89]\d{9,10}
         </nationalNumberPattern>
         <!-- Numbers are often written without the city code. -->
-        <possibleNumberPattern>\d{7,11}</possibleNumberPattern>
+        <possibleNumberPattern>\d{6,11}</possibleNumberPattern>
       </generalDesc>
       <!-- Toll-free and premium rate numbers are not available from abroad. -->
       <noInternationalDialling>
@@ -3648,9 +3761,9 @@
             [013]|
             [12]0
           )\d{8}|
+          800\d{3,7}|
           902\d{7}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{10,11}</possibleNumberPattern>
         <exampleNumber>82012345678</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
@@ -3688,7 +3801,7 @@
             )
           )\d{5}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
+        <possibleNumberPattern>\d{6,11}</possibleNumberPattern>
         <!-- Using test number for Grodno from the plan. -->
         <exampleNumber>152450911</exampleNumber>
       </fixedLine>
@@ -3713,9 +3826,9 @@
           8(?:
             0[13]|
             20\d
-          )\d{7}
+          )\d{7}|
+          800\d{3,7}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{10,11}</possibleNumberPattern>
         <exampleNumber>8011234567</exampleNumber>
       </tollFree>
       <premiumRate>
@@ -5121,8 +5234,9 @@
         <nationalNumberPattern>[24-9]\d{7,9}</nationalNumberPattern>
         <possibleNumberPattern>\d{8,10}</possibleNumberPattern>
       </generalDesc>
+      <!-- Added prefix 20 and 21 found online. -->
       <fixedLine>
-        <nationalNumberPattern>2[24-7]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>2[0-24-7]\d{6}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>22123456</exampleNumber>
       </fixedLine>
@@ -6209,10 +6323,11 @@
       </generalDesc>
       <fixedLine>
         <!-- We include the VSAT lines here. -->
+        <!-- Added prefix 23 found online. -->
         <nationalNumberPattern>
           (?:
             1\d|
-            2[014-79]|
+            2[013-79]|
             3[0-8]|
             4[0135689]
           )\d{6}|
@@ -6634,7 +6749,7 @@
           6(?:
             0[0-8]|
             [12-79]\d|
-            8[01]
+            8[017]
           )\d{6}
         </nationalNumberPattern>
         <exampleNumber>650123456</exampleNumber>
@@ -6692,9 +6807,15 @@
     <!-- Spain -->
     <territory id="ES" countryCode="34" internationalPrefix="00" mobileNumberPortableRegion="true">
       <references>
-        <sourceUrl>http://www.mityc.es/telecomunicaciones/es-ES/Servicios/Numeracion/Paginas/Plan.aspx</sourceUrl>
+        <sourceUrl>
+          http://www.minetur.gob.es/telecomunicaciones/es-ES/Servicios/Numeracion/Documents/14-10_Descripcion_PNN.pdf
+        </sourceUrl>
       </references>
       <availableFormats>
+        <numberFormat pattern="([89]00)(\d{3})(\d{3})">
+          <leadingDigits>[89]00</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="([5-9]\d{2})(\d{2})(\d{2})(\d{2})">
           <leadingDigits>
             [568]|
@@ -9143,7 +9264,7 @@
         <nationalNumberPattern>
           (?:
             [23]\d|
-            5[78]
+            58
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
@@ -9152,8 +9273,9 @@
       <mobile>
         <nationalNumberPattern>
           (?:
-            5[1-69]\d|
+            5[1-79]\d|
             6\d{2}|
+            8[4-79]\d|
             9(?:
               0[1-9]|
               [1-8]\d
@@ -9413,9 +9535,13 @@
         <!-- The prefix 31 seems to be also used, based on online searches. -->
         <nationalNumberPattern>
           (?:
-            3[1-9]|
-            4\d
-          )\d{6}
+            3[1-9]\d|
+            4\d{2}|
+            9(?:
+              8[0-35]|
+              9[5-9]
+            )
+          )\d{5}
         </nationalNumberPattern>
         <exampleNumber>34101234</exampleNumber>
       </mobile>
@@ -10206,7 +10332,7 @@
       </uan>
     </territory>
 
-    <!-- India -->
+   <!-- India -->
     <!-- Note that several changes in area codes have occurred since the numbering plan was released
          - fixed line changes are notified on the http://www.bsnl.co.in website. Area codes can be
          verified here at http://dq.ndc.bsnl.co.in/bsnl-web/stdSearch.seam. -->
@@ -10223,12 +10349,10 @@
         <numberFormat pattern="(\d{5})(\d{5})">
           <leadingDigits>
             7(?:
-              0[2-9]|
-              2[012579]|
-              3[057-9]|
+              [0257]|
+              3[0157-9]|
               4[0-389]|
               6[0-35-9]|
-              [57]|
               8[0-79]
             )|
             8(?:
@@ -10238,36 +10362,32 @@
               3[0-57-9]|
               [45]|
               6[02457-9]|
-              7[1-69]|
-              8[0124-9]|
+              7[01-69]|
+              8[0-24-9]|
               9[02-9]
             )|
             9
           </leadingDigits>
           <leadingDigits>
             7(?:
-              0(?:
-                2[2-9]|
-                [3-8]|
-                9[0-8]
-              )|
+              0|
               2(?:
-                0[024-9]|
-                19|
-                2[012]|
-                5[09]|
-                7[5-8]|
+                [02379]|
+                [14][017-9]|
+                5[047-9]|
+                6[015-9]|
+                8[0-59]|
                 9[389]
               )|
               3(?:
-                0[1-9]|
-                [58]|
+                [058]|
+                10|
                 7[3679]|
                 9[689]
               )|
               4(?:
                 0[1-9]|
-                1[15-9]|
+                1[015-9]|
                 [29][89]|
                 39|
                 8[389]
@@ -10279,7 +10399,7 @@
                 9[7-9]
               )|
               6(?:
-                0[0-27]|
+                0[0-47]|
                 1[0-257-9]|
                 2[0-4]|
                 3[19]|
@@ -10291,10 +10411,7 @@
                 [1-79]|
                 8[1-9]
               )|
-              8(?:
-                [0-7]|
-                9[013-9]
-              )
+              8[0-79]
             )|
             8(?:
               0(?:
@@ -10302,9 +10419,8 @@
                 6[67]
               )|
               1(?:
-                [02-589]|
-                1[0135-9]|
-                7[0-79]
+                [02-57-9]|
+                1[0135-9]
               )|
               2(?:
                 [236-9]|
@@ -10316,7 +10432,10 @@
               )|
               [45]|
               6[02457-9]|
-              7[1-69]|
+              7(?:
+                07|
+                [1-69]
+              )|
               8(?:
                 [0-26-9]|
                 44|
@@ -10713,34 +10832,31 @@
         <!-- 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: 7202, 7601,
-             768[567], 7695, 8299, 8309. New prefixes were also added based on the document
-             provided from mobile carriers: https://github.com/googlei18n/libphonenumber/issues/260 -->
+             land-line or mobile, since the ranges overlap. Extra prefixes added: 7601, 768[567],
+             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(?:
-                2[2-9]|
-                [3-8]\d|
-                9[0-8]
-              )|
+              0\d{2}|
               2(?:
-                0[024-9]|
-                19|
-                2[012]|
-                5[09]|
-                7[5-8]|
+                [02379]\d|
+                [14][017-9]|
+                5[047-9]|
+                6[015-9]|
+                8[0-59]|
                 9[389]
               )|
               3(?:
-                0[1-9]|
-                [58]\d|
+                [058]\d|
+                10|
                 7[3679]|
                 9[689]
               )|
               4(?:
                 0[1-9]|
-                1[15-9]|
+                1[015-9]|
                 [29][89]|
                 39|
                 8[389]
@@ -10752,7 +10868,7 @@
                 9[7-9]
               )|
               6(?:
-                0[0127]|
+                0[0-47]|
                 1[0-257-9]|
                 2[0-4]|
                 3[19]|
@@ -10764,10 +10880,7 @@
                 [1-79]\d|
                 8[1-9]
               )|
-              8(?:
-                [0-7]\d|
-                9[013-9]
-              )
+              8[0-79]\d
             )|
             8(?:
               0(?:
@@ -10775,9 +10888,8 @@
                 6[67]
               )|
               1(?:
-                [02-589]\d|
-                1[0135-9]|
-                7[0-79]
+                [02-57-9]\d|
+                1[0135-9]
               )|
               2(?:
                 [236-9]\d|
@@ -10789,7 +10901,10 @@
               )|
               [45]\d{2}|
               6[02457-9]\d|
-              7[1-69]\d|
+              7(?:
+                07|
+                [1-69]\d
+              )|
               8(?:
                 [0-26-9]\d|
                 44|
@@ -11817,7 +11932,7 @@
           7(?:
             55|
             7[025-9]|
-            8[05-9]|
+            8[015-9]|
             9[0-25-9]
           )\d{6}
         </nationalNumberPattern>
@@ -15777,10 +15892,11 @@
         </nationalNumberPattern>
         <exampleNumber>50123456</exampleNumber>
       </fixedLine>
+      <!-- Added prefix 80 as per IR21 from carrier. -->
       <mobile>
         <nationalNumberPattern>
           (?:
-            8[689]|
+            8[0689]|
             9[013-9]
           )\d{6}
         </nationalNumberPattern>
@@ -16233,6 +16349,7 @@
         </nationalNumberPattern>
         <exampleNumber>2012345</exampleNumber>
       </fixedLine>
+      <!-- Added prefix 580 and 581 as per information from the carrier. -->
       <mobile>
         <nationalNumberPattern>
           5(?:
@@ -16245,7 +16362,7 @@
             )|
             7\d{2}|
             8(?:
-              [2568]\d|
+              [0-2568]\d|
               7[15-8]
             )|
             9[0-8]\d
@@ -16443,8 +16560,8 @@
         <numberFormat pattern="(\d{3})(\d{3})(\d{4})">
           <leadingDigits>
             [2467]|
-            3[12457-9]|
-            5[89]|
+            3[0-2457-9]|
+            5[089]|
             8[02-9]|
             9[0-35-9]
           </leadingDigits>
@@ -16465,8 +16582,8 @@
           <leadingDigits>
             1(?:
               [2467]|
-              3[12457-9]|
-              5[89]|
+              3[0-2457-9]|
+              5[089]|
               8[2-9]|
               9[1-35-9]
             )
@@ -16481,6 +16598,7 @@
       </generalDesc>
       <fixedLine>
         <!-- http://en.wikipedia.org/wiki/Area_codes_in_Mexico_by_code -->
+        <!-- Also covering fixed satellite service numbers (prefixes: 200 and 201). -->
         <nationalNumberPattern>
           (?:
             33|
@@ -16489,6 +16607,7 @@
           )\d{8}|
           (?:
             2(?:
+              0[01]|
               2[2-9]|
               3[1-35-8]|
               4[13-9]|
@@ -16552,6 +16671,7 @@
         <exampleNumber>2221234567</exampleNumber>
       </fixedLine>
       <mobile>
+      <!-- Also covering fixed satellite service numbers (prefixes: 200 and 201). -->
         <nationalNumberPattern>
           1(?:
             (?:
@@ -16625,10 +16745,25 @@
         <exampleNumber>12221234567</exampleNumber>
       </mobile>
       <tollFree>
-        <nationalNumberPattern>800\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          8(?:
+            00|
+            88
+          )\d{7}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>8001234567</exampleNumber>
       </tollFree>
+      <sharedCost>
+        <nationalNumberPattern>300\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>3001234567</exampleNumber>
+      </sharedCost>
+      <personalNumber>
+        <nationalNumberPattern>500\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <exampleNumber>5001234567</exampleNumber>
+      </personalNumber>
       <premiumRate>
         <nationalNumberPattern>900\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
@@ -21048,8 +21183,17 @@
         <nationalNumberPattern>22\d{5}</nationalNumberPattern>
         <exampleNumber>2221234</exampleNumber>
       </fixedLine>
+      <!-- Added prefix 90 per IR21 from the carrier -->
       <mobile>
-        <nationalNumberPattern>9[89]\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>
+          9(?:
+            0(?:
+              0[5-9]|
+              [1-9]\d
+            )|
+            [89]\d{2}
+          )\d{3}
+        </nationalNumberPattern>
         <exampleNumber>9812345</exampleNumber>
       </mobile>
     </territory>
@@ -21266,32 +21410,7 @@
         <exampleNumber>08001234</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
-        <nationalNumberPattern>
-          2(?:
-            2(?:
-              0[07]|
-              [13]7|
-              2[57]
-            )|
-            3(?:
-              0[34]|
-              [1278]3|
-              3[23]|
-              [46][34]
-            )|
-            (?:
-              40[4-69]|
-              67
-            )|
-            5(?:
-              0[5-7]|
-              1[6-9]|
-              [23][78]|
-              48|
-              5[01]
-            )
-          )\d{4}
-        </nationalNumberPattern>
+        <nationalNumberPattern>2[2-5]\d{6}</nationalNumberPattern>
         <exampleNumber>22171234</exampleNumber>
       </fixedLine>
       <mobile>
@@ -21436,14 +21555,12 @@
         <!-- Sotel Tchad "SALAM" (77 XX XX XX) is classified as a fixed operator in the plan, but it
              also says numbers starting with 7 are mobile numbers. Putting under mobile for now.
              Also adding 6[028] and 63[5-9] which are operated by Airtel. -->
+        <!-- Adding entire 9 prefix based on information from carrier. -->
         <nationalNumberPattern>
           (?:
             6[02368]\d|
             77\d|
-            9(?:
-              5[0-4]|
-              9\d
-            )
+            9\d{2}
           )\d{5}
         </nationalNumberPattern>
         <exampleNumber>63012345</exampleNumber>
@@ -22076,8 +22193,9 @@
         <nationalNumberPattern>
           868(?:
             2(?:
-              [03]1|
-              2[1-5]
+              01|
+              2[1-5]|
+              3[1-5]
             )|
             6(?:
               0[79]|
@@ -24102,7 +24220,12 @@
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>2696[0-4]\d{4}</nationalNumberPattern>
+        <nationalNumberPattern>
+          269(?:
+              6[0-4]|
+              50
+             )\d{4}
+        </nationalNumberPattern>
         <exampleNumber>269601234</exampleNumber>
       </fixedLine>
       <mobile>
@@ -24271,7 +24394,7 @@
       </references>
       <availableFormats>
         <!-- One-digit area codes -->
-        <numberFormat pattern="([49])(\d{3})(\d{2,5})">
+        <numberFormat pattern="([49])(\d{3})(\d{2,4})">
           <leadingDigits>
             4|
             9[2-9]
@@ -24279,11 +24402,8 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <!-- Mobile numbers -->
-        <numberFormat pattern="([179]\d)(\d{3})(\d{3,4})">
-          <leadingDigits>
-            [19]1|
-            7
-          </leadingDigits>
+        <numberFormat pattern="(7\d)(\d{3})(\d{3,4})">
+          <leadingDigits>7</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(86\d{2})(\d{3})(\d{3})">
@@ -24294,21 +24414,26 @@
         <numberFormat pattern="([2356]\d{2})(\d{3,5})">
           <leadingDigits>
             2(?:
-              [278]|
               0[45]|
-              [49]8
+              2[278]|
+              [49]8|
+              [78]
             )|
             3(?:
               08|
               17|
               3[78]|
-              [78]
+              7[1569]|
+              8[37]|
+              98
             )|
             5[15][78]|
             6(?:
               [29]8|
-              37|
-              [68][78]
+              [38]7|
+              6[78]|
+              75|
+              [89]8
             )
           </leadingDigits>
           <format>$1 $2</format>
@@ -24316,23 +24441,13 @@
         <numberFormat pattern="(\d{3})(\d{3})(\d{3,4})">
           <leadingDigits>
             2(?:
-              [278]|
-              0[45]|
-              48
-            )|
-            3(?:
-              08|
-              17|
-              3[78]|
-              [78]
-            )|
-            5[15][78]|
-            6(?:
-              [29]8|
-              37|
-              [68][78]
+              1[39]|
+              2[0157]|
+              6[14]|
+              7[35]|
+              84
             )|
-            80
+            329
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -24340,54 +24455,17 @@
         <numberFormat pattern="([1-356]\d)(\d{3,5})">
           <leadingDigits>
             1[3-9]|
-            2(?:
-              [1-469]|
-              0[0-35-9]|
-              [45][0-79]
-            )|
-            3(?:
-              0[0-79]|
-              1[0-689]|
-              [24-69]|
-              3[0-69]
-            )|
-            5(?:
-              [02-46-9]|
-              [15][0-69]
-            )|
-            6(?:
-              [0145]|
-              [29][0-79]|
-              3[0-689]|
-              [68][0-69]
-            )
+            2[0569]|
+            3[0-69]|
+            5[05689]|
+            6[0-46-9]
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <numberFormat pattern="([1-356]\d)(\d{3})(\d{3})">
+        <numberFormat pattern="([235]\d)(\d{3})(\d{3,4})">
           <leadingDigits>
-            1[3-9]|
-            2(?:
-              [1-469]|
-              0[0-35-9]|
-              [45][0-79]
-            )|
-            3(?:
-              0[0-79]|
-              1[0-689]|
-              [24-69]|
-              3[0-69]
-            )|
-            5(?:
-              [02-46-9]|
-              [15][0-69]
-            )|
-            6(?:
-              [0145]|
-              [29][0-79]|
-              3[0-689]|
-              [68][0-69]
-            )
+            [23]9|
+            54
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -24405,24 +24483,16 @@
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <numberFormat pattern="([25]\d{3})(\d{3})(\d{3})">
-          <leadingDigits>
-            (?:
-              25|
-              54
-            )8
-          </leadingDigits>
-          <leadingDigits>
-            258[23]|
-            5483
-          </leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
         <!-- VOIP numbers -->
         <numberFormat pattern="(8\d{3})(\d{6})">
           <leadingDigits>86</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <!-- Tollfree Numbers -->
+        <numberFormat pattern="(80\d)(\d{3})(\d{4})">
+          <leadingDigits>80</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <!-- A complicated nationalNumberPattern is necessary here, since the numbers are extremely
@@ -24430,75 +24500,118 @@
         <nationalNumberPattern>
           2(?:
             [012457-9]\d{3,8}|
-            6\d{3,6}
+            6(?:
+               [14]\d{7}|
+               \d{4}
+            )
           )|
-          [13-79]\d{4,8}|
+          [13-79]\d{4,9}|
           8[06]\d{8}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{3,10}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <!-- Numbering is grouped by subscriber-number length. -->
+        <!-- The new organisation is used for both formatting and validation
+             1. First we have 3 digit area code with SN(3,4,5).
+             2. Then we have 3 digit area code with SN(6,7).
+             3. Then we have 2 digit area code with SN(3,4,5).
+             4. Then we have 2 digit area code with SN(6,7).
+             5. Then we have 4 digit area code.
+             6. Then we have 1 digit area code with SN(6,7). -->
         <nationalNumberPattern>
           (?:
-            1[3-9]|
             2(?:
-              0[45]|
-              [16]|
-              2[28]|
-              [49]8?|
-              58[23]|
-              7[246]|
-              8[1346-9]
+               0(?:
+                  4\d|
+                  5\d{2}
+               )|
+               2[278]\d|
+               48\d|
+               7(?:
+                 [1-7]\d|
+                 [089]\d{2}
+               )|
+               8(?:
+                 [2-57-9]|
+                 [146]\d{2}
+               )|
+               98
             )|
             3(?:
-              08?|
-              17?|
-              3[78]|
-              [2456]|
-              7[1569]|
-              8[379]
-            )|
-            5(?:
-              [07-9]|
-              1[78]|
-              483|
-              5(?:
-                7?|
-                8
-              )
+               08|
+               17|
+               3[78]|
+               7(?:
+                 [19]|
+                 [56]\d
+               )|
+               8[37]|
+               98
             )|
+            5[15][78]|
             6(?:
-              0|
-              28|
-              37?|
-              [45][68][78]|
-              98?
-            )|
-            848
-          )\d{3,6}|
+               28\d{2}|
+               [36]7|
+               75\d|
+               [69]8|
+               8(?:
+                  7\d|
+                  8
+               )
+             )
+           )\d{3}|
           (?:
             2(?:
-              27|
-              5|
-              7[135789]|
-              8[25]
+               1[39]|
+               2[0157]|
+               6[14]|
+               7[35]|
+               84
             )|
-            3[39]|
-            5[1-46]|
-            6[126-8]
-          )\d{4,6}|
-          2(?:
-            (?:
-              0|
-              70
-            )\d{5,6}|
-            2[05]\d{7}
-          )|
+            329
+          )\d{7}|
           (?:
-            4\d|
-            9[2-8]
-          )\d{4,7}
+            1(?:
+               3\d{2}|
+               9\d|
+               [4-8]
+            )|
+            2(?:
+               0\d{2}|
+               [569]\d
+            )|
+            3(?:
+               [26]|
+               [013459]\d
+            )|
+            5(?:
+               0|
+               5\d{2}|
+               [689]\d
+            )|
+            6(?:
+               [39]|
+               [01246]\d|
+               [78]\d{2}
+            )
+         )\d{3}|
+         (?:
+           29\d|
+           39|
+           54
+         )\d{6}|
+         (?:
+           (?:
+             25|
+             54
+           )83|
+           2582\d
+         )\d{3}|
+         (?:
+           4\d{6,7}|
+           9[2-9]\d{4,5}
+         )
         </nationalNumberPattern>
         <exampleNumber>1312345</exampleNumber>
       </fixedLine>
@@ -24506,13 +24619,9 @@
            also being used by the carriers as mobile prefixes. -->
       <mobile>
         <nationalNumberPattern>
-          7[1378]\d{7}|
-          86(?:
-            22|
-            44
-          )\d{6}
+          7[1378]\d{7}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>711234567</exampleNumber>
       </mobile>
       <tollFree>
@@ -24526,6 +24635,7 @@
           86(?:
             1[12]|
             30|
+            44|
             55|
             77|
             8[367]|