Merge metadata changes from upstream 8.13.0

Includes changes in resources/ up to and including upstream commit 185004cabd1b: "[maven-release-plugin] prepare release v8.13.0"
daviddrysdale · Nov 6, 2022 · e610dc9 · e610dc9
1 parent e97c76d
commit e610dc9
Show file tree

Hide file tree

Showing 13 changed files with 188 additions and 126 deletions.
diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
diff --git a/resources/ShortNumberMetadata.xml b/resources/ShortNumberMetadata.xml
@@ -4674,7 +4674,10 @@
             2|
             6(?:
               00[06]|
-              11[17]
+              1(?:
+                1[17]|
+                23
+              )
             )
           )|
           75[12]\d\d

diff --git a/resources/carrier/en/357.txt b/resources/carrier/en/357.txt
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+35791|Cytamobile-Vodafone
 35794|Lemontel
 35795|PrimeTel
 35796|MTN

diff --git a/resources/carrier/en/359.txt b/resources/carrier/en/359.txt
@@ -19,5 +19,22 @@
 35989|Telenor
 359988|Bob
 359989|A1
-359996|Bulsatcom
-359999|MAX
+3599960|A1
+3599961|A1
+3599962|A1
+3599964|Telenor
+3599965|Telenor
+3599966|Telenor
+3599967|Vivacom
+3599968|Vivacom
+3599969|Vivacom
+3599990|A1
+3599991|A1
+3599992|A1
+3599993|A1
+3599994|Telenor
+3599995|Telenor
+3599996|Vivacom
+3599997|Vivacom
+3599998|Vivacom
+3599999|Vivacom
diff --git a/resources/carrier/en/389.txt b/resources/carrier/en/389.txt
@@ -16,33 +16,18 @@
 # Mapped ranges at 3-4 digit granularity level for easier maintenance. Added
 # some additional ranges based on respective IR.21 docs.
 
+3897|A1
 38970|T-Mobile
 38971|T-Mobile
 38972|T-Mobile
-389731|A1
-389732|A1
-389733|A1
-389734|A1
-389735|A1
 3897370|T-Mobile
 3897371|T-Mobile
-3897375|A1
-3897377|A1
-3897378|A1
 389742|T-Mobile
 3897421|Mobik
 389746|T-Mobile
 3897470|T-Mobile
 3897471|T-Mobile
 3897474|T-Mobile
-3897475|A1
-3897477|A1
 38974774|Telekabel
-3897478|A1
-38975|A1
-38976|A1
-38977|A1
-38978|A1
-38979|A1
 3897970|T-Mobile
 3897971|T-Mobile
diff --git a/resources/carrier/en/46.txt b/resources/carrier/en/46.txt
@@ -250,7 +250,12 @@
 46726006|Telavox AB
 46726008|Global Telefoni Sve
 4672601|Telavox AB
+4672603|Tele2 Sverige
+4672604|Tele2 Sverige
+4672605|Tele2 Sverige
 4672606|Tele2 Sverige
+4672607|Tele2 Sverige
+4672608|Tele2 Sverige
 467261|GLOBETOUCH AB
 467262|GLOBETOUCH AB
 467263|GLOBETOUCH AB
@@ -395,6 +400,7 @@
 46734527|Soatso AB
 46734528|Soatso AB
 46734529|Soatso AB
+4673453|TeliaSonera
 4673454|Tele2 Sverige
 4673455|Viatel Sweden
 4673456|Svea Billing System

diff --git a/resources/carrier/en/47.txt b/resources/carrier/en/47.txt
@@ -222,6 +222,7 @@
 474898|telenor norge
 474899|telia
 47591|telenor norge
+47596|ice norge
 4790|telenor norge
 479042|svea billing services
 479043|svea billing services
@@ -317,9 +318,9 @@
 479441|telenor norge
 479442|telia
 479443|telia
-479444|telenor norge
-479445|telenor norge
-479446|telenor norge
+479444|ice norge
+479445|ice norge
+479446|ice norge
 479447|telia
 479448|telia
 479449|telia

diff --git a/resources/carrier/en/48.txt b/resources/carrier/en/48.txt
@@ -18,6 +18,7 @@
 482115|Plus
 48212|Orange
 48450|Play
+48454|Orange
 484590|Play
 4845910|Play
 4845911|Play

diff --git a/resources/carrier/en/7.txt b/resources/carrier/en/7.txt
@@ -134,6 +134,8 @@
 79010134|Tele2
 79010135|Tele2
 79010136|Tele2
