Keghani update 7.6.0 (#1289)

Aug 24, 2016: libphonenumber-7.6.0 Code changes: Refactored metadata loading and closed all streams after loading. Made isNumberGeographical public, and changed the geocoder to use this when checking whether to give a detailed answer or country-level only. Build changes: Use protobuf-javanano 3.0.0-alpha-7 from Maven Central. Metadata changes: Updated phone metadata for region code(s): EH, ET, JM, MA, SK, SN, SY, ZM Updated short number metadata for region code(s): ZA Updated geocoding data for country calling code(s): 212 (en) New carrier data for country calling code(s): 86 (zh, zh_Hant), 852 (zh, zh_Hant), 963 (en) Updated carrier data for country calling code(s): 86 (en), 212 (en), 251 (en), 421 (en) Deleted unsupported SingleFilePhoneNumberMetadataProto
google · Aug 24, 2016 · 24d8dc1 · 24d8dc1
1 parent ed02941
commit 24d8dc1
Show file tree

Hide file tree

Showing 40 changed files with 16,836 additions and 16,685 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -18,7 +18,7 @@ cmake_minimum_required (VERSION 2.8)
 
 project (libphonenumber)
 set (libphonenumber_VERSION_MAJOR 7)
-set (libphonenumber_VERSION_MINOR 5)
+set (libphonenumber_VERSION_MINOR 6)
 
 # Helper functions dealing with finding libraries and programs this library
 # depends on.

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/cpp/src/phonenumbers/short_metadata.cc b/cpp/src/phonenumbers/short_metadata.cc
@@ -2981,18 +2981,19 @@ static const unsigned char data[] = {
   0x28, 0x3F, 0x3A, 0x31, 0x32, 0x7C, 0x35, 0x29, 0x1A, 0x07, 0x5C, 0x64, 0x7B,
   0x32, 0x2C, 0x33, 0x7D, 0x32, 0x03, 0x31, 0x31, 0x32, 0xF2, 0x01, 0x08, 0x12,
   0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0xFA, 0x01, 0x08, 0x12, 0x02, 0x4E,
-  0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0xA9, 0x01, 0x0A, 0x16, 0x12, 0x0B, 0x5B,
-  0x31, 0x34, 0x5D, 0x5C, 0x64, 0x7B, 0x32, 0x2C, 0x34, 0x7D, 0x1A, 0x07, 0x5C,
-  0x64, 0x7B, 0x33, 0x2C, 0x35, 0x7D, 0x22, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A,
-  0x02, 0x4E, 0x41, 0x2A, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41,
-  0x4A, 0x02, 0x5A, 0x41, 0xDA, 0x01, 0x25, 0x12, 0x13, 0x31, 0x28, 0x3F, 0x3A,
-  0x30, 0x31, 0x28, 0x3F, 0x3A, 0x31, 0x31, 0x7C, 0x37, 0x37, 0x29, 0x7C, 0x31,
-  0x32, 0x29, 0x1A, 0x07, 0x5C, 0x64, 0x7B, 0x33, 0x2C, 0x35, 0x7D, 0x32, 0x05,
-  0x31, 0x30, 0x31, 0x31, 0x31, 0xEA, 0x01, 0x2B, 0x12, 0x19, 0x31, 0x28, 0x3F,
+  0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0xB6, 0x01, 0x0A, 0x17, 0x12, 0x0C, 0x5B,
+  0x31, 0x33, 0x34, 0x5D, 0x5C, 0x64, 0x7B, 0x32, 0x2C, 0x34, 0x7D, 0x1A, 0x07,
+  0x5C, 0x64, 0x7B, 0x33, 0x2C, 0x35, 0x7D, 0x22, 0x08, 0x12, 0x02, 0x4E, 0x41,
+  0x1A, 0x02, 0x4E, 0x41, 0x2A, 0x08, 0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E,
+  0x41, 0x4A, 0x02, 0x5A, 0x41, 0xDA, 0x01, 0x25, 0x12, 0x13, 0x31, 0x28, 0x3F,
   0x3A, 0x30, 0x31, 0x28, 0x3F, 0x3A, 0x31, 0x31, 0x7C, 0x37, 0x37, 0x29, 0x7C,
-  0x31, 0x32, 0x29, 0x7C, 0x34, 0x37, 0x37, 0x35, 0x31, 0x1A, 0x07, 0x5C, 0x64,
-  0x7B, 0x33, 0x2C, 0x35, 0x7D, 0x32, 0x05, 0x31, 0x30, 0x31, 0x31, 0x31, 0xF2,
-  0x01, 0x15, 0x12, 0x05, 0x34, 0x37, 0x37, 0x35, 0x31, 0x1A, 0x05, 0x5C, 0x64,
+  0x31, 0x32, 0x29, 0x1A, 0x07, 0x5C, 0x64, 0x7B, 0x33, 0x2C, 0x35, 0x7D, 0x32,
+  0x05, 0x31, 0x30, 0x31, 0x31, 0x31, 0xEA, 0x01, 0x31, 0x12, 0x1F, 0x31, 0x28,
+  0x3F, 0x3A, 0x30, 0x31, 0x28, 0x3F, 0x3A, 0x31, 0x31, 0x7C, 0x37, 0x37, 0x29,
+  0x7C, 0x31, 0x32, 0x29, 0x7C, 0x33, 0x37, 0x35, 0x36, 0x37, 0x7C, 0x34, 0x37,
+  0x37, 0x35, 0x31, 0x1A, 0x07, 0x5C, 0x64, 0x7B, 0x33, 0x2C, 0x35, 0x7D, 0x32,
+  0x05, 0x31, 0x30, 0x31, 0x31, 0x31, 0xF2, 0x01, 0x1B, 0x12, 0x0B, 0x33, 0x37,
+  0x35, 0x36, 0x37, 0x7C, 0x34, 0x37, 0x37, 0x35, 0x31, 0x1A, 0x05, 0x5C, 0x64,
   0x7B, 0x35, 0x7D, 0x32, 0x05, 0x34, 0x37, 0x37, 0x35, 0x31, 0xFA, 0x01, 0x08,
   0x12, 0x02, 0x4E, 0x41, 0x1A, 0x02, 0x4E, 0x41, 0x0A, 0x82, 0x01, 0x0A, 0x12,
   0x12, 0x09, 0x5B, 0x31, 0x39, 0x5D, 0x5C, 0x64, 0x7B, 0x32, 0x7D, 0x1A, 0x05,

diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh
diff --git a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh_Hant b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh_Hant
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/carrier/src/com/google/i18n/phonenumbers/carrier/data/config b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
diff --git a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN
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/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA
diff --git a/java/pending_code_changes.txt b/java/pending_code_changes.txt
@@ -1,8 +1 @@
- - Deleted unsupported SingleFilePhoneNumberMetadataProto.
-Code changes:
- - Refactored metadata loading and closed all streams after loading.
- - Made isNumberGeographical public, and changed the geocoder to
-   use this when checking whether to give a detailed answer or country-level
-   only.
-Build changes:
- - Use protobuf-javanano 3.0.0-alpha-7 from Maven Central.
+
diff --git a/java/release_notes.txt b/java/release_notes.txt
@@ -1,3 +1,21 @@
+Aug 24, 2016: libphonenumber-7.6.0
+Code changes:
+ - Refactored metadata loading and closed all streams after loading.
+ - Made isNumberGeographical public, and changed the geocoder to
+   use this when checking whether to give a detailed answer or country-level
+   only.
+Build changes:
+ - Use protobuf-javanano 3.0.0-alpha-7 from Maven Central.
+Metadata changes:
+ - Updated phone metadata for region code(s): EH, ET, JM, MA, SK, SN, SY, ZM
+ - Updated short number metadata for region code(s): ZA
+ - Updated geocoding data for country calling code(s): 212 (en)
+ - New carrier data for country calling code(s):
+   86 (zh, zh_Hant), 852 (zh, zh_Hant), 963 (en)
+ - Updated carrier data for country calling code(s):
+   86 (en), 212 (en), 251 (en), 421 (en)
+ - Deleted unsupported SingleFilePhoneNumberMetadataProto
+
 Aug 10, 2016: libphonenumber-7.5.2
 Metadata changes:
  - Updated phone metadata for region code(s): CO, IN, ME

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
@@ -1557,14 +1557,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ]
-,"EH":[,[,,"[5689]\\d{8}","\\d{9}"]
+,"EH":[,[,,"[5-9]\\d{8}","\\d{9}"]
 ,[,,"528[89]\\d{5}","\\d{9}",,,"528812345"]
-,[,,"6(?:0[0-8]|[12-79]\\d|8[017])\\d{6}","\\d{9}",,,"650123456"]
+,[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[07][07]|6[12]))\\d{6}","\\d{9}",,,"650123456"]
 ,[,,"80\\d{7}","\\d{9}",,,"801234567"]
 ,[,,"89\\d{7}","\\d{9}",,,"891234567"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"5924[01]\\d{4}","\\d{9}",,,"592401234"]
 ,"EH",212,"00","0",,,"0",,,,,,[,,"NA","NA"]
 ,,"528[89]",[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -1605,7 +1605,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"ET":[,[,,"[1-59]\\d{8}","\\d{7,9}"]
 ,[,,"(?:11(?:1(?:1[124]|2[2-57]|3[1-5]|5[5-8]|8[6-8])|2(?:13|3[6-8]|5[89]|7[05-9]|8[2-6])|3(?:2[01]|3[0-289]|4[1289]|7[1-4]|87)|4(?:1[69]|3[2-49]|4[0-3]|6[5-8])|5(?:1[578]|44|5[0-4])|6(?:18|2[69]|4[5-7]|5[1-5]|6[0-59]|8[015-8]))|2(?:2(?:11[1-9]|22[0-7]|33\\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|22[0-6]|33[0134689]|44[04]|55[0-6]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:11[1-9]|22[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\\d)))\\d{4}","\\d{7,9}",,,"111112345"]
-,[,,"9(?:[1-46]\\d|5[89])\\d{6}","\\d{9}",,,"911234567"]
+,[,,"9(?:[1-468]\\d|5[89])\\d{6}","\\d{9}",,,"911234567"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -2413,7 +2413,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"JM":[,[,,"[589]\\d{9}","\\d{7}(?:\\d{3})?"]
 ,[,,"876(?:5(?:0[12]|1[0-468]|2[35]|63)|6(?:0[1-3579]|1[027-9]|[23]\\d|40|5[06]|6[2-589]|7[05]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\\d|9[2-468]))\\d{4}","\\d{7}(?:\\d{3})?",,,"8765123456"]
-,[,,"876(?:2[16-9]\\d|[348]\\d{2}|5(?:0[3-9]|27|6[0-24-9]|[3-578]\\d)|7(?:0[07]|7\\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579]))\\d{4}","\\d{10}",,,"8762101234"]
+,[,,"876(?:2(?:[16-9]\\d|58)|[348]\\d{2}|5(?:0[3-9]|27|6[0-24-9]|[3-578]\\d)|7(?:0[07]|7\\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579]))\\d{4}","\\d{10}",,,"8762101234"]
 ,[,,"8(?:00|44|55|66|77|88)[2-9]\\d{6}","\\d{10}",,,"8002123456"]
 ,[,,"900[2-9]\\d{6}","\\d{10}",,,"9002123456"]
 ,[,,"NA","NA"]
@@ -2941,20 +2941,22 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ]
-,"MA":[,[,,"[5689]\\d{8}","\\d{9}"]
-,[,,"5(?:2(?:(?:[015-7]\\d|2[02-9]|3[2-57]|4[2-8]|8[235-7])\\d|9(?:0\\d|[89]0))|3(?:(?:[0-4]\\d|[57][2-9]|6[235-8]|9[3-9])\\d|8(?:0\\d|[89]0)))\\d{4}","\\d{9}",,,"520123456"]
-,[,,"6(?:0[0-8]|[12-79]\\d|8[017])\\d{6}","\\d{9}",,,"650123456"]
+,"MA":[,[,,"[5-9]\\d{8}","\\d{9}"]
+,[,,"5(?:2(?:(?:[015-7]\\d|2[02-9]|3[2-57]|4[2-8]|8[235-7])\\d|9(?:0\\d|[89]0))|3(?:(?:[0-4]\\d|[57][2-9]|6[235-8]|9[3-9])\\d|8(?:0\\d|[89]0))|(?:4[067]|5[03])\\d{2})\\d{4}","\\d{9}",,,"520123456"]
+,[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[07][07]|6[12]))\\d{6}","\\d{9}",,,"650123456"]
 ,[,,"80\\d{7}","\\d{9}",,,"801234567"]
 ,[,,"89\\d{7}","\\d{9}",,,"891234567"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,[,,"NA","NA"]
-,"MA",212,"00","0",,,"0",,,,[[,"([56]\\d{2})(\\d{6})","$1-$2",["5(?:2[015-7]|3[0-4])|6"]
+,[,,"5924[01]\\d{4}","\\d{9}",,,"592401234"]
+,"MA",212,"00","0",,,"0",,,,[[,"([5-7]\\d{2})(\\d{6})","$1-$2",["5(?:2[015-7]|3[0-4])|[67]"]
 ,"0$1"]
-,[,"([58]\\d{3})(\\d{5})","$1-$2",["5(?:2[2-489]|3[5-9])|892","5(?:2(?:[2-48]|90)|3(?:[5-79]|80))|892"]
+,[,"([58]\\d{3})(\\d{5})","$1-$2",["5(?:2[2-489]|3[5-9]|92)|892","5(?:2(?:[2-48]|90)|3(?:[5-79]|80)|924)|892"]
 ,"0$1"]
 ,[,"(5\\d{4})(\\d{4})","$1-$2",["5(?:29|38)","5(?:29|38)[89]"]
 ,"0$1"]
+,[,"([5]\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["5(?:4[067]|5[03])"]
+,"0$1"]
 ,[,"(8[09])(\\d{7})","$1-$2",["8(?:0|9[013-9])"]
 ,"0$1"]
 ]
@@ -4234,7 +4236,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"SK":[,[,,"(?:[2-68]\\d{5,8}|9\\d{6,8})","\\d{6,9}"]
 ,[,,"2(?:16\\d{3,4}|\\d{8})|[3-5](?:[1-8]16\\d{2,3}|\\d{8})","\\d{6,9}",,,"212345678"]
-,[,,"9(?:0(?:[1-8]\\d|9[1-9])|(?:1[0-24-9]|4[0489]|50)\\d)\\d{5}","\\d{9}",,,"912123456"]
+,[,,"9(?:0(?:[1-8]\\d|9[1-9])|(?:1[0-24-9]|4[04589]|50)\\d)\\d{5}","\\d{9}",,,"912123456"]
 ,[,,"800\\d{6}","\\d{9}",,,"800123456"]
 ,[,,"9(?:[78]\\d{7}|00\\d{6})","\\d{9}",,,"900123456"]
 ,[,,"8[5-9]\\d{7}","\\d{9}",,,"850123456"]
@@ -4302,7 +4304,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"SN":[,[,,"[3789]\\d{8}","\\d{9}"]
 ,[,,"3(?:0(?:1[0-2]|80)|282|3(?:8[1-9]|9[3-9])|611|90[1-5])\\d{5}","\\d{9}",,,"301012345"]
-,[,,"7(?:[067]\\d|21|8[0-46]|90)\\d{6}","\\d{9}",,,"701234567"]
+,[,,"7(?:[06-8]\\d|21|90)\\d{6}","\\d{9}",,,"701234567"]
 ,[,,"800\\d{6}","\\d{9}",,,"800123456"]
 ,[,,"88[4689]\\d{6}","\\d{9}",,,"884123456"]
 ,[,,"81[02468]\\d{6}","\\d{9}",,,"810123456"]
@@ -4425,7 +4427,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"SY":[,[,,"[1-59]\\d{7,8}","\\d{6,9}"]
 ,[,,"(?:1(?:1\\d?|4\\d|[2356])|2(?:1\\d?|[235])|3(?:[13]\\d|4)|4[13]|5[1-3])\\d{6}","\\d{6,9}",,,"112345678"]
-,[,,"9(?:22|[35][0-8]|4\\d|6[024-9]|88|9[0-489])\\d{6}","\\d{9}",,,"944567890"]
+,[,,"9(?:22|3[0-8]|[45]\\d|6[024-9]|88|9[0-489])\\d{6}","\\d{9}",,,"944567890"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -5025,7 +5027,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"ZM":[,[,,"[289]\\d{8}","\\d{9}"]
 ,[,,"21[1-8]\\d{6}","\\d{9}",,,"211234567"]
-,[,,"9(?:5[05]|6\\d|7[1-9])\\d{6}","\\d{9}",,,"955123456"]
+,[,,"9(?:5[034589]|[67]\\d)\\d{6}","\\d{9}",,,"955123456"]
 ,[,,"800\\d{6}","\\d{9}",,,"800123456"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]

diff --git a/javascript/i18n/phonenumbers/metadatafortesting.js b/javascript/i18n/phonenumbers/metadatafortesting.js
@@ -241,16 +241,18 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ]
-,"CN":[,[]
-,[]
-,[]
+,"CN":[,[,,"[1-7]\\d{6,11}|8[0-357-9]\\d{6,9}|9\\d{7,10}","\\d{4,12}"]
+,[,,"[2-9]\\d{10}","\\d{11}",,,"91234567"]
+,[,,"1(?:[38]\\d|4[57]|5[0-35-9]|7[0136-8])\\d{8}","\\d{11}",,,"13123456789"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,"CN",86,,,,,,,,1,[[,"(\\d{3})(\\d{5,6})","$1 $2",["[3-9]","[3-9]\\d{2}[19]","[3-9]\\d{2}(?:10|95)"]
-,"$1","$CC $1"]
+,"CN",86,,"0",,,"0",,,,[[,"(\\d{3})(\\d{5,6})","$1 $2",["[3-9]","[3-9]\\d{2}[19]","[3-9]\\d{2}(?:10|95)"]
+,"0$1","$CC $1"]
+,[,"(\\d{3})(\\d{8})","$1 $2",["1"]
+,"$1"]
 ]
 ,,[,,"NA","NA"]
 ,,,[,,"NA","NA"]

diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js
@@ -1557,14 +1557,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ]
-,"EH":[,[,,"[5689]\\d{8}","\\d{9}"]
+,"EH":[,[,,"[5-9]\\d{8}","\\d{9}"]
 ,[,,"528[89]\\d{5}","\\d{9}"]
-,[,,"6(?:0[0-8]|[12-79]\\d|8[017])\\d{6}","\\d{9}"]
+,[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[07][07]|6[12]))\\d{6}","\\d{9}"]
 ,[,,"80\\d{7}","\\d{9}"]
 ,[,,"89\\d{7}","\\d{9}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,[,,"NA","NA"]
+,[,,"5924[01]\\d{4}","\\d{9}"]
 ,"EH",212,"00","0",,,"0",,,,,,[,,"NA","NA"]
 ,,"528[89]",[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -1605,7 +1605,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"ET":[,[,,"[1-59]\\d{8}","\\d{7,9}"]
 ,[,,"(?:11(?:1(?:1[124]|2[2-57]|3[1-5]|5[5-8]|8[6-8])|2(?:13|3[6-8]|5[89]|7[05-9]|8[2-6])|3(?:2[01]|3[0-289]|4[1289]|7[1-4]|87)|4(?:1[69]|3[2-49]|4[0-3]|6[5-8])|5(?:1[578]|44|5[0-4])|6(?:18|2[69]|4[5-7]|5[1-5]|6[0-59]|8[015-8]))|2(?:2(?:11[1-9]|22[0-7]|33\\d|44[1467]|66[1-68])|5(?:11[124-6]|33[2-8]|44[1467]|55[14]|66[1-3679]|77[124-79]|880))|3(?:3(?:11[0-46-8]|22[0-6]|33[0134689]|44[04]|55[0-6]|66[01467])|4(?:44[0-8]|55[0-69]|66[0-3]|77[1-5]))|4(?:6(?:22[0-24-7]|33[1-5]|44[13-69]|55[14-689]|660|88[1-4])|7(?:11[1-9]|22[1-9]|33[13-7]|44[13-6]|55[1-689]))|5(?:7(?:227|55[05]|(?:66|77)[14-8])|8(?:11[149]|22[013-79]|33[0-68]|44[013-8]|550|66[1-5]|77\\d)))\\d{4}","\\d{7,9}"]
-,[,,"9(?:[1-46]\\d|5[89])\\d{6}","\\d{9}"]
+,[,,"9(?:[1-468]\\d|5[89])\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -2413,7 +2413,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"JM":[,[,,"[589]\\d{9}","\\d{7}(?:\\d{3})?"]
 ,[,,"876(?:5(?:0[12]|1[0-468]|2[35]|63)|6(?:0[1-3579]|1[027-9]|[23]\\d|40|5[06]|6[2-589]|7[05]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\\d|9[2-468]))\\d{4}","\\d{7}(?:\\d{3})?"]
-,[,,"876(?:2[16-9]\\d|[348]\\d{2}|5(?:0[3-9]|27|6[0-24-9]|[3-578]\\d)|7(?:0[07]|7\\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579]))\\d{4}","\\d{10}"]
+,[,,"876(?:2(?:[16-9]\\d|58)|[348]\\d{2}|5(?:0[3-9]|27|6[0-24-9]|[3-578]\\d)|7(?:0[07]|7\\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579]))\\d{4}","\\d{10}"]
 ,[,,"8(?:00|44|55|66|77|88)[2-9]\\d{6}","\\d{10}"]
 ,[,,"900[2-9]\\d{6}","\\d{10}"]
 ,[,,"NA","NA"]
@@ -2941,20 +2941,22 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ,,,[,,"NA","NA"]
 ]
-,"MA":[,[,,"[5689]\\d{8}","\\d{9}"]
-,[,,"5(?:2(?:(?:[015-7]\\d|2[02-9]|3[2-57]|4[2-8]|8[235-7])\\d|9(?:0\\d|[89]0))|3(?:(?:[0-4]\\d|[57][2-9]|6[235-8]|9[3-9])\\d|8(?:0\\d|[89]0)))\\d{4}","\\d{9}"]
-,[,,"6(?:0[0-8]|[12-79]\\d|8[017])\\d{6}","\\d{9}"]
+,"MA":[,[,,"[5-9]\\d{8}","\\d{9}"]
+,[,,"5(?:2(?:(?:[015-7]\\d|2[02-9]|3[2-57]|4[2-8]|8[235-7])\\d|9(?:0\\d|[89]0))|3(?:(?:[0-4]\\d|[57][2-9]|6[235-8]|9[3-9])\\d|8(?:0\\d|[89]0))|(?:4[067]|5[03])\\d{2})\\d{4}","\\d{9}"]
+,[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[07][07]|6[12]))\\d{6}","\\d{9}"]
 ,[,,"80\\d{7}","\\d{9}"]
 ,[,,"89\\d{7}","\\d{9}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,[,,"NA","NA"]
-,"MA",212,"00","0",,,"0",,,,[[,"([56]\\d{2})(\\d{6})","$1-$2",["5(?:2[015-7]|3[0-4])|6"]
+,[,,"5924[01]\\d{4}","\\d{9}"]
+,"MA",212,"00","0",,,"0",,,,[[,"([5-7]\\d{2})(\\d{6})","$1-$2",["5(?:2[015-7]|3[0-4])|[67]"]
 ,"0$1"]
-,[,"([58]\\d{3})(\\d{5})","$1-$2",["5(?:2[2-489]|3[5-9])|892","5(?:2(?:[2-48]|90)|3(?:[5-79]|80))|892"]
+,[,"([58]\\d{3})(\\d{5})","$1-$2",["5(?:2[2-489]|3[5-9]|92)|892","5(?:2(?:[2-48]|90)|3(?:[5-79]|80)|924)|892"]
 ,"0$1"]
 ,[,"(5\\d{4})(\\d{4})","$1-$2",["5(?:29|38)","5(?:29|38)[89]"]
 ,"0$1"]
+,[,"([5]\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["5(?:4[067]|5[03])"]
+,"0$1"]
 ,[,"(8[09])(\\d{7})","$1-$2",["8(?:0|9[013-9])"]
 ,"0$1"]
 ]
@@ -4234,7 +4236,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"SK":[,[,,"(?:[2-68]\\d{5,8}|9\\d{6,8})","\\d{6,9}"]
 ,[,,"2(?:16\\d{3,4}|\\d{8})|[3-5](?:[1-8]16\\d{2,3}|\\d{8})","\\d{6,9}"]
-,[,,"9(?:0(?:[1-8]\\d|9[1-9])|(?:1[0-24-9]|4[0489]|50)\\d)\\d{5}","\\d{9}"]
+,[,,"9(?:0(?:[1-8]\\d|9[1-9])|(?:1[0-24-9]|4[04589]|50)\\d)\\d{5}","\\d{9}"]
 ,[,,"800\\d{6}","\\d{9}"]
 ,[,,"9(?:[78]\\d{7}|00\\d{6})","\\d{9}"]
 ,[,,"8[5-9]\\d{7}","\\d{9}"]
@@ -4302,7 +4304,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"SN":[,[,,"[3789]\\d{8}","\\d{9}"]
 ,[,,"3(?:0(?:1[0-2]|80)|282|3(?:8[1-9]|9[3-9])|611|90[1-5])\\d{5}","\\d{9}"]
-,[,,"7(?:[067]\\d|21|8[0-46]|90)\\d{6}","\\d{9}"]
+,[,,"7(?:[06-8]\\d|21|90)\\d{6}","\\d{9}"]
 ,[,,"800\\d{6}","\\d{9}"]
 ,[,,"88[4689]\\d{6}","\\d{9}"]
 ,[,,"81[02468]\\d{6}","\\d{9}"]
@@ -4425,7 +4427,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"SY":[,[,,"[1-59]\\d{7,8}","\\d{6,9}"]
 ,[,,"(?:1(?:1\\d?|4\\d|[2356])|2(?:1\\d?|[235])|3(?:[13]\\d|4)|4[13]|5[1-3])\\d{6}","\\d{6,9}"]
-,[,,"9(?:22|[35][0-8]|4\\d|6[024-9]|88|9[0-489])\\d{6}","\\d{9}"]
+,[,,"9(?:22|3[0-8]|[45]\\d|6[024-9]|88|9[0-489])\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -5025,7 +5027,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"ZM":[,[,,"[289]\\d{8}","\\d{9}"]
 ,[,,"21[1-8]\\d{6}","\\d{9}"]
-,[,,"9(?:5[05]|6\\d|7[1-9])\\d{6}","\\d{9}"]
+,[,,"9(?:5[034589]|[67]\\d)\\d{6}","\\d{9}"]
 ,[,,"800\\d{6}","\\d{9}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]