p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added error messages for GIS DB functions when used with rasters.

This commit is contained in:
Daniel Wiesmann 2016-08-15 18:21:12 +01:00 committed by Tim Graham
parent d6b9aab37c
commit 082f5bfdbc
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/gis/db/models/functions.py
View File

@ -1,7 +1,8 @@
from decimal import Decimal from decimal import Decimal
from django.contrib.gis.db.models.fields import GeometryField from django.contrib.gis.db.models.fields import GeometryField, RasterField
from django.contrib.gis.db.models.sql import AreaField from django.contrib.gis.db.models.sql import AreaField
from django.contrib.gis.geometry.backend import Geometry
from django.contrib.gis.measure import ( from django.contrib.gis.measure import (
Area as AreaMeasure, Distance as DistanceMeasure, Area as AreaMeasure, Distance as DistanceMeasure,
) )
@ -40,6 +41,8 @@ class GeoFunc(Func):
def as_sql(self, compiler, connection): def as_sql(self, compiler, connection):
if self.function is None: if self.function is None:
self.function = connection.ops.spatial_function_name(self.name) self.function = connection.ops.spatial_function_name(self.name)
if any(isinstance(field, RasterField) for field in self.get_source_fields()):
raise TypeError("Geometry functions not supported for raster fields.")
return super(GeoFunc, self).as_sql(compiler, connection) return super(GeoFunc, self).as_sql(compiler, connection)
def resolve_expression(self, *args, **kwargs): def resolve_expression(self, *args, **kwargs):
@ -87,6 +90,8 @@ class GeomValue(Value):
class GeoFuncWithGeoParam(GeoFunc): class GeoFuncWithGeoParam(GeoFunc):
def __init__(self, expression, geom, *expressions, **extra): def __init__(self, expression, geom, *expressions, **extra):
if not isinstance(geom, Geometry):
raise TypeError("Please provide a geometry object.")
if not hasattr(geom, 'srid') or not geom.srid: if not hasattr(geom, 'srid') or not geom.srid:
raise ValueError("Please provide a geometry attribute with a defined SRID.") raise ValueError("Please provide a geometry attribute with a defined SRID.")
super(GeoFuncWithGeoParam, self).__init__(expression, GeomValue(geom), *expressions, **extra) super(GeoFuncWithGeoParam, self).__init__(expression, GeomValue(geom), *expressions, **extra)

16
tests/gis_tests/rasterapp/test_rasterfield.py
View File

@ -1,5 +1,6 @@
import json import json
from django.contrib.gis.db.models.functions import Distance
from django.contrib.gis.db.models.lookups import ( from django.contrib.gis.db.models.lookups import (
DistanceLookupBase, gis_lookups, DistanceLookupBase, gis_lookups,
) )
@ -326,3 +327,18 @@ class RasterFieldTest(TransactionTestCase):
msg = "Couldn't create spatial object from lookup value '%s'." % obj msg = "Couldn't create spatial object from lookup value '%s'." % obj
with self.assertRaisesMessage(ValueError, msg): with self.assertRaisesMessage(ValueError, msg):
RasterModel.objects.filter(geom__intersects=obj) RasterModel.objects.filter(geom__intersects=obj)
def test_db_function_errors(self):
"""
Errors are raised when using DB functions with raster content.
"""
point = GEOSGeometry("SRID=3086;POINT (-697024.9213808845 683729.1705516104)")
rast = GDALRaster(json.loads(JSON_RASTER))
msg = "Please provide a geometry object."
with self.assertRaisesMessage(TypeError, msg):
RasterModel.objects.annotate(distance_from_point=Distance("geom", rast))
with self.assertRaisesMessage(TypeError, msg):
RasterModel.objects.annotate(distance_from_point=Distance("rastprojected", rast))
msg = "Geometry functions not supported for raster fields."
with self.assertRaisesMessage(TypeError, msg):
RasterModel.objects.annotate(distance_from_point=Distance("rastprojected", point)).count()