CAMP/gazetteer
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed broken .overlaps() query.

Browse source
This commit is contained in:
Schuyler Erle 2011-08-28 09:31:23 +02:00
parent 04bed12052
commit abd06fc0e2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gazetteer/places/models.py
View file

@ -20,11 +20,11 @@ class FeatureSearchManager(models.GeoManager):
def overlaps(self, (minx, miny, maxx, maxy), text=None, srid=4326): def overlaps(self, (minx, miny, maxx, maxy), text=None, srid=4326):
bbox = Polygon(((minx,miny),(minx,maxy),(maxx,maxy),(maxx,miny),(minx,miny)),srid=srid) bbox = Polygon(((minx,miny),(minx,maxy),(maxx,maxy),(maxx,miny),(minx,miny)),srid=srid)
if srid != 4326: bbox.transform(4326) # convert to lon/lat if srid != 4326: bbox.transform(4326) # convert to lon/lat
qset = super(FeatureSearchManager, self).get_query_set().filter(geometry__bboverlaps=bbox) qset = models.GeoManager.get_query_set(self).filter(geometry__bboverlaps=bbox)
if text: if text:
text = text.replace("'", "''") # escape the ' text = text.replace("'", "''") # escape the '
# use the pg_trgm index # use the pg_trgm index
qset = qset.extra(where="[preferred_name %% '%s']" % text) qset = qset.extra(where=["preferred_name %%%% '%s'" % text])
return qset return qset
class Feature(models.Model): class Feature(models.Model):