From 989ca0a87b7d880ee2036f9aab08834103811ee7 Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Fri, 3 May 2024 06:31:00 +0100
Subject: [PATCH] Merge metadata changes from upstream 8.13.36

Includes changes in resources/ up to and including
upstream commit 1035cc6c80de:
  "[maven-release-plugin] prepare release v8.13.36"
---
 resources/PhoneNumberMetadata.xml | 89 +++++++++++++++++--------------
 resources/carrier/en/41.txt       |  4 ++
 resources/carrier/en/592.txt      |  3 +-
 resources/carrier/en/65.txt       |  3 ++
 resources/carrier/en/677.txt      |  2 +
 resources/carrier/en/992.txt      |  1 +
 resources/carrier/en/995.txt      | 13 +++--
 resources/geocoding/en/1.txt      |  4 ++
 resources/timezones/map_data.txt  |  4 +-
 9 files changed, 76 insertions(+), 47 deletions(-)

diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index 3c04826b8..d5a40e873 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -1435,7 +1435,6 @@
         <possibleLengths national="10" localOnly="[6-8]"/>
         <exampleNumber>1123456789</exampleNumber>
         <nationalNumberPattern>
-          3888[013-9]\d{5}|
           3(?:
             7(?:
               1[15]|
@@ -1576,7 +1575,8 @@
                 0[45]|
                 [17][2-6]|
                 3[4-6]|
-                [58][3-6]
+                5[3-6]|
+                8[3-68]
               )
             )
           )\d{6}|
@@ -1714,17 +1714,14 @@
             7(?:
               1[15]|
               81
-            )[46]|
+            )|
             8(?:
-              (?:
-                21|
-                4[16]|
-                69|
-                9[12]
-              )[46]|
-              88[013-9]
+              21|
+              4[16]|
+              69|
+              9[12]
             )
-          )\d{5}|
+          )[46]\d{5}|
           9(?:
             2(?:
               657|
@@ -1852,7 +1849,8 @@
                   0[45]|
                   [17][2-6]|
                   3[4-6]|
-                  [58][3-6]
+                  5[3-6]|
+                  8[3-68]
                 )
               )
             )
@@ -5014,7 +5012,7 @@
             6(?:
               2[1-35]|
               5[149]|
-              8[067]
+              8[013467]
             )
           )\d{4}
         </nationalNumberPattern>
@@ -5053,8 +5051,8 @@
         <nationalNumberPattern>
           79(?:
             1(?:
-              [01]\d|
-              2[0-8]
+              [0-2]\d|
+              3[0-3]
             )|
             2[0-7]\d
           )\d{3}
@@ -5865,7 +5863,12 @@
       <mobile>
         <possibleLengths national="9"/>
         <exampleNumber>781234567</exampleNumber>
-        <nationalNumberPattern>7[35-9]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            6[89]|
+            7[235-9]
+          )\d{7}
+        </nationalNumberPattern>
       </mobile>
       <!-- https://www.eofcom.admin.ch/eofcom/public/listEofcom_e164Allocated.do -->
       <pager>
@@ -10345,12 +10348,12 @@
          as this breaks parsing (it treats all leading zeros as national prefixes. -->
     <!-- http://www.itu.int/oth/T020200004E/en -->
     <!-- http://www.arcep.ga -->
-    <territory id="GA" countryCode="241" internationalPrefix="00"
+    <territory id="GA" countryCode="241" internationalPrefix="00" nationalPrefix="0"
                nationalPrefixForParsing="0(11\d{6}|60\d{6}|61\d{6}|6[256]\d{6}|7[467]\d{6})"
                nationalPrefixTransformRule="$1">
       <availableFormats>
         <!-- If no leading zero was supplied, format with the national prefix. -->
-        <numberFormat pattern="(\d)(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="0$FG">
+        <numberFormat pattern="(\d)(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>[2-7]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
@@ -10360,11 +10363,8 @@
           <format>$1 $2 $3 $4</format>
         </numberFormat>
         <!-- Even in new way of dialling, 0 is mandatory when dialling domestically. -->
-        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="0$FG">
-          <leadingDigits>
-            11|
-            [67]
-          </leadingDigits>
+        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>[167]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
@@ -11166,14 +11166,15 @@
                   0\d|
                   11|
                   22|
-                  33|
+                  3[0-6]|
                   44|
                   5[05]|
                   77|
                   88|
                   9[09]
                 )|
