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

Removed ability to pass a geometry string to GIS functions 

This was a possible confusion source with column name arguments.
Thanks Sergey Fedoseev for the suggestion.
This commit is contained in:
Claude Paroz 2015-11-07 14:43:33 +01:00
parent 24c1605aa0
commit c3531d2f20
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@ from decimal import Decimal
from django.contrib.gis.db.models.fields import GeometryField from django.contrib.gis.db.models.fields import GeometryField
from django.contrib.gis.db.models.sql import AreaField from django.contrib.gis.db.models.sql import AreaField
from django.contrib.gis.geos.geometry import GEOSGeometry
from django.contrib.gis.measure import ( from django.contrib.gis.measure import (
Area as AreaMeasure, Distance as DistanceMeasure, Area as AreaMeasure, Distance as DistanceMeasure,
) )
@ -91,16 +90,9 @@ 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 hasattr(geom, 'srid'): if not hasattr(geom, 'srid') or not geom.srid:
# Try to interpret it as a geometry input
try:
geom = GEOSGeometry(geom)
except Exception:
raise ValueError("This function requires a geometric parameter.")
if 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.")
geom = GeomValue(geom) super(GeoFuncWithGeoParam, self).__init__(expression, GeomValue(geom), *expressions, **extra)
super(GeoFuncWithGeoParam, self).__init__(expression, geom, *expressions, **extra)
class SQLiteDecimalToFloatMixin(object): class SQLiteDecimalToFloatMixin(object):

4
tests/gis_tests/distapp/tests.py
View File

@ -516,9 +516,7 @@ class DistanceFunctionsTests(TestCase):
dist_qs = [dist1] dist_qs = [dist1]
else: else:
dist2 = SouthTexasCityFt.objects.annotate(distance=Distance('point', lagrange)).order_by('id') dist2 = SouthTexasCityFt.objects.annotate(distance=Distance('point', lagrange)).order_by('id')
# Using EWKT string parameter. dist_qs = [dist1, dist2]
dist3 = SouthTexasCityFt.objects.annotate(distance=Distance('point', lagrange.ewkt)).order_by('id')
dist_qs = [dist1, dist2, dist3]
# Original query done on PostGIS, have to adjust AlmostEqual tolerance # Original query done on PostGIS, have to adjust AlmostEqual tolerance
# for Oracle. # for Oracle.