JAVA: libphonenumber 3.7/offline-geocoder 1.1 release.

java/release_notes.txt

@@ -1,3 +1,19 @@
+June 29th, 2011
+* Code changes
+ - Fixed issue 38, issue 39, issue 41 and issue 43
+
+* Metadata changes
+ - Added phone number area mapping files for
+   - JP in Japanese
+   - FR in French
+   - TW in English, Simplified and Traditional Chinese
+   - RU in English
+   - IT in English and Italian
+   - PT in Portuguese
+   - TR in English and Turkish
+   - CH in English, German, French and Italian
+ - Updates: CR, GE, IT, JP, KW, MH, MP, MU, PE, PM, RW, TG, TJ, TK
+
 June 14th, 2011
 * Code changes
  - Added PhoneNumberOfflineGeocoder, supporting classes and their unittests.

java/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java

@@ -110,8 +110,12 @@ public class AsYouTypeFormatter {
     defaultMetaData = currentMetaData;
   }
 
+  // The metadata needed by this class is the same for all regions sharing the same country calling
+  // code. Therefore, we return the metadata for "main" region for this country calling code.
   private PhoneMetadata getMetadataForRegion(String regionCode) {
-    PhoneMetadata metadata = phoneUtil.getMetadataForRegion(regionCode);
+    int countryCallingCode = phoneUtil.getCountryCodeForRegion(regionCode);
+    String mainCountry = phoneUtil.getRegionCodeForCountryCode(countryCallingCode);
+    PhoneMetadata metadata = phoneUtil.getMetadataForRegion(mainCountry);
     if (metadata != null) {
       return metadata;
     }

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

@@ -909,6 +909,9 @@ public class PhoneNumberUtilTest extends TestCase {
   public void testIsNANPACountry() {
     assertTrue(phoneUtil.isNANPACountry(RegionCode.US));
     assertTrue(phoneUtil.isNANPACountry(RegionCode.BS));
+    assertFalse(phoneUtil.isNANPACountry(RegionCode.DE));
+    assertFalse(phoneUtil.isNANPACountry(RegionCode.ZZ));
+    assertFalse(phoneUtil.isNANPACountry(null));
   }
 
   public void testIsPossibleNumber() {

java/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java

@@ -29,8 +29,6 @@ import java.util.Locale;
 public class PhoneNumberOfflineGeocoderTest extends TestCase {
   private final PhoneNumberOfflineGeocoder geocoder =
       new PhoneNumberOfflineGeocoder(TEST_MAPPING_DATA_DIRECTORY);
-  static final String TEST_META_DATA_FILE_PREFIX =
-      "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting";
   private static final String TEST_MAPPING_DATA_DIRECTORY =
       "/com/google/i18n/phonenumbers/geocoding/testing_data/";
 

resources/PhoneNumberMetaData.xml

@@ -3837,7 +3837,7 @@
         <exampleNumber>9001234567</exampleNumber>
       </premiumRate>
       <voip>
-        <nationalNumberPattern>4000\d{4}</nationalNumberPattern>
+        <nationalNumberPattern>40[02]0\d{4}</nationalNumberPattern>
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>40001234</exampleNumber>
       </voip>
@@ -3845,9 +3845,9 @@
         <!-- This pattern excludes 4-digit SMS content numbers for now. -->
         <nationalNumberPattern>
           1(?:
-            02[2-469]|
+            02[2-4679]|
             1(?:
-              1[0235-9]|
+              1[0-35-9]|
               2|
               37|
               46|
@@ -3855,7 +3855,11 @@
               8[79]|
               9[0-379]
             )|
-            212)
+            212|
+            400|
+            902
+          )|
+          911
         </nationalNumberPattern>
         <possibleNumberPattern>\d{3,4}</possibleNumberPattern>
         <exampleNumber>1022</exampleNumber>
@@ -6352,26 +6356,22 @@
     <!-- Georgia -->
     <!-- http://www.itu.int/oth/T0202000050/en
          http://en.wikipedia.org/wiki/Telephone_numbers_in_Georgia. -->
-    <territory id="GE" countryCode="995" internationalPrefix="8~10"
-               nationalPrefix="8" nationalPrefixFormattingRule="$NP $FG">
+    <territory id="GE" countryCode="995" internationalPrefix="8~10" nationalPrefix="8">
       <availableFormats>
         <!-- Format isn't very strictly defined - the yellow pages omits area code and does 2 2 2,
              the communications commission uses 2 3 3. Wikipedia says 3 2 3. Some use 2 6. -->
-        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
-          <leadingDigits>[13-79]</leadingDigits>
+        <numberFormat pattern="(\d{3})(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP $FG">
+          <leadingDigits>[348]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
-        <numberFormat pattern="(800)(\d{2})(\d{2})(\d{2})">
-          <leadingDigits>8</leadingDigits>
+        <numberFormat pattern="(\d{3})(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="$FG">
+          <leadingDigits>5</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>
-          [13-79]\d{7}|
-          8\d{8}
-        </nationalNumberPattern>
-        <possibleNumberPattern>\d{5,9}</possibleNumberPattern>
+        <nationalNumberPattern>[3458]\d{8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>
@@ -6389,23 +6389,25 @@
               7[239]|
               9[1-7]
             )
-          )\d{5}
+          )\d{6}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{5,8}</possibleNumberPattern>
-        <exampleNumber>32123456</exampleNumber>
+        <possibleNumberPattern>\d{6,9}</possibleNumberPattern>
+        <exampleNumber>322123456</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- The ITU document says 790 instead of 590, but this contradicts their press release
+             about the change in numbers, and online numbers found. -->
         <nationalNumberPattern>
-          (?:
+          5(?:
             14|
             5[01578]|
-            6[28]|
+            68|
             7[0147-9]|
             9[0-35-9]
           )\d{6}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{8}</possibleNumberPattern>
-        <exampleNumber>55123456</exampleNumber>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <exampleNumber>555123456</exampleNumber>
       </mobile>
       <!-- Information from www.yell.ge, examples such as Wissol Petroleum Georgia hotline. -->
       <tollFree>
@@ -8894,15 +8896,6 @@
         <possibleNumberPattern>\d{8,12}</possibleNumberPattern>
         <exampleNumber>1800123456</exampleNumber>
       </tollFree>
-      <!-- The metadata on premium rate is temporarily commented out as wikipedia says 900 is
-           mobile, conflicting with the national numbering plan. -->
-      <!--
-      <premiumRate>
-        <nationalNumberPattern>900\d{7}</nationalNumberPattern>
-        <possibleNumberPattern>\d{10}</possibleNumberPattern>
-        <exampleNumber>9001234567</exampleNumber>
-      </premiumRate>
-      -->
       <uan>
         <!-- Information gathered from sites such as http://www.calcutta.bsnl.co.in/insuan.html -->
         <nationalNumberPattern>1860345\d{4}</nationalNumberPattern>
@@ -9246,7 +9239,8 @@
             [13]|
             8(?:
               00|
-              4[78]
+              4[78]|
+              99
             )
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -9255,7 +9249,7 @@
           <leadingDigits>
             8(?:
               03|
-              9
+              92
             )
           </leadingDigits>
           <format>$1 $2</format>
@@ -9294,7 +9288,16 @@
         <exampleNumber>800123456</exampleNumber>
       </tollFree>
       <premiumRate>
+        <!-- Adding 0878 numbers, as per
+             http://www.aduc.it/notizia/polizia+mette+allerta+sul+numero+0878_73136.php. Other
+             premium prefixes are mentioned here:
+             http://www.dirittodellinformatica.it/news/telefonia/agcom-blocco-permanente-prefissi-144-166-892-899-20080520241.html -->
         <nationalNumberPattern>
+          0878\d{5}|
+          1(?:
+            44|
+            6[346]
+          )\d{6}|
           89(?:
             2\d{3}|
             9\d{6}
@@ -9699,10 +9702,10 @@
     </territory>
 
     <!-- Japan -->
-    <!-- http://www.soumu.go.jp/main_sosiki/joho_tsusin/top/tel_number/fixed.html -->
+    <!-- http://www.soumu.go.jp/main_sosiki/joho_tsusin/top/tel_number/number_shitei.html -->
     <!-- http://www.numberingplans.com/?page=dialling&sub=areacodes&ac=JP -->
-    <territory id="JP" countryCode="81" internationalPrefix="010"
-               nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
+    <territory id="JP" countryCode="81" internationalPrefix="010" nationalPrefix="0"
+               nationalPrefixFormattingRule="$NP$FG" leadingZeroPossible="true" >
       <availableFormats>
         <!-- Toll-free, premium-rate and UAN numbers -->
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
@@ -9719,6 +9722,16 @@
           <leadingDigits>800</leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
+        <!-- National-only toll-free numbers (0077 and 0088, where the leading "0" is considered the
+             national prefix) -->
+        <numberFormat pattern="(\d{3})(\d{4,5})">
+          <leadingDigits>077</leadingDigits>
+          <format>$1-$2</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{2})(\d{4})">
+          <leadingDigits>088</leadingDigits>
+          <format>$1-$2-$3</format>
+        </numberFormat>
         <!-- Some leading digits are explicitly reserved for a particular purpose.
              We handle them first in this rule, and let the following rules ignore those exceptions.
              Note: The rule here is not in the files we rely on when creating the other rules.
@@ -10484,26 +10497,46 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>\d{9,10}</nationalNumberPattern>
-        <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
+        <nationalNumberPattern>
+          [1-9]\d{8,9}|
+          0(?:
+            7\d{5,6}|
+            8\d{7}
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
       </generalDesc>
+      <noInternationalDialling>
+        <!-- Toll-free numbers with a leading "00" cannot be dialled internationally. -->
+        <nationalNumberPattern>
+          0(?:
+            777(?:
+              [01]\d{2}|
+              5\d{3}
+            )|
+            882[1245]\d{4}
+          )
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{7,9}</possibleNumberPattern>
+        <exampleNumber>0777012</exampleNumber>
+      </noInternationalDialling>
       <fixedLine>
         <nationalNumberPattern>
           (?:
             1(?:
-              1[236-8]|
+              1[235-8]|
               2[3-6]|
               3[3-9]|
               4[2-6]|
               [58][2-8]|
               6[2-7]|
               7[2-9]|
-              9[1-8]
+              9[1-9]
             )|
             2[2-9]\d|
             [36][1-9]\d|
             4(?:
-              6[0235-8]|
+              6[02-8]|
               [2-578]\d|
               9[2-59]
             )|
@@ -10549,11 +10582,20 @@
         <exampleNumber>2012345678</exampleNumber>
       </pager>
       <tollFree>
+        <!-- http://www.kddi.com/english/business/free_call_dx/number.html and
+             http://tm.softbank.jp/english/business/phone_service/freecall_sp/index.html -->
         <nationalNumberPattern>
           120\d{6}|
-          800\d{7}
+          800\d{7}|
+          0(?:
+            777(?:
+              [01]\d{2}|
+              5\d{3}
+            )|
+            882[1245]\d{4}
+          )
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{9,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
         <exampleNumber>120123456</exampleNumber>
       </tollFree>
       <premiumRate>
@@ -11026,7 +11068,8 @@
       <fixedLine>
         <!-- Covers only numbers from Pyongyang and Rason Economic Special Zone. According to
              wikipedia, other ranges of phone numbers are top secret, unpublished, and not dialable
-             from overseas. -->
+             from overseas. Also, there is conflicting information about the length of fixed-line
+             numbers, so here we are following Wikipedia. -->
         <nationalNumberPattern>
           2\d{7}|
           85\d{6}
@@ -11325,7 +11368,7 @@
         <nationalNumberPattern>
           (?:
             5(?:
-              0[0-2]|
+              0[0-25]|
               5\d
             )|
             6(?:
@@ -12884,8 +12927,44 @@
     </territory>
 
     <!-- Marshall Islands -->
+    <!-- http://www.itu.int/oth/T0202000085/en -->
     <territory id="MH" countryCode="692" internationalPrefix="011"
                nationalPrefix="1">
+      <availableFormats>
+        <numberFormat pattern="(\d{3})(\d{4})">
+          <format>$1-$2</format>
+        </numberFormat>
+      </availableFormats>
+      <generalDesc>
+        <nationalNumberPattern>[2-6]\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{7}</possibleNumberPattern>
+      </generalDesc>
+      <fixedLine>
+        <nationalNumberPattern>
+          (?:
+            247|
+            528|
+            625
+          )\d{4}
+        </nationalNumberPattern>
+        <exampleNumber>2471234</exampleNumber>
+      </fixedLine>
+      <mobile>
+        <nationalNumberPattern>
+          (?:
+            235|
+            329|
+            45[56]|
+            545
+          )\d{4}
+        </nationalNumberPattern>
+        <exampleNumber>2351234</exampleNumber>
+      </mobile>
+      <voip>
+        <!-- VSAT prefixes are here. -->
+        <nationalNumberPattern>635\d{4}</nationalNumberPattern>
+        <exampleNumber>6351234</exampleNumber>
+      </voip>
     </territory>
 
     <!-- Macedonia, Former Yugoslav Rep. of -->
@@ -13234,18 +13313,28 @@
         <nationalNumberPattern>
           670(?:
             2(?:
-              3[3-5]|
-              88|
-              56
+              3[3-7]|
+              56|
+              8[5-8]
+            )|
+            32[1238]|
+            4(?:
+              33|
+              8[348]
+            )|
+            5(?:
+              32|
+              55|
+              88
             )|
-            32[23]|
-            4[38]3|
-            532|
             6(?:
               64|
               70|
-              8\d
-            )
+              82
+            )|
+            78[589]|
+            8[3-9]8|
+            989
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>6702345678</exampleNumber>
@@ -13254,18 +13343,28 @@
         <nationalNumberPattern>
           670(?:
             2(?:
-              3[3-5]|
-              88|
-              56
+              3[3-7]|
+              56|
+              8[5-8]
+            )|
+            32[1238]|
+            4(?:
+              33|
+              8[348]
+            )|
+            5(?:
+              32|
+              55|
+              88
             )|
-            32[23]|
-            4[38]3|
-            532|
             6(?:
               64|
               70|
-              8\d
-            )
+              82
+            )|
+            78[589]|
+            8[3-9]8|
+            989
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>6702345678</exampleNumber>
@@ -13509,13 +13608,9 @@
     </territory>
 
     <!-- Mauritius -->
-    <!-- http://www.itu.int/oth/T0202000088/en - covers mobile only -->
     <!-- http://www.icta.mu/telecommunications/numbering.htm -->
     <territory id="MU" countryCode="230" internationalPrefix="0(?:[2-7]0|33)"
       preferredInternationalPrefix="020">
-      <!-- There is a proposal to change this to 8 digits - this is supposed to happen August 2010,
-           and 7 digit numbers will be phased out by 1 November 2010. Update Aug 9th: Changeover
-           postponed to indeterminate later date. -->
       <availableFormats>
         <numberFormat pattern="([2-9]\d{2})(\d{4})">
           <format>$1 $2</format>
@@ -13532,8 +13627,7 @@
           (?:
             2(?:
               [034789]\d|
-              1[0-8]|
-              2[0-79]
+              1[0-7]
             )|
             4(?:
               [013-8]\d|
@@ -13558,23 +13652,47 @@
               9\d
             )|
             7\d{2}|
-            87[15-7]|
+            87[15-8]|
             9[1-8]\d
           )\d{4}
         </nationalNumberPattern>
         <exampleNumber>2512345</exampleNumber>
       </mobile>
+      <pager>
+        <nationalNumberPattern>
+          2(?:
+            1[89]|
+            2\d
+          )\d{4}
+        </nationalNumberPattern>
+        <exampleNumber>2181234</exampleNumber>
+      </pager>
       <tollFree>
         <nationalNumberPattern>80[012]\d{4}</nationalNumberPattern>
         <exampleNumber>8001234</exampleNumber>
       </tollFree>
-      <!-- These may be either shared cost or premium rate - they don't differentiate between these
-           in the plan. This is expected to change with the introduction of the new numbering plan
-           in late 2010 - at that time, this will be updated appropriately. -->
       <premiumRate>
         <nationalNumberPattern>30\d{5}</nationalNumberPattern>
         <exampleNumber>3012345</exampleNumber>
       </premiumRate>
+      <voip>
+        <nationalNumberPattern>
+          3(?:
+            20|
+            9\d
+          )\d{4}
+        </nationalNumberPattern>
+        <exampleNumber>3201234</exampleNumber>
+      </voip>
+      <shortCode>
+        <nationalNumberPattern>
+          1\d{2,4}
+          8\d{3}|
+          99\d
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{3,5}</possibleNumberPattern>
+        <exampleNumber>995</exampleNumber>
+      </shortCode>
     </territory>
 
     <!-- Maldives -->
@@ -15132,8 +15250,9 @@
     <!-- Peru -->
     <!-- http://www.itu.int/oth/T02020000A6/en -->
     <!-- http://en.wikipedia.org/wiki/+51 -->
+    <!-- http://www.assistbook.com/South%20America/Peru/widecodes -->
     <territory id="PE" countryCode="51" internationalPrefix="19(?:1[124]|77|90)00"
-               nationalPrefix="0" nationalPrefixFormattingRule="($FG)"
+               nationalPrefix="0" nationalPrefixFormattingRule="($NP$FG)"
                preferredExtnPrefix=" Anexo ">
       <availableFormats>
         <numberFormat pattern="(1)(\d{7})">
@@ -15141,7 +15260,14 @@
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="([4-8]\d)(\d{6})">
-          <leadingDigits>[4-8]</leadingDigits>
+          <leadingDigits>
+            [4-7]|
+            8[2-4]
+          </leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{5})">
+          <leadingDigits>80</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <!-- Formatting from common usage found on the internet, supported by ITU doc. -->
@@ -15174,6 +15300,26 @@
         <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>912345678</exampleNumber>
       </mobile>
+      <tollFree>
+        <nationalNumberPattern>800\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>80012345</exampleNumber>
+      </tollFree>
+      <premiumRate>
+        <nationalNumberPattern>805\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>80512345</exampleNumber>
+      </premiumRate>
+      <sharedCost>
+        <nationalNumberPattern>801\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>80112345</exampleNumber>
+      </sharedCost>
+      <personalNumber>
+        <nationalNumberPattern>80[24]\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8}</possibleNumberPattern>
+        <exampleNumber>80212345</exampleNumber>
+      </personalNumber>
     </territory>
 
     <!-- French Polynesia (Tahiti) (Territoire français d'outre-mer) -->
@@ -15832,8 +15978,26 @@
     </territory>
 
     <!-- Saint Pierre and Miquelon (Collectivité territoriale de la République française) -->
+    <!-- http://www.itu.int/oth/T02020000B2/en -->
     <territory id="PM" countryCode="508" internationalPrefix="00"
-               nationalPrefix="0">
+               nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
+      <availableFormats>
+        <numberFormat pattern="([45]\d)(\d{2})(\d{2})">
+          <format>$1 $2 $3</format>
+        </numberFormat>
+      </availableFormats>
+      <generalDesc>
+        <nationalNumberPattern>[45]\d{5}</nationalNumberPattern>
+        <possibleNumberPattern>\d{6}</possibleNumberPattern>
+      </generalDesc>
+      <fixedLine>
+        <nationalNumberPattern>41\d{4} </nationalNumberPattern>
+        <exampleNumber>411234</exampleNumber>
+      </fixedLine>
+      <mobile>
+        <nationalNumberPattern>55\d{4} </nationalNumberPattern>
+        <exampleNumber>551234</exampleNumber>
+      </mobile>
     </territory>
 
     <!-- Puerto Rico -->
@@ -16511,38 +16675,55 @@
     </territory>
 
     <!-- Rwanda -->
+    <!-- According to ITU, there is no national prefix. However, this is still used. As of June 3rd
+         2011, this was confirmed by a Rwandan local. It is also shown in this format on pages such
+         as www.tigo.co.rw "Choose Your Number" service. -->
     <!-- http://www.rura.gov.rw/docs/RWANDA_NATIONAL_NUMBERING_PLAN.pdf -->
-    <territory id="RW" countryCode="250" internationalPrefix="000"
-               nationalPrefix="0" nationalPrefixFormattingRule="$NP$FG">
+    <!-- http://en.wikipedia.org/wiki/+250 -->
+    <territory id="RW" countryCode="250" internationalPrefix="00"
+               nationalPrefix="0" leadingZeroPossible="true">
       <availableFormats>
         <numberFormat nationalPrefixFormattingRule="$FG"
-          pattern="(25\d)(\d{3})(\d{3})">
+          pattern="(2\d{2})(\d{3})(\d{3})">
           <leadingDigits>2</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="([7-9]\d{2})(\d{3})(\d{3})">
+        <numberFormat pattern="([7-9]\d{2})(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>[7-9]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(0\d)(\d{2})(\d{2})(\d{2})">
+          <leadingDigits>0</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[27-9]\d{8}</nationalNumberPattern>
-        <possibleNumberPattern>\d{9}</possibleNumberPattern>
+        <nationalNumberPattern>[027-9]\d{7,8}</nationalNumberPattern>
+        <possibleNumberPattern>\d{8,9}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>25\d{7}</nationalNumberPattern>
+        <!-- We support satellite numbers here, since they are in the plan, although no recent
+             online examples can be found. We also support fixed-line ranges that have been reserved
+             and paid for, even where no online numbers can be found. -->
+        <nationalNumberPattern>
+          2[258]\d{7}|
+          06\d{6}
+        </nationalNumberPattern>
         <exampleNumber>250123456</exampleNumber>
       </fixedLine>
       <mobile>
         <nationalNumberPattern>7[258]\d{7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>720123456</exampleNumber>
       </mobile>
       <tollFree>
         <nationalNumberPattern>800\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>800123456</exampleNumber>
       </tollFree>
       <premiumRate>
         <nationalNumberPattern>900\d{6}</nationalNumberPattern>
+        <possibleNumberPattern>\d{9}</possibleNumberPattern>
         <exampleNumber>900123456</exampleNumber>
       </premiumRate>
     </territory>
@@ -17981,14 +18162,17 @@
         <numberFormat pattern="(\d{3})(\d{2})(\d{2})">
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[02-9]\d{6}</nationalNumberPattern>
-        <possibleNumberPattern>\d{7}</possibleNumberPattern>
+        <nationalNumberPattern>[02-9]\d{6,7}</nationalNumberPattern>
+        <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
         <nationalNumberPattern>
-          (?:
+          2?(?:
             2[2-7]|
             3[23]|
             44|
@@ -17997,7 +18181,7 @@
             77
           )\d{5}
         </nationalNumberPattern>
-        <exampleNumber>2212345</exampleNumber>
+        <exampleNumber>22212345</exampleNumber>
       </fixedLine>
       <mobile>
         <!-- Added prefix 09 because many mobile numbers were found with this. -->
@@ -18007,9 +18191,10 @@
             7[56]|
             8[1-7]|
             9\d
-          )\d{5}
+          )\d{5}|
+          9[0-289]\d{6}
         </nationalNumberPattern>
-        <exampleNumber>0112345</exampleNumber>
+        <exampleNumber>90112345</exampleNumber>
       </mobile>
     </territory>
 
@@ -18100,7 +18285,7 @@
             4[48]|
             5|
             9(?:
-              19|
+              1[59]|
               [0235-9]
             )
           </leadingDigits>
@@ -18167,7 +18352,16 @@
     </territory>
 
     <!-- Tokelau -->
+    <!-- http://www.itu.int/oth/T02020000D2/en -->
     <territory id="TK" countryCode="690" internationalPrefix="00">
+      <!-- No more information beyond leading digit and number length can be found. Numbers are
+           formatted as a block. The example number is the test number provided in the ITU document.
+           -->
+      <generalDesc>
+        <nationalNumberPattern>[1-9]\d{3}</nationalNumberPattern>
+        <possibleNumberPattern>\d{4}</possibleNumberPattern>
+        <exampleNumber>3190</exampleNumber>
+      </generalDesc>
     </territory>
 
     <!-- Timor-Leste (East Timor) -->

resources/geocoding/de/41.txt

@@ -0,0 +1,37 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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.bakom.admin.ch/themen/telekom/00479/00604/index.html?lang=de
+
+4121|Lausanne
+4122|Genf
+4124|Yverdon/Aigle
+4126|Freiburg
+4127|Sitten
+4131|Bern
+4132|Biel/Neuenburg/Solothurn/Jura
+4133|Thun
+4134|Burgdorf/Langnau i.E.
+4141|Luzern
+4143|Zürich
+4144|Zürich
+4152|Winterthur
+4155|Rapperswil
+4156|Baden
+4161|Basel
+4162|Olten
+4171|St. Gallen
+4181|Chur
+4191|Bellinzona

resources/geocoding/en/39.txt

@@ -0,0 +1,137 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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://en.wikipedia.org/wiki/Area_codes_in_Italy
+
+3902|Milan
+3906|Rome
+39010|Genoa
+39011|Turin
+39015|Biella
+39030|Brescia
+39031|Como
+39035|Bergamo
+39039|Monza
+39040|Trieste
+39041|Venice
+39045|Verona
+39049|Padova
+39050|Pisa
+39051|Bologna
+39055|Florence
+39059|Modena
+39070|Cagliari
+39071|Ancona
+39075|Perugia
+39079|Sassari
+39080|Bari
+39081|Naples
+39085|Pescara
+39089|Salerno
+39090|Messina
+39091|Palermo
+39095|Catania
+39099|Taranto
+390122|Turin
+390125|Turin
+390131|Alessandria
+390141|Asti
+390161|Vercelli
+390165|Aosta Valley
+390166|Aosta Valley
+390171|Cuneo
+390183|Imperia
+390185|Genoa
+390187|La Spezia
+390321|Novara
+390322|Novara
+390324|Verbano-Cusio-Ossola
+390331|Varese
+390332|Varese
+390341|Lecco
+390342|Sondrio
+390343|Sondrio
+390344|Como
+390346|Bergamo
+390362|Cremona/Monza
+390363|Bergamo
+390364|Brescia
+390365|Brescia
+390371|Lodi
+390372|Cremona
+390373|Cremona
+390376|Mantua
+390382|Pavia
+390421|Venice
+390422|Treviso
+390423|Treviso
+390424|Vicenza
+390425|Rovigo
+390426|Rovigo
+390432|Udine
+390444|Vicenza
+390445|Vicenza
+390461|Trento
+390471|Bolzano/Bozen
+390481|Gorizia
+390521|Parma
+390522|Reggio Emilia
+390523|Piacenza
+390532|Ferrara
+390541|Rimini
+390543|Forlì-Cesena
+390545|Ravenna
+390549|San Marino
+390565|Livorno
+390574|Prato
+390575|Arezzo
+390577|Siena
+390583|Lucca
+390585|Massa-Carrara
+390586|Livorno
+390731|Ancona
+390732|Ancona
+390733|Macerata
+390734|Fermo
+390735|Ascoli Piceno
+390737|Macerata
+390774|Rome
+390776|Frosinone
+390783|Oristano
+390789|Sassari
+390823|Caserta
+390824|Benevento
+390825|Avellino
+390832|Lecce
+390862|L'Aquila
+390865|Isernia
+390874|Campobasso
+390881|Foggia
+390882|Foggia
+390883|Andria Barletta Trani
+390884|Foggia
+390921|Palermo
+390922|Agrigento
+390924|Trapani
+390925|Agrigento
+390933|Caltanissetta
+390934|Caltanissetta and Enna
+390942|Catania
+390961|Catanzaro
+390962|Crotone
+390963|Vibo Valentia
+390965|Reggio Calabria
+390974|Salerno
+390975|Potenza

resources/geocoding/en/41.txt

@@ -0,0 +1,37 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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.bakom.admin.ch/themen/telekom/00479/00604/index.html?lang=en
+
+4121|Lausanne
+4122|Geneva
+4124|Yverdon/Aigle
+4126|Fribourg
+4127|Sion
+4131|Berne
+4132|Bienne/Neuchâtel/Soleure/Jura
+4133|Thun
+4134|Burgdorf/Langnau i.E.
+4141|Lucerne
+4143|Zurich
+4144|Zurich
+4152|Winterthur
+4155|Rapperswil
+4156|Baden
+4161|Basel
+4162|Olten
+4171|St. Gallen
+4181|Chur
+4191|Bellinzona

resources/geocoding/en/7.txt

@@ -0,0 +1,105 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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/dms_pub/itu-t/oth/02/02/T02020000AD0001MSWE.doc
+
+7301|Republic of Buryatia
+7302|Chita
+7336|Baikonur
+7341|Udmurtian Republic
+7342|Perm
+7343|Ekaterinburg
+7345|Tyumen
+7346|Surgut
+7347|Republic of Bashkortostan
+7349|Yamalo-Nenets Autonomous District
+7351|Chelyabinsk
+7352|Kurgan
+7353|Orenburg
+7381|Omsk
+7382|Tomsk
+7383|Novosibirsk
+7384|Kemerovo
+7385|Altai Territory
+7388|Republic of Altai
+7390|Republic of Khakassia
+7391|Krasnoyarsk Territory
+7394|Republic of Tuva
+7401|Kaliningrad
+7411|Republic of Sakha
+7413|Magadan
+7415|Kamchatka Region
+7416|Amur Region
+7421|Khabarovsk Territory
+7423|Primorie territory
+7424|Sakhalin Region
+7426|Jewish Autonomous Region
+7427|Chukotka Autonomous District
+7471|Kursk
+7472|Belgorod
+7473|Voronezh
+7474|Lipetsk
+7475|Tambov
+7481|Smolensk
+7482|Tver
+7483|Bryansk
+7484|Kaluga
+7485|Yaroslavl
+7486|Orel
+7487|Tula
+7491|Ryazan
+7492|Vladimir
+7494|Kostroma
+7495|Moscow
+7496|Moscow
+7498|Moscow
+7499|Moscow
+7811|Pskov
+7812|St Petersburg
+7813|Leningrad region
+7814|Republic of Karelia
+7815|Murmansk
+7816|Veliky Novgorod
+7817|Vologda
+7818|Arkhangelsk
+7820|Cherepovets
+7821|Komi Republic
+7831|Nizhni Novgorod
+7833|Kirov
+7834|Republic of Mordovia
+7835|Chuvashi Republic
+7836|Republic of Marij El
+7841|Penza
+7842|Ulyanovsk
+7843|Republic of Tatarstan
+7844|Volgograd
+7845|Saratov
+7846|Samara
+7847|Republic of Kalmykia
+7848|Tolyatti
+7851|Astrakhan
+7855|Naberezhnye Chelny
+7861|Krasnodar Territory
+7862|Sochi
+7863|Rostov
+7865|Stavropol territory
+7866|Kabardino-Balkarian Republic
+7867|Republic of North Ossetia
+7871|Chechen Republic
+7872|Republic of Daghestan
+7873|Ingushi Republic
+7877|Republic of Adygeya
+7878|Karachayevo-Cherkessian Republic
+7879|Mineranye Vody

resources/geocoding/en/886.txt

@@ -0,0 +1,30 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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://en.wikipedia.org/wiki/Telephone_numbers_in_Taiwan
+
+8862|Taipei
+8863|Taoyuan, Hsinchu, Yilan, Hualien
+8864|Taichung, Changhua
+8865|Chiayi, Yunlin
+8866|Tainan, Penghu
+8867|Kaohsiung
+8868|Pingtung
+88637|Miaoli
+88649|Nantou
+88682|Kinmen
+88689|Taitung
+886826|Wuqiu
+886836|Matsu

resources/geocoding/en/90.txt

@@ -0,0 +1,181 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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/T02020000D6/en
+
+90212|Istanbul (Europe)
+90213|Istanbul (Europe)
+90216|Istanbul (Anatolia)
+90217|Istanbul (Anatolia)
+90222|Esksehir
+90223|Esksehir
+90224|Bursa
+90225|Bursa
+90226|Yalova
+90227|Yalova
+90228|Bilecik
+90229|Bilecik
+90232|Izmir
+90233|Izmir
+90236|Manisa
+90237|Manisa
+90242|Antalya
+90243|Antalya
+90246|Isparta
+90247|Isparta
+90248|Burdur
+90249|Burdur
+90252|Mugla
+90253|Mugla
+90256|Aydin
+90257|Aydin
+90258|Denizli
+90259|Denizli
+90262|Kocaeli
+90263|Kocaeli
+90264|Sakarya
+90265|Sakarya
+90266|Balikesir
+90267|Balikesir
+90272|Afyon
+90273|Afyon
+90274|Kutahya
+90275|Kutahya
+90276|Usak
+90277|Usak
+90282|Tekirdag
+90283|Tekirdag
+90284|Edirne
+90285|Edirne
+90286|Canakkale
+90287|Canakkale
+90288|Kirklareli
+90289|Kirklareli
+90312|Ankara
+90313|Ankara
+90318|Kirikkale
+90319|Kirikkale
+90322|Adana
+90323|Adana
+90324|Icel
+90325|Icel
+90326|Hatay
+90327|Hatay
+90328|Osmaniye
+90329|Osmaniye
+90332|Konya
+90333|Konya
+90338|Karaman
+90339|Karaman
+90342|Gaziantep
+90343|Gaziantep
+90344|K. Maras
+90345|K. Maras
+90346|Sivas
+90347|Sivas
+90348|Kilis
+90349|Kilis
+90352|Kayseri
+90353|Kayseri
+90354|Yozgat
+90355|Yozgat
+90356|Tokat
+90357|Tokat
+90358|Amasya
+90359|Amasya
+90362|Samsun
+90363|Samsun
+90364|Corum
+90365|Corum
+90366|Kastamonu
+90367|Kastamonu
+90368|Sinop
+90369|Sinop
+90370|Karabuk
+90371|Karabuk
+90372|Zongdulak
+90373|Zongdulak
+90374|Bolu
+90375|Bolu
+90376|Cankiri
+90377|Cankiri
+90378|Bartin
+90379|Bartin
+90380|Duzce
+90381|Duzce
+90382|Aksaray
+90383|Aksaray
+90384|Nevsehir
+90385|Nevsehir
+90386|Kirsehir
+90387|Kirsehir
+90388|Nigde
+90389|Nigde
+90412|Diyarbakir
+90413|Diyarbakir
+90414|Sanliurfa
+90415|Sanliurfa
+90416|Adiyaman
+90417|Adiyaman
+90422|Malatya
+90423|Malatya
+90424|Elazig
+90425|Elazig
+90426|Bingol
+90427|Bingol
+90428|Tuniceli
+90429|Tuniceli
+90432|Van
+90433|Van
+90434|Bitlis
+90435|Bitlis
+90436|Mus
+90437|Mus
+90438|Hakkari
+90439|Hakkari
+90442|Erzurum
+90443|Erzurum
+90446|Erzincan
+90447|Erzincan
+90452|Ordu
+90453|Ordu
+90454|Giresun
+90455|Giresun
+90456|Gumushane
+90457|Gumushane
+90458|Bayburt
+90459|Bayburt
+90462|Trabzon
+90463|Trabzon
+90464|Rize
+90465|Rize
+90466|Artvin
+90467|Artvin
+90472|Agri
+90473|Agri
+90474|Kars
+90475|Kars
+90476|Igdir
+90477|Igdir
+90478|Ardahan
+90479|Ardahan
+90482|Mardin
+90483|Mardin
+90484|Stirt
+90485|Stirt
+90486|Sirnak
+90487|Sirnak
+90488|Batman
+90489|Batman

resources/geocoding/fr/41.txt

@@ -0,0 +1,37 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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.bakom.admin.ch/themen/telekom/00479/00604/index.html?lang=fr
+
+4121|Lausanne
+4122|Genève
+4124|Yverdon/Aigle
+4126|Fribourg
+4127|Sion
+4131|Berne
+4132|Bienne/Neuchâtel/Soleure/Jura
+4133|Thoune
+4134|Burgdorf/Langnau i.E.
+4141|Lucerne
+4143|Zurich
+4144|Zurich
+4152|Winterthour
+4155|Rapperswil
+4156|Baden
+4161|Bâle
+4162|Olten
+4171|St. Gall
+4181|Coire
+4191|Bellinzona

resources/geocoding/it/39.txt

@@ -0,0 +1,249 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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://it.wikipedia.org/wiki/Elenco_degli_indicativi_geografici_in_Italia
+
+3902|Milano
+3906|Roma
+39010|Genova
+39011|Torino
+39015|Biella
+39019|Savona
+39030|Brescia
+39031|Como
+39035|Bergamo
+39039|Monza
+39040|Trieste
+39041|Venezia
+39045|Verona
+39049|Padova
+39050|Pisa
+39051|Bologna
+39055|Firenze
+39059|Modena
+39070|Cagliari
+39071|Ancona
+39075|Perugia
+39079|Sassari
+39080|Bari
+39081|Napoli
+39085|Pescara
+39089|Salerno
+39090|Messina
+39091|Palermo
+39095|Catania
+39099|Taranto
+390121|Pinerolo
+390122|Susa
+390123|Lanzo Torinese
+390124|Rivarolo Canavese
+390125|Ivrea
+390131|Alessandria
+390141|Asti
+390142|Casale Monferrato
+390143|Novi Ligure
+390144|Acqui Terme
+390161|Vercelli
+390163|Borgosesia
+390165|Aosta
+390166|Saint-Vincent
+390171|Cuneo
+390172|Savigliano
+390173|Alba
+390174|Mondovì
+390175|Saluzzo
+390182|Albenga
+390183|Imperia
+390184|Sanremo
+390185|Rapallo
+390187|La Spezia
+390321|Novara
+390322|Arona
+390323|Baveno
+390324|Domodossola
+390331|Busto Arsizio
+390332|Varese
+390341|Lecco
+390342|Sondrio
+390343|Chiavenna
+390344|Menaggio
+390345|San Pellegrino Terme
+390346|Clusone
+390362|Seregno
+390363|Treviglio
+390364|Breno
+390365|Salò
+390371|Lodi
+390372|Cremona
+390373|Crema
+390374|Soresina
+390375|Casalmaggiore
+390376|Mantova
+390377|Codogno
+390381|Vigevano
+390382|Pavia
+390383|Voghera
+390384|Mortara
+390385|Stradella
+390386|Ostiglia
+390421|San Donà di Piave
+390422|Treviso
+390423|Montebelluna
+390424|Bassano del Grappa
+390425|Rovigo
+390426|Adria
+390427|Spilimbergo
+390428|Tarvisio
+390429|Este
+390431|Cervignano del Friuli
+390432|Udine
+390433|Tolmezzo
+390434|Pordenone
+390435|Pieve di Cadore
+390436|Cortina d'Ampezzo
+390437|Belluno
+390438|Conegliano
+390439|Feltre
+390442|Legnago
+390444|Vicenza
+390445|Schio
+390461|Trento
+390462|Cavalese
+390463|Cles
+390464|Rovereto
+390465|Tione di Trento
+390471|Bolzano
+390472|Bressanone
+390473|Merano
+390474|Brunico
+390481|Gorizia
+390521|Parma
+390522|Reggio nell'Emilia
+390523|Piacenza
+390524|Fidenza
+390525|Fornovo di Taro
+390532|Ferrara
+390533|Comacchio
+390534|Porretta Terme
+390535|Mirandola
+390536|Sassuolo
+390541|Rimini
+390542|Imola
+390543|Forlì
+390544|Ravenna
+390545|Lugo
+390546|Faenza
+390547|Cesena
+390549|Repubblica di San Marino
+390564|Grosseto
+390565|Piombino
+390566|Follonica
+390571|Empoli
+390572|Montecatini Terme
+390573|Pistoia
+390574|Prato
+390575|Arezzo
+390577|Siena
+390578|Chianciano Terme
+390583|Lucca
+390584|Viareggio
+390585|Massa
+390586|Livorno
+390587|Pontedera
+390588|Volterra
+390721|Pesaro
+390722|Urbino
+390731|Jesi
+390732|Fabriano
+390733|Macerata
+390734|Fermo
+390735|San Benedetto del Tronto
+390736|Ascoli Piceno
+390737|Camerino
+390742|Foligno
+390743|Spoleto
+390744|Terni
+390746|Rieti
+390761|Viterbo
+390763|Orvieto
+390765|Poggio Mirteto
+390766|Civitavecchia
+390771|Formia
+390773|Latina
+390774|Tivoli
+390775|Frosinone
+390776|Cassino
+390781|Iglesias
+390782|Lanusei
+390783|Oristano
+390784|Nuoro
+390785|Macomer
+390789|Olbia
+390823|Caserta
+390824|Benevento
+390825|Avellino
+390827|Sant'Angelo dei Lombardi
+390828|Battipaglia
+390831|Brindisi
+390832|Lecce
+390833|Gallipoli
+390835|Matera
+390836|Maglie
+390861|Teramo
+390862|L'Aquila
+390863|Avezzano
+390864|Sulmona
+390865|Isernia
+390871|Chieti
+390872|Lanciano
+390873|Vasto
+390874|Campobasso
+390875|Termoli
+390881|Foggia
+390882|San Severo
+390883|Andria
+390884|Manfredonia
+390885|Cerignola
+390921|Cefalù
+390922|Agrigento
+390923|Trapani
+390924|Alcamo
+390925|Sciacca
+390931|Siracusa
+390932|Ragusa
+390933|Caltagirone
+390934|Caltanissetta
+390935|Enna
+390941|Patti
+390942|Taormina
+390961|Catanzaro
+390962|Crotone
+390963|Vibo Valentia
+390964|Locri
+390965|Reggio di Calabria
+390966|Palmi
+390967|Soverato
+390968|Lamezia Terme
+390971|Potenza
+390972|Melfi
+390973|Lagonegro
+390974|Vallo della Lucania
+390975|Sala Consilina
+390976|Muro Lucano
+390981|Castrovillari
+390982|Paola
+390983|Rossano
+390984|Cosenza
+390985|Scalea

resources/geocoding/it/41.txt

@@ -0,0 +1,37 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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.bakom.admin.ch/themen/telekom/00479/00604/index.html?lang=it
+
+4121|Losanna
+4122|Ginevra
+4124|Yverdon/Aigle
+4126|Friburgo
+4127|Sion
+4131|Berna
+4132|Bienne/Neuchâtel/Soletta/Giura
+4133|Thun
+4134|Burgdorf/Langnau i.E.
+4141|Lucerna
+4143|Zurigo
+4144|Zurigo
+4152|Winterthur
+4155|Rapperswil
+4156|Baden
+4161|Basilea
+4162|Olten
+4171|San Gallo
+4181|Coira
+4191|Bellinzona

resources/geocoding/pt/351.txt

@@ -0,0 +1,90 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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.anacom.pt/streaming/2_SFT19set01.pdf?contentId=17316&field=ATTACHED_FILE
+
+35120|Livre
+35121|Lisboa
+35122|Porto
+351230|Livre
+351231|Mealhada
+351232|Viseu
+351233|Figueira da Foz
+351234|Aveiro
+351235|Arganil
+351236|Pombal
+351237|Livre
+351238|Seia
+351239|Coimbra
+351240|Livre
+351241|Abrantes
+351242|Ponte de Sôr
+351243|Santarém
+351244|Leiria
+351245|Portalegre
+351246|Livres
+351247|Livres
+351248|Livres
+351249|Torres Novas
+351250|Livre
+351251|Valença
+351252|V. N. de Famalicão
+351253|Braga
+351254|Peso da Régua
+351255|Penafiel
+351256|S. João da Madeira
+351257|Livre
+351258|Viana do Castelo
+351259|Vila Real
+351260|Livre
+351261|Torres Vedras
+351262|Caldas da Rainha
+351263|V. Franca de Xira
+351264|Livre
+351265|Setúbal
+351266|Évora
+351267|Livre
+351268|Estremoz
+351269|Santiago do Cacém
+351270|Livre
+351271|Guarda
+351272|Castelo Branco
+351273|Bragança
+351274|Proença-a-Nova
+351275|Covilhã
+351276|Chaves
+351277|Idanha-a-Nova
+351278|Mirandela
+351279|Moncorvo
+351280|Livre
+351281|Tavira
+351282|Portimão
+351283|Odemira
+351284|Beja
+351285|Moura
+351286|Castro Verde
+351287|Livres
+351288|Livres
+351289|Faro
+351290|Livre
+351291|Funchal
+351292|Horta
+351293|Livres
+351294|Livres
+351295|Angra do Heroísmo
+351296|Ponta Delgada
+351297|Livres
+351298|Livres
+351299|Livres

resources/geocoding/tr/90.txt

@@ -0,0 +1,181 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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://en.wikipedia.org/wiki/%2B90 and http://www.itu.int/oth/T02020000D6/en
+
+90212|Istanbul (Avrupa)
+90213|Istanbul (Avrupa)
+90216|Istanbul (Anatolia)
+90217|Istanbul (Anatolia)
+90222|Eskisehir
+90223|Eskisehir
+90224|Bursa
+90225|Bursa
+90226|Yalova
+90227|Yalova
+90228|Bilecik
+90229|Bilecik
+90232|İzmir
+90233|İzmir
+90236|Manisa
+90237|Manisa
+90242|Antalya
+90243|Antalya
+90246|Isparta
+90247|Isparta
+90248|Burdur
+90249|Burdur
+90252|Muğla
+90253|Muğla
+90256|Aydın
+90257|Aydın
+90258|Denizli
+90259|Denizli
+90262|Kocaeli (İzmit)
+90263|Kocaeli (İzmit)
+90264|Sakarya (Adapazarı)
+90265|Sakarya (Adapazarı)
+90266|Balıkesir
+90267|Balıkesir
+90272|Afyon
+90273|Afyon
+90274|Kütahya
+90275|Kütahya
+90276|Uşak
+90277|Uşak
+90282|Tekirdağ
+90283|Tekirdağ
+90284|Edirne
+90285|Edirne
+90286|Çanakkale
+90287|Çanakkale
+90288|Kırklareli
+90289|Kırklareli
+90312|Ankara
+90313|Ankara
+90318|Kırıkkale
+90319|Kırıkkale
+90322|Adana
+90323|Adana
+90324|Mersin
+90325|Mersin
+90326|Hatay
+90327|Hatay
+90328|Osmaniye
+90329|Osmaniye
+90332|Konya
+90333|Konya
+90338|Karaman
+90339|Karaman
+90342|Gaziantep
+90343|Gaziantep
+90344|Kahramanmaraş
+90345|Kahramanmaraş
+90346|Sivas
+90347|Sivas
+90348|Kilis
+90349|Kilis
+90352|Kayseri
+90353|Kayseri
+90354|Yozgat
+90355|Yozgat
+90356|Tokat
+90357|Tokat
+90358|Amasya
+90359|Amasya
+90362|Samsun
+90363|Samsun
+90364|Çorum
+90365|Çorum
+90366|Kastamonu
+90367|Kastamonu
+90368|Sinop
+90369|Sinop
+90370|Karabük
+90371|Karabük
+90372|Zonguldak
+90373|Zonguldak
+90374|Bolu
+90375|Bolu
+90376|Çankırı
+90377|Çankırı
+90378|Bartın
+90379|Bartın
+90380|Düzce
+90381|Düzce
+90382|Aksaray
+90383|Aksaray
+90384|Nevşehir
+90385|Nevşehir
+90386|Kırşehir
+90387|Kırşehir
+90388|Niğde
+90389|Niğde
+90412|Diyarbakır
+90413|Diyarbakır
+90414|Şanlıurfa
+90415|Şanlıurfa
+90416|Adıyaman
+90417|Adıyaman
+90422|Malatya
+90423|Malatya
+90424|Elazığ
+90425|Elazığ
+90426|Bingöl
+90427|Bingöl
+90428|Tunceli
+90429|Tunceli
+90432|Van
+90433|Van
+90434|Bitlis
+90435|Bitlis
+90436|Muş
+90437|Muş
+90438|Hakkari
+90439|Hakkari
+90442|Erzurum
+90443|Erzurum
+90446|Erzincan
+90447|Erzincan
+90452|Ordu
+90453|Ordu
+90454|Giresun
+90455|Giresun
+90456|Gümüşhane
+90457|Gümüşhane
+90458|Bayburt
+90459|Bayburt
+90462|Trabzon
+90463|Trabzon
+90464|Rize
+90465|Rize
+90466|Artvin
+90467|Artvin
+90472|Ağrı
+90473|Ağrı
+90474|Kars
+90475|Kars
+90476|Iğdır
+90477|Iğdır
+90478|Ardahan
+90479|Ardahan
+90482|Mardin
+90483|Mardin
+90484|Siirt
+90485|Siirt
+90486|Şırnak
+90487|Şırnak
+90488|Batman
+90489|Batman

resources/geocoding/zh/886.txt

@@ -0,0 +1,30 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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://zh.wikipedia.org/zh-cn/中華民國長途電話區號表
+
+8862|台北
+8863|桃园、新竹、花莲、宜兰
+8864|台中、彰化
+8865|嘉义、云林
+8866|台南、澎湖
+8867|高雄
+8868|屏东
+88637|苗栗
+88649|南投
+88682|金门
+88689|台东
+886826|乌丘
+886836|马祖

resources/geocoding/zh_Hant/886.txt

@@ -0,0 +1,30 @@
+# Copyright (C) 2011 Google Inc.
+
+# 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://zh.wikipedia.org/wiki/中華民國長途電話區號表
+
+8862|臺北
+8863|桃園、新竹、花蓮、宜蘭
+8864|臺中、彰化
+8865|嘉義、雲林
+8866|臺南、澎湖
+8867|高雄
+8868|屏東
+88637|苗栗
+88649|南投
+88682|金門
+88689|臺東
+886826|烏坵
+886836|馬祖