Commit 1ec25c4f authored by Justin Bronn's avatar Justin Bronn
Browse files

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
parent 30745b2e

django/contrib/gis/admin/options.py

+0 −1
Original line number Diff line number Diff line
@@ -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'

django/contrib/gis/templates/gis/admin/osm.js

+1 −1
Original line number Diff line number Diff line 
{% 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 %}