From d563a0ac2de9a1de876b3746c25f770b4a8bc5a1 Mon Sep 17 00:00:00 2001
From: Lara Scheidegger <lararennie@google.com>
Date: Fri, 22 Oct 2010 23:15:24 +0000
Subject: [PATCH] Updating AE, GG, GB, IM, JE metadata

---
 java/release_notes.txt                        |   4 +++
 .../phonenumbers/src/PhoneNumberMetaData.xml  |  30 ++++++++++--------
 .../data/PhoneNumberMetadataProto_AE          | Bin 551 -> 539 bytes
 .../data/PhoneNumberMetadataProto_GB          | Bin 2628 -> 2644 bytes
 .../data/PhoneNumberMetadataProto_GG          | Bin 489 -> 523 bytes
 .../data/PhoneNumberMetadataProto_IM          | Bin 449 -> 465 bytes
 .../data/PhoneNumberMetadataProto_JE          | Bin 522 -> 538 bytes
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/java/release_notes.txt b/java/release_notes.txt
index a3c9d4239..c627b66b8 100644
--- a/java/release_notes.txt
+++ b/java/release_notes.txt
@@ -1,3 +1,7 @@
+October 22nd, 2010
+* Metadata changes:
+  - Updates to existing countries: AE, GB, GG, IM, JE
+
 October 15th, 2010
 * Code improvements:
   - Allowed parsing of numbers that start with "++" or a full-width "+" symbol
diff --git a/java/resources/com/google/i18n/phonenumbers/src/PhoneNumberMetaData.xml b/java/resources/com/google/i18n/phonenumbers/src/PhoneNumberMetaData.xml
index 97662e713..eeb170686 100644
--- a/java/resources/com/google/i18n/phonenumbers/src/PhoneNumberMetaData.xml
+++ b/java/resources/com/google/i18n/phonenumbers/src/PhoneNumberMetaData.xml
@@ -34,8 +34,8 @@
 <!DOCTYPE phoneNumberMetadata [
     <!ELEMENT phoneNumberMetadata (territories)>
     <!ELEMENT territories (territory+)>
-    <!ELEMENT territory (availableFormats?, generalDesc?, fixedLine?, mobile?, tollFree?,
-        premiumRate?, sharedCost?, personalNumber?, voip?, pager?)>
+    <!ELEMENT territory (availableFormats?, generalDesc?, fixedLine?, mobile?, pager?, tollFree?,
+        premiumRate?, sharedCost?, personalNumber?, voip?)>
     <!ELEMENT generalDesc (nationalNumberPattern, possibleNumberPattern)>
     <!ELEMENT fixedLine (nationalNumberPattern?, possibleNumberPattern?, exampleNumber?)>
     <!ELEMENT mobile (nationalNumberPattern?, possibleNumberPattern?, exampleNumber?)>
@@ -133,13 +133,15 @@
           <leadingDigits>5</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="([4679]00)(\d)(\d{5})">
+        <numberFormat pattern="([4679]00)(\d)(\d{5})"
+          nationalPrefixFormattingRule="$FG">
           <leadingDigits>[4679]0</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(800)(\d{2})(\d{0,7})">
+        <numberFormat pattern="(800)(\d{2,9})"
+          nationalPrefixFormattingRule="$FG">
           <leadingDigits>8</leadingDigits>
-          <format>$1 $2 $3</format>
+          <format>$1 $2</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
@@ -2800,7 +2802,7 @@
       <tollFree>
         <!-- 800 1111 with 7 digits, 800 with 9 or 10 digits, 808 with 10 digits, 500 with 9 digits. -->
         <nationalNumberPattern>80(?:0(?:1111|\d{6,7})|8\d{7})|500\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7}(?:\d{2,3})?</possibleNumberPattern>
         <exampleNumber>8001234567</exampleNumber>
       </tollFree>
       <premiumRate>
@@ -2815,7 +2817,7 @@
              number prefixes in the United Kingdom
              845 46 47 with 7 digits, 842-845, 870 with 10 digits -->
         <nationalNumberPattern>8(?:4(?:5464\d|[2-5]\d{7})|70\d{7})</nationalNumberPattern>
-        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7}(?:\d{3})?</possibleNumberPattern>
         <exampleNumber>8431234567</exampleNumber>
       </sharedCost>
       <personalNumber>
@@ -2944,7 +2946,7 @@
       </pager>
       <tollFree>
         <nationalNumberPattern>80(?:0(?:1111|\d{6,7})|8\d{7})|500\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7}(?:\d{2,3})?</possibleNumberPattern>
         <exampleNumber>8001234567</exampleNumber>
       </tollFree>
       <premiumRate>
@@ -2953,8 +2955,8 @@
         <exampleNumber>9012345678</exampleNumber>
       </premiumRate>
       <sharedCost>
