From 36312a3a9e01e08227a57d4cbe523287eae06536 Mon Sep 17 00:00:00 2001
From: David Drysdale <drysdale@google.com>
Date: Wed, 20 Sep 2023 20:22:47 +0100
Subject: [PATCH] Merge metadata changes from upstream 8.13.21

Includes changes in resources/ up to and including
upstream commit f6bf98034432:
  "[maven-release-plugin] prepare release v8.13.21"
---
 resources/PhoneNumberMetadata.xml | 46 ++++++++++++---------
 resources/carrier/en/61.txt       |  4 ++
 resources/geocoding/en/52.txt     |  1 +
 resources/geocoding/en/61.txt     | 66 +++++++++----------------------
 resources/geocoding/es/52.txt     |  1 +
 5 files changed, 53 insertions(+), 65 deletions(-)

diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index db3b00ede..487966536 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -2535,7 +2535,7 @@
             [0-3]\d|
             4[047-9]|
             5[0-25-9]|
-            6[016-9]|
+            6[0-26-9]|
             7[02-8]|
             8[0-24-9]|
             9[0-37-9]
@@ -5598,7 +5598,7 @@
             [0-3]\d|
             4[047-9]|
             5[0-25-9]|
-            6[016-9]|
+            6[0-26-9]|
             7[02-8]|
             8[0-24-9]|
             9[0-37-9]
@@ -7830,7 +7830,7 @@
             [0-3]\d|
             4[047-9]|
             5[0-25-9]|
-            6[016-9]|
+            6[0-26-9]|
             7[02-8]|
             8[0-24-9]|
             9[0-37-9]
@@ -21202,6 +21202,7 @@
             (?:
               [27]2|
               44|
+              87|
               99
             )[1-9]|
             65[0-689]
@@ -21214,7 +21215,7 @@
               4[0-35-9]|
               6[0-46-9]|
               7[013-9]|
-              8[1-79]|
+              8[1-69]|
               9[1-8]
             )|
             [2-9]\d
@@ -21280,7 +21281,7 @@
               3[1-6]|
               4[124-6]|
               6[1246-9]|
