Metadata updates for release 8.12.30 (google#2649)

kjin · Aug 17, 2021 · c0c63d4 · c0c63d4
1 parent e831ec2
commit c0c63d4
Show file tree

Hide file tree

Showing 28 changed files with 27,620 additions and 27,755 deletions.
diff --git a/cpp/src/phonenumbers/lite_metadata.cc b/cpp/src/phonenumbers/lite_metadata.cc
diff --git a/cpp/src/phonenumbers/metadata.cc b/cpp/src/phonenumbers/metadata.cc
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/263_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/263_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/55_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY
diff --git a/javascript/i18n/phonenumbers/demo-compiled.js b/javascript/i18n/phonenumbers/demo-compiled.js
diff --git a/javascript/i18n/phonenumbers/metadata.js b/javascript/i18n/phonenumbers/metadata.js
@@ -473,7 +473,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"80[1-4]\\d{5}",,,,"80112345"]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"60(?:2[78]|3[5-9]|4[02-9]|5[0-46-9]|[6-8]\\d|90)\\d{4}",,,,"60271234"]
+,[,,"60(?:2[78]|3[5-9]|4[02-9]|5[0-46-9]|[6-8]\\d|9[01])\\d{4}",,,,"60271234"]
 ,"AM",374,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["[89]0"]
 ,"0 $1"]
 ,[,"(\\d{3})(\\d{5})","$1 $2",["2|3[12]"]
@@ -2905,9 +2905,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"GL":[,[,,"(?:19|[2-689]\\d)\\d{4}",,,,,,,[6]
+,"GL":[,[,,"(?:19|[2-689]\\d|70)\\d{4}",,,,,,,[6]
 ]
-,[,,"(?:19|3[1-7]|6[14689]|8[14-79]|9\\d)\\d{4}",,,,"321000"]
+,[,,"(?:19|3[1-7]|6[14689]|70|8[14-79]|9\\d)\\d{4}",,,,"321000"]
 ,[,,"[245]\\d{5}",,,,"221234"]
 ,[,,"80\\d{4}",,,,"801234"]
 ,[,,,,,,,,,[-1]
@@ -2917,7 +2917,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,,,,,,,,[-1]
 ]
 ,[,,"3[89]\\d{4}",,,,"381234"]
-,"GL",299,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",["19|[2-689]"]
+,"GL",299,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",["19|[2-9]"]
 ]
 ]
 ,,[,,,,,,,,,[-1]
@@ -4203,7 +4203,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"2(?:[23]\\d\\d|4(?:[1-35-9]\\d|44)|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7]))\\d{4}",,,,"22345678",,,[8]
 ]
-,[,,"(?:5(?:2(?:22|5[25])|88[58])|6(?:222|333|444|70[013-9]|888|93[039])|9(?:11[01]|3(?:00|33)|500))\\d{4}|(?:5(?:[05]\\d|1[0-7]|6[56])|6(?:0[034679]|5[015-9]|6\\d|7[67]|9[069])|9(?:0[09]|22|[4679]\\d|55|8[057-9]))\\d{5}",,,,"50012345",,,[8]
+,[,,"(?:5(?:2(?:22|5[25])|7(?:55|77)|88[58])|6(?:222|333|444|70[013-9]|888|93[039])|9(?:11[01]|3(?:00|33)|500))\\d{4}|(?:5(?:[05]\\d|1[0-7]|6[56])|6(?:0[034679]|5[015-9]|6\\d|7[67]|9[069])|9(?:0[09]|22|[4679]\\d|55|8[057-9]))\\d{5}",,,,"50012345",,,[8]
 ]
 ,[,,"18\\d{5}",,,,"1801234",,,[7]
 ]
@@ -6554,7 +6554,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"662[0-24-9]\\d{4}|6(?:[1-578]\\d|6[013-57-9]|9[0-35-9])\\d{5}",,,,"61234567",,,[8]
 ]
-,[,,"(?:8(?:0(?:[13]\\d|2[013-9]|4[015])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-2]))|9[0-8]\\d\\d)\\d{4}",,,,"81234567",,,[8]
+,[,,"(?:8(?:0(?:[13]\\d|2[013-9]|4[015-7])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-2]))|9[0-8]\\d\\d)\\d{4}",,,,"81234567",,,[8]
 ]
 ,[,,"(?:18|8)00\\d{7}",,,,"18001234567",,,[10,11]
 ]
@@ -6820,7 +6820,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:1\\d|2[0-79]|3[0-46-8]|4[0-7]|5[57-9])\\d{5}|(?:[134]\\d|8[125])\\d{4}",,,,"4012345",,,[6,7]
 ]
-,[,,"28\\d{5}|(?:6[1-9]|79)\\d{6,7}|(?:15|24|(?:3[59]|4[89]|8[08])\\d|60|7[1-8]|9(?:0\\d|[2-9]))\\d{6}",,,,"71123456",,,[7,8,9]
+,[,,"(?:(?:15|(?:3[59]|4[89]|79|8[08])\\d|6(?:0[5-7]|[1-9]\\d)|9(?:0\\d|[2-9]))\\d|2(?:4\\d|8))\\d{5}|(?:6\\d|7[1-9])\\d{6}",,,,"71123456",,,[7,8,9]
 ]
 ,[,,,,,,,,,[-1]
 ]
@@ -6842,7 +6842,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[3478]|64|90"]
 ]
-,[,"(\\d{2})(\\d{5,7})","$1 $2",["1|28|6[1-35-9]|9[2-9]"]
+,[,"(\\d{2})(\\d{5,7})","$1 $2",["1|28|6(?:0[5-7]|[1-35-9])|9[2-9]"]
 ]
 ]
 ,,[,,,,,,,,,[-1]
@@ -6997,7 +6997,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"21\\d{6,7}|(?:1(?:[14]\\d|[2356])|2[235]|3(?:[13]\\d|4)|4[134]|5[1-3])\\d{6}",,,,"112345678",,,,[6,7]
 ]
-,[,,"9(?:22|[3-589]\\d|6[02-9])\\d{6}",,,,"944567890",,,[9]
+,[,,"9(?:22|[3-689]\\d)\\d{6}",,,,"944567890",,,[9]
 ]
 ,[,,,,,,,,,[-1]
 ]
@@ -8140,13 +8140,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"800":[,[,,"[1-9]\\d{7}",,,,,,,[8]
+,"800":[,[,,"(?:005|[1-9]\\d\\d)\\d{5}",,,,,,,[8]
 ]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"[1-9]\\d{7}",,,,"12345678"]
+,[,,"(?:005|[1-9]\\d\\d)\\d{5}",,,,"12345678"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@@ -8155,7 +8155,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,"001",800,,,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2",["[1-9]"]
+,"001",800,,,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2",["\\d"]
 ]
 ]
 ,,[,,,,,,,,,[-1]

diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js
@@ -473,7 +473,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"80[1-4]\\d{5}"]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"60(?:2[78]|3[5-9]|4[02-9]|5[0-46-9]|[6-8]\\d|90)\\d{4}"]
+,[,,"60(?:2[78]|3[5-9]|4[02-9]|5[0-46-9]|[6-8]\\d|9[01])\\d{4}"]
 ,"AM",374,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["[89]0"]
 ,"0 $1"]
 ,[,"(\\d{3})(\\d{5})","$1 $2",["2|3[12]"]
@@ -2905,9 +2905,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"GL":[,[,,"(?:19|[2-689]\\d)\\d{4}",,,,,,,[6]
+,"GL":[,[,,"(?:19|[2-689]\\d|70)\\d{4}",,,,,,,[6]
 ]
-,[,,"(?:19|3[1-7]|6[14689]|8[14-79]|9\\d)\\d{4}"]
+,[,,"(?:19|3[1-7]|6[14689]|70|8[14-79]|9\\d)\\d{4}"]
 ,[,,"[245]\\d{5}"]
 ,[,,"80\\d{4}"]
 ,[,,,,,,,,,[-1]
@@ -2917,7 +2917,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,,,,,,,,[-1]
 ]
 ,[,,"3[89]\\d{4}"]
-,"GL",299,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",["19|[2-689]"]
+,"GL",299,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",["19|[2-9]"]
 ]
 ]
 ,,[,,,,,,,,,[-1]
@@ -4203,7 +4203,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"2(?:[23]\\d\\d|4(?:[1-35-9]\\d|44)|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7]))\\d{4}",,,,,,,[8]
 ]
-,[,,"(?:5(?:2(?:22|5[25])|88[58])|6(?:222|333|444|70[013-9]|888|93[039])|9(?:11[01]|3(?:00|33)|500))\\d{4}|(?:5(?:[05]\\d|1[0-7]|6[56])|6(?:0[034679]|5[015-9]|6\\d|7[67]|9[069])|9(?:0[09]|22|[4679]\\d|55|8[057-9]))\\d{5}",,,,,,,[8]
+,[,,"(?:5(?:2(?:22|5[25])|7(?:55|77)|88[58])|6(?:222|333|444|70[013-9]|888|93[039])|9(?:11[01]|3(?:00|33)|500))\\d{4}|(?:5(?:[05]\\d|1[0-7]|6[56])|6(?:0[034679]|5[015-9]|6\\d|7[67]|9[069])|9(?:0[09]|22|[4679]\\d|55|8[057-9]))\\d{5}",,,,,,,[8]
 ]
 ,[,,"18\\d{5}",,,,,,,[7]
 ]
@@ -6554,7 +6554,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"662[0-24-9]\\d{4}|6(?:[1-578]\\d|6[013-57-9]|9[0-35-9])\\d{5}",,,,,,,[8]
 ]
-,[,,"(?:8(?:0(?:[13]\\d|2[013-9]|4[015])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-2]))|9[0-8]\\d\\d)\\d{4}",,,,,,,[8]
+,[,,"(?:8(?:0(?:[13]\\d|2[013-9]|4[015-7])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-2]))|9[0-8]\\d\\d)\\d{4}",,,,,,,[8]
 ]
 ,[,,"(?:18|8)00\\d{7}",,,,,,,[10,11]
 ]
@@ -6820,7 +6820,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:1\\d|2[0-79]|3[0-46-8]|4[0-7]|5[57-9])\\d{5}|(?:[134]\\d|8[125])\\d{4}",,,,,,,[6,7]
 ]
-,[,,"28\\d{5}|(?:6[1-9]|79)\\d{6,7}|(?:15|24|(?:3[59]|4[89]|8[08])\\d|60|7[1-8]|9(?:0\\d|[2-9]))\\d{6}",,,,,,,[7,8,9]
+,[,,"(?:(?:15|(?:3[59]|4[89]|79|8[08])\\d|6(?:0[5-7]|[1-9]\\d)|9(?:0\\d|[2-9]))\\d|2(?:4\\d|8))\\d{5}|(?:6\\d|7[1-9])\\d{6}",,,,,,,[7,8,9]
 ]
 ,[,,,,,,,,,[-1]
 ]
@@ -6842,7 +6842,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[3478]|64|90"]
 ]
-,[,"(\\d{2})(\\d{5,7})","$1 $2",["1|28|6[1-35-9]|9[2-9]"]
+,[,"(\\d{2})(\\d{5,7})","$1 $2",["1|28|6(?:0[5-7]|[1-35-9])|9[2-9]"]
 ]
 ]
 ,,[,,,,,,,,,[-1]
@@ -6997,7 +6997,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"21\\d{6,7}|(?:1(?:[14]\\d|[2356])|2[235]|3(?:[13]\\d|4)|4[134]|5[1-3])\\d{6}",,,,,,,,[6,7]
 ]
-,[,,"9(?:22|[3-589]\\d|6[02-9])\\d{6}",,,,,,,[9]
+,[,,"9(?:22|[3-689]\\d)\\d{6}",,,,,,,[9]
 ]
 ,[,,,,,,,,,[-1]
 ]
@@ -8140,13 +8140,13 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
-,"800":[,[,,"[1-9]\\d{7}",,,,,,,[8]
+,"800":[,[,,"(?:005|[1-9]\\d\\d)\\d{5}",,,,,,,[8]
 ]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"[1-9]\\d{7}"]
+,[,,"(?:005|[1-9]\\d\\d)\\d{5}"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@@ -8155,7 +8155,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,"001",800,,,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2",["[1-9]"]
+,"001",800,,,,,,,,1,[[,"(\\d{4})(\\d{4})","$1 $2",["\\d"]
 ]
 ]
 ,,[,,,,,,,,,[-1]

diff --git a/release_notes.txt b/release_notes.txt
@@ -1,3 +1,10 @@
+Aug 17, 2021: v8.12.30
+Metadata changes:
+ - Updated phone metadata for region code(s): 800, AM, GL, KW, SG, SO, SY
+ - Updated carrier data for country calling code(s):
+   55 (en), 65 (en), 252 (en), 263 (en), 963 (en)
+ - Updated / refreshed time zone meta data.
+
 Aug 06, 2021: v8.12.29
 Code changes:
  - Updated As-You-Type-Formatter to exclude patterns where some digits would be dropped in the output. This also fixes the bug where an extra country code is added in some cases to the user's output. b/183053929

diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
@@ -759,7 +759,7 @@
             4[02-9]|
             5[0-46-9]|
             [6-8]\d|
-            90
+            9[01]
           )\d{4}
         </nationalNumberPattern>
       </voip>
@@ -11224,7 +11224,7 @@
         <numberFormat pattern="(\d{2})(\d{2})(\d{2})">
           <leadingDigits>
             19|
-            [2-689]
+            [2-9]
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -11233,7 +11233,8 @@
         <nationalNumberPattern>
           (?:
             19|
-            [2-689]\d
+            [2-689]\d|
+            70
           )\d{4}
         </nationalNumberPattern>
       </generalDesc>
@@ -11246,6 +11247,7 @@
             19|
             3[1-7]|
             6[14689]|
+            70|
             8[14-79]|
             9\d
           )\d{4}
@@ -17419,6 +17421,10 @@
                 22|
                 5[25]
               )|
+              7(?:
+                55|
+                77
+              )|
               88[58]
             )|
             6(?:
@@ -25530,7 +25536,7 @@
           )\d{5}
         </nationalNumberPattern>
       </fixedLine>
-      <!-- 8023 and 8041 are added based on user report.  -->
+      <!-- 8023 and 804[167] are added based on user report.  -->
       <mobile>
         <possibleLengths national="8"/>
         <exampleNumber>81234567</exampleNumber>
@@ -25540,7 +25546,7 @@
               0(?:
                 [13]\d|
                 2[013-9]|
-                4[015]
+                4[015-7]
               )|
               [1-8]\d\d|
               9(?:
@@ -26215,7 +26221,10 @@
           <leadingDigits>
             1|
             28|
-            6[1-35-9]|
+            6(?:
+              0[5-7]|
+              [1-35-9]
+            )|
             9[2-9]
           </leadingDigits>
           <format>$1 $2</format>
@@ -26259,25 +26268,32 @@
         <possibleLengths national="[7-9]"/>
         <exampleNumber>71123456</exampleNumber>
         <nationalNumberPattern>
-          28\d{5}|
-          (?:
-            6[1-9]|
-            79
-          )\d{6,7}|
           (?:
-            15|
-            24|
             (?:
-              3[59]|
-              4[89]|
-              8[08]
+              15|
+              (?:
+                3[59]|
+                4[89]|
+                79|
+                8[08]
+              )\d|
+              6(?:
+                0[5-7]|
+                [1-9]\d
+              )|
+              9(?:
+                0\d|
+                [2-9]
+              )
             )\d|
-            60|
-            7[1-8]|
-            9(?:
-              0\d|
-              [2-9]
+            2(?:
+              4\d|
+              8
             )
+          )\d{5}|
+          (?:
+            6\d|
+            7[1-9]
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -26644,8 +26660,7 @@
         <nationalNumberPattern>
           9(?:
             22|
-            [3-589]\d|
-            6[02-9]
+            [3-689]\d
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -30793,17 +30808,29 @@
     <territory id="001" countryCode="800">
       <availableFormats>
         <numberFormat pattern="(\d{4})(\d{4})">
-          <leadingDigits>[1-9]</leadingDigits>
+          <leadingDigits>\d</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[1-9]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            005|
+            [1-9]\d\d
+          )\d{5}
+        </nationalNumberPattern>
       </generalDesc>
+      <!-- SN number starting with '0' is added based on number mentioned in
+           https://www.lectra.com/en/contact and it is diallable from France (Orange network) -->
       <tollFree>
         <possibleLengths national="8"/>
         <exampleNumber>12345678</exampleNumber>
-        <nationalNumberPattern>[1-9]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            005|
+            [1-9]\d\d
+          )\d{5}
+        </nationalNumberPattern>
       </tollFree>
     </territory>