-        <nationalNumberPattern>8(?:4[3-5]|70)\d{7}</nationalNumberPattern>
-        <possibleNumberPattern>\d{10}</possibleNumberPattern>
+        <nationalNumberPattern>8(?:4(?:5464\d|[2-5]\d{7})|70\d{7})</nationalNumberPattern>
+        <possibleNumberPattern>\d{7}(?:\d{3})?</possibleNumberPattern>
         <exampleNumber>8431234567</exampleNumber>
       </sharedCost>
       <personalNumber>
@@ -3716,7 +3718,7 @@
       <!-- Other numbers as per GB. -->
       <tollFree>
         <nationalNumberPattern>80(?:0(?:1111|\d{6,7})|8\d{7})|500\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7}(?:\d{2,3})?</possibleNumberPattern>
         <exampleNumber>8001234567</exampleNumber>
       </tollFree>
       <premiumRate>
@@ -3726,7 +3728,7 @@
       </premiumRate>
       <sharedCost>
         <nationalNumberPattern>8(?:4(?:5464\d|[2-5]\d{7})|70\d{7})</nationalNumberPattern>
-        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7}(?:\d{3})?</possibleNumberPattern>
         <exampleNumber>8431234567</exampleNumber>
       </sharedCost>
       <personalNumber>
@@ -4087,7 +4089,7 @@
       </pager>
       <tollFree>
         <nationalNumberPattern>80(?:0(?:1111|\d{6,7})|8\d{7})|500\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7}(?:\d{2,3})?</possibleNumberPattern>
         <exampleNumber>8001234567</exampleNumber>
       </tollFree>
       <premiumRate>
@@ -4097,7 +4099,7 @@
       </premiumRate>
       <sharedCost>
         <nationalNumberPattern>8(?:4(?:5464\d|[2-5]\d{7})|70\d{7})</nationalNumberPattern>
-        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7}(?:\d{3})?</possibleNumberPattern>
         <exampleNumber>8431234567</exampleNumber>
       </sharedCost>
       <!-- Specific to JE. -->
diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE
index 9ef7920b5a0748e27b50c4991d3568904475bdf6..597d55b4604009553da857cf31306c5dcbd71ff5 100644
GIT binary patch
delta 69
zcmZ3^GMj~S&07Z6Dh387p^cmm7>$@z3>g_182B_S3=A|iVp6J&bS!H%8CX>e6;zCX
R5{wLt7K{u~RX{!i0|4t93ZDP~

delta 81
zcmbQuvYdr;&07Z6Dh387xs99;810x1R16sz7#Kt~EDQ`ZHDXe#jcUP^fsT2tCIg3x
Zp@NE$f{HOv2_ple1tSAY15kj00RYR`4bcDq

diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB
index 6457a19d8af37f7d158580641c844e23ddb45ada..e3ab0795118f8c100968a0d03faae28214c4f1f9 100644
GIT binary patch
delta 79
zcmX>iaz$iAESr#EOiHzRt%ki7kT%jWuGO@koW@oxz>g#h65RZVO@>jlih+U2Q9;E>
VLB*JXfq{`h*bu03voMDt69A`w6bb+U

delta 56
zcmca2aztc9EE^|BOiH!6j-f&A<b1Yb1aI>vHW|jrTwL5-!iF05R#glPOop44ISiQq
D+VBpL

diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG
index 221e99ca0160e200e6baa455b45163f9d3fd8636..869208202030c423935b88289dbc1153fb4657d1 100644
GIT binary patch
delta 98
zcmaFK+|9zd<}Cwj6$1kk(?rh2LV__V)#kMt_EtdJNXNKV(|+PsUo&M3poj?&o0^!J
g#H7?j8|j+Hf>mnPm>WPCj12rpdO<oT%QKz=0C@i#x&QzG

delta 64
zcmeBXdCAPV<}Cwj6$1m~gNdArIXPlds?Bu_4QeOu^OY60(6F~Mi8j_Xjjb^^&;&`<
PGBU6MX`q71j*O=Ob#)Uc

diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM
index 1e9692e7432e4feed4751b2269ec04e1bbde807a..fb263ec643eeca7c16063dee9331cd454da88ace 100644
GIT binary patch
delta 60
zcmX@ee36-R&07Z6Dh39|6B9XS3kk-gRGZgo*joW<BOT*fP5X&!iv{?RL_uPcH5q3B
E081kiBme*a

delta 44
scmcb}e2|%Q&07Z6Dh39|9TPccb8^I_RGaG<8q`kQR*c|Gwq%?E06X3d;Q#;t

diff --git a/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE b/java/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE
index 7c24093bbe209434987f7ca1dab9e58e8b6c139d..ca1fb4ecb688f85862744ae65eb11082f2089c2a 100644
GIT binary patch
delta 60
zcmeBTnZ?4n<}Cwj6$1m4;6%=KLV__V)#kMt_EtdJNXNKV(|+QCVgY_6QIObV8^&`0
D7CaJh

delta 44
scmbQm(#68L<}Cwj6$1kk<3!GNoE$MJ)#f^e2DKAU79%*5eHhOH02g8nE&u=k