mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-30 19:20:44 +00:00
Code Issues 32 Releases Wiki Activity

Delayed GDAL check for OSMGeoAdmin

Browse Source
This commit is contained in:
Claude Paroz 2015-04-24 18:16:40 +02:00
parent b695153852
commit a37dcfd0a3
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,18 +4,5 @@ from django.contrib.admin import ( # NOQA: flake8 detects only the last __all__
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 # NOQA
from django.contrib.gis.admin.widgets import OpenLayersWidget # NOQA from django.contrib.gis.admin.widgets import OpenLayersWidget # NOQA
__all__ = [
"autodiscover", "site", "AdminSite", "ModelAdmin", "StackedInline",
"TabularInline", "HORIZONTAL", "VERTICAL",
"GeoModelAdmin", "OpenLayersWidget", "HAS_OSM",
]
try:
from django.contrib.gis.admin.options import OSMGeoAdmin
HAS_OSM = True
__all__ += ['OSMGeoAdmin']
except ImportError:
HAS_OSM = False

26
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,14 +126,17 @@ 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
max_extent = '-20037508,-20037508,20037508,20037508' max_extent = '-20037508,-20037508,20037508,20037508'
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,3 +1,4 @@
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
from ..admin import admin from ..admin import admin
@ -19,4 +20,5 @@ class City(models.Model):
return self.name return self.name
site = admin.AdminSite(name='admin_gis') site = admin.AdminSite(name='admin_gis')
site.register(City, admin.OSMGeoAdmin) if HAS_GDAL:
site.register(City, admin.OSMGeoAdmin)