From 1ec25c4fb7df0fdbc30bb7ae1e06e97451dec361 Mon Sep 17 00:00:00 2001 From: Justin Bronn Date: Sat, 17 Sep 2011 23:01:46 +0000 Subject: [PATCH] OpenLayers has had built-in OSM support since 2.10, no need for extra JS. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16847 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/gis/admin/options.py | 1 - django/contrib/gis/templates/gis/admin/osm.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/django/contrib/gis/admin/options.py b/django/contrib/gis/admin/options.py index 7da6b9e4f2..4732e7363f 100644 --- a/django/contrib/gis/admin/options.py +++ b/django/contrib/gis/admin/options.py @@ -121,7 +121,6 @@ if gdal.HAS_GDAL: class OSMGeoAdmin(GeoModelAdmin): map_template = 'gis/admin/osm.html' - extra_js = ['http://www.openstreetmap.org/openlayers/OpenStreetMap.js'] num_zoom = 20 map_srid = spherical_mercator_srid max_extent = '-20037508,-20037508,20037508,20037508' diff --git a/django/contrib/gis/templates/gis/admin/osm.js b/django/contrib/gis/templates/gis/admin/osm.js index 2a1f59e4d3..16a5773074 100644 --- a/django/contrib/gis/templates/gis/admin/osm.js +++ b/django/contrib/gis/templates/gis/admin/osm.js @@ -1,2 +1,2 @@ {% extends "gis/admin/openlayers.js" %} -{% block base_layer %}new OpenLayers.Layer.OSM.Mapnik("OpenStreetMap (Mapnik)");{% endblock %} +{% block base_layer %}new OpenLayers.Layer.OSM("OpenStreetMap (Mapnik)");{% endblock %}