Merge branch 'google:master' into rename-nongeographicalregion

.github/workflows/osv-scanner-unified.yml

@@ -35,7 +35,7 @@ jobs:
   scan-scheduled:
     if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
     # If you want to copy this config, highly suggest pinning this version to a release rather than tracking the main branch
-    uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
     with:
        # Just scan the root directory and docs, since everything else is fixtures
       scan-args: |-
@@ -45,7 +45,7 @@ jobs:
   scan-pr:
     if: ${{ github.event_name == 'pull_request' || github.event_name == 'merge_group' }}
     # If you want to copy this config, highly suggest pinning this version to a release rather than tracking the main branch
-    uses: google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable-pr.yml@8bd1ce1c4be9d98053ffd9e6e14585276a36762c" # v1.9.1
     with:
       # Just scan the root directory and docs, since everything else is fixtures
       scan-args: |-

.gitignore

@@ -1,5 +1,14 @@
-target/
-!tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar
-build/
-lib/
-generated/
+# Ignore build directories and any files generated by the update script.
+cpp/build/
+cpp/src/phonenumbers/geocoding/geocoding_data.cc
+cpp/src/phonenumbers/phonemetadata.pb.*
+cpp/src/phonenumbers/phonenumber.pb.*
+cpp/test/phonenumbers/geocoding/geocoding_test_data.cc
+java/build/
+java/demo/war/WEB-INF/classes/
+java/demo/war/WEB-INF/lib/
+java/**/target/
+# Ignore the logs directory
+/logs/
+# Ignore ourselves because this is not intended to be submitted.
+/.gitignore

README.md

