mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

gis: Fixed #6246 (Thanks jos3ph); removed unnecessary commented debugging code.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6966 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2007-12-21 21:36:54 +00:00
parent 34560a01da
commit 24617b1667
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,15 +38,8 @@ class GeoQuerySet(QuerySet):
# If GEOM_SELECT is defined in the backend, then it will be used
# for the selection format of the geometry column.
if GEOM_SELECT:
#if oracle and hasattr(self, '_ewkt'):
# Transformed geometries in Oracle use EWKT so that the SRID
# on the transformed lazy geometries is set correctly).
#print '-=' * 20
#print self._ewkt, GEOM_SELECT
#self._geo_fmt = "'SRID=%d;'||%s" % (self._ewkt, GEOM_SELECT)
#self._geo_fmt = GEOM_SELECT
#else:
#print '-=' * 20
self._geo_fmt = GEOM_SELECT
else:
self._geo_fmt = '%s'

15
django/contrib/gis/utils/ogrinspect.py
View File

@ -110,14 +110,17 @@ def _ogrinspect(data_source, model_name, geom_name='geom', layer_key=0, srid=Non
# Setting up the SRID parameter string.
if srid is None:
srid = layer.srs.srid
if srid is None:
if layer.srs is None:
srid_str = 'srid=-1'
elif srid == 4326:
# WGS84 is the default.
srid_str = ''
else:
srid_str = 'srid=%s' % srid
srid = layer.srs.srid
if srid is None:
srid_str = 'srid=-1'
elif srid == 4326:
# WGS84 is the default.
srid_str = ''
else:
srid_str = 'srid=%s' % srid
else:
srid_str = 'srid=%s' % srid