-                111
+                111|
+                77\d
               )|
               1(?:
                 1(?:
@@ -11182,14 +11183,16 @@
                 )|
                 4\d\d
               )|
-              (?:
-                44|
-                6[89]
-              )\d\d|
+              [23]555|
+              4(?:
+                4\d\d|
+                555
+              )|
               5(?:
                 [0157-9]\d\d|
                 200
               )|
+              6[89]\d\d|
               7(?:
                 [0147-9]\d\d|
                 5(?:
@@ -11202,7 +11205,10 @@
                   [018]\d|
                   2[0-4]
                 )|
-                58[89]|
+                5(?:
+                  55|
+                  8[89]
+                )|
                 8(?:
                   55|
                   88
@@ -12420,8 +12426,8 @@
             6\d\d|
             7(?:
               [01]\d|
-              2[1256]|
-              3[12]|
+              2[0-256]|
+              3[0-2]|
               49
             )
           )\d{4}
@@ -21112,7 +21118,8 @@
             )|
             4(?:
               [013568]\d|
-              2[4-8]
+              2[4-8]|
+              71
             )|
             54(?:
               [3-5]\d|
@@ -25613,6 +25620,7 @@
       <availableFormats>
         <numberFormat pattern="(\d{2})(\d{5})">
           <leadingDigits>
+            6[89]|
             7|
             8[4-9]|
             9(?:
@@ -25625,10 +25633,8 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          (?:
-            [1-6]|
-            [7-9]\d\d
-          )\d{4}
+          [6-9]\d{6}|
+          [1-6]\d{4}
         </nationalNumberPattern>
       </generalDesc>
       <!-- Although not mentioned in the 2011 update, it seems likely that the range 67300-67699
@@ -25653,6 +25659,7 @@
           48\d{3}|
           (?:
             (?:
+              6[89]|
               7[1-9]|
               8[4-9]
             )\d|
@@ -26150,7 +26157,7 @@
         <exampleNumber>81234567</exampleNumber>
         <nationalNumberPattern>
           8(?:
-            09[0-24]|
+            09[0-6]|
             95[0-2]
           )\d{4}|
           (?:
@@ -27709,7 +27716,7 @@
             2[02]|
             [34]0|
             5[05]|
-            7[0178]|
+            7[01578]|
             8[078]|
             9\d
           )\d{7}
@@ -30226,7 +30233,7 @@
         <nationalNumberPattern>
           340(?:
             2(?:
-              0[0-368]|
+              0\d|
               2[06-8]|
               4[49]|
               77
@@ -30267,7 +30274,7 @@
         <nationalNumberPattern>
           340(?:
             2(?:
-              0[0-368]|
+              0\d|
               2[06-8]|
               4[49]|
               77
diff --git a/resources/carrier/en/41.txt b/resources/carrier/en/41.txt
index d70703d7f..e9b03f523 100644
--- a/resources/carrier/en/41.txt
+++ b/resources/carrier/en/41.txt
@@ -12,6 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+4168|Swisscom
+4169|Swisscom
+4172|Swisscom
+4173|Swisscom
 417500|Swisscom
 417507|Swisscom
 417508|Swisscom
diff --git a/resources/carrier/en/592.txt b/resources/carrier/en/592.txt
index 292f0b468..456e678be 100644
--- a/resources/carrier/en/592.txt
+++ b/resources/carrier/en/592.txt
@@ -50,7 +50,8 @@
 592708|GTT
 592709|GTT
 59271|E-Networks
-592721|GTT
+592720|E-Networks
+592721|Digicel Guyana
 592722|Digicel Guyana
 592725|GTT
 592726|GTT
diff --git a/resources/carrier/en/65.txt b/resources/carrier/en/65.txt
index a74edd2a0..f72e7a2f7 100644
--- a/resources/carrier/en/65.txt
+++ b/resources/carrier/en/65.txt
@@ -61,7 +61,10 @@
 658090|SingTel
 658091|M1
 658092|Simba
+658093|SingTel
 658094|M1
+658095|SingTel
+658096|Simba
 6581|StarHub
 65810|M1
 65812|SingTel
diff --git a/resources/carrier/en/677.txt b/resources/carrier/en/677.txt
index ba0cf3775..2cb532aea 100644
--- a/resources/carrier/en/677.txt
+++ b/resources/carrier/en/677.txt
@@ -14,6 +14,8 @@
 
 # Data from ITU: http://www.itu.int/oth/T02020000BF/en
 
+67768|Satsol
+67769|Satsol
 6777|Solomon Telekom
 6778|BMobile
 6779|Smile
diff --git a/resources/carrier/en/992.txt b/resources/carrier/en/992.txt
index 66119e0e5..013cee6f3 100644
--- a/resources/carrier/en/992.txt
+++ b/resources/carrier/en/992.txt
@@ -38,6 +38,7 @@
 99255|Megafon
 99270|Tcell
 99271|Babilon-M
+99275|Babilon-M
 99277|Tcell
 99278|Megafon
 99280|ZET-MOBILE
diff --git a/resources/carrier/en/995.txt b/resources/carrier/en/995.txt
index a11c382f1..d99cd1f35 100644
--- a/resources/carrier/en/995.txt
+++ b/resources/carrier/en/995.txt
@@ -15,6 +15,7 @@
 # Veon was formerly known as Beeline/VimpelCom.
 
 99550001|Cellfie
+99550002|Icell Telecom
 995500050|Silknet
 995500051|Silknet
 995500052|Silknet
@@ -28,7 +29,8 @@
 99550010|Cellfie
 99550011|Silknet
 9955002|Silknet
-9955003|Silknet
+9955003|Unicell Mobile
+99550033|Silknet
 9955004|Silknet
 99550050|MagtiCom
 99550055|Silknet
@@ -40,6 +42,7 @@
 995501|Cellfie
 9955050|Silknet
 9955055|MagtiCom
+995507|Globalcell
 995510|Silknet
 99551100|MagtiCom
 99551101|Silknet
@@ -57,17 +60,20 @@
 99552222|MagtiCom
 99552225|Silknet
 9955225|Silknet
+995525|Globalcell
 995530|Silknet
 9955333|MagtiCom
 9955335|Silknet
+995535|Globalcell
 995540|Silknet
 99554444|MagtiCom
 9955445|Silknet
+995545|Globalcell
 995550|MagtiCom
 99555000|Silknet
 99555005|Silknet
 99555050|Silknet
-99555055|Datacom
+99555055|Globalcell
 995551|MagtiCom
 9955520|Premium Net International SRL
 9955522|Asanet
@@ -92,7 +98,8 @@
 995577|Silknet
 995579|Cellfie
 995580|Silknet
-995585|MagtiCom
+9955855|Globalcell
+9955858|MagtiCom
 995588|Silknet
 995590|Silknet
 995591|MagtiCom
diff --git a/resources/geocoding/en/1.txt b/resources/geocoding/en/1.txt
index a2bd53b16..60b87f1d5 100644
--- a/resources/geocoding/en/1.txt
+++ b/resources/geocoding/en/1.txt
@@ -7575,8 +7575,12 @@
 1339|Massachusetts
 1340200|Chtamstths, VI
 1340203|Chtamstths, VI
+1340204|Chtamstths, VI
+1340205|Chtamstths, VI
 1340206|St. Croix, VI
+1340207|Chtamstths, VI
 1340208|St. Croix, VI
+1340209|Chtamstths, VI
 1340423|Chtamstths, VI
 134044|Chtamstths, VI
 1340725|Chtamstths, VI
diff --git a/resources/timezones/map_data.txt b/resources/timezones/map_data.txt
index 4b2ba72cb..1907cd3d2 100644
--- a/resources/timezones/map_data.txt
+++ b/resources/timezones/map_data.txt
@@ -949,7 +949,7 @@
 1475|America/New_York
 1478|America/New_York
 1479|America/Chicago
-1480|America/Denver&America/Phoenix
+1480|America/Phoenix
 1484|America/New_York
 1501|America/Chicago
 1502|America/New_York
@@ -969,7 +969,7 @@
 1517|America/New_York
 1518|America/New_York
 1519|America/Toronto
-1520|America/Denver&America/Phoenix
+1520|America/Phoenix
 1530|America/Los_Angeles
 1531|America/Chicago
 1534|America/Chicago