pythonthings
diff --git a/‎python/phonenumbers/geocoder.py‎
Lines changed: 15 additions & 2 deletions b/‎python/phonenumbers/geocoder.py‎
Lines changed: 15 additions & 2 deletions
diff --git a/‎python/tests/geocodertest.py‎
Lines changed: 4 additions & 0 deletions b/‎python/tests/geocodertest.py‎
Lines changed: 4 additions & 0 deletions
@@ -44,7 +44,8 @@
 # limitations under the License.
 
 from .phonenumberutil import format_number, PhoneNumberFormat, number_type
-from .phonenumberutil import region_code_for_number, PhoneNumberType
+from .phonenumberutil import region_code_for_number, PhoneNumberType, PhoneNumber
+from .phonenumberutil import country_mobile_token, national_significant_number
 try:
     from .geodata import GEOCODE_DATA, GEOCODE_LONGEST_PREFIX
     from .geodata.locale import LOCALE_DATA
@@ -222,7 +223,19 @@ def description_for_valid_number(numobj, lang, script=None, region=None):
     number, or an empty string if no description is available."""
     number_region = region_code_for_number(numobj)
     if region is None or region == number_region:
-        area_description = _area_description_for_number(numobj, lang, script, region)
+        mobile_token = country_mobile_token(numobj.country_code)
+        national_number = national_significant_number(numobj)
+        if mobile_token != "" and national_number.startswith(mobile_token):
+            # In some countries, eg. Argentina, mobile numbers have a mobile token
+            # before the national destination code, this should be removed before
+            # geocoding.
+            national_number = national_number[len(mobile_token):]
+            copied_numobj = PhoneNumber(country_code=numobj.country_code,
+                                        national_number=national_number,
+                                        italian_leading_zero=national_number.startswith("0"))
+            area_description = _area_description_for_number(copied_numobj, lang, script, region)
+        else:
+            area_description = _area_description_for_number(numobj, lang, script, region)
         if area_description != "":
             return area_description
         else:
 
@@ -56,6 +56,7 @@ def insert_test_geodata():
 US_INVALID_NUMBER = FrozenPhoneNumber(country_code=1, national_number=123456789L)
 BS_NUMBER1 = FrozenPhoneNumber(country_code=1, national_number=2423651234L)
 AU_NUMBER = FrozenPhoneNumber(country_code=61, national_number=236618300L)
+AR_MOBILE_NUMBER = FrozenPhoneNumber(country_code=54, national_number=92214000000L)
 NUMBER_WITH_INVALID_COUNTRY_CODE = FrozenPhoneNumber(country_code=999, national_number=2423651234L)
 INTERNATIONAL_TOLL_FREE = FrozenPhoneNumber(country_code=800, national_number=12345678L)
 
@@ -120,6 +121,9 @@ def testGetDescriptionForKoreanNumber(self):
         self.assertEqual(u"\uC778\uCC9C",
                           description_for_number(KO_NUMBER2, _KOREAN))
 
+    def testGetDescriptionForArgentinianMobileNumber(self):
+        self.assertEqual("La Plata", description_for_number(AR_MOBILE_NUMBER, _ENGLISH))
+
     def testGetDescriptionForFallBack(self):
         # No fallback, as the location name for the given phone number is
         # available in the requested language.