+79010138|Multiregional Transit Telecom (MTT)
+79010139|Multiregional Transit Telecom (MTT)
 7901014|Tele2
 7901015|Tele2
 7901016|Tele2

diff --git a/resources/carrier/en/960.txt b/resources/carrier/en/960.txt
@@ -14,6 +14,7 @@
 
 9607|Dhiraagu
 96091|Ooredoo
+96092|Ooredoo
 96093|Ooredoo
 96094|Ooredoo
 96095|Ooredoo

diff --git a/resources/carrier/ru/7.txt b/resources/carrier/ru/7.txt
@@ -140,6 +140,8 @@
 79010134|Tele2
 79010135|Tele2
 79010136|Tele2
+79010138|ОАО МТТ
+79010139|ОАО МТТ
 7901014|Tele2
 7901015|Tele2
 7901016|Tele2

diff --git a/resources/geocoding/en/504.txt b/resources/geocoding/en/504.txt
@@ -18,11 +18,16 @@
 5042201|Polo Paz
 5042202|Tegucigalpa
 5042203|Polo Paz
+5042204|Francisco Morazan
 5042209|Res. Centro América, Tegucigalpa
 5042211|El Picacho
 5042212|Rdsi Tegucigalpa (Pri3)
 5042213|Telef. Inalámbrica Tegucig.
+5042214|Francisco Morazan
+5042215|Francisco Morazan
 5042216|Rdsi Tegucigalpa (Pri3)
+5042218|Francisco Morazan
+5042219|Francisco Morazan
 5042220|Principal
 5042221|Almendros
 5042222|Principal
@@ -44,13 +49,17 @@
 5042238|Principal
 5042239|Miraflores
 5042240|Kennedy, Tegucigalpa
+5042242|Francisco Morazan
 5042244|Tegucigalpa
 5042245|La Vega, Tegucigalpa
 5042246|La Vega, Tegucigalpa
 5042255|El Hato
 5042257|Prados Universitarios
+5042281|Francisco Morazan
+5042283|Francisco Morazan
 5042290|Toncontin
 5042291|Toncontin
+5042405|Atlantida
 5042407|Roatán, Bay Islands
 5042423|La Ceiba
 5042424|Sabá
@@ -73,7 +82,15 @@
 5042452|Coyoles Central
 5042453|Guanaja
 5042455|French Harbour
-504251|San Pedro Sula, Cortés
+5042458|Atlantida
+5042459|Atlantida
+5042502|Cortes
+5042503|Cortes
+5042505|Cortes
+5042511|Cortes
+5042513|Cortes
+5042515|Cortes
+5042516|San Pedro Sula, Cortés
 5042540|San Pedro Sula, Cortés
 5042543|Inalámbrica Sps
 5042544|Rdsi San Pedro Sula
@@ -91,8 +108,11 @@
 5042564|San Pedro Sula, Cortés
 5042565|Chamelecón
 5042566|Jardines Del Valle
+5042569|Cortes
+5042570|Cortes
 5042574|Búfalo
 504261|Choloma, Cortés
+5042637|Santa Barbra
 5042640|C. Comunitarios
 5042641|C. Comunitarios
 5042642|C. Comunitarios
@@ -119,6 +139,7 @@
 504268|La Lima
 5042690|El Negrito
 5042691|Morazán
+504270|Olancho
 5042764|Amarat/Marcala
 5042766|Valle De Ángeles
 5042767|Ojojona

diff --git a/resources/phonemetadata.proto b/resources/phonemetadata.proto
@@ -285,15 +285,14 @@ message PhoneMetadata {
   // should not overlap.
   optional string leading_digits = 23;
 
-  // Deprecated: do not use. Will be deletd when there are no references to this
-  // later.
-  optional bool leading_zero_possible = 26 [default=false];
-
   // This field is set when this country has implemented mobile number
   // portability. This means that transferring mobile numbers between carriers
   // is allowed. A consequence of this is that phone prefix to carrier mapping
   // is less reliable.
   optional bool mobile_number_portable_region = 32 [default=false];
+
+  reserved 26;
+  reserved "leading_zero_possible";
 }
 
 message PhoneMetadataCollection {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4674,7 +4674,10 @@ @@
 |
 (?:
 [06]|
-[17]
+(?:
+[17]|
+                  )
                 )
               )|
 [12]\d\d
@@ Expand Down @@