METADATA: Update PhoneNumberMetadata.xml.

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@320 ee073f10-1060-11df-b6a4-87a95322a99c

diff --git a/java/release_notes.txt b/java/release_notes.txt
index 8461424..f915803 100644 (file)
--- a/java/release_notes.txt
+++ b/java/release_notes.txt
@@ -15,8 +15,8 @@ August 11th, 2011: libphonenumber-3.8
  - Split geocoding US binary data into multiple files.
 
 * Metadata changes
- - Updates: AR, AT, AU, AZ, BE, BF, BH, CA, CN, CO, CR, HT, HU, IT, KG, KH, LB,
-   LI, ME, NC, RS, SE, TT, US, ZA
+ - Updates: AR, AT, AU, AZ, BE, BF, BH, BY, CA, CN, CO, CR, HT, HU, IT, KG, KH,
+   LB, LI, ME, NC, RS, SE, TT, US, VG, ZA
  - New geocoding data for: AL, AM, AO, BF, BJ, BW, CD, CI, CZ, DZ, EE, GH, GM,
    GN, GR, GW, HU, IS, KE, LK, LS, LT, LU, LV, MD, MG, MR, NA, PE, QN, SD, SK,
    SN, SZ, TN, VE, VN, ZA, ZW

diff --git a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java b/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
index b5d7ace..0bb1700 100644 (file)
--- a/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
+++ b/java/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
@@ -432,9 +432,8 @@ public class CountryCodeToRegionCodeMap {
     listWithRegionCode.add("MG");
     countryCodeToRegionCodeMap.put(261, listWithRegionCode);
 
-    listWithRegionCode = new ArrayList<String>(3);
+    listWithRegionCode = new ArrayList<String>(2);
     listWithRegionCode.add("RE");
-    listWithRegionCode.add("TF");
     listWithRegionCode.add("YT");
     countryCodeToRegionCodeMap.put(262, listWithRegionCode);
 

diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY
index 969f182..b07157e 100644 (file)
Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY differ

diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TF b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TF
deleted file mode 100644 (file)
index 8e7ef30..0000000
Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TF and /dev/null differ

diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG
index 17db04b..3c4a379 100644 (file)
Binary files a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG and b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG differ

diff --git a/resources/PhoneNumberMetaData.xml b/resources/PhoneNumberMetaData.xml
index fa32c56..a65f9ed 100644 (file)
--- a/resources/PhoneNumberMetaData.xml
+++ b/resources/PhoneNumberMetaData.xml
@@ -2834,18 +2834,38 @@
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$NP $FG"
           pattern="([89]\d{2})(\d{3})(\d{4})">
-          <leadingDigits>[89]</leadingDigits>
+          <leadingDigits>
+            8[01]|
+            9
+          </leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat nationalPrefixFormattingRule="$NP $FG"
+          pattern="(8\d{2})(\d{4})(\d{4})">
+          <leadingDigits>82</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           [12-4]\d{8}|
-          [89]\d{9}
+          [89]\d{9,10}
         </nationalNumberPattern>
         <!-- Numbers are often written without the city code. -->
-        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7,11}</possibleNumberPattern>
       </generalDesc>
+      <!-- Toll-free and premium rate numbers are not available from abroad. -->
+      <noInternationalDialling>
+        <nationalNumberPattern>
+          8(?:
+            [01]|
+            20
+          )\d{8}|
+          902\d{7}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{10,11}</possibleNumberPattern>
+        <exampleNumber>82012345678</exampleNumber>
+      </noInternationalDialling>
       <fixedLine>
         <nationalNumberPattern>
           (?:
@@ -2889,7 +2909,7 @@
         <nationalNumberPattern>
           (?:
             2(?:
-              5[679]|
+              5[5679]|
               9[1-9]
             )|
             33\d|
@@ -2902,12 +2922,23 @@
       </mobile>
       <tollFree>
         <!-- Putting Interactive Polling Service (free) here too. -->
-        <nationalNumberPattern>80[13]\d{7}</nationalNumberPattern>
-        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <nationalNumberPattern>
+          8(?:
+            0[13]|
+            20\d
+          )\d{7}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{10,11}</possibleNumberPattern>
         <exampleNumber>8011234567</exampleNumber>
       </tollFree>
       <premiumRate>
-        <nationalNumberPattern>902\d{7}</nationalNumberPattern>
+        <!-- Putting Interactive Polling Service (paid) here too. -->
+        <nationalNumberPattern>
+          (?:
+            810|
+            902
+          )\d{7}
+        </nationalNumberPattern>
         <possibleNumberPattern>\d{10}</possibleNumberPattern>
         <exampleNumber>9021234567</exampleNumber>
       </premiumRate>
@@ -13503,6 +13534,9 @@
         <possibleNumberPattern>\d{7}(?:\d{3})?</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- Extra exchange codes 232, 289, 355, 472, 633, 637, 646, 647, 649, 653, 687, 734 and 828
+             were seen in the white and yellow pages, but no numbers with these exchange codes have
+             proved to be diallable so we exclude them for now.. -->
         <nationalNumberPattern>
           670(?:
             2(?:
@@ -16193,6 +16227,11 @@
       </mobile>
     </territory>
 
+    <!-- Pitcairn Island -->
+    <!-- id="PN" -->
+    <!-- This island is not supported since evidence seems to be that the 50 inhabitants use
+         satellite phones. -->
+
     <!-- Puerto Rico -->
     <!-- http://www.itu.int/oth/T02020000AA/en -->
     <territory id="PR" countryCode="1" leadingDigits="787|939"
@@ -16613,8 +16652,8 @@
     </territory>
 
     <!-- Réunion (French Departments and Territories in the Indian Ocean) -->
-    <!-- Note this shares the same country code as La Mayotte and French Southern Territories, and
-         the formatting patterns here are used by all of them. -->
+    <!-- Note this shares the same country code as La Mayotte and the formatting patterns here are
+         used by both of them. -->
     <!-- http://www.itu.int/oth/T020200004B/en -->
     <territory id="RE" countryCode="262" internationalPrefix="00"
                nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG"
@@ -18367,9 +18406,9 @@
     </territory>
 
     <!-- French Southern Territories -->
-    <territory id="TF" countryCode="262" internationalPrefix="00"
-               nationalPrefix="0">
-    </territory>
+    <!-- id="TF" countryCode="262" internationalPrefix="00" nationalPrefix="0" -->
+    <!-- This country is not covered due to lack of information about its numbering plan. It has 140
+         temporary inhabitants. -->
 
     <!-- Togo -->
     <!-- http://www.itu.int/oth/T02020000D1/en -->
@@ -19840,14 +19879,17 @@
         <possibleNumberPattern>\d{7}(?:\d{3})?</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
+        <!-- No data on central office codes can be found on the nanpa.com website. The codes 422
+             and 774 have been added from numbers found in the white pages.  -->
         <nationalNumberPattern>
           284(?:
             (?:
               229|
               4(?:
-                46|
+                22|
                 9[45]
               )|
+              774|
               8(?:
                 52|
                 6[459]
@@ -19859,16 +19901,21 @@
         <exampleNumber>2842291234</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- No data on central office codes can be found on the nanpa.com website. The codes
+             34[0-367], 446 and 54[57] have been added from numbers found in the white pages.  -->
         <nationalNumberPattern>
           284(?:
             (?:
-              30[0-3]|
+              3(?:
+                0[0-3]|
+                4[0-367]
+              )|
               4(?:
-                4[0-5]|
+                4[0-6]|
                 68|
                 99
               )|
-              54[0-4]
+              54[0-57]
             )\d{4}|
             496[6-9]\d{3}
           )