@@ -55,7 +55,7 @@ Cream Sandwich).
 The [Java demo](https://libphonenumber.appspot.com/) is updated with a slight
 delay after the GitHub release.
 
-Last demo update: v8.13.51.
+Last demo update: v8.13.53.
 
 Note: Even though the library (main branch/[maven release](https://repo1.maven.org/maven2/com/googlecode/libphonenumber/libphonenumber/8.12.56/))
 is at v8.12.57, because of some deployment issues, we were unable to update the

cpp/src/phonenumbers/phonenumberutil.cc

@@ -1710,6 +1710,17 @@ void PhoneNumberUtil::FormatOutOfCountryKeepingAlphaChars(
     PrefixNumberWithCountryCallingCode(country_code, INTERNATIONAL,
                                        formatted_number);
   }
+  std::string region_code;
+  GetRegionCodeForCountryCode(country_code, &region_code);
+  // Metadata cannot be null because the country code is valid.
+  const PhoneMetadata* metadata_for_region =
+      GetMetadataForRegionOrCallingCode(country_code, region_code);
+  // Strip any extension
+  std::string extension;
+  MaybeStripExtension(formatted_number, &extension);
+  // Append the formatted extension
+  MaybeAppendFormattedExtension(number, *metadata_for_region, INTERNATIONAL,
+                                formatted_number);
 }
 
 const NumberFormat* PhoneNumberUtil::ChooseFormattingPatternForNumber(

cpp/src/phonenumbers/phonenumberutil.h

@@ -531,6 +531,13 @@ class PhoneNumberUtil : public Singleton<PhoneNumberUtil> {
   //      would most likely be area codes) and length (obviously includes the
   //      length of area codes for fixed line numbers), it will return false for
   //      the subscriber-number-only version.
+  //
+  // There is a known issue with this method: if a number is possible only in a
+  // certain region among several regions that share the same country calling
+  // code, this method will consider only the "main" region. For example,
+  // +1310xxxx are valid numbers in Canada. However, they are not possible in
+  // the US. As a result, this method will return false for +1310xxxx. See
+  // https://issuetracker.google.com/issues/335892662 for more details.
   ValidationResult IsPossibleNumberWithReason(const PhoneNumber& number) const;
 
   // Convenience wrapper around IsPossibleNumberWithReason(). Instead of
@@ -565,6 +572,13 @@ class PhoneNumberUtil : public Singleton<PhoneNumberUtil> {
   //      would most likely be area codes) and length (obviously includes the
   //      length of area codes for fixed line numbers), it will return false for
   //      the subscriber-number-only version.
+  //
+  // There is a known issue with this method: if a number is possible only in a
+  // certain region among several regions that share the same country calling
+  // code, this method will consider only the "main" region. For example,
+  // +1310xxxx are valid numbers in Canada. However, they are not possible in
+  // the US. As a result, this method will return false for +1310xxxx. See
+  // https://issuetracker.google.com/issues/335892662 for more details.
   ValidationResult IsPossibleNumberForTypeWithReason(
       const PhoneNumber& number, PhoneNumberType type) const;
 

cpp/test/phonenumbers/phonenumberutil_test.cc

@@ -935,6 +935,16 @@ TEST_F(PhoneNumberUtilTest, FormatOutOfCountryKeepingAlphaChars) {
                                                   &formatted_number);
   EXPECT_EQ("1 800 SIX-FLAG", formatted_number);
 
+  // Testing a number with extension.
+  formatted_number.clear();
+  PhoneNumber alpha_numeric_number_with_extn;
+  phone_util_.ParseAndKeepRawInput("800 SIX-flag ext. 1234", RegionCode::US(),
+                                   &alpha_numeric_number_with_extn);
+  // preferredExtnPrefix for US is " extn. " (in test metadata)
+  phone_util_.FormatOutOfCountryKeepingAlphaChars(
+      alpha_numeric_number_with_extn, RegionCode::AU(), &formatted_number);
+  EXPECT_EQ("0011 1 800 SIX-FLAG extn. 1234", formatted_number);
+
   // Testing that if the raw input doesn't exist, it is formatted using
   // FormatOutOfCountryCallingNumber.
   alpha_numeric_number.clear_raw_input();

java/carrier/pom.xml

@@ -1,17 +1,15 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>carrier</artifactId>
-  <version>1.236-SNAPSHOT</version>
+  <version>1.238-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.52-SNAPSHOT</version>
+    <version>8.13.54-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -83,12 +81,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.52-SNAPSHOT</version>
+      <version>8.13.54-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.246-SNAPSHOT</version>
+      <version>2.248-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

java/demo/pom.xml

@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>8.13.52-SNAPSHOT</version>
+  <version>8.13.54-SNAPSHOT</version>
   <packaging>war</packaging>
   <url>https://github.com/google/libphonenumber/</url>
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.52-SNAPSHOT</version>
+    <version>8.13.54-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -68,17 +68,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.52-SNAPSHOT</version>
+      <version>8.13.54-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.246-SNAPSHOT</version>
+      <version>2.248-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>1.236-SNAPSHOT</version>
+      <version>1.238-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

java/demo/src/main/resources/com/google/phonenumbers/demo/result.soy

@@ -101,44 +101,42 @@
       <TH>Result from isPossibleNumber()</TH>
       <TD>{$isPossibleNumber}</TD>
     </TR>
-{if $isPossibleNumber}
-  {if $validationResult == "IS_POSSIBLE_LOCAL_ONLY"}
     <TR>
       <TH>Result from isPossibleNumberWithReason()</TH>
       <TD>{$validationResult}</TD>
     </TR>
-    <TR>
-      <TD colspan=2>Number is considered invalid as it is not a possible national number.</TD>
-    </TR>
-  {else}
     <TR>
       <TH>Result from isValidNumber()</TH>
       <TD>{$isValidNumber}</TD>
     </TR>
+    {if $isValidNumber}
+     {if $validationResult != "IS_POSSIBLE"}
+      <TR>
+        <TD colspan=2 style="color:red">
+          Warning: This number represents a known <a href="https://issuetracker.google.com/issues/335892662">
+          edge case</a> - it is a valid number, but it is not considered (strictly) possible
+        </TD>
+      </TR>
+    {/if}
     {if $isValidNumberForRegion != null}
-    <TR>
-      <TH>Result from isValidNumberForRegion()</TH>
-      <TD>{$isValidNumberForRegion}</TD>
-    </TR>
+      <TR>
+        <TH>Result from isValidNumberForRegion()</TH>
+        <TD>{$isValidNumberForRegion}</TD>
+      </TR>
     {/if}
     <TR>
       <TH>Phone Number region</TH>
-      <TD>{$phoneNumberRegion ?: ""}</TD>
+      <TD>{$phoneNumberRegion}</TD>
     </TR>
     <TR>
       <TH>Result from getNumberType()</TH>
       <TD>{$numberType}</TD>
     </TR>
-  {/if}
-{else}
-    <TR>
-      <TH>Result from isPossibleNumberWithReason()</TH>
-      <TD>{$validationResult}</TD>
-    </TR>
-    <TR>
-      <TD colspan=2>Note: Numbers that are not possible have type UNKNOWN, an unknown region, and are considered invalid.</TD>
-    </TR>
-{/if}
+    {else}
+     <TR>
+       <TD colspan=2>Note: Invalid numbers have type UNKNOWN and no region.</TD>
+     </TR>
+     {/if}
   </TABLE>
 </DIV>
 

java/geocoder/pom.xml

@@ -1,17 +1,15 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geocoder</artifactId>
-  <version>2.246-SNAPSHOT</version>
+  <version>2.248-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.52-SNAPSHOT</version>
+    <version>8.13.54-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -93,12 +91,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.52-SNAPSHOT</version>
+      <version>8.13.54-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.246-SNAPSHOT</version>
+      <version>2.248-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

java/internal/prefixmapper/pom.xml

@@ -1,17 +1,15 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>prefixmapper</artifactId>
-  <version>2.246-SNAPSHOT</version>
+  <version>2.248-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.52-SNAPSHOT</version>
+    <version>8.13.54-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -85,7 +83,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.52-SNAPSHOT</version>
+      <version>8.13.54-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

java/libphonenumber/pom.xml

@@ -1,17 +1,15 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>libphonenumber</artifactId>
-  <version>8.13.52-SNAPSHOT</version>
+  <version>8.13.54-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.52-SNAPSHOT</version>
+    <version>8.13.54-SNAPSHOT</version>
   </parent>
 
   <build>

java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java

@@ -1878,8 +1878,11 @@ public class PhoneNumberUtil {
     String regionCode = getRegionCodeForCountryCode(countryCode);
     // Metadata cannot be null because the country calling code is valid.
     PhoneMetadata metadataForRegion = getMetadataForRegionOrCallingCode(countryCode, regionCode);
-    maybeAppendFormattedExtension(number, metadataForRegion,
-                                  PhoneNumberFormat.INTERNATIONAL, formattedNumber);
+    // Strip any extension
+    maybeStripExtension(formattedNumber);
+    // Append the formatted extension
+    maybeAppendFormattedExtension(
+        number, metadataForRegion, PhoneNumberFormat.INTERNATIONAL, formattedNumber);
     if (internationalPrefixForFormatting.length() > 0) {
       formattedNumber.insert(0, " ").insert(0, countryCode).insert(0, " ")
           .insert(0, internationalPrefixForFormatting);
@@ -2713,6 +2716,13 @@ public class PhoneNumberUtil {
    *        length (obviously includes the length of area codes for fixed line numbers), it will
    *        return false for the subscriber-number-only version.
    * </ol>
+   *
+   * <p>There is a known <a href="https://issuetracker.google.com/issues/335892662">issue</a> with this
+   * method: if a number is possible only in a certain region among several regions that share the
+   * same country calling code, this method will consider only the "main" region. For example,
+   * +1310xxxx are valid numbers in Canada. However, they are not possible in the US. As a result,
+   * this method will return IS_POSSIBLE_LOCAL_ONLY for +1310xxxx.
+   *
    * @param number  the number that needs to be checked
    * @return  a ValidationResult object which indicates whether the number is possible
    */
@@ -2742,6 +2752,12 @@ public class PhoneNumberUtil {
    *        return false for the subscriber-number-only version.
    * </ol>
    *
+   * <p>There is a known <a href="https://issuetracker.google.com/issues/335892662">issue</a> with this
+   * method: if a number is possible only in a certain region among several regions that share the
+   * same country calling code, this method will consider only the "main" region. For example,
+   * +1310xxxx are valid numbers in Canada. However, they are not possible in the US. As a result,
+   * this method will return IS_POSSIBLE_LOCAL_ONLY for +1310xxxx.
+   *
    * @param number  the number that needs to be checked
    * @param type  the type we are interested in
    * @return  a ValidationResult object which indicates whether the number is possible

java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java

@@ -675,7 +675,7 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
                  phoneUtil.formatOutOfCountryCallingNumber(IT_NUMBER, RegionCode.UZ));
   }
 
-  public void testFormatOutOfCountryKeepingAlphaChars() {
+  public void testFormatOutOfCountryKeepingAlphaChars() throws Exception {
     PhoneNumber alphaNumericNumber = new PhoneNumber();
     alphaNumericNumber.setCountryCode(1).setNationalNumber(8007493524L)
         .setRawInput("1800 six-flag");
@@ -701,6 +701,13 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase {
     assertEquals("1 800 SIX-FLAG",
                  phoneUtil.formatOutOfCountryKeepingAlphaChars(alphaNumericNumber, RegionCode.BS));
 
+    // Testing a number with extension.
+    PhoneNumber alphaNumericNumberWithExtn =
+        phoneUtil.parseAndKeepRawInput("800 SIX-flag ext. 1234", RegionCode.US);
+    assertEquals(
+        "0011 1 800 SIX-FLAG extn. 1234",
+        phoneUtil.formatOutOfCountryKeepingAlphaChars(alphaNumericNumberWithExtn, RegionCode.AU));
+
     // Testing that if the raw input doesn't exist, it is formatted using
     // formatOutOfCountryCallingNumber.
     alphaNumericNumber.clearRawInput();

java/pom.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber-parent</artifactId>
-  <version>8.13.52-SNAPSHOT</version>
+  <version>8.13.54-SNAPSHOT</version>
   <packaging>pom</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 

javascript/i18n/phonenumbers/demo-compiled.js

@@ -7,9 +7,9 @@ var ba="function"==typeof Object.defineProperties?Object.defineProperty:function
 function ea(a,b){if(b)a:{var c=da;a=a.split(".");for(var d=0;d<a.length-1;d++){var f=a[d];if(!(f in c))break a;c=c[f]}a=a[a.length-1];d=c[a];b=b(d);b!=d&&null!=b&&ba(c,a,{configurable:!0,writable:!0,value:b})}}ea("Object.is",function(a){return a?a:function(b,c){return b===c?0!==b||1/b===1/c:b!==b&&c!==c}});
 ea("Array.prototype.includes",function(a){return a?a:function(b,c){var d=this;d instanceof String&&(d=String(d));var f=d.length;c=c||0;for(0>c&&(c=Math.max(c+f,0));c<f;c++){var e=d[c];if(e===b||Object.is(e,b))return!0}return!1}});
 ea("String.prototype.includes",function(a){return a?a:function(b,c){if(null==this)throw new TypeError("The 'this' value for String.prototype.includes must not be null or undefined");if(b instanceof RegExp)throw new TypeError("First argument to String.prototype.includes must not be a regular expression");return-1!==this.indexOf(b,c||0)}});var fa=this||self;function na(a){a.ka=void 0;a.ja=function(){return a.ka?a.ka:a.ka=new a}}
-function k(a,b){function c(){}c.prototype=b.prototype;a.la=b.prototype;a.prototype=new c;a.prototype.constructor=a;a.ua=function(d,f,e){for(var g=Array(arguments.length-2),h=2;h<arguments.length;h++)g[h-2]=arguments[h];return b.prototype[f].apply(d,g)}};function oa(a){if(Error.captureStackTrace)Error.captureStackTrace(this,oa);else{var b=Error().stack;b&&(this.stack=b)}a&&(this.message=String(a))}k(oa,Error);oa.prototype.name="CustomError";function pa(a,b){a=a.split("%s");for(var c="",d=a.length-1,f=0;f<d;f++)c+=a[f]+(f<b.length?b[f]:"%s");oa.call(this,c+a[d])}k(pa,oa);pa.prototype.name="AssertionError";function qa(a,b){throw new pa("Failure"+(a?": "+a:""),Array.prototype.slice.call(arguments,1));};function ra(a,b){a.sort(b||sa)}function sa(a,b){return a>b?1:a<b?-1:0};function ta(a){var b=[],c=0,d;for(d in a)b[c++]=a[d];return b}function ua(a,b){a:{for(var c in a)if(b.call(void 0,a[c],c,a)){b=c;break a}b=void 0}return b&&a[b]};function va(a){return String(a).replace(/\-([a-z])/g,function(b,c){return c.toUpperCase()})};function wa(a){var b=document;return"string"===typeof a?b.getElementById(a):a};function xa(a,b){this.g=a;this.o=b.name;this.j=!!b.aa;this.h=b.i;this.u=b.type;this.s=!1;switch(this.h){case ya:case za:case Ea:case Fa:case Ga:case Ha:case Ia:this.s=!0}this.l=b.defaultValue}var Ia=1,Ha=2,ya=3,za=4,Ea=6,Fa=16,Ga=18;function Ja(a,b){this.h=a;this.g={};for(a=0;a<b.length;a++){var c=b[a];this.g[c.g]=c}}function Ka(a){a=ta(a.g);ra(a,function(b,c){return b.g-c.g});return a}function La(a,b){return ua(a.g,function(c){return c.o==b})||null};function l(){this.h={};this.j=this.m().g;this.g=this.l=null}function Ma(a,b){for(var c in a.h){var d=Number(c);a.j[d]||b.call(a,d,a.h[c])}}l.prototype.has=function(a){return n(this,a.g)};l.prototype.get=function(a,b){return q(this,a.g,b)};l.prototype.set=function(a,b){t(this,a.g,b)};l.prototype.add=function(a,b){Na(this,a.g,b)};
+function k(a,b){function c(){}c.prototype=b.prototype;a.la=b.prototype;a.prototype=new c;a.prototype.constructor=a;a.ua=function(d,f,e){for(var g=Array(arguments.length-2),h=2;h<arguments.length;h++)g[h-2]=arguments[h];return b.prototype[f].apply(d,g)}};function oa(a){if(Error.captureStackTrace)Error.captureStackTrace(this,oa);else{var b=Error().stack;b&&(this.stack=b)}a&&(this.message=String(a))}k(oa,Error);oa.prototype.name="CustomError";function pa(a,b){a=a.split("%s");for(var c="",d=a.length-1,f=0;f<d;f++)c+=a[f]+(f<b.length?b[f]:"%s");oa.call(this,c+a[d])}k(pa,oa);pa.prototype.name="AssertionError";function qa(a,b){throw new pa("Failure"+(a?": "+a:""),Array.prototype.slice.call(arguments,1));};function ra(a,b){a.sort(b||sa)}function sa(a,b){return a>b?1:a<b?-1:0};function ta(a){var b=[],c=0,d;for(d in a)b[c++]=a[d];return b}function ua(a,b){a:{for(var c in a)if(b.call(void 0,a[c],c,a)){b=c;break a}b=void 0}return b&&a[b]};function va(a){return String(a).replace(/\-([a-z])/g,function(b,c){return c.toUpperCase()})};function wa(a){var b=document;return"string"===typeof a?b.getElementById(a):a};function xa(a,b){this.g=a;this.o=b.name;this.j=!!b.aa;this.h=b.i;this.u=b.type;this.s=!1;switch(this.h){case ya:case za:case Ea:case Fa:case Ga:case Ha:case Ia:this.s=!0}this.l=b.defaultValue}var Ia=1,Ha=2,ya=3,za=4,Ea=6,Fa=16,Ga=18;function Ja(a,b){this.h=a;this.g={};for(a=0;a<b.length;a++){var c=b[a];this.g[c.g]=c}}function Ka(a){a=ta(a.g);ra(a,function(b,c){return b.g-c.g});return a}function La(a,b){return ua(a.g,function(c){return c.o==b})||null};function l(){this.h={};this.j=this.m().g;this.g=this.l=null}function Ma(a,b){for(var c in a.h){var d=Number(c);a.j[d]||b.call(a,d,a.h[c])}}l.prototype.has=function(a){return n(this,a.g)};l.prototype.get=function(a,b){return p(this,a.g,b)};l.prototype.set=function(a,b){t(this,a.g,b)};l.prototype.add=function(a,b){Na(this,a.g,b)};
 function Oa(a,b){for(var c=Ka(a.m()),d=0;d<c.length;d++){var f=c[d],e=f.g;if(n(b,e)){a.g&&delete a.g[f.g];var g=11==f.h||10==f.h;if(f.j){f=u(b,e);for(var h=0;h<f.length;h++)Na(a,e,g?f[h].clone():f[h])}else f=Pa(b,e),g?(g=Pa(a,e))?Oa(g,f):t(a,e,f.clone()):t(a,e,f)}}}l.prototype.clone=function(){var a=new this.constructor;a!=this&&(a.h={},a.g&&(a.g={}),Oa(a,this));return a};function n(a,b){return null!=a.h[b]}
-function Pa(a,b){var c=a.h[b];if(null==c)return null;if(a.l){if(!(b in a.g)){var d=a.l,f=a.j[b];if(null!=c)if(f.j){for(var e=[],g=0;g<c.length;g++)e[g]=d.g(f,c[g]);c=e}else c=d.g(f,c);return a.g[b]=c}return a.g[b]}return c}function q(a,b,c){var d=Pa(a,b);return a.j[b].j?d[c||0]:d}function v(a,b){if(n(a,b))a=q(a,b,void 0);else a:{a=a.j[b];if(void 0===a.l)if(b=a.u,b===Boolean)a.l=!1;else if(b===Number)a.l=0;else if(b===String)a.l=a.s?"0":"";else{a=new b;break a}a=a.l}return a}
+function Pa(a,b){var c=a.h[b];if(null==c)return null;if(a.l){if(!(b in a.g)){var d=a.l,f=a.j[b];if(null!=c)if(f.j){for(var e=[],g=0;g<c.length;g++)e[g]=d.g(f,c[g]);c=e}else c=d.g(f,c);return a.g[b]=c}return a.g[b]}return c}function p(a,b,c){var d=Pa(a,b);return a.j[b].j?d[c||0]:d}function v(a,b){if(n(a,b))a=p(a,b,void 0);else a:{a=a.j[b];if(void 0===a.l)if(b=a.u,b===Boolean)a.l=!1;else if(b===Number)a.l=0;else if(b===String)a.l=a.s?"0":"";else{a=new b;break a}a=a.l}return a}
 function u(a,b){return Pa(a,b)||[]}function w(a,b){return a.j[b].j?n(a,b)?a.h[b].length:0:n(a,b)?1:0}function t(a,b,c){a.h[b]=c;a.g&&(a.g[b]=c)}function Na(a,b,c){a.h[b]||(a.h[b]=[]);a.h[b].push(c);a.g&&delete a.g[b]}function Qa(a,b){delete a.h[b];a.g&&delete a.g[b]}function Ra(a,b){var c=[],d;for(d in b)0!=d&&c.push(new xa(d,b[d]));return new Ja(a,c)};function x(){}x.prototype.h=function(a,b){return 11==a.h||10==a.h?this.l(b):"number"!==typeof b||isFinite(b)?b:b.toString()};x.prototype.j=function(a,b){a=new a.h;this.o(a,b);return a};
 x.prototype.g=function(a,b){if(11==a.h||10==a.h)return b instanceof l?b:this.j(a.u.prototype.m(),b);if(14==a.h)return"string"===typeof b&&$a.test(b)&&(a=Number(b),0<a)?a:b;if(!a.s)return b;a=a.u;if(a===String){if("number"===typeof b)return String(b)}else if(a===Number&&"string"===typeof b&&("Infinity"===b||"-Infinity"===b||"NaN"===b||$a.test(b)))return Number(b);return b};var $a=/^-?[0-9]+$/;function y(a,b,c){this.s=a;this.v=b;this.u=c}k(y,x);y.prototype.l=function(a){for(var b=Ka(a.m()),c={},d=0;d<b.length;d++){var f=b[d],e=f.g;switch(this.s){case 1:e=f.o;break;case 2:e=va(f.o.replace(/_/g,"-"))}if(a.has(f))if(f.j){var g=[];c[e]=g;for(e=0;e<w(a,f.g);e++)g.push(this.h(f,a.get(f,e)))}else c[e]=this.h(f,a.get(f))}Ma(a,function(h,m){c[h]=m});return c};y.prototype.h=function(a,b){return this.v&&8==a.h&&"boolean"===typeof b?b?1:0:y.la.h.call(this,a,b)};
 y.prototype.g=function(a,b){return 8==a.h&&"number"===typeof b?!!b:y.la.g.call(this,a,b)};y.prototype.o=function(a,b){var c=a.m(),d;for(d in b){var f=b[d],e=!/[^0-9]/.test(d);if(e)var g=c.g[parseInt(d,10)]||null;else 2==this.s&&(d=String(d).replace(/([A-Z])/g,"-$1").toLowerCase().replace(/\-/g,"_")),g=La(c,d);if(g)if(g.j)for(e=0;e<f.length;e++)a.add(g,this.g(g,f[e]));else a.set(g,this.g(g,f));else e?(g=a,e=Number(d),g.h[e]=f,g.g&&delete g.g[e]):this.u||qa("Failed to find field: "+d)}};function z(a,b){null!=a&&this.g.apply(this,arguments)}z.prototype.h="";z.prototype.set=function(a){this.h=""+a};z.prototype.g=function(a,b,c){this.h+=String(a);if(null!=b)for(var d=1;d<arguments.length;d++)this.h+=arguments[d];return this};function A(a){a.h=""}z.prototype.toString=function(){return this.h};/*
@@ -181,7 +181,7 @@ CG:[,[,,"222\\d{6}|(?:0\\d|80)\\d{7}",,,,,,,[9]],[,,"222[1-589]\\d{5}",,,,"22212
 ,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],EE:[,[,,"8\\d{9}|[4578]\\d{7}|(?:[3-8]\\d|90)\\d{5}",,,,,,,[7,8,10]],[,,"(?:3[23589]|4[3-8]|6\\d|7[1-9]|88)\\d{5}",,,,"3212345",,,[7]],[,,"(?:5\\d{5}|8(?:1(?:0(?:0(?:00|[178]\\d)|[3-9]\\d\\d)|(?:1(?:0[2-6]|1\\d)|(?:2[0-59]|[3-79]\\d)\\d)\\d)|2(?:0(?:0(?:00|4\\d)|(?:19|[2-7]\\d)\\d)|(?:(?:[124-69]\\d|3[5-9])\\d|7(?:[0-79]\\d|8[13-9])|8(?:[2-6]\\d|7[01]))\\d)|[349]\\d{4}))\\d\\d|5(?:(?:[02]\\d|5[0-478])\\d|1(?:[0-8]\\d|95)|6(?:4[0-4]|5[1-589]))\\d{3}",
 ,,,"51234567",,,[7,8]],[,,"800(?:(?:0\\d\\d|1)\\d|[2-9])\\d{3}",,,,"80012345"],[,,"(?:40\\d\\d|900)\\d{4}",,,,"9001234",,,[7,8]],[,,,,,,,,,[-1]],[,,"70[0-2]\\d{5}",,,,"70012345",,,[8]],[,,,,,,,,,[-1]],"EE",372,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[369]|4[3-8]|5(?:[0-2]|5[0-478]|6[45])|7[1-9]|88","[369]|4[3-8]|5(?:[02]|1(?:[0-8]|95)|5[0-478]|6(?:4[0-4]|5[1-589]))|7[1-9]|88"]],[,"(\\d{4})(\\d{3,4})","$1 $2",["[45]|8(?:00|[1-49])","[45]|8(?:00[1-9]|[1-49])"]],[,"(\\d{2})(\\d{2})(\\d{4})","$1 $2 $3",
 ["7"]],[,"(\\d{4})(\\d{3})(\\d{3})","$1 $2 $3",["8"]]],,[,,,,,,,,,[-1]],,,[,,"800[2-9]\\d{3}",,,,,,,[7]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],EG:[,[,,"[189]\\d{8,9}|[24-6]\\d{8}|[135]\\d{7}",,,,,,,[8,9,10],[6,7]],[,,"13[23]\\d{6}|(?:15|57)\\d{6,7}|(?:2\\d|3|4[05-8]|5[05]|6[24-689]|8[2468]|9[235-7])\\d{7}",,,,"234567890",,,[8,9],[6,7]],[,,"1[0-25]\\d{8}",,,,"1001234567",,,[10]],[,,"800\\d{7}",,,,"8001234567",,,[10]],[,,"900\\d{7}",,,,"9001234567",,,[10]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],
-"EG",20,"00","0",,,"0",,,,[[,"(\\d)(\\d{7,8})","$1 $2",["[23]"],"0$1"],[,"(\\d{2})(\\d{6,7})","$1 $2",["1[35]|[4-6]|8[2468]|9[235-7]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[89]"],"0$1"],[,"(\\d{2})(\\d{8})","$1 $2",["1"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],EH:[,[,,"[5-8]\\d{8}",,,,,,,[9]],[,,"528[89]\\d{5}",,,,"528812345"],[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}",,,,"650123456"],[,,"80[0-7]\\d{6}",,,,"801234567"],
+"EG",20,"00","0",,,"0",,,,[[,"(\\d)(\\d{7,8})","$1 $2",["[23]"],"0$1"],[,"(\\d{2})(\\d{6,7})","$1 $2",["1[35]|[4-6]|8[2468]|9[235-7]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[89]"],"0$1"],[,"(\\d{2})(\\d{8})","$1 $2",["1"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],EH:[,[,,"[5-8]\\d{8}",,,,,,,[9]],[,,"528[89]\\d{5}",,,,"528812345"],[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-467]|5[0-3]|8[0-5]))\\d{6}",,,,"650123456"],[,,"80[0-7]\\d{6}",,,,"801234567"],
 [,,"89\\d{7}",,,,"891234567"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"(?:592(?:4[0-2]|93)|80[89]\\d\\d)\\d{4}",,,,"592401234"],"EH",212,"00","0",,,"0",,,,,,[,,,,,,,,,[-1]],,"528[89]",[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],ER:[,[,,"[178]\\d{6}",,,,,,,[7],[6]],[,,"(?:1(?:1[12568]|[24]0|55|6[146])|8\\d\\d)\\d{4}",,,,"8370362",,,,[6]],[,,"(?:17[1-3]|7\\d\\d)\\d{4}",,,,"7123456"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"ER",291,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3})",
 "$1 $2 $3",["[178]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],ES:[,[,,"[5-9]\\d{8}",,,,,,,[9]],[,,"96906(?:0[0-8]|1[1-9]|[2-9]\\d)\\d\\d|9(?:69(?:0[0-57-9]|[1-9]\\d)|73(?:[0-8]\\d|9[1-9]))\\d{4}|(?:8(?:[1356]\\d|[28][0-8]|[47][1-9])|9(?:[135]\\d|[268][0-8]|4[1-9]|7[124-9]))\\d{6}",,,,"810123456"],[,,"(?:590[16]00\\d|9(?:6906(?:09|10)|7390\\d\\d))\\d\\d|(?:6\\d|7[1-48])\\d{7}",,,,"612345678"],[,,"[89]00\\d{6}",,,,"800123456"],[,,"80[367]\\d{6}",,,,"803123456"],
 [,,"90[12]\\d{6}",,,,"901123456"],[,,"70\\d{7}",,,,"701234567"],[,,,,,,,,,[-1]],"ES",34,"00",,,,,,,,[[,"(\\d{4})","$1",["905"]],[,"(\\d{6})","$1",["[79]9"]],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[89]00"]],[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[5-9]"]]],[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[89]00"]],[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[5-9]"]]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,"51\\d{7}",,,,"511234567"],,,[,,,,,,,,,[-1]]],ET:[,[,,"(?:11|[2-579]\\d)\\d{7}",
@@ -218,7 +218,7 @@ CG:[,[,,"222\\d{6}|(?:0\\d|80)\\d{7}",,,,,,,[9]],[,,"222[1-589]\\d{5}",,,,"22212
 ,,,"6713001234",,,,[7]],[,,"8(?:00|33|44|55|66|77|88)[2-9]\\d{6}",,,,"8002123456"],[,,"900[2-9]\\d{6}",,,,"9002123456"],[,,,,,,,,,[-1]],[,,"52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}",,,,"5002345678"],[,,,,,,,,,[-1]],"GU",1,"011","1",,,"([2-9]\\d{6})$|1","671$1",,1,,,[,,,,,,,,,[-1]],,"671",[,,,,,,,,,[-1]],[,,,,
 ,,,,,[-1]],,,[,,,,,,,,,[-1]]],GW:[,[,,"[49]\\d{8}|4\\d{6}",,,,,,,[7,9]],[,,"443\\d{6}",,,,"443201234",,,[9]],[,,"9(?:5\\d|6[569]|77)\\d{6}",,,,"955012345",,,[9]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"40\\d{5}",,,,"4012345",,,[7]],"GW",245,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["40"]],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[49]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],GY:[,[,,"(?:[2-8]\\d{3}|9008)\\d{3}",,,,,,,[7]],[,,"(?:2(?:1[6-9]|2[0-35-9]|3[1-4]|5[3-9]|6\\d|7[0-79])|3(?:2[25-9]|3\\d)|4(?:4[0-24]|5[56])|50[0-6]|77[1-57])\\d{4}",
 ,,,"2201234"],[,,"510\\d{4}|(?:6\\d|7[0-5])\\d{5}",,,,"6091234"],[,,"(?:289|8(?:00|6[28]|88|99))\\d{4}",,,,"2891234"],[,,"9008\\d{3}",,,,"9008123"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"515\\d{4}",,,,"5151234"],"GY",592,"001",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[2-9]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],HK:[,[,,"8[0-46-9]\\d{6,7}|9\\d{4,7}|(?:[2-7]|9\\d{3})\\d{7}",,,,,,,[5,6,7,8,9,11]],[,,"(?:2(?:[13-9]\\d|2[013-9])\\d|3(?:(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69])\\d|8(?:4[0-8]|[579]\\d|6[0-2]))|58(?:0[1-9]|1[2-9]))\\d{4}",
-,,,"21234567",,,[8]],[,,"(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4])|7(?:4[0-2]|6[0-5]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[014-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|7[05])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-49]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}",,,,"51234567",,,[8]],[,,"800\\d{6}",,,,"800123456",,,[9]],[,,"900(?:[0-24-9]\\d{7}|3\\d{1,4})",
+,,,"21234567",,,[8]],[,,"(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4])|7(?:4[0-2]|6[0-5]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[014-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|7[015])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-59]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}",,,,"51234567",,,[8]],[,,"800\\d{6}",,,,"800123456",,,[9]],[,,"900(?:[0-24-9]\\d{7}|3\\d{1,4})",
 ,,,"90012345678",,,[5,6,7,8,11]],[,,,,,,,,,[-1]],[,,"8(?:1[0-4679]\\d|2(?:[0-36]\\d|7[0-4])|3(?:[034]\\d|2[09]|70))\\d{4}",,,,"81123456",,,[8]],[,,,,,,,,,[-1]],"HK",852,"00(?:30|5[09]|[126-9]?)",,,,,,"00",,[[,"(\\d{3})(\\d{2,5})","$1 $2",["900","9003"]],[,"(\\d{4})(\\d{4})","$1 $2",["[2-7]|8[1-4]|9(?:0[1-9]|[1-8])"]],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["8"]],[,"(\\d{3})(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3 $4",["9"]]],,[,,"7(?:1(?:0[0-38]|1[0-3679]|3[013]|69|9[0136])|2(?:[02389]\\d|1[18]|7[27-9])|3(?:[0-38]\\d|7[0-369]|9[2357-9])|47\\d|5(?:[178]\\d|5[0-5])|6(?:0[0-7]|2[236-9]|[35]\\d)|7(?:[27]\\d|8[7-9])|8(?:[23689]\\d|7[1-9])|9(?:[025]\\d|6[0-246-8]|7[0-36-9]|8[238]))\\d{4}",
 ,,,"71123456",,,[8]],,,[,,,,,,,,,[-1]],[,,"30(?:0[1-9]|[15-7]\\d|2[047]|89)\\d{4}",,,,"30161234",,,[8]],,,[,,,,,,,,,[-1]]],HN:[,[,,"8\\d{10}|[237-9]\\d{7}",,,,,,,[8,11]],[,,"2(?:2(?:0[0-59]|1[1-9]|[23]\\d|4[02-7]|5[57]|6[245]|7[0135689]|8[01346-9]|9[0-2])|4(?:0[578]|2[3-59]|3[13-9]|4[0-68]|5[1-3589])|5(?:0[2357-9]|1[1-356]|4[03-5]|5\\d|6[014-69]|7[04]|80)|6(?:[056]\\d|17|2[067]|3[047]|4[0-378]|[78][0-8]|9[01])|7(?:0[5-79]|6[46-9]|7[02-9]|8[034]|91)|8(?:79|8[0-357-9]|9[1-57-9]))\\d{4}",,,,"22123456",
 ,,[8]],[,,"[37-9]\\d{7}",,,,"91234567",,,[8]],[,,"8002\\d{7}",,,,"80021234567",,,[11]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"HN",504,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1-$2",["[237-9]"]],[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["8"]]],[[,"(\\d{4})(\\d{4})","$1-$2",["[237-9]"]]],[,,,,,,,,,[-1]],,,[,,"8002\\d{7}",,,,,,,[11]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],HR:[,[,,"(?:[24-69]\\d|3[0-79])\\d{7}|80\\d{5,7}|[1-79]\\d{7}|6\\d{5,6}",,,,,,,[6,7,8,9]],[,,"1\\d{7}|(?:2[0-3]|3[1-5]|4[02-47-9]|5[1-3])\\d{6,7}",
@@ -233,7 +233,7 @@ CG:[,[,,"222\\d{6}|(?:0\\d|80)\\d{7}",,,,,,,[9]],[,,"222[1-589]\\d{5}",,,,"22212
 ,"(?:1500|8071\\d{3})\\d{3}",,,,"8071123456",,,[7,10]],,,[,,,,,,,,,[-1]]],IE:[,[,,"(?:1\\d|[2569])\\d{6,8}|4\\d{6,9}|7\\d{8}|8\\d{8,9}",,,,,,,[7,8,9,10],[5,6]],[,,"(?:1\\d|21)\\d{6,7}|(?:2[24-9]|4(?:0[24]|5\\d|7)|5(?:0[45]|1\\d|8)|6(?:1\\d|[237-9])|9(?:1\\d|[35-9]))\\d{5}|(?:23|4(?:[1-469]|8\\d)|5[23679]|6[4-6]|7[14]|9[04])\\d{7}",,,,"2212345",,,,[5,6]],[,,"8(?:22|[35-9]\\d)\\d{6}",,,,"850123456",,,[9]],[,,"1800\\d{6}",,,,"1800123456",,,[10]],[,,"15(?:1[2-8]|[2-8]0|9[089])\\d{6}",,,,"1520123456",
 ,,[10]],[,,"18[59]0\\d{6}",,,,"1850123456",,,[10]],[,,"700\\d{6}",,,,"700123456",,,[9]],[,,"76\\d{7}",,,,"761234567",,,[9]],"IE",353,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{5})","$1 $2",["2[24-9]|47|58|6[237-9]|9[35-9]"],"(0$1)"],[,"(\\d{3})(\\d{5})","$1 $2",["[45]0"],"(0$1)"],[,"(\\d)(\\d{3,4})(\\d{4})","$1 $2 $3",["1"],"(0$1)"],[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[2569]|4[1-69]|7[14]"],"(0$1)"],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["70"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["81"],
 "(0$1)"],[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[78]"],"0$1"],[,"(\\d{4})(\\d{3})(\\d{3})","$1 $2 $3",["1"]],[,"(\\d{2})(\\d{4})(\\d{4})","$1 $2 $3",["4"],"(0$1)"],[,"(\\d{2})(\\d)(\\d{3})(\\d{4})","$1 $2 $3 $4",["8"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,"18[59]0\\d{6}",,,,,,,[10]],[,,"818\\d{6}",,,,"818123456",,,[9]],,,[,,"88210[1-9]\\d{4}|8(?:[35-79]5\\d\\d|8(?:[013-9]\\d\\d|2(?:[01][1-9]|[2-9]\\d)))\\d{5}",,,,"8551234567",,,[10]]],IL:[,[,,"1\\d{6}(?:\\d{3,5})?|[57]\\d{8}|[1-489]\\d{7}",,,,,,,[7,8,
-9,10,11,12]],[,,"153\\d{8,9}|29[1-9]\\d{5}|(?:2[0-8]|[3489]\\d)\\d{6}",,,,"21234567",,,[8,11,12],[7]],[,,"55(?:4(?:[01]0|5[0-2])|57[0-289])\\d{4}|5(?:(?:[0-2][02-9]|[36]\\d|[49][2-9]|8[3-7])\\d|5(?:01|2\\d|3[0-3]|4[34]|5[0-25689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\\d{5}",,,,"502345678",,,[9]],[,,"1(?:255|80[019]\\d{3})\\d{3}",,,,"1800123456",,,[7,10]],[,,"1212\\d{4}|1(?:200|9(?:0[0-2]|19))\\d{6}",,,,"1919123456",,,[8,10]],[,,"1700\\d{6}",,,,"1700123456",,,[10]],[,,,,,,,,,[-1]],[,,"7(?:38(?:0\\d|5[0-2569]|88)|8(?:33|55|77|81)\\d)\\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}",
+9,10,11,12]],[,,"153\\d{8,9}|29[1-9]\\d{5}|(?:2[0-8]|[3489]\\d)\\d{6}",,,,"21234567",,,[8,11,12],[7]],[,,"55(?:4(?:[01]0|5[0-2])|57[0-289])\\d{4}|5(?:(?:[0-2][02-9]|[36]\\d|[49][2-9]|8[3-7])\\d|5(?:01|2\\d|3[0-3]|4[34]|5[0-25689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\\d{5}",,,,"502345678",,,[9]],[,,"1(?:255|80[019]\\d{3})\\d{3}",,,,"1800123456",,,[7,10]],[,,"1212\\d{4}|1(?:200|9(?:0[0-2]|19))\\d{6}",,,,"1919123456",,,[8,10]],[,,"1700\\d{6}",,,,"1700123456",,,[10]],[,,,,,,,,,[-1]],[,,"7(?:38(?:0\\d|5[0-3569]|88)|8(?:33|55|77|81)\\d)\\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}",
 ,,,"771234567",,,[9]],"IL",972,"0(?:0|1[2-9])","0",,,"0",,,,[[,"(\\d{4})(\\d{3})","$1-$2",["125"]],[,"(\\d{4})(\\d{2})(\\d{2})","$1-$2-$3",["121"]],[,"(\\d)(\\d{3})(\\d{4})","$1-$2-$3",["[2-489]"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{4})","$1-$2-$3",["[57]"],"0$1"],[,"(\\d{4})(\\d{3})(\\d{3})","$1-$2-$3",["12"]],[,"(\\d{4})(\\d{6})","$1-$2",["159"]],[,"(\\d)(\\d{3})(\\d{3})(\\d{3})","$1-$2-$3-$4",["1[7-9]"]],[,"(\\d{3})(\\d{1,2})(\\d{3})(\\d{4})","$1-$2 $3-$4",["15"]]],,[,,,,,,,,,[-1]],,,[,,"1700\\d{6}",
 ,,,,,,[10]],[,,"1599\\d{6}",,,,"1599123456",,,[10]],,,[,,"151\\d{8,9}",,,,"15112340000",,,[11,12]]],IM:[,[,,"1624\\d{6}|(?:[3578]\\d|90)\\d{8}",,,,,,,[10],[6]],[,,"1624(?:230|[5-8]\\d\\d)\\d{3}",,,,"1624756789",,,,[6]],[,,"76245[06]\\d{4}|7(?:4576|[59]24\\d|624[0-4689])\\d{5}",,,,"7924123456"],[,,"808162\\d{4}",,,,"8081624567"],[,,"8(?:440[49]06|72299\\d)\\d{3}|(?:8(?:45|70)|90[0167])624\\d{4}",,,,"9016247890"],[,,,,,,,,,[-1]],[,,"70\\d{8}",,,,"7012345678"],[,,"56\\d{8}",,,,"5612345678"],"IM",44,
 "00","0",,,"([25-8]\\d{5})$|0","1624$1",,,,,[,,,,,,,,,[-1]],,"74576|(?:16|7[56])24",[,,,,,,,,,[-1]],[,,"3440[49]06\\d{3}|(?:3(?:08162|3\\d{4}|45624|7(?:0624|2299))|55\\d{4})\\d{4}",,,,"5512345678"],,,[,,,,,,,,,[-1]]],IN:[,[,,"(?:000800|[2-9]\\d\\d)\\d{7}|1\\d{7,12}",,,,,,,[8,9,10,11,12,13],[6,7]],[,,"2717(?:[2-7]\\d|95)\\d{4}|(?:271[0-689]|782[0-6])[2-7]\\d{5}|(?:170[24]|2(?:(?:[02][2-79]|90)\\d|80[13468])|(?:3(?:23|80)|683|79[1-7])\\d|4(?:20[24]|72[2-8])|552[1-7])\\d{6}|(?:11|33|4[04]|80)[2-7]\\d{7}|(?:342|674|788)(?:[0189][2-7]|[2-7]\\d)\\d{5}|(?:1(?:2[0-249]|3[0-25]|4[145]|[59][14]|6[014]|7[1257]|8[01346])|2(?:1[257]|3[013]|4[01]|5[0137]|6[0158]|78|8[1568]|9[14])|3(?:26|4[13]|5[34]|6[01489]|7[02-46]|8[159])|4(?:1[36]|2[1-47]|3[15]|5[12]|6[0-26-9]|7[014-9]|8[013-57]|9[014-7])|5(?:1[025]|22|[36][25]|4[28]|[578]1|9[15])|6(?:12|[2-47]1|5[17]|6[13]|80)|7(?:12|2[14]|3[134]|4[47]|5[15]|[67]1)|8(?:16|2[014]|3[126]|6[136]|7[078]|8[34]|91))[2-7]\\d{6}|(?:1(?:2[35-8]|3[346-9]|4[236-9]|[59][0235-9]|6[235-9]|7[34689]|8[257-9])|2(?:1[134689]|3[24-8]|4[2-8]|5[25689]|6[2-4679]|7[3-79]|8[2-479]|9[235-9])|3(?:01|1[79]|2[1245]|4[5-8]|5[125689]|6[235-7]|7[157-9]|8[2-46-8])|4(?:1[14578]|2[5689]|3[2-467]|5[4-7]|6[35]|73|8[2689]|9[2389])|5(?:[16][146-9]|2[14-8]|3[1346]|4[14-69]|5[46]|7[2-4]|8[2-8]|9[246])|6(?:1[1358]|2[2457]|3[2-4]|4[235-7]|5[2-689]|6[24578]|7[235689]|8[124-6])|7(?:1[013-9]|2[0235-9]|3[2679]|4[1-35689]|5[2-46-9]|[67][02-9]|8[013-7]|9[089])|8(?:1[1357-9]|2[235-8]|3[03-57-9]|4[0-24-9]|5\\d|6[2457-9]|7[1-6]|8[1256]|9[2-4]))\\d[2-7]\\d{5}",
@@ -304,9 +304,9 @@ CG:[,[,,"222\\d{6}|(?:0\\d|80)\\d{7}",,,,,,,[9]],[,,"222[1-589]\\d{5}",,,,"22212
 ,,,[[,"(\\d)(\\d{3})(\\d{4})","$1 $2 $3",["52[0-7]"],"(0-$1)",,1],[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["[7-9]"],"0 $1",,1],[,"(\\d{2})(\\d{6})","$1 $2",["37|4(?:[15]|6[1-8])"],"(0-$1)",,1],[,"(\\d{3})(\\d{5})","$1 $2",["[3-6]"],"(0-$1)",,1]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,"70[67]\\d{5}",,,,"70712345"],,,[,,,,,,,,,[-1]]],LU:[,[,,"35[013-9]\\d{4,8}|6\\d{8}|35\\d{2,4}|(?:[2457-9]\\d|3[0-46-9])\\d{2,9}",,,,,,,[4,5,6,7,8,9,10,11]],[,,"(?:35[013-9]|80[2-9]|90[89])\\d{1,8}|(?:2[2-9]|3[0-46-9]|[457]\\d|8[13-9]|9[2-579])\\d{2,9}",
 ,,,"27123456"],[,,"6(?:[269][18]|5[1568]|7[189]|81)\\d{6}",,,,"628123456",,,[9]],[,,"800\\d{5}",,,,"80012345",,,[8]],[,,"90[015]\\d{5}",,,,"90012345",,,[8]],[,,"801\\d{5}",,,,"80112345",,,[8]],[,,,,,,,,,[-1]],[,,"20(?:1\\d{5}|[2-689]\\d{1,7})",,,,"20201234",,,[4,5,6,7,8,9,10]],"LU",352,"00",,,,"(15(?:0[06]|1[12]|[35]5|4[04]|6[26]|77|88|99)\\d)",,,,[[,"(\\d{2})(\\d{3})","$1 $2",["2(?:0[2-689]|[2-9])|[3-57]|8(?:0[2-9]|[13-9])|9(?:0[89]|[2-579])"],,"$CC $1"],[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",["2(?:0[2-689]|[2-9])|[3-57]|8(?:0[2-9]|[13-9])|9(?:0[89]|[2-579])"],
 ,"$CC $1"],[,"(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["20[2-689]"],,"$CC $1"],[,"(\\d{2})(\\d{2})(\\d{2})(\\d{1,2})","$1 $2 $3 $4",["2(?:[0367]|4[3-8])"],,"$CC $1"],[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["80[01]|90[015]"],,"$CC $1"],[,"(\\d{2})(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3 $4",["20"],,"$CC $1"],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["6"],,"$CC $1"],[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{1,2})","$1 $2 $3 $4 $5",["2(?:[0367]|4[3-8])"],,"$CC $1"],[,"(\\d{2})(\\d{2})(\\d{2})(\\d{1,5})","$1 $2 $3 $4",
-["[3-57]|8[13-9]|9(?:0[89]|[2-579])|(?:2|80)[2-9]"],,"$CC $1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],LV:[,[,,"(?:[268]\\d|90)\\d{6}",,,,,,,[8]],[,,"6\\d{7}",,,,"63123456"],[,,"23(?:23[0-57-9]|33[0238])\\d{3}|2(?:[0-24-9]\\d\\d|3(?:0[07]|[14-9]\\d|2[024-9]|3[0-24-9]))\\d{4}",,,,"21234567"],[,,"80\\d{6}",,,,"80123456"],[,,"90\\d{6}",,,,"90123456"],[,,"81\\d{6}",,,,"81123456"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"LV",371,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",
-["[269]|8[01]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],LY:[,[,,"[2-9]\\d{8}",,,,,,,[9],[7]],[,,"(?:2(?:0[56]|[1-6]\\d|7[124579]|8[124])|3(?:1\\d|2[2356])|4(?:[17]\\d|2[1-357]|5[2-4]|8[124])|5(?:[1347]\\d|2[1-469]|5[13-5]|8[1-4])|6(?:[1-479]\\d|5[2-57]|8[1-5])|7(?:[13]\\d|2[13-79])|8(?:[124]\\d|5[124]|84))\\d{6}",,,,"212345678",,,,[7]],[,,"9[1-6]\\d{7}",,,,"912345678"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"LY",218,"00","0",
-,,"0",,,,[[,"(\\d{2})(\\d{7})","$1-$2",["[2-9]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MA:[,[,,"[5-8]\\d{8}",,,,,,,[9]],[,,"5(?:2(?:[0-25-79]\\d|3[1-578]|4[02-46-8]|8[0235-7])|3(?:[0-47]\\d|5[02-9]|6[02-8]|8[014-9]|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}",,,,"520123456"],[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}",,,,"650123456"],[,,"80[0-7]\\d{6}",,,,"801234567"],[,,"89\\d{7}",,,,"891234567"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"(?:592(?:4[0-2]|93)|80[89]\\d\\d)\\d{4}",
+["[3-57]|8[13-9]|9(?:0[89]|[2-579])|(?:2|80)[2-9]"],,"$CC $1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],LV:[,[,,"(?:[268]\\d|90)\\d{6}",,,,,,,[8]],[,,"6\\d{7}",,,,"63123456"],[,,"2333[0-8]\\d{3}|2(?:[0-24-9]\\d\\d|3(?:0[07]|[14-9]\\d|2[02-9]|3[0-24-9]))\\d{4}",,,,"21234567"],[,,"80\\d{6}",,,,"80123456"],[,,"90\\d{6}",,,,"90123456"],[,,"81\\d{6}",,,,"81123456"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"LV",371,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[269]|8[01]"]]],
+,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],LY:[,[,,"[2-9]\\d{8}",,,,,,,[9],[7]],[,,"(?:2(?:0[56]|[1-6]\\d|7[124579]|8[124])|3(?:1\\d|2[2356])|4(?:[17]\\d|2[1-357]|5[2-4]|8[124])|5(?:[1347]\\d|2[1-469]|5[13-5]|8[1-4])|6(?:[1-479]\\d|5[2-57]|8[1-5])|7(?:[13]\\d|2[13-79])|8(?:[124]\\d|5[124]|84))\\d{6}",,,,"212345678",,,,[7]],[,,"9[1-6]\\d{7}",,,,"912345678"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"LY",218,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{7})",
+"$1-$2",["[2-9]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MA:[,[,,"[5-8]\\d{8}",,,,,,,[9]],[,,"5(?:2(?:[0-25-79]\\d|3[1-578]|4[02-46-8]|8[0235-7])|3(?:[0-47]\\d|5[02-9]|6[02-8]|8[014-9]|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}",,,,"520123456"],[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-467]|5[0-3]|8[0-5]))\\d{6}",,,,"650123456"],[,,"80[0-7]\\d{6}",,,,"801234567"],[,,"89\\d{7}",,,,"891234567"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"(?:592(?:4[0-2]|93)|80[89]\\d\\d)\\d{4}",
 ,,,"592401234"],"MA",212,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["5[45]"],"0$1"],[,"(\\d{4})(\\d{5})","$1-$2",["5(?:2[2-46-9]|3[3-9]|9)|8(?:0[89]|92)"],"0$1"],[,"(\\d{2})(\\d{7})","$1-$2",["8"],"0$1"],[,"(\\d{3})(\\d{6})","$1-$2",["[5-7]"],"0$1"]],,[,,,,,,,,,[-1]],1,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MC:[,[,,"(?:[3489]|6\\d)\\d{7}",,,,,,,[8,9]],[,,"(?:870|9[2-47-9]\\d)\\d{5}",,,,"99123456",,,[8]],[,,"4(?:[469]\\d|5[1-9])\\d{5}|(?:3|6\\d)\\d{7}",,,,"612345678"],
 [,,"(?:800|90\\d)\\d{5}",,,,"90123456",,,[8]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"MC",377,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{2})","$1 $2 $3",["87"]],[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["4"],"0$1"],[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[389]"]],[,"(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4 $5",["6"],"0$1"]],[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["4"],"0$1"],[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[389]"]],[,"(\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2})",
 "$1 $2 $3 $4 $5",["6"],"0$1"]],[,,,,,,,,,[-1]],,,[,,"8[07]0\\d{5}",,,,,,,[8]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MD:[,[,,"(?:[235-7]\\d|[89]0)\\d{6}",,,,,,,[8]],[,,"(?:(?:2[1-9]|3[1-79])\\d|5(?:33|5[257]))\\d{5}",,,,"22212345"],[,,"562\\d{5}|(?:6\\d|7[16-9])\\d{6}",,,,"62112345"],[,,"800\\d{5}",,,,"80012345"],[,,"90[056]\\d{5}",,,,"90012345"],[,,"808\\d{5}",,,,"80812345"],[,,,,,,,,,[-1]],[,,"3[08]\\d{6}",,,,"30123456"],"MD",373,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{5})","$1 $2",["[89]"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{3})",
@@ -314,11 +314,11 @@ CG:[,[,,"222\\d{6}|(?:0\\d|80)\\d{7}",,,,,,,[9]],[,,"222[1-589]\\d{5}",,,,"22212
 ,,[8]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"78[1-49]\\d{5}",,,,"78108780",,,[8]],"ME",382,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[2-9]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,"77[1-9]\\d{5}",,,,"77273012",,,[8]],,,[,,,,,,,,,[-1]]],MF:[,[,,"(?:590\\d|7090)\\d{5}|(?:69|80|9\\d)\\d{7}",,,,,,,[9]],[,,"590(?:0[079]|[14]3|[27][79]|3[03-7]|5[0-268]|87)\\d{4}",,,,"590271234"],[,,"(?:69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))|7090[0-4])\\d{4}",
 ,,,"690001234"],[,,"80[0-5]\\d{6}",,,,"800012345"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}",,,,"976012345"],"MF",590,"00","0",,,"0",,,,,,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MG:[,[,,"[23]\\d{8}",,,,,,,[9],[7]],[,,"2072[29]\\d{4}|20(?:2\\d|4[47]|5[3467]|6[279]|7[356]|8[268]|9[2457])\\d{5}",,,,"202123456",,,,[7]],[,,"3[2-47-9]\\d{7}",,,,"321234567"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],
 [,,"22\\d{7}",,,,"221234567"],"MG",261,"00","0",,,"([24-9]\\d{6})$|0","20$1",,,[[,"(\\d{2})(\\d{2})(\\d{3})(\\d{2})","$1 $2 $3 $4",["[23]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MH:[,[,,"329\\d{4}|(?:[256]\\d|45)\\d{5}",,,,,,,[7]],[,,"(?:247|528|625)\\d{4}",,,,"2471234"],[,,"(?:(?:23|54)5|329|45[35-8])\\d{4}",,,,"2351234"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"635\\d{4}",,,,"6351234"],"MH",692,"011","1",,,"1",,,,[[,"(\\d{3})(\\d{4})",
-"$1-$2",["[2-6]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MK:[,[,,"[2-578]\\d{7}",,,,,,,[8],[6,7]],[,,"(?:(?:2(?:62|77)0|3444)\\d|4[56]440)\\d{3}|(?:34|4[357])700\\d{3}|(?:2(?:[0-3]\\d|5[0-578]|6[01]|82)|3(?:1[3-68]|[23][2-68]|4[23568])|4(?:[23][2-68]|4[3-68]|5[2568]|6[25-8]|7[24-68]|8[4-68]))\\d{5}",,,,"22012345",,,,[6,7]],[,,"7(?:3555|(?:474|9[019]7)7)\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-48]\\d|6[01]|7[01578])|4(?:2\\d|60|7[01578])|9(?:[2-4]\\d|5[01]|7[015]))\\d{4}",
-,,,"72345678"],[,,"800\\d{5}",,,,"80012345"],[,,"5\\d{7}",,,,"50012345"],[,,"8(?:0[1-9]|[1-9]\\d)\\d{5}",,,,"80123456"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"MK",389,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{4})","$1 $2 $3",["2|34[47]|4(?:[37]7|5[47]|64)"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[347]"],"0$1"],[,"(\\d{3})(\\d)(\\d{2})(\\d{2})","$1 $2 $3 $4",["[58]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],ML:[,[,,"[24-9]\\d{7}",,,,,,,[8]],[,,"2(?:07[0-8]|12[67])\\d{4}|(?:2(?:02|1[4-689])|4(?:0[0-4]|4[1-39]))\\d{5}",
-,,,"20212345"],[,,"2(?:0(?:01|79)|17\\d)\\d{4}|(?:5[01]|[679]\\d|8[2-49])\\d{6}",,,,"65012345"],[,,"80\\d{6}",,,,"80012345"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"ML",223,"00",,,,,,,,[[,"(\\d{4})","$1",["67[057-9]|74[045]","67(?:0[09]|[59]9|77|8[89])|74(?:0[02]|44|55)"]],[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[24-9]"]]],[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[24-9]"]]],[,,,,,,,,,[-1]],,,[,,"80\\d{6}"],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MM:[,
+"$1-$2",["[2-6]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MK:[,[,,"[2-578]\\d{7}",,,,,,,[8],[6,7]],[,,"(?:(?:2(?:62|77)0|3444)\\d|4[56]440)\\d{3}|(?:34|4[357])700\\d{3}|(?:2(?:[0-3]\\d|5[0-578]|6[01]|82)|3(?:1[3-68]|[23][2-68]|4[23568])|4(?:[23][2-68]|4[3-68]|5[2568]|6[25-8]|7[24-68]|8[4-68]))\\d{5}",,,,"22012345",,,,[6,7]],[,,"7(?:3555|(?:474|9[019]7)7)\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-478]\\d|6[01])|4(?:2\\d|60|7[01578])|9(?:[2-4]\\d|5[01]|7[015]))\\d{4}",,,,"72345678"],
+[,,"800\\d{5}",,,,"80012345"],[,,"5\\d{7}",,,,"50012345"],[,,"8(?:0[1-9]|[1-9]\\d)\\d{5}",,,,"80123456"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"MK",389,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{4})","$1 $2 $3",["2|34[47]|4(?:[37]7|5[47]|64)"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[347]"],"0$1"],[,"(\\d{3})(\\d)(\\d{2})(\\d{2})","$1 $2 $3 $4",["[58]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],ML:[,[,,"[24-9]\\d{7}",,,,,,,[8]],[,,"2(?:07[0-8]|12[67])\\d{4}|(?:2(?:02|1[4-689])|4(?:0[0-4]|4[1-59]))\\d{5}",
+,,,"20212345"],[,,"2(?:0(?:01|79)|17\\d)\\d{4}|(?:5[01]|[679]\\d|8[2-59])\\d{6}",,,,"65012345"],[,,"80\\d{6}",,,,"80012345"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"ML",223,"00",,,,,,,,[[,"(\\d{4})","$1",["67[057-9]|74[045]","67(?:0[09]|[59]9|77|8[89])|74(?:0[02]|44|55)"]],[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[24-9]"]]],[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[24-9]"]]],[,,,,,,,,,[-1]],,,[,,"80\\d{6}"],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MM:[,
 [,,"1\\d{5,7}|95\\d{6}|(?:[4-7]|9[0-46-9])\\d{6,8}|(?:2|8\\d)\\d{5,8}",,,,,,,[6,7,8,9,10],[5]],[,,"(?:1(?:(?:12|[28]\\d|3[56]|7[3-6]|9[0-6])\\d|4(?:2[29]|62|7[0-2]|83)|6)|2(?:2(?:00|8[34])|4(?:0\\d|[26]2|7[0-2]|83)|51\\d\\d)|4(?:2(?:2\\d\\d|48[013])|3(?:20\\d|4(?:70|83)|56)|420\\d|5(?:2\\d|470))|6(?:0(?:[23]|88\\d)|(?:124|[56]2\\d)\\d|2472|3(?:20\\d|470)|4(?:2[04]\\d|472)|7(?:3\\d\\d|4[67]0|8(?:[01459]\\d|8))))\\d{4}|5(?:2(?:2\\d{5,6}|47[02]\\d{4})|(?:3472|4(?:2(?:1|86)|470)|522\\d|6(?:20\\d|483)|7(?:20\\d|48[01])|8(?:20\\d|47[02])|9(?:20\\d|470))\\d{4})|7(?:(?:0470|4(?:25\\d|470)|5(?:202|470|96\\d))\\d{4}|1(?:20\\d{4,5}|4(?:70|83)\\d{4}))|8(?:1(?:2\\d{5,6}|4(?:10|7[01]\\d)\\d{3})|2(?:2\\d{5,6}|(?:320|490\\d)\\d{3})|(?:3(?:2\\d\\d|470)|4[24-7]|5(?:(?:2\\d|51)\\d|4(?:[1-35-9]\\d|4[0-57-9]))|6[23])\\d{4})|(?:1[2-6]\\d|4(?:2[24-8]|3[2-7]|[46][2-6]|5[3-5])|5(?:[27][2-8]|3[2-68]|4[24-8]|5[23]|6[2-4]|8[24-7]|9[2-7])|6(?:[19]20|42[03-6]|(?:52|7[45])\\d)|7(?:[04][24-8]|[15][2-7]|22|3[2-4])|8(?:1[2-689]|2[2-8]|(?:[35]2|64)\\d))\\d{4}|25\\d{5,6}|(?:2[2-9]|6(?:1[2356]|[24][2-6]|3[24-6]|5[2-4]|6[2-8]|7[235-7]|8[245]|9[24])|8(?:3[24]|5[245]))\\d{4}",
-,,,"1234567",,,[6,7,8,9],[5]],[,,"(?:17[01]|9(?:2(?:[0-4]|[56]\\d\\d)|(?:3(?:[0-36]|4\\d)|(?:6\\d|8[89]|9[4-8])\\d|7(?:3|40|[5-9]\\d))\\d|4(?:(?:[0245]\\d|[1379])\\d|88)|5[0-6])\\d)\\d{4}|9[69]1\\d{6}|9(?:[68]\\d|9[089])\\d{5}",,,,"92123456",,,[7,8,9,10]],[,,"80080(?:0[1-9]|2\\d)\\d{3}",,,,"8008001234",,,[10]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"1333\\d{4}|[12]468\\d{4}",,,,"13331234",,,[8]],"MM",95,"00","0",,,"0",,,,[[,"(\\d)(\\d{2})(\\d{3})","$1 $2 $3",["16|2"],"0$1"],[,"(\\d{2})(\\d{2})(\\d{3})",
+,,,"1234567",,,[6,7,8,9],[5]],[,,"(?:17[01]|9(?:2(?:[0-4]|[56]\\d\\d)|(?:3(?:[0-36]|4\\d)|(?:6\\d|8[89]|9[4-8])\\d|7(?:3|40|[5-9]\\d))\\d|4(?:(?:[0245]\\d|[1379])\\d|88)|5[0-6])\\d)\\d{4}|9[69]1\\d{6}|9(?:[68]\\d|9[089])\\d{5}",,,,"92123456",,,[7,8,9,10]],[,,"80080(?:0[1-9]|2\\d)\\d{3}",,,,"8008001234",,,[10]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"1333\\d{4}",,,,"13331234",,,[8]],"MM",95,"00","0",,,"0",,,,[[,"(\\d)(\\d{2})(\\d{3})","$1 $2 $3",["16|2"],"0$1"],[,"(\\d{2})(\\d{2})(\\d{3})",
 "$1 $2 $3",["4(?:[2-46]|5[3-5])|5|6(?:[1-689]|7[235-7])|7(?:[0-4]|5[2-7])|8[1-5]|(?:60|86)[23]"],"0$1"],[,"(\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[12]|452|678|86","[12]|452|6788|86"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[4-7]|8[1-35]"],"0$1"],[,"(\\d)(\\d{3})(\\d{4,6})","$1 $2 $3",["9(?:2[0-4]|[35-9]|4[137-9])"],"0$1"],[,"(\\d)(\\d{4})(\\d{4})","$1 $2 $3",["2"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["8"],"0$1"],[,"(\\d)(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["92"],"0$1"],[,
 "(\\d)(\\d{5})(\\d{4})","$1 $2 $3",["9"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MN:[,[,,"[12]\\d{7,9}|[5-9]\\d{7}",,,,,,,[8,9,10],[4,5,6]],[,,"[12]2[1-3]\\d{5,6}|(?:(?:[12](?:1|27)|5[368])\\d\\d|7(?:0(?:[0-5]\\d|7[078]|80)|128))\\d{4}|[12](?:3[2-8]|4[2-68]|5[1-4689])\\d{6,7}",,,,"53123456",,,,[4,5,6]],[,,"(?:83[01]|92[039])\\d{5}|(?:5[05]|6[069]|72|8[015689]|9[013-9])\\d{6}",,,,"88123456",,,[8]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],
 [,,"712[0-79]\\d{4}|7(?:1[013-9]|[5-9]\\d)\\d{5}",,,,"75123456",,,[8]],"MN",976,"001","0",,,"0",,,,[[,"(\\d{2})(\\d{2})(\\d{4})","$1 $2 $3",["[12]1"],"0$1"],[,"(\\d{4})(\\d{4})","$1 $2",["[5-9]"]],[,"(\\d{3})(\\d{5,6})","$1 $2",["[12]2[1-3]"],"0$1"],[,"(\\d{4})(\\d{5,6})","$1 $2",["[12](?:27|3[2-8]|4[2-68]|5[1-4689])","[12](?:27|3[2-8]|4[2-68]|5[1-4689])[0-3]"],"0$1"],[,"(\\d{5})(\\d{4,5})","$1 $2",["[12]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MO:[,[,,"0800\\d{3}|(?:28|[68]\\d)\\d{6}",
@@ -328,7 +328,7 @@ CG:[,[,,"222\\d{6}|(?:0\\d|80)\\d{7}",,,,,,,[9]],[,,"222[1-589]\\d{5}",,,,"22212
 ,,,"976612345"],"MQ",596,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[5-79]|8(?:0[6-9]|[36])"],"0$1"],[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["8"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MR:[,[,,"(?:[2-4]\\d\\d|800)\\d{5}",,,,,,,[8]],[,,"(?:25[08]|35\\d|45[1-7])\\d{5}",,,,"35123456"],[,,"[2-4][0-46-9]\\d{6}",,,,"22123456"],[,,"800\\d{5}",,,,"80012345"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"MR",
 222,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[2-48]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MS:[,[,,"(?:[58]\\d\\d|664|900)\\d{7}",,,,,,,[10],[7]],[,,"6644(?:1[0-3]|91)\\d{4}",,,,"6644912345",,,,[7]],[,,"664(?:3(?:49|9[1-6])|49[2-6])\\d{4}",,,,"6644923456",,,,[7]],[,,"8(?:00|33|44|55|66|77|88)[2-9]\\d{6}",,,,"8002123456"],[,,"900[2-9]\\d{6}",,,,"9002123456"],[,,,,,,,,,[-1]],[,,"52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}",
 ,,,"5002345678"],[,,,,,,,,,[-1]],"MS",1,"011","1",,,"([34]\\d{6})$|1","664$1",,,,,[,,,,,,,,,[-1]],,"664",[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MT:[,[,,"3550\\d{4}|(?:[2579]\\d\\d|800)\\d{5}",,,,,,,[8]],[,,"20(?:3[1-4]|6[059])\\d{4}|2(?:0[19]|[1-357]\\d|60)\\d{5}",,,,"21001234"],[,,"(?:7(?:210|[79]\\d\\d)|9(?:[29]\\d\\d|69[67]|8(?:1[1-3]|89|97)))\\d{4}",,,,"96961234"],[,,"800(?:02|[3467]\\d)\\d{3}",,,,"80071234"],[,,"5(?:0(?:0(?:37|43)|(?:6\\d|70|9[0168])\\d)|[12]\\d0[1-5])\\d{3}",,,,
-"50037123"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"3550\\d{4}",,,,"35501234"],"MT",356,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[2357-9]"]]],,[,,"7117\\d{4}",,,,"71171234"],,,[,,,,,,,,,[-1]],[,,"501\\d{5}",,,,"50112345"],,,[,,,,,,,,,[-1]]],MU:[,[,,"(?:[57]|8\\d\\d)\\d{7}|[2-468]\\d{6}",,,,,,,[7,8,10]],[,,"(?:2(?:[0346-8]\\d|1[0-7])|4(?:[013568]\\d|2[4-8]|71)|54(?:[3-5]\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}",,,,"54480123",,,[7,8]],[,,"5(?:4(?:2[1-389]|7[1-9])|87[15-8])\\d{4}|(?:5(?:2[5-9]|4[3-689]|[57]\\d|8[0-689]|9[0-8])|7(?:0[0-4]|3[013]))\\d{5}",
+"50037123"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"3550\\d{4}",,,,"35501234"],"MT",356,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[2357-9]"]]],,[,,"7117\\d{4}",,,,"71171234"],,,[,,,,,,,,,[-1]],[,,"501\\d{5}",,,,"50112345"],,,[,,,,,,,,,[-1]]],MU:[,[,,"(?:[57]|8\\d\\d)\\d{7}|[2-468]\\d{6}",,,,,,,[7,8,10]],[,,"(?:2(?:[0346-8]\\d|1[0-7])|4(?:[013568]\\d|2[4-8]|71|90)|54(?:[3-5]\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}",,,,"54480123",,,[7,8]],[,,"5(?:4(?:2[1-389]|7[1-9])|87[15-8])\\d{4}|(?:5(?:2[5-9]|4[3-689]|[57]\\d|8[0-689]|9[0-8])|7(?:0[0-4]|3[013]))\\d{5}",
 ,,,"52512345",,,[8]],[,,"802\\d{7}|80[0-2]\\d{4}",,,,"8001234",,,[7,10]],[,,"30\\d{5}",,,,"3012345",,,[7]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"3(?:20|9\\d)\\d{4}",,,,"3201234",,,[7]],"MU",230,"0(?:0|[24-7]0|3[03])",,,,,,"020",,[[,"(\\d{3})(\\d{4})","$1 $2",["[2-46]|8[013]"]],[,"(\\d{4})(\\d{4})","$1 $2",["[57]"]],[,"(\\d{5})(\\d{5})","$1 $2",["8"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MV:[,[,,"(?:800|9[0-57-9]\\d)\\d{7}|[34679]\\d{6}",,,,,,,[7,10]],[,,"(?:3(?:0[0-4]|3[0-59])|6(?:[58][024689]|6[024-68]|7[02468]))\\d{4}",
 ,,,"6701234",,,[7]],[,,"(?:46[46]|[79]\\d\\d)\\d{4}",,,,"7712345",,,[7]],[,,"800\\d{7}",,,,"8001234567",,,[10]],[,,"900\\d{7}",,,,"9001234567",,,[10]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"MV",960,"0(?:0|19)",,,,,,"00",,[[,"(\\d{3})(\\d{4})","$1-$2",["[34679]"]],[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["[89]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,"4(?:0[01]|50)\\d{4}",,,,"4001234",,,[7]],,,[,,,,,,,,,[-1]]],MW:[,[,,"(?:[1289]\\d|31|77)\\d{7}|1\\d{6}",,,,,,,[7,9]],[,,"(?:1[2-9]|2[12]\\d\\d)\\d{5}",
 ,,,"1234567"],[,,"111\\d{6}|(?:31|77|[89][89])\\d{7}",,,,"991234567",,,[9]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"MW",265,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3})","$1 $2 $3",["1[2-9]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["2"],"0$1"],[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[137-9]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MX:[,[,,"[2-9]\\d{9}",,,,,,,[10],[7,8]],[,,"657[12]\\d{6}|(?:2(?:0[01]|2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[267][1-9]|3[1-8]|[45]\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[0-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}",
@@ -339,11 +339,11 @@ CG:[,[,,"222\\d{6}|(?:0\\d|80)\\d{7}",,,,,,,[9]],[,,"222[1-589]\\d{5}",,,,"22212
 "$1-$2 $3",["3"],"0$1"],[,"(\\d)(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3-$4",["1(?:[367]|80)"]],[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2 $3",["15"],"0$1"],[,"(\\d{2})(\\d{4})(\\d{4})","$1-$2 $3",["1"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],MZ:[,[,,"(?:2|8\\d)\\d{7}",,,,,,,[8,9]],[,,"2(?:[1346]\\d|5[0-2]|[78][12]|93)\\d{5}",,,,"21123456",,,[8]],[,,"8[2-79]\\d{7}",,,,"821234567",,,[9]],[,,"800\\d{6}",,,,"800123456",,,[9]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],
 [,,,,,,,,,[-1]],"MZ",258,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["2|8[2-79]"]],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["8"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],NA:[,[,,"[68]\\d{7,8}",,,,,,,[8,9]],[,,"64426\\d{3}|6(?:1(?:2[2-7]|3[01378]|4[0-4])|254|32[0237]|4(?:27|41|5[25])|52[236-8]|626|7(?:2[2-4]|30))\\d{4,5}|6(?:1(?:(?:0\\d|2[0189]|3[24-69]|4[5-9])\\d|17|69|7[014])|2(?:17|5[0-36-8]|69|70)|3(?:17|2[14-689]|34|6[289]|7[01]|81)|4(?:17|2[0-2]|4[06]|5[0137]|69|7[01])|5(?:17|2[0459]|69|7[01])|6(?:17|25|38|42|69|7[01])|7(?:17|2[569]|3[13]|6[89]|7[01]))\\d{4}",
 ,,,"61221234"],[,,"(?:60|8[1245])\\d{7}",,,,"811234567",,,[9]],[,,"80\\d{7}",,,,"800123456",,,[9]],[,,"8701\\d{5}",,,,"870123456",,,[9]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"8(?:3\\d\\d|86)\\d{5}",,,,"88612345"],"NA",264,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["88"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["6"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["87"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["8"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,
-[-1]],,,[,,,,,,,,,[-1]]],NC:[,[,,"(?:050|[2-57-9]\\d\\d)\\d{3}",,,,,,,[6]],[,,"(?:2[03-9]|3[0-5]|4[1-7]|88)\\d{4}",,,,"201234"],[,,"(?:5[0-4]|[79]\\d|8[0-79])\\d{4}",,,,"751234"],[,,"050\\d{3}",,,,"050012"],[,,"36\\d{4}",,,,"366711"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NC",687,"00",,,,,,,,[[,"(\\d{3})","$1",["5[6-8]"]],[,"(\\d{2})(\\d{2})(\\d{2})","$1.$2.$3",["[02-57-9]"]]],[[,"(\\d{2})(\\d{2})(\\d{2})","$1.$2.$3",["[02-57-9]"]]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,
-,,,,,,,,[-1]]],NE:[,[,,"[027-9]\\d{7}",,,,,,,[8]],[,,"2(?:0(?:20|3[1-8]|4[13-5]|5[14]|6[14578]|7[1-578])|1(?:4[145]|5[14]|6[14-68]|7[169]|88))\\d{4}",,,,"20201234"],[,,"(?:23|7[0467]|[89]\\d)\\d{6}",,,,"93123456"],[,,"08\\d{6}",,,,"08123456"],[,,"09\\d{6}",,,,"09123456"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NE",227,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["08"]],[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[089]|2[013]|7[0467]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],
-[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],NF:[,[,,"[13]\\d{5}",,,,,,,[6],[5]],[,,"(?:1(?:06|17|28|39)|3[0-2]\\d)\\d{3}",,,,"106609",,,,[5]],[,,"(?:14|3[58])\\d{4}",,,,"381234",,,,[5]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NF",672,"00",,,,"([0-258]\\d{4})$","3$1",,,[[,"(\\d{2})(\\d{4})","$1 $2",["1[0-3]"]],[,"(\\d)(\\d{5})","$1 $2",["[13]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],NG:[,[,,"38\\d{6}|[78]\\d{9,13}|(?:20|9\\d)\\d{8}",
-,,,,,,[8,10,11,12,13,14],[6,7]],[,,"(?:20(?:[1259]\\d|3[013-9]|4[1-8]|6[024-689]|7[1-79]|8[2-9])|38)\\d{6}",,,,"2033123456",,,[8,10],[6,7]],[,,"(?:702[0-24-9]|819[01])\\d{6}|(?:7(?:0[13-9]|[12]\\d)|8(?:0[1-9]|1[0-8])|9(?:0[1-9]|1[1-6]))\\d{7}",,,,"8021234567",,,[10]],[,,"800\\d{7,11}",,,,"80017591759",,,[10,11,12,13,14]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NG",234,"009","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{2,3})","$1 $2 $3",["3"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3,4})",
-"$1 $2 $3",["[7-9]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["20[129]"],"0$1"],[,"(\\d{4})(\\d{2})(\\d{4})","$1 $2 $3",["2"],"0$1"],[,"(\\d{3})(\\d{4})(\\d{4,5})","$1 $2 $3",["[78]"],"0$1"],[,"(\\d{3})(\\d{5})(\\d{5,6})","$1 $2 $3",["[78]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,"700\\d{7,11}",,,,"7001234567",,,[10,11,12,13,14]],,,[,,,,,,,,,[-1]]],NI:[,[,,"(?:1800|[25-8]\\d{3})\\d{4}",,,,,,,[8]],[,,"2\\d{7}",,,,"21234567"],[,,"(?:5(?:5[0-7]|[78]\\d)|6(?:20|3[035]|4[045]|5[05]|77|8[1-9]|9[059])|(?:7[5-8]|8\\d)\\d)\\d{5}",
+[-1]],,,[,,,,,,,,,[-1]]],NC:[,[,,"(?:050|[2-57-9]\\d\\d)\\d{3}",,,,,,,[6]],[,,"(?:2[03-9]|3[0-5]|4[1-7]|88)\\d{4}",,,,"201234"],[,,"(?:[579]\\d|8[0-79])\\d{4}",,,,"751234"],[,,"050\\d{3}",,,,"050012"],[,,"36\\d{4}",,,,"366711"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NC",687,"00",,,,,,,,[[,"(\\d{3})","$1",["5[6-8]"]],[,"(\\d{2})(\\d{2})(\\d{2})","$1.$2.$3",["[02-57-9]"]]],[[,"(\\d{2})(\\d{2})(\\d{2})","$1.$2.$3",["[02-57-9]"]]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,
+,,[-1]]],NE:[,[,,"[027-9]\\d{7}",,,,,,,[8]],[,,"2(?:0(?:20|3[1-8]|4[13-5]|5[14]|6[14578]|7[1-578])|1(?:4[145]|5[14]|6[14-68]|7[169]|88))\\d{4}",,,,"20201234"],[,,"(?:23|7[0467]|[89]\\d)\\d{6}",,,,"93123456"],[,,"08\\d{6}",,,,"08123456"],[,,"09\\d{6}",,,,"09123456"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NE",227,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["08"]],[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[089]|2[013]|7[0467]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,
+,,,,,,[-1]],,,[,,,,,,,,,[-1]]],NF:[,[,,"[13]\\d{5}",,,,,,,[6],[5]],[,,"(?:1(?:06|17|28|39)|3[0-2]\\d)\\d{3}",,,,"106609",,,,[5]],[,,"(?:14|3[58])\\d{4}",,,,"381234",,,,[5]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NF",672,"00",,,,"([0-258]\\d{4})$","3$1",,,[[,"(\\d{2})(\\d{4})","$1 $2",["1[0-3]"]],[,"(\\d)(\\d{5})","$1 $2",["[13]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],NG:[,[,,"38\\d{6}|[78]\\d{9,13}|(?:20|9\\d)\\d{8}",,,,,
+,,[8,10,11,12,13,14],[6,7]],[,,"(?:20(?:[1259]\\d|3[013-9]|4[1-8]|6[024-689]|7[1-79]|8[2-9])|38)\\d{6}",,,,"2033123456",,,[8,10],[6,7]],[,,"(?:702[0-24-9]|819[01])\\d{6}|(?:7(?:0[13-9]|[12]\\d)|8(?:0[1-9]|1[0-8])|9(?:0[1-9]|1[1-6]))\\d{7}",,,,"8021234567",,,[10]],[,,"800\\d{7,11}",,,,"80017591759",,,[10,11,12,13,14]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NG",234,"009","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{2,3})","$1 $2 $3",["3"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",
+["[7-9]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["20[129]"],"0$1"],[,"(\\d{4})(\\d{2})(\\d{4})","$1 $2 $3",["2"],"0$1"],[,"(\\d{3})(\\d{4})(\\d{4,5})","$1 $2 $3",["[78]"],"0$1"],[,"(\\d{3})(\\d{5})(\\d{5,6})","$1 $2 $3",["[78]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,"700\\d{7,11}",,,,"7001234567",,,[10,11,12,13,14]],,,[,,,,,,,,,[-1]]],NI:[,[,,"(?:1800|[25-8]\\d{3})\\d{4}",,,,,,,[8]],[,,"2\\d{7}",,,,"21234567"],[,,"(?:5(?:5[0-7]|[78]\\d)|6(?:20|3[035]|4[045]|5[05]|77|8[1-9]|9[059])|(?:7[5-8]|8\\d)\\d)\\d{5}",
 ,,,"81234567"],[,,"1800\\d{4}",,,,"18001234"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NI",505,"00",,,,,,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[125-8]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],NL:[,[,,"(?:[124-7]\\d\\d|3(?:[02-9]\\d|1[0-8]))\\d{6}|8\\d{6,9}|9\\d{6,10}|1\\d{4,5}",,,,,,,[5,6,7,8,9,10,11]],[,,"(?:1(?:[035]\\d|1[13-578]|6[124-8]|7[24]|8[0-467])|2(?:[0346]\\d|2[2-46-9]|5[125]|9[479])|3(?:[03568]\\d|1[3-8]|2[01]|4[1-8])|4(?:[0356]\\d|1[1-368]|7[58]|8[15-8]|9[23579])|5(?:[0358]\\d|[19][1-9]|2[1-57-9]|4[13-8]|6[126]|7[0-3578])|7\\d\\d)\\d{6}",
 ,,,"101234567",,,[9]],[,,"(?:6[1-58]|970\\d)\\d{7}",,,,"612345678",,,[9,11]],[,,"800\\d{4,7}",,,,"8001234",,,[7,8,9,10]],[,,"90[069]\\d{4,7}",,,,"9061234",,,[7,8,9,10]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"(?:85|91)\\d{7}",,,,"851234567",,,[9]],"NL",31,"00","0",,,"0",,,,[[,"(\\d{4})","$1",["1[238]|[34]"]],[,"(\\d{2})(\\d{3,4})","$1 $2",["14"]],[,"(\\d{6})","$1",["1"]],[,"(\\d{3})(\\d{4,7})","$1 $2",["[89]0"],"0$1"],[,"(\\d{2})(\\d{7})","$1 $2",["66"],"0$1"],[,"(\\d)(\\d{8})","$1 $2",["6"],"0$1"],[,
 "(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["1[16-8]|2[259]|3[124]|4[17-9]|5[124679]"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[1-578]|91"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{5})","$1 $2 $3",["9"],"0$1"]],[[,"(\\d{3})(\\d{4,7})","$1 $2",["[89]0"],"0$1"],[,"(\\d{2})(\\d{7})","$1 $2",["66"],"0$1"],[,"(\\d)(\\d{8})","$1 $2",["6"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["1[16-8]|2[259]|3[124]|4[17-9]|5[124679]"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[1-578]|91"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{5})",
@@ -366,14 +366,14 @@ CG:[,[,,"222\\d{6}|(?:0\\d|80)\\d{7}",,,,,,,[9]],[,,"222[1-589]\\d{5}",,,,"22212
 ,,,,,,[8,9,10,11,12],[5,6,7]],[,,"(?:(?:21|42)[2-9]|58[126])\\d{7}|(?:2[25]|4[0146-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)[2-9]\\d{6,7}|(?:2(?:3[2358]|4[2-4]|9[2-8])|45[3479]|54[2-467]|60[468]|72[236]|8(?:2[2-689]|3[23578]|4[3478]|5[2356])|9(?:2[2-8]|3[27-9]|4[2-6]|6[3569]|9[25-8]))[2-9]\\d{5,6}",,,,"2123456789",,,[9,10],[5,6,7,8]],[,,"3(?:[0-247]\\d|3[0-79]|55|64)\\d{7}",,,,"3012345678",,,[10]],[,,"800\\d{5}(?:\\d{3})?",,,,"80012345",,,[8,11]],[,,"900\\d{5}",,,,"90012345",,,[8]],[,,,,,,,,,[-1]],[,,"122\\d{6}",
 ,,,"122044444",,,[9]],[,,,,,,,,,[-1]],"PK",92,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{2,7})","$1 $2 $3",["[89]0"],"0$1"],[,"(\\d{4})(\\d{5})","$1 $2",["1"]],[,"(\\d{3})(\\d{6,7})","$1 $2",["2(?:3[2358]|4[2-4]|9[2-8])|45[3479]|54[2-467]|60[468]|72[236]|8(?:2[2-689]|3[23578]|4[3478]|5[2356])|9(?:2[2-8]|3[27-9]|4[2-6]|6[3569]|9[25-8])","9(?:2[3-8]|98)|(?:2(?:3[2358]|4[2-4]|9[2-8])|45[3479]|54[2-467]|60[468]|72[236]|8(?:2[2-689]|3[23578]|4[3478]|5[2356])|9(?:22|3[27-9]|4[2-6]|6[3569]|9[25-7]))[2-9]"],
 "(0$1)"],[,"(\\d{2})(\\d{7,8})","$1 $2",["(?:2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91)[2-9]"],"(0$1)"],[,"(\\d{5})(\\d{5})","$1 $2",["58"],"(0$1)"],[,"(\\d{3})(\\d{7})","$1 $2",["3"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["2[125]|4[0-246-9]|5[1-35-7]|6[1-8]|7[14]|8[16]|91"],"(0$1)"],[,"(\\d{3})(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3 $4",["[24-9]"],"(0$1)"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,"(?:2(?:[125]|3[2358]|4[2-4]|9[2-8])|4(?:[0-246-9]|5[3479])|5(?:[1-35-7]|4[2-467])|6(?:0[468]|[1-8])|7(?:[14]|2[236])|8(?:[16]|2[2-689]|3[23578]|4[3478]|5[2356])|9(?:1|22|3[27-9]|4[2-6]|6[3569]|9[2-7]))111\\d{6}",
-,,,"21111825888",,,[11,12]],,,[,,,,,,,,,[-1]]],PL:[,[,,"(?:6|8\\d\\d)\\d{7}|[1-9]\\d{6}(?:\\d{2})?|[26]\\d{5}",,,,,,,[6,7,8,9,10]],[,,"47\\d{7}|(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])(?:[02-9]\\d{6}|1(?:[0-8]\\d{5}|9\\d{3}(?:\\d{2})?))",,,,"123456789",,,[7,9]],[,,"21(?:1[013-5]|2\\d|3[4-9])\\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}",,,,"512345678",,,[9]],[,,"800\\d{6,7}",,,,"800123456",,,[9,10]],[,,"70[01346-8]\\d{6}",,,,"701234567",,,[9]],[,,"801\\d{6}",,
-,,"801234567",,,[9]],[,,,,,,,,,[-1]],[,,"39\\d{7}",,,,"391234567",,,[9]],"PL",48,"00",,,,,,,,[[,"(\\d{5})","$1",["19"]],[,"(\\d{3})(\\d{3})","$1 $2",["11|20|64"]],[,"(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])1","(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])19"]],[,"(\\d{3})(\\d{2})(\\d{2,3})","$1 $2 $3",["64"]],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["21|39|45|5[0137]|6[0469]|7[02389]|8(?:0[14]|8)"]],
+,,,"21111825888",,,[11,12]],,,[,,,,,,,,,[-1]]],PL:[,[,,"(?:6|8\\d\\d)\\d{7}|[1-9]\\d{6}(?:\\d{2})?|[26]\\d{5}",,,,,,,[6,7,8,9,10]],[,,"47\\d{7}|(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])(?:[02-9]\\d{6}|1(?:[0-8]\\d{5}|9\\d{3}(?:\\d{2})?))",,,,"123456789",,,[7,9]],[,,"2131[89]\\d{4}|21(?:1[013-5]|2\\d|3[2-9])\\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}",,,,"512345678",,,[9]],[,,"800\\d{6,7}",,,,"800123456",,,[9,10]],[,,"70[01346-8]\\d{6}",,,,"701234567",,,[9]],[,
+,"801\\d{6}",,,,"801234567",,,[9]],[,,,,,,,,,[-1]],[,,"39\\d{7}",,,,"391234567",,,[9]],"PL",48,"00",,,,,,,,[[,"(\\d{5})","$1",["19"]],[,"(\\d{3})(\\d{3})","$1 $2",["11|20|64"]],[,"(\\d{2})(\\d{2})(\\d{3})","$1 $2 $3",["(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])1","(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])19"]],[,"(\\d{3})(\\d{2})(\\d{2,3})","$1 $2 $3",["64"]],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["21|39|45|5[0137]|6[0469]|7[02389]|8(?:0[14]|8)"]],
 [,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["1[2-8]|[2-7]|8[1-79]|9[145]"]],[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["8"]]],,[,,"64\\d{4,7}",,,,"641234567",,,[6,7,8,9]],,,[,,,,,,,,,[-1]],[,,"804\\d{6}",,,,"804123456",,,[9]],,,[,,,,,,,,,[-1]]],PM:[,[,,"[45]\\d{5}|(?:708|8\\d\\d)\\d{6}",,,,,,,[6,9]],[,,"(?:4[1-35-9]|5[0-47-9]|80[6-9]\\d\\d)\\d{4}",,,,"430123"],[,,"(?:4[02-489]|5[02-9]|708(?:4[0-5]|5[0-6]))\\d{4}",,,,"551234"],[,,"80[0-5]\\d{6}",,,,"800012345",,,[9]],[,,"8[129]\\d{7}",,,,"810123456",
 ,,[9]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"PM",508,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3",["[45]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["7"]],[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["8"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],PR:[,[,,"(?:[589]\\d\\d|787)\\d{7}",,,,,,,[10],[7]],[,,"(?:787|939)[2-9]\\d{6}",,,,"7872345678",,,,[7]],[,,"(?:787|939)[2-9]\\d{6}",,,,"7872345678",,,,[7]],[,,"8(?:00|33|44|55|66|77|88)[2-9]\\d{6}",
 ,,,"8002345678"],[,,"900[2-9]\\d{6}",,,,"9002345678"],[,,,,,,,,,[-1]],[,,"52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}",,,,"5002345678"],[,,,,,,,,,[-1]],"PR",1,"011","1",,,"1",,,1,,,[,,,,,,,,,[-1]],,"787|939",[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],PS:[,[,,"[2489]2\\d{6}|(?:1\\d|5)\\d{8}",,,,,,,[8,9,10],
 [7]],[,,"(?:22[2-47-9]|42[45]|82[014-68]|92[3569])\\d{5}",,,,"22234567",,,[8],[7]],[,,"5[69]\\d{7}",,,,"599123456",,,[9]],[,,"1800\\d{6}",,,,"1800123456",,,[10]],[,,,,,,,,,[-1]],[,,"1700\\d{6}",,,,"1700123456",,,[10]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"PS",970,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{4})","$1 $2 $3",["[2489]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["5"],"0$1"],[,"(\\d{4})(\\d{3})(\\d{3})","$1 $2 $3",["1"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],
 PT:[,[,,"1693\\d{5}|(?:[26-9]\\d|30)\\d{7}",,,,,,,[9]],[,,"2(?:[12]\\d|3[1-689]|4[1-59]|[57][1-9]|6[1-35689]|8[1-69]|9[1256])\\d{6}",,,,"212345678"],[,,"6(?:[06]92(?:30|9\\d)|[35]92(?:[049]\\d|3[034]))\\d{3}|(?:(?:16|6[0356])93|9(?:[1-36]\\d\\d|480))\\d{5}",,,,"912345678"],[,,"80[02]\\d{6}",,,,"800123456"],[,,"(?:6(?:0[178]|4[68])\\d|76(?:0[1-57]|1[2-47]|2[237]))\\d{5}",,,,"760123456"],[,,"80(?:8\\d|9[1579])\\d{5}",,,,"808123456"],[,,"884[0-4689]\\d{5}",,,,"884123456"],[,,"30\\d{7}",,,,"301234567"],
-"PT",351,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["2[12]"]],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["16|[236-9]"]]],,[,,"6(?:222\\d|8988)\\d{4}",,,,"622212345"],,,[,,,,,,,,,[-1]],[,,"70(?:38[01]|596|(?:7\\d|8[17])\\d)\\d{4}",,,,"707123456"],,,[,,"600\\d{6}|6[06]92(?:0\\d|3[349]|49)\\d{3}",,,,"600110000"]],PW:[,[,,"(?:[24-8]\\d\\d|345|900)\\d{4}",,,,,,,[7]],[,,"(?:2(?:55|77)|345|488|5(?:35|44|87)|6(?:22|54|79)|7(?:33|47)|8(?:24|55|76)|900)\\d{4}",,,,"2771234"],[,,"(?:(?:46|83)[0-5]|6[2-4689]0)\\d{4}|(?:45|77|88)\\d{5}",
+"PT",351,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["2[12]"]],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["16|[236-9]"]]],,[,,"6(?:222\\d|8988)\\d{4}",,,,"622212345"],,,[,,,,,,,,,[-1]],[,,"70(?:38[01]|596|(?:7\\d|8[17])\\d)\\d{4}",,,,"707123456"],,,[,,"600\\d{6}|6[06]92(?:0\\d|3[349]|49)\\d{3}",,,,"600110000"]],PW:[,[,,"(?:[24-8]\\d\\d|345|900)\\d{4}",,,,,,,[7]],[,,"(?:2(?:55|77)|345|488|5(?:35|44|87)|6(?:22|54|79)|7(?:33|47)|8(?:24|55|76)|900)\\d{4}",,,,"2771234"],[,,"(?:(?:46|83)[0-5]|(?:6[2-4689]|78)0)\\d{4}|(?:45|77|88)\\d{5}",
 ,,,"6201234"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"PW",680,"01[12]",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[2-9]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],PY:[,[,,"59\\d{4,6}|9\\d{5,10}|(?:[2-46-8]\\d|5[0-8])\\d{4,7}",,,,,,,[6,7,8,9,10,11],[5]],[,,"(?:[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36])\\d{5,7}|(?:2(?:2[4-68]|[4-68]\\d|7[15]|9[1-5])|3(?:18|3[167]|4[2357]|51|[67]\\d)|4(?:3[12]|5[13]|9[1-47])|5(?:[1-4]\\d|5[02-4])|6(?:3[1-3]|44|7[1-8])|7(?:4[0-4]|5\\d|6[1-578]|75|8[0-8])|858)\\d{5,6}",
 ,,,"212345678",,,[7,8,9],[5,6]],[,,"9(?:51|6[129]|7[1-6]|8[1-7]|9[1-5])\\d{6}",,,,"961456789",,,[9]],[,,"9800\\d{5,7}",,,,"98000123456",,,[9,10,11]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"8700[0-4]\\d{4}",,,,"870012345",,,[9]],"PY",595,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3,6})","$1 $2",["[2-9]0"],"0$1"],[,"(\\d{2})(\\d{5})","$1 $2",["[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36]"],"(0$1)"],[,"(\\d{3})(\\d{4,5})","$1 $2",["2[279]|3[13-5]|4[359]|5|6(?:[34]|7[1-46-8])|7[46-8]|85"],"(0$1)"],[,"(\\d{2})(\\d{3})(\\d{3,4})",
 "$1 $2 $3",["2[14-68]|3[26-9]|4[1246-8]|6(?:1|75)|7[1-35]|8[1-36]"],"(0$1)"],[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["87"]],[,"(\\d{3})(\\d{6})","$1 $2",["9(?:[5-79]|8[1-7])"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[2-8]"],"0$1"],[,"(\\d{4})(\\d{3})(\\d{4})","$1 $2 $3",["9"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,"[2-9]0\\d{4,7}",,,,"201234567",,,[6,7,8,9]],,,[,,,,,,,,,[-1]]],QA:[,[,,"800\\d{4}|(?:2|800)\\d{6}|(?:0080|[3-7])\\d{7}",,,,,,,[7,8,9,11]],[,,"4(?:1111|2022)\\d{3}|4(?:[04]\\d\\d|14[0-6]|999)\\d{4}",
@@ -407,10 +407,10 @@ PT:[,[,,"1693\\d{5}|(?:[26-9]\\d|30)\\d{7}",,,,,,,[9]],[,,"2(?:[12]\\d|3[1-689]|
 ,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"SL",232,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{6})","$1 $2",["[236-9]"],"(0$1)"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],SM:[,[,,"(?:0549|[5-7]\\d)\\d{6}",,,,,,,[8,10],[6]],[,,"0549(?:8[0157-9]|9\\d)\\d{4}",,,,"0549886377",,,[10],[6]],[,,"6[16]\\d{6}",,,,"66661212",,,[8]],[,,,,,,,,,[-1]],[,,"7[178]\\d{6}",,,,"71123456",,,[8]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"5[158]\\d{6}",,,,"58001110",,,[8]],"SM",378,"00",,,
 ,"([89]\\d{5})$","0549$1",,,[[,"(\\d{6})","$1",["[89]"]],[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[5-7]"]],[,"(\\d{4})(\\d{6})","$1 $2",["0"]]],[[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[5-7]"]],[,"(\\d{4})(\\d{6})","$1 $2",["0"]]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],SN:[,[,,"(?:[378]\\d|93)\\d{7}",,,,,,,[9]],[,,"3(?:0(?:1[0-2]|80)|282|3(?:8[1-9]|9[3-9])|611)\\d{5}",,,,"301012345"],[,,"7(?:(?:[06-8]\\d|[19]0|21)\\d|5(?:0[01]|[19]0|2[25]|3[36]|[4-7]\\d|8[35]))\\d{5}",
 ,,,"701234567"],[,,"800\\d{6}",,,,"800123456"],[,,"88[4689]\\d{6}",,,,"884123456"],[,,"81[02468]\\d{6}",,,,"810123456"],[,,,,,,,,,[-1]],[,,"(?:3(?:392|9[01]\\d)\\d|93(?:3[13]0|929))\\d{4}",,,,"933301234"],"SN",221,"00",,,,,,,,[[,"(\\d{3})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["8"]],[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[379]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],SO:[,[,,"[346-9]\\d{8}|[12679]\\d{7}|[1-5]\\d{6}|[1348]\\d{5}",,,,,,,[6,7,8,9]],[,,
-"(?: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]],[,,"(?:(?:15|(?:3[59]|4[89]|6\\d|7[79]|8[08])\\d|9(?:0\\d|[2-9]))\\d|2(?:4\\d|8))\\d{5}|(?:[67]\\d\\d|904)\\d{5}",,,,"71123456",,,[7,8,9]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"SO",252,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{4})","$1 $2",["8[125]"]],[,"(\\d{6})","$1",["[134]"]],[,"(\\d)(\\d{6})","$1 $2",["[15]|2[0-79]|3[0-46-8]|4[0-7]"]],[,"(\\d)(\\d{7})","$1 $2",
-["(?:2|90)4|[67]"]],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[348]|64|79|90"]],[,"(\\d{2})(\\d{5,7})","$1 $2",["1|28|6[0-35-9]|77|9[2-9]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],SR:[,[,,"(?:[2-5]|68|[78]\\d)\\d{5}",,,,,,,[6,7]],[,,"(?:2[1-3]|3[0-7]|(?:4|68)\\d|5[2-58])\\d{4}",,,,"211234"],[,,"(?:7[124-7]|8[124-9])\\d{5}",,,,"7412345",,,[7]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"56\\d{4}",,,,"561234",,,[6]],"SR",597,"00",,,,,,,,[[,"(\\d{2})(\\d{2})(\\d{2})",
-"$1-$2-$3",["56"]],[,"(\\d{3})(\\d{3})","$1-$2",["[2-5]"]],[,"(\\d{3})(\\d{4})","$1-$2",["[6-8]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],SS:[,[,,"[19]\\d{8}",,,,,,,[9]],[,,"1[89]\\d{7}",,,,"181234567"],[,,"(?:12|9[1257-9])\\d{7}",,,,"977123456"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"SS",211,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[19]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,
-,,,,,,[-1]]],ST:[,[,,"(?:22|9\\d)\\d{5}",,,,,,,[7]],[,,"22\\d{5}",,,,"2221234"],[,,"900[5-9]\\d{3}|9(?:0[1-9]|[89]\\d)\\d{4}",,,,"9812345"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"ST",239,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[29]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],SV:[,[,,"[267]\\d{7}|(?:80\\d|900)\\d{4}(?:\\d{4})?",,,,,,,[7,8,11]],[,,"2(?:79(?:0[0347-9]|[1-9]\\d)|89(?:0[024589]|[1-9]\\d))\\d{3}|2(?:[1-69]\\d|[78][0-8])\\d{5}",
+"(?: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]],[,,"(?:(?:15|(?:3[59]|4[89]|6\\d|7[679]|8[08])\\d|9(?:0\\d|[2-9]))\\d|2(?:4\\d|8))\\d{5}|(?:[67]\\d\\d|904)\\d{5}",,,,"71123456",,,[7,8,9]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"SO",252,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{4})","$1 $2",["8[125]"]],[,"(\\d{6})","$1",["[134]"]],[,"(\\d)(\\d{6})","$1 $2",["[15]|2[0-79]|3[0-46-8]|4[0-7]"]],[,"(\\d)(\\d{7})","$1 $2",
+["(?:2|90)4|[67]"]],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[348]|64|79|90"]],[,"(\\d{2})(\\d{5,7})","$1 $2",["1|28|6[0-35-9]|7[67]|9[2-9]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],SR:[,[,,"(?:[2-5]|68|[78]\\d)\\d{5}",,,,,,,[6,7]],[,,"(?:2[1-3]|3[0-7]|(?:4|68)\\d|5[2-58])\\d{4}",,,,"211234"],[,,"(?:7[124-7]|8[124-9])\\d{5}",,,,"7412345",,,[7]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"56\\d{4}",,,,"561234",,,[6]],"SR",597,"00",,,,,,,,[[,
+"(\\d{2})(\\d{2})(\\d{2})","$1-$2-$3",["56"]],[,"(\\d{3})(\\d{3})","$1-$2",["[2-5]"]],[,"(\\d{3})(\\d{4})","$1-$2",["[6-8]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],SS:[,[,,"[19]\\d{8}",,,,,,,[9]],[,,"1[89]\\d{7}",,,,"181234567"],[,,"(?:12|9[1257-9])\\d{7}",,,,"977123456"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"SS",211,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[19]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],
+[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],ST:[,[,,"(?:22|9\\d)\\d{5}",,,,,,,[7]],[,,"22\\d{5}",,,,"2221234"],[,,"900[5-9]\\d{3}|9(?:0[1-9]|[89]\\d)\\d{4}",,,,"9812345"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"ST",239,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[29]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],SV:[,[,,"[267]\\d{7}|(?:80\\d|900)\\d{4}(?:\\d{4})?",,,,,,,[7,8,11]],[,,"2(?:79(?:0[0347-9]|[1-9]\\d)|89(?:0[024589]|[1-9]\\d))\\d{3}|2(?:[1-69]\\d|[78][0-8])\\d{5}",
 ,,,"21234567",,,[8]],[,,"[67]\\d{7}",,,,"70123456",,,[8]],[,,"800\\d{8}|80[01]\\d{4}",,,,"8001234",,,[7,11]],[,,"900\\d{4}(?:\\d{4})?",,,,"9001234",,,[7,11]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"SV",503,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[89]"]],[,"(\\d{4})(\\d{4})","$1 $2",["[267]"]],[,"(\\d{3})(\\d{4})(\\d{4})","$1 $2 $3",["[89]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],SX:[,[,,"7215\\d{6}|(?:[58]\\d\\d|900)\\d{7}",,,,,,,[10],[7]],[,,"7215(?:4[2-8]|8[239]|9[056])\\d{4}",
 ,,,"7215425678",,,,[7]],[,,"7215(?:1[02]|2\\d|5[034679]|8[014-8])\\d{4}",,,,"7215205678",,,,[7]],[,,"8(?:00|33|44|55|66|77|88)[2-9]\\d{6}",,,,"8002123456"],[,,"900[2-9]\\d{6}",,,,"9002123456"],[,,,,,,,,,[-1]],[,,"52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}",,,,"5002345678"],[,,,,,,,,,[-1]],"SX",1,"011","1",,,"(5\\d{6})$|1",
 "721$1",,,,,[,,,,,,,,,[-1]],,"721",[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],SY:[,[,,"[1-359]\\d{8}|[1-5]\\d{7}",,,,,,,[8,9],[6,7]],[,,"21\\d{6,7}|(?:1(?:[14]\\d|[2356])|2[235]|3(?:[13]\\d|4)|4[134]|5[1-3])\\d{6}",,,,"112345678",,,,[6,7]],[,,"(?:50|9[1-689])\\d{7}",,,,"944567890",,,[9]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"SY",963,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[1-4]|5[1-3]"],"0$1",,1],[,"(\\d{3})(\\d{3})(\\d{3})",
@@ -438,8 +438,8 @@ PT:[,[,,"1693\\d{5}|(?:[26-9]\\d|30)\\d{7}",,,,,,,[9]],[,,"2(?:[12]\\d|3[1-689]|
 ,,,"311234567",,,[9],[5,6,7]],[,,"790\\d{6}|(?:39|50|6[36-8]|7[1-357]|9[1-9])\\d{7}",,,,"501234567",,,[9]],[,,"800[1-8]\\d{5,6}",,,,"800123456"],[,,"900[239]\\d{5,6}",,,,"900212345"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"89[1-579]\\d{6}",,,,"891234567",,,[9]],"UA",380,"00","0",,,"0",,"0~0",,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["6[12][29]|(?:3[1-8]|4[136-8]|5[12457]|6[49])2|(?:56|65)[24]","6[12][29]|(?:35|4[1378]|5[12457]|6[49])2|(?:56|65)[24]|(?:3[1-46-8]|46)2[013-9]"],"0$1"],[,"(\\d{4})(\\d{5})",
 "$1 $2",["3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6[0135689]|7[4-6])|6(?:[12][3-7]|[459])","3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6(?:[015689]|3[02389])|7[4-6])|6(?:[12][3-7]|[459])"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[3-7]|89|9[1-9]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["[89]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],UG:[,[,,"800\\d{6}|(?:[29]0|[347]\\d)\\d{7}",,,,,,,[9],[5,6,7]],[,,"20(?:(?:240|30[67])\\d|6(?:00[0-2]|30[0-4]))\\d{3}|(?:20(?:[017]\\d|2[5-9]|3[1-4]|5[0-4]|6[15-9])|[34]\\d{3})\\d{5}",
 ,,,"312345678",,,,[5,6,7]],[,,"72[48]0\\d{5}|7(?:[015-8]\\d|2[067]|36|4[0-7]|9[89])\\d{6}",,,,"712345678"],[,,"800[1-3]\\d{5}",,,,"800123456"],[,,"90[1-3]\\d{6}",,,,"901123456"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"UG",256,"00[057]","0",,,"0",,,,[[,"(\\d{4})(\\d{5})","$1 $2",["202","2024"],"0$1"],[,"(\\d{3})(\\d{6})","$1 $2",["[27-9]|4(?:6[45]|[7-9])"],"0$1"],[,"(\\d{2})(\\d{7})","$1 $2",["[34]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],US:[,[,,"[2-9]\\d{9}|3\\d{6}",
-,,,,,,[10],[7]],[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468]))\\d{4}|(?:305[3-9]|472[24]|505[2-57-9]|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",
-,,,"2015550123",,,,[7]],[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468]))\\d{4}|(?:305[3-9]|472[24]|505[2-57-9]|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",
+,,,,,,[10],[7]],[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",
+,,,"2015550123",,,,[7]],[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",
 ,,,"2015550123",,,,[7]],[,,"8(?:00|33|44|55|66|77|88)[2-9]\\d{6}",,,,"8002345678"],[,,"900[2-9]\\d{6}",,,,"9002345678"],[,,,,,,,,,[-1]],[,,"52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}",,,,"5002345678"],[,,"305209\\d{4}",,,,"3052090123",,,,[7]],"US",1,"011","1",,,"1",,,1,[[,"(\\d{3})(\\d{4})","$1-$2",["310"],,,1],
 [,"(\\d{3})(\\d{4})","$1-$2",["[24-9]|3(?:[02-9]|1[1-9])"]],[,"(\\d{3})(\\d{3})(\\d{4})","($1) $2-$3",["[2-9]"],,,1]],[[,"(\\d{3})(\\d{4})","$1-$2",["310"],,,1],[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["[2-9]"]]],[,,,,,,,,,[-1]],1,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],UY:[,[,,"0004\\d{2,9}|[1249]\\d{7}|(?:[49]\\d|80)\\d{5}",,,,,,,[6,7,8,9,10,11,12,13]],[,,"(?:1(?:770|9(?:20|[89]7))|(?:2\\d|4[2-7])\\d\\d)\\d{4}",,,,"21231234",,,[8],[7]],[,,"9[1-9]\\d{6}",,,,"94231234",,,[8]],[,,"0004\\d{2,9}|(?:405|80[05])\\d{4}",
 ,,,"8001234"],[,,"90[0-8]\\d{4}",,,,"9001234",,,[7]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"UY",598,"0(?:0|1[3-9]\\d)","0"," int. ",,"0",,"00",,[[,"(\\d{3})(\\d{3,4})","$1 $2",["0"]],[,"(\\d{3})(\\d{4})","$1 $2",["[49]0|8"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["9"],"0$1"],[,"(\\d{4})(\\d{4})","$1 $2",["[124]"]],[,"(\\d{3})(\\d{3})(\\d{2,4})","$1 $2 $3",["0"]],[,"(\\d{3})(\\d{3})(\\d{3})(\\d{2,4})","$1 $2 $3 $4",["0"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,
@@ -497,32 +497,32 @@ ub=/^([A-Za-z0-9\uff10-\uff19\u0660-\u0669\u06f0-\u06f9]+((\-)*[A-Za-z0-9\uff10-
 function vb(){return";ext="+J("20")+"|[ \u00a0\\t,]*(?:e?xt(?:ensi(?:o\u0301?|\u00f3))?n?|\uff45?\uff58\uff54\uff4e?|\u0434\u043e\u0431|anexo)[:\\.\uff0e]?[ \u00a0\\t,-]*"+(J("20")+"#?|[ \u00a0\\t,]*(?:[x\uff58#\uff03~\uff5e]|int|\uff49\uff4e\uff54)[:\\.\uff0e]?[ \u00a0\\t,-]*")+(J("9")+"#?|[- ]+")+(J("6")+"#|[ \u00a0\\t]*(?:,{2}|;)[:\\.\uff0e]?[ \u00a0\\t,-]*")+(J("15")+"#?|[ \u00a0\\t]*(?:,)+[:\\.\uff0e]?[ \u00a0\\t,-]*")+(J("9")+"#?")}
 var wb=new RegExp("(?:"+vb()+")$","i"),xb=new RegExp("^[0-9\uff10-\uff19\u0660-\u0669\u06f0-\u06f9]{2}$|^[+\uff0b]*(?:[-x\u2010-\u2015\u2212\u30fc\uff0d-\uff0f \u00a0\u00ad\u200b\u2060\u3000()\uff08\uff09\uff3b\uff3d.\\[\\]/~\u2053\u223c\uff5e*]*[0-9\uff10-\uff19\u0660-\u0669\u06f0-\u06f9]){3,}[-x\u2010-\u2015\u2212\u30fc\uff0d-\uff0f \u00a0\u00ad\u200b\u2060\u3000()\uff08\uff09\uff3b\uff3d.\\[\\]/~\u2053\u223c\uff5e*A-Za-z0-9\uff10-\uff19\u0660-\u0669\u06f0-\u06f9]*(?:"+vb()+")?$","i"),yb=/(\$\d)/,
 zb=/\$NP/,Ab=/\$FG/,Bb=/\$CC/,Cb=/^\(?\$1\)?$/;function Db(a){return 2>a.length?!1:K(xb,a)}function Eb(a){return K(sb,a)?L(a,kb):L(a,ib)}function Fb(a){var b=Eb(a.toString());A(a);a.g(b)}function Gb(a){return null!=a&&(1!=w(a,9)||-1!=u(a,9)[0])}function L(a,b){for(var c=new z,d,f=a.length,e=0;e<f;++e)d=a.charAt(e),d=b[d.toUpperCase()],null!=d&&c.g(d);return c.toString()}function Hb(a){return 0==a.length||Cb.test(a)}function Ib(a){return null!=a&&isNaN(a)&&a.toUpperCase()in gb}
-function M(a,b,c){if(0==q(b,2)&&n(b,5)){var d=v(b,5);if(0<d.length)return d}d=v(b,1);var f=N(b);if(0==c)return Jb(d,0,f,"");if(!(d in I))return f;a=O(a,d,P(d));b=Kb(b,a,c);f=Lb(f,a,c);return Jb(d,c,f,b)}function Mb(a,b,c){var d=v(b,1),f=N(b);if(!(d in I))return f;a=O(a,d,P(d));b=Kb(b,a,2);c=Lb(f,a,2,c);return Jb(d,2,c,b)}function O(a,b,c){return"001"==c?Q(a,""+b):Q(a,c)}function Nb(a,b){return Mb(a,b,0<v(b,7).length?v(b,7):"")}
-function Ob(a,b,c){if(!Ib(c))return M(a,b,1);var d=v(b,1),f=N(b);if(!(d in I))return f;if(1==d){if(null!=c&&I[1].includes(c.toUpperCase()))return d+" "+M(a,b,2)}else if(d==Pb(a,c))return M(a,b,2);var e=Q(a,c),g=v(e,11);c="";n(e,17)?c=v(e,17):K(lb,g)&&(c=g);a=O(a,d,P(d));f=Lb(f,a,1);b=Kb(b,a,1);return 0<c.length?c+" "+d+" "+f+b:Jb(d,1,f,b)}function N(a){if(!n(a,2))return"";var b=""+q(a,2);return n(a,4)&&q(a,4)&&0<v(a,8)?Array(v(a,8)+1).join("0")+b:b}
-function Jb(a,b,c,d){switch(b){case 0:return"+"+a+c+d;case 1:return"+"+a+" "+c+d;case 3:return"tel:+"+a+"-"+c+d;default:return c+d}}function Lb(a,b,c,d){b=0==u(b,20).length||2==c?u(b,19):u(b,20);b=Qb(b,a);return null==b?a:Rb(a,b,c,d)}function Qb(a,b){for(var c,d=a.length,f=0;f<d;++f){c=a[f];var e=w(c,3);if(0==e||0==b.search(q(c,3,e-1)))if(e=new RegExp(q(c,1)),K(e,b))return c}return null}
-function Rb(a,b,c,d){var f=v(b,2),e=new RegExp(q(b,1)),g=v(b,5);2==c&&null!=d&&0<d.length&&0<g.length?(b=g.replace(Bb,d),f=f.replace(yb,b),a=a.replace(e,f)):(b=v(b,4),a=2==c&&null!=b&&0<b.length?a.replace(e,f.replace(yb,b)):a.replace(e,f));3==c&&(a=a.replace(/^[-x\u2010-\u2015\u2212\u30fc\uff0d-\uff0f \u00a0\u00ad\u200b\u2060\u3000()\uff08\uff09\uff3b\uff3d.\[\]/~\u2053\u223c\uff5e]+/,""),a=a.replace(/[-x\u2010-\u2015\u2212\u30fc\uff0d-\uff0f \u00a0\u00ad\u200b\u2060\u3000()\uff08\uff09\uff3b\uff3d.\[\]/~\u2053\u223c\uff5e]+/g,
-"-"));return a}function Kb(a,b,c){return n(a,3)&&0!=q(a,3).length?3==c?";ext="+q(a,3):n(b,13)?q(b,13)+v(a,3):" ext. "+v(a,3):""}function Sb(a,b){switch(b){case 4:return q(a,5);case 3:return q(a,4);case 1:return q(a,3);case 0:case 2:return q(a,2);case 5:return q(a,6);case 6:return q(a,8);case 7:return q(a,7);case 8:return q(a,21);case 9:return q(a,25);case 10:return q(a,28);default:return q(a,1)}}function lc(a,b){var c=mc(a,b);a=O(a,v(b,1),c);if(null==a)return-1;b=N(b);return nc(b,a)}
-function nc(a,b){return R(a,q(b,1))?R(a,q(b,5))?4:R(a,q(b,4))?3:R(a,q(b,6))?5:R(a,q(b,8))?6:R(a,q(b,7))?7:R(a,q(b,21))?8:R(a,q(b,25))?9:R(a,q(b,28))?10:R(a,q(b,2))?q(b,18)||R(a,q(b,3))?2:0:!q(b,18)&&R(a,q(b,3))?1:-1:-1}function Q(a,b){if(null==b)return null;b=b.toUpperCase();var c=a.g[b];if(null==c){c=gb[b];if(null==c)return null;c=(new G).j(F.m(),c);a.g[b]=c}return c}function R(a,b){var c=a.length;return 0<w(b,9)&&-1==u(b,9).indexOf(c)?!1:K(v(b,2),a)}
-function oc(a,b){var c=mc(a,b);return pc(a,b,c)}function pc(a,b,c){var d=v(b,1),f=O(a,d,c);if(null==f||"001"!=c&&d!=Pb(a,c))return!1;a=N(b);return-1!=nc(a,f)}function mc(a,b){if(null==b)return null;var c=v(b,1);c=I[c];if(null==c)a=null;else if(1==c.length)a=c[0];else a:{b=N(b);for(var d,f=c.length,e=0;e<f;e++){d=c[e];var g=Q(a,d);if(n(g,23)){if(0==b.search(q(g,23))){a=d;break a}}else if(-1!=nc(b,g)){a=d;break a}}a=null}return a}function P(a){a=I[a];return null==a?"ZZ":a[0]}
-function Pb(a,b){a=Q(a,b);if(null==a)throw Error("Invalid region code: "+b);return v(a,10)}function qc(a,b,c,d){var f=Sb(c,d),e=0==w(f,9)?u(q(c,1),9):u(f,9);f=u(f,10);if(2==d)if(Gb(Sb(c,0)))a=Sb(c,1),Gb(a)&&(e=e.concat(0==w(a,9)?u(q(c,1),9):u(a,9)),e.sort(),0==f.length?f=u(a,10):(f=f.concat(u(a,10)),f.sort()));else return qc(a,b,c,1);if(-1==e[0])return 5;b=b.length;if(-1<f.indexOf(b))return 4;c=e[0];return c==b?0:c>b?2:e[e.length-1]<b?3:-1<e.indexOf(b,1)?0:5}
+function M(a,b,c){if(0==p(b,2)&&n(b,5)){var d=v(b,5);if(0<d.length)return d}d=v(b,1);var f=N(b);if(0==c)return Jb(d,0,f,"");if(!(d in I))return f;a=O(a,d,P(d));b=Kb(b,a,c);f=Lb(f,a,c);return Jb(d,c,f,b)}function Mb(a,b,c){var d=v(b,1),f=N(b);if(!(d in I))return f;a=O(a,d,P(d));b=Kb(b,a,2);c=Lb(f,a,2,c);return Jb(d,2,c,b)}function O(a,b,c){return"001"==c?Q(a,""+b):Q(a,c)}function Nb(a,b){return Mb(a,b,0<v(b,7).length?v(b,7):"")}
+function Ob(a,b,c){if(!Ib(c))return M(a,b,1);var d=v(b,1),f=N(b);if(!(d in I))return f;if(1==d){if(null!=c&&I[1].includes(c.toUpperCase()))return d+" "+M(a,b,2)}else if(d==Pb(a,c))return M(a,b,2);var e=Q(a,c),g=v(e,11);c="";n(e,17)?c=v(e,17):K(lb,g)&&(c=g);a=O(a,d,P(d));f=Lb(f,a,1);b=Kb(b,a,1);return 0<c.length?c+" "+d+" "+f+b:Jb(d,1,f,b)}function N(a){if(!n(a,2))return"";var b=""+p(a,2);return n(a,4)&&p(a,4)&&0<v(a,8)?Array(v(a,8)+1).join("0")+b:b}
+function Jb(a,b,c,d){switch(b){case 0:return"+"+a+c+d;case 1:return"+"+a+" "+c+d;case 3:return"tel:+"+a+"-"+c+d;default:return c+d}}function Lb(a,b,c,d){b=0==u(b,20).length||2==c?u(b,19):u(b,20);b=Qb(b,a);return null==b?a:Rb(a,b,c,d)}function Qb(a,b){for(var c,d=a.length,f=0;f<d;++f){c=a[f];var e=w(c,3);if(0==e||0==b.search(p(c,3,e-1)))if(e=new RegExp(p(c,1)),K(e,b))return c}return null}
+function Rb(a,b,c,d){var f=v(b,2),e=new RegExp(p(b,1)),g=v(b,5);2==c&&null!=d&&0<d.length&&0<g.length?(b=g.replace(Bb,d),f=f.replace(yb,b),a=a.replace(e,f)):(b=v(b,4),a=2==c&&null!=b&&0<b.length?a.replace(e,f.replace(yb,b)):a.replace(e,f));3==c&&(a=a.replace(/^[-x\u2010-\u2015\u2212\u30fc\uff0d-\uff0f \u00a0\u00ad\u200b\u2060\u3000()\uff08\uff09\uff3b\uff3d.\[\]/~\u2053\u223c\uff5e]+/,""),a=a.replace(/[-x\u2010-\u2015\u2212\u30fc\uff0d-\uff0f \u00a0\u00ad\u200b\u2060\u3000()\uff08\uff09\uff3b\uff3d.\[\]/~\u2053\u223c\uff5e]+/g,
+"-"));return a}function Kb(a,b,c){return n(a,3)&&0!=p(a,3).length?3==c?";ext="+p(a,3):n(b,13)?p(b,13)+v(a,3):" ext. "+v(a,3):""}function Sb(a,b){switch(b){case 4:return p(a,5);case 3:return p(a,4);case 1:return p(a,3);case 0:case 2:return p(a,2);case 5:return p(a,6);case 6:return p(a,8);case 7:return p(a,7);case 8:return p(a,21);case 9:return p(a,25);case 10:return p(a,28);default:return p(a,1)}}function lc(a,b){var c=mc(a,b);a=O(a,v(b,1),c);if(null==a)return-1;b=N(b);return nc(b,a)}
+function nc(a,b){return R(a,p(b,1))?R(a,p(b,5))?4:R(a,p(b,4))?3:R(a,p(b,6))?5:R(a,p(b,8))?6:R(a,p(b,7))?7:R(a,p(b,21))?8:R(a,p(b,25))?9:R(a,p(b,28))?10:R(a,p(b,2))?p(b,18)||R(a,p(b,3))?2:0:!p(b,18)&&R(a,p(b,3))?1:-1:-1}function Q(a,b){if(null==b)return null;b=b.toUpperCase();var c=a.g[b];if(null==c){c=gb[b];if(null==c)return null;c=(new G).j(F.m(),c);a.g[b]=c}return c}function R(a,b){var c=a.length;return 0<w(b,9)&&-1==u(b,9).indexOf(c)?!1:K(v(b,2),a)}
+function oc(a,b){var c=mc(a,b);return pc(a,b,c)}function pc(a,b,c){var d=v(b,1),f=O(a,d,c);if(null==f||"001"!=c&&d!=Pb(a,c))return!1;a=N(b);return-1!=nc(a,f)}function mc(a,b){if(null==b)return null;var c=v(b,1);c=I[c];if(null==c)a=null;else if(1==c.length)a=c[0];else a:{b=N(b);for(var d,f=c.length,e=0;e<f;e++){d=c[e];var g=Q(a,d);if(n(g,23)){if(0==b.search(p(g,23))){a=d;break a}}else if(-1!=nc(b,g)){a=d;break a}}a=null}return a}function P(a){a=I[a];return null==a?"ZZ":a[0]}
+function Pb(a,b){a=Q(a,b);if(null==a)throw Error("Invalid region code: "+b);return v(a,10)}function qc(a,b,c,d){var f=Sb(c,d),e=0==w(f,9)?u(p(c,1),9):u(f,9);f=u(f,10);if(2==d)if(Gb(Sb(c,0)))a=Sb(c,1),Gb(a)&&(e=e.concat(0==w(a,9)?u(p(c,1),9):u(a,9)),e.sort(),0==f.length?f=u(a,10):(f=f.concat(u(a,10)),f.sort()));else return qc(a,b,c,1);if(-1==e[0])return 5;b=b.length;if(-1<f.indexOf(b))return 4;c=e[0];return c==b?0:c>b?2:e[e.length-1]<b?3:-1<e.indexOf(b,1)?0:5}
 function rc(a){var b=S,c=N(a);a=v(a,1);if(!(a in I))return 1;a=O(b,a,P(a));return qc(b,c,a,-1)}function sc(a,b){a=a.toString();if(0==a.length||"0"==a.charAt(0))return 0;for(var c,d=a.length,f=1;3>=f&&f<=d;++f)if(c=parseInt(a.substring(0,f),10),c in I)return b.g(a.substring(f)),c;return 0}
-function tc(a,b,c,d,f,e){if(0==b.length)return 0;b=new z(b);var g;null!=c&&(g=q(c,11));null==g&&(g="NonMatch");var h=b.toString();if(0==h.length)g=20;else if(nb.test(h))h=h.replace(nb,""),A(b),b.g(Eb(h)),g=1;else{h=new RegExp(g);Fb(b);g=b.toString();if(0==g.search(h)){h=g.match(h)[0].length;var m=g.substring(h).match(ob);m&&null!=m[1]&&0<m[1].length&&"0"==L(m[1],ib)?g=!1:(A(b),b.g(g.substring(h)),g=!0)}else g=!1;g=g?5:20}f&&t(e,6,g);if(20!=g){if(2>=b.h.length)throw Error("Phone number too short after IDD");
-a=sc(b,d);if(0!=a)return t(e,1,a),a;throw Error("Invalid country calling code");}if(null!=c&&(g=v(c,10),h=""+g,m=b.toString(),0==m.lastIndexOf(h,0)&&(h=new z(m.substring(h.length)),m=q(c,1),m=new RegExp(v(m,2)),uc(h,c,null),h=h.toString(),!K(m,b.toString())&&K(m,h)||3==qc(a,b.toString(),c,-1))))return d.g(h),f&&t(e,6,10),t(e,1,g),g;t(e,1,0);return 0}
-function uc(a,b,c){var d=a.toString(),f=d.length,e=q(b,15);if(0!=f&&null!=e&&0!=e.length){var g=new RegExp("^(?:"+e+")");if(f=g.exec(d)){e=new RegExp(v(q(b,1),2));var h=K(e,d),m=f.length-1;b=q(b,16);if(null==b||0==b.length||null==f[m]||0==f[m].length){if(!h||K(e,d.substring(f[0].length)))null!=c&&0<m&&null!=f[m]&&c.g(f[1]),a.set(d.substring(f[0].length))}else if(d=d.replace(g,b),!h||K(e,d))null!=c&&0<m&&c.g(f[1]),a.set(d)}}}
+function tc(a,b,c,d,f,e){if(0==b.length)return 0;b=new z(b);var g;null!=c&&(g=p(c,11));null==g&&(g="NonMatch");var h=b.toString();if(0==h.length)g=20;else if(nb.test(h))h=h.replace(nb,""),A(b),b.g(Eb(h)),g=1;else{h=new RegExp(g);Fb(b);g=b.toString();if(0==g.search(h)){h=g.match(h)[0].length;var m=g.substring(h).match(ob);m&&null!=m[1]&&0<m[1].length&&"0"==L(m[1],ib)?g=!1:(A(b),b.g(g.substring(h)),g=!0)}else g=!1;g=g?5:20}f&&t(e,6,g);if(20!=g){if(2>=b.h.length)throw Error("Phone number too short after IDD");
+a=sc(b,d);if(0!=a)return t(e,1,a),a;throw Error("Invalid country calling code");}if(null!=c&&(g=v(c,10),h=""+g,m=b.toString(),0==m.lastIndexOf(h,0)&&(h=new z(m.substring(h.length)),m=p(c,1),m=new RegExp(v(m,2)),uc(h,c,null),h=h.toString(),!K(m,b.toString())&&K(m,h)||3==qc(a,b.toString(),c,-1))))return d.g(h),f&&t(e,6,10),t(e,1,g),g;t(e,1,0);return 0}
+function uc(a,b,c){var d=a.toString(),f=d.length,e=p(b,15);if(0!=f&&null!=e&&0!=e.length){var g=new RegExp("^(?:"+e+")");if(f=g.exec(d)){e=new RegExp(v(p(b,1),2));var h=K(e,d),m=f.length-1;b=p(b,16);if(null==b||0==b.length||null==f[m]||0==f[m].length){if(!h||K(e,d.substring(f[0].length)))null!=c&&0<m&&null!=f[m]&&c.g(f[1]),a.set(d.substring(f[0].length))}else if(d=d.replace(g,b),!h||K(e,d))null!=c&&0<m&&c.g(f[1]),a.set(d)}}}
 function vc(a,b,c,d){if(null==b)throw Error("The string supplied did not seem to be a phone number");if(250<b.length)throw Error("The string supplied is too long to be a phone number");var f=new z;var e=b.indexOf(";phone-context=");if(-1===e)e=null;else if(e+=15,e>=b.length)e="";else{var g=b.indexOf(";",e);e=-1!==g?b.substring(e,g):b.substring(e)}var h=e;null==h?g=!0:0===h.length?g=!1:(g=tb.exec(h),h=ub.exec(h),g=null!==g||null!==h);if(!g)throw Error("The string supplied did not seem to be a phone number");
 null!=e?("+"===e.charAt(0)&&f.g(e),e=b.indexOf("tel:"),f.g(b.substring(0<=e?e+4:0,b.indexOf(";phone-context=")))):(e=f.g,g=null!=b?b:"",h=g.search(pb),0<=h?(g=g.substring(h),g=g.replace(rb,""),h=g.search(qb),0<=h&&(g=g.substring(0,h))):g="",e.call(f,g));e=f.toString();g=e.indexOf(";isub=");0<g&&(A(f),f.g(e.substring(0,g)));if(!Db(f.toString()))throw Error("The string supplied did not seem to be a phone number");e=f.toString();if(!(Ib(c)||null!=e&&0<e.length&&nb.test(e)))throw Error("Invalid country calling code");
-e=new H;d&&t(e,5,b);a:{b=f.toString();g=b.search(wb);if(0<=g&&Db(b.substring(0,g))){h=b.match(wb);for(var m=h.length,p=1;p<m;++p)if(null!=h[p]&&0<h[p].length){A(f);f.g(b.substring(0,g));b=h[p];break a}}b=""}0<b.length&&t(e,3,b);g=Q(a,c);b=new z;h=0;m=f.toString();try{h=tc(a,m,g,b,d,e)}catch(r){if("Invalid country calling code"==r.message&&nb.test(m)){if(m=m.replace(nb,""),h=tc(a,m,g,b,d,e),0==h)throw r;}else throw r;}0!=h?(f=P(h),f!=c&&(g=O(a,h,f))):(Fb(f),b.g(f.toString()),null!=c?(h=v(g,10),t(e,
+e=new H;d&&t(e,5,b);a:{b=f.toString();g=b.search(wb);if(0<=g&&Db(b.substring(0,g))){h=b.match(wb);for(var m=h.length,q=1;q<m;++q)if(null!=h[q]&&0<h[q].length){A(f);f.g(b.substring(0,g));b=h[q];break a}}b=""}0<b.length&&t(e,3,b);g=Q(a,c);b=new z;h=0;m=f.toString();try{h=tc(a,m,g,b,d,e)}catch(r){if("Invalid country calling code"==r.message&&nb.test(m)){if(m=m.replace(nb,""),h=tc(a,m,g,b,d,e),0==h)throw r;}else throw r;}0!=h?(f=P(h),f!=c&&(g=O(a,h,f))):(Fb(f),b.g(f.toString()),null!=c?(h=v(g,10),t(e,
 1,h)):d&&Qa(e,6));if(2>b.h.length)throw Error("The string supplied is too short to be a phone number");null!=g&&(c=new z,f=new z(b.toString()),uc(f,g,c),a=qc(a,f.toString(),g,-1),2!=a&&4!=a&&5!=a&&(b=f,d&&0<c.toString().length&&t(e,7,c.toString())));d=b.toString();a=d.length;if(2>a)throw Error("The string supplied is too short to be a phone number");if(17<a)throw Error("The string supplied is too long to be a phone number");if(1<d.length&&"0"==d.charAt(0)){t(e,4,!0);for(a=1;a<d.length-1&&"0"==d.charAt(a);)a++;
-1!=a&&t(e,8,a)}t(e,2,parseInt(d,10));return e}function wc(a,b){a=Q(a,mc(a,b));if(null==a)return!0;b=N(b);return!R(b,q(a,24))}function K(a,b){return(a="string"==typeof a?b.match("^(?:"+a+")$"):b.match(a))&&a[0].length==b.length?!0:!1};function xc(a){this.fa=/\u2008/;this.ma="";this.v=new z;this.da="";this.s=new z;this.ba=new z;this.u=!0;this.ea=this.ca=this.oa=!1;this.ga=hb.ja();this.$=0;this.h=new z;this.ha=!1;this.o="";this.g=new z;this.j=[];this.na=a;this.l=yc(this,this.na)}var zc=new F;t(zc,11,"NA");
+1!=a&&t(e,8,a)}t(e,2,parseInt(d,10));return e}function wc(a,b){a=Q(a,mc(a,b));if(null==a)return!0;b=N(b);return!R(b,p(a,24))}function K(a,b){return(a=b.match(new RegExp("^(?:"+("string"==typeof a?a:a.source)+")$","i")))&&a[0].length==b.length?!0:!1};function xc(a){this.fa=/\u2008/;this.ma="";this.v=new z;this.da="";this.s=new z;this.ba=new z;this.u=!0;this.ea=this.ca=this.oa=!1;this.ga=hb.ja();this.$=0;this.h=new z;this.ha=!1;this.o="";this.g=new z;this.j=[];this.na=a;this.l=yc(this,this.na)}var zc=new F;t(zc,11,"NA");
 var Ac=/^[-x\u2010-\u2015\u2212\u30fc\uff0d-\uff0f \u00a0\u00ad\u200b\u2060\u3000()\uff08\uff09\uff3b\uff3d.\[\]/~\u2053\u223c\uff5e]*\$1[-x\u2010-\u2015\u2212\u30fc\uff0d-\uff0f \u00a0\u00ad\u200b\u2060\u3000()\uff08\uff09\uff3b\uff3d.\[\]/~\u2053\u223c\uff5e]*(\$\d[-x\u2010-\u2015\u2212\u30fc\uff0d-\uff0f \u00a0\u00ad\u200b\u2060\u3000()\uff08\uff09\uff3b\uff3d.\[\]/~\u2053\u223c\uff5e]*)*$/,Bc=/[- ]/;function yc(a,b){var c=a.ga;b=Ib(b)?Pb(c,b):0;a=Q(a.ga,P(b));return null!=a?a:zc}
-function Cc(a){for(var b=a.j.length,c=0;c<b;++c){var d=a.j[c],f=v(d,1);if(a.da==f)return!1;var e=a;var g=d,h=v(g,1);A(e.v);var m=e;g=v(g,2);var p="999999999999999".match(h)[0];p.length<m.g.h.length?m="":(m=p.replace(new RegExp(h,"g"),g),m=m.replace(/9/g,"\u2008"));0<m.length?(e.v.g(m),e=!0):e=!1;if(e)return a.da=f,a.ha=Bc.test(q(d,4)),a.$=0,!0}return a.u=!1}
-function Dc(a,b){for(var c=[],d=b.length-3,f=a.j.length,e=0;e<f;++e){var g=a.j[e];0==w(g,3)?c.push(a.j[e]):(g=q(g,3,Math.min(d,w(g,3)-1)),0==b.search(g)&&c.push(a.j[e]))}a.j=c}
+function Cc(a){for(var b=a.j.length,c=0;c<b;++c){var d=a.j[c],f=v(d,1);if(a.da==f)return!1;var e=a;var g=d,h=v(g,1);A(e.v);var m=e;g=v(g,2);var q="999999999999999".match(h)[0];q.length<m.g.h.length?m="":(m=q.replace(new RegExp(h,"g"),g),m=m.replace(/9/g,"\u2008"));0<m.length?(e.v.g(m),e=!0):e=!1;if(e)return a.da=f,a.ha=Bc.test(p(d,4)),a.$=0,!0}return a.u=!1}
+function Dc(a,b){for(var c=[],d=b.length-3,f=a.j.length,e=0;e<f;++e){var g=a.j[e];0==w(g,3)?c.push(a.j[e]):(g=p(g,3,Math.min(d,w(g,3)-1)),0==b.search(g)&&c.push(a.j[e]))}a.j=c}
 function Ec(a,b){a.s.g(b);var c=b;ob.test(c)||1==a.s.h.length&&mb.test(c)?("+"==b?(c=b,a.ba.g(b)):(c=ib[b],a.ba.g(c),a.g.g(c)),b=c):(a.u=!1,a.oa=!0);if(!a.u){if(!a.oa)if(Fc(a)){if(Gc(a))return Hc(a)}else if(0<a.o.length&&(b=a.g.toString(),A(a.g),a.g.g(a.o),a.g.g(b),b=a.h.toString(),c=b.lastIndexOf(a.o),A(a.h),a.h.g(b.substring(0,c))),a.o!=Ic(a))return a.h.g(" "),Hc(a);return a.s.toString()}switch(a.ba.h.length){case 0:case 1:case 2:return a.s.toString();case 3:if(Fc(a))a.ea=!0;else return a.o=Ic(a),
 Jc(a);default:if(a.ea)return Gc(a)&&(a.ea=!1),a.h.toString()+a.g.toString();if(0<a.j.length){b=Kc(a,b);c=Lc(a);if(0<c.length)return c;Dc(a,a.g.toString());return Cc(a)?Mc(a):a.u?Nc(a,b):a.s.toString()}return Jc(a)}}function Hc(a){a.u=!0;a.ea=!1;a.j=[];a.$=0;A(a.v);a.da="";return Jc(a)}
-function Lc(a){for(var b=a.g.toString(),c=a.j.length,d=0;d<c;++d){var f=a.j[d],e=v(f,1);if((new RegExp("^(?:"+e+")$")).test(b)&&(a.ha=Bc.test(q(f,4)),f=b.replace(new RegExp(e,"g"),q(f,2)),f=Nc(a,f),L(f,jb)==a.ba))return f}return""}function Nc(a,b){var c=a.h.h.length;return a.ha&&0<c&&" "!=a.h.toString().charAt(c-1)?a.h+" "+b:a.h+b}
-function Jc(a){var b=a.g.toString();if(3<=b.length){for(var c=a.ca&&0==a.o.length&&0<w(a.l,20)?u(a.l,20):u(a.l,19),d=c.length,f=0;f<d;++f){var e=c[f];0<a.o.length&&Hb(v(e,4))&&!q(e,6)&&!n(e,5)||(0!=a.o.length||a.ca||Hb(v(e,4))||q(e,6))&&Ac.test(v(e,2))&&a.j.push(e)}Dc(a,b);b=Lc(a);return 0<b.length?b:Cc(a)?Mc(a):a.s.toString()}return Nc(a,b)}function Mc(a){var b=a.g.toString(),c=b.length;if(0<c){for(var d="",f=0;f<c;f++)d=Kc(a,b.charAt(f));return a.u?Nc(a,d):a.s.toString()}return a.h.toString()}
-function Ic(a){var b=a.g.toString(),c=0;if(1!=q(a.l,10))var d=!1;else d=a.g.toString(),d="1"==d.charAt(0)&&"0"!=d.charAt(1)&&"1"!=d.charAt(1);d?(c=1,a.h.g("1").g(" "),a.ca=!0):n(a.l,15)&&(d=new RegExp("^(?:"+q(a.l,15)+")"),d=b.match(d),null!=d&&null!=d[0]&&0<d[0].length&&(a.ca=!0,c=d[0].length,a.h.g(b.substring(0,c))));A(a.g);a.g.g(b.substring(c));return b.substring(0,c)}
-function Fc(a){var b=a.ba.toString(),c=new RegExp("^(?:\\+|"+q(a.l,11)+")");c=b.match(c);return null!=c&&null!=c[0]&&0<c[0].length?(a.ca=!0,c=c[0].length,A(a.g),a.g.g(b.substring(c)),A(a.h),a.h.g(b.substring(0,c)),"+"!=b.charAt(0)&&a.h.g(" "),!0):!1}function Gc(a){if(0==a.g.h.length)return!1;var b=new z,c=sc(a.g,b);if(0==c)return!1;A(a.g);a.g.g(b.toString());b=P(c);"001"==b?a.l=Q(a.ga,""+c):b!=a.na&&(a.l=yc(a,b));a.h.g(""+c).g(" ");a.o="";return!0}
+function Lc(a){for(var b=a.g.toString(),c=a.j.length,d=0;d<c;++d){var f=a.j[d],e=v(f,1);if((new RegExp("^(?:"+e+")$")).test(b)&&(a.ha=Bc.test(p(f,4)),f=b.replace(new RegExp(e,"g"),p(f,2)),f=Nc(a,f),L(f,jb)==a.ba))return f}return""}function Nc(a,b){var c=a.h.h.length;return a.ha&&0<c&&" "!=a.h.toString().charAt(c-1)?a.h+" "+b:a.h+b}
+function Jc(a){var b=a.g.toString();if(3<=b.length){for(var c=a.ca&&0==a.o.length&&0<w(a.l,20)?u(a.l,20):u(a.l,19),d=c.length,f=0;f<d;++f){var e=c[f];0<a.o.length&&Hb(v(e,4))&&!p(e,6)&&!n(e,5)||(0!=a.o.length||a.ca||Hb(v(e,4))||p(e,6))&&Ac.test(v(e,2))&&a.j.push(e)}Dc(a,b);b=Lc(a);return 0<b.length?b:Cc(a)?Mc(a):a.s.toString()}return Nc(a,b)}function Mc(a){var b=a.g.toString(),c=b.length;if(0<c){for(var d="",f=0;f<c;f++)d=Kc(a,b.charAt(f));return a.u?Nc(a,d):a.s.toString()}return a.h.toString()}
+function Ic(a){var b=a.g.toString(),c=0;if(1!=p(a.l,10))var d=!1;else d=a.g.toString(),d="1"==d.charAt(0)&&"0"!=d.charAt(1)&&"1"!=d.charAt(1);d?(c=1,a.h.g("1").g(" "),a.ca=!0):n(a.l,15)&&(d=new RegExp("^(?:"+p(a.l,15)+")"),d=b.match(d),null!=d&&null!=d[0]&&0<d[0].length&&(a.ca=!0,c=d[0].length,a.h.g(b.substring(0,c))));A(a.g);a.g.g(b.substring(c));return b.substring(0,c)}
+function Fc(a){var b=a.ba.toString(),c=new RegExp("^(?:\\+|"+p(a.l,11)+")");c=b.match(c);return null!=c&&null!=c[0]&&0<c[0].length?(a.ca=!0,c=c[0].length,A(a.g),a.g.g(b.substring(c)),A(a.h),a.h.g(b.substring(0,c)),"+"!=b.charAt(0)&&a.h.g(" "),!0):!1}function Gc(a){if(0==a.g.h.length)return!1;var b=new z,c=sc(a.g,b);if(0==c)return!1;A(a.g);a.g.g(b.toString());b=P(c);"001"==b?a.l=Q(a.ga,""+c):b!=a.na&&(a.l=yc(a,b));a.h.g(""+c).g(" ");a.o="";return!0}
 function Kc(a,b){var c=a.v.toString();if(0<=c.substring(a.$).search(a.fa)){var d=c.search(a.fa);b=c.replace(a.fa,b);A(a.v);a.v.g(b);a.$=d;return b.substring(0,a.$+1)}1==a.j.length&&(a.u=!1);a.da="";return a.s.toString()};var Oc={AC:[,[,,"9\\d\\d",,,,,,,[3]],,,[,,"9(?:11|99)",,,,"911"],[,,,,,,,,,[-1]],,,,"AC",,,,,,,,,,,,,,,,,,[,,"9(?:11|99)",,,,"911"],,[,,"9(?:11|99)",,,,"911"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],AD:[,[,,"1\\d\\d",,,,,,,[3]],,,[,,"11[0268]",,,,"110"],[,,,,,,,,,[-1]],,,,"AD",,,,,,,,,,,,,,,,,,[,,"11[0268]",,,,"110"],,[,,"11[0268]",,,,"110"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],AE:[,[,,"[149]\\d{2,3}",,,,,,,[3,4]],,,[,,"112|99[7-9]",,,,"112",,,[3]],[,,,,,,,,,[-1]],,,,"AE",,
 ,,,,,,,,,,,,,,,,[,,"112|99[7-9]",,,,"112",,,[3]],,[,,"112|445[16]|99[7-9]",,,,"112"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,"445\\d",,,,"4450",,,[4]]],AF:[,[,,"[14]\\d\\d(?:\\d{2})?",,,,,,,[3,5]],,,[,,"1(?:0[02]|19)",,,,"100",,,[3]],[,,,,,,,,,[-1]],,,,"AF",,,,,,,,,,,,,,,,,,[,,"1(?:0[02]|19)",,,,"100",,,[3]],,[,,"1(?:0[02]|19)|40404",,,,"100"],[,,,,,,,,,[-1]],[,,"404\\d\\d",,,,"40400",,,[5]],,[,,"404\\d\\d",,,,"40400",,,[5]]],AG:[,[,,"[19]\\d\\d",,,,,,,[3]],,,[,,"9(?:11|88|99)",,,,"911"],[,,,,,,,,,[-1]],
 ,,,"AG",,,,,,,,,,,,,,,,,,[,,"9(?:11|99)",,,,"911"],,[,,"176|9(?:11|88|99)",,,,"176"],[,,,,,,,,,[-1]],[,,"176",,,,"176"],,[,,"176",,,,"176"]],AI:[,[,,"[19]\\d\\d",,,,,,,[3]],,,[,,"9(?:11|88)",,,,"911"],[,,,,,,,,,[-1]],,,,"AI",,,,,,,,,,,,,,,,,,[,,"911",,,,"911"],,[,,"176|9(?:11|88)",,,,"176"],[,,,,,,,,,[-1]],[,,"176",,,,"176"],,[,,"176",,,,"176"]],AL:[,[,,"[15]\\d{2,5}",,,,,,,[3,4,5,6]],,,[,,"1(?:1(?:2|6[01]\\d\\d)|2[7-9]|3[15]|41)",,,,"112",,,[3,6]],[,,"5\\d{4}",,,,"50000",,,[5]],,,,"AL",,,,,,,,,,
@@ -676,15 +676,15 @@ LT:[,[,,"[01]\\d(?:\\d(?:\\d{3})?)?",,,,,,,[2,3,6]],,,[,,"0(?:11?|22?|33?)|1(?:0
  See the License for the specific language governing permissions and
  limitations under the License.
 */
-function Pc(){this.g={}}na(Pc);function Qc(a){return(a=I[a])?a:[]}function Rc(a,b){a=Qc(v(a,1));return null!=b&&a.includes(b)}function Sc(a,b,c){if(!Rc(b,c))return!1;a=Tc(a,c);if(!a)return!1;b=Uc(b);c=q(a,1);if(!Vc(b,c))return!1;a=q(a,29);return Vc(b,a)}function Tc(a,b){if(!b)return null;b=b.toUpperCase();var c=a.g[b];if(null==c){c=Oc[b];if(null==c)return null;c=(new G).j(F.m(),c);a.g[b]=c}return c}
-function Uc(a){if(!n(a,2))return"";var b=""+q(a,2);return n(a,4)&&q(a,4)&&0<v(a,8)?Array(v(a,8)+1).join("0")+b:b}function Vc(a,b){return 0<u(b,9).length&&!u(b,9).includes(a.length)?!1:K(v(b,2),a.toString())};var S=hb.ja();function Wc(a){switch(lc(S,a)){case 0:return"FIXED_LINE";case 1:return"MOBILE";case 2:return"FIXED_LINE_OR_MOBILE";case 3:return"TOLL_FREE";case 4:return"PREMIUM_RATE";case 5:return"SHARED_COST";case 6:return"VOIP";case 7:return"PERSONAL_NUMBER";case 8:return"PAGER";case 9:return"UAN";case -1:return"UNKNOWN"}}
-function Xc(){var a=wa("phoneNumber").value,b=wa("defaultCountry").value.toUpperCase(),c=wa("carrierCode").value,d=new z;try{var f=S;if(!Ib(b)&&0<a.length&&"+"!=a.charAt(0))throw Error("Invalid country calling code");var e=vc(f,a,b,!0);d.g("****Parsing Result:****\n");d.g(JSON.stringify((new y(1)).l(e)));d.g("\n\n****Validation Results:****");var g=rc(e);var h=0==g||4==g;d.g("\nResult from isPossibleNumber(): ");d.g(h);var m=rc(e);f=b&&"ZZ"!=b;if(h)if(4==m)d.g("\nResult from isPossibleNumberWithReason(): "),
-d.g("IS_POSSIBLE_LOCAL_ONLY"),d.g("\nNumber is considered invalid as it is not a possible national number.");else{var p=oc(S,e);d.g("\nResult from isValidNumber(): ");d.g(p);p&&f&&(d.g("\nResult from isValidNumberForRegion(): "),d.g(pc(S,e,b)));d.g("\nPhone Number region: ");d.g(mc(S,e));d.g("\nResult from getNumberType(): ");d.g(Wc(e))}else{d.g("\nResult from isPossibleNumberWithReason(): ");switch(m){case 1:d.g("INVALID_COUNTRY_CODE");break;case 2:d.g("TOO_SHORT");break;case 3:d.g("TOO_LONG");break;
-case 5:d.g("INVALID_LENGTH")}d.g("\nNote: Numbers that are not possible have type UNKNOWN, an unknown region, and are considered invalid.")}if(!p){var r=Pc.ja();d.g("\n\n****ShortNumberInfo Results:****");d.g("\nResult from isPossibleShortNumber: ");var ha=d.g;a:{var Tb=Qc(v(e,1)),Zc=Uc(e).length;for(h=0;h<Tb.length;h++){var Ub=Tc(r,Tb[h]);if(Ub&&u(q(Ub,1),9).includes(Zc)){var Vb=!0;break a}}Vb=!1}ha.call(d,Vb);d.g("\nResult from isValidShortNumber: ");var $c=d.g,W=Qc(v(e,1));a:if(0===W.length)var ia=
-null;else if(1===W.length)ia=W[0];else{var ad=Uc(e);for(ha=0;ha<W.length;ha++){var Wb=W[ha],Xb=Tc(r,Wb);if(Xb&&Vc(ad,q(Xb,29))){ia=Wb;break a}}ia=null}var bd=1<W.length&&null!=ia?!0:Sc(r,e,ia);$c.call(d,bd);if(f){d.g("\nResult from isPossibleShortNumberForRegion: ");var cd=d.g;if(Rc(e,b)){var Yb=Tc(r,b);if(Yb){var dd=Uc(e).length;var Sa=u(q(Yb,1),9).includes(dd)}else Sa=!1}else Sa=!1;cd.call(d,Sa);d.g("\nResult from isValidShortNumberForRegion: ");d.g(Sc(r,e,b))}}d.g("\n\n****Formatting Results:**** ");
-d.g("\nE164 format: ");d.g(p?M(S,e,0):"invalid");d.g("\nOriginal format: ");var X=d.g;r=S;var Y;if(Y=n(e,5)){var Zb=v(e,1),$b=O(r,Zb,P(Zb));if(null==$b)var ac=!1;else{var ed=N(e);ac=null!=Qb(u($b,19),ed)}Y=!ac}if(Y)var ja=v(e,5);else if(n(e,6)){switch(q(e,6)){case 1:var B=M(r,e,1);break;case 5:B=Ob(r,e,b);break;case 10:B=M(r,e,1).substring(1);break;default:var ka=P(v(e,1));var bc=Q(r,ka);if(null==bc)var la=null;else{var Ta=v(bc,12);la=0==Ta.length?null:Ta=Ta.replace("~","")}var ma=M(r,e,2);if(null==
+function Pc(){this.g={}}na(Pc);function Qc(a){return(a=I[a])?a:[]}function Rc(a,b){a=Qc(v(a,1));return null!=b&&a.includes(b)}function Sc(a,b,c){if(!Rc(b,c))return!1;a=Tc(a,c);if(!a)return!1;b=Uc(b);c=p(a,1);if(!Vc(b,c))return!1;a=p(a,29);return Vc(b,a)}function Tc(a,b){if(!b)return null;b=b.toUpperCase();var c=a.g[b];if(null==c){c=Oc[b];if(null==c)return null;c=(new G).j(F.m(),c);a.g[b]=c}return c}
+function Uc(a){if(!n(a,2))return"";var b=""+p(a,2);return n(a,4)&&p(a,4)&&0<v(a,8)?Array(v(a,8)+1).join("0")+b:b}function Vc(a,b){return 0<u(b,9).length&&!u(b,9).includes(a.length)?!1:K(v(b,2),a.toString())};var S=hb.ja();function Wc(a){switch(lc(S,a)){case 0:return"FIXED_LINE";case 1:return"MOBILE";case 2:return"FIXED_LINE_OR_MOBILE";case 3:return"TOLL_FREE";case 4:return"PREMIUM_RATE";case 5:return"SHARED_COST";case 6:return"VOIP";case 7:return"PERSONAL_NUMBER";case 8:return"PAGER";case 9:return"UAN";case -1:return"UNKNOWN"}}
+function Xc(){var a=wa("phoneNumber").value,b=wa("defaultCountry").value.toUpperCase(),c=wa("carrierCode").value,d=new z;try{var f=S;if(!Ib(b)&&0<a.length&&"+"!=a.charAt(0))throw Error("Invalid country calling code");var e=vc(f,a,b,!0);d.g("****Parsing Result:****\n");d.g(JSON.stringify((new y(1)).l(e)));d.g("\n\n****Validation Results:****");var g=rc(e);var h=0==g||4==g;d.g("\nResult from isPossibleNumber(): ");d.g(h);var m=rc(e);d.g("\nResult from isPossibleNumberWithReason(): ");switch(m){case 0:d.g("IS_POSSIBLE");
+break;case 4:d.g("IS_POSSIBLE_LOCAL_ONLY");break;case 1:d.g("INVALID_COUNTRY_CODE");break;case 2:d.g("TOO_SHORT");break;case 3:d.g("TOO_LONG");break;case 5:d.g("INVALID_LENGTH")}f=b&&"ZZ"!=b;var q=oc(S,e);d.g("\nResult from isValidNumber(): ");d.g(q);if(q)0!=m&&d.g("\nWarning: This number represents a known edge case - it is a valid number, but it is not considered (strictly) possible. See https://issuetracker.google.com/issues/335892662 for more details."),f&&(d.g("\nResult from isValidNumberForRegion(): "),
+d.g(pc(S,e,b))),d.g("\nPhone Number region: "),d.g(mc(S,e)),d.g("\nResult from getNumberType(): "),d.g(Wc(e));else{d.g("\nNote: Invalid numbers have type UNKNOWN and no region.");var r=Pc.ja();d.g("\n\n****ShortNumberInfo Results:****");d.g("\nResult from isPossibleShortNumber: ");var ha=d.g;a:{var Tb=Qc(v(e,1)),Zc=Uc(e).length;for(m=0;m<Tb.length;m++){var Ub=Tc(r,Tb[m]);if(Ub&&u(p(Ub,1),9).includes(Zc)){var Vb=!0;break a}}Vb=!1}ha.call(d,Vb);d.g("\nResult from isValidShortNumber: ");var $c=d.g,W=
+Qc(v(e,1));a:if(0===W.length)var ia=null;else if(1===W.length)ia=W[0];else{var ad=Uc(e);for(ha=0;ha<W.length;ha++){var Wb=W[ha],Xb=Tc(r,Wb);if(Xb&&Vc(ad,p(Xb,29))){ia=Wb;break a}}ia=null}var bd=1<W.length&&null!=ia?!0:Sc(r,e,ia);$c.call(d,bd);if(f){d.g("\nResult from isPossibleShortNumberForRegion: ");var cd=d.g;if(Rc(e,b)){var Yb=Tc(r,b);if(Yb){var dd=Uc(e).length;var Sa=u(p(Yb,1),9).includes(dd)}else Sa=!1}else Sa=!1;cd.call(d,Sa);d.g("\nResult from isValidShortNumberForRegion: ");d.g(Sc(r,e,b))}}d.g("\n\n****Formatting Results:**** ");
+d.g("\nE164 format: ");d.g(q?M(S,e,0):"invalid");d.g("\nOriginal format: ");var X=d.g;r=S;var Y;if(Y=n(e,5)){var Zb=v(e,1),$b=O(r,Zb,P(Zb));if(null==$b)var ac=!1;else{var ed=N(e);ac=null!=Qb(u($b,19),ed)}Y=!ac}if(Y)var ja=v(e,5);else if(n(e,6)){switch(p(e,6)){case 1:var B=M(r,e,1);break;case 5:B=Ob(r,e,b);break;case 10:B=M(r,e,1).substring(1);break;default:var ka=P(v(e,1));var bc=Q(r,ka);if(null==bc)var la=null;else{var Ta=v(bc,12);la=0==Ta.length?null:Ta=Ta.replace("~","")}var ma=M(r,e,2);if(null==
 la||0==la.length)B=ma;else{b:{var fd=v(e,5);Y=la;var cc=L(fd,ib);if(0==cc.lastIndexOf(Y,0))try{var dc=oc(r,vc(r,cc.substring(Y.length),ka,!1));break b}catch(ec){}dc=!1}if(dc)B=ma;else{var gd=Q(r,ka),hd=N(e),Ua=Qb(u(gd,19),hd);if(null==Ua)B=ma;else{var Z=v(Ua,4),fc=Z.indexOf("$1");if(0>=fc)B=ma;else if(Z=Z.substring(0,fc),Z=L(Z,ib),0==Z.length)B=ma;else{var gc=Ua.clone();Qa(gc,4);ka=[gc];var Aa=v(e,1),Ba=N(e);if(Aa in I){var hc=O(r,Aa,P(Aa)),Va=Qb(ka,Ba);if(null==Va)var ic=Ba;else{var Wa=Va.clone(),
-Ca=v(Va,4);if(0<Ca.length){var jc=v(hc,12);0<jc.length?(Ca=Ca.replace(zb,jc).replace(Ab,"$1"),t(Wa,4,Ca)):Qa(Wa,4)}ic=Rb(Ba,Wa,2)}var id=Kb(e,hc,2);B=Jb(Aa,2,ic,id)}else B=Ba}}}}}var Xa=v(e,5);if(null!=B&&0<Xa.length){var jd=L(B,jb),kd=L(Xa,jb);jd!=kd&&(B=Xa)}ja=B}else ja=M(r,e,2);X.call(d,ja);d.g("\nNational format: ");d.g(M(S,e,2));d.g("\nInternational format: ");d.g(p?M(S,e,1):"invalid");d.g("\nOut-of-country format from US: ");d.g(p?Ob(S,e,"US"):"invalid");d.g("\nOut-of-country format from Switzerland: ");
-d.g(p?Ob(S,e,"CH"):"invalid");0<c.length&&(d.g("\nNational format with carrier code: "),d.g(Mb(S,e,c)));d.g("\nFormat for mobile dialing (calling from US): ");var ld=d.g;if(p)a:{c=S;var Ya=v(e,1);if(Ya in I){X="";var C=e.clone();Qa(C,3);var aa=P(Ya),T=lc(c,C);ja=-1!=T;if("US"==aa)if(T=0==T||1==T||2==T,"BR"==aa&&T)X=0<v(C,7).length?Nb(c,C):"";else if(1==Ya){var md=Q(c,"US"),Za;if(Za=wc(c,C)){var nd=N(C);Za=2!=qc(c,nd,md,-1)}X=Za?M(c,C,1):M(c,C,2)}else X=("001"==aa||("MX"==aa||"CL"==aa||"UZ"==aa)&&
-T)&&wc(c,C)?M(c,C,1):M(c,C,2);else if(ja&&wc(c,C)){var Da=M(c,C,1);break a}Da=X}else Da=n(e,5)?v(e,5):""}else Da="invalid";ld.call(d,Da);d.g("\nFormat for national dialing with preferred carrier code and empty fallback carrier code: ");d.g(p?Nb(S,e):"invalid");d.g("\n\n****AsYouTypeFormatter Results****");var od=new xc(b),pd=a.length;for(b=0;b<pd;++b){var kc=a.charAt(b);d.g("\nChar entered: ");d.g(kc);d.g(" Output: ");e=d;var qd=e.g;p=od;p.ma=Ec(p,kc);qd.call(e,p.ma)}}catch(ec){d.g("\n"+ec.toString())}wa("output").value=
+Ca=v(Va,4);if(0<Ca.length){var jc=v(hc,12);0<jc.length?(Ca=Ca.replace(zb,jc).replace(Ab,"$1"),t(Wa,4,Ca)):Qa(Wa,4)}ic=Rb(Ba,Wa,2)}var id=Kb(e,hc,2);B=Jb(Aa,2,ic,id)}else B=Ba}}}}}var Xa=v(e,5);if(null!=B&&0<Xa.length){var jd=L(B,jb),kd=L(Xa,jb);jd!=kd&&(B=Xa)}ja=B}else ja=M(r,e,2);X.call(d,ja);d.g("\nNational format: ");d.g(M(S,e,2));d.g("\nInternational format: ");d.g(q?M(S,e,1):"invalid");d.g("\nOut-of-country format from US: ");d.g(q?Ob(S,e,"US"):"invalid");d.g("\nOut-of-country format from Switzerland: ");
+d.g(q?Ob(S,e,"CH"):"invalid");0<c.length&&(d.g("\nNational format with carrier code: "),d.g(Mb(S,e,c)));d.g("\nFormat for mobile dialing (calling from US): ");var ld=d.g;if(q)a:{c=S;var Ya=v(e,1);if(Ya in I){X="";var C=e.clone();Qa(C,3);var aa=P(Ya),T=lc(c,C);ja=-1!=T;if("US"==aa)if(T=0==T||1==T||2==T,"BR"==aa&&T)X=0<v(C,7).length?Nb(c,C):"";else if(1==Ya){var md=Q(c,"US"),Za;if(Za=wc(c,C)){var nd=N(C);Za=2!=qc(c,nd,md,-1)}X=Za?M(c,C,1):M(c,C,2)}else X=("001"==aa||("MX"==aa||"CL"==aa||"UZ"==aa)&&
+T)&&wc(c,C)?M(c,C,1):M(c,C,2);else if(ja&&wc(c,C)){var Da=M(c,C,1);break a}Da=X}else Da=n(e,5)?v(e,5):""}else Da="invalid";ld.call(d,Da);d.g("\nFormat for national dialing with preferred carrier code and empty fallback carrier code: ");d.g(q?Nb(S,e):"invalid");d.g("\n\n****AsYouTypeFormatter Results****");var od=new xc(b),pd=a.length;for(b=0;b<pd;++b){var kc=a.charAt(b);d.g("\nChar entered: ");d.g(kc);d.g(" Output: ");e=d;var qd=e.g;q=od;q.ma=Ec(q,kc);qd.call(e,q.ma)}}catch(ec){d.g("\n"+ec.toString())}wa("output").value=
 d.toString();return!1}var Yc=["phoneNumberParser"],U=fa;Yc[0]in U||"undefined"==typeof U.execScript||U.execScript("var "+Yc[0]);for(var V;Yc.length&&(V=Yc.shift());)Yc.length||void 0===Xc?U[V]&&U[V]!==Object.prototype[V]?U=U[V]:U=U[V]={}:U[V]=Xc;})();

javascript/i18n/phonenumbers/demo.js

@@ -58,52 +58,50 @@ function phoneNumberParser() {
     output.append('\nResult from isPossibleNumber(): ');
     output.append(isPossible);
     var validationResult = i18n.phonenumbers.PhoneNumberUtil.ValidationResult;
-    var isPossibleReason = phoneUtil_.isPossibleNumberWithReason(number)
-    var hasRegionCode = regionCode && regionCode != 'ZZ';
-    if (isPossible) {
-      // Checking as isValid() fails if possible local only.
-      if (isPossibleReason == validationResult.IS_POSSIBLE_LOCAL_ONLY) {
-        output.append('\nResult from isPossibleNumberWithReason(): ');
+    var isPossibleReason = phoneUtil_.isPossibleNumberWithReason(number);
+    output.append('\nResult from isPossibleNumberWithReason(): ');
+    switch (isPossibleReason) {
+      case validationResult.IS_POSSIBLE:
+        output.append('IS_POSSIBLE');
+        break;
+      case validationResult.IS_POSSIBLE_LOCAL_ONLY:
         output.append('IS_POSSIBLE_LOCAL_ONLY');
+        break;
+      case validationResult.INVALID_COUNTRY_CODE:
+        output.append('INVALID_COUNTRY_CODE');
+        break;
+      case validationResult.TOO_SHORT:
+        output.append('TOO_SHORT');
+        break;
+      case validationResult.TOO_LONG:
+        output.append('TOO_LONG');
+        break;
+      case validationResult.INVALID_LENGTH:
+        output.append('INVALID_LENGTH');
+        break;
+      }
+    var hasRegionCode = regionCode && regionCode != 'ZZ';
+    var isNumberValid = phoneUtil_.isValidNumber(number);
+    output.append('\nResult from isValidNumber(): ');
+    output.append(isNumberValid);
+    if (isNumberValid) {
+      if (isPossibleReason != validationResult.IS_POSSIBLE) {
         output.append(
-            '\nNumber is considered invalid as it is ' +
-            'not a possible national number.');
-      } else {
-        var isNumberValid = phoneUtil_.isValidNumber(number);
-        output.append('\nResult from isValidNumber(): ');
-        output.append(isNumberValid);
-        if (isNumberValid && hasRegionCode) {
+            '\nWarning: This number represents a known edge case - it is ' +
+            'a valid number, but it is not considered (strictly) possible. ' +
+            'See https://issuetracker.google.com/issues/335892662 for more details.');
+      }
+      if (hasRegionCode) {
           output.append('\nResult from isValidNumberForRegion(): ');
           output.append(phoneUtil_.isValidNumberForRegion(number, regionCode));
-        }
-        output.append('\nPhone Number region: ');
-        output.append(phoneUtil_.getRegionCodeForNumber(number));
-        output.append('\nResult from getNumberType(): ');
-        output.append(getNumberTypeString(number));
       }
+      output.append('\nPhone Number region: ');
+      output.append(phoneUtil_.getRegionCodeForNumber(number));
+      output.append('\nResult from getNumberType(): ');
+      output.append(getNumberTypeString(number));
     } else {
-      output.append('\nResult from isPossibleNumberWithReason(): ');
-      switch (isPossibleReason) {
-        case validationResult.INVALID_COUNTRY_CODE:
-          output.append('INVALID_COUNTRY_CODE');
-          break;
-        case validationResult.TOO_SHORT:
-          output.append('TOO_SHORT');
-          break;
-        case validationResult.TOO_LONG:
-          output.append('TOO_LONG');
-          break;
-        case validationResult.INVALID_LENGTH:
-          output.append('INVALID_LENGTH');
-          break;
-      }
-      // IS_POSSIBLE shouldn't happen, since we only call this if _not_
-      // possible.
       output.append(
-          '\nNote: Numbers that are not possible have type UNKNOWN,' +
-          ' an unknown region, and are considered invalid.');
-    }
-    if (!isNumberValid) {
+          '\nNote: Invalid numbers have type UNKNOWN and no region.');
       var shortInfo = i18n.phonenumbers.ShortNumberInfo.getInstance();
       output.append('\n\n****ShortNumberInfo Results:****');
       output.append('\nResult from isPossibleShortNumber: ');

javascript/i18n/phonenumbers/metadata.js

@@ -2402,7 +2402,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"EH":[,[,,"[5-8]\\d{8}",,,,,,,[9]
 ]
 ,[,,"528[89]\\d{5}",,,,"528812345"]
-,[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}",,,,"650123456"]
+,[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-467]|5[0-3]|8[0-5]))\\d{6}",,,,"650123456"]
 ,[,,"80[0-7]\\d{6}",,,,"801234567"]
 ,[,,"89\\d{7}",,,,"891234567"]
 ,[,,,,,,,,,[-1]
@@ -3210,7 +3210,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:2(?:[13-9]\\d|2[013-9])\\d|3(?:(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69])\\d|8(?:4[0-8]|[579]\\d|6[0-2]))|58(?:0[1-9]|1[2-9]))\\d{4}",,,,"21234567",,,[8]
 ]
-,[,,"(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4])|7(?:4[0-2]|6[0-5]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[014-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|7[05])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-49]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}",,,,"51234567",,,[8]
+,[,,"(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4])|7(?:4[0-2]|6[0-5]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[014-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|7[015])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-59]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}",,,,"51234567",,,[8]
 ]
 ,[,,"800\\d{6}",,,,"800123456",,,[9]
 ]
@@ -3501,7 +3501,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"7(?:38(?:0\\d|5[0-2569]|88)|8(?:33|55|77|81)\\d)\\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}",,,,"771234567",,,[9]
+,[,,"7(?:38(?:0\\d|5[0-3569]|88)|8(?:33|55|77|81)\\d)\\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}",,,,"771234567",,,[9]
 ]
 ,"IL",972,"0(?:0|1[2-9])","0",,,"0",,,,[[,"(\\d{4})(\\d{3})","$1-$2",["125"]
 ]
@@ -4582,7 +4582,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"LV":[,[,,"(?:[268]\\d|90)\\d{6}",,,,,,,[8]
 ]
 ,[,,"6\\d{7}",,,,"63123456"]
-,[,,"23(?:23[0-57-9]|33[0238])\\d{3}|2(?:[0-24-9]\\d\\d|3(?:0[07]|[14-9]\\d|2[024-9]|3[0-24-9]))\\d{4}",,,,"21234567"]
+,[,,"2333[0-8]\\d{3}|2(?:[0-24-9]\\d\\d|3(?:0[07]|[14-9]\\d|2[02-9]|3[0-24-9]))\\d{4}",,,,"21234567"]
 ,[,,"80\\d{6}",,,,"80123456"]
 ,[,,"90\\d{6}",,,,"90123456"]
 ,[,,"81\\d{6}",,,,"81123456"]
@@ -4633,7 +4633,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"MA":[,[,,"[5-8]\\d{8}",,,,,,,[9]
 ]
 ,[,,"5(?:2(?:[0-25-79]\\d|3[1-578]|4[02-46-8]|8[0235-7])|3(?:[0-47]\\d|5[02-9]|6[02-8]|8[014-9]|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}",,,,"520123456"]
-,[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}",,,,"650123456"]
+,[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-467]|5[0-3]|8[0-5]))\\d{6}",,,,"650123456"]
 ,[,,"80[0-7]\\d{6}",,,,"801234567"]
 ,[,,"89\\d{7}",,,,"891234567"]
 ,[,,,,,,,,,[-1]
@@ -4831,7 +4831,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:(?:2(?:62|77)0|3444)\\d|4[56]440)\\d{3}|(?:34|4[357])700\\d{3}|(?:2(?:[0-3]\\d|5[0-578]|6[01]|82)|3(?:1[3-68]|[23][2-68]|4[23568])|4(?:[23][2-68]|4[3-68]|5[2568]|6[25-8]|7[24-68]|8[4-68]))\\d{5}",,,,"22012345",,,,[6,7]
 ]
-,[,,"7(?:3555|(?:474|9[019]7)7)\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-48]\\d|6[01]|7[01578])|4(?:2\\d|60|7[01578])|9(?:[2-4]\\d|5[01]|7[015]))\\d{4}",,,,"72345678"]
+,[,,"7(?:3555|(?:474|9[019]7)7)\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-478]\\d|6[01])|4(?:2\\d|60|7[01578])|9(?:[2-4]\\d|5[01]|7[015]))\\d{4}",,,,"72345678"]
 ,[,,"800\\d{5}",,,,"80012345"]
 ,[,,"5\\d{7}",,,,"50012345"]
 ,[,,"8(?:0[1-9]|[1-9]\\d)\\d{5}",,,,"80123456"]
@@ -4857,8 +4857,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"ML":[,[,,"[24-9]\\d{7}",,,,,,,[8]
 ]
-,[,,"2(?:07[0-8]|12[67])\\d{4}|(?:2(?:02|1[4-689])|4(?:0[0-4]|4[1-39]))\\d{5}",,,,"20212345"]
-,[,,"2(?:0(?:01|79)|17\\d)\\d{4}|(?:5[01]|[679]\\d|8[2-49])\\d{6}",,,,"65012345"]
+,[,,"2(?:07[0-8]|12[67])\\d{4}|(?:2(?:02|1[4-689])|4(?:0[0-4]|4[1-59]))\\d{5}",,,,"20212345"]
+,[,,"2(?:0(?:01|79)|17\\d)\\d{4}|(?:5[01]|[679]\\d|8[2-59])\\d{6}",,,,"65012345"]
 ,[,,"80\\d{6}",,,,"80012345"]
 ,[,,,,,,,,,[-1]
 ]
@@ -4900,7 +4900,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"1333\\d{4}|[12]468\\d{4}",,,,"13331234",,,[8]
+,[,,"1333\\d{4}",,,,"13331234",,,[8]
 ]
 ,"MM",95,"00","0",,,"0",,,,[[,"(\\d)(\\d{2})(\\d{3})","$1 $2 $3",["16|2"]
 ,"0$1"]
@@ -5116,7 +5116,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"MU":[,[,,"(?:[57]|8\\d\\d)\\d{7}|[2-468]\\d{6}",,,,,,,[7,8,10]
 ]
-,[,,"(?:2(?:[0346-8]\\d|1[0-7])|4(?:[013568]\\d|2[4-8]|71)|54(?:[3-5]\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}",,,,"54480123",,,[7,8]
+,[,,"(?:2(?:[0346-8]\\d|1[0-7])|4(?:[013568]\\d|2[4-8]|71|90)|54(?:[3-5]\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}",,,,"54480123",,,[7,8]
 ]
 ,[,,"5(?:4(?:2[1-389]|7[1-9])|87[15-8])\\d{4}|(?:5(?:2[5-9]|4[3-689]|[57]\\d|8[0-689]|9[0-8])|7(?:0[0-4]|3[013]))\\d{5}",,,,"52512345",,,[8]
 ]
@@ -5346,7 +5346,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"NC":[,[,,"(?:050|[2-57-9]\\d\\d)\\d{3}",,,,,,,[6]
 ]
 ,[,,"(?:2[03-9]|3[0-5]|4[1-7]|88)\\d{4}",,,,"201234"]
-,[,,"(?:5[0-4]|[79]\\d|8[0-79])\\d{4}",,,,"751234"]
+,[,,"(?:[579]\\d|8[0-79])\\d{4}",,,,"751234"]
 ,[,,"050\\d{3}",,,,"050012"]
 ,[,,"36\\d{4}",,,,"366711"]
 ,[,,,,,,,,,[-1]
@@ -5966,7 +5966,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"47\\d{7}|(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])(?:[02-9]\\d{6}|1(?:[0-8]\\d{5}|9\\d{3}(?:\\d{2})?))",,,,"123456789",,,[7,9]
 ]
-,[,,"21(?:1[013-5]|2\\d|3[4-9])\\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}",,,,"512345678",,,[9]
+,[,,"2131[89]\\d{4}|21(?:1[013-5]|2\\d|3[2-9])\\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}",,,,"512345678",,,[9]
 ]
 ,[,,"800\\d{6,7}",,,,"800123456",,,[9,10]
 ]
@@ -6112,7 +6112,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"PW":[,[,,"(?:[24-8]\\d\\d|345|900)\\d{4}",,,,,,,[7]
 ]
 ,[,,"(?:2(?:55|77)|345|488|5(?:35|44|87)|6(?:22|54|79)|7(?:33|47)|8(?:24|55|76)|900)\\d{4}",,,,"2771234"]
-,[,,"(?:(?:46|83)[0-5]|6[2-4689]0)\\d{4}|(?:45|77|88)\\d{5}",,,,"6201234"]
+,[,,"(?:(?:46|83)[0-5]|(?:6[2-4689]|78)0)\\d{4}|(?:45|77|88)\\d{5}",,,,"6201234"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@@ -6834,7 +6834,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]
 ]
-,[,,"(?:(?:15|(?:3[59]|4[89]|6\\d|7[79]|8[08])\\d|9(?:0\\d|[2-9]))\\d|2(?:4\\d|8))\\d{5}|(?:[67]\\d\\d|904)\\d{5}",,,,"71123456",,,[7,8,9]
+,[,,"(?:(?:15|(?:3[59]|4[89]|6\\d|7[679]|8[08])\\d|9(?:0\\d|[2-9]))\\d|2(?:4\\d|8))\\d{5}|(?:[67]\\d\\d|904)\\d{5}",,,,"71123456",,,[7,8,9]
 ]
 ,[,,,,,,,,,[-1]
 ]
@@ -6856,7 +6856,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[348]|64|79|90"]
 ]
-,[,"(\\d{2})(\\d{5,7})","$1 $2",["1|28|6[0-35-9]|77|9[2-9]"]
+,[,"(\\d{2})(\\d{5,7})","$1 $2",["1|28|6[0-35-9]|7[67]|9[2-9]"]
 ]
 ]
 ,,[,,,,,,,,,[-1]
@@ -7600,9 +7600,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"US":[,[,,"[2-9]\\d{9}|3\\d{6}",,,,,,,[10]
 ,[7]
 ]
-,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468]))\\d{4}|(?:305[3-9]|472[24]|505[2-57-9]|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,"2015550123",,,,[7]
+,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,"2015550123",,,,[7]
 ]
-,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468]))\\d{4}|(?:305[3-9]|472[24]|505[2-57-9]|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,"2015550123",,,,[7]
+,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,"2015550123",,,,[7]
 ]
 ,[,,"8(?:00|33|44|55|66|77|88)[2-9]\\d{6}",,,,"8002345678"]
 ,[,,"900[2-9]\\d{6}",,,,"9002345678"]

javascript/i18n/phonenumbers/metadatalite.js

@@ -2402,7 +2402,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"EH":[,[,,"[5-8]\\d{8}",,,,,,,[9]
 ]
 ,[,,"528[89]\\d{5}"]
-,[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}"]
+,[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-467]|5[0-3]|8[0-5]))\\d{6}"]
 ,[,,"80[0-7]\\d{6}"]
 ,[,,"89\\d{7}"]
 ,[,,,,,,,,,[-1]
@@ -3210,7 +3210,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:2(?:[13-9]\\d|2[013-9])\\d|3(?:(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69])\\d|8(?:4[0-8]|[579]\\d|6[0-2]))|58(?:0[1-9]|1[2-9]))\\d{4}",,,,,,,[8]
 ]
-,[,,"(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4])|7(?:4[0-2]|6[0-5]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[014-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|7[05])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-49]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}",,,,,,,[8]
+,[,,"(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4])|7(?:4[0-2]|6[0-5]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[014-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|7[015])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-59]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}",,,,,,,[8]
 ]
 ,[,,"800\\d{6}",,,,,,,[9]
 ]
@@ -3501,7 +3501,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"7(?:38(?:0\\d|5[0-2569]|88)|8(?:33|55|77|81)\\d)\\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}",,,,,,,[9]
+,[,,"7(?:38(?:0\\d|5[0-3569]|88)|8(?:33|55|77|81)\\d)\\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}",,,,,,,[9]
 ]
 ,"IL",972,"0(?:0|1[2-9])","0",,,"0",,,,[[,"(\\d{4})(\\d{3})","$1-$2",["125"]
 ]
@@ -4582,7 +4582,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"LV":[,[,,"(?:[268]\\d|90)\\d{6}",,,,,,,[8]
 ]
 ,[,,"6\\d{7}"]
-,[,,"23(?:23[0-57-9]|33[0238])\\d{3}|2(?:[0-24-9]\\d\\d|3(?:0[07]|[14-9]\\d|2[024-9]|3[0-24-9]))\\d{4}"]
+,[,,"2333[0-8]\\d{3}|2(?:[0-24-9]\\d\\d|3(?:0[07]|[14-9]\\d|2[02-9]|3[0-24-9]))\\d{4}"]
 ,[,,"80\\d{6}"]
 ,[,,"90\\d{6}"]
 ,[,,"81\\d{6}"]
@@ -4633,7 +4633,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"MA":[,[,,"[5-8]\\d{8}",,,,,,,[9]
 ]
 ,[,,"5(?:2(?:[0-25-79]\\d|3[1-578]|4[02-46-8]|8[0235-7])|3(?:[0-47]\\d|5[02-9]|6[02-8]|8[014-9]|9[3-9])|(?:4[067]|5[03])\\d)\\d{5}"]
-,[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}"]
+,[,,"(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-467]|5[0-3]|8[0-5]))\\d{6}"]
 ,[,,"80[0-7]\\d{6}"]
 ,[,,"89\\d{7}"]
 ,[,,,,,,,,,[-1]
@@ -4831,7 +4831,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:(?:2(?:62|77)0|3444)\\d|4[56]440)\\d{3}|(?:34|4[357])700\\d{3}|(?:2(?:[0-3]\\d|5[0-578]|6[01]|82)|3(?:1[3-68]|[23][2-68]|4[23568])|4(?:[23][2-68]|4[3-68]|5[2568]|6[25-8]|7[24-68]|8[4-68]))\\d{5}",,,,,,,,[6,7]
 ]
-,[,,"7(?:3555|(?:474|9[019]7)7)\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-48]\\d|6[01]|7[01578])|4(?:2\\d|60|7[01578])|9(?:[2-4]\\d|5[01]|7[015]))\\d{4}"]
+,[,,"7(?:3555|(?:474|9[019]7)7)\\d{3}|7(?:[0-25-8]\\d\\d|3(?:[1-478]\\d|6[01])|4(?:2\\d|60|7[01578])|9(?:[2-4]\\d|5[01]|7[015]))\\d{4}"]
 ,[,,"800\\d{5}"]
 ,[,,"5\\d{7}"]
 ,[,,"8(?:0[1-9]|[1-9]\\d)\\d{5}"]
@@ -4857,8 +4857,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"ML":[,[,,"[24-9]\\d{7}",,,,,,,[8]
 ]
-,[,,"2(?:07[0-8]|12[67])\\d{4}|(?:2(?:02|1[4-689])|4(?:0[0-4]|4[1-39]))\\d{5}"]
-,[,,"2(?:0(?:01|79)|17\\d)\\d{4}|(?:5[01]|[679]\\d|8[2-49])\\d{6}"]
+,[,,"2(?:07[0-8]|12[67])\\d{4}|(?:2(?:02|1[4-689])|4(?:0[0-4]|4[1-59]))\\d{5}"]
+,[,,"2(?:0(?:01|79)|17\\d)\\d{4}|(?:5[01]|[679]\\d|8[2-59])\\d{6}"]
 ,[,,"80\\d{6}"]
 ,[,,,,,,,,,[-1]
 ]
@@ -4900,7 +4900,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
-,[,,"1333\\d{4}|[12]468\\d{4}",,,,,,,[8]
+,[,,"1333\\d{4}",,,,,,,[8]
 ]
 ,"MM",95,"00","0",,,"0",,,,[[,"(\\d)(\\d{2})(\\d{3})","$1 $2 $3",["16|2"]
 ,"0$1"]
@@ -5116,7 +5116,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"MU":[,[,,"(?:[57]|8\\d\\d)\\d{7}|[2-468]\\d{6}",,,,,,,[7,8,10]
 ]
-,[,,"(?:2(?:[0346-8]\\d|1[0-7])|4(?:[013568]\\d|2[4-8]|71)|54(?:[3-5]\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}",,,,,,,[7,8]
+,[,,"(?:2(?:[0346-8]\\d|1[0-7])|4(?:[013568]\\d|2[4-8]|71|90)|54(?:[3-5]\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}",,,,,,,[7,8]
 ]
 ,[,,"5(?:4(?:2[1-389]|7[1-9])|87[15-8])\\d{4}|(?:5(?:2[5-9]|4[3-689]|[57]\\d|8[0-689]|9[0-8])|7(?:0[0-4]|3[013]))\\d{5}",,,,,,,[8]
 ]
@@ -5346,7 +5346,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"NC":[,[,,"(?:050|[2-57-9]\\d\\d)\\d{3}",,,,,,,[6]
 ]
 ,[,,"(?:2[03-9]|3[0-5]|4[1-7]|88)\\d{4}"]
-,[,,"(?:5[0-4]|[79]\\d|8[0-79])\\d{4}"]
+,[,,"(?:[579]\\d|8[0-79])\\d{4}"]
 ,[,,"050\\d{3}"]
 ,[,,"36\\d{4}"]
 ,[,,,,,,,,,[-1]
@@ -5966,7 +5966,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"47\\d{7}|(?:1[2-8]|2[2-69]|3[2-4]|4[1-468]|5[24-689]|6[1-3578]|7[14-7]|8[1-79]|9[145])(?:[02-9]\\d{6}|1(?:[0-8]\\d{5}|9\\d{3}(?:\\d{2})?))",,,,,,,[7,9]
 ]
-,[,,"21(?:1[013-5]|2\\d|3[4-9])\\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}",,,,,,,[9]
+,[,,"2131[89]\\d{4}|21(?:1[013-5]|2\\d|3[2-9])\\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}",,,,,,,[9]
 ]
 ,[,,"800\\d{6,7}",,,,,,,[9,10]
 ]
@@ -6112,7 +6112,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"PW":[,[,,"(?:[24-8]\\d\\d|345|900)\\d{4}",,,,,,,[7]
 ]
 ,[,,"(?:2(?:55|77)|345|488|5(?:35|44|87)|6(?:22|54|79)|7(?:33|47)|8(?:24|55|76)|900)\\d{4}"]
-,[,,"(?:(?:46|83)[0-5]|6[2-4689]0)\\d{4}|(?:45|77|88)\\d{5}"]
+,[,,"(?:(?:46|83)[0-5]|(?:6[2-4689]|78)0)\\d{4}|(?:45|77|88)\\d{5}"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@@ -6834,7 +6834,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]
 ]
-,[,,"(?:(?:15|(?:3[59]|4[89]|6\\d|7[79]|8[08])\\d|9(?:0\\d|[2-9]))\\d|2(?:4\\d|8))\\d{5}|(?:[67]\\d\\d|904)\\d{5}",,,,,,,[7,8,9]
+,[,,"(?:(?:15|(?:3[59]|4[89]|6\\d|7[679]|8[08])\\d|9(?:0\\d|[2-9]))\\d|2(?:4\\d|8))\\d{5}|(?:[67]\\d\\d|904)\\d{5}",,,,,,,[7,8,9]
 ]
 ,[,,,,,,,,,[-1]
 ]
@@ -6856,7 +6856,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[348]|64|79|90"]
 ]
-,[,"(\\d{2})(\\d{5,7})","$1 $2",["1|28|6[0-35-9]|77|9[2-9]"]
+,[,"(\\d{2})(\\d{5,7})","$1 $2",["1|28|6[0-35-9]|7[67]|9[2-9]"]
 ]
 ]
 ,,[,,,,,,,,,[-1]
@@ -7600,9 +7600,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"US":[,[,,"[2-9]\\d{9}|3\\d{6}",,,,,,,[10]
 ,[7]
 ]
-,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468]))\\d{4}|(?:305[3-9]|472[24]|505[2-57-9]|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,,,,,[7]
+,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,,,,,[7]
 ]
-,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468]))\\d{4}|(?:305[3-9]|472[24]|505[2-57-9]|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,,,,,[7]
+,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[0135-79]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,,,,,[7]
 ]
 ,[,,"8(?:00|33|44|55|66|77|88)[2-9]\\d{6}"]
 ,[,,"900[2-9]\\d{6}"]

javascript/i18n/phonenumbers/phonenumberutil.js

@@ -3584,6 +3584,12 @@ i18n.phonenumbers.PhoneNumberUtil.prototype.testNumberLengthForType_ =
  * numbers), it will return false for the subscriber-number-only version.
  * </ol>
  *
+ * <p>There is a known <a href="https://issuetracker.google.com/issues/335892662">issue</a> with this
+ * method: if a number is possible only in a certain region among several regions that share the
+ * same country calling code, this method will consider only the "main" region. For example,
+ * +1310xxxx are valid numbers in Canada. However, they are not possible in the US. As a result,
+ * this method will return IS_POSSIBLE_LOCAL_ONLY for +1310xxxx.
+ *
  * @param {i18n.phonenumbers.PhoneNumber} number the number that needs to be
  *     checked
  * @return {i18n.phonenumbers.PhoneNumberUtil.ValidationResult} a
@@ -3613,6 +3619,12 @@ i18n.phonenumbers.PhoneNumberUtil.prototype.isPossibleNumberWithReason =
  * numbers), it will return false for the subscriber-number-only version.
  * </ol>
  *
+ * <p>There is a known <a href="https://issuetracker.google.com/issues/335892662">issue</a> with this
+ * method: if a number is possible only in a certain region among several regions that share the
+ * same country calling code, this method will consider only the "main" region. For example,
+ * +1310xxxx are valid numbers in Canada. However, they are not possible in the US. As a result,
+ * this method will return IS_POSSIBLE_LOCAL_ONLY for +1310xxxx.
+ *
  * @param {i18n.phonenumbers.PhoneNumber} number the number that needs to be
  *     checked
  * @param {i18n.phonenumbers.PhoneNumberType} type the type we are interested in
@@ -4759,8 +4771,7 @@ i18n.phonenumbers.PhoneNumberUtil.prototype.canBeInternationallyDialled =
  */
 i18n.phonenumbers.PhoneNumberUtil.matchesEntirely = function(regex, str) {
   /** @type {Array.<string>} */
-  var matchedGroups = (typeof regex == 'string') ?
-      str.match('^(?:' + regex + ')$') : str.match(regex);
+  var matchedGroups = str.match(new RegExp('^(?:' + (typeof regex == 'string' ? regex : regex.source) + ')$', 'i'));
   if (matchedGroups && matchedGroups[0].length == str.length) {
     return true;
   }

release_notes.txt

@@ -1,3 +1,22 @@
+Jan 29, 2025: v8.13.54
+Metadata changes:
+ - Updated phone metadata for region code(s): HK, ML, NC, PL, US
+ - New geocoding data for country calling code(s): 1274 (en)
+ - Updated carrier data for country calling code(s):
+   41 (en), 48 (en), 51 (en), 223 (en), 268 (en), 852 (en, zh)
+ - Updated / refreshed time zone meta data.
+
+Jan 13, 2025: v8.13.53
+Code changes:
+ - Fixed a bug where the extension was appended twice in formatOutOfCountryKeepingAlphaChars in the Java version and updated FormatOutOfCountryKeepingAlphaChars in the C++ version to format the extension.
+Metadata changes:
+ - Updated phone metadata for region code(s):
+   EH, IL, LV, MA, MK, MM, MU, PW, SO
+ - Updated carrier data for country calling code(s):
+   90 (en), 92 (en), 212 (en), 229 (en), 252 (en), 351 (en), 371 (en), 389 (en),
+   597 (en), 680 (en)
+ - Updated / refreshed time zone meta data.
+
 Dec 11, 2024: v8.13.52
 Metadata changes:
  - Updated phone metadata for region code(s):

resources/PhoneNumberMetadata.xml

@@ -10224,9 +10224,9 @@
             )|
             7(?:
               [0167]\d|
-              2[0-4]|
-              5[01]|
-              8[0-3]
+              2[0-467]|
+              5[0-3]|
+              8[0-5]
             )
           )\d{6}
         </nationalNumberPattern>
@@ -13354,7 +13354,7 @@
             4(?:
               4[0-35-9]|
               6[02357-9]|
-              7[05]
+              7[015]
             )|
             5(?:
               [1-59][0-46-9]|
@@ -13367,7 +13367,7 @@
               [268][0-57-9]|
               7[0-79]
             )|
-            70[1-49]|
+            70[1-59]|
             84[0-39]|
             9(?:
               0[1-9]|
@@ -14435,7 +14435,7 @@
           7(?:
             38(?:
               0\d|
-              5[0-2569]|
+              5[0-3569]|
               88
             )|
             8(?:
@@ -19940,16 +19940,13 @@
         <possibleLengths national="8"/>
         <exampleNumber>21234567</exampleNumber>
         <nationalNumberPattern>
-          23(?:
-            23[0-57-9]|
-            33[0238]
-          )\d{3}|
+          2333[0-8]\d{3}|
           2(?:
             [0-24-9]\d\d|
             3(?:
               0[07]|
               [14-9]\d|
-              2[024-9]|
+              2[02-9]|
               3[0-24-9]
             )
           )\d{4}
@@ -20120,9 +20117,9 @@
             )|
             7(?:
               [0167]\d|
-              2[0-4]|
-              5[01]|
-              8[0-3]
+              2[0-467]|
+              5[0-3]|
+              8[0-5]
             )
           )\d{6}
         </nationalNumberPattern>
@@ -20708,9 +20705,8 @@
           7(?:
             [0-25-8]\d\d|
             3(?:
-              [1-48]\d|
-              6[01]|
-              7[01578]
+              [1-478]\d|
+              6[01]
             )|
             4(?:
               2\d|
@@ -20802,7 +20798,7 @@
             )|
             4(?:
               0[0-4]|
-              4[1-39]
+              4[1-59]
             )
           )\d{5}
         </nationalNumberPattern>
@@ -20821,7 +20817,7 @@
           (?:
             5[01]|
             [679]\d|
-            8[2-49]
+            8[2-59]
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -21226,10 +21222,7 @@
       <voip>
         <possibleLengths national="8"/>
         <exampleNumber>13331234</exampleNumber>
-        <nationalNumberPattern>
-          1333\d{4}|
-          [12]468\d{4}
-        </nationalNumberPattern>
+        <nationalNumberPattern>1333\d{4}</nationalNumberPattern>
       </voip>
     </territory>
 
@@ -21962,7 +21955,8 @@
             4(?:
               [013568]\d|
               2[4-8]|
-              71
+              71|
+              90
             )|
             54(?:
               [3-5]\d|
@@ -22843,8 +22837,7 @@
         <exampleNumber>751234</exampleNumber>
         <nationalNumberPattern>
           (?:
-            5[0-4]|
-            [79]\d|
+            [579]\d|
             8[0-79]
           )\d{4}
         </nationalNumberPattern>
@@ -24898,10 +24891,11 @@
         <possibleLengths national="9"/>
         <exampleNumber>512345678</exampleNumber>
         <nationalNumberPattern>
+          2131[89]\d{4}|
           21(?:
             1[013-5]|
             2\d|
-            3[4-9]
+            3[2-9]
           )\d{5}|
           (?:
             45|
@@ -25391,7 +25385,10 @@
               46|
               83
             )[0-5]|
-            6[2-4689]0
+            (?:
+              6[2-4689]|
+              78
+            )0
           )\d{4}|
           (?:
             45|
@@ -27563,7 +27560,7 @@
             1|
             28|
             6[0-35-9]|
-            77|
+            7[67]|
             9[2-9]
           </leadingDigits>
           <format>$1 $2</format>
@@ -27614,7 +27611,7 @@
                 3[59]|
                 4[89]|
                 6\d|
-                7[79]|
+                7[679]|
                 8[08]
               )\d|
               9(?:
@@ -28797,7 +28794,7 @@
     <!-- Türkiye (TR) -->
     <!-- http://en.wikipedia.org/wiki/%2B90 -->
     <!-- http://www.itu.int/oth/T02020000D6/en -->
-    <!-- https://eng.btk.gov.tr/en-US/Pages/National-Numbering-Plan -->
+    <!-- https://www.btk.gov.tr/genel-numaralandirma-plani -->
     <!-- https://www.btk.gov.tr/tr-TR/Sayfalar/Isletmecilere-Tahsisli-Numaralar -->
     <territory id="TR" countryCode="90" internationalPrefix="00" nationalPrefix="0"
                mobileNumberPortableRegion="true">
@@ -29791,8 +29788,9 @@
             )
           )\d{4}|
           (?:
+            2742|
             305[3-9]|
-            472[24]|
+            472[247-9]|
             505[2-57-9]|
             983[2-47-9]
           )\d{6}|
@@ -29900,8 +29898,9 @@
             )
           )\d{4}|
           (?:
+            2742|
             305[3-9]|
-            472[24]|
+            472[247-9]|
             505[2-57-9]|
             983[2-47-9]
           )\d{6}|

resources/carrier/en/212.txt

@@ -1,42 +1,22 @@
-# Copyright (C) 2013 The Libphonenumber Authors
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Prefixes include those from http://en.wikipedia.org/wiki/+212 and
-# http://www.telecomjahiz.com/Assistance/Liste-des-prefixes-des-operateurs-de-telephonie-Mobile-et-Fixe-au-Maroc.php
-# and http://www.anrt.ma/sites/default/files/Blocs_de_numeros_par_operateur.pdf
-# This last file refers to Méditel as Medi Telecom, Maroc Telecom as Itissalat
-# Al-Maghrib and Inwi as WANA Corporate (its old name, according to wikipedia).
-
 21260|Inwi
 21261|Maroc Telecom
-212612|Méditel
-212614|Méditel
-212617|Méditel
-212619|Méditel
-212620|Méditel
-212621|Méditel
+212612|Orange
+212614|Orange
+212617|Orange
+212619|Orange
+212620|Orange
+212621|Orange
 212622|Maroc Telecom
 212623|Maroc Telecom
 212624|Maroc Telecom
-212625|Méditel
+212625|Orange
 212626|Inwi
 212627|Inwi
 212628|Maroc Telecom
 212629|Inwi
 212630|Inwi
-212631|Méditel
-212632|Méditel
+212631|Orange
+212632|Orange
 212633|Inwi
 212634|Inwi
 212635|Inwi
@@ -48,42 +28,42 @@
 212641|Maroc Telecom
 212642|Maroc Telecom
 212643|Maroc Telecom
-212644|Méditel
-212645|Méditel
+212644|Orange
+212645|Orange
 212646|Inwi
 212647|Inwi
 212648|Maroc Telecom
-212649|Méditel
+212649|Orange
 21265|Maroc Telecom
-212656|Méditel
-212657|Méditel
-212660|Méditel
+212656|Orange
+212657|Orange
+212660|Orange
 212661|Maroc Telecom
 212662|Maroc Telecom
-212663|Méditel
-212664|Méditel
-212665|Méditel
+212663|Orange
+212664|Orange
+212665|Orange
 212666|Maroc Telecom
 212667|Maroc Telecom
 212668|Maroc Telecom
-212669|Méditel
+212669|Orange
 21267|Maroc Telecom
-212674|Méditel
-212675|Méditel
-212679|Méditel
+212674|Orange
+212675|Orange
+212679|Orange
 212680|Inwi
 212681|Inwi
 212682|Maroc Telecom
-212684|Méditel
+212684|Orange
 212687|Inwi
-212688|Méditel
+212688|Orange
 212689|Maroc Telecom
 212690|Inwi
-212691|Méditel
+212691|Orange
 2126921|Al Hourria Telecom
 2126922|Al Hourria Telecom
-212693|Méditel
-212694|Méditel
+212693|Orange
+212694|Orange
 212695|Inwi
 212696|Maroc Telecom
 212697|Maroc Telecom
@@ -94,5 +74,5 @@
 21272|Inwi
 21275|Maroc Telecom
 21276|Maroc Telecom
-21277|Méditel
-21278|Méditel
+21277|Orange
+21278|Orange

resources/carrier/en/223.txt

@@ -21,6 +21,7 @@
 22382|Orange
 22383|Orange
 22384|Orange
+22385|Orange
 22389|Sotelma
 22390|Orange
 22391|Orange

resources/carrier/en/229.txt

@@ -15,15 +15,10 @@
 # Libercom is brand name of Benintelecoms and Moov is brand name of Etisalat.
 # Celtiis is brand name of SBIN.
 
-2290140|SBIN
-2290141|SBIN
+229014|SBIN
 2290142|MTN
-2290143|SBIN
-2290144|SBIN
 2290145|Moov
 2290146|MTN
-2290147|SBIN
-2290148|SBIN
 229015|MTN
 2290155|Moov
 2290158|Moov
@@ -50,7 +45,6 @@
 22946|MTN
 2295|MTN
 22955|Moov
-22956|Moov
 22960|Moov
 22961|MTN
 22962|MTN

resources/carrier/en/252.txt

@@ -31,6 +31,7 @@
 25270|Golis Telecom
 25271|Amtel
 25272|Golis Telecom
+25276|Somtel
 25279|Somtel
 25280|Somali Networks
 25288|Somali Networks

resources/carrier/en/268.txt

@@ -15,4 +15,4 @@
 26876|Swazi MTN
 26877|SPTC
 26878|Swazi MTN
-26879|Swazi Mobile Ltd
+26879|Eswatini Mobile

resources/carrier/en/351.txt

@@ -60,6 +60,8 @@
 3519280|NOWO
 3519281|NOWO
 3519282|Digi Communications
+3519283|Digi Communications
+3519284|Digi Communications
 3519285|ONITELECOM
 3519290|NOS
 3519291|NOS

resources/carrier/en/371.txt

@@ -13,31 +13,23 @@
 # limitations under the License.
 
 371200|Tele2
-3712010|Bite Latvia
-3712011|Bite Latvia
-3712012|Bite Latvia
-3712013|Bite Latvia
-3712014|Bite Latvia
-3712015|Bite Latvia
-3712016|Bite Latvia
-3712017|Bite Latvia
-3712019|Bite Latvia
+371201|Bite Latvia
+3712018|Tele2
 371202|LMT
 371203|Tele2
 371204|Tele2
 371205|Tele2
 371206|Bite Latvia
 371207|Bite Latvia
-3712080|Bite Latvia
-3712081|Bite Latvia
-3712082|Bite Latvia
-3712083|Bite Latvia
-3712084|Bite Latvia
-3712085|Bite Latvia
-3712086|Bite Latvia
-3712087|Bite Latvia
-3712088|Bite Latvia
+371208|Bite Latvia
+3712089|Tele2
+3712091|Tele2
+3712092|Tele2
+3712093|Tele2
 3712094|Triatel
+3712095|Tele2
+3712096|Tele2
+3712097|Tele2
 37121|Bite Latvia
 3712200|LMT
 3712201|LMT
@@ -75,10 +67,7 @@
 3712317|Bite Latvia
 3712320|Bite Latvia
 3712322|Bite Latvia
-37123230|Tele2
-37123232|Tele2
-37123233|Tele2
-37123238|Tele2
+3712323|Tele2
 3712327|Bite Latvia
 3712328|LMT
 3712330|Bite Latvia

resources/carrier/en/389.txt

@@ -24,8 +24,6 @@
 38972|T-Mobile
 38973|A1
 389736|T-Mobile
-3897370|T-Mobile
-3897371|T-Mobile
 389742|T-Mobile
 3897421|Mobik
 389746|T-Mobile

resources/carrier/en/41.txt

@@ -29,6 +29,7 @@
 417552|Swisscom
 417553|Swisscom
 417557|Swisscom
+41757|Swisscom
 417600|Sunrise
 41762|Sunrise
 41763|Sunrise

resources/carrier/en/48.txt

@@ -47,10 +47,9 @@
 484595|Plus
 4845950|SIA Ntel Solutions
 4845957|BSG ESTONIA OU
-4845958|TELESTRADA S.A.
-4845959|TELESTRADA S.A.
 484596|Plus
 484598|Plus
+484599|Plus
 4850|Orange
 4851|Orange
 4853|Play

resources/carrier/en/51.txt

@@ -1,26 +1,7 @@
-# Copyright (C) 2013 The Libphonenumber Authors
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
+5190|Entel
 51900|Claro
 51901|Claro
-51902|Entel
-51903|Entel
-51904|Entel
-51905|Entel
-51906|Entel
-51907|Entel
-51908|Entel
+51909|Americatel
 51910|Claro
 51912|Entel
 51913|Claro

resources/carrier/en/597.txt

@@ -17,11 +17,7 @@
 59774|Digicel
 59775|Telesur
 59776|Digicel
-597770|Telesur
-597771|Telesur
-597772|Telesur
-597773|Telesur
-597774|Telesur
+59777|Telesur
 5978|Telesur
 59781|Digicel
 59782|Digicel

resources/carrier/en/680.txt

@@ -17,5 +17,6 @@
 68045|PMCI
 68046|PMCI
 68077|PalauCel
+68078|PalauCel
 68083|PMCI
 68088|PalauTel

resources/carrier/en/852.txt

@@ -83,6 +83,7 @@
 852469|China Mobile
 8524699|South China Telecommunications
 852470|Hutchison Telecom
+852471|Hutchison Telecom
 852474|China Mobile
 852475|Hutchison Telecom
 852476|China Mobile
@@ -306,6 +307,7 @@
 852702|Hutchison Telecom
 852703|Hutchison Telecom
 852704|Hutchison Telecom
+852705|Hutchison Telecom
 8527071|SmarTone
 8527072|SmarTone
 8527073|SmarTone

resources/carrier/en/90.txt

@@ -19,6 +19,7 @@
 90510221|Netgsm
 90510222|Netgsm
 90510223|Netgsm
+90510224|Netgsm
 90510227|Netgsm
 90510232|Foniv Telecommunications Services
 90510244|Nida Telekomunikasyon
@@ -40,10 +41,6 @@
 9053386|Kuzey Kibris Turkcell
 9053387|Kuzey Kibris Turkcell
 9054|Vodafone
-9054285|KKTC Telsim
-9054286|KKTC Telsim
-9054287|KKTC Telsim
-9054288|KKTC Telsim
 9055|Turk Telekom
 905610|Selam Mobile
 905616|Turkcell

resources/carrier/en/92.txt

@@ -14,9 +14,9 @@
 
 # http://en.wikipedia.org/wiki/List_of_mobile_codes_in_Pakistan
 
-9230|Mobilink
+9230|Jazz
 9231|Zong
-9232|Warid
+9232|Jazz
 9233|Ufone
 9234|Telenor
 9235|Special Communications Organization

resources/carrier/zh/852.txt

@@ -77,6 +77,7 @@
 852469|中国移动
 8524699|中國南方電信(香港)有限公司
 852470|和記電話有限公司
+852471|和記電話有限公司
 852474|中国移动
 852475|和記電話有限公司
 852476|中国移动
@@ -300,6 +301,7 @@
 852702|和記電話有限公司
 852703|和記電話有限公司
 852704|和記電話有限公司
+852705|和記電話有限公司
 8527071|数码通
 8527072|数码通
 8527073|数码通

resources/geocoding/en/1.txt

@@ -3808,6 +3808,7 @@
 1270982|Elizabethtown, KY
 1270988|Salem, KY
 1272|Pennsylvania
+1274|Wisconsin
 1276|Virginia
 1276223|Wytheville, VA
 1276228|Wytheville, VA

resources/metadata/1/ranges.csv

@@ -4472,6 +4472,7 @@ Prefix             ; Length ; Type                 ; Tariff        ; Area Code L
 270982             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Elizabethtown, KY"
 270988             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Chicago"                            ; "US"                                                                         ; "Salem, KY"
 272[2-9]           ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Pennsylvania"
+2742               ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Chicago"                            ; "US"                                                                         ; "Wisconsin"                                 ; GOVERNMENT
 2762[014-9]        ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Virginia"
 27622[0-24-79]     ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Virginia"
 27622[38]          ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Wytheville, VA"
@@ -12708,7 +12709,7 @@ Prefix             ; Length ; Type                 ; Tariff        ; Area Code L
 46995[013-9]       ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Chicago"                            ; "US"                                                                         ; "Texas"
 469952             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Chicago"                            ; "US"                                                                         ; "McKinney, TX"
 470[2-9]           ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Georgia"
-472[24]            ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "North Carolina"                            ; GOVERNMENT
+472[247-9]         ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "North Carolina"                            ; GOVERNMENT
 47323[0-2]         ; 10     ; FIXED_LINE           ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Grenada"                            ; "GD"
 473269             ; 10     ; FIXED_LINE           ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Grenada"                            ; "GD"
 47332[89]          ; 10     ; FIXED_LINE           ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Grenada"                            ; "GD"
@@ -34815,7 +34816,7 @@ Prefix             ; Length ; Type                 ; Tariff        ; Area Code L
 9282[4-79]         ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
 92828[015-8]       ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
 92828[24]          ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Sedona, AZ"
-928283             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Tuba City, AZ"
+928283             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Denver&America/Phoenix"             ; "US"                                                                         ; "Tuba City, AZ"
 928289             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Winslow, AZ"
 9283[0589]         ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
 92831[0-35689]     ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
@@ -34877,16 +34878,18 @@ Prefix             ; Length ; Type                 ; Tariff        ; Area Code L
 928649             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Cottonwood, AZ"
 92866[0-8]         ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
 928669             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Parker, AZ"
-92867[0-35-9]      ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
-928674             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Chinle, AZ"
+92867[015689]      ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
+92867[237]         ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Denver&America/Phoenix"             ; "US"                                                                         ; "Arizona"
+928674             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Denver&America/Phoenix"             ; "US"                                                                         ; "Chinle, AZ"
 928680             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Lake Havasu City, AZ"
 928681             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Kingman, AZ"
-92868[235-79]      ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
+92868[2357-9]      ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
 928684             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Wickenburg, AZ"
-928688             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Denver&America/Phoenix"             ; "US"                                                                         ; "Arizona"
-92869[013-68]      ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
+928686             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Denver&America/Phoenix"             ; "US"                                                                         ; "Arizona"
+92869[013-6]       ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
 928692             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Kingman, AZ"
-928697             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Kayenta, AZ"
+928697             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Denver&America/Phoenix"             ; "US"                                                                         ; "Kayenta, AZ"
+928698             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Denver&America/Phoenix"             ; "US"                                                                         ; "Arizona"
 928699             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Flagstaff, AZ"
 92870[0-35-79]     ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
 928704             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Bullhead City, AZ"
@@ -34895,13 +34898,15 @@ Prefix             ; Length ; Type                 ; Tariff        ; Area Code L
 92871[1-3569]      ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
 928714             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Flagstaff, AZ"
 928718             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Kingman, AZ"
-92872[0-578]       ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
+92872[0-37]        ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
+92872[458]         ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Denver&America/Phoenix"             ; "US"                                                                         ; "Arizona"
 928726             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Yuma, AZ"
-928729             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Fort Defiance, AZ"
+928729             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Denver&America/Phoenix"             ; "US"                                                                         ; "Fort Defiance, AZ"
 9287[349]          ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
-92875[0-256]       ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
+92875[0-26]        ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
 92875[37]          ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Kingman, AZ"
 92875[48]          ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Bullhead City, AZ"
+928755             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Denver&America/Phoenix"             ; "US"                                                                         ; "Arizona"
 928759             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Prescott Valley, AZ"
 92876[0-25-9]      ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
 928763             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Bullhead City, AZ"
@@ -34910,7 +34915,8 @@ Prefix             ; Length ; Type                 ; Tariff        ; Area Code L
 92877[16-8]        ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Prescott, AZ"
 92877[25]          ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Prescott Valley, AZ"
 92877[349]         ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Flagstaff, AZ"
-92878[014679]      ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
+92878[0469]        ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
+92878[17]          ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Denver&America/Phoenix"             ; "US"                                                                         ; "Arizona"
 92878[23]          ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Yuma, AZ"
 928785             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Wellton, AZ"
 928788             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Fort Mohave, AZ"
@@ -34922,7 +34928,7 @@ Prefix             ; Length ; Type                 ; Tariff        ; Area Code L
 92886[0-46-9]      ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
 928865             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Clifton, AZ"
 92887[02-9]        ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
-928871             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Window Rock, AZ"
+928871             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Denver&America/Phoenix"             ; "US"                                                                         ; "Window Rock, AZ"
 92889[0-8]         ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"
 928899             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Prescott, AZ"
 9289[013-9]        ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Phoenix"                            ; "US"                                                                         ; "Arizona"

resources/metadata/212/operators.csv

@@ -2,4 +2,4 @@ Id                 ; Name:en
 al_hourria_telecom ; "Al Hourria Telecom"
 inwi               ; "Inwi"
 maroc_telecom      ; "Maroc Telecom"
-meditel            ; "Méditel"
+orange             ; "Orange"

resources/metadata/212/ranges.csv

@@ -17,7 +17,7 @@ Prefix     ; Length ; Type       ; Tariff        ; Operator             ; Format
 5247       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "MA"    ; "Essaouira"                                      ; "Essaouira"                                      ; GOVERNMENT ; "Regulatory - 06/2018"
 5248       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "MA"    ; "Ouarzazate"                                     ; "Ouarzazate"                                     ; GOVERNMENT ; "Regulatory - 06/2018"
 525        ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt1_3/6"     ; "MA"    ; "Southern Morocco"                               ; "Maroc Sud"                                      ; GOVERNMENT ; "Regulatory - 06/2018"
-52[67]     ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "MA"    ;                                                  ;                                                  ; IR21       ; "IR21 - 3/13/2018"
+52[67]     ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "MA"    ;                                                  ;                                                  ; IR21
 5282       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "MA"    ; "Agadir/Ait Meloul/Inezgane"                     ; "Agadir/Inezgane/Ait Melou"                      ; GOVERNMENT ; "Regulatory - 06/2018"
 5283       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "MA"    ; "Inezgane/Taroudant"                             ; "Inezgane/Taroudannt"                            ; GOVERNMENT ; "Regulatory - 06/2018"
 5285       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "MA"    ; "Oulad Teima/Taroudant"                          ; "Taroudannt/Oulad Teima"                         ; GOVERNMENT ; "Regulatory - 06/2018"
@@ -31,7 +31,7 @@ Prefix     ; Length ; Type       ; Tariff        ; Operator             ; Format
 530        ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt1_3/6"     ; "MA"    ; "Rabat/Kènitra"                                  ; "Rabat/Kénitra"                                  ; GOVERNMENT ; "Regulatory - 06/2018"
 531        ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt1_3/6"     ; "MA"    ; "Tangier/Al Hoceima/Larache/Tètouan/Chefchaouen" ; "Tanger/Tétouan/Larache/Al Hoceima/Cherfchaouen" ; GOVERNMENT ; "Regulatory - 06/2018"
 532        ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt1_3/6"     ; "MA"    ; "Fès/Errachidia/Meknès/Nador/Oujda/Taza"         ; "Fès/Oujda/Meknès/Taza/Nador/Errachidia"         ; GOVERNMENT ; "Regulatory - 06/2018"
-53[34]     ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "MA"    ;                                                  ;                                                  ; IR21       ; "IR21 - 3/13/2018"
+53[34]     ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "MA"    ;                                                  ;                                                  ; IR21
 5350       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "MA"
 5352       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "MA"    ; "Taza"                                           ; "Taza"                                           ; GOVERNMENT ; "Regulatory - 06/2018"
 5353       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "MA"    ; "Midelt"                                         ; "Midelt"                                         ; GOVERNMENT ; "Regulatory - 06/2018"
@@ -70,36 +70,36 @@ Prefix     ; Length ; Type       ; Tariff        ; Operator             ; Format
 59293      ; 9      ; VOIP       ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "EH,MA"
 60         ; 9      ; MOBILE     ; STANDARD_RATE ; "inwi"               ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 3/13/2018"
 61[013568] ; 9      ; MOBILE     ; STANDARD_RATE ; "maroc_telecom"      ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 4/20/2018"
-61[2479]   ; 9      ; MOBILE     ; STANDARD_RATE ; "meditel"            ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; GOVERNMENT ; "Regulatory - 06/2018"
-62[015]    ; 9      ; MOBILE     ; STANDARD_RATE ; "meditel"            ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; GOVERNMENT ; "Regulatory - 06/2018"
+61[2479]   ; 9      ; MOBILE     ; STANDARD_RATE ; "orange"             ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
+62[015]    ; 9      ; MOBILE     ; STANDARD_RATE ; "orange"             ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
 62[2-48]   ; 9      ; MOBILE     ; STANDARD_RATE ; "maroc_telecom"      ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 4/20/2018"
 62[679]    ; 9      ; MOBILE     ; STANDARD_RATE ; "inwi"               ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 3/13/2018"
 63[03-58]  ; 9      ; MOBILE     ; STANDARD_RATE ; "inwi"               ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 3/13/2018"
-63[12]     ; 9      ; MOBILE     ; STANDARD_RATE ; "meditel"            ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; GOVERNMENT ; "Regulatory - 06/2018"
+63[12]     ; 9      ; MOBILE     ; STANDARD_RATE ; "orange"             ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
 63[679]    ; 9      ; MOBILE     ; STANDARD_RATE ; "maroc_telecom"      ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 4/20/2018"
 64[067]    ; 9      ; MOBILE     ; STANDARD_RATE ; "inwi"               ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 3/13/2018"
 64[1-38]   ; 9      ; MOBILE     ; STANDARD_RATE ; "maroc_telecom"      ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 4/20/2018"
-6[47][459] ; 9      ; MOBILE     ; STANDARD_RATE ; "meditel"            ; "fmt1_3/6"     ; "EH,MA"
+6[47][459] ; 9      ; MOBILE     ; STANDARD_RATE ; "orange"             ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
 65[0-589]  ; 9      ; MOBILE     ; STANDARD_RATE ; "maroc_telecom"      ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 4/20/2018"
-65[67]     ; 9      ; MOBILE     ; STANDARD_RATE ; "meditel"            ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; GOVERNMENT ; "Regulatory - 06/2018"
-66[03-59]  ; 9      ; MOBILE     ; STANDARD_RATE ; "meditel"            ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; GOVERNMENT ; "Regulatory - 06/2018"
+65[67]     ; 9      ; MOBILE     ; STANDARD_RATE ; "orange"             ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
+66[03-59]  ; 9      ; MOBILE     ; STANDARD_RATE ; "orange"             ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
 66[126-8]  ; 9      ; MOBILE     ; STANDARD_RATE ; "maroc_telecom"      ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 4/20/2018"
 67[0-36-8] ; 9      ; MOBILE     ; STANDARD_RATE ; "maroc_telecom"      ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 4/20/2018"
 68[017]    ; 9      ; MOBILE     ; STANDARD_RATE ; "inwi"               ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 3/13/2018"
 68[29]     ; 9      ; MOBILE     ; STANDARD_RATE ; "maroc_telecom"      ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 4/20/2018"
-68[48]     ; 9      ; MOBILE     ; STANDARD_RATE ; "meditel"            ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; GOVERNMENT ; "Regulatory - 06/2018"
+68[48]     ; 9      ; MOBILE     ; STANDARD_RATE ; "orange"             ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
 69[0589]   ; 9      ; MOBILE     ; STANDARD_RATE ; "inwi"               ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; GOVERNMENT ; "Regulatory - 06/2018"
-69[134]    ; 9      ; MOBILE     ; STANDARD_RATE ; "meditel"            ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; GOVERNMENT ; "Regulatory - 06/2018"
+69[134]    ; 9      ; MOBILE     ; STANDARD_RATE ; "orange"             ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
 692[03-9]  ; 9      ; MOBILE     ; STANDARD_RATE ;                      ; "fmt1_3/6"     ; "EH,MA"
 692[12]    ; 9      ; MOBILE     ; STANDARD_RATE ; "al_hourria_telecom" ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; GOVERNMENT ; "Regulatory - 06/2018"
 69[67]     ; 9      ; MOBILE     ; STANDARD_RATE ; "maroc_telecom"      ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21       ; "IR21 - 4/20/2018"
 7[01]      ; 9      ; MOBILE     ; STANDARD_RATE ; "inwi"               ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
 72[0-2]    ; 9      ; MOBILE     ; STANDARD_RATE ; "inwi"               ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; GOVERNMENT
-72[34]     ; 9      ; MOBILE     ; STANDARD_RATE ; "inwi"               ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
-75[01]     ; 9      ; MOBILE     ; STANDARD_RATE ; "maroc_telecom"      ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
+72[3467]   ; 9      ; MOBILE     ; STANDARD_RATE ; "inwi"               ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
+75[0-3]    ; 9      ; MOBILE     ; STANDARD_RATE ; "maroc_telecom"      ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
 76         ; 9      ; MOBILE     ; STANDARD_RATE ; "maroc_telecom"      ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
-77         ; 9      ; MOBILE     ; STANDARD_RATE ; "meditel"            ; "fmt1_3/6"     ; "EH,MA"
-78[0-3]    ; 9      ; MOBILE     ; STANDARD_RATE ; "meditel"            ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; ITU
+77         ; 9      ; MOBILE     ; STANDARD_RATE ; "orange"             ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
+78[0-5]    ; 9      ; MOBILE     ; STANDARD_RATE ; "orange"             ; "fmt1_3/6"     ; "EH,MA" ;                                                  ;                                                  ; IR21
 80[0-7]    ; 9      ; FIXED_LINE ; TOLL_FREE     ;                      ; "fmt5_2/7"     ; "EH,MA"
 80[89]     ; 9      ; VOIP       ; STANDARD_RATE ;                      ; "fmt2_4/5"     ; "EH,MA" ;                                                  ;                                                  ; GOVERNMENT
 89[013-9]  ; 9      ; FIXED_LINE ; PREMIUM_RATE  ;                      ; "fmt5_2/7"     ; "EH,MA"

resources/metadata/223/ranges.csv

@@ -13,11 +13,13 @@ Prefix   ; Length ; Type       ; Tariff        ; National Only ; Operator  ; For
 40[0-4]  ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;           ; "fmt_2/2/2/2" ; "ML"    ;              ; ITU        ; "ITU_ 3.6.2018"
 441      ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;           ; "fmt_2/2/2/2" ; "ML"    ;              ; ITU        ; "ITU_ 3.6.2018"
 44[239]  ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;           ; "fmt_2/2/2/2" ; "ML"    ; "Bamako"     ; ITU        ; "ITU_ 3.6.2018"
+44[45]   ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;           ; "fmt_2/2/2/2" ; "ML"    ;              ; IR21
 5[01]    ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "atel"    ; "fmt_2/2/2/2" ; "ML"
 6        ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "sotelma" ; "fmt_2/2/2/2" ; "ML"
 7        ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "orange"  ; "fmt_2/2/2/2" ; "ML"
 80       ; 8      ; FIXED_LINE ; TOLL_FREE     ; true          ;           ; "fmt_2/2/2/2" ; "ML"
 8[2-4]   ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "orange"  ; "fmt_2/2/2/2" ; "ML"
+85       ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "orange"  ; "fmt_2/2/2/2" ; "ML"    ;              ; IR21
 89       ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "sotelma" ; "fmt_2/2/2/2" ; "ML"
 9[0-4]   ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "orange"  ; "fmt_2/2/2/2" ; "ML"
 9[5-9]   ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "sotelma" ; "fmt_2/2/2/2" ; "ML"

resources/metadata/229/ranges.csv

@@ -4,8 +4,7 @@ Prefix      ; Length ; Type                 ; Tariff        ; Operator  ; Format
 014[01347]  ; 10     ; MOBILE               ; STANDARD_RATE ; "sbin"    ; "fmt_2/2/2/2/2" ; "BJ"    ;                                        ;                                         ; ITU
 014[26]     ; 10     ; MOBILE               ; STANDARD_RATE ; "mtn"     ; "fmt_2/2/2/2/2" ; "BJ"    ;                                        ;                                         ; ITU
 0145        ; 10     ; MOBILE               ; STANDARD_RATE ; "moov"    ; "fmt_2/2/2/2/2" ; "BJ"    ;                                        ;                                         ; ITU
-0148        ; 10     ; MOBILE               ; STANDARD_RATE ; "sbin"    ; "fmt_2/2/2/2/2" ; "BJ"    ;                                        ;                                         ; IR21
-0149        ; 10     ; MOBILE               ; STANDARD_RATE ;           ; "fmt_2/2/2/2/2" ; "BJ"    ;                                        ;                                         ; ITU
+014[89]     ; 10     ; MOBILE               ; STANDARD_RATE ; "sbin"    ; "fmt_2/2/2/2/2" ; "BJ"    ;                                        ;                                         ; IR21
 015[0-4679] ; 10     ; MOBILE               ; STANDARD_RATE ; "mtn"     ; "fmt_2/2/2/2/2" ; "BJ"    ;                                        ;                                         ; ITU
 015[58]     ; 10     ; MOBILE               ; STANDARD_RATE ; "moov"    ; "fmt_2/2/2/2/2" ; "BJ"    ;                                        ;                                         ; ITU
 016[03-58]  ; 10     ; MOBILE               ; STANDARD_RATE ; "moov"    ; "fmt_2/2/2/2/2" ; "BJ"    ;                                        ;                                         ; ITU
@@ -62,7 +61,7 @@ Prefix      ; Length ; Type                 ; Tariff        ; Operator  ; Format
 5[1-37-9]   ; 8      ; MOBILE               ; STANDARD_RATE ; "mtn"     ; "fmt1_2/2/2/2"  ; "BJ"
 54          ; 8      ; MOBILE               ; STANDARD_RATE ; "mtn"     ; "fmt1_2/2/2/2"  ; "BJ"    ;                                        ;                                         ;            ; "User report"
 55          ; 8      ; MOBILE               ; STANDARD_RATE ; "moov"    ; "fmt1_2/2/2/2"  ; "BJ"    ;                                        ;                                         ; IR21
-56          ; 8      ; MOBILE               ; STANDARD_RATE ; "moov"    ; "fmt1_2/2/2/2"  ; "BJ"
+56          ; 8      ; MOBILE               ; STANDARD_RATE ; "mtn"     ; "fmt1_2/2/2/2"  ; "BJ"    ;                                        ;                                         ; ITU
 6[03-58]    ; 8      ; MOBILE               ; STANDARD_RATE ; "moov"    ; "fmt1_2/2/2/2"  ; "BJ"    ;                                        ;                                         ; IR21
 6[12679]    ; 8      ; MOBILE               ; STANDARD_RATE ; "mtn"     ; "fmt1_2/2/2/2"  ; "BJ"
 81          ; 8      ; UAN                  ; STANDARD_RATE ;           ; "fmt1_2/2/2/2"  ; "BJ"    ;                                        ;                                         ; ITU

resources/metadata/230/ranges.csv

@@ -10,6 +10,7 @@ Prefix     ; Length ; Type                 ; Tariff        ; Operator   ; Format
 42[4-7]    ; 7      ; FIXED_LINE           ; STANDARD_RATE ;            ; "fmt1_3/4" ; "MU"    ; "Central Region" ; "Región Central" ; "Région Centrale"
 428        ; 7      ; FIXED_LINE           ; STANDARD_RATE ;            ; "fmt1_3/4" ; "MU"    ; "Central Region" ; "Región Central" ; "Région Centrale" ;            ; "Added per client's request"
 471        ; 7      ; FIXED_LINE           ; STANDARD_RATE ;            ; "fmt1_3/4" ; "MU"    ; "Central Region" ; "Región Central" ; "Région Centrale" ;            ; "User report"
+490        ; 7      ; FIXED_LINE           ; STANDARD_RATE ;            ; "fmt1_3/4" ; "MU"    ; "Central Region" ; "Región Central" ; "Région Centrale" ;            ; "User report"
 525        ; 8      ; MOBILE               ; STANDARD_RATE ; "cellplus" ; "fmt2_4/4" ; "MU"    ;                  ;                  ;                   ; GOVERNMENT
 526        ; 8      ; MOBILE               ; STANDARD_RATE ; "cellplus" ; "fmt2_4/4" ; "MU"    ;                  ;                  ;                   ; ITU
 527        ; 8      ; MOBILE               ; STANDARD_RATE ; "mtml"     ; "fmt2_4/4" ; "MU"    ;                  ;                  ;                   ; ITU

resources/metadata/252/ranges.csv

@@ -31,6 +31,7 @@ Prefix    ; Length ; Type       ; Tariff        ; Operator          ; Format
 7[02]     ; 8      ; MOBILE     ; STANDARD_RATE ; "golis_telecom"   ; "mobile_1/7"   ; "SO"    ;             ; IR21
 71        ; 8      ; MOBILE     ; STANDARD_RATE ; "amtel"           ; "mobile_1/7"   ; "SO"
 7[3-8]    ; 8      ; MOBILE     ; STANDARD_RATE ;                   ; "mobile_1/7"   ; "SO"
+76        ; 9      ; MOBILE     ; STANDARD_RATE ; "somtel"          ; "mobile_2/5-7" ; "SO"    ;             ; IR21
 77        ; 9      ; MOBILE     ; STANDARD_RATE ;                   ; "mobile_2/5-7" ; "SO"
 79        ; 8      ; MOBILE     ; STANDARD_RATE ; "somtel"          ; "mobile_1/7"   ; "SO"    ;             ;            ; "Added per client's request."
 79        ; 9      ; MOBILE     ; STANDARD_RATE ; "somtel"          ; "mobile_3/3/3" ; "SO"

resources/metadata/268/operators.csv

@@ -1,4 +1,4 @@
-Id           ; Name:en
-sptc         ; "SPTC"
-swazi_mobile ; "Swazi Mobile Ltd"
-swazi_mtn    ; "Swazi MTN"
+Id              ; Name:en
+eswatini_mobile ; "Eswatini Mobile"
+sptc            ; "SPTC"
+swazi_mtn       ; "Swazi MTN"

resources/metadata/268/ranges.csv

@@ -1,54 +1,54 @@
-Prefix          ; Length ; Type       ; Tariff        ; National Only ; Operator       ; Format     ; Regions ; Geocode:en                        ; Provenance
-0800            ; 8      ; FIXED_LINE ; TOLL_FREE     ; true          ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-22[0-3][0-689]  ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-2207            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Nhlangano, Shiselweni district"  ; ITU
-2217            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Hlathikulu, Shiselweni district" ; ITU
-2227            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Hluthi, Shiselweni district"     ; ITU
-2237            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Mahamba, Shiselweni district"    ; ITU
-22[4-9]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-23[037][0-24-9] ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-2303            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Nsoko, Lubombo district"         ; ITU
-23[128][014-9]  ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-231[23]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Mhlume, Lubombo district"        ; ITU
-232[23]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Tshaneni, Lubombo district"      ; ITU
-2333            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Mpaka, Lubombo district"         ; ITU
-23[46][0-25-9]  ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-2343            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Siteki, Lubombo district"        ; ITU
-2344            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Siphofaneni, Lubombo district"   ; ITU
-23[59]          ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-236[34]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Big Bend, Lubombo district"      ; ITU
-2373            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Maphiveni, Lubombo district"     ; ITU
-238[23]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Simunye, Lubombo district"       ; ITU
-240[0-37-9]     ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-240[4-6]        ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Mbabane, Hhohho district"        ; ITU
-241[0-57-9]     ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-2416            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Lobamba, Hhohho district"        ; ITU
-24[2478][013-9] ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-2422            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Sidwashini, Hhohho district"     ; ITU
-24[36][0-689]   ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-2437            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Pigg's Peak, Hhohho district"    ; ITU
-2442            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Ngwenya, Hhohho district"        ; ITU
-245[014-9]      ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-245[23]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Bhunya, Hhohho district"         ; ITU
-2467            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Mhlambanyatsi, Hhohho district"  ; ITU
-2472            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Mahwalala, Hhohho district"      ; ITU
-2482            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Siphocosini, Hhohho district"    ; ITU
-249             ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-250[0-47-9]     ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-250[56]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Manzini"                         ; ITU
-251[0-69]       ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-251[78]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Matsapha, Manzini district"      ; ITU
-25[2-4][0-79]   ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-2528            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Malkerns, Manzini district"      ; ITU
-2538            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Mankayane, Manzini district"     ; ITU
-2548            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Ludzeludze, Manzini district"    ; ITU
-25[5-9]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-32              ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Shiselweni"                      ; ITU
-33              ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Lubombo"                         ; ITU
-34              ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Hhohho"                          ; ITU
-35              ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ; "Manzini"                         ; ITU
-70              ; 8      ; VOIP       ; STANDARD_RATE ; false         ;                ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-7[68]           ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "swazi_mtn"    ; "fmt1_4/4" ; "SZ"    ;                                   ; IR21
-77              ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "sptc"         ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
-79              ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "swazi_mobile" ; "fmt1_4/4" ; "SZ"    ;                                   ; IR21
-900             ; 9      ; FIXED_LINE ; PREMIUM_RATE  ; false         ;                ; "fmt2_5/4" ; "SZ"    ;                                   ; ITU
+Prefix          ; Length ; Type       ; Tariff        ; National Only ; Operator          ; Format     ; Regions ; Geocode:en                        ; Provenance
+0800            ; 8      ; FIXED_LINE ; TOLL_FREE     ; true          ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+22[0-3][0-689]  ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+2207            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Nhlangano, Shiselweni district"  ; ITU
+2217            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Hlathikulu, Shiselweni district" ; ITU
+2227            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Hluthi, Shiselweni district"     ; ITU
+2237            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Mahamba, Shiselweni district"    ; ITU
+22[4-9]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+23[037][0-24-9] ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+2303            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Nsoko, Lubombo district"         ; ITU
+23[128][014-9]  ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+231[23]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Mhlume, Lubombo district"        ; ITU
+232[23]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Tshaneni, Lubombo district"      ; ITU
+2333            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Mpaka, Lubombo district"         ; ITU
+23[46][0-25-9]  ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+2343            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Siteki, Lubombo district"        ; ITU
+2344            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Siphofaneni, Lubombo district"   ; ITU
+23[59]          ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+236[34]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Big Bend, Lubombo district"      ; ITU
+2373            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Maphiveni, Lubombo district"     ; ITU
+238[23]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Simunye, Lubombo district"       ; ITU
+240[0-37-9]     ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+240[4-6]        ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Mbabane, Hhohho district"        ; ITU
+241[0-57-9]     ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+2416            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Lobamba, Hhohho district"        ; ITU
+24[2478][013-9] ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+2422            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Sidwashini, Hhohho district"     ; ITU
+24[36][0-689]   ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+2437            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Pigg's Peak, Hhohho district"    ; ITU
+2442            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Ngwenya, Hhohho district"        ; ITU
+245[014-9]      ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+245[23]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Bhunya, Hhohho district"         ; ITU
+2467            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Mhlambanyatsi, Hhohho district"  ; ITU
+2472            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Mahwalala, Hhohho district"      ; ITU
+2482            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Siphocosini, Hhohho district"    ; ITU
+249             ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+250[0-47-9]     ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+250[56]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Manzini"                         ; ITU
+251[0-69]       ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+251[78]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Matsapha, Manzini district"      ; ITU
+25[2-4][0-79]   ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+2528            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Malkerns, Manzini district"      ; ITU
+2538            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Mankayane, Manzini district"     ; ITU
+2548            ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Ludzeludze, Manzini district"    ; ITU
+25[5-9]         ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+32              ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Shiselweni"                      ; ITU
+33              ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Lubombo"                         ; ITU
+34              ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Hhohho"                          ; ITU
+35              ; 8      ; FIXED_LINE ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ; "Manzini"                         ; ITU
+70              ; 8      ; VOIP       ; STANDARD_RATE ; false         ;                   ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+7[68]           ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "swazi_mtn"       ; "fmt1_4/4" ; "SZ"    ;                                   ; IR21
+77              ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "sptc"            ; "fmt1_4/4" ; "SZ"    ;                                   ; ITU
+79              ; 8      ; MOBILE     ; STANDARD_RATE ; false         ; "eswatini_mobile" ; "fmt1_4/4" ; "SZ"    ;                                   ; IR21
+900             ; 9      ; FIXED_LINE ; PREMIUM_RATE  ; false         ;                   ; "fmt2_5/4" ; "SZ"    ;                                   ; ITU

resources/metadata/33/ranges.csv

@@ -40,10 +40,10 @@ Prefix         ; Length ; Type       ; Tariff        ; Operator
 257[0-8]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 2579[0-24-9]   ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 25793          ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-258[013-5]     ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
+258[013-6]     ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 2582[0-6]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 2582[7-9]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-258[6-9]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+258[7-9]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 259[0-6]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 259[7-9]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 26[04-9]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -83,15 +83,15 @@ Prefix         ; Length ; Type       ; Tariff        ; Operator
 353[1-46]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 3535[07-9]     ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 3535[1-6]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-3537[016-9]    ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
+3537[0136-9]   ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 35372          ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; IR21
-3537[3-5]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+3537[45]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 353[89]        ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 356[0-479]     ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 3565[0-8]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 35659          ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-3566[0367]     ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
-3566[124589]   ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+3566[03679]    ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
+3566[12458]    ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 3568[0-367]    ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 3568[4589]     ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 36[0-689]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
@@ -118,8 +118,8 @@ Prefix         ; Length ; Type       ; Tariff        ; Operator
 41[046-9]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 41[1-3]        ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 415[0-8]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
-4159[0-469]    ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
-4159[578]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+4159[0-4679]   ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
+4159[58]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 420[01]        ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 4202[0-6]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 4202[7-9]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -136,8 +136,8 @@ Prefix         ; Length ; Type       ; Tariff        ; Operator
 4209[238]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 42[159]        ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 42[246-8]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
-423[0-4]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
-423[5-9]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+423[0-5]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
+423[6-9]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 43[02478]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 43[1359]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 436            ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "Fill up to support master"
@@ -151,8 +151,8 @@ Prefix         ; Length ; Type       ; Tariff        ; Operator
 4445[6-9]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 4448[0-7]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 4448[89]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
-449[0134]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
-449[25-9]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+449[0-4]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
+449[5-9]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 45[016-8]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 45[2-59]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 46[0-24]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -173,8 +173,8 @@ Prefix         ; Length ; Type       ; Tariff        ; Operator
 4878[04-689]   ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 4878[1-37]     ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 5[07]          ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
-51[0135]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-51[24679]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
+51[01]         ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+51[2-79]       ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 518[02][0-7]   ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 518[02][89]    ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 518[13-9]      ; 9      ; FIXED_LINE ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -463,8 +463,8 @@ Prefix         ; Length ; Type       ; Tariff        ; Operator
 8068[2-9]      ; 9      ; UAN        ; STANDARD_RATE ;                                ; "varcost_3/2/2/2" ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 807            ; 9      ; UAN        ; STANDARD_RATE ;                                ; "varcost_3/2/2/2" ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 808[0-79]      ; 9      ; UAN        ; STANDARD_RATE ;                                ; "varcost_3/2/2/2" ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-80880[015-9]   ; 9      ; UAN        ; STANDARD_RATE ;                                ; "varcost_3/2/2/2" ; "FR"    ; GOVERNMENT
-80880[2-4]     ; 9      ; UAN        ; STANDARD_RATE ;                                ; "varcost_3/2/2/2" ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+80880[014-9]   ; 9      ; UAN        ; STANDARD_RATE ;                                ; "varcost_3/2/2/2" ; "FR"    ; GOVERNMENT
+80880[23]      ; 9      ; UAN        ; STANDARD_RATE ;                                ; "varcost_3/2/2/2" ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 808810         ; 9      ; UAN        ; STANDARD_RATE ;                                ; "varcost_3/2/2/2" ; "FR"    ; GOVERNMENT
 80881[1-9]     ; 9      ; UAN        ; STANDARD_RATE ;                                ; "varcost_3/2/2/2" ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 8088[2-9]      ; 9      ; UAN        ; STANDARD_RATE ;                                ; "varcost_3/2/2/2" ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -765,8 +765,8 @@ Prefix         ; Length ; Type       ; Tariff        ; Operator
 973[0-79]      ; 9      ; VOIP       ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 9738[0-7]      ; 9      ; VOIP       ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 9738[89]       ; 9      ; VOIP       ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-9740[07]       ; 9      ; VOIP       ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
-9740[1-689]    ; 9      ; VOIP       ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+9740[037]      ; 9      ; VOIP       ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
+9740[124-689]  ; 9      ; VOIP       ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 97410          ; 9      ; VOIP       ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 9741[1-9]      ; 9      ; VOIP       ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT
 974[2-8]       ; 9      ; VOIP       ; STANDARD_RATE ;                                ; "fmt_1/2/2/2/2"   ; "FR"    ; GOVERNMENT

resources/metadata/351/ranges.csv

@@ -104,11 +104,11 @@ Prefix        ; Length ; Type            ; Tariff        ; Operator     ; Format
 92[5-7]       ; 9      ; MOBILE          ; STANDARD_RATE ; "meo"        ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"    ;                       ;                       ; IR21       ; "IR21 dated 4/2/2019"
 928[01]       ; 9      ; MOBILE          ; STANDARD_RATE ; "nowo"       ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"    ;                       ;                       ; GOVERNMENT ; "Mobile Section updated 4/15/2019"
 9282          ; 9      ; MOBILE          ; STANDARD_RATE ; "digi"       ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"    ;                       ;                       ; IR21
-928[346-9]    ; 9      ; MOBILE          ; STANDARD_RATE ;              ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"
+928[34]       ; 9      ; MOBILE          ; STANDARD_RATE ; "digi"       ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"    ;                       ;                       ; GOVERNMENT
 9285          ; 9      ; MOBILE          ; STANDARD_RATE ; "onitelecom" ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"    ;                       ;                       ; GOVERNMENT ; "Mobile Section updated 4/15/2019"
+92[89][6-9]   ; 9      ; MOBILE          ; STANDARD_RATE ;              ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"
 929[0-4]      ; 9      ; MOBILE          ; STANDARD_RATE ; "nos"        ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"    ;                       ;                       ; IR21       ; "IR21 dated 2/27/2019"
 9295          ; 9      ; MOBILE          ; STANDARD_RATE ; "suma-movil" ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"    ;                       ;                       ; GOVERNMENT
-929[6-9]      ; 9      ; MOBILE          ; STANDARD_RATE ;              ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"
 93            ; 9      ; MOBILE          ; STANDARD_RATE ; "nos"        ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"    ;                       ;                       ; IR21       ; "IR21 dated 2/27/2019"
 9480          ; 9      ; MOBILE          ; STANDARD_RATE ;              ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"
 96            ; 9      ; MOBILE          ; STANDARD_RATE ; "meo"        ; "all_3/3/3"          ; "Atlantic/Azores&Europe/Lisbon" ; "PT"    ;                       ;                       ; IR21       ; "IR21 dated 4/2/2019"

resources/metadata/353/ranges.csv

@@ -55,8 +55,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 1255[0-36-9]    ; 8,9    ; FIXED_LINE      ; STANDARD_RATE ; 1                ; false         ;                     ; "fixed_1/3-4/4"     ;                                                    ; "IE"    ; "Dublin"                                          ; GOVERNMENT
 1255[45]        ; 8,9    ; FIXED_LINE      ; STANDARD_RATE ; 1                ; false         ;                     ; "fixed_1/3-4/4"     ;                                                    ; "IE"    ; "Dublin"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 126[0-2]        ; 8,9    ; FIXED_LINE      ; STANDARD_RATE ; 1                ; false         ;                     ; "fixed_1/3-4/4"     ;                                                    ; "IE"    ; "Dublin"                                          ; GOVERNMENT
-1263[05-9]      ; 8,9    ; FIXED_LINE      ; STANDARD_RATE ; 1                ; false         ;                     ; "fixed_1/3-4/4"     ;                                                    ; "IE"    ; "Dublin"                                          ; GOVERNMENT
-1263[1-4]       ; 8,9    ; FIXED_LINE      ; STANDARD_RATE ; 1                ; false         ;                     ; "fixed_1/3-4/4"     ;                                                    ; "IE"    ; "Dublin"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+1263[0-25-9]    ; 8,9    ; FIXED_LINE      ; STANDARD_RATE ; 1                ; false         ;                     ; "fixed_1/3-4/4"     ;                                                    ; "IE"    ; "Dublin"                                          ; GOVERNMENT
+1263[34]        ; 8,9    ; FIXED_LINE      ; STANDARD_RATE ; 1                ; false         ;                     ; "fixed_1/3-4/4"     ;                                                    ; "IE"    ; "Dublin"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 1264            ; 8,9    ; FIXED_LINE      ; STANDARD_RATE ; 1                ; false         ;                     ; "fixed_1/3-4/4"     ;                                                    ; "IE"    ; "Dublin"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 1265[045]       ; 8,9    ; FIXED_LINE      ; STANDARD_RATE ; 1                ; false         ;                     ; "fixed_1/3-4/4"     ;                                                    ; "IE"    ; "Dublin"                                          ; GOVERNMENT
 1265[1-36-9]    ; 8,9    ; FIXED_LINE      ; STANDARD_RATE ; 1                ; false         ;                     ; "fixed_1/3-4/4"     ;                                                    ; "IE"    ; "Dublin"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -354,10 +354,10 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 2580[0-8]       ; 7      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/5"         ;                                                    ; "IE"    ; "Fermoy"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 25809           ; 7      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/5"         ;                                                    ; "IE"    ; "Fermoy"                                          ; GOVERNMENT
 258[1-9]        ; 7      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/5"         ;                                                    ; "IE"    ; "Fermoy"                                          ; GOVERNMENT
-2590            ; 7      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/5"         ;                                                    ; "IE"    ; "Fermoy"                                          ; GOVERNMENT
+259[02]         ; 7      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/5"         ;                                                    ; "IE"    ; "Fermoy"                                          ; GOVERNMENT
 2591[0-468]     ; 7      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/5"         ;                                                    ; "IE"    ; "Fermoy"                                          ; GOVERNMENT
 2591[579]       ; 7      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/5"         ;                                                    ; "IE"    ; "Fermoy"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-259[2-9]        ; 7      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/5"         ;                                                    ; "IE"    ; "Fermoy"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+259[3-9]        ; 7      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/5"         ;                                                    ; "IE"    ; "Fermoy"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 26[017-9]       ; 7      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/5"         ;                                                    ; "IE"    ; "Macroom"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 26[24]          ; 7      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/5"         ;                                                    ; "IE"    ; "Macroom"                                         ; GOVERNMENT
 263[0-2]        ; 7      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/5"         ;                                                    ; "IE"    ; "Macroom"                                         ; GOVERNMENT
@@ -524,8 +524,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 42965[0139]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrickmacross"                                  ; GOVERNMENT
 42965[24-8]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrickmacross"                                  ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 42968[01]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrickmacross"                                  ; GOVERNMENT
-429682[03]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrickmacross"                                  ; GOVERNMENT
-429682[124-9]   ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrickmacross"                                  ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+429682[0389]    ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrickmacross"                                  ; GOVERNMENT
+429682[124-7]   ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrickmacross"                                  ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 42968[3-9]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrickmacross"                                  ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 42969[0-48]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrickmacross"                                  ; GOVERNMENT
 42969[5-79]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrickmacross"                                  ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -927,8 +927,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 526100[01]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Clonmel"                                         ; GOVERNMENT
 526100[2-9]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Clonmel"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 52610[1-9]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Clonmel"                                         ; GOVERNMENT
-52611[0136-9]   ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Clonmel"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-52611[245]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Clonmel"                                         ; GOVERNMENT
+52611[01389]    ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Clonmel"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+52611[24-7]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Clonmel"                                         ; GOVERNMENT
 5261[238]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Clonmel"                                         ; GOVERNMENT
 52614[017-9]    ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Clonmel"                                         ; GOVERNMENT
 52614[2-5]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Clonmel/Cahir/Killenaule"                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -975,8 +975,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 53900[0-46-9]   ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Wexford"                                         ; GOVERNMENT
 539005[0-479]   ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Wexford"                                         ; GOVERNMENT
 539005[568]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Wexford"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-53901[0-58]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Wexford"                                         ; GOVERNMENT
-53901[679]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Wexford"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+53901[0-589]    ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Wexford"                                         ; GOVERNMENT
+53901[67]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Wexford"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 5390[2-9]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Wexford"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 5391[02-46-9]   ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Wexford"                                         ; GOVERNMENT
 53911[0-24-9]   ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Wexford"                                         ; GOVERNMENT
@@ -1210,8 +1210,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 599115[2-8]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carlow"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 59912[0-24-9]   ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carlow"                                          ; GOVERNMENT
 599123          ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carlow"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-59919[04689]    ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carlow"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-59919[1-357]    ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carlow"                                          ; GOVERNMENT
+59919[0489]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carlow"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+59919[1-35-7]   ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carlow"                                          ; GOVERNMENT
 5997[02]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Muine Bheag"                                     ; GOVERNMENT
 59971[0-49]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Muine Bheag"                                     ; GOVERNMENT
 59971[5-8]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Muine Bheag"                                     ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -1814,8 +1814,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 81882[0-689]    ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 818827          ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ; GOVERNMENT
 8188[356]       ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-81884[0-46-9]   ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-818845          ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ; GOVERNMENT
+81884[0-4679]   ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+81884[58]       ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ; GOVERNMENT
 81887[0-79]     ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 818878          ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ; GOVERNMENT
 81888[03-7]     ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ;            ; "FILLUP TO SUPPORT MASTER RANGE"

resources/metadata/371/ranges.csv

@@ -1,12 +1,13 @@
 Prefix        ; Length ; Type       ; Tariff        ; Operator   ; Format       ; Regions ; Provenance ; Comment
 20[03-5]      ; 8      ; MOBILE     ; STANDARD_RATE ; "tele2"    ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 12/19/2018"
 201[0-79]     ; 8      ; MOBILE     ; STANDARD_RATE ; "bite"     ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 2/8/2019"
-2018          ; 8      ; MOBILE     ; STANDARD_RATE ;            ; "fmt1_2/3/3" ; "LV"    ; ITU        ; "Fillup to support master range"
+2018          ; 8      ; MOBILE     ; STANDARD_RATE ; "tele2"    ; "fmt1_2/3/3" ; "LV"    ; GOVERNMENT
 202           ; 8      ; MOBILE     ; STANDARD_RATE ; "lmt"      ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 2/6/2019"
 20[67]        ; 8      ; MOBILE     ; STANDARD_RATE ; "bite"     ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 2/8/2019"
 208[0-8]      ; 8      ; MOBILE     ; STANDARD_RATE ; "bite"     ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 2/8/2019"
-2089          ; 8      ; MOBILE     ; STANDARD_RATE ;            ; "fmt1_2/3/3" ; "LV"    ; ITU        ; "Fillup to support master range"
-209[0-35-9]   ; 8      ; MOBILE     ; STANDARD_RATE ;            ; "fmt1_2/3/3" ; "LV"    ; ITU        ; "Fillup to support master range"
+2089          ; 8      ; MOBILE     ; STANDARD_RATE ; "tele2"    ; "fmt1_2/3/3" ; "LV"    ; GOVERNMENT
+209[089]      ; 8      ; MOBILE     ; STANDARD_RATE ;            ; "fmt1_2/3/3" ; "LV"    ; ITU        ; "Fillup to support master range"
+209[1-35-7]   ; 8      ; MOBILE     ; STANDARD_RATE ; "tele2"    ; "fmt1_2/3/3" ; "LV"    ; GOVERNMENT
 2094          ; 8      ; MOBILE     ; STANDARD_RATE ; "triatel"  ; "fmt1_2/3/3" ; "LV"    ; GOVERNMENT ; "Regulator Allocated Numbering File (3/2019)"
 21            ; 8      ; MOBILE     ; STANDARD_RATE ; "bite"     ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 2/8/2019"
 220[0-4]      ; 8      ; MOBILE     ; STANDARD_RATE ; "lmt"      ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 2/6/2019"
@@ -34,11 +35,12 @@ Prefix        ; Length ; Type       ; Tariff        ; Operator   ; Format
 231[17]       ; 8      ; MOBILE     ; STANDARD_RATE ; "bite"     ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 2/8/2019"
 231[2-689]    ; 8      ; MOBILE     ; STANDARD_RATE ;            ; "fmt1_2/3/3" ; "LV"    ; ITU        ; "Fillup to support master range"
 232[027]      ; 8      ; MOBILE     ; STANDARD_RATE ; "bite"     ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 2/8/2019"
-23[23]3[0238] ; 8      ; MOBILE     ; STANDARD_RATE ; "tele2"    ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 12/19/2018"
-2323[14579]   ; 8      ; MOBILE     ; STANDARD_RATE ;            ; "fmt1_2/3/3" ; "LV"    ; ITU        ; "Fillup to support master range"
+2323          ; 8      ; MOBILE     ; STANDARD_RATE ; "tele2"    ; "fmt1_2/3/3" ; "LV"    ; GOVERNMENT
 232[4-69]     ; 8      ; MOBILE     ; STANDARD_RATE ;            ; "fmt1_2/3/3" ; "LV"    ; ITU        ; "Fillup to support master range"
 2328          ; 8      ; MOBILE     ; STANDARD_RATE ; "lmt"      ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 2/6/2019"
 233[124-689]  ; 8      ; MOBILE     ; STANDARD_RATE ;            ; "fmt1_2/3/3" ; "LV"    ; ITU        ; "Fillup to support master range"
+2333[0238]    ; 8      ; MOBILE     ; STANDARD_RATE ; "tele2"    ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 12/19/2018"
+2333[14-7]    ; 8      ; MOBILE     ; STANDARD_RATE ; "tele2"    ; "fmt1_2/3/3" ; "LV"    ; GOVERNMENT
 23400         ; 8      ; MOBILE     ; STANDARD_RATE ; "bite"     ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 2/8/2019"
 2340[13-9]    ; 8      ; MOBILE     ; STANDARD_RATE ;            ; "fmt1_2/3/3" ; "LV"    ; ITU        ; "Fillup to support master range"
 23402         ; 8      ; MOBILE     ; STANDARD_RATE ; "tele2"    ; "fmt1_2/3/3" ; "LV"    ; IR21       ; "IR dated 12/19/2018"

resources/metadata/389/ranges.csv

@@ -144,12 +144,11 @@ Prefix       ; Length ; Type       ; Tariff        ; Area Code Length ; Operator
 5            ; 8      ; FIXED_LINE ; PREMIUM_RATE  ;                  ;               ; "var_cost_3/1/2/2" ; "MK"    ;                                       ; GOVERNMENT
 7[0-2]       ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "t_mobile"    ; "fmt1_2/3/3"       ; "MK"    ;                                       ; ITU
 731          ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"
-73[238]      ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21
+73[2378]     ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21
 734[04]      ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21
 734[1-35-9]  ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"    ;                                       ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 73555        ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21
-73[67][01]   ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "t_mobile"    ; "fmt1_2/3/3"       ; "MK"    ;                                       ; GOVERNMENT
-737[578]     ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"    ;                                       ; GOVERNMENT
+736[01]      ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "t_mobile"    ; "fmt1_2/3/3"       ; "MK"    ;                                       ; GOVERNMENT
 742[02-9]    ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "t_mobile"    ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21
 7421         ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "mobik"       ; "fmt1_2/3/3"       ; "MK"    ;                                       ; ITU
 7460         ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "t_mobile"    ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21

resources/metadata/41/ranges.csv

@@ -179,8 +179,8 @@ Prefix            ; Length ; Type            ; Tariff        ; Operator
 244[01]           ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                  ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 2442[02-6]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                  ; GOVERNMENT
 2442[17-9]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                  ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-2443[03-68]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                  ; GOVERNMENT
-2443[1279]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                  ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+2443[02-68]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                  ; GOVERNMENT
+2443[179]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                  ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 2444[0-24-7]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                  ; GOVERNMENT
 2444[389]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                  ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 2445[0-26-8]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                 ; "Yverdon/Aigle"                  ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -216,8 +216,8 @@ Prefix            ; Length ; Type            ; Tariff        ; Operator
 2630[013-9]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Freiburg"                      ; "Fribourg"                      ; "Fribourg"                      ; "Friburgo"                       ; GOVERNMENT
 26302             ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Freiburg"                      ; "Fribourg"                      ; "Fribourg"                      ; "Friburgo"
 263[136-9]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Freiburg"                      ; "Fribourg"                      ; "Fribourg"                      ; "Friburgo"                       ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-2632[0-3]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Freiburg"                      ; "Fribourg"                      ; "Fribourg"                      ; "Friburgo"                       ; GOVERNMENT
-2632[4-9]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Freiburg"                      ; "Fribourg"                      ; "Fribourg"                      ; "Friburgo"                       ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+2632[0-4]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Freiburg"                      ; "Fribourg"                      ; "Fribourg"                      ; "Friburgo"                       ; GOVERNMENT
+2632[5-9]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Freiburg"                      ; "Fribourg"                      ; "Fribourg"                      ; "Friburgo"                       ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 2634[02-689]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Freiburg"                      ; "Fribourg"                      ; "Fribourg"                      ; "Friburgo"                       ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 2634[17]          ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Freiburg"                      ; "Fribourg"                      ; "Fribourg"                      ; "Friburgo"                       ; GOVERNMENT
 2635[0-259]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Freiburg"                      ; "Fribourg"                      ; "Fribourg"                      ; "Friburgo"                       ; GOVERNMENT
@@ -276,8 +276,8 @@ Prefix            ; Length ; Type            ; Tariff        ; Operator
 2720[12469]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Sitten"                        ; "Sion"                          ; "Sion"                          ; "Sion"                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 2720[3578]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Sitten"                        ; "Sion"                          ; "Sion"                          ; "Sion"                           ; GOVERNMENT
 272[1-79]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Sitten"                        ; "Sion"                          ; "Sion"                          ; "Sion"                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-2728[04-7]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Sitten"                        ; "Sion"                          ; "Sion"                          ; "Sion"                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-2728[1-389]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Sitten"                        ; "Sion"                          ; "Sion"                          ; "Sion"                           ; GOVERNMENT
+2728[0467]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Sitten"                        ; "Sion"                          ; "Sion"                          ; "Sion"                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+2728[1-3589]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Sitten"                        ; "Sion"                          ; "Sion"                          ; "Sion"                           ; GOVERNMENT
 2730[03-7]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Sitten"                        ; "Sion"                          ; "Sion"                          ; "Sion"                           ; GOVERNMENT
 2730[1289]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Sitten"                        ; "Sion"                          ; "Sion"                          ; "Sion"                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 273[135-8]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Sitten"                        ; "Sion"                          ; "Sion"                          ; "Sion"                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -538,8 +538,8 @@ Prefix            ; Length ; Type            ; Tariff        ; Operator
 3322[1-9]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Thun"                          ; "Thun"                          ; "Thoune"                        ; "Thun"                           ; GOVERNMENT
 3324[0-25-9]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Thun"                          ; "Thun"                          ; "Thoune"                        ; "Thun"                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 3324[34]          ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Thun"                          ; "Thun"                          ; "Thoune"                        ; "Thun"                           ; GOVERNMENT
-3325[03-9]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Thun"                          ; "Thun"                          ; "Thoune"                        ; "Thun"                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-3325[12]          ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Thun"                          ; "Thun"                          ; "Thoune"                        ; "Thun"                           ; GOVERNMENT
+3325[0-2]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Thun"                          ; "Thun"                          ; "Thoune"                        ; "Thun"                           ; GOVERNMENT
+3325[3-9]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Thun"                          ; "Thun"                          ; "Thoune"                        ; "Thun"                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 333[0-26-9]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Thun"                          ; "Thun"                          ; "Thoune"                        ; "Thun"                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 3333[013-69]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Thun"                          ; "Thun"                          ; "Thoune"                        ; "Thun"                           ; GOVERNMENT
 3333[278]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Thun"                          ; "Thun"                          ; "Thoune"                        ; "Thun"                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -647,8 +647,8 @@ Prefix            ; Length ; Type            ; Tariff        ; Operator
 3459              ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Burgdorf/Langnau i.E."         ; "Burgdorf/Langnau i.E."         ; "Burgdorf/Langnau i.E."         ; "Burgdorf/Langnau i.E."          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 41[01]            ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 4120              ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ; GOVERNMENT
-4121[0189]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ; GOVERNMENT
-4121[2-7]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+4121[01389]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ; GOVERNMENT
+4121[24-7]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 4122[02-9]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ; GOVERNMENT
 41221             ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 412[379]          ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -700,8 +700,8 @@ Prefix            ; Length ; Type            ; Tariff        ; Operator
 4155[2-9]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ; GOVERNMENT
 4156[0-267]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ; GOVERNMENT
 4156[3-589]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-4157[037]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ; GOVERNMENT
-4157[124-689]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+4157[0347]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ; GOVERNMENT
+4157[125689]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 4158[0-48]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ; GOVERNMENT
 4158[5-79]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 4159[0-36-8]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -759,8 +759,8 @@ Prefix            ; Length ; Type            ; Tariff        ; Operator
 4198[02489]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ; GOVERNMENT
 4198[135-7]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Luzern"                        ; "Lucerne"                       ; "Lucerne"                       ; "Lucerna"                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 43[0167]          ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Zürich"                        ; "Zurich"                        ; "Zurich"                        ; "Zurigo"                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-4320[0-36-9]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Zürich"                        ; "Zurich"                        ; "Zurich"                        ; "Zurigo"                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
-4320[45]          ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Zürich"                        ; "Zurich"                        ; "Zurich"                        ; "Zurigo"                         ; GOVERNMENT
+4320[0-37-9]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Zürich"                        ; "Zurich"                        ; "Zurich"                        ; "Zurigo"                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+4320[4-6]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Zürich"                        ; "Zurich"                        ; "Zurich"                        ; "Zurigo"                         ; GOVERNMENT
 4321[015-9]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Zürich"                        ; "Zurich"                        ; "Zurich"                        ; "Zurigo"                         ; GOVERNMENT
 4321[2-4]         ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Zürich"                        ; "Zurich"                        ; "Zurich"                        ; "Zurigo"                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 4322[013-8]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"    ; "Zürich"                        ; "Zurich"                        ; "Zurich"                        ; "Zurigo"                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -1650,7 +1650,8 @@ Prefix            ; Length ; Type            ; Tariff        ; Operator
 755[0-3]          ; 9      ; MOBILE          ; STANDARD_RATE ; "swisscom"              ; "fmt1_2/3/2/2"   ; "CH"    ;                                 ;                                 ;                                 ;                                  ; IR21
 755[4-689]        ; 9      ; MOBILE          ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"
 7557              ; 9      ; MOBILE          ; STANDARD_RATE ; "swisscom"              ; "fmt1_2/3/2/2"   ; "CH"
-75[6-9]           ; 9      ; MOBILE          ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"
+75[689]           ; 9      ; MOBILE          ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"
+757               ; 9      ; MOBILE          ; STANDARD_RATE ; "swisscom"              ; "fmt1_2/3/2/2"   ; "CH"    ;                                 ;                                 ;                                 ;                                  ; GOVERNMENT
 7600              ; 9      ; MOBILE          ; STANDARD_RATE ; "sunrise"               ; "fmt1_2/3/2/2"   ; "CH"    ;                                 ;                                 ;                                 ;                                  ; GOVERNMENT
 760[1-9]          ; 9      ; MOBILE          ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"
 761               ; 9      ; MOBILE          ; STANDARD_RATE ;                         ; "fmt1_2/3/2/2"   ; "CH"

resources/metadata/48/operators.csv

@@ -23,7 +23,6 @@ softelnet                 ; "Softelnet S.A. Sp. k."
 t_mobile                  ; "T-Mobile"
 telco_leaders             ; "TELCO LEADERS LTD"
 telenabler                ; "TELENABLER"
-telestrada                ; "TELESTRADA S.A."
 twilio                    ; "Twilio Ireland Limited"
 upc                       ; "UPC Polska"
 voxbone                   ; "VOXBONE SA"

resources/metadata/48/ranges.csv

@@ -19,7 +19,8 @@ Prefix       ; Length ; Type       ; Tariff        ; Operator
 2113[06-9]   ; 9      ; MOBILE     ; STANDARD_RATE ; "plus"                      ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; IR21
 2113[1-5]    ; 9      ; MOBILE     ; STANDARD_RATE ; "polska"                    ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; GOVERNMENT
 212          ; 9      ; MOBILE     ; STANDARD_RATE ; "orange"                    ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; GOVERNMENT
-213[4-9]     ; 9      ; MOBILE     ; STANDARD_RATE ; "plus"                      ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; IR21
+2131[89]     ; 9      ; MOBILE     ; STANDARD_RATE ; "plus"                      ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; IR21
+213[2-9]     ; 9      ; MOBILE     ; STANDARD_RATE ; "plus"                      ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; IR21
 22           ; 9      ; FIXED_LINE ; STANDARD_RATE ;                             ; "fixed_2/3/2/2"     ; "PL"    ; "Warsaw"               ; "Warszawa"
 2219         ; 7      ; FIXED_LINE ; STANDARD_RATE ;                             ; "fixed_2/2/3"       ; "PL"    ; "Warsaw"               ; "Warszawa"
 23           ; 9      ; FIXED_LINE ; STANDARD_RATE ;                             ; "fixed_2/3/2/2"     ; "PL"    ; "Ciechanów"            ; "Ciechanów"
@@ -58,11 +59,10 @@ Prefix       ; Length ; Type       ; Tariff        ; Operator
 4592[1-9]    ; 9      ; MOBILE     ; STANDARD_RATE ;                             ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; GOVERNMENT
 4594[02-49]  ; 9      ; MOBILE     ; STANDARD_RATE ;                             ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; GOVERNMENT
 4594[15-8]   ; 9      ; MOBILE     ; STANDARD_RATE ; "plus"                      ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; IR21
-4595[1-6]    ; 9      ; MOBILE     ; STANDARD_RATE ; "plus"                      ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; IR21
+4595[1-689]  ; 9      ; MOBILE     ; STANDARD_RATE ; "plus"                      ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; IR21
 45957        ; 9      ; MOBILE     ; STANDARD_RATE ; "bsg_estonia_ou"            ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; GOVERNMENT
-4595[89]     ; 9      ; MOBILE     ; STANDARD_RATE ; "telestrada"                ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; GOVERNMENT
-459[68]      ; 9      ; MOBILE     ; STANDARD_RATE ; "plus"                      ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; IR21
-459[79]      ; 9      ; MOBILE     ; STANDARD_RATE ;                             ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; GOVERNMENT
+459[689]     ; 9      ; MOBILE     ; STANDARD_RATE ; "plus"                      ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; IR21
+4597         ; 9      ; MOBILE     ; STANDARD_RATE ;                             ; "mobile_3/3/3"      ; "PL"    ;                        ;                        ; GOVERNMENT
 46           ; 9      ; FIXED_LINE ; STANDARD_RATE ;                             ; "fixed_2/3/2/2"     ; "PL"    ; "Skierniewice"         ; "Skierniewice"
 4619         ; 7      ; FIXED_LINE ; STANDARD_RATE ;                             ; "fixed_2/2/3"       ; "PL"    ; "Skierniewice"         ; "Skierniewice"
 47           ; 9      ; FIXED_LINE ; STANDARD_RATE ;                             ; "fixed_2/3/2/2"     ; "PL"

resources/metadata/51/operators.csv

@@ -1,7 +1,7 @@
 Id              ; International Dialling Codes ; Name:en
-__americatel    ; "197700"                     ; "Americatel"
 __idt           ; "191400"                     ; "IDT"
 __nextel        ; "199000"                     ; "Nextel"
+americatel      ; "197700"                     ; "Americatel"
 claro           ; "191200"                     ; "Claro"
 dolphin_telecom ;                              ; "Dolphin Telecom"
 entel           ;                              ; "Entel"

resources/metadata/51/ranges.csv

@@ -80,7 +80,7 @@ Prefix         ; Length ; Type            ; Tariff        ; Area Code Length ; O
 90[01]         ; 9      ; MOBILE          ; STANDARD_RATE ;                  ; "claro"           ; "mobile_3/3/3" ; "PE"    ;                 ; IR21
 90[236-8]      ; 9      ; MOBILE          ; STANDARD_RATE ;                  ; "entel"           ; "mobile_3/3/3" ; "PE"
 90[45]         ; 9      ; MOBILE          ; STANDARD_RATE ;                  ; "entel"           ; "mobile_3/3/3" ; "PE"    ;                 ; GOVERNMENT
-909            ; 9      ; MOBILE          ; STANDARD_RATE ;                  ;                   ; "mobile_3/3/3" ; "PE"    ;                 ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+909            ; 9      ; MOBILE          ; STANDARD_RATE ;                  ; "americatel"      ; "mobile_3/3/3" ; "PE"    ;                 ; GOVERNMENT
 91[03-8]       ; 9      ; MOBILE          ; STANDARD_RATE ;                  ; "claro"           ; "mobile_3/3/3" ; "PE"    ;                 ; IR21
 911            ; 9      ; MOBILE          ; STANDARD_RATE ;                  ;                   ; "mobile_3/3/3" ; "PE"    ;                 ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 912            ; 9      ; MOBILE          ; STANDARD_RATE ;                  ; "entel"           ; "mobile_3/3/3" ; "PE"    ;                 ; GOVERNMENT

resources/metadata/597/ranges.csv

@@ -1,4 +1,4 @@
-Prefix  ; Length ; Type       ; Tariff        ; Operator  ; Format       ; Regions
+Prefix  ; Length ; Type       ; Tariff        ; Operator  ; Format       ; Regions ; Provenance
 2[1-3]  ; 6      ; FIXED_LINE ; STANDARD_RATE ;           ; "fmt1_3/3"   ; "SR"
 3[0-7]  ; 6      ; FIXED_LINE ; STANDARD_RATE ;           ; "fmt1_3/3"   ; "SR"
 4       ; 6      ; FIXED_LINE ; STANDARD_RATE ;           ; "fmt1_3/3"   ; "SR"
@@ -7,7 +7,6 @@ Prefix  ; Length ; Type       ; Tariff        ; Operator  ; Format       ; Regio
 68      ; 7      ; FIXED_LINE ; STANDARD_RATE ;           ; "fmt3_3/4"   ; "SR"
 7[1246] ; 7      ; MOBILE     ; STANDARD_RATE ; "digicel" ; "fmt3_3/4"   ; "SR"
 75      ; 7      ; MOBILE     ; STANDARD_RATE ; "telesur" ; "fmt3_3/4"   ; "SR"
-77[0-4] ; 7      ; MOBILE     ; STANDARD_RATE ; "telesur" ; "fmt3_3/4"   ; "SR"
-77[5-9] ; 7      ; MOBILE     ; STANDARD_RATE ;           ; "fmt3_3/4"   ; "SR"
+77      ; 7      ; MOBILE     ; STANDARD_RATE ; "telesur" ; "fmt3_3/4"   ; "SR"    ; IR21
 8[12]   ; 7      ; MOBILE     ; STANDARD_RATE ; "digicel" ; "fmt3_3/4"   ; "SR"
 8[4-9]  ; 7      ; MOBILE     ; STANDARD_RATE ; "telesur" ; "fmt3_3/4"   ; "SR"

resources/metadata/64/ranges.csv

@@ -205,7 +205,8 @@ Prefix        ; Length ; Type            ; Tariff        ; Area Code Length ; Op
 32815         ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Fairlie"
 32816         ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Waimate"
 3281[7-9]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Christchurch"
-328[2-79]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "South Island"                                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+328[2-69]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "South Island"                                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+3287          ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "South Island"                                           ; GOVERNMENT
 3288[0-6]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Christchurch"
 3288[78]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Nelson"
 32889         ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Blenheim"
@@ -960,7 +961,8 @@ Prefix        ; Length ; Type            ; Tariff        ; Area Code Length ; Op
 428[01]       ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Wellington"
 4282[01]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Wellington"
 4282[2-9]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"
-428[3-9]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ;                                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+428[3-689]    ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ;                                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+4287          ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ;                                                          ; GOVERNMENT
 429[0236-9]   ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Paraparaumu"
 429[145]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Paraparaumu"                                            ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 43[0-24-6]    ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Wellington"                                             ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -1572,7 +1574,7 @@ Prefix        ; Length ; Type            ; Tariff        ; Area Code Length ; Op
 72625         ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Opotiki"
 7262[67]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Rotorua"
 7262[89]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Taupo"
-72[68][3-9]   ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ;                                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+726[3-9]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ;                                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 72800         ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Thames"
 72801         ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Huntly"
 72802         ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Paeroa"
@@ -1594,6 +1596,8 @@ Prefix        ; Length ; Type            ; Tariff        ; Area Code Length ; Op
 72823         ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Whakatane"
 7282[45]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"
 7282[7-9]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Tauranga"
+728[3-689]    ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ;                                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+7287          ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ;                                                          ; GOVERNMENT
 730[0-3]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Whakatane"                                              ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 730[4-9]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Whakatane"
 731[01346-9]  ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Whakatane/Opotiki"                                      ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@@ -1982,7 +1986,8 @@ Prefix        ; Length ; Type            ; Tariff        ; Area Code Length ; Op
 92837         ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Hibiscus Coast"
 92838         ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Pukekohe"
 92839         ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Whangarei"
-928[4-9]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Auckland"                                               ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+928[4-689]    ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Auckland"                                               ;            ; "FILLUP TO SUPPORT MASTER RANGE"
+9287          ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Auckland"                                               ; GOVERNMENT
 929[03]       ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Auckland"                                               ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 929[124-9]    ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Auckland"
 93[035-7]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 1                ;                          ; "fixed_1/3/4"    ; "Pacific/Auckland" ; "NZ"    ; "Auckland"

resources/metadata/680/ranges.csv

@@ -16,6 +16,7 @@ Prefix     ; Length ; Type       ; Tariff        ; Operator   ; Format     ; Reg
 733        ; 7      ; FIXED_LINE ; STANDARD_RATE ;            ; "fmt1_3/4" ; "PW"    ; "Ngaremlengui State"
 747        ; 7      ; FIXED_LINE ; STANDARD_RATE ;            ; "fmt1_3/4" ; "PW"    ; "Ngardmau State"
 77         ; 7      ; MOBILE     ; STANDARD_RATE ; "palaucel" ; "fmt1_3/4" ; "PW"
+780        ; 7      ; MOBILE     ; STANDARD_RATE ; "palaucel" ; "fmt1_3/4" ; "PW"    ;                                      ; ITU
 824        ; 7      ; FIXED_LINE ; STANDARD_RATE ;            ; "fmt1_3/4" ; "PW"    ; "Ngaraard State"
 83[0-5]    ; 7      ; MOBILE     ; STANDARD_RATE ; "pmci"     ; "fmt1_3/4" ; "PW"    ;                                      ; IR21
 855        ; 7      ; FIXED_LINE ; STANDARD_RATE ;            ; "fmt1_3/4" ; "PW"    ; "Ngarchelong State"

resources/metadata/687/ranges.csv

@@ -4,7 +4,6 @@ Prefix  ; Length ; Type       ; Tariff        ; Operator ; Format      ; Regions
 3[0-5]  ; 6      ; FIXED_LINE ; STANDARD_RATE ;          ; "fmt_2/2/2" ; "NC"    ; ITU
 36      ; 6      ; FIXED_LINE ; PREMIUM_RATE  ;          ; "fmt_2/2/2" ; "NC"    ; ITU
 4[1-7]  ; 6      ; FIXED_LINE ; STANDARD_RATE ;          ; "fmt_2/2/2" ; "NC"    ; ITU
-5[0-4]  ; 6      ; MOBILE     ; STANDARD_RATE ; "opt_nc" ; "fmt_2/2/2" ; "NC"    ; IR21
-[79]    ; 6      ; MOBILE     ; STANDARD_RATE ; "opt_nc" ; "fmt_2/2/2" ; "NC"    ; IR21
+[579]   ; 6      ; MOBILE     ; STANDARD_RATE ; "opt_nc" ; "fmt_2/2/2" ; "NC"    ; IR21
 8[0-79] ; 6      ; MOBILE     ; STANDARD_RATE ; "opt_nc" ; "fmt_2/2/2" ; "NC"    ; IR21
 88      ; 6      ; FIXED_LINE ; STANDARD_RATE ;          ; "fmt_2/2/2" ; "NC"    ; ITU