phonelib 0.6.3 → 0.6.4

data/data/libphonenumber/cpp/test/phonenumbers/geocoding/phonenumber_offline_geocoder_test.cc

@@ -53,6 +53,7 @@ class PhoneNumberOfflineGeocoderTest : public testing::Test {
     KO_NUMBER2(MakeNumber(82, 322123456UL)),
     KO_NUMBER3(MakeNumber(82, 6421234567ULL)),
     KO_INVALID_NUMBER(MakeNumber(82, 1234UL)),
+    KO_MOBILE(MakeNumber(82, 101234567ULL)),
     US_NUMBER1(MakeNumber(1, 6502530000ULL)),
     US_NUMBER2(MakeNumber(1, 6509600000ULL)),
     US_NUMBER3(MakeNumber(1, 2128120000UL)),
@@ -82,6 +83,7 @@ class PhoneNumberOfflineGeocoderTest : public testing::Test {
   const PhoneNumber KO_NUMBER2;
   const PhoneNumber KO_NUMBER3;
   const PhoneNumber KO_INVALID_NUMBER;
+  const PhoneNumber KO_MOBILE;
 
   const PhoneNumber US_NUMBER1;
   const PhoneNumber US_NUMBER2;
@@ -201,5 +203,12 @@ TEST_F(PhoneNumberOfflineGeocoderTest, TestGetDescriptionForInvalidNumber) {
                                                    kEnglishLocale));
 }
 
+TEST_F(PhoneNumberOfflineGeocoderTest,
+       TestGetDescriptionForNonGeographicalNumberWithGeocodingPrefix) {
+  // We have a geocoding prefix, but we shouldn't use it since this is not
+  // geographical.
+  EXPECT_EQ("South Korea",
+            geocoder_->GetDescriptionForNumber(KO_MOBILE, kEnglishLocale));
+}
 }  // namespace phonenumbers
 }  // namespace i18n

data/data/libphonenumber/cpp/test/phonenumbers/phonenumberutil_test.cc

