[qa] Test bounding box calculation when using method field for geo field

Author: hemache

tests/django_restframework_gis_tests/serializers.py

@@ -140,6 +140,32 @@ class Meta:
         exclude = []
 
 
+class LocationGeoFeatureMethodAutoBboxSerializer(gis_serializers.GeoFeatureModelSerializer):
+    new_geometry = gis_serializers.GeometrySerializerMethodField()
+
+    class Meta:
+        model = Location
+        geo_field = 'new_geometry'
+        auto_bbox = True
+        exclude = []
+
+    def get_new_geometry(self, obj):
+        return obj.geometry
+
+
+class LocationGeoFeatureMethodManualBboxSerializer(gis_serializers.GeoFeatureModelSerializer):
+    new_geometry = gis_serializers.GeometrySerializerMethodField()
+
+    class Meta:
+        model = Location
+        geo_field = 'new_geometry'
+        bbox_geo_field = 'new_geometry'
+        exclude = []
+
+    def get_new_geometry(self, obj):
+        return obj.geometry
+
+
 class NoneGeoFeatureMethodSerializer(gis_serializers.GeoFeatureModelSerializer):
     new_geometry = gis_serializers.GeometrySerializerMethodField()
 

tests/django_restframework_gis_tests/test_bbox.py

@@ -22,6 +22,8 @@ class TestRestFrameworkGisBBox(TestCase):
     def setUp(self):
         self.geojson_boxedlocation_list_url = reverse('api_geojson_boxedlocation_list')
         self.geojson_location_bbox_list_url = reverse('api_geojson_location_bbox_list')
+        self.geojson_location_method_field_auto_bbox_list_url = reverse('api_geojson_location_method_field_auto_bbox_list')
+        self.geojson_location_method_field_manual_bbox_list_url = reverse('api_geojson_location_method_field_manual_bbox_list')
 
     def _create_locations(self):
         self.bl1 = BoxedLocation.objects.create(
@@ -87,6 +89,20 @@ def test_get_autogenerated_location_bbox_geojson(self):
         self.assertEqual(len(response.data['features']), 1)
         self.assertEqual(response.data['features'][0]['bbox'], self.l1.geometry.extent)
 
+    def test_get_autogenerated_location_auto_bbox_geojson_with_method_field(self):
+        self._create_locations()
+        response = self.client.get(self.geojson_location_method_field_auto_bbox_list_url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data['features']), 1)
+        self.assertEqual(response.data['features'][0]['bbox'], self.l1.geometry.extent)
+    
+    def test_get_autogenerated_location_manual_bbox_geojson_with_method_field(self):
+        self._create_locations()
+        response = self.client.get(self.geojson_location_method_field_manual_bbox_list_url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data['features']), 1)
+        self.assertEqual(response.data['features'][0]['bbox'], self.l1.geometry.extent)
+
     def test_bbox_improperly_configured(self):
         self._create_locations()
 

tests/django_restframework_gis_tests/urls.py

@@ -65,6 +65,16 @@
         views.geojson_location_bbox_list,
         name='api_geojson_location_bbox_list',
     ),
+    url(
+        r'^geojson-location-method-field-auto-bbox/$',
+        views.geojson_location_method_field_auto_bbox_list,
+        name='api_geojson_location_method_field_auto_bbox_list',
+    ),
+    url(
+        r'^geojson-location-method-field-manual-bbox/$',
+        views.geojson_location_method_field_manual_bbox_list,
+        name='api_geojson_location_method_field_manual_bbox_list',
+    ),
     # Filters
     url(
         r'^filters/contained_in_bbox$',

tests/django_restframework_gis_tests/views.py

@@ -18,6 +18,8 @@
     LocationGeoFeatureBboxSerializer,
     LocationGeoFeatureFalseIdSerializer,
     LocationGeoFeatureMethodSerializer,
+    LocationGeoFeatureMethodAutoBboxSerializer,
+    LocationGeoFeatureMethodManualBboxSerializer,
     LocationGeoFeatureNoIdSerializer,
     LocationGeoFeatureSerializer,
     LocationGeoFeatureSlugSerializer,
@@ -240,6 +242,24 @@ class GeojsonLocationBboxList(generics.ListCreateAPIView):
 geojson_location_bbox_list = GeojsonLocationBboxList.as_view()
 
 
+class GeojsonLocationMethodFieldAutoBboxList(generics.ListCreateAPIView):
+    model = Location
+    serializer_class = LocationGeoFeatureMethodAutoBboxSerializer
+    queryset = Location.objects.all()
+
+
+geojson_location_method_field_auto_bbox_list = GeojsonLocationMethodFieldAutoBboxList.as_view()
+
+
+class GeojsonLocationMethodFieldManualBboxList(generics.ListCreateAPIView):
+    model = Location
+    serializer_class = LocationGeoFeatureMethodManualBboxSerializer
+    queryset = Location.objects.all()
+
+
+geojson_location_method_field_manual_bbox_list = GeojsonLocationMethodFieldManualBboxList.as_view()
+
+
 class GeojsonNullableDetails(generics.RetrieveUpdateDestroyAPIView):
     model = Location
     serializer_class = LocationGeoFeatureSerializer