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 · Sep 17, 2011 · 1ec25c4 · 1ec25c4
1 parent 30745b2
commit 1ec25c4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/django/contrib/gis/admin/options.py b/django/contrib/gis/admin/options.py
@@ -121,7 +121,6 @@ class OLMap(self.widget):
 
     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
@@ -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 %}