@@ -1165,7 +1165,7 @@ TEST_F(PhoneNumberUtilTest, FormatNumberForMobileDialing) {
   // numbers are always output in international format, but short numbers are
   // in national format.
   test_number.set_country_code(1);
-  test_number.set_national_number(6502530000LL);
+  test_number.set_national_number(6502530000L);
   phone_util_.FormatNumberForMobileDialing(
       test_number, RegionCode::US(), false, &formatted_number);
   EXPECT_EQ("+16502530000", formatted_number);
@@ -1341,9 +1341,10 @@ TEST_F(PhoneNumberUtilTest, GetLengthOfGeographicalAreaCode) {
   number.set_national_number(2070313000ULL);
   EXPECT_EQ(2, phone_util_.GetLengthOfGeographicalAreaCode(number));
 
-  // A UK mobile phone, which has no area code.
+  // A mobile number in the UK does not have an area code (by default, mobile
+  // numbers do not, unless they have been added to our list of exceptions).
   number.set_country_code(44);
-  number.set_national_number(7123456789ULL);
+  number.set_national_number(7912345678ULL);
   EXPECT_EQ(0, phone_util_.GetLengthOfGeographicalAreaCode(number));
 
   // Google Buenos Aires, which has area code "11".
@@ -1351,6 +1352,11 @@ TEST_F(PhoneNumberUtilTest, GetLengthOfGeographicalAreaCode) {
   number.set_national_number(1155303000ULL);
   EXPECT_EQ(2, phone_util_.GetLengthOfGeographicalAreaCode(number));
 
+  // A mobile number in Argentina also has an area code.
+  number.set_country_code(54);
+  number.set_national_number(91187654321);
+  EXPECT_EQ(3, phone_util_.GetLengthOfGeographicalAreaCode(number));
+
   // Google Sydney, which has area code "2".
   number.set_country_code(61);
   number.set_national_number(293744000ULL);
@@ -1373,6 +1379,12 @@ TEST_F(PhoneNumberUtilTest, GetLengthOfGeographicalAreaCode) {
   number.set_country_code(800);
   number.set_national_number(12345678ULL);
   EXPECT_EQ(0, phone_util_.GetLengthOfGeographicalAreaCode(number));
+
+  // A mobile number from China is geographical, but does not have an area code.
+  PhoneNumber cn_mobile;
+  cn_mobile.set_country_code(86);
+  cn_mobile.set_national_number(18912341234ULL);
+  EXPECT_EQ(0, phone_util_.GetLengthOfGeographicalAreaCode(cn_mobile));
 }
 
 TEST_F(PhoneNumberUtilTest, GetLengthOfNationalDestinationCode) {
@@ -1392,9 +1404,9 @@ TEST_F(PhoneNumberUtilTest, GetLengthOfNationalDestinationCode) {
   number.set_national_number(2070313000ULL);
   EXPECT_EQ(2, phone_util_.GetLengthOfNationalDestinationCode(number));
 
-  // A UK mobile phone, which has NDC "7123"
+  // A UK mobile phone, which has NDC "7912"
   number.set_country_code(44);
-  number.set_national_number(7123456789ULL);
+  number.set_national_number(7912345678ULL);
   EXPECT_EQ(4, phone_util_.GetLengthOfNationalDestinationCode(number));
 
   // Google Buenos Aires, which has NDC "11".
@@ -1444,6 +1456,13 @@ TEST_F(PhoneNumberUtilTest, GetLengthOfNationalDestinationCode) {
   number.set_country_code(800);
   number.set_national_number(12345678ULL);
   EXPECT_EQ(4, phone_util_.GetLengthOfNationalDestinationCode(number));
+
+  // A mobile number from China is geographical, but does not have an area code:
+  // however it still can be considered to have a national destination code.
+  PhoneNumber cn_mobile;
+  cn_mobile.set_country_code(86);
+  cn_mobile.set_national_number(18912341234ULL);
+  EXPECT_EQ(3, phone_util_.GetLengthOfNationalDestinationCode(cn_mobile));
 }
 
 TEST_F(PhoneNumberUtilTest, GetCountryMobileToken) {

data/data/libphonenumber/java/build.xml

@@ -45,21 +45,6 @@
     </exec>
   </target>
 
-  <target name="build-single-file-phone-metadata">
-    <exec executable="java">
-      <arg value="-jar" />
-      <arg value="${build.tools.jar}"/>
-      <arg value="BuildMetadataProtoFromXml"/>
-      <arg value="--input-file=${resources.dir}/PhoneNumberMetadata.xml"/>
-      <arg value="--output-dir=${libphonenumber.src.dir}/com/google/i18n/phonenumbers"/>
-      <arg value="--data-prefix=data/SingleFilePhoneNumberMetadataProto"/>
-      <arg value="--single-file=true"/>
-      <arg value="--mapping-class=CountryCodeToRegionCodeMap"/>
-      <arg value="--copyright=2010"/>
-      <arg value="--lite-build=false"/>
-    </exec>
-  </target>
-
   <target name="build-short-metadata">
     <exec executable="java">
       <arg value="-jar" />
@@ -88,21 +73,6 @@
     </exec>
   </target>
 
-  <target name="build-single-file-test-metadata">
-    <exec executable="java">
-      <arg value="-jar" />
-      <arg value="${build.tools.jar}"/>
-      <arg value="BuildMetadataProtoFromXml"/>
-      <arg value="--input-file=${resources.dir}/PhoneNumberMetadataForTesting.xml"/>
-      <arg value="--output-dir=${libphonenumber.test.dir}/com/google/i18n/phonenumbers"/>
-      <arg value="--data-prefix=data/SingleFilePhoneNumberMetadataProtoForTesting"/>
-      <arg value="--single-file=true"/>
-      <arg value="--mapping-class=CountryCodeToRegionCodeMapForTesting"/>
-      <arg value="--copyright=2010"/>
-      <arg value="--lite-build=false"/>
-    </exec>
-  </target>
-
   <target name="build-alternate-metadata">
     <exec executable="java">
       <arg value="-jar" />

data/data/libphonenumber/java/carrier/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>carrier</artifactId>
-  <version>1.40-SNAPSHOT</version>
+  <version>1.42-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.5.2-SNAPSHOT</version>
+    <version>7.6.1-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -56,12 +56,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.5.2-SNAPSHOT</version>
+      <version>7.6.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.50-SNAPSHOT</version>
+      <version>2.52-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/demo/pom.xml

@@ -4,11 +4,11 @@
   <parent>
     <artifactId>libphonenumber-parent</artifactId>
     <groupId>com.googlecode.libphonenumber</groupId>
-    <version>7.5.2-SNAPSHOT</version>
+    <version>7.6.1-SNAPSHOT</version>
   </parent>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>7.5.2-SNAPSHOT</version>
+  <version>7.6.1-SNAPSHOT</version>
 
   <properties>
     <gae.version>1.9.32</gae.version>
@@ -48,17 +48,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.5.2-SNAPSHOT</version>
+      <version>7.6.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.50-SNAPSHOT</version>
+      <version>2.52-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>1.40-SNAPSHOT</version>
+      <version>1.42-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/geocoder/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>geocoder</artifactId>
-  <version>2.50-SNAPSHOT</version>
+  <version>2.52-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.5.2-SNAPSHOT</version>
+    <version>7.6.1-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -64,12 +64,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.5.2-SNAPSHOT</version>
+      <version>7.6.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.50-SNAPSHOT</version>
+      <version>2.52-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java

@@ -186,7 +186,7 @@ public class PhoneNumberOfflineGeocoder {
     PhoneNumberType numberType = phoneUtil.getNumberType(number);
     if (numberType == PhoneNumberType.UNKNOWN) {
       return "";
-    } else if (!canBeGeocoded(numberType)) {
+    } else if (!phoneUtil.isNumberGeographical(numberType, number.getCountryCode())) {
       return getCountryNameForNumber(number, languageCode);
     }
     return getDescriptionForValidNumber(number, languageCode);
@@ -209,20 +209,9 @@ public class PhoneNumberOfflineGeocoder {
     PhoneNumberType numberType = phoneUtil.getNumberType(number);
     if (numberType == PhoneNumberType.UNKNOWN) {
       return "";
-    } else if (!canBeGeocoded(numberType)) {
+    } else if (!phoneUtil.isNumberGeographical(numberType, number.getCountryCode())) {
       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);
-  }
 }

data/data/libphonenumber/java/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java

@@ -41,6 +41,8 @@ public class PhoneNumberOfflineGeocoderTest extends TestCase {
       new PhoneNumber().setCountryCode(82).setNationalNumber(6421234567L);
   private static final PhoneNumber KO_INVALID_NUMBER =
       new PhoneNumber().setCountryCode(82).setNationalNumber(1234L);
+  private static final PhoneNumber KO_MOBILE =
+      new PhoneNumber().setCountryCode(82).setNationalNumber(101234567L);
   private static final PhoneNumber US_NUMBER1 =
       new PhoneNumber().setCountryCode(1).setNationalNumber(6502530000L);
   private static final PhoneNumber US_NUMBER2 =
@@ -160,4 +162,9 @@ public class PhoneNumberOfflineGeocoderTest extends TestCase {
     assertEquals("", geocoder.getDescriptionForNumber(KO_INVALID_NUMBER, Locale.ENGLISH));
     assertEquals("", geocoder.getDescriptionForNumber(US_INVALID_NUMBER, Locale.ENGLISH));
   }
+
+  public void testGetDescriptionForNonGeographicalNumberWithGeocodingPrefix() {
+    // We have a geocoding prefix, but we shouldn't use it since this is not geographical.
+    assertEquals("South Korea", geocoder.getDescriptionForNumber(KO_MOBILE, Locale.ENGLISH));
+  }
 }

data/data/libphonenumber/java/internal/prefixmapper/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>prefixmapper</artifactId>
-  <version>2.50-SNAPSHOT</version>
+  <version>2.52-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.5.2-SNAPSHOT</version>
+    <version>7.6.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.5.2-SNAPSHOT</version>
+      <version>7.6.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/lib/protobuf-javanano-readme.md

@@ -0,0 +1,20 @@
+Steps to update the protobuf library version:
+
+- Start by finding a protobuf library version released to Maven Central that has functionality you
+  need, e.g. nano. See http://mvnrepository.com/artifact/com.google.protobuf.
+- Update the protobuf library dependency's `groupId`, `artifactId`, and `version` to match this
+  artifact in all the `pom.xml` files. You can find the files by searching for
+  `<groupId>com.google.protobuf` in the GitHub repository.
+- Download the `.jar` from the Maven Repository,
+  e.g. from http://repo1.maven.org/maven2/com/google/protobuf/nano/protobuf-javanano/3.0.0-alpha-7/,
+  and copy to `java/lib/`, replacing the previous version's `.jar`.
+- See https://github.com/google/protobuf/releases for the release containing the chosen version, and
+  download the `protoc` binary for your machine's architecture from the same release and use this to
+  re-generate `java/libphonenumber/src/com/google/i18n/phonenumbers/nano/Phonemetadata.java` and
+  check in any changes to this file. The command from the root directory is:
+
+  ```
+  protoc --javanano_out=com.google.i18n.phonenumbers.nano:java/libphonenumber/src \
+         resources/phonemetadata.proto \
+         --proto_path=resources
+  ```

data/data/libphonenumber/java/libphonenumber/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber</artifactId>
-  <version>7.5.2-SNAPSHOT</version>
+  <version>7.6.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.5.2-SNAPSHOT</version>
+    <version>7.6.1-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -29,38 +29,6 @@
       </testResource>
     </testResources>
     <plugins>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          <excludes>
-            <exclude>com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.class</exclude>
-            <exclude>com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.2</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <relocations>
-                <relocation>
-                  <pattern>com.google.protobuf</pattern>
-                  <shadedPattern>
-                    com.google.i18n.phonenumbers.repackaged.com.google.protobuf
-                  </shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -84,17 +52,12 @@
     </plugins>
   </build>
 
-  <repositories>
-    <repository>
-      <id>protobuf-java-lib</id>
-      <url>file://${project.basedir}/../lib</url>
-    </repository>
-  </repositories>
   <dependencies>
     <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.6.1</version>
+      <groupId>com.google.protobuf.nano</groupId>
+      <artifactId>protobuf-javanano</artifactId>
+      <!-- If updating the version, see instructions in java/lib/protobuf-javanano-readme.md. -->
+      <version>3.0.0-alpha-7</version>
     </dependency>
   </dependencies>