JAVA/JS/CPP: Metadata updates (v5.0.2)

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

5 files changed, 699 insertions, 64 deletions

diff --git a/PhoneNumberAlternateFormats.xml b/PhoneNumberAlternateFormats.xml
index a119bf1..c25db7c 100644
--- a/PhoneNumberAlternateFormats.xml
+++ b/PhoneNumberAlternateFormats.xml
@@ -35,7 +35,7 @@
            in English according to ISO 3166-1.
 
      For more information on what each element represents, see
-     phonemetadata.proto
+     resources/phonemetadata.proto
 -->
 
 <!DOCTYPE phoneNumberMetadata [
diff --git a/PhoneNumberMetaData.xml b/PhoneNumberMetaData.xml
index cd148bc..eef14c0 100644
--- a/PhoneNumberMetaData.xml
+++ b/PhoneNumberMetaData.xml
@@ -22,7 +22,7 @@
            official short names in English according to ISO 3166-1.
 
      For more information on what each element represents, see
-     java/com/google/i18n/phonenumbers/phonemetadata.proto
+     resources/phonemetadata.proto
 
      Note that if you want to add validation metadata, the generalDesc nationalNumberPattern and
      possibleNumberPattern must be provided. If this is missing, then the country will be
@@ -2466,9 +2466,9 @@
         <nationalNumberPattern>
           (?:
             6(?:
-              0[0-7]|
-              6[0-2]|
-              8[01]
+              0\d|
+              [18][01]|
+              6[0-4]
             )|
             7(?:
               [02-68]\d|
@@ -4326,11 +4326,13 @@
 
     <!-- China -->
     <!-- http://www.itu.int/dms_pub/itu-t/oth/02/02/T020200002B0001XLSE.xls -->
-    <territory id="CN" countryCode="86" internationalPrefix="00"
-               nationalPrefix="0">
+    <territory id="CN" countryCode="86" internationalPrefix="(1[1279]\d{3})?00"
+               preferredInternationalPrefix="00" nationalPrefix="0"
+               nationalPrefixForParsing="(1[1279]\d{3})|0">
       <availableFormats>
         <numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(80\d{2})(\d{4})"
-                      nationalPrefixOptionalWhenFormatting="true">
+                      nationalPrefixOptionalWhenFormatting="true"
+                      carrierCodeFormattingRule="$CC $FG">
           <leadingDigits>80[2678]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -4350,12 +4352,14 @@
           <intlFormat>NA</intlFormat>
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(21)(\d{4})(\d{4,6})"
-                      nationalPrefixOptionalWhenFormatting="true">
+                      nationalPrefixOptionalWhenFormatting="true"
+                      carrierCodeFormattingRule="$CC $FG">
           <leadingDigits>21</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="([12]\d)(\d{4})(\d{4})"
-                      nationalPrefixOptionalWhenFormatting="true">
+                      nationalPrefixOptionalWhenFormatting="true"
+                      carrierCodeFormattingRule="$CC $FG">
           <leadingDigits>
             10[1-9]|
             2[02-9]
@@ -4378,7 +4382,8 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(\d{3})(\d{4})(\d{4})"
-                      nationalPrefixOptionalWhenFormatting="true">
+                      nationalPrefixOptionalWhenFormatting="true"
+                      carrierCodeFormattingRule="$CC $FG">
           <leadingDigits>
             3(?:
               11|
@@ -4406,7 +4411,8 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$NP$FG" pattern="(\d{3})(\d{3})(\d{4})"
-                      nationalPrefixOptionalWhenFormatting="true">
+                      nationalPrefixOptionalWhenFormatting="true"
+                      carrierCodeFormattingRule="$CC $FG">
           <leadingDigits>
             3(?:
               1[02-9]|
@@ -4464,7 +4470,7 @@
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="(1[3-58]\d)(\d{4})(\d{4})">
+        <numberFormat pattern="(1[3-58]\d)(\d{4})(\d{4})" carrierCodeFormattingRule="$CC $FG">
           <leadingDigits>1[3-58]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -4849,8 +4855,8 @@
             400|
             5(?:
               15|
-              5[15]|
-            )
+              5[15]
+            )|
             693|
             7(?:
               00|
@@ -5659,7 +5665,7 @@
         <nationalNumberPattern>
           2(?:
             1[2-5]|
-            7[45]|
+            7[45]
           )\d{5}
         </nationalNumberPattern>
         <exampleNumber>21360003</exampleNumber>
@@ -7783,7 +7789,7 @@
             3(?:
               02|
               45
-            )
+            )|
             425
           )|
           3[13]3|
@@ -10005,9 +10011,8 @@
         <exampleNumber>21234567</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- The ITU document says 055 is reserved, but wikipedia claims it is already in use. We
-             are fairly sure wikipedia is accurate based on news coverage of the launch of these
-             numbers. -->
+        <!-- The ITU document has only some of these prefixes - wikipedia lists more. We are fairly
+             sure wikipedia is accurate based on news coverage of the launch of these numbers. -->
         <nationalNumberPattern>
           5(?:
             [02347-9]\d{2}|
@@ -10073,7 +10078,7 @@
             47\d|
             6(?:
               5\d|
-              88
+              8[08]
             )|
             7\d{2}|
             8(?:
@@ -11769,7 +11774,7 @@
                 7[1-379]|
                 8[0-68]|
                 9[02-39]
-              )|
+              )
             )|
             87(?:
               [02]0|
@@ -13022,7 +13027,7 @@
     <!-- Cambodia -->
     <!-- http://www.itu.int/oth/T0202000023/en -->
     <!-- http://en.wikipedia.org/wiki/+855 -->
-    <territory id="KH" countryCode="855" internationalPrefix="00[178]"
+    <territory id="KH" countryCode="855" internationalPrefix="00[14-9]"
                nationalPrefix="0">
       <availableFormats>
         <numberFormat pattern="(\d{2})(\d{3})(\d{3,4})" nationalPrefixFormattingRule="$NP$FG">
@@ -13060,21 +13065,21 @@
         <exampleNumber>23456789</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 86 from numbers found online, along with 88 (these numbers seem to be one digit
-             longer as well.) Adding 97 followed by 7 digits as such numbers have been found online.
-             Adding 14 as Mobitel have informed us they are using this prefix. -->
+        <!-- Adding 86 and 87 from numbers found online, along with 88 (the 88 numbers seem to be
+             one digit longer as well.) Adding 97 followed by 7 digits as such numbers have been
+             found online. Adding 14 as Mobitel have informed us they are using this prefix. Adding
+             60[1-9] based on information received from Beeline. -->
         <nationalNumberPattern>
           (?:
             (?:
               1\d|
-              6[6-9]|
-              7[06-9]
+              [67][06-9]
             )[1-9]|
             8(?:
               0[89]|
+              [134679]\d|
               5[2-689]|
-              8\d{2}|
-              [13469]\d|
+              8\d{2}
             )|
             9(?:
               [0-689][1-9]|
@@ -13781,8 +13786,11 @@
                internationalPrefix="810" nationalPrefix="8">
        <!-- Formatting rules obtained from Russia. -->
       <generalDesc>
+        <!-- We make this as specific as possible to overlap as little as possible with Russia, so
+             determining the country is faster. -->
         <nationalNumberPattern>
           (?:
+            33\d|
             7\d{2}|
             80[09]
           )\d{7}
@@ -13795,8 +13803,11 @@
         <exampleNumber>7511234567</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
-        <!-- VSAT numbers are also included here. -->
+        <!-- VSAT numbers are also included here. We also include the area code for Baikonur (336
+             22), which is within Kazakhstan but in fact rented and administered by Russia at the
+             moment. -->
         <nationalNumberPattern>
+          33622\d{5}|
           7(?:
             1(?:
               0(?:
@@ -13878,10 +13889,9 @@
                 59
               )|
               7(?:
-                [23]\d|
+                [237]\d|
                 40|
-                5[279]|
-                7\d
+                5[279]
               )|
               8(?:
                 [23]\d|
@@ -13893,8 +13903,7 @@
                 3[124578]|
                 59
               )
-            )|
-            3622
+            )
           )\d{5}
         </nationalNumberPattern>
         <exampleNumber>7123456789</exampleNumber>
@@ -13904,7 +13913,8 @@
           7(?:
             0[01257]|
             6[02-4]|
-            7[1578]
+            7[1578]|
+            85
           )\d{7}
         </nationalNumberPattern>
         <exampleNumber>7710009998</exampleNumber>
@@ -14973,7 +14983,7 @@
                 2[2-9]|
                 3[2-57]|
                 4[2-8]|
-                8[235-9]|
+                8[235-9]
               )\d|
               9(?:
                 0\d|
@@ -16206,7 +16216,7 @@
           (?:
             7(?:
               210|
-              [79]\d{2}|
+              [79]\d{2}
             )|
             9(?:
               2[13]\d|
@@ -16383,7 +16393,7 @@
           (?:
             3(?:
               0[01]|
-              3[0-59]|
+              3[0-59]
             )|
             6(?:
               [567][02468]|
@@ -16793,7 +16803,7 @@
         <nationalNumberPattern>
           1(?:
             [02-46-9][2-9]|
-            11\d
+            1[12]\d
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
@@ -17091,7 +17101,7 @@
         <nationalNumberPattern>
           (?:
             [79]\d|
-            8[0-79]|
+            8[0-79]
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>751234</exampleNumber>
@@ -17332,7 +17342,7 @@
               9(?:
                 8[5-9]|
                 6[1-5]
-              )|
+              )
             )|
             4(?:
               28[0-2]|
@@ -20227,10 +20237,11 @@
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <!-- Retaining previous prefix as 18 since it seems still to be used. -->
+        <!-- Retaining previous prefix as 18 since it seems still to be used. Adding 11 from numbers
+             found online. -->
         <nationalNumberPattern>
           1(?:
-            [25]\d|
+            [125]\d|
             8[3567]
           )\d{6}
         </nationalNumberPattern>
@@ -20824,6 +20835,22 @@
         <nationalNumberPattern>[2-689]\d{8}</nationalNumberPattern>
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
       </generalDesc>
+      <noInternationalDialling>
+        <nationalNumberPattern>
+          (?:
+            8(?:
+              00|
+              [5-9]\d
+            )|
+            9(?:
+              00|
+              [78]\d
+            )
+          )\d{6}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>800123456</exampleNumber>
+      </noInternationalDialling>
       <fixedLine>
         <nationalNumberPattern>[2-5]\d{8}</nationalNumberPattern>
         <exampleNumber>212345678</exampleNumber>
@@ -20866,6 +20893,11 @@
         </nationalNumberPattern>
         <exampleNumber>690123456</exampleNumber>
       </voip>
+      <uan>
+        <nationalNumberPattern>96\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>961234567</exampleNumber>
+      </uan>
       <emergency>
         <nationalNumberPattern>
           1(?:
@@ -21011,7 +21043,10 @@
       <fixedLine>
         <nationalNumberPattern>
           3(?:
-            010|
+            0(?:
+              1[01]|
+              80
+            )|
             3(?:
               8[1-9]|
               9[2-9]
@@ -21021,26 +21056,30 @@
         <exampleNumber>301012345</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- The patterns from the ITU document seem too restrictive, based on numbers found in
-             online searches and phones that SMSs have been successfully received from, so the
-             ranges, have been extended to include 76 5[4-7], 76 6[3-5] and 77 01, 1[239], 2[89],
-             3[49], 4[7-9], 7[4-7], 8[2-9] and 9\d. -->
         <nationalNumberPattern>
           7(?:
-            0[1256]0|
+            0(?:
+              [01279]0|
+              3[03]|
+              4[05]|
+              5[06]|
+              6[03-5]|
+              8[029]
+            )|
             6(?:
               1[23]|
               2[89]|
               3[3489]|
               4[6-9]|
-              5[1-9]|
+              5\d|
               6[3-9]|
               7[45]|
               8[3-8]
             )|
-            7(?:
+            7\d{2}|
+            8(?:
               01|
-              [1-9]\d
+              1[01]
             )
           )\d{5}
         </nationalNumberPattern>
@@ -21918,12 +21957,22 @@
     <territory id="TL" countryCode="670" internationalPrefix="00">
       <availableFormats>
         <numberFormat pattern="(\d{3})(\d{4})">
+          <leadingDigits>[2-489]</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <!-- Since numbers grew an extra digit, we have no indication of how people are formatting
+             them. If we see another pattern being used, we should change this later. -->
+        <numberFormat pattern="(\d{4})(\d{4})">
+          <leadingDigits>7</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[2-47-9]\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{7}</possibleNumberPattern>
+        <nationalNumberPattern>
+          [2-489]\d{6}|
+          7\d{6,7}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>
@@ -21933,30 +21982,47 @@
             4[1-4]
           )\d{5}
         </nationalNumberPattern>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>2112345</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- The prefix 79 is assigned to "pagers" in the numbering plan, but it seems from numbers
-             found online that it is in fact assigned to mobile users. -->
-        <nationalNumberPattern>7[2-49]\d{5}</nationalNumberPattern>
-        <exampleNumber>7212345</exampleNumber>
+        <nationalNumberPattern>7[78][1-9]\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>77212345</exampleNumber>
       </mobile>
       <tollFree>
         <nationalNumberPattern>80\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>8012345</exampleNumber>
       </tollFree>
       <premiumRate>
         <nationalNumberPattern>90\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>9012345</exampleNumber>
       </premiumRate>
+      <!-- We don't include paging or voicemail because the identified paging range was used by
+           mobile previously, and for voicemail, it is unclear if the 2012 change affected these
+           numbers, or if the range was indeed previously used for voicemail at all. -->
       <personalNumber>
+        <!-- We presume this wasn't affected by the numbering plan update. -->
         <nationalNumberPattern>70\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
         <exampleNumber>7012345</exampleNumber>
       </personalNumber>
+      <shortCode>
+        <nationalNumberPattern>
+          1(?:
+            0[02]|
+            2[0138]|
+            72|
+            9[07]
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <exampleNumber>102</exampleNumber>
+      </shortCode>
       <emergency>
-        <!-- http://www.fco.gov.uk/en/travel-and-living-abroad/travel-advice-by-country/asia-oceania/east-timor
-             Seems to be a number for the local UN Police. -->
-        <nationalNumberPattern>112</nationalNumberPattern>
+        <nationalNumberPattern>11[25]</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
         <exampleNumber>112</exampleNumber>
       </emergency>
@@ -23164,7 +23230,7 @@
               6\d{2}|
               7(?:
                 [23]\d|
-                7[69]|
+                7[69]
               )|
               9(?:
                 22|
diff --git a/geocoding/en/7.txt b/geocoding/en/7.txt
index 46ba073..312765e 100644
--- a/geocoding/en/7.txt
+++ b/geocoding/en/7.txt
@@ -14,6 +14,7 @@
 
 # Generated from:
 # http://www.itu.int/oth/T02020000AD/en [2009-05-25]
+# http://www.itu.int/oth/T020200006F/en [2012-07-27]
 
 7301|Republic of Buryatia
 7302|Chita
@@ -66,6 +67,255 @@
 7496|Moscow
 7498|Moscow
 7499|Moscow
+77102|Zhezkazgan
+771030|Atasu
+771031|Aksu-Ayuly
+771032|Karazhal
+771033|Agadyr
+771034|Zhezdy
+771035|Ulytau
+771036|Balkhash
+771037|Aktogai
+771038|Shashubai
+771039|Priozersk
+771040|Zhairem (GOK)
+771042|Zharyk
+771043|Zhairem
+771063|Satpaev
+77112|Uralsk
+771130|Peremetnoye
+771131|Darinskoye
+771132|Fyodorovka
+771133|Aksai
+771134|Zhympity
+771135|Zhanibek
+771136|Chapayev
+771137|Chingirlau
+771138|Zhalpaktal
+771139|Taskala
+771140|Saikhin
+771141|Zhangala
+771142|Taipak
+771143|Akzhaik
+771144|Kaztalovka
+771145|Karatobe
+77122|Atyrau
+7712302|Tengizshevroil
+7712303|Tengizs
+771231|Akkystau
+771233|Ganyushkino
+771234|Indernborski
+771235|Dossor
+771236|Makhambet
+771237|Kulsary
+771238|Miyaly
+771239|Makat
+77132|Aktobe/Kargalinskoye
+771331|Martuk
+771332|Uil
+771333|Kandyagash
+771334|Emba
+771335|Shalkar
+771336|Khromtau
+771337|Alga
+771339|Komsomolskoye
+771341|Khobda
+771342|Badamsha
+771343|Irgiz
+771345|Karauylkeldy
+771346|Shubarkuduk
+77142|Kostanai
+771430|Arkalyk
+771431|Rudny
+771433|Lisakovsk
+771434|Denisovka
+771435|Zhitikara
+771436|Taranovskoye
+771437|Kamysty
+771439|Torgai
+771440|Amangeldy
+771441|Karabalyk
+771442|Fyodorovka
+771443|Borovskoi
+771444|Uzunkol
+771445|Ubaganskoye
+771448|Oktyabrskoye
+771451|Sarykol
+771452|Karasu
+771453|Auliekol
+771454|Karamendy
+771455|Zatobolsk
+771456|Kachar
+77152|Petropavlovsk
+771531|Bulayevo
+771532|Smirnovo
+771533|Saumalkol
+771534|Sergeyevka
+771535|Novoishimski
+771536|Taiynsha
+771537|Timiryazevo
+771538|Beskol
+771541|Mamlutka
+771542|Kishkenekol
+771543|Yavlenka
+771544|Presnovka
+771546|Talshik
+77162|Kokshetau/Krasni Yar
+771630|Burabay
+771631|Shortandy
+771632|Zerenda
+771633|Ereimentau
+771635|Zhaksy
+771636|Shuchinsk
+771637|Korgalzhyn
+771638|Akkol
+771639|Stepnyak
+771640|Balkashino
+771641|Astrakhanka
+771642|Egendykol
+771643|Atbasar
+771644|Arshaly
+771645|Stepnogorsk
+771646|Makinsk
+771647|Esil
+771648|Derzhavinsk
+771651|Kabanbai Batyr
+77172|Astana
+77182|Pavlodar
+771831|Zhelezinka
+771832|Irtyshsk
+771833|Terenkol
+771834|Uspenka
+771836|Sharbakty
+771837|Aksu
+771838|Koktobe
+771839|Akku
+771840|Bayanaul
+771841|Aktogai
+771845|Pavlodar area
+77187|Ekibastuz
+77212|Karaganda
+77213|Aktau/Temirtau
+772131|Abai
+772137|Saran
+772138|Gabidena Mustafina
+772144|Kiyevka
+772146|Karkaralinsk
+772147|Egindybulak
+772148|Molodezhnoye
+772149|Osakarovka
+772153|Topar
+772154|Botakara
+772156|Shakhtinsk
+77222|Semey
+772230|Urdzhar
+772236|Beskaragai
+772237|Ayagoz
+772239|Makanchi
+772246|Barshatas
+772251|Kurchatov
+772252|Karaul
+772256|Kainar
+772257|Shulbinsk
+77232|Ust-Kamenogorsk
+772331|Glubokoye
+772332|Shemonaikha
+772333|Samarskoye
+772334|Tavricheskoye
+772335|Zyryanovsk
+772336|Ridder
+772337|Serebryansk
+772338|Bozanbai/Molodezhnyi
+772339|Kurchum
+772340|Zaisan
+772341|Ulken Naryn
+772342|Katon-Karagai
+772343|Terekty
+772344|Akzhar
+772345|Shar
+772346|Aksuat
+772347|Kalbatau
+772348|Kokpekty
+772351|Borodulikha
+772353|Novaya Shulba
+77242|Kyzylorda
+772431|Zhalagash
+772432|Shiyeli
+772433|Aralsk
+772435|Zhanakorgan
+772436|Terenozek
+772437|Zhosaly
+772438|Aiteke bi
+77252|Shymkent
+772530|Temirlanovka
+772531|Aksukent
+772532|Abai
+772533|Turkestan
+772534|Zhetysai
+772535|Shardara
+772536|Kentau
+772537|Saryagash
+772538|Turara Ryskulova
+772539|Kazygurt
+772540|Arys
+772541|Myrzakent
+772542|Asykata
+772544|Shaulder
+772546|Sholakkorgan
+772547|Lenger
+772548|Shayan
+77262|Taraz
+772631|Kulan
+772632|Merke
+772633|Asa
+772634|Zhanatas
+772635|Bauyrzhan Mamyshuly
+772636|Kordai
+772637|Sarykemer
+772638|Tole bi
+772639|Saudakent
+772641|Akkol
+772642|Moiynkum
+772643|Shu
+772644|Karatau
+77272|Almaty
+772725|Otegen Batyra
+77272956|Talgar
+77272983|Kaskelen
+77273|Almaty
+772752|Otegen Batyra
+772757|Akshi
+772770|Uzynagash
+772771|Kaskelen
+772772|Kapchagai
+772773|Bakanas
+772774|Talgar
+772775|Esik
+772776|Shelek
+772777|Kegen
+772778|Chundzha
+772779|Narynkol
+77282|Taldykorgan
+772831|Zharkent
+772832|Zhansugurov
+772833|Usharal
+772834|Ushtobe
+772835|Tekeli
+772836|Karabulak
+772837|Kabanbai
+772838|Balpyk bi
+772839|Sarkand
+772840|Saryozek
+772841|Kapal
+772842|Kogaly
+772843|Lepsy
+77292|Aktau
+772931|Shetpe
+772932|Beineu
+772934|Zhanaozen
+772935|Zhetybai
+772937|Kuryk
+772938|Fort Shevchenko
 7811|Pskov
 7812|St Petersburg
 7813|Leningrad region
diff --git a/geocoding/en/98.txt b/geocoding/en/98.txt
new file mode 100644
index 0000000..f61ec7b
--- /dev/null
+++ b/geocoding/en/98.txt
@@ -0,0 +1,211 @@
+# Copyright (C) 2012 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.
+
+# Generated from:
+# http://www.itu.int/oth/T0202000066/en [2012-07-24]
+
+98111|Babol
+98112|Babol suburbs
+98121|Amol
+98122|Amol suburbs
+98123|Ghaemshahr
+98124|Ghaemshahr suburbs
+98131|Rasht
+98132|Rasht suburbs
+98141|Lahijan
+98142|Lahijan suburbs
+98151|Sari
+98152|Sari suburbs
+98171|Gorgan
+98172|Gonbad Kavos
+98173|Gorgan suburbs
+98174|Gonbad Kavos suburbs
+98181|Bandar Anzali
+98182|Bandar Anzali suburbs
+98191|Chalus
+98192|Chalus suburbs
+98212|Tehran
+98213|Tehran
+98214|Tehran
+98215|Tehran
+98216|Tehran
+98217|Tehran
+98218|Tehran
+98219|Tehran
+98221|Tehran suburbs
+98228|Eslamshahr
+98229|Eslamshahr suburbs
+98231|Semnan
+98232|Semnan suburbs
+98241|Zanjan
+98242|Zanjan suburbs
+98251|Qom
+98252|Qom suburbs
+98255|Saveh
+98256|Saveh suburbs
+98261|Karaj
+98262|Karaj suburbs
+98273|Shahroud
+98274|Shahroud suburbs
+98281|Qazvin
+98282|Qazvin suburbs
+98291|Varamin
+98292|Varamin suburbs
+98311|Isfahan
+98312|Isfahan suburbs
+98321|Shahreza
+98322|Shahreza suburbs
+98323|Naein
+98324|Naein suburbs
+98331|Najafabad
+98332|Najafabad suburbs
+98334|Zarrinshahr
+98335|Zarrinshahr suburbs
+98341|Kerman
+98342|Kerman suburbs
+98344|Bam
+98345|Sirjan
+98346|Bam suburbs
+98347|Sirjan suburbs
+98348|Jiroft
+98349|Jiroft suburbs
+98351|Yazd
+98352|Yazd suburbs
+98353|Yazd suburbs
+98361|Kashan
+98362|Kashan suburbs
+98371|Khansar
+98372|Khansar suburbs
+98381|Shahrekord
+98382|Shahrekord suburbs
+98391|Rafsanjan
+98392|Rafsanjan suburbs
+98411|Tabriz
+98412|Tabriz suburbs
+98421|Maragheh
+98422|Maragheh suburbs
+98423|Miyaneh
+98424|Miyaneh suburbs
+98426|Ahar
+98427|Ahar suburbs
+98431|Sarab
+98432|Sarab suburbs
+98441|Orumieh
+98442|Mahabad
+98443|Orumieh suburbs
+98444|Mahabad suburbs
+98451|Ardabil
+98452|Ardabil suburbs
+98461|Khoy
+98462|Khoy suburbs
+98471|Shabestar
+98472|Shabestar suburbs
+98481|Myandoab
+98482|Myandoab suburbs
+98491|Marand
+98492|Marand suburbs
+98511|Mashhad
+98512|Mashhad suburbs
+98528|Torbat-e Jam
+98529|Torbat-e Jam suburbs
+98531|Torbat-e Heydarieh
+98532|Torbat-e Heydarieh suburbs
+98533|Gonabad
+98534|Ferdows
+98535|Ferdows suburbs
+98541|Zahedan
+98542|Zabol
+98543|Zahedan suburbs
+98544|Zabol suburbs
+98545|Chabahar
+98546|Chabahar suburbs
+98547|Iranshahr
+98548|Iranshahr suburbs
+98551|Neyshabur
+98552|Neyshabur suburbs
+98561|Birjand
+98562|Birjand suburbs
+98571|Sabzevar
+98572|Sabzevar suburbs
+98581|Quchan
+98582|Quchan suburbs
+98584|Bojnord
+98585|Bojnord suburbs
+98611|Ahwaz
+98612|Ahwaz suburbs
+98631|Abadan
+98632|Abadan suburbs
+98641|Dezful
+98642|Dezful suburbs
+98651|Sarbandar
+98652|Sarbandar suburbs
+98661|Khorramabad
+98662|Brojerd
+98663|Khoramabad suburbs
+98664|Aligodarz
+98665|Borujerd suburbs
+98666|Aligudarz suburbs
+98671|Behbahan
+98672|Behbahan suburbs
+98681|Masjed Soleiman
+98682|Masjed Soleiman suburbs
+98691|Ramhormoz
+98692|Ramhormoz suburbs
+98711|Shiraz
+98712|Shiraz suburbs
+98721|Kazeroon
+98722|Kazeroon suburbs
+98728|Marvdasht
+98729|Marvdasht suburbs
+98731|Fasa
+98732|Fasa suburbs
+98741|Yasooj
+98742|Dogonbadan
+98743|Yasooj suburbs
+98744|Dogonbadan suburbs
+98751|Abadeh
+98752|Abadeh suburbs
+98761|Bandar Abbas
+98762|Bandar Lengeh
+98763|Bandar Abbas suburbs
+98764|Bandar Lengeh suburbs
+98765|Minab
+98766|Minab suburbs
+98771|Bushehr
+98772|Bushehr suburbs
+98773|Bushehr suburbs
+98781|Lar
+98782|Lar suburbs
+98791|Jahrom
+98792|Jahrom suburbs
+98811|Hamedan
+98812|Hamedan suburbs
+98831|Kermanshah
+98832|Kermanshah suburbs
+98834|Sarpole Zahab
+98835|Sarpole Zahab suburbs
+98837|Kangavar
+98838|Kangavar suburbs
+98841|Ilam
+98842|Ilam suburbs
+98851|Malayer
+98852|Malayer suburbs
+98861|Arak
+98862|Arak suburbs
+98865|Khomein
+98866|Khomein suburbs
+98871|Sanandaj
+98872|Sanandaj suburbs
+98874|Saqqez
+98875|Saqqez suburbs
diff --git a/geocoding/ru/7.txt b/geocoding/ru/7.txt
new file mode 100644
index 0000000..8bd8c4f
--- /dev/null
+++ b/geocoding/ru/7.txt
@@ -0,0 +1,108 @@
+# Copyright (C) 2012 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.
+
+# Currently only data for Kazakhstan is present, even though Russia shares
+# the same country calling code.
+#
+# Generated from:
+# Data from http://ru.wikipedia.org/wiki/Телефонный_план_нумерации_Казахстана
+#
+# This data does not correspond exactly to the English data obtained from ITU.
+# Differences are due to extra data on wikipedia for VSAT numbers, missing
+# data, and places where the name of the district has been used in Russian as
+# opposed to the name of the largest city in that district in English. We also
+# have data at the province level, particularly helpful here since not all
+# city-codes are listed.
+
+7710|Карагандинская область
+77102|Жезказган
+7711|Западно-Казахстанская область
+77112|Уральск
+7712|Атырауская область
+77122|Атырау
+7713|Актюбинская область
+77132|Актюбинск
+7714|Костанайская область
+77142|Костанай
+7715|Северо-Казахстанская область
+77152|Петропавловск
+7716|Акмолинская область
+77162|Кокшетау
+77172|Астана
+7718|Павлодарская область
+77182|Павлодар
+7721|Карагандинская область
+77212|Караганда
+7722|Восточно-Казахстанская область
+77222|Семипалатинск
+7723|Восточно-Казахстанская область
+77232|Усть-Каменогорск
+7724|Кызылординская область
+77242|Кызылорда
+7725|Южно-Казахстанская область
+77252|Шымкент
+7726|Жамбылская область
+77262|Тараз
+7727|Алматинская область
+77272|Алма-Ата/Карасайский район/Илийский район
+77273|Алма-Ата
+77274010|Кольжат, Уйгурский район
+77274023|Жаланаш, Райымбекский район
+77274033|Ойкарагайский, Райымбекский район
+7727405|Улькен, Жамбылский район
+772752|Илийский район
+772757|Илийский район
+772770|Жамбылский район
+772771|Карасайский район
+772772|Капшагай
+772773|Балхашский район
+772774|Талгарский район
+772775|Енбекшиказахский район
+772776|Енбекшиказахский район
+772777|Райымбекский район
+772778|Уйгурский район
+772779|Райымбекский район
+7728|Алматинская область
+77282|Талдыкорган
+7728301|Достык, Алакольский район
+77283015|Егинсу, Аксуский район
+77283016|Кураксу, Аксуский район
+7728302|Акжар, Каратальский район
+77283027|Токжайлау, Алакольский район
+7728303|Копберлик, Каратальский район
+77283049|Алмалы, Каратальский район
+7728305|Камыскала, Алакольский район
+7728306|Акши, Алакольский район
+7728307|Каракум, Каратальский район
+772831|Панфиловский район
+772832|Аксуский район
+772833|Алакольский район
+772834|Каратальский район
+772835|Текели
+772836|Ескельдинский район
+772837|Алакольский район
+772838|Коксуский район
+772839|Саркандский район
+772840|Кербулакский район
+772841|Аксуский район
+772842|Кербулакский район
+772843|Саркандский район
+7729|Мангистауская область
+77292|Актау
+772931|Мангистауский район
+772932|Бейнеуский район
+772934|Жанаозен
+772935|Каракиянский район
+772937|Каракиянский район
+772938|Тупкараганский район