From 2515304edd3bc99f2376c1851bd2cf6d2f344985 Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Tue, 30 Jul 2024 18:26:15 +0100
Subject: [PATCH] Merge metadata changes from upstream 8.13.42

Includes changes in resources/ up to and including
upstream commit d23d53f43a18:
  "[maven-release-plugin] prepare release v8.13.42"
---
 resources/PhoneNumberMetadata.xml | 68 ++++++++++++++++++-------------
 resources/ShortNumberMetadata.xml | 26 +++++++-----
 resources/carrier/en/237.txt      |  2 +-
 resources/carrier/en/591.txt      | 52 ++++++++---------------
 resources/carrier/en/592.txt      |  1 +
 resources/carrier/en/61.txt       |  4 ++
 resources/carrier/en/65.txt       |  1 +
 resources/carrier/en/992.txt      |  8 ++++
 resources/geocoding/en/86.txt     |  1 +
 resources/geocoding/zh/86.txt     |  1 +
 10 files changed, 88 insertions(+), 76 deletions(-)

diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index d20508e53..4d501ee19 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -4342,7 +4342,7 @@
       <availableFormats>
         <numberFormat pattern="(\d)(\d{7})" carrierCodeFormattingRule="$NP$CC $FG">
           <leadingDigits>
-            [23]|
+            [235]|
             4[46]
           </leadingDigits>
           <format>$1 $2</format>
@@ -4358,10 +4358,11 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
+          8001\d{5}|
           (?:
-            [2-467]\d\d|
-            8001
-          )\d{5}
+            [2-467]\d|
+            50
+          )\d{6}
         </nationalNumberPattern>
       </generalDesc>
       <noInternationalDialling>
@@ -4434,6 +4435,11 @@
         <exampleNumber>800171234</exampleNumber>
         <nationalNumberPattern>8001[07]\d{4}</nationalNumberPattern>
       </tollFree>
+      <voip>
+        <possibleLengths national="8" localOnly="7"/>
+        <exampleNumber>50123456</exampleNumber>
+        <nationalNumberPattern>50\d{6}</nationalNumberPattern>
+      </voip>
     </territory>
 
     <!-- Caribbean Netherlands (BQ) -->
@@ -12414,15 +12420,11 @@
         <possibleLengths national="7"/>
         <exampleNumber>6091234</exampleNumber>
         <nationalNumberPattern>
+          510\d{4}|
           (?:
-            510|
-            6\d\d|
-            7(?:
-              [0135]\d|
-              2[0-8]|
-              4[0-24-9]
-            )
-          )\d{4}
+            6\d|
+            7[0-5]
+          )\d{5}
         </nationalNumberPattern>
       </mobile>
       <tollFree>
@@ -17550,7 +17552,7 @@
         <numberFormat pattern="(\d{2})(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG"
                       carrierCodeFormattingRule="$NP$CC-$FG">
           <leadingDigits>
-            60|
+            [36]0|
             8
           </leadingDigits>
           <format>$1-$2-$3</format>
@@ -17686,7 +17688,7 @@
           )|
           (?:
             00368|
-            80
+            [38]0
           )\d{7}
         </nationalNumberPattern>
       </tollFree>
@@ -18220,7 +18222,7 @@
         </numberFormat>
         <!-- Format for UAN numbers. -->
         <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>30[013-9]</leadingDigits>
+          <leadingDigits>30[0135-9]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
         <!-- Format for mobile numbers. -->
@@ -18253,19 +18255,14 @@
       </fixedLine>
       <!-- Adding 202[89], 205[289], 207[68] and 209[135-7] from numbers found online. -->
       <mobile>
-        <possibleLengths national="9,10"/>
+        <possibleLengths national="10"/>
         <exampleNumber>2023123456</exampleNumber>
         <nationalNumberPattern>
+          208[78]\d{6}|
           (?:
-            20(?:
-              [23579]\d|
-              88
-            )|
-            30(?:
-              2\d|
-              4
-            )
-          )\d{6}
+            20[23579]|
+            30[24]
+          )\d{7}
         </nationalNumberPattern>
       </mobile>
       <!-- The Lonely Planet says that newer WIN phones (fixed phones without a physical landline)
@@ -21607,6 +21604,7 @@
         <possibleLengths national="8,9" localOnly="6,7"/>
         <exampleNumber>323856789</exampleNumber>
         <nationalNumberPattern>
