From f60bbcd0d068ba3837c18eeb88fddbc22cb392ed Mon Sep 17 00:00:00 2001
From: David Yonge-Mallo <davinci@google.com>
Date: Wed, 6 Jun 2012 09:15:01 +0000
Subject: [PATCH] JAVA: Metadata changes only (v4.8.4)

---
 .../CountryCodeToRegionCodeMap.java           |   8 +-
 .../data/PhoneNumberMetadataProto_881         | Bin 0 -> 297 bytes
 .../data/PhoneNumberMetadataProto_AE          | Bin 609 -> 611 bytes
 .../data/PhoneNumberMetadataProto_RO          | Bin 508 -> 647 bytes
 java/release_notes.txt                        |   5 ++
 resources/PhoneNumberMetaData.xml             |  80 ++++++++++++++++--
 6 files changed, 82 insertions(+), 11 deletions(-)
 create mode 100644 java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
index 5ad849eb9..0f4fe5c5e 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
@@ -31,10 +31,10 @@ public class CountryCodeToRegionCodeMap {
   // countries sharing a calling code, such as the NANPA countries, the one
   // indicated with "isMainCountryForCode" in the metadata should be first.
   static Map<Integer, List<String>> getCountryCodeToRegionCodeMap() {
-    // The capacity is set to 284 as there are 213 different country codes,
+    // The capacity is set to 285 as there are 214 different country codes,
     // and this offers a load factor of roughly 0.75.
     Map<Integer, List<String>> countryCodeToRegionCodeMap =
-        new HashMap<Integer, List<String>>(284);
+        new HashMap<Integer, List<String>>(285);
 
     ArrayList<String> listWithRegionCode;
 
@@ -819,6 +819,10 @@ public class CountryCodeToRegionCodeMap {
     listWithRegionCode.add("BD");
     countryCodeToRegionCodeMap.put(880, listWithRegionCode);
 
+    listWithRegionCode = new ArrayList<String>(1);
+    listWithRegionCode.add("001");
+    countryCodeToRegionCodeMap.put(881, listWithRegionCode);
+
     listWithRegionCode = new ArrayList<String>(1);
     listWithRegionCode.add("001");
     countryCodeToRegionCodeMap.put(883, listWithRegionCode);
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881
new file mode 100644
index 0000000000000000000000000000000000000000..3bda4511b29d44b6042091f94338df3d6abff633
GIT binary patch
literal 297
zcmZ4UmVvd3fq_wh0Z1@1GH^zlna9SYR9n<CGOz+^OCZf@W@uz=Vrph?0aU=`=LjWG
zgo)M%v;}Sk&Djjh1_p)<49tZ<-@yPQgOEl{iY5?O8`pv<(^^di4i!TM6(a=|W1uod
N1{P2#FoIZc008J6C&&N*

literal 0
HcmV?d00001

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE
index 4fde50dd9a03035501b5a89aff3552ae43f0148a..b75959f6edb331777e7b7753c734bc6039eb60b7 100644
GIT binary patch
delta 38
scmaFJ@|cBl&07Z6Dh39osEM2ztURXC21Xl8LmAn`H9*YC=NTsf0NalW_W%F@

delta 36
rcmaFN@{omd&07Z6Dh39oh>4sTEZnBi1{=#l8Ck_NfUL<E87Bb%$ZHCa

diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO
index e3924d3febefff83fec9ec2290e36f88e98c8c24..3e8489d1bf269d8b296513707cffd2c780c62bbf 100644
GIT binary patch
delta 253
zcmYk0Jr2S!42A8Mf)ElcY%B~N5~-CM2l_(?Mm8?cX6q?v10x6MF<{|f+<*b619Y$~
zKY!1DAO9ZQo^J>)0Nxb<5E0f?H|;*kZCB|mE(}k(MVN6<qrx%+C5hufaj}-!uHdGv
zWIj&KPpuoLla;d5m2#_r{$E0vlTxpfMx695mYanjB?VJED<KHgHYAq`JW~Awlk>77
jZTLxMx+*UWf}ey68G)5>q4}3{bCj`rN<*#@?HmAKa(6fm

delta 116
zcmZo?{ljd(<}Cwj6$1m~X9gg_$jHDGZDee&YZ)7pQf*Po$iNDuEo*@?4E#We*l0sz
wT{DoJIaF?Axiupr)8x&J){{k;R23nL42*yV)I?iY#xgQ68>kpE0?md30Ai&X7XSbN

diff --git a/java/release_notes.txt b/java/release_notes.txt
index a5833422c..a7ecc4e05 100644
--- a/java/release_notes.txt
+++ b/java/release_notes.txt
@@ -1,3 +1,8 @@
+June 5th, 2012: libphonenumber-4.8.4
+* Metadata update only:
+ - AE, RO
+ - Non-geographical entity with calling code 881 (Iridium)
+
 May 30th, 2012: libphonenumber-4.8.3
 * Metadata update only:
  - AN, ET, KW, MN, SX, TC, TL
diff --git a/resources/PhoneNumberMetaData.xml b/resources/PhoneNumberMetaData.xml
index 828ef52c6..cb88e53b1 100644
--- a/resources/PhoneNumberMetaData.xml
+++ b/resources/PhoneNumberMetaData.xml
@@ -195,7 +195,7 @@
           <leadingDigits>[2-4679][2-8]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(5[056])(\d{3})(\d{4})">
+        <numberFormat pattern="(5[0256])(\d{3})(\d{4})">
           <leadingDigits>5</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -226,7 +226,9 @@
         <exampleNumber>22345678</exampleNumber>
       </fixedLine>
       <mobile>
-        <nationalNumberPattern>5[056]\d{7}</nationalNumberPattern>
+        <!-- The prefix 52 has been added afte notification from the Emirates Telecommunications
+             Company. -->
+        <nationalNumberPattern>5[0256]\d{7}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>501234567</exampleNumber>
       </mobile>
@@ -19485,7 +19487,6 @@
 
     <!-- Romania -->
     <!-- http://www.itu.int/dms_pub/itu-t/oth/02/02/T02020000AC0001MSWE.doc -->
-    <!-- http://en.wikipedia.org/wiki/Romania_telephone_area_codes -->
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Romania -->
     <!-- Extension prefix found online, confirmed by a Romanian. -->
     <territory id="RO" countryCode="40" internationalPrefix="00"
@@ -19499,27 +19500,56 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(21)(\d{4})">
+          <leadingDigits>21</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
           <leadingDigits>
-            [23][02-9]|
+            [23][3-7]|
             [89]
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(2\d{2})(\d{3})">
+          <leadingDigits>2[3-6]</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[237-9]\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>
+          2\d{5,8}|
+          [37-9]\d{8}
+        </nationalNumberPattern>
         <!-- Although the ITU plan says the number plan is open, this was changed in 2008 according
-             to wikipedia and people must dial the full number. For this reason the possible number
-             pattern is restricted to 9 digits. -->
-        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+             to wikipedia and people must dial the full number. However, there are still short
+             numbers that total 6 digits long, so the possible number pattern should take these into
+             account. -->
+        <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>[23][13-6]\d{7}</nationalNumberPattern>
+        <!-- We exclude three-digit short numbers for Bucharest (219\d{2}) and four-digit short
+             numbers outside Bucharest (2[36]\d9\d{3}) even though ITU suggests these exist. We do
+             this based on numbers found online and the wikipedia article which indicate that these
+             are four digits long in Bucharest only, and three digits elsewhere. -->
+        <nationalNumberPattern>
+          2(?:
+            1(?:
+              \d{7}|
+              9\d{3}
+            )|
+            [3-6](?:
+              \d{7}|
+              \d9\d{2}
+            )
+          )|
+          3[13-6]\d{7}
+          </nationalNumberPattern>
         <exampleNumber>211234567</exampleNumber>
       </fixedLine>
       <mobile>
         <nationalNumberPattern>7[1-8]\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>712345678</exampleNumber>
       </mobile>
       <tollFree>
@@ -19529,14 +19559,17 @@
       </tollFree>
       <premiumRate>
         <nationalNumberPattern>90[036]\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>900123456</exampleNumber>
       </premiumRate>
       <sharedCost>
         <nationalNumberPattern>801\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>801123456</exampleNumber>
       </sharedCost>
       <personalNumber>
         <nationalNumberPattern>802\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>802123456</exampleNumber>
       </personalNumber>
       <uan>
@@ -19544,6 +19577,7 @@
              location-independent national numbers. Only numbers beginning with 37 have been seen so
              these are the only ones supported for now. -->
         <nationalNumberPattern>37\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>372123456</exampleNumber>
       </uan>
       <emergency>
@@ -24734,6 +24768,34 @@
       </voip>
     </territory>
 
+    <!-- Iridium -->
+    <!-- www.iridium.com -->
+    <!-- http://www.itu.int/oth/T0202000069/en -->
+    <!-- Globalstar also reports using this prefix, but we cannot find any online numbers with the
+         Globalstar prefixes, so are not sure how exactly these work, and what length the numbers
+         are. For this reason, we only support Iridium numbers at the moment. -->
+    <territory id="001" countryCode="881">
+      <availableFormats>
+        <!-- Formatting chosen based on ITU document and Iridium website FAQ. -->
+        <numberFormat pattern="(\d)(\d{3})(\d{5})">
+          <leadingDigits>[67]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+      </availableFormats>
+      <generalDesc>
+        <nationalNumberPattern>[67]\d{8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>612345678</exampleNumber>
+      </generalDesc>
+      <fixedLine>
+        <nationalNumberPattern>NA</nationalNumberPattern>
+        <possibleNumberPattern>NA</possibleNumberPattern>
+      </fixedLine>
+      <mobile>
+        <nationalNumberPattern>[67]\d{8}</nationalNumberPattern>
+      </mobile>
+    </territory>
+
     <!-- http://www.itu.int/oth/T02020000F3/en -->
     <!-- http://www.republicwireless.com/world-wi-fi-number -->
     <territory id="001" countryCode="883">