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

[1.8.x] Fixed #24802 -- Delayed GDAL check for OSMGeoAdmin 

Backport of a37dcfd0a3 from master
This commit is contained in:
Tim Graham 2015-05-15 09:10:54 -04:00
parent f19932591b
commit 30e5703844
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
django/contrib/gis/admin/__init__.py
View File

@ -1,21 +1,14 @@
# Getting the normal admin routines, classes, and `site` instance. # Getting the normal admin routines, classes, and `site` instance.
from django.contrib.admin import ( # NOQA: flake8 detects only the last __all__ from django.contrib.admin import (
autodiscover, site, AdminSite, ModelAdmin, StackedInline, TabularInline, autodiscover, site, AdminSite, ModelAdmin, StackedInline, TabularInline,
HORIZONTAL, VERTICAL, HORIZONTAL, VERTICAL,
) )
# Geographic admin options classes and widgets. # Geographic admin options classes and widgets.
from django.contrib.gis.admin.options import GeoModelAdmin # NOQA from django.contrib.gis.admin.options import GeoModelAdmin, OSMGeoAdmin
from django.contrib.gis.admin.widgets import OpenLayersWidget # NOQA from django.contrib.gis.admin.widgets import OpenLayersWidget
__all__ = [ __all__ = [
"autodiscover", "site", "AdminSite", "ModelAdmin", "StackedInline", 'autodiscover', 'site', 'AdminSite', 'ModelAdmin', 'StackedInline',
"TabularInline", "HORIZONTAL", "VERTICAL", 'TabularInline', 'HORIZONTAL', 'VERTICAL', 'GeoModelAdmin', 'OSMGeoAdmin',
"GeoModelAdmin", "OpenLayersWidget", "HAS_OSM", 'OpenLayersWidget',
] ]
try:
from django.contrib.gis.admin.options import OSMGeoAdmin
HAS_OSM = True
__all__ += ['OSMGeoAdmin']
except ImportError:
HAS_OSM = False

12
django/contrib/gis/admin/options.py
View File

@ -2,6 +2,9 @@ from django.contrib.admin import ModelAdmin
from django.contrib.gis.admin.widgets import OpenLayersWidget from django.contrib.gis.admin.widgets import OpenLayersWidget
from django.contrib.gis.db import models from django.contrib.gis.db import models
from django.contrib.gis.gdal import HAS_GDAL, OGRGeomType from django.contrib.gis.gdal import HAS_GDAL, OGRGeomType
from django.core.exceptions import ImproperlyConfigured
spherical_mercator_srid = 3857
class GeoModelAdmin(ModelAdmin): class GeoModelAdmin(ModelAdmin):
@ -123,10 +126,8 @@ class GeoModelAdmin(ModelAdmin):
} }
return OLMap return OLMap
if HAS_GDAL:
spherical_mercator_srid = 3857
class OSMGeoAdmin(GeoModelAdmin): class OSMGeoAdmin(GeoModelAdmin):
map_template = 'gis/admin/osm.html' map_template = 'gis/admin/osm.html'
num_zoom = 20 num_zoom = 20
map_srid = spherical_mercator_srid map_srid = spherical_mercator_srid
@ -134,3 +135,8 @@ if HAS_GDAL:
max_resolution = '156543.0339' max_resolution = '156543.0339'
point_zoom = num_zoom - 6 point_zoom = num_zoom - 6
units = 'm' units = 'm'
def __init__(self, *args):
if not HAS_GDAL:
raise ImproperlyConfigured("OSMGeoAdmin is not usable without GDAL libs installed")
super(OSMGeoAdmin, self).__init__(*args)

4
tests/gis_tests/geoadmin/models.py
View File

@ -1,5 +1,6 @@
from django.contrib.gis import admin from django.contrib.gis import admin
from django.contrib.gis.db import models from django.contrib.gis.db import models
from django.contrib.gis.gdal import HAS_GDAL
from django.utils.encoding import python_2_unicode_compatible from django.utils.encoding import python_2_unicode_compatible
@ -16,4 +17,5 @@ class City(models.Model):
def __str__(self): def __str__(self):
return self.name return self.name
admin.site.register(City, admin.OSMGeoAdmin) if HAS_GDAL:
admin.site.register(City, admin.OSMGeoAdmin)