added short_name to administrative_area

Author: benediktziegler

geolocation/geocode/models.py

@@ -24,14 +24,15 @@ def administrative_area(self):
     @administrative_area.setter
     def administrative_area(self, value_list):
         for value in value_list:
-            area = AdministrativeAreaLevelModel(value.get('area_type'), value.get('name'))
+            area = AdministrativeAreaLevelModel(value.get('area_type'), value.get('name'), value.get('short_name'))
             self._administrative_area.append(area)
 
 
 class AdministrativeAreaLevelModel(object):
-    def __init__(self, area_type, name):
+    def __init__(self, area_type, name, short_name):
         self.area_type = area_type
         self.name = name
+        self.short_name = short_name
 
     def __repr__(self):
         return '<AdministrativeAreaLevelModel: %s>' % self.name

geolocation/geocode/parsers.py

@@ -76,9 +76,10 @@ def get_administrative_area(self):
 
         for area_type in administrative_areas:
             name = self.search_address_components(area_type)
+            short_name = self.search_address_components(area_type, True)
 
             if name:
-                data.append(dict(name=name, area_type=area_type))
+                data.append(dict(name=name, short_name=short_name, area_type=area_type))
 
         return data
 

tests/tests.py

@@ -95,6 +95,10 @@ def test_administrative_area_level_1(self):
             'New York',
             my_location.administrative_area[0].name.decode('utf-8'))
 
+        self.assertEqual(
+            'NY',
+            my_location.administrative_area[0].short_name.decode('utf-8'))
+
     def test_administrative_area_level_2(self):
         address = "New York City Wall Street 126"
 
@@ -106,6 +110,10 @@ def test_administrative_area_level_2(self):
             'New York County',
             my_location.administrative_area[1].name.decode('utf-8'))
 
+        self.assertEqual(
+            'New York County',
+            my_location.administrative_area[1].short_name.decode('utf-8'))
+
     def test_coding(self):
         address = "São Paulo"