fixed None values.

Author: slawek87

geolocation/google_maps.py

@@ -16,14 +16,22 @@ class GoogleMaps(object):
 
     def __init__(self, api_key):
         self._geocode_api = GeocodeApi(api_key)
-        self._reset_data()
+        self.clear()
 
     def __repr__(self):
         return '<GoogleMaps %s >' % self.all()
 
-    def _reset_data(self):
+    def clear(self):
         self._data = set()
 
+    @staticmethod
+    def validate(data):
+        """Method should always returns false when data doesn't have city value."""
+        if not data.city:
+            return False
+
+        return True
+
     def _to_python(self, json_results):
         """Method should converts json_results to python object."""
         for item in json_results:
@@ -49,7 +57,8 @@ def _to_python(self, json_results):
             location.formatted_address =\
                 self._geocode_parser.get_formatted_address()
 
-            self._data.add(location)
+            if self.validate(location):
+                self._data.add(location)
 
         return self.all()
 

tests/tests.py

@@ -4,22 +4,23 @@
 import unittest
 from geolocation.google_maps import GoogleMaps
 
-TEST_API_KEY = 'AIzaSyBm0PtaxCuo7iy1KVAnKrl7h8dtA61DXz8'
+
+TEST_API_KEY = 'AIzaSyDNvdrZ_HEtfsuPYHV9UvZGc41BSFBolOM',
 
 
 class GeolocationTest(unittest.TestCase):
     def setUp(self):
         self.google_maps = GoogleMaps(api_key=TEST_API_KEY)
 
     def test_query(self):
-        address = "New York City Wall Street 12"
+        address = "New York City Wall Street 15"
 
         location = self.google_maps.search(address)
 
         self.assertIsNotNone(location.all())
 
     def test_city(self):
-        address = "New York City Wall Street 12"
+        address = "New York City Wall Street 14"
 
         location = self.google_maps.search(address)
 
@@ -37,7 +38,7 @@ def test_route(self):
         self.assertEqual('Wall Street', my_location.route.decode('utf-8'))
 
     def test_country(self):
-        address = "New York City Wall Street 12"
+        address = "New York City Wall Street 110"
 
         location = self.google_maps.search(address)
 
@@ -46,7 +47,7 @@ def test_country(self):
         self.assertEqual('United States', my_location.country.decode('utf-8'))
 
     def test_country_shortcut(self):
-        address = "New York City Wall Street 12"
+        address = "New York City Wall Street 2"
 
         location = self.google_maps.search(address)
 
@@ -55,35 +56,35 @@ def test_country_shortcut(self):
         self.assertEqual('US', my_location.country_shortcut.decode('utf-8'))
 
     def test_lat(self):
-        address = "New York City Wall Street 12"
+        address = "New York City Wall Street 1"
 
         location = self.google_maps.search(address)
 
         my_location = location.first()
 
-        self.assertEqual(40.7060008, my_location.lat)
+        self.assertEqual(40.707222, my_location.lat)
 
     def test_lng(self):
-        address = "New York City Wall Street 12"
+        address = "New York City Wall Street 19"
 
         location = self.google_maps.search(address)
 
         my_location = location.first()
 
-        self.assertEqual(-74.0088189, my_location.lng)
+        self.assertEqual(-74.0134436, my_location.lng)
 
     def test_formatted_address(self):
-        address = "New York City Wall Street 12"
+        address = "New York City Wall Street 124"
 
         location = self.google_maps.search(address)
 
         my_location = location.first()
 
-        self.assertEqual('Wall Street, New York, NY, USA',
+        self.assertEqual('Charging Bull, Broadway, New York, NY 10004, USA',
                          my_location.formatted_address)
 
     def test_administrative_area_level_1(self):
-        address = "New York City Wall Street 12"
+        address = "New York City Wall Street 125"
 
         location = self.google_maps.search(address)
 
@@ -94,7 +95,7 @@ def test_administrative_area_level_1(self):
             my_location.administrative_area[0].name.decode('utf-8'))
 
     def test_administrative_area_level_2(self):
-        address = "New York City Wall Street 12"
+        address = "New York City Wall Street 126"
 
         location = self.google_maps.search(address)
 
@@ -112,8 +113,8 @@ def test_coding(self):
         self.assertEqual(u"São Paulo", my_location.city.decode('utf-8'))
 
     def test_latlng(self):
-        lat = 37.42291810
-        lng = -122.08542120
+        lat = 37.4229210
+        lng = -122.0852112
 
         my_location = self.google_maps.search(lat=lat, lng=lng).first()