+          4270\d{4}|
           (?:
             3(?:
               2[0-36-9]|
@@ -25597,9 +25595,8 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          800\d{4}|
           (?:
-            [249]\d|
+            [2489]\d|
             64
           )\d{5}
         </nationalNumberPattern>
@@ -25623,6 +25620,11 @@
         <exampleNumber>8000000</exampleNumber>
         <nationalNumberPattern>800[08]\d{3}</nationalNumberPattern>
       </tollFree>
+      <premiumRate>
+        <possibleLengths national="7"/>
+        <exampleNumber>8512345</exampleNumber>
+        <nationalNumberPattern>85\d{5}</nationalNumberPattern>
+      </premiumRate>
       <!-- Includes prefix 971,95[0-9] which is assigned to Audiotext ,International Audiotext
            Services. -->
       <voip>
@@ -26050,7 +26052,7 @@
         <exampleNumber>81234567</exampleNumber>
         <nationalNumberPattern>
           8(?:
-            09[0-6]|
+            09[0-68]|
             95[0-2]
           )\d{4}|
           (?:
@@ -27557,7 +27559,12 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{4})(\d)(\d{4})">
-          <leadingDigits>3[1-5]</leadingDigits>
+          <leadingDigits>
+            3(?:
+              [1245]|
+              3[12]
+            )
+          </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{4})">
@@ -27597,6 +27604,7 @@
         <exampleNumber>917123456</exampleNumber>
         <nationalNumberPattern>
           (?:
+            33[03-9]|
             4(?:
               1[18]|
               4[02-479]
@@ -30143,6 +30151,7 @@
           340(?:
             2(?:
               0\d|
+              10|
               2[06-8]|
               4[49]|
               77
@@ -30184,6 +30193,7 @@
           340(?:
             2(?:
               0\d|
+              10|
               2[06-8]|
               4[49]|
               77
diff --git a/resources/ShortNumberMetadata.xml b/resources/ShortNumberMetadata.xml
index 819b7f921..898db7ddd 100644
--- a/resources/ShortNumberMetadata.xml
+++ b/resources/ShortNumberMetadata.xml
@@ -640,7 +640,7 @@
     <territory id="AT">
       <generalDesc>
         <nationalNumberPattern>
-          [168]\d\d(?:
+          [1268]\d\d(?:
             \d(?:
               \d{2}
             )?
@@ -671,6 +671,7 @@
             )
           )|
           (?:
+            220|
             61|
             8108[1-3]
           )0
@@ -695,11 +696,14 @@
       <!-- Added yesss! numbers 810810 , 810820 and 810830 based on their website. 
            Added Georg number 610 based on their website. -->
       <carrierSpecific>
-        <possibleLengths national="3,6"/>
+        <possibleLengths national="3,4,6"/>
         <exampleNumber>610</exampleNumber>
         <nationalNumberPattern>
-          610|
-          810\d{3}
+          (?:
+            220|
+            810\d\d
+          )\d|
+          610
         </nationalNumberPattern>
       </carrierSpecific>
       <emergency>
@@ -3591,16 +3595,12 @@
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_germany -->
     <territory id="DE">
       <generalDesc>
-        <nationalNumberPattern>
-          1\d\d(?:
-            \d{2,3}
-          )?
-        </nationalNumberPattern>
+        <nationalNumberPattern>[13]\d{2,5}</nationalNumberPattern>
       </generalDesc>
       <!-- 118xx short numbers are used for directory services and 1180xx are used for call
            connect services. -->
       <shortCode>
-        <possibleLengths national="3,5,6"/>
+        <possibleLengths national="[3-6]"/>
         <exampleNumber>110</exampleNumber>
         <nationalNumberPattern>
           11(?:
@@ -3614,6 +3614,7 @@
             )|
             800\d
           )|
+          3311|
           118\d\d
         </nationalNumberPattern>
       </shortCode>
@@ -3627,6 +3628,11 @@
           )
         </nationalNumberPattern>
       </tollFree>
+      <carrierSpecific>
+        <possibleLengths national="4"/>
+        <exampleNumber>3310</exampleNumber>
+        <nationalNumberPattern>331\d</nationalNumberPattern>
+      </carrierSpecific>
       <emergency>
         <possibleLengths national="3"/>
         <exampleNumber>110</exampleNumber>
diff --git a/resources/carrier/en/237.txt b/resources/carrier/en/237.txt
index f1e67c94c..4bdeaa5c7 100644
--- a/resources/carrier/en/237.txt
+++ b/resources/carrier/en/237.txt
@@ -33,6 +33,6 @@
 237685|NEXTTEL
 237686|Orange
 237687|Orange
-237688|NEXTTEL
+237688|Orange
 237689|NEXTTEL
 23769|Orange
diff --git a/resources/carrier/en/591.txt b/resources/carrier/en/591.txt
index 412555e25..ec6791e64 100644
--- a/resources/carrier/en/591.txt
+++ b/resources/carrier/en/591.txt
@@ -12,40 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-59170|Nuevatel
-591710|Entel
-591711|Entel
-591712|Entel
-591714|Entel
-591715|Entel
-591716|Entel
-591717|Entel
-591718|Entel
-591719|Entel
-59172|Entel
-591730|Entel
-591731|Entel
-591732|Entel
-591733|Entel
-5917342|Entel
-5917343|Entel
-5917344|Entel
-5917346|Entel
-5917347|Entel
-5917348|Entel
-5917349|Entel
-5917353|Entel
-591736|Entel
-5917370|Entel
-5917371|Entel
-5917372|Entel
-5917373|Entel
-5917374|Entel
-5917375|Entel
-5917377|Entel
-591738|Entel
+5916|Tigo
+5917|Tigo
 59174|Entel
-59175|Tigo
-59176|Tigo
-59177|Tigo
-59179|Nuevatel
+5917419|Nuevatel
+5917429|Nuevatel
+5917438|Nuevatel
+5917439|Nuevatel
+5917449|Nuevatel
+5917459|Nuevatel
+5917474|Nuevatel
+5917479|Nuevatel
+5917487|Nuevatel
+5917488|Nuevatel
+5917489|Nuevatel
+5917497|Nuevatel
+5917498|Nuevatel
+5917499|Nuevatel
diff --git a/resources/carrier/en/592.txt b/resources/carrier/en/592.txt
index 0c453bb05..06f436a80 100644
--- a/resources/carrier/en/592.txt
+++ b/resources/carrier/en/592.txt
@@ -59,6 +59,7 @@
 592726|GTT
 592727|GTT
 592728|GTT
+592729|GTT
 59273|E-Networks
 59274|Digicel Guyana
 592740|E-Networks
diff --git a/resources/carrier/en/61.txt b/resources/carrier/en/61.txt
index cb022515f..eb3514bea 100644
--- a/resources/carrier/en/61.txt
+++ b/resources/carrier/en/61.txt
@@ -120,6 +120,10 @@
 61487|Telstra
 61488|Telstra
 614888|My Number
+614890|Optus
+614891|Optus
+614892|Optus
+614893|Optus
 6148984|Victorian Rail Track
 6148985|MessageBird
 614899|Pivotel Satellite
diff --git a/resources/carrier/en/65.txt b/resources/carrier/en/65.txt
index f72e7a2f7..9723c23bd 100644
--- a/resources/carrier/en/65.txt
+++ b/resources/carrier/en/65.txt
@@ -65,6 +65,7 @@
 658094|M1
 658095|SingTel
 658096|Simba
+658098|Simba
 6581|StarHub
 65810|M1
 65812|SingTel
diff --git a/resources/carrier/en/992.txt b/resources/carrier/en/992.txt
index 013cee6f3..9c724c880 100644
--- a/resources/carrier/en/992.txt
+++ b/resources/carrier/en/992.txt
@@ -26,6 +26,14 @@
 99217|Babilon-M
 9922|O-Mobile
 99230|O-Mobile
+992330|ZET-MOBILE
+992333|ZET-MOBILE
+992334|ZET-MOBILE
+992335|ZET-MOBILE
+992336|ZET-MOBILE
+992337|ZET-MOBILE
+992338|ZET-MOBILE
+992339|ZET-MOBILE
 99240|ZET-MOBILE
 99241|Megafon
 992440|ZET-MOBILE
diff --git a/resources/geocoding/en/86.txt b/resources/geocoding/en/86.txt
index 6cfdb4caa..0640b5f45 100644
--- a/resources/geocoding/en/86.txt
+++ b/resources/geocoding/en/86.txt
@@ -87615,6 +87615,7 @@
 861709997|Zhongshan, Guangdong
 861709998|Shenzhen, Guangdong
 861709999|Guangzhou, Guangdong
+86173|Beijing
 8617600|Beijing
 8617601|Beijing
 86176012|Shanghai
diff --git a/resources/geocoding/zh/86.txt b/resources/geocoding/zh/86.txt
index b9aba33e6..0a7562aeb 100644
--- a/resources/geocoding/zh/86.txt
+++ b/resources/geocoding/zh/86.txt
@@ -87615,6 +87615,7 @@
 861709997|广东省中山市
 861709998|广东省深圳市
 861709999|广东省广州市
+86173|北京市
 8617600|北京市
 8617601|北京市
 86176012|上海市