Author: jbronn
Date: 2011-09-17 16:01:46 -0700 (Sat, 17 Sep 2011)
New Revision: 16847

Modified:
   django/trunk/django/contrib/gis/admin/options.py
   django/trunk/django/contrib/gis/templates/gis/admin/osm.js
Log:
OpenLayers has had built-in OSM support since 2.10, no need for extra JS.

Modified: django/trunk/django/contrib/gis/admin/options.py
===================================================================
--- django/trunk/django/contrib/gis/admin/options.py    2011-09-17 20:06:00 UTC 
(rev 16846)
+++ django/trunk/django/contrib/gis/admin/options.py    2011-09-17 23:01:46 UTC 
(rev 16847)
@@ -121,7 +121,6 @@
 
     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'

Modified: django/trunk/django/contrib/gis/templates/gis/admin/osm.js
===================================================================
--- django/trunk/django/contrib/gis/templates/gis/admin/osm.js  2011-09-17 
20:06:00 UTC (rev 16846)
+++ django/trunk/django/contrib/gis/templates/gis/admin/osm.js  2011-09-17 
23:01:46 UTC (rev 16847)
@@ -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 %}

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to