-              7[1-378]|
+              7[0-378]|
               9[12479]
             )|
             9(?:
@@ -21416,7 +21417,7 @@
               3[1-6]|
               4[124-6]|
               6[1246-9]|
-              7[1-378]|
+              7[0-378]|
               9[12479]
             )|
             9(?:
@@ -29076,6 +29077,11 @@
     <territory id="UY" countryCode="598" preferredInternationalPrefix="00"
                internationalPrefix="0(?:0|1[3-9]\d)" nationalPrefix="0" preferredExtnPrefix=" int. ">
       <availableFormats>
+        <!-- 6 - 7 digit toll free numbers -->
+        <numberFormat pattern="(\d{3})(\d{3,4})">
+          <leadingDigits>0</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
         <numberFormat pattern="(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
             405|
@@ -29094,23 +29100,26 @@
           <leadingDigits>[124]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <!-- 8 - 10 digit toll free numbers -->
+        <numberFormat pattern="(\d{3})(\d{3})(\d{2,4})">
+          <leadingDigits>0</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <!-- 10 digit toll free numbers -->
         <numberFormat pattern="(\d{3})(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>4</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- 13 digit toll free numbers -->
-        <numberFormat pattern="(\d{3})(\d{3})(\d{3})(\d{4})">
+        <!-- 11 - 13 digit toll free numbers -->
+        <numberFormat pattern="(\d{3})(\d{3})(\d{3})(\d{2,4})">
           <leadingDigits>0</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          (?:
-            0004|
-            4
-          )\d{9}|
+          0004\d{2,9}|
+          4\d{9}|
           [1249]\d{7}|
           (?:
             [49]\d|
@@ -29126,7 +29135,10 @@
           (?:
             1(?:
               770|
-              987
+              9(?:
+                20|
+                87
+              )
             )|
             (?:
               2\d|
@@ -29141,14 +29153,12 @@
         <nationalNumberPattern>9[1-9]\d{6}</nationalNumberPattern>
       </mobile>
       <tollFree>
-        <possibleLengths national="7,10,13"/>
+        <possibleLengths national="[6-13]"/>
         <exampleNumber>8001234</exampleNumber>
         <nationalNumberPattern>
+          0004\d{2,9}|
           (?:
-            (?:
-              0004|
-              4
-            )\d{5}|
+            4\d{5}|
             80[05]
           )\d{4}|
           405\d{4}
diff --git a/resources/carrier/en/61.txt b/resources/carrier/en/61.txt
index 2e4f2f0e6..9a0ac84bd 100644
--- a/resources/carrier/en/61.txt
+++ b/resources/carrier/en/61.txt
@@ -78,6 +78,7 @@
 61459|Telstra
 61460|Telstra
 61461|Telstra
+61462|Telstra
 61466|Optus
 61467|Telstra
 61468|Optus
@@ -102,6 +103,9 @@
 614801|Telstra
 614803|Telstra
 614804|Telstra
+614805|Telstra
+614806|Telstra
+614807|Telstra
 614808|Pivotel Satellite
 61481|Optus
 61482|Optus
diff --git a/resources/geocoding/en/52.txt b/resources/geocoding/en/52.txt
index 7daab49a5..51af31cd8 100644
--- a/resources/geocoding/en/52.txt
+++ b/resources/geocoding/en/52.txt
@@ -342,6 +342,7 @@
 52867|Nuevo Laredo/Tamaulipas
 52868|Tamaulipas
 52869|Cuatro Cienegas/San Buenaventura, COAH
+52870|Coahuila/Durango
 52871|Coahuila
 52872|Coahuila/Durango
 52873|Nuevo Leon
diff --git a/resources/geocoding/en/61.txt b/resources/geocoding/en/61.txt
index d162f032a..7f97e3b32 100644
--- a/resources/geocoding/en/61.txt
+++ b/resources/geocoding/en/61.txt
@@ -2985,7 +2985,7 @@
 61251187|Uriarra Forest
 61251188|Yass
 61251189|Anembo
-61251190|Binalong
+61251190|Canberra
 61251191|Bungendore
 61251192|Burrinjuck
 61251193|Canberra
@@ -2995,9 +2995,9 @@
 61251197|Gundaroo
 61251198|Michelago
 61251199|Rye Park
-61251200|The Mullion
-61251201|Uriarra Forest
-61251202|Yass
+61251200|Binalong
+61251201|Anembo
+61251202|Bungendore
 61251203|Anembo
 61251204|Binalong
 61251205|Bungendore
@@ -3012,16 +3012,16 @@
 61251214|The Mullion
 61251215|Uriarra Forest
 61251216|Yass
-61251217|Anembo
+61251217|Burrinjuck
 61251218|Binalong
-61251219|Bungendore
+61251219|Canberra
 6125122|Canberra
 6125123|Canberra
 6125124|Canberra
 6125125|Canberra
 6125126|Canberra
 6125127|Canberra
-61251280|Burrinjuck
+61251280|Canberra
 61251281|Canberra
 61251282|Captains Flat
 61251283|Cavan
@@ -3031,47 +3031,19 @@
 61251287|Rye Park
 61251288|The Mullion
 61251289|Uriarra Forest
-61251290|Yass
+61251290|Captains Flat
 61251291|Canberra
-612530000|Leadville
-612530001|Leadville
-612530002|Leadville
-612530003|Leadville
-612530004|Leadville/Baldry/Bathurst/Birriwa
-612530005|Leadville/Baldry/Bathurst/Birriwa
-612530006|Leadville
-612530007|Baldry
-612530008|Bathurst
-612530009|Birriwa
-612530010|Lue
-612530011|Lue
-612530012|Lue
-612530013|Lue
-612530014|Lue/Blayney/Boorowa/Bribbaree
-612530015|Lue/Blayney/Boorowa/Bribbaree
-612530016|Lue
-612530017|Blayney
-612530018|Boorowa
-612530019|Bribbaree
-61253002|Mudgee
-612530029|Burraga
-612530030|Twelve Mile
-612530031|Twelve Mile
-612530032|Twelve Mile
-612530033|Twelve Mile
-612530034|Twelve Mile/Bylong/Canowindra/Bathurst
-612530035|Twelve Mile/Bylong/Canowindra/Bathurst
-612530036|Twelve Mile
-612530037|Bylong
-612530038|Canowindra
-612530039|Bathurst
-61253004|Windeyer
-612530048|Caragabal
-612530049|Cassilis
-61253005|Wollar
-612530055|Lithgow
-612530056|Orange
-612530059|Coolah
+61251292|Canberra
+612513|Cavan/Canberra/Gearys Gap/Gundaroo/Bungendore/Michelago/Burrinjuck/Rye Park/The Mullion/Captains Flat/UriarraForest/Yass
+612514|Canberra/Gearys Gap/Gundaroo/Michelago/Rye Park/The Mullion/Uriarra Forest/Yass/Anembo/Binalong/Bungendore/Burrinjuck/Captains Flat/Cavan
+612515|Canberra
+612516|Canberra
+61253000|Leadville/Baldry/Bathurst/Birriwa
+61253001|Lue/Blayney/Boorowa/Bribbaree/Birriwa
+61253002|Boorowa/Bribbaree/Burraga/Mudgee
+61253003|Bathurst/Burraga/Bylong/Canowindra/Twelve Mile
+61253004|Canowindra/Caragabal/Cassilis/Windeyer
+61253005|Cassilis/Coolah/Lithgow/Orange/Wollar
 61253006|Baldry
 612530068|Cowra
 612530069|Cudal
diff --git a/resources/geocoding/es/52.txt b/resources/geocoding/es/52.txt
index 7fac5af8d..bb6e42d7f 100644
--- a/resources/geocoding/es/52.txt
+++ b/resources/geocoding/es/52.txt
@@ -342,6 +342,7 @@
 52867|Nuevo León/Tamaulipas
 52868|Tamaulipas
 52869|Cuatro Ciénegas/San Buenaventura, COAH
+52870|Coahuila/Durango
 52871|Coahuila
 52872|Coahuila/Durango
 52873|Nuevo León