Ticket #15533: osmgeoadminfix.diff

django/contrib/gis/admin/widgets.py

@@ -1 +1 @@
 from django.conf import settings
-from django.contrib.gis.gdal import OGRException
+from django.contrib.gis.gdal import OGRException, SRSException
 from django.contrib.gis.geos import GEOSGeometry, GEOSException
 from django.forms.widgets import Textarea
 from django.template import loader, Context
@@ -54 +54 @@
             if value.srid != srid:
                 try:
                     ogr = value.ogr
-                    ogr.transform(srid)
+                    try:
+                        ogr.transform(srid)
+                    except SRSException:
+                        # 900913 is deprecated, 3857 is the official projection
+                        if srid == 900913:
+                            ogr.transform(3857)
+                        else:
+                            raise
                     wkt = ogr.wkt
                 except OGRException:
                     wkt = ''