Replace get_coords() by coords in more places

Author: Martin Pauly

haystack/backends/elasticsearch_backend.py

@@ -296,7 +296,7 @@ def build_search_kwargs(self, query_string, sort_by=None, start_offset=0, end_of
             for field, direction in sort_by:
                 if field == 'distance' and distance_point:
                     # Do the geo-enabled sort.
-                    lng, lat = distance_point['point'].get_coords()
+                    lng, lat = distance_point['point'].coords
                     sort_kwargs = {
                         "_geo_distance": {
                             distance_point['field']: [lng, lat],
@@ -455,7 +455,7 @@ def build_search_kwargs(self, query_string, sort_by=None, start_offset=0, end_of
             filters.append(within_filter)
 
         if dwithin is not None:
-            lng, lat = dwithin['point'].get_coords()
+            lng, lat = dwithin['point'].coords
 
             # NB: the 1.0.0 release of elasticsearch introduce an
             #     incompatible change on the distance filter formating

haystack/backends/solr_backend.py

@@ -173,7 +173,7 @@ def build_search_kwargs(self, query_string, sort_by=None, start_offset=0, end_of
         if sort_by is not None:
             if sort_by in ['distance asc', 'distance desc'] and distance_point:
                 # Do the geo-enabled sort.
-                lng, lat = distance_point['point'].get_coords()
+                lng, lat = distance_point['point'].coords
                 kwargs['sfield'] = distance_point['field']
                 kwargs['pt'] = '%s,%s' % (lat, lng)
 
@@ -290,7 +290,7 @@ def build_search_kwargs(self, query_string, sort_by=None, start_offset=0, end_of
 
         if dwithin is not None:
             kwargs.setdefault('fq', [])
-            lng, lat = dwithin['point'].get_coords()
+            lng, lat = dwithin['point'].coords
             geofilt = '{!geofilt pt=%s,%s sfield=%s d=%s}' % (lat, lng, dwithin['field'], dwithin['distance'].km)
             kwargs['fq'].append(geofilt)
 

haystack/models.py

@@ -133,7 +133,7 @@ def _get_distance(self):
             if location_field is None:
                 return None
 
-            lf_lng, lf_lat = location_field.get_coords()
+            lf_lng, lf_lat = location_field.coords
             self._distance = Distance(km=geopy_distance.distance((po_lat, po_lng), (lf_lat, lf_lng)).km)
 
         # We've either already calculated it or the backend returned it, so

haystack/utils/geo.py

@@ -43,7 +43,7 @@ def ensure_wgs84(point):
 
     if not new_point.srid:
         # It has no spatial reference id. Assume WGS-84.
-        new_point.set_srid(WGS_84_SRID)
+        new_point.srid = WGS_84_SRID
     elif new_point.srid != WGS_84_SRID:
         # Transform it to get to the right system.
         new_point.transform(WGS_84_SRID)
@@ -72,7 +72,7 @@ def generate_bounding_box(bottom_left, top_right):
 
     The two-tuple is in the form ``((min_lat, min_lng), (max_lat, max_lng))``.
     """
-    west, lat_1 = bottom_left.get_coords()
-    east, lat_2 = top_right.get_coords()
+    west, lat_1 = bottom_left.coords
+    east, lat_2 = top_right.coords
     min_lat, max_lat = min(lat_1, lat_2), max(lat_1, lat_2)
     return ((min_lat, west), (max_lat, east))

test_haystack/spatial/test_spatial.py

@@ -37,7 +37,7 @@ def test_ensure_wgs84(self):
         self.assertEqual(std_pnt.y, 38.97127105172941)
 
         orig_pnt = Point(-95.23592948913574, 38.97127105172941)
-        orig_pnt.set_srid(2805)
+        orig_pnt.srid = 2805
         std_pnt = ensure_wgs84(orig_pnt)
         self.assertEqual(orig_pnt.srid, 2805)
         self.assertEqual(std_pnt.srid, 4326)
@@ -96,8 +96,8 @@ def test_indexing(self):
         self.assertEqual(sqs.count(), 1)
         self.assertEqual(sqs[0].username, first.username)
         # Make sure we've got a proper ``Point`` object.
-        self.assertAlmostEqual(sqs[0].location.get_coords()[0], first.longitude)
-        self.assertAlmostEqual(sqs[0].location.get_coords()[1], first.latitude)
+        self.assertAlmostEqual(sqs[0].location.coords[0], first.longitude)
+        self.assertAlmostEqual(sqs[0].location.coords[1], first.latitude)
 
         # Double-check, to make sure there was nothing accidentally copied
         # between instances.
@@ -106,8 +106,8 @@ def test_indexing(self):
         sqs = self.sqs.models(Checkin).filter(django_id=second.pk)
         self.assertEqual(sqs.count(), 1)
         self.assertEqual(sqs[0].username, second.username)
-        self.assertAlmostEqual(sqs[0].location.get_coords()[0], second.longitude)
-        self.assertAlmostEqual(sqs[0].location.get_coords()[1], second.latitude)
+        self.assertAlmostEqual(sqs[0].location.coords[0], second.longitude)
+        self.assertAlmostEqual(sqs[0].location.coords[1], second.latitude)
 
     def test_within(self):
         self.assertEqual(self.sqs.all().count(), 10)