From aa21158f8d78f5470866fc6c993d374a6248181e Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Mon, 25 Mar 2024 06:16:22 +0000 Subject: [PATCH] Merge metadata changes from upstream 8.13.33 Includes changes in resources/ up to and including upstream commit 5e620bb2637f: "[maven-release-plugin] prepare release v8.13.33" --- resources/PhoneNumberMetadata.xml | 62 ++++++++++++++++++------------- resources/carrier/en/255.txt | 2 +- resources/carrier/en/256.txt | 2 +- resources/carrier/en/355.txt | 4 +- resources/carrier/en/376.txt | 6 +-- resources/carrier/en/380.txt | 2 + resources/carrier/en/972.txt | 1 + resources/carrier/en/993.txt | 1 + resources/carrier/en/995.txt | 1 + resources/carrier/uk/380.txt | 2 + resources/geocoding/en/1.txt | 2 + resources/timezones/map_data.txt | 2 + 12 files changed, 55 insertions(+), 32 deletions(-) diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml index 852bd84e2..c0144bc1c 100644 --- a/resources/PhoneNumberMetadata.xml +++ b/resources/PhoneNumberMetadata.xml @@ -5394,7 +5394,7 @@ [06]7| 19| 25| - 73 + 7[39] )| 90[25] )[2-9]\d{6} @@ -5452,7 +5452,7 @@ [06]7| 19| 25| - 73 + 7[39] )| 90[25] )[2-9]\d{6} @@ -11120,16 +11120,19 @@ )\d\d| (?: 5(?: - 00(?: - 0\d| - 11| - 22| - 33| - 44| - 5[05]| - 77| - 88| - 9[09] + 0(?: + 0(?: + 0\d| + 11| + 22| + 33| + 44| + 5[05]| + 77| + 88| + 9[09] + )| + 111 )| 1(?: 1(?: @@ -13592,7 +13595,7 @@ 7(?: 38(?: 0\d| - 5[09]| + 5[019]| 88 )| 8(?: @@ -18777,11 +18780,11 @@ - + - @@ -27781,12 +27784,17 @@ $1 $2-$3-$4 - 6 + [67] $1 $2 - [1-6]\d{7} + + (?: + [1-6]\d| + 71 + )\d{6} + @@ -27829,7 +27837,12 @@ 66123456 - 6\d{7} + + (?: + 6\d| + 71 + )\d{6} + @@ -28644,10 +28657,9 @@ 621234567 - 77[2-9]\d{6}| (?: 6[125-9]| - 7[13-689] + 7[13-9] )\d{7} @@ -28810,7 +28822,7 @@ 39| 50| 6[36-8]| - 7[1-3]| + 7[1-357]| 9[1-9] )\d{7} @@ -28919,7 +28931,7 @@ [015-8]\d| 20| 36| - 4[0-4]| + 4[0-5]| 9[89] )\d{6} @@ -29002,7 +29014,7 @@ 0[1-35-9]| 1[02-9]| 2[03-57-9]| - 3[149]| + 3[1459]| 4[08]| 5[1-46]| 6[0279]| @@ -29108,7 +29120,7 @@ 0[1-35-9]| 1[02-9]| 2[03-57-9]| - 3[149]| + 3[1459]| 4[08]| 5[1-46]| 6[0279]| diff --git a/resources/carrier/en/255.txt b/resources/carrier/en/255.txt index 170f8f264..14d1f9c79 100644 --- a/resources/carrier/en/255.txt +++ b/resources/carrier/en/255.txt @@ -26,6 +26,6 @@ 25574|Vodacom 25575|Vodacom 25576|Vodacom -25577|Zantel +25577|tiGO 25578|Airtel 25579|Benson Informatics diff --git a/resources/carrier/en/256.txt b/resources/carrier/en/256.txt index 92bd61206..28dad9e43 100644 --- a/resources/carrier/en/256.txt +++ b/resources/carrier/en/256.txt @@ -5,7 +5,7 @@ 256726|Tangerine 256728|Talkio 25673|Hamilton Telecom -25674|Sure Telecom +25674|Airtel 25675|Airtel 25676|MTN 25677|MTN diff --git a/resources/carrier/en/355.txt b/resources/carrier/en/355.txt index 51dbe00c7..a300636de 100644 --- a/resources/carrier/en/355.txt +++ b/resources/carrier/en/355.txt @@ -16,6 +16,6 @@ # services to its subscribers on 01.01.2018. The existing subscribers are # advised to port to other networks. http://www.plus.al/ -35567|ALBtelecom -35568|Telekom +35567|One +35568|One 35569|Vodafone diff --git a/resources/carrier/en/376.txt b/resources/carrier/en/376.txt index 1f41498ec..508664167 100644 --- a/resources/carrier/en/376.txt +++ b/resources/carrier/en/376.txt @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -3763|Mobiland -3765|Mobiland -3766|Mobiland +3763|Andorra Telecom +3765|Andorra Telecom +3766|Andorra Telecom diff --git a/resources/carrier/en/380.txt b/resources/carrier/en/380.txt index ac317adcb..6c3366834 100644 --- a/resources/carrier/en/380.txt +++ b/resources/carrier/en/380.txt @@ -23,6 +23,8 @@ 38067|Kyivstar 38068|Kyivstar 38073|lifecell +38075|Vodafone +38077|Kyivstar 38091|TriMob 38092|PEOPLEnet 38093|lifecell diff --git a/resources/carrier/en/972.txt b/resources/carrier/en/972.txt index 921cb919c..97f0b50ca 100644 --- a/resources/carrier/en/972.txt +++ b/resources/carrier/en/972.txt @@ -31,6 +31,7 @@ 9725543|Maskyoo 9725544|Cellran Cellular Communications 97255440|Merkaziya +97255442|Xphone 9725550|Annatel 9725551|Annatel 9725552|Annatel diff --git a/resources/carrier/en/993.txt b/resources/carrier/en/993.txt index 91b033374..282935dc5 100644 --- a/resources/carrier/en/993.txt +++ b/resources/carrier/en/993.txt @@ -21,3 +21,4 @@ 99367|MTS (BARASH Communication) 99368|MTS (BARASH Communication) 99369|MTS (BARASH Communication) +9937|TM-Cell diff --git a/resources/carrier/en/995.txt b/resources/carrier/en/995.txt index a7b72d509..48d24db94 100644 --- a/resources/carrier/en/995.txt +++ b/resources/carrier/en/995.txt @@ -37,6 +37,7 @@ 9955008|Silknet 99550090|Cellfie 99550099|Silknet +995501|Cellfie 9955050|Silknet 9955055|MagtiCom 995510|Silknet diff --git a/resources/carrier/uk/380.txt b/resources/carrier/uk/380.txt index f52c0ddc2..270acb143 100644 --- a/resources/carrier/uk/380.txt +++ b/resources/carrier/uk/380.txt @@ -24,6 +24,8 @@ 38067|Київстар 38068|Київстар 38073|lifecell +38075|Vodafone Україна +38077|Київстар 38091|ТриМоб 38092|PEOPLEnet 38093|lifecell diff --git a/resources/geocoding/en/1.txt b/resources/geocoding/en/1.txt index 4b73470ca..a2bd53b16 100644 --- a/resources/geocoding/en/1.txt +++ b/resources/geocoding/en/1.txt @@ -2334,6 +2334,7 @@ 1231995|Traverse City, MI 1234|Ohio 1234678|Akron, OH +1235|Missouri 1236|British Columbia 1239|Florida 1239200|Naples, FL @@ -27963,6 +27964,7 @@ 1873|Quebec 1876957|Negril 1878|Pennsylvania +1879|Newfoundland and Labrador 1901|Tennessee 1901213|Memphis, TN 1901226|Memphis, TN diff --git a/resources/timezones/map_data.txt b/resources/timezones/map_data.txt index fd7e75475..ce41f299d 100644 --- a/resources/timezones/map_data.txt +++ b/resources/timezones/map_data.txt @@ -465,6 +465,7 @@ 1229|America/New_York 1231|America/New_York 1234|America/New_York +1235|America/Chicago 1236|America/Vancouver 1239|America/New_York 1240|America/New_York @@ -1862,6 +1863,7 @@ 1873|America/Toronto 1876|America/Jamaica 1878|America/New_York +1879|America/Puerto_Rico&America/St_Johns 1901|America/Chicago 1902|America/Halifax 1903|America/Chicago