p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reported OpenLayersWidget exceptions through logging

This commit is contained in:
Claude Paroz 2012-10-17 11:55:38 +02:00
parent fd02bcff4a
commit 9d2e1f065e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
django/contrib/gis/admin/widgets.py
View File

@ -1,3 +1,5 @@
import logging
from django.forms.widgets import Textarea from django.forms.widgets import Textarea
from django.template import loader, Context from django.template import loader, Context
from django.templatetags.static import static from django.templatetags.static import static
@ -10,6 +12,8 @@ from django.contrib.gis.geos import GEOSGeometry, GEOSException, fromstr
# Creating a template context that contains Django settings # Creating a template context that contains Django settings
# values needed by admin map templates. # values needed by admin map templates.
geo_context = Context({'LANGUAGE_BIDI' : translation.get_language_bidi()}) geo_context = Context({'LANGUAGE_BIDI' : translation.get_language_bidi()})
logger = logging.getLogger('django.contrib.gis')
class OpenLayersWidget(Textarea): class OpenLayersWidget(Textarea):
""" """
@ -29,7 +33,11 @@ class OpenLayersWidget(Textarea):
if isinstance(value, six.string_types): if isinstance(value, six.string_types):
try: try:
value = GEOSGeometry(value) value = GEOSGeometry(value)
except (GEOSException, ValueError): except (GEOSException, ValueError) as err:
logger.error(
"Error creating geometry from value '%s' (%s)" % (
value, err)
)
value = None value = None
if value and value.geom_type.upper() != self.geom_type: if value and value.geom_type.upper() != self.geom_type:
@ -56,7 +64,11 @@ class OpenLayersWidget(Textarea):
ogr = value.ogr ogr = value.ogr
ogr.transform(srid) ogr.transform(srid)
wkt = ogr.wkt wkt = ogr.wkt
except OGRException: except OGRException as err:
logger.error(
"Error transforming geometry from srid '%s' to srid '%s' (%s)" % (
value.srid, srid, err)
)
wkt = '' wkt = ''
else: else:
wkt = value.wkt wkt = value.wkt