Update libphonenumber to an unmodified copy of v7.0.1

Copied from upstream commit eb7f783d2fd7d222a10283a72d9e7 with no local modifications and a cherry-pick of commit 5b00cb5b2dc0582c29 (JAVA/JS: Documentation fix and added missing licences.) from upstream master. Added Android.mk to build the code for platform and unbundled use. Note that while we rename packages, we don't rename resources to make sure they're found. Change-Id: Idb886f1b5d7bca491b9f7f8d18574a88f08593ba
author: Narayan Kamath <narayan@google.com> 2014-12-18 11:56:40 +0000
committer: Narayan Kamath <narayan@google.com> 2014-12-23 12:32:44 +0000
commit: a77faddfc3b3e4cca8f585c82d669054aec221f4 (patch)
tree: b3ca5eaf70be2df2a1a9cfc684532d1563d759a7 /geocoder
parent: eec8af34d3129d0f37c45ff8a82b4212724a6d79 (diff)
download: libphonenumber-a77faddfc3b3e4cca8f585c82d669054aec221f4.tar.gz
520 files changed, 773 insertions, 0 deletions
diff --git a/geocoder/pom.xml b/geocoder/pom.xml
new file mode 100644
index 00000000..60142e22
--- /dev/null
+++ b/geocoder/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.googlecode.libphonenumber</groupId>
+  <artifactId>geocoder</artifactId>
+  <version>2.18</version>
+  <packaging>jar</packaging>
+  <url>http://code.google.com/p/libphonenumber/</url>
+
+  <parent>
+    <groupId>com.googlecode.libphonenumber</groupId>
+    <artifactId>libphonenumber-parent</artifactId>
+    <version>7.0.1</version>
+  </parent>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>test</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>src/com/google/i18n/phonenumbers/geocoding/data</directory>
+        <targetPath>com/google/i18n/phonenumbers/geocoding/data</targetPath>
+      </resource>
+      <resource>
+        <directory>src/com/google/i18n/phonenumbers/timezones/data</directory>
+        <targetPath>com/google/i18n/phonenumbers/timezones/data</targetPath>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>test/com/google/i18n/phonenumbers/geocoding/testing_data</directory>
+        <targetPath>com/google/i18n/phonenumbers/geocoding/testing_data</targetPath>
+      </testResource>
+      <testResource>
+        <directory>test/com/google/i18n/phonenumbers/timezones/testing_data</directory>
+        <targetPath>com/google/i18n/phonenumbers/timezones/testing_data</targetPath>
+      </testResource>
+    </testResources>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.googlecode.libphonenumber</groupId>
+      <artifactId>libphonenumber</artifactId>
+      <version>7.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.googlecode.libphonenumber</groupId>
+      <artifactId>prefixmapper</artifactId>
+      <version>2.18</version>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java b/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java
new file mode 100644
index 00000000..afbc0b2d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java
@@ -0,0 +1,192 @@
+/*
+ * 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.
+ */
+
+package com.google.i18n.phonenumbers;
+
+import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberType;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.google.i18n.phonenumbers.prefixmapper.PrefixTimeZonesMap;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * An offline mapper from phone numbers to time zones.
+ */
+public class PhoneNumberToTimeZonesMapper {
+  private static PhoneNumberToTimeZonesMapper instance = null;
+  private static final String MAPPING_DATA_DIRECTORY =
+      "/com/google/i18n/phonenumbers/timezones/data/";
+  private static final String MAPPING_DATA_FILE_NAME = "map_data";
+  // This is defined by ICU as the unknown time zone.
+  private static final String UNKNOWN_TIMEZONE = "Etc/Unknown";
+  // A list with the ICU unknown time zone as single element.
+  // @VisibleForTesting
+  static final List<String> UNKNOWN_TIME_ZONE_LIST = new ArrayList<String>(1);
+  static {
+    UNKNOWN_TIME_ZONE_LIST.add(UNKNOWN_TIMEZONE);
+  }
+
+  private static final Logger LOGGER =
+      Logger.getLogger(PhoneNumberToTimeZonesMapper.class.getName());
+
+  private PrefixTimeZonesMap prefixTimeZonesMap = null;
+
+  // @VisibleForTesting
+  PhoneNumberToTimeZonesMapper(String prefixTimeZonesMapDataDirectory) {
+    this.prefixTimeZonesMap = loadPrefixTimeZonesMapFromFile(
+        prefixTimeZonesMapDataDirectory + MAPPING_DATA_FILE_NAME);
+  }
+
+  private PhoneNumberToTimeZonesMapper(PrefixTimeZonesMap prefixTimeZonesMap) {
+    this.prefixTimeZonesMap = prefixTimeZonesMap;
+  }
+
+  private static PrefixTimeZonesMap loadPrefixTimeZonesMapFromFile(String path) {
+    InputStream source = PhoneNumberToTimeZonesMapper.class.getResourceAsStream(path);
+    ObjectInputStream in = null;
+    PrefixTimeZonesMap map = new PrefixTimeZonesMap();
+    try {
+      in = new ObjectInputStream(source);
+      map.readExternal(in);
+    } catch (IOException e) {
+      LOGGER.log(Level.WARNING, e.toString());
+    } finally {
+      close(in);
+    }
+    return map;
+  }
+
+  private static void close(InputStream in) {
+    if (in != null) {
+      try {
+        in.close();
+      } catch (IOException e) {
+        LOGGER.log(Level.WARNING, e.toString());
+      }
+    }
+  }
+
+  /**
+   * Helper class used for lazy instantiation of a PhoneNumberToTimeZonesMapper. This also loads the
+   * map data in a thread-safe way.
+   */
+  private static class LazyHolder {
+    private static final PhoneNumberToTimeZonesMapper INSTANCE;
+    static {
+      PrefixTimeZonesMap map =
+          loadPrefixTimeZonesMapFromFile(MAPPING_DATA_DIRECTORY + MAPPING_DATA_FILE_NAME);
+      INSTANCE = new PhoneNumberToTimeZonesMapper(map);
+    }
+  }
+
+  /**
+   * Gets a {@link PhoneNumberToTimeZonesMapper} instance.
+   *
+   * <p> The {@link PhoneNumberToTimeZonesMapper} is implemented as a singleton. Therefore, calling
+   * this method multiple times will only result in one instance being created.
+   *
+   * @return  a {@link PhoneNumberToTimeZonesMapper} instance
+   */
+  public static synchronized PhoneNumberToTimeZonesMapper getInstance() {
+    return LazyHolder.INSTANCE;
+  }
+
+  /**
+   * Returns a list of time zones to which a phone number belongs.
+   *
+   * <p>This method assumes the validity of the number passed in has already been checked, and that
+   * the number is geo-localizable. We consider fixed-line and mobile numbers possible candidates
+   * for geo-localization.
+   *
+   * @param number  a valid phone number for which we want to get the time zones to which it belongs
+   * @return  a list of the corresponding time zones or a single element list with the default
+   *     unknown time zone if no other time zone was found or if the number was invalid
+   */
+  public List<String> getTimeZonesForGeographicalNumber(PhoneNumber number) {
+    return getTimeZonesForGeocodableNumber(number);
+  }
+
+  /**
+   * As per {@link #getTimeZonesForGeographicalNumber(PhoneNumber)} but explicitly checks
+   * the validity of the number passed in.
+   *
+   * @param number  the phone number for which we want to get the time zones to which it belongs
+   * @return  a list of the corresponding time zones or a single element list with the default
+   *     unknown time zone if no other time zone was found or if the number was invalid
+   */
+  public List<String> getTimeZonesForNumber(PhoneNumber number) {
+    PhoneNumberType numberType = PhoneNumberUtil.getInstance().getNumberType(number);
+    if (numberType == PhoneNumberType.UNKNOWN) {
+      return UNKNOWN_TIME_ZONE_LIST;
+    } else if (!canBeGeocoded(numberType)) {
+      return getCountryLevelTimeZonesforNumber(number);
+    }
+    return getTimeZonesForGeographicalNumber(number);
+  }
+
+  /**
+   * A similar method is implemented as PhoneNumberUtil.isNumberGeographical, which performs a
+   * stricter check, as it determines if a number has a geographical association. Also, if new
+   * phone number types were added, we should check if this other method should be updated too.
+   * TODO: Remove duplication by completing the logic in the method in PhoneNumberUtil.
+   *                   For more information, see the comments in that method.
+   */
+  private boolean canBeGeocoded(PhoneNumberType numberType) {
+    return (numberType == PhoneNumberType.FIXED_LINE ||
+            numberType == PhoneNumberType.MOBILE ||
+            numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE);
+  }
+
+  /**
+   * Returns a String with the ICU unknown time zone.
+   */
+  public static String getUnknownTimeZone() {
+    return UNKNOWN_TIMEZONE;
+  }
+
+  /**
+   * Returns a list of time zones to which a geocodable phone number belongs.
+   *
+   * @param number  the phone number for which we want to get the time zones to which it belongs
+   * @return  the list of corresponding  time zones or a single element list with the default
+   *     unknown time zone if no other time zone was found or if the number was invalid
+   */
+  private List<String> getTimeZonesForGeocodableNumber(PhoneNumber number) {
+    List<String> timezones = prefixTimeZonesMap.lookupTimeZonesForNumber(number);
+    return Collections.unmodifiableList(timezones.isEmpty() ? UNKNOWN_TIME_ZONE_LIST
+                                                            : timezones);
+  }
+
+  /**
+   * Returns the list of time zones corresponding to the country calling code of {@code number}.
+   *
+   * @param number  the phone number to look up
+   * @return  the list of corresponding time zones or a single element list with the default
+   *     unknown time zone if no other time zone was found
+   */
+  private List<String> getCountryLevelTimeZonesforNumber(PhoneNumber number) {
+    List<String> timezones = prefixTimeZonesMap.lookupCountryLevelTimeZonesForNumber(number);
+    return Collections.unmodifiableList(timezones.isEmpty() ? UNKNOWN_TIME_ZONE_LIST
+                                                            : timezones);
+  }
+}
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
new file mode 100644
index 00000000..5642a11d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package com.google.i18n.phonenumbers.geocoding;
+
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberType;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.google.i18n.phonenumbers.prefixmapper.PrefixFileReader;
+
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * An offline geocoder which provides geographical information related to a phone number.
+ *
+ * @author Shaopeng Jia
+ */
+public class PhoneNumberOfflineGeocoder {
+  private static PhoneNumberOfflineGeocoder instance = null;
+  private static final String MAPPING_DATA_DIRECTORY =
+      "/com/google/i18n/phonenumbers/geocoding/data/";
+  private PrefixFileReader prefixFileReader = null;
+
+  private final PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
+
+  // @VisibleForTesting
+  PhoneNumberOfflineGeocoder(String phonePrefixDataDirectory) {
+    prefixFileReader = new PrefixFileReader(phonePrefixDataDirectory);
+  }
+
+  /**
+   * Gets a {@link PhoneNumberOfflineGeocoder} instance to carry out international phone number
+   * geocoding.
+   *
+   * <p> The {@link PhoneNumberOfflineGeocoder} is implemented as a singleton. Therefore, calling
+   * this method multiple times will only result in one instance being created.
+   *
+   * @return  a {@link PhoneNumberOfflineGeocoder} instance
+   */
+  public static synchronized PhoneNumberOfflineGeocoder getInstance() {
+    if (instance == null) {
+      instance = new PhoneNumberOfflineGeocoder(MAPPING_DATA_DIRECTORY);
+    }
+    return instance;
+  }
+
+  /**
+   * Returns the customary display name in the given language for the given territory the phone
+   * number is from. If it could be from many territories, nothing is returned.
+   */
+  private String getCountryNameForNumber(PhoneNumber number, Locale language) {
+    List<String> regionCodes =
+        phoneUtil.getRegionCodesForCountryCode(number.getCountryCode());
+    if (regionCodes.size() == 1) {
+      return getRegionDisplayName(regionCodes.get(0), language);
+    } else {
+      String regionWhereNumberIsValid = "ZZ";
+      for (String regionCode : regionCodes) {
+        if (phoneUtil.isValidNumberForRegion(number, regionCode)) {
+          if (!regionWhereNumberIsValid.equals("ZZ")) {
+            // If we can't assign the phone number as definitely belonging to only one territory,
+            // then we return nothing.
+            return "";
+          }
+          regionWhereNumberIsValid = regionCode;
+        }
+      }
+      return getRegionDisplayName(regionWhereNumberIsValid, language);
+    }
+  }
+
+  /**
+   * Returns the customary display name in the given language for the given region.
+   */
+  private String getRegionDisplayName(String regionCode, Locale language) {
+    return (regionCode == null || regionCode.equals("ZZ") ||
+            regionCode.equals(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY))
+        ? "" : new Locale("", regionCode).getDisplayCountry(language);
+  }
+
+  /**
+   * Returns a text description for the given phone number, in the language provided. The
+   * description might consist of the name of the country where the phone number is from, or the
+   * name of the geographical area the phone number is from if more detailed information is
+   * available.
+   *
+   * <p>This method assumes the validity of the number passed in has already been checked, and that
+   * the number is suitable for geocoding. We consider fixed-line and mobile numbers possible
+   * candidates for geocoding.
+   *
+   * @param number  a valid phone number for which we want to get a text description
+   * @param languageCode  the language code for which the description should be written
+   * @return  a text description for the given language code for the given phone number
+   */
+  public String getDescriptionForValidNumber(PhoneNumber number, Locale languageCode) {
+    String langStr = languageCode.getLanguage();
+    String scriptStr = "";  // No script is specified
+    String regionStr = languageCode.getCountry();
+
+    String areaDescription;
+    String mobileToken = PhoneNumberUtil.getCountryMobileToken(number.getCountryCode());
+    String nationalNumber = phoneUtil.getNationalSignificantNumber(number);
+    if (!mobileToken.equals("") && nationalNumber.startsWith(mobileToken)) {
+      // In some countries, eg. Argentina, mobile numbers have a mobile token before the national
+      // destination code, this should be removed before geocoding.
+      nationalNumber = nationalNumber.substring(mobileToken.length());
+      String region = phoneUtil.getRegionCodeForCountryCode(number.getCountryCode());
+      PhoneNumber copiedNumber;
+      try {
+        copiedNumber = phoneUtil.parse(nationalNumber, region);
+      } catch (NumberParseException e) {
+        // If this happens, just reuse what we had.
+        copiedNumber = number;
+      }
+      areaDescription = prefixFileReader.getDescriptionForNumber(copiedNumber, langStr, scriptStr,
+                                                                 regionStr);
+    } else {
+      areaDescription = prefixFileReader.getDescriptionForNumber(number, langStr, scriptStr,
+                                                                 regionStr);
+    }
+    return (areaDescription.length() > 0)
+        ? areaDescription : getCountryNameForNumber(number, languageCode);
+  }
+
+  /**
+   * As per {@link #getDescriptionForValidNumber(PhoneNumber, Locale)} but also considers the
+   * region of the user. If the phone number is from the same region as the user, only a lower-level
+   * description will be returned, if one exists. Otherwise, the phone number's region will be
+   * returned, with optionally some more detailed information.
+   *
+   * <p>For example, for a user from the region "US" (United States), we would show "Mountain View,
+   * CA" for a particular number, omitting the United States from the description. For a user from
+   * the United Kingdom (region "GB"), for the same number we may show "Mountain View, CA, United
+   * States" or even just "United States".
+   *
+   * <p>This method assumes the validity of the number passed in has already been checked.
+   *
+   * @param number  the phone number for which we want to get a text description
+   * @param languageCode  the language code for which the description should be written
+   * @param userRegion  the region code for a given user. This region will be omitted from the
+   *     description if the phone number comes from this region. It is a two-letter uppercase ISO
+   *     country code as defined by ISO 3166-1.
+   * @return  a text description for the given language code for the given phone number, or empty
+   *     string if the number passed in is invalid
+   */
+  public String getDescriptionForValidNumber(PhoneNumber number, Locale languageCode,
+                                             String userRegion) {
+    // If the user region matches the number's region, then we just show the lower-level
+    // description, if one exists - if no description exists, we will show the region(country) name
+    // for the number.
+    String regionCode = phoneUtil.getRegionCodeForNumber(number);
+    if (userRegion.equals(regionCode)) {
+      return getDescriptionForValidNumber(number, languageCode);
+    }
+    // Otherwise, we just show the region(country) name for now.
+    return getRegionDisplayName(regionCode, languageCode);
+    // TODO: Concatenate the lower-level and country-name information in an appropriate
+    // way for each language.
+  }
+
+  /**
+   * As per {@link #getDescriptionForValidNumber(PhoneNumber, Locale)} but explicitly checks
+   * the validity of the number passed in.
+   *
+   * @param number  the phone number for which we want to get a text description
+   * @param languageCode  the language code for which the description should be written
+   * @return  a text description for the given language code for the given phone number, or empty
+   *     string if the number passed in is invalid
+   */
+  public String getDescriptionForNumber(PhoneNumber number, Locale languageCode) {
+    PhoneNumberType numberType = phoneUtil.getNumberType(number);
+    if (numberType == PhoneNumberType.UNKNOWN) {
+      return "";
+    } else if (!canBeGeocoded(numberType)) {
+      return getCountryNameForNumber(number, languageCode);
+    }
+    return getDescriptionForValidNumber(number, languageCode);
+  }
+
+  /**
+   * As per {@link #getDescriptionForValidNumber(PhoneNumber, Locale, String)} but
+   * explicitly checks the validity of the number passed in.
+   *
+   * @param number  the phone number for which we want to get a text description
+   * @param languageCode  the language code for which the description should be written
+   * @param userRegion  the region code for a given user. This region will be omitted from the
+   *     description if the phone number comes from this region. It is a two-letter uppercase ISO
+   *     country code as defined by ISO 3166-1.
+   * @return  a text description for the given language code for the given phone number, or empty
+   *     string if the number passed in is invalid
+   */
+  public String getDescriptionForNumber(PhoneNumber number, Locale languageCode,
+                                        String userRegion) {
+    PhoneNumberType numberType = phoneUtil.getNumberType(number);
+    if (numberType == PhoneNumberType.UNKNOWN) {
+      return "";
+    } else if (!canBeGeocoded(numberType)) {
+      return getCountryNameForNumber(number, languageCode);
+    }
+    return getDescriptionForValidNumber(number, languageCode, userRegion);
+  }
+
+  /**
+   * A similar method is implemented as PhoneNumberUtil.isNumberGeographical, which performs a
+   * stricter check, as it determines if a number has a geographical association. Also, if new
+   * phone number types were added, we should check if this other method should be updated too.
+   */
+  private boolean canBeGeocoded(PhoneNumberType numberType) {
+    return (numberType == PhoneNumberType.FIXED_LINE ||
+            numberType == PhoneNumberType.MOBILE ||
+            numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE);
+  }
+}
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1201_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1201_en
new file mode 100644
index 00000000..738cdda4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1201_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1202_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1202_en
new file mode 100644
index 00000000..306ce02d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1202_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1203_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1203_en
new file mode 100644
index 00000000..3d6b8884
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1203_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1204_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1204_en
new file mode 100644
index 00000000..e647f8b3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1204_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1205_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1205_en
new file mode 100644
index 00000000..158325dd
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1205_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1206_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1206_en
new file mode 100644
index 00000000..521632c8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1206_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1207_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1207_en
new file mode 100644
index 00000000..c0d7fed9
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1207_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1208_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1208_en
new file mode 100644
index 00000000..7902c882
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1208_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1209_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1209_en
new file mode 100644
index 00000000..342bd1d7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1209_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1210_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1210_en
new file mode 100644
index 00000000..519470dc
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1210_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1212_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1212_en
new file mode 100644
index 00000000..d4179c0b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1212_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1213_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1213_en
new file mode 100644
index 00000000..e7315ebf
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1213_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1214_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1214_en
new file mode 100644
index 00000000..24fe37e4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1214_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1215_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1215_en
new file mode 100644
index 00000000..5a82d6b2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1215_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1216_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1216_en
new file mode 100644
index 00000000..de9ae286
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1216_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1217_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1217_en
new file mode 100644
index 00000000..42ed99ba
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1217_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1218_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1218_en
new file mode 100644
index 00000000..69437c8b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1218_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1219_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1219_en
new file mode 100644
index 00000000..28d49d41
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1219_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1224_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1224_en
new file mode 100644
index 00000000..edc41d8b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1224_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1225_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1225_en
new file mode 100644
index 00000000..72a7e4fb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1225_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1226_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1226_en
new file mode 100644
index 00000000..7f2d4fa0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1226_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1228_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1228_en
new file mode 100644
index 00000000..30885966
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1228_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1229_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1229_en
new file mode 100644
index 00000000..d2c73766
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1229_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1231_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1231_en
new file mode 100644
index 00000000..b7239f43
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1231_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1234_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1234_en
new file mode 100644
index 00000000..cfa857a0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1234_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1236_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1236_en
new file mode 100644
index 00000000..40b369ea
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1236_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1239_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1239_en
new file mode 100644
index 00000000..fc09d69f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1239_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1240_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1240_en
new file mode 100644
index 00000000..ca467e2d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1240_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1242_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1242_en
new file mode 100644
index 00000000..cd7ef422
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1242_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1248_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1248_en
new file mode 100644
index 00000000..fce5b265
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1248_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1250_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1250_en
new file mode 100644
index 00000000..cb9032c7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1250_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1251_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1251_en
new file mode 100644
index 00000000..3b58823d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1251_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1252_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1252_en
new file mode 100644
index 00000000..e5b118bf
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1252_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1253_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1253_en
new file mode 100644
index 00000000..15fcfdce
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1253_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1254_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1254_en
new file mode 100644
index 00000000..7653a150
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1254_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1256_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1256_en
new file mode 100644
index 00000000..5ce57599
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1256_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1260_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1260_en
new file mode 100644
index 00000000..0f843a23
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1260_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1262_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1262_en
new file mode 100644
index 00000000..18fbe4d2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1262_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1267_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1267_en
new file mode 100644
index 00000000..5b7fc869
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1267_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1269_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1269_en
new file mode 100644
index 00000000..f3c9eb18
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1269_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1270_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1270_en
new file mode 100644
index 00000000..f08e69b9
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1270_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1272_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1272_en
new file mode 100644
index 00000000..6c7efbc1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1272_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1276_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1276_en
new file mode 100644
index 00000000..4f7afc7b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1276_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1281_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1281_en
new file mode 100644
index 00000000..e77e3dd6
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1281_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1289_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1289_en
new file mode 100644
index 00000000..3ad70c6b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1289_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1301_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1301_en
new file mode 100644
index 00000000..72ae4931
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1301_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1302_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1302_en
new file mode 100644
index 00000000..9a8f0d00
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1302_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1303_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1303_en
new file mode 100644
index 00000000..f8977e7e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1303_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1304_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1304_en
new file mode 100644
index 00000000..05affb87
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1304_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1305_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1305_en
new file mode 100644
index 00000000..4a712d25
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1305_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1306_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1306_en
new file mode 100644
index 00000000..3a098532
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1306_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1307_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1307_en
new file mode 100644
index 00000000..1e477134
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1307_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1308_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1308_en
new file mode 100644
index 00000000..0439103e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1308_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1309_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1309_en
new file mode 100644
index 00000000..a7b0ee3e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1309_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1310_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1310_en
new file mode 100644
index 00000000..a09548ed
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1310_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1312_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1312_en
new file mode 100644
index 00000000..9a2fdc62
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1312_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1313_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1313_en
new file mode 100644
index 00000000..499d4cc3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1313_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1314_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1314_en
new file mode 100644
index 00000000..87f62d6d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1314_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1315_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1315_en
new file mode 100644
index 00000000..99db4f4c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1315_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1316_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1316_en
new file mode 100644
index 00000000..99240c73
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1316_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1317_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1317_en
new file mode 100644
index 00000000..fbd34c30
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1317_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1318_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1318_en
new file mode 100644
index 00000000..3888496a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1318_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1319_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1319_en
new file mode 100644
index 00000000..0d26b462
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1319_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1320_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1320_en
new file mode 100644
index 00000000..ce98c697
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1320_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1321_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1321_en
new file mode 100644
index 00000000..f8292efb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1321_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1323_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1323_en
new file mode 100644
index 00000000..20b17999
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1323_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1325_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1325_en
new file mode 100644
index 00000000..46091edb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1325_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1330_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1330_en
new file mode 100644
index 00000000..1bda6b04
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1330_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1331_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1331_en
new file mode 100644
index 00000000..d5f7c6c7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1331_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1334_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1334_en
new file mode 100644
index 00000000..dd1fcfea
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1334_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1336_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1336_en
new file mode 100644
index 00000000..3208387a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1336_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1337_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1337_en
new file mode 100644
index 00000000..a1c297f8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1337_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1339_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1339_en
new file mode 100644
index 00000000..0c2e42ba
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1339_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en
new file mode 100644
index 00000000..829b666b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1345_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1346_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1346_en
new file mode 100644
index 00000000..a3176e2d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1346_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1347_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1347_en
new file mode 100644
index 00000000..9772cb5d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1347_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1351_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1351_en
new file mode 100644
index 00000000..eee213d2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1351_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1352_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1352_en
new file mode 100644
index 00000000..f001b758
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1352_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1360_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1360_en
new file mode 100644
index 00000000..ab3cde5c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1360_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1361_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1361_en
new file mode 100644
index 00000000..34d33174
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1361_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1364_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1364_en
new file mode 100644
index 00000000..238b4c9d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1364_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1365_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1365_en
new file mode 100644
index 00000000..89d25904
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1365_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1385_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1385_en
new file mode 100644
index 00000000..4a4c1bbc
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1385_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1386_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1386_en
new file mode 100644
index 00000000..32a565b8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1386_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1401_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1401_en
new file mode 100644
index 00000000..869fd4f5
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1401_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1402_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1402_en
new file mode 100644
index 00000000..3111cbcb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1402_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1403_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1403_en
new file mode 100644
index 00000000..89a2736d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1403_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1404_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1404_en
new file mode 100644
index 00000000..7eeefe84
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1404_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1405_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1405_en
new file mode 100644
index 00000000..bf440cd4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1405_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1406_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1406_en
new file mode 100644
index 00000000..aa6c0e92
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1406_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1407_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1407_en
new file mode 100644
index 00000000..aa31c190
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1407_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1408_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1408_en
new file mode 100644
index 00000000..3e4ce5f1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1408_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1409_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1409_en
new file mode 100644
index 00000000..80d7719d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1409_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1410_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1410_en
new file mode 100644
index 00000000..66ad9dd2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1410_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1412_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1412_en
new file mode 100644
index 00000000..7b81a344
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1412_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1413_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1413_en
new file mode 100644
index 00000000..c22672ca
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1413_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1414_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1414_en
new file mode 100644
index 00000000..e3fbda6a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1414_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1415_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1415_en
new file mode 100644
index 00000000..0ec8c740
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1415_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1416_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1416_en
new file mode 100644
index 00000000..f5472754
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1416_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1417_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1417_en
new file mode 100644
index 00000000..148e1a23
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1417_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en
new file mode 100644
index 00000000..b08761e0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1418_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1419_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1419_en
new file mode 100644
index 00000000..c9b6308a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1419_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1423_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1423_en
new file mode 100644
index 00000000..3a8bc445
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1423_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1424_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1424_en
new file mode 100644
index 00000000..83a2cb4c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1424_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1425_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1425_en
new file mode 100644
index 00000000..60a11109
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1425_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1430_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1430_en
new file mode 100644
index 00000000..eb8782d3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1430_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1431_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1431_en
new file mode 100644
index 00000000..412c0099
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1431_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1432_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1432_en
new file mode 100644
index 00000000..81d3c8f5
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1432_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1434_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1434_en
new file mode 100644
index 00000000..4ab7d913
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1434_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1435_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1435_en
new file mode 100644
index 00000000..44c0dcca
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1435_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1437_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1437_en
new file mode 100644
index 00000000..99927565
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1437_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en
new file mode 100644
index 00000000..fe31ca94
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1438_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1440_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1440_en
new file mode 100644
index 00000000..1aeb7166
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1440_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1441_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1441_en
new file mode 100644
index 00000000..024ff727
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1441_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1443_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1443_en
new file mode 100644
index 00000000..ab579a42
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1443_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en
new file mode 100644
index 00000000..6e4ea08d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1450_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1469_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1469_en
new file mode 100644
index 00000000..5c9aea93
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1469_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1478_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1478_en
new file mode 100644
index 00000000..7a69e9f3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1478_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1479_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1479_en
new file mode 100644
index 00000000..24f94405
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1479_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1480_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1480_en
new file mode 100644
index 00000000..2301d36f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1480_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1484_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1484_en
new file mode 100644
index 00000000..b99d7f82
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1484_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1501_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1501_en
new file mode 100644
index 00000000..e713b7eb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1501_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1502_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1502_en
new file mode 100644
index 00000000..97e9a538
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1502_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1503_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1503_en
new file mode 100644
index 00000000..2e242a11
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1503_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1504_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1504_en
new file mode 100644
index 00000000..54fae9f2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1504_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1505_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1505_en
new file mode 100644
index 00000000..48ea3e9c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1505_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1506_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1506_en
new file mode 100644
index 00000000..eaa8495f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1506_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1507_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1507_en
new file mode 100644
index 00000000..635ee6ee
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1507_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1508_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1508_en
new file mode 100644
index 00000000..dadeaee6
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1508_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1509_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1509_en
new file mode 100644
index 00000000..a789b7fc
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1509_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1510_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1510_en
new file mode 100644
index 00000000..432422c7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1510_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1512_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1512_en
new file mode 100644
index 00000000..779bc543
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1512_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1513_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1513_en
new file mode 100644
index 00000000..01fc83f8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1513_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en
new file mode 100644
index 00000000..b0540cc8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1514_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1515_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1515_en
new file mode 100644
index 00000000..fe792674
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1515_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1516_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1516_en
new file mode 100644
index 00000000..a7b13149
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1516_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1517_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1517_en
new file mode 100644
index 00000000..5e494026
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1517_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1518_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1518_en
new file mode 100644
index 00000000..be1f0f27
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1518_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1519_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1519_en
new file mode 100644
index 00000000..c43ecd62
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1519_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1520_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1520_en
new file mode 100644
index 00000000..2099e178
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1520_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1530_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1530_en
new file mode 100644
index 00000000..77da7752
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1530_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1540_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1540_en
new file mode 100644
index 00000000..5a04caad
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1540_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1541_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1541_en
new file mode 100644
index 00000000..7cae6ee0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1541_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1551_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1551_en
new file mode 100644
index 00000000..e36fbbc7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1551_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1559_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1559_en
new file mode 100644
index 00000000..cc00fa04
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1559_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1561_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1561_en
new file mode 100644
index 00000000..d58e47e7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1561_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1562_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1562_en
new file mode 100644
index 00000000..fbc2449a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1562_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1563_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1563_en
new file mode 100644
index 00000000..f9c826c0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1563_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1567_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1567_en
new file mode 100644
index 00000000..4c005b5b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1567_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1570_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1570_en
new file mode 100644
index 00000000..7ef5fe11
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1570_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1571_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1571_en
new file mode 100644
index 00000000..f5fe1946
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1571_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1573_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1573_en
new file mode 100644
index 00000000..97b51753
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1573_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1574_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1574_en
new file mode 100644
index 00000000..fdb404bf
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1574_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1575_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1575_en
new file mode 100644
index 00000000..7c8652ce
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1575_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1580_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1580_en
new file mode 100644
index 00000000..012895f0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1580_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1585_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1585_en
new file mode 100644
index 00000000..665bb8f4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1585_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1586_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1586_en
new file mode 100644
index 00000000..a61668b8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1586_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1587_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1587_en
new file mode 100644
index 00000000..71f8a244
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1587_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1601_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1601_en
new file mode 100644
index 00000000..b034d16f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1601_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1602_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1602_en
new file mode 100644
index 00000000..00c8e9b2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1602_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1603_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1603_en
new file mode 100644
index 00000000..d38464df
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1603_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1604_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1604_en
new file mode 100644
index 00000000..74485d77
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1604_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1605_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1605_en
new file mode 100644
index 00000000..65c3b6c2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1605_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1606_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1606_en
new file mode 100644
index 00000000..7fed3337
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1606_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1607_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1607_en
new file mode 100644
index 00000000..15c1d79a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1607_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1608_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1608_en
new file mode 100644
index 00000000..e83d1e2b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1608_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1609_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1609_en
new file mode 100644
index 00000000..0caab169
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1609_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1610_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1610_en
new file mode 100644
index 00000000..960b47f3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1610_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1612_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1612_en
new file mode 100644
index 00000000..c9f788b2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1612_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1613_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1613_en
new file mode 100644
index 00000000..9002423a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1613_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1614_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1614_en
new file mode 100644
index 00000000..1d67ea5f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1614_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1615_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1615_en
new file mode 100644
index 00000000..df22b4b9
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1615_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1616_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1616_en
new file mode 100644
index 00000000..572dee9a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1616_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1617_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1617_en
new file mode 100644
index 00000000..a2cbbd3f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1617_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1618_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1618_en
new file mode 100644
index 00000000..068f5548
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1618_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1619_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1619_en
new file mode 100644
index 00000000..a5bfd6a4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1619_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1620_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1620_en
new file mode 100644
index 00000000..558f9b0b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1620_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1623_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1623_en
new file mode 100644
index 00000000..7294c6a1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1623_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1626_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1626_en
new file mode 100644
index 00000000..fb16596c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1626_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1630_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1630_en
new file mode 100644
index 00000000..38dfc005
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1630_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1631_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1631_en
new file mode 100644
index 00000000..43200ef4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1631_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1636_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1636_en
new file mode 100644
index 00000000..c2a81083
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1636_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1639_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1639_en
new file mode 100644
index 00000000..090d2b4e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1639_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1641_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1641_en
new file mode 100644
index 00000000..029375f0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1641_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1646_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1646_en
new file mode 100644
index 00000000..c064ba3e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1646_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1647_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1647_en
new file mode 100644
index 00000000..c000f64a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1647_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1649_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1649_en
new file mode 100644
index 00000000..0c11495e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1649_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1650_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1650_en
new file mode 100644
index 00000000..55293fb4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1650_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1651_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1651_en
new file mode 100644
index 00000000..3397a0e7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1651_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1657_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1657_en
new file mode 100644
index 00000000..dd7858f0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1657_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1660_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1660_en
new file mode 100644
index 00000000..5ae69087
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1660_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1661_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1661_en
new file mode 100644
index 00000000..e8a6159a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1661_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1662_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1662_en
new file mode 100644
index 00000000..4ab9592e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1662_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1667_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1667_en
new file mode 100644
index 00000000..878e9f06
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1667_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1669_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1669_en
new file mode 100644
index 00000000..b3bf8a03
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1669_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1671_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1671_en
new file mode 100644
index 00000000..df13b7a3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1671_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1678_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1678_en
new file mode 100644
index 00000000..b2d0b540
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1678_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1682_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1682_en
new file mode 100644
index 00000000..b98d356c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1682_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1701_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1701_en
new file mode 100644
index 00000000..0b8af901
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1701_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1702_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1702_en
new file mode 100644
index 00000000..3e20271d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1702_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1703_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1703_en
new file mode 100644
index 00000000..80838a86
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1703_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1704_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1704_en
new file mode 100644
index 00000000..40eba184
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1704_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1705_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1705_en
new file mode 100644
index 00000000..2ab1c139
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1705_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1706_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1706_en
new file mode 100644
index 00000000..4d8dd1ce
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1706_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1707_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1707_en
new file mode 100644
index 00000000..51812dc7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1707_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1708_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1708_en
new file mode 100644
index 00000000..5b8ccb11
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1708_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1709_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1709_en
new file mode 100644
index 00000000..c095549d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1709_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1712_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1712_en
new file mode 100644
index 00000000..3fa32c8f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1712_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1713_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1713_en
new file mode 100644
index 00000000..c301aa23
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1713_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1714_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1714_en
new file mode 100644
index 00000000..755a74ab
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1714_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1715_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1715_en
new file mode 100644
index 00000000..bcfd9cee
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1715_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1716_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1716_en
new file mode 100644
index 00000000..a6b3ee68
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1716_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1717_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1717_en
new file mode 100644
index 00000000..3a33a093
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1717_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1718_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1718_en
new file mode 100644
index 00000000..40d8db1b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1718_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1719_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1719_en
new file mode 100644
index 00000000..f4a7431f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1719_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1720_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1720_en
new file mode 100644
index 00000000..fbd0050d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1720_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1724_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1724_en
new file mode 100644
index 00000000..344a46b5
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1724_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1725_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1725_en
new file mode 100644
index 00000000..98690d00
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1725_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1726_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1726_en
new file mode 100644
index 00000000..cb81e2d6
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1726_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1727_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1727_en
new file mode 100644
index 00000000..6e36ae35
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1727_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1730_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1730_en
new file mode 100644
index 00000000..a2db58d4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1730_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1731_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1731_en
new file mode 100644
index 00000000..965cf8e4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1731_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1732_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1732_en
new file mode 100644
index 00000000..efacd565
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1732_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1734_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1734_en
new file mode 100644
index 00000000..8647b390
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1734_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1737_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1737_en
new file mode 100644
index 00000000..6477b15b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1737_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1740_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1740_en
new file mode 100644
index 00000000..beb9874b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1740_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1754_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1754_en
new file mode 100644
index 00000000..701f6a87
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1754_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1757_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1757_en
new file mode 100644
index 00000000..d84adf9f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1757_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1760_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1760_en
new file mode 100644
index 00000000..d0c02cf1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1760_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1763_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1763_en
new file mode 100644
index 00000000..99456c69
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1763_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1765_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1765_en
new file mode 100644
index 00000000..84224360
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1765_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1769_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1769_en
new file mode 100644
index 00000000..2c1e5e81
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1769_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1770_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1770_en
new file mode 100644
index 00000000..a45e61c9
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1770_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1772_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1772_en
new file mode 100644
index 00000000..aedb9a9d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1772_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1773_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1773_en
new file mode 100644
index 00000000..3b5cb28a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1773_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1774_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1774_en
new file mode 100644
index 00000000..f57d6def
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1774_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1775_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1775_en
new file mode 100644
index 00000000..ce1ba5aa
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1775_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1778_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1778_en
new file mode 100644
index 00000000..d43286ed
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1778_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1779_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1779_en
new file mode 100644
index 00000000..ad2a62fa
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1779_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1780_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1780_en
new file mode 100644
index 00000000..3848d35a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1780_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1781_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1781_en
new file mode 100644
index 00000000..1b58baa5
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1781_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1782_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1782_en
new file mode 100644
index 00000000..4968fec9
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1782_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1785_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1785_en
new file mode 100644
index 00000000..95554808
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1785_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1786_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1786_en
new file mode 100644
index 00000000..6dcf1c58
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1786_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1801_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1801_en
new file mode 100644
index 00000000..64549a1f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1801_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1802_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1802_en
new file mode 100644
index 00000000..eeb00b94
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1802_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1803_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1803_en
new file mode 100644
index 00000000..a2a4e7bb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1803_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1804_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1804_en
new file mode 100644
index 00000000..28a4bb74
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1804_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1805_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1805_en
new file mode 100644
index 00000000..3a548df7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1805_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1806_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1806_en
new file mode 100644
index 00000000..f0ae9e93
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1806_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1807_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1807_en
new file mode 100644
index 00000000..d9cd36a2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1807_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1808_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1808_en
new file mode 100644
index 00000000..628d574d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1808_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1809_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1809_en
new file mode 100644
index 00000000..09461ba5
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1809_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1810_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1810_en
new file mode 100644
index 00000000..277ba1d3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1810_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1812_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1812_en
new file mode 100644
index 00000000..b5f9fd0f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1812_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1813_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1813_en
new file mode 100644
index 00000000..46aa88c9
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1813_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1814_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1814_en
new file mode 100644
index 00000000..537f281b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1814_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1815_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1815_en
new file mode 100644
index 00000000..e8c30266
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1815_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1816_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1816_en
new file mode 100644
index 00000000..7acae722
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1816_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1817_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1817_en
new file mode 100644
index 00000000..82f654c3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1817_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1818_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1818_en
new file mode 100644
index 00000000..2d0de5a7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1818_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en
new file mode 100644
index 00000000..cf175f9d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1819_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1828_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1828_en
new file mode 100644
index 00000000..cfd33731
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1828_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1830_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1830_en
new file mode 100644
index 00000000..9be7aee7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1830_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1831_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1831_en
new file mode 100644
index 00000000..4000106b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1831_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1832_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1832_en
new file mode 100644
index 00000000..b6184a12
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1832_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1838_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1838_en
new file mode 100644
index 00000000..ff902cef
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1838_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1843_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1843_en
new file mode 100644
index 00000000..5002c7e5
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1843_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1845_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1845_en
new file mode 100644
index 00000000..06e92691
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1845_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1847_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1847_en
new file mode 100644
index 00000000..4dfd7a2a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1847_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1848_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1848_en
new file mode 100644
index 00000000..ca5aca79
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1848_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1850_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1850_en
new file mode 100644
index 00000000..9c4cc441
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1850_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1851_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1851_en
new file mode 100644
index 00000000..8523ef39
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1851_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1856_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1856_en
new file mode 100644
index 00000000..1811dbe5
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1856_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1857_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1857_en
new file mode 100644
index 00000000..708b2d1f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1857_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1858_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1858_en
new file mode 100644
index 00000000..2d5c23f1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1858_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1859_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1859_en
new file mode 100644
index 00000000..ad06fab0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1859_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1860_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1860_en
new file mode 100644
index 00000000..fd33cb4f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1860_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1862_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1862_en
new file mode 100644
index 00000000..79757a71
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1862_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1863_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1863_en
new file mode 100644
index 00000000..49d58b19
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1863_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1864_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1864_en
new file mode 100644
index 00000000..2b49e914
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1864_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1865_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1865_en
new file mode 100644
index 00000000..0154f4cf
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1865_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
new file mode 100644
index 00000000..3623f93c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1870_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1870_en
new file mode 100644
index 00000000..000d8695
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1870_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1872_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1872_en
new file mode 100644
index 00000000..e851d4b3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1872_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1873_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1873_en
new file mode 100644
index 00000000..78e7da11
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1873_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1876_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1876_en
new file mode 100644
index 00000000..38e4ad8c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1876_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1878_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1878_en
new file mode 100644
index 00000000..676f6785
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1878_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1888_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1888_en
new file mode 100644
index 00000000..47068cb6
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1888_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1901_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1901_en
new file mode 100644
index 00000000..ddd65ed8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1901_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1902_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1902_en
new file mode 100644
index 00000000..6184bed1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1902_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1903_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1903_en
new file mode 100644
index 00000000..0129a4b1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1903_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1904_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1904_en
new file mode 100644
index 00000000..32c15fe2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1904_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1905_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1905_en
new file mode 100644
index 00000000..0e353e67
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1905_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1906_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1906_en
new file mode 100644
index 00000000..bd9ffcbd
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1906_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1907_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1907_en
new file mode 100644
index 00000000..6be26e46
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1907_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1908_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1908_en
new file mode 100644
index 00000000..962ce38c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1908_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1909_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1909_en
new file mode 100644
index 00000000..16136715
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1909_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1910_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1910_en
new file mode 100644
index 00000000..5b3f3b6f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1910_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1912_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1912_en
new file mode 100644
index 00000000..9900df17
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1912_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1913_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1913_en
new file mode 100644
index 00000000..c4b3a01f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1913_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1914_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1914_en
new file mode 100644
index 00000000..dc95cd0d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1914_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1915_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1915_en
new file mode 100644
index 00000000..3dcc8a78
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1915_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1916_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1916_en
new file mode 100644
index 00000000..85d11f9e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1916_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1917_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1917_en
new file mode 100644
index 00000000..f1b0a2c4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1917_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1918_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1918_en
new file mode 100644
index 00000000..ffd1762f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1918_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1919_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1919_en
new file mode 100644
index 00000000..8d101db8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1919_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1920_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1920_en
new file mode 100644
index 00000000..60087ad1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1920_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1925_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1925_en
new file mode 100644
index 00000000..961bc02d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1925_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1928_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1928_en
new file mode 100644
index 00000000..377cb359
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1928_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1929_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1929_en
new file mode 100644
index 00000000..9662e515
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1929_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1930_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1930_en
new file mode 100644
index 00000000..bf6ba805
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1930_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1931_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1931_en
new file mode 100644
index 00000000..74ee4729
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1931_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1936_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1936_en
new file mode 100644
index 00000000..4e664207
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1936_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1937_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1937_en
new file mode 100644
index 00000000..c727bf7d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1937_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1938_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1938_en
new file mode 100644
index 00000000..764aedae
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1938_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1940_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1940_en
new file mode 100644
index 00000000..54cbd5fa
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1940_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1941_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1941_en
new file mode 100644
index 00000000..ff9beacb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1941_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1947_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1947_en
new file mode 100644
index 00000000..f553708e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1947_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1949_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1949_en
new file mode 100644
index 00000000..cfc39a60
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1949_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1951_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1951_en
new file mode 100644
index 00000000..847e6f63
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1951_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1952_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1952_en
new file mode 100644
index 00000000..eaaf0b25
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1952_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1954_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1954_en
new file mode 100644
index 00000000..3fefdbd3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1954_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1956_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1956_en
new file mode 100644
index 00000000..9cc12fce
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1956_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1959_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1959_en
new file mode 100644
index 00000000..3126e192
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1959_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1970_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1970_en
new file mode 100644
index 00000000..ebb2e3bf
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1970_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1971_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1971_en
new file mode 100644
index 00000000..30530d01
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1971_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1972_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1972_en
new file mode 100644
index 00000000..d77b65cd
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1972_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1973_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1973_en
new file mode 100644
index 00000000..a37c0223
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1973_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1978_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1978_en
new file mode 100644
index 00000000..c2f0bd4d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1978_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1979_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1979_en
new file mode 100644
index 00000000..f778a259
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1979_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1980_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1980_en
new file mode 100644
index 00000000..9855e155
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1980_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1984_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1984_en
new file mode 100644
index 00000000..917d3510
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1984_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1985_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1985_en
new file mode 100644
index 00000000..8d3b3b21
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1985_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1989_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1989_en
new file mode 100644
index 00000000..e5c08979
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1989_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/20_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/20_en
new file mode 100644
index 00000000..17bd9a6e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/20_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
new file mode 100644
index 00000000..ad7f9448
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_fr
new file mode 100644
index 00000000..9016b0d0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/213_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/213_en
new file mode 100644
index 00000000..7a1379ca
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/213_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en
new file mode 100644
index 00000000..9af2d13e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/216_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/220_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/220_en
new file mode 100644
index 00000000..ce7ed8b0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/220_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en
new file mode 100644
index 00000000..87a8cc14
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/221_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/222_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/222_en
new file mode 100644
index 00000000..7b4ec365
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/222_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/222_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/222_fr
new file mode 100644
index 00000000..ceb08709
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/222_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en
new file mode 100644
index 00000000..1a9cae3c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/224_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en
new file mode 100644
index 00000000..e290e50a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_fr
new file mode 100644
index 00000000..e290e50a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/226_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/226_en
new file mode 100644
index 00000000..0b5db051
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/226_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/228_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/228_en
new file mode 100644
index 00000000..192a5d76
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/228_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/228_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/228_es
new file mode 100644
index 00000000..7c124ef8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/228_es
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/228_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/228_fr
new file mode 100644
index 00000000..884ca420
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/228_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/229_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/229_en
new file mode 100644
index 00000000..21b5b826
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/229_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/229_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/229_fr
new file mode 100644
index 00000000..6002a86e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/229_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/230_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/230_en
new file mode 100644
index 00000000..3cf32590
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/230_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/230_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/230_es
new file mode 100644
index 00000000..49f20509
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/230_es
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/230_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/230_fr
new file mode 100644
index 00000000..bf51072e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/230_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/232_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/232_en
new file mode 100644
index 00000000..9cb39963
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/232_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en
new file mode 100644
index 00000000..726d581a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/234_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/234_en
new file mode 100644
index 00000000..da1af172
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/234_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/237_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/237_en
new file mode 100644
index 00000000..28ac500d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/237_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_en
new file mode 100644
index 00000000..092d85a4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_pt
new file mode 100644
index 00000000..092d85a4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_pt
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/239_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/239_en
new file mode 100644
index 00000000..37a5e898
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/239_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/239_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/239_pt
new file mode 100644
index 00000000..8610e0ae
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/239_pt
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en
new file mode 100644
index 00000000..08484279
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/241_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/242_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/242_en
new file mode 100644
index 00000000..2ad2a1a1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/242_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/242_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/242_fr
new file mode 100644
index 00000000..2ad2a1a1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/242_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/243_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/243_en
new file mode 100644
index 00000000..14b51a0f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/243_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/243_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/243_fr
new file mode 100644
index 00000000..ac48d421
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/243_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/244_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/244_en
new file mode 100644
index 00000000..7234500a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/244_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/244_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/244_pt
new file mode 100644
index 00000000..0395f3ec
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/244_pt
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_en
new file mode 100644
index 00000000..377f1634
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_pt
new file mode 100644
index 00000000..40171fab
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_pt
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/247_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/247_en
new file mode 100644
index 00000000..259944a0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/247_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/249_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/249_en
new file mode 100644
index 00000000..d605df87
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/249_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
new file mode 100644
index 00000000..e389d1c3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/252_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/252_en
new file mode 100644
index 00000000..241ed680
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/252_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en
new file mode 100644
index 00000000..3b413f6e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/256_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/256_en
new file mode 100644
index 00000000..6043317b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/256_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/257_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/257_en
new file mode 100644
index 00000000..3debe94f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/257_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/258_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/258_en
new file mode 100644
index 00000000..6f11df70
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/258_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/258_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/258_pt
new file mode 100644
index 00000000..18ddf2e4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/258_pt
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/260_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/260_en
new file mode 100644
index 00000000..b469b168
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/260_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/261_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/261_en
new file mode 100644
index 00000000..af8affbf
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/261_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/263_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/263_en
new file mode 100644
index 00000000..5df9b2fe
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/263_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en
new file mode 100644
index 00000000..6ea2c2b4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/266_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/266_en
new file mode 100644
index 00000000..3fc9c6f4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/266_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en
new file mode 100644
index 00000000..4c52bd27
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/267_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/268_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/268_en
new file mode 100644
index 00000000..16067ff6
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/268_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/269_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/269_en
new file mode 100644
index 00000000..bbc053b0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/269_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/269_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/269_fr
new file mode 100644
index 00000000..bbc053b0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/269_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en
new file mode 100644
index 00000000..39d41a0a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en
new file mode 100644
index 00000000..b65865d7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr
new file mode 100644
index 00000000..a9df7876
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/299_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/299_en
new file mode 100644
index 00000000..2e0fee59
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/299_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/30_el b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/30_el
new file mode 100644
index 00000000..5f26cf5a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/30_el
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/30_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/30_en
new file mode 100644
index 00000000..4d7e2199
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/30_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/31_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/31_en
new file mode 100644
index 00000000..7565cac2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/31_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/31_nl b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/31_nl
new file mode 100644
index 00000000..dc25957f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/31_nl
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/32_de b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/32_de
new file mode 100644
index 00000000..e4830502
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/32_de
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/32_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/32_en
new file mode 100644
index 00000000..8b04552d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/32_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/32_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/32_fr
new file mode 100644
index 00000000..23df1d74
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/32_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/32_nl b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/32_nl
new file mode 100644
index 00000000..4f4f0d98
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/32_nl
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en
new file mode 100644
index 00000000..c8f107f1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr
new file mode 100644
index 00000000..e6424bbf
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
new file mode 100644
index 00000000..2af5897e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
new file mode 100644
index 00000000..c03c3ac6
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/351_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/351_en
new file mode 100644
index 00000000..61f0da1e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/351_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/351_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/351_pt
new file mode 100644
index 00000000..eb08045e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/351_pt
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_de b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_de
new file mode 100644
index 00000000..d4de4f8d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_de
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en
new file mode 100644
index 00000000..09aa464b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_fr
new file mode 100644
index 00000000..dbadfaf3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/352_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en
new file mode 100644
index 00000000..b207f523
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/353_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en
new file mode 100644
index 00000000..2e85aa2a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/354_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/355_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/355_en
new file mode 100644
index 00000000..5275f69c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/355_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en
new file mode 100644
index 00000000..a4b84ac1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi
new file mode 100644
index 00000000..3824cfb6
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se
new file mode 100644
index 00000000..b016fc3c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/359_bg b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/359_bg
new file mode 100644
index 00000000..11573e00
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/359_bg
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/359_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/359_en
new file mode 100644
index 00000000..7daae272
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/359_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/36_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/36_en
new file mode 100644
index 00000000..d9f2a718
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/36_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/36_hu b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/36_hu
new file mode 100644
index 00000000..6eaf1515
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/36_hu
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/370_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/370_en
new file mode 100644
index 00000000..52b47bd3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/370_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/371_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/371_en
new file mode 100644
index 00000000..5273f0e7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/371_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/372_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/372_en
new file mode 100644
index 00000000..aaaa3388
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/372_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/373_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/373_en
new file mode 100644
index 00000000..9ef1b6e4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/373_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/373_ro b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/373_ro
new file mode 100644
index 00000000..3ef4931d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/373_ro
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/373_ru b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/373_ru
new file mode 100644
index 00000000..b6438217
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/373_ru
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_am b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_am
new file mode 100644
index 00000000..edb84d2f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_am
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en
new file mode 100644
index 00000000..24f46fd1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru
new file mode 100644
index 00000000..82ec2871
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/374_ru
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/375_be b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/375_be
new file mode 100644
index 00000000..9c06e9ca
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/375_be
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/375_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/375_en
new file mode 100644
index 00000000..41b5f4e7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/375_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/375_ru b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/375_ru
new file mode 100644
index 00000000..0f1489a6
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/375_ru
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/381_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/381_en
new file mode 100644
index 00000000..8cde57a4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/381_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/381_sr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/381_sr
new file mode 100644
index 00000000..2a5deaaa
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/381_sr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/389_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/389_en
new file mode 100644
index 00000000..e3b6913d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/389_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/39_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/39_en
new file mode 100644
index 00000000..fada2f31
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/39_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/39_it b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/39_it
new file mode 100644
index 00000000..db326827
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/39_it
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/40_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/40_en
new file mode 100644
index 00000000..d5704a30
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/40_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/40_ro b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/40_ro
new file mode 100644
index 00000000..6c565379
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/40_ro
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/41_de b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/41_de
new file mode 100644
index 00000000..e62c7976
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/41_de
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/41_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/41_en
new file mode 100644
index 00000000..79ab0868
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/41_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/41_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/41_fr
new file mode 100644
index 00000000..6fb2df85
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/41_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/41_it b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/41_it
new file mode 100644
index 00000000..9cc1e5bb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/41_it
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/420_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/420_en
new file mode 100644
index 00000000..6e39c435
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/420_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/421_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/421_en
new file mode 100644
index 00000000..5a5dc092
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/421_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_de b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_de
new file mode 100644
index 00000000..5687e970
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_de
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_en
new file mode 100644
index 00000000..050418d6
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/43_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en
new file mode 100644
index 00000000..3a2d306a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en
new file mode 100644
index 00000000..934bb3ef
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_sv b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_sv
new file mode 100644
index 00000000..31a27a8d
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/46_sv
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en
new file mode 100644
index 00000000..765f730b
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/47_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/48_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/48_en
new file mode 100644
index 00000000..969da0c5
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/48_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/48_pl b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/48_pl
new file mode 100644
index 00000000..cd5eb5a9
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/48_pl
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de
new file mode 100644
index 00000000..428b8bf3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_de
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en
new file mode 100644
index 00000000..ec5c04ea
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/49_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/51_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/51_en
new file mode 100644
index 00000000..7f84d3eb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/51_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/53_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/53_en
new file mode 100644
index 00000000..5d158674
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/53_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
new file mode 100644
index 00000000..01e66926
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_es
new file mode 100644
index 00000000..afd958be
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/54_es
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
new file mode 100644
index 00000000..61697eb3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt
new file mode 100644
index 00000000..753576a8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
new file mode 100644
index 00000000..074b9d7a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
new file mode 100644
index 00000000..f55b59f5
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en
new file mode 100644
index 00000000..347d96b7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_en
new file mode 100644
index 00000000..9c7a7876
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es
new file mode 100644
index 00000000..84078161
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/58_es
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en
new file mode 100644
index 00000000..8e5d390f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/599_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_en
new file mode 100644
index 00000000..557ddf77
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_id b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_id
new file mode 100644
index 00000000..b73d9516
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_id
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_en
new file mode 100644
index 00000000..cb2807d7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_th b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_th
new file mode 100644
index 00000000..5e86e0b5
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/66_th
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en
new file mode 100644
index 00000000..ed10d040
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en
new file mode 100644
index 00000000..becd121f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru
new file mode 100644
index 00000000..746a1c64
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_en
new file mode 100644
index 00000000..bb2776fe
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_ja b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_ja
new file mode 100644
index 00000000..7cc73840
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/81_ja
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ar b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ar
new file mode 100644
index 00000000..10f1725a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ar
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_cs b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_cs
new file mode 100644
index 00000000..bf568876
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_cs
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_en
new file mode 100644
index 00000000..96a01658
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_fr
new file mode 100644
index 00000000..dea606c8
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_fr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ko b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ko
new file mode 100644
index 00000000..e833c20f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ko
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_zh b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_zh
new file mode 100644
index 00000000..6e53fd69
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_zh
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_zh_Hant b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_zh_Hant
new file mode 100644
index 00000000..6559ae2f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_zh_Hant
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en
new file mode 100644
index 00000000..52217295
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_vi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_vi
new file mode 100644
index 00000000..1b0e2d77
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_vi
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en
new file mode 100644
index 00000000..8fd663bf
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh
new file mode 100644
index 00000000..406d8511
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en
new file mode 100644
index 00000000..7bed31bb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
new file mode 100644
index 00000000..d04e3abd
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh_Hant b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh_Hant
new file mode 100644
index 00000000..eb259e9f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/886_zh_Hant
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/90_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/90_en
new file mode 100644
index 00000000..a3dfd818
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/90_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/90_tr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/90_tr
new file mode 100644
index 00000000..cfcf99a0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/90_tr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
new file mode 100644
index 00000000..b7da96af
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/94_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/94_en
new file mode 100644
index 00000000..0794d2a1
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/94_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en
new file mode 100644
index 00000000..37a2bf85
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/962_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/966_ar b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/966_ar
new file mode 100644
index 00000000..a3cb5d15
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/966_ar
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/966_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/966_en
new file mode 100644
index 00000000..2e8d655a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/966_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en
new file mode 100644
index 00000000..e6995f46
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa
new file mode 100644
index 00000000..00da41f7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
new file mode 100644
index 00000000..df72e10c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
diff --git a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
new file mode 100644
index 00000000..aa574da0
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
diff --git a/geocoder/test/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapperTest.java b/geocoder/test/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapperTest.java
new file mode 100644
index 00000000..8bb3423d
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapperTest.java
@@ -0,0 +1,136 @@
+/*
+ * 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.
+ */
+
+package com.google.i18n.phonenumbers;
+
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Unit tests for PhoneNumberToTimeZonesMapper.java
+ *
+ * @author Walter Erquinigo
+ */
+public class PhoneNumberToTimeZonesMapperTest extends TestCase {
+  private final PhoneNumberToTimeZonesMapper prefixTimeZonesMapper =
+      new PhoneNumberToTimeZonesMapper(TEST_MAPPING_DATA_DIRECTORY);
+  private static final String TEST_MAPPING_DATA_DIRECTORY =
+      "/com/google/i18n/phonenumbers/timezones/testing_data/";
+  // Set up some test numbers to re-use.
+  private static final PhoneNumber AU_NUMBER =
+      new PhoneNumber().setCountryCode(61).setNationalNumber(236618300L);
+  private static final PhoneNumber CA_NUMBER =
+      new PhoneNumber().setCountryCode(1).setNationalNumber(6048406565L);
+  private static final PhoneNumber KO_NUMBER =
+      new PhoneNumber().setCountryCode(82).setNationalNumber(22123456L);
+  private static final PhoneNumber KO_INVALID_NUMBER =
+      new PhoneNumber().setCountryCode(82).setNationalNumber(1234L);
+  private static final PhoneNumber US_NUMBER1 =
+      new PhoneNumber().setCountryCode(1).setNationalNumber(6509600000L);
+  private static final PhoneNumber US_NUMBER2 =
+      new PhoneNumber().setCountryCode(1).setNationalNumber(2128120000L);
+  private static final PhoneNumber US_NUMBER3 =
+      new PhoneNumber().setCountryCode(1).setNationalNumber(6174240000L);
+  private static final PhoneNumber US_INVALID_NUMBER =
+      new PhoneNumber().setCountryCode(1).setNationalNumber(123456789L);
+  private static final PhoneNumber NUMBER_WITH_INVALID_COUNTRY_CODE =
+      new PhoneNumber().setCountryCode(999).setNationalNumber(2423651234L);
+  private static final PhoneNumber INTERNATIONAL_TOLL_FREE =
+      new PhoneNumber().setCountryCode(800).setNationalNumber(12345678L);
+
+  // NANPA time zones.
+  private static final String CHICAGO_TZ = "America/Chicago";
+  private static final String LOS_ANGELES_TZ = "America/Los_Angeles";
+  private static final String NEW_YORK_TZ = "America/New_York";
+  private static final String WINNIPEG_TZ = "America/Winnipeg";
+  // Non NANPA time zones.
+  private static final String SEOUL_TZ = "Asia/Seoul";
+  private static final String SYDNEY_TZ = "Australia/Sydney";
+
+  static List<String> buildListOfTimeZones(String ... timezones) {
+    ArrayList<String> timezonesList = new ArrayList<String>(timezones.length);
+    for (String timezone : timezones) {
+      timezonesList.add(timezone);
+    }
+    return timezonesList;
+  }
+
+  private static List<String> getNanpaTimeZonesList() {
+    return buildListOfTimeZones(NEW_YORK_TZ, CHICAGO_TZ, WINNIPEG_TZ, LOS_ANGELES_TZ);
+  }
+
+  public void testGetTimeZonesForNumber() {
+    // Test with invalid numbers even when their country code prefixes exist in the mapper.
+    assertEquals(PhoneNumberToTimeZonesMapper.UNKNOWN_TIME_ZONE_LIST,
+                 prefixTimeZonesMapper.getTimeZonesForNumber(US_INVALID_NUMBER));
+    assertEquals(PhoneNumberToTimeZonesMapper.UNKNOWN_TIME_ZONE_LIST,
+                 prefixTimeZonesMapper.getTimeZonesForNumber(KO_INVALID_NUMBER));
+    // Test with valid prefixes.
+    assertEquals(buildListOfTimeZones(SYDNEY_TZ),
+                 prefixTimeZonesMapper.getTimeZonesForNumber(AU_NUMBER));
+    assertEquals(buildListOfTimeZones(SEOUL_TZ),
+                 prefixTimeZonesMapper.getTimeZonesForNumber(KO_NUMBER));
+    assertEquals(buildListOfTimeZones(WINNIPEG_TZ),
+                 prefixTimeZonesMapper.getTimeZonesForNumber(CA_NUMBER));
+    assertEquals(buildListOfTimeZones(LOS_ANGELES_TZ),
+                 prefixTimeZonesMapper.getTimeZonesForNumber(US_NUMBER1));
+    assertEquals(buildListOfTimeZones(NEW_YORK_TZ),
+                 prefixTimeZonesMapper.getTimeZonesForNumber(US_NUMBER2));
+    // Test with an invalid country code.
+    assertEquals(PhoneNumberToTimeZonesMapper.UNKNOWN_TIME_ZONE_LIST,
+                 prefixTimeZonesMapper.getTimeZonesForNumber(NUMBER_WITH_INVALID_COUNTRY_CODE));
+    // Test with a non geographical phone number.
+    assertEquals(PhoneNumberToTimeZonesMapper.UNKNOWN_TIME_ZONE_LIST,
+                 prefixTimeZonesMapper.getTimeZonesForNumber(INTERNATIONAL_TOLL_FREE));
+  }
+
+  public void testGetTimeZonesForValidNumber() {
+    // Test with invalid numbers even when their country code prefixes exist in the mapper.
+    assertEquals(getNanpaTimeZonesList(),
+                 prefixTimeZonesMapper.getTimeZonesForGeographicalNumber(US_INVALID_NUMBER));
+    assertEquals(buildListOfTimeZones(SEOUL_TZ),
+                 prefixTimeZonesMapper.getTimeZonesForGeographicalNumber(KO_INVALID_NUMBER));
+    // Test with valid prefixes.
+    assertEquals(buildListOfTimeZones(SYDNEY_TZ),
+                 prefixTimeZonesMapper.getTimeZonesForGeographicalNumber(AU_NUMBER));
+    assertEquals(buildListOfTimeZones(SEOUL_TZ),
+                 prefixTimeZonesMapper.getTimeZonesForGeographicalNumber(KO_NUMBER));
+    assertEquals(buildListOfTimeZones(WINNIPEG_TZ),
+                 prefixTimeZonesMapper.getTimeZonesForGeographicalNumber(CA_NUMBER));
+    assertEquals(buildListOfTimeZones(LOS_ANGELES_TZ),
+                 prefixTimeZonesMapper.getTimeZonesForGeographicalNumber(US_NUMBER1));
+    assertEquals(buildListOfTimeZones(NEW_YORK_TZ),
+                 prefixTimeZonesMapper.getTimeZonesForGeographicalNumber(US_NUMBER2));
+    // Test with an invalid country code.
+    assertEquals(PhoneNumberToTimeZonesMapper.UNKNOWN_TIME_ZONE_LIST,
+                 prefixTimeZonesMapper.getTimeZonesForGeographicalNumber(
+                     NUMBER_WITH_INVALID_COUNTRY_CODE));
+    // Test with a non geographical phone number.
+    assertEquals(PhoneNumberToTimeZonesMapper.UNKNOWN_TIME_ZONE_LIST,
+                 prefixTimeZonesMapper.getTimeZonesForGeographicalNumber(
+                     INTERNATIONAL_TOLL_FREE));
+  }
+
+  public void testGetTimeZonesForValidNumberSearchingAtCountryCodeLevel() {
+    // Test that the country level time zones are returned when the number passed in is valid but
+    // not covered by any non-country level prefixes in the mapper.
+    assertEquals(prefixTimeZonesMapper.getTimeZonesForNumber(US_NUMBER3),
+                 getNanpaTimeZonesList());
+  }
+}
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java b/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java
new file mode 100644
index 00000000..ed9bd3b0
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package com.google.i18n.phonenumbers.geocoding;
+
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import junit.framework.TestCase;
+
+import java.util.Locale;
+
+/**
+ * Unit tests for PhoneNumberOfflineGeocoder.java
+ *
+ * @author Shaopeng Jia
+ */
+public class PhoneNumberOfflineGeocoderTest extends TestCase {
+  private final PhoneNumberOfflineGeocoder geocoder =
+      new PhoneNumberOfflineGeocoder(TEST_MAPPING_DATA_DIRECTORY);
+  private static final String TEST_MAPPING_DATA_DIRECTORY =
+      "/com/google/i18n/phonenumbers/geocoding/testing_data/";
+
+  // Set up some test numbers to re-use.
+  private static final PhoneNumber KO_NUMBER1 =
+      new PhoneNumber().setCountryCode(82).setNationalNumber(22123456L);
+  private static final PhoneNumber KO_NUMBER2 =
+      new PhoneNumber().setCountryCode(82).setNationalNumber(322123456L);
+  private static final PhoneNumber KO_NUMBER3 =
+      new PhoneNumber().setCountryCode(82).setNationalNumber(6421234567L);
+  private static final PhoneNumber KO_INVALID_NUMBER =
+      new PhoneNumber().setCountryCode(82).setNationalNumber(1234L);
+  private static final PhoneNumber US_NUMBER1 =
+      new PhoneNumber().setCountryCode(1).setNationalNumber(6502530000L);
+  private static final PhoneNumber US_NUMBER2 =
+      new PhoneNumber().setCountryCode(1).setNationalNumber(6509600000L);
+  private static final PhoneNumber US_NUMBER3 =
+      new PhoneNumber().setCountryCode(1).setNationalNumber(2128120000L);
+  private static final PhoneNumber US_NUMBER4 =
+      new PhoneNumber().setCountryCode(1).setNationalNumber(6174240000L);
+  private static final PhoneNumber US_INVALID_NUMBER =
+      new PhoneNumber().setCountryCode(1).setNationalNumber(123456789L);
+  private static final PhoneNumber NANPA_TOLL_FREE =
+      new PhoneNumber().setCountryCode(1).setNationalNumber(8002431234L);
+  private static final PhoneNumber BS_NUMBER1 =
+      new PhoneNumber().setCountryCode(1).setNationalNumber(2423651234L);
+  private static final PhoneNumber AU_NUMBER =
+      new PhoneNumber().setCountryCode(61).setNationalNumber(236618300L);
+  private static final PhoneNumber AR_MOBILE_NUMBER =
+      new PhoneNumber().setCountryCode(54).setNationalNumber(92214000000L);
+  private static final PhoneNumber NUMBER_WITH_INVALID_COUNTRY_CODE =
+      new PhoneNumber().setCountryCode(999).setNationalNumber(2423651234L);
+  private static final PhoneNumber INTERNATIONAL_TOLL_FREE =
+      new PhoneNumber().setCountryCode(800).setNationalNumber(12345678L);
+
+  public void testGetDescriptionForNumberWithNoDataFile() {
+    // No data file containing mappings for US numbers is available in Chinese for the unittests. As
+    // a result, the country name of United States in simplified Chinese is returned.
+    assertEquals("\u7F8E\u56FD",
+        geocoder.getDescriptionForNumber(US_NUMBER1, Locale.SIMPLIFIED_CHINESE));
+    assertEquals("Bahamas",
+        geocoder.getDescriptionForNumber(BS_NUMBER1, new Locale("en", "US")));
+    assertEquals("Australia",
+        geocoder.getDescriptionForNumber(AU_NUMBER, new Locale("en", "US")));
+    assertEquals("", geocoder.getDescriptionForNumber(NUMBER_WITH_INVALID_COUNTRY_CODE,
+                                                      new Locale("en", "US")));
+    assertEquals("", geocoder.getDescriptionForNumber(INTERNATIONAL_TOLL_FREE,
+                                                      new Locale("en", "US")));
+  }
+
+  public void testGetDescriptionForNumberWithMissingPrefix() {
+    // Test that the name of the country is returned when the number passed in is valid but not
+    // covered by the geocoding data file.
+    assertEquals("United States",
+        geocoder.getDescriptionForNumber(US_NUMBER4, new Locale("en", "US")));
+  }
+
+  public void testGetDescriptionForNumberBelongingToMultipleCountriesIsEmpty() {
+      // Test that nothing is returned when the number passed in is valid but not
+      // covered by the geocoding data file and belongs to multiple countries
+      assertEquals("",
+          geocoder.getDescriptionForNumber(NANPA_TOLL_FREE, new Locale("en", "US")));
+  }
+
+  public void testGetDescriptionForNumber_en_US() {
+    assertEquals("CA",
+        geocoder.getDescriptionForNumber(US_NUMBER1, new Locale("en", "US")));
+    assertEquals("Mountain View, CA",
+        geocoder.getDescriptionForNumber(US_NUMBER2, new Locale("en", "US")));
+    assertEquals("New York, NY",
+        geocoder.getDescriptionForNumber(US_NUMBER3, new Locale("en", "US")));
+  }
+
+  public void testGetDescriptionForKoreanNumber() {
+    assertEquals("Seoul",
+        geocoder.getDescriptionForNumber(KO_NUMBER1, Locale.ENGLISH));
+    assertEquals("Incheon",
+        geocoder.getDescriptionForNumber(KO_NUMBER2, Locale.ENGLISH));
+    assertEquals("Jeju",
+        geocoder.getDescriptionForNumber(KO_NUMBER3, Locale.ENGLISH));
+    assertEquals("\uC11C\uC6B8",
+        geocoder.getDescriptionForNumber(KO_NUMBER1, Locale.KOREAN));
+    assertEquals("\uC778\uCC9C",
+        geocoder.getDescriptionForNumber(KO_NUMBER2, Locale.KOREAN));
+  }
+
+  public void testGetDescriptionForArgentinianMobileNumber() {
+    assertEquals("La Plata",
+        geocoder.getDescriptionForNumber(AR_MOBILE_NUMBER, Locale.ENGLISH));
+  }
+
+  public void testGetDescriptionForFallBack() {
+    // No fallback, as the location name for the given phone number is available in the requested
+    // language.
+    assertEquals("Kalifornien",
+        geocoder.getDescriptionForNumber(US_NUMBER1, Locale.GERMAN));
+    // German falls back to English.
+    assertEquals("New York, NY",
+        geocoder.getDescriptionForNumber(US_NUMBER3, Locale.GERMAN));
+    // Italian falls back to English.
+    assertEquals("CA",
+        geocoder.getDescriptionForNumber(US_NUMBER1, Locale.ITALIAN));
+    // Korean doesn't fall back to English.
+    assertEquals("\uB300\uD55C\uBBFC\uAD6D",
+        geocoder.getDescriptionForNumber(KO_NUMBER3, Locale.KOREAN));
+  }
+
+  public void testGetDescriptionForNumberWithUserRegion() {
+    // User in Italy, American number. We should just show United States, in Spanish, and not more
+    // detailed information.
+    assertEquals("Estados Unidos",
+        geocoder.getDescriptionForNumber(US_NUMBER1, new Locale("es", "ES"), "IT"));
+    // Unknown region - should just show country name.
+    assertEquals("Estados Unidos",
+        geocoder.getDescriptionForNumber(US_NUMBER1, new Locale("es", "ES"), "ZZ"));
+    // User in the States, language German, should show detailed data.
+    assertEquals("Kalifornien",
+        geocoder.getDescriptionForNumber(US_NUMBER1, Locale.GERMAN, "US"));
+    // User in the States, language French, no data for French, so we fallback to English detailed
+    // data.
+    assertEquals("CA",
+        geocoder.getDescriptionForNumber(US_NUMBER1, Locale.FRENCH, "US"));
+    // Invalid number - return an empty string.
+    assertEquals("", geocoder.getDescriptionForNumber(US_INVALID_NUMBER, Locale.ENGLISH,
+                                                      "US"));
+  }
+
+  public void testGetDescriptionForInvalidNumber() {
+    assertEquals("", geocoder.getDescriptionForNumber(KO_INVALID_NUMBER, Locale.ENGLISH));
+    assertEquals("", geocoder.getDescriptionForNumber(US_INVALID_NUMBER, Locale.ENGLISH));
+  }
+}
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_de b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_de
new file mode 100644
index 00000000..2a516e0e
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_de
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_en b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_en
new file mode 100644
index 00000000..9af68fa9
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1201_en
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1212_en b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1212_en
new file mode 100644
index 00000000..0c3d5d84
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1212_en
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1617_en b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1617_en
new file mode 100644
index 00000000..b4f7c1d7
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1617_en
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_de b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_de
new file mode 100644
index 00000000..1fa2f0fd
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_de
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_en b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_en
new file mode 100644
index 00000000..a95364ea
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1650_en
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1989_en b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1989_en
new file mode 100644
index 00000000..40d87160
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/1989_en
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/54_en b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/54_en
new file mode 100644
index 00000000..2c4b1b27
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/54_en
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en
new file mode 100644
index 00000000..cd18ecbf
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_ko b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_ko
new file mode 100644
index 00000000..dfa91c39
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_ko
diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/config b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/config
new file mode 100644
index 00000000..98d176c6
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/config
diff --git a/geocoder/test/com/google/i18n/phonenumbers/timezones/testing_data/map_data b/geocoder/test/com/google/i18n/phonenumbers/timezones/testing_data/map_data
new file mode 100644
index 00000000..0150711e
--- /dev/null
+++ b/geocoder/test/com/google/i18n/phonenumbers/timezones/testing_data/map_data
author	Narayan Kamath <narayan@google.com>	2014-12-18 11:56:40 +0000
committer	Narayan Kamath <narayan@google.com>	2014-12-23 12:32:44 +0000
commit	a77faddfc3b3e4cca8f585c82d669054aec221f4 (patch)
tree	b3ca5eaf70be2df2a1a9cfc684532d1563d759a7 /geocoder
parent	eec8af34d3129d0f37c45ff8a82b4212724a6d79 (diff)
download	libphonenumber-a77faddfc3b3e4cca8f585c82d669054aec221f4.tar.gz