innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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
This commit is contained in:
Justin Bronn 2011-09-17 23:01:46 +00:00
parent 30745b2e65
commit 1ec25c4fb7
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/contrib/gis/admin/options.py
View File

@ -121,7 +121,6 @@ if gdal.HAS_GDAL:
class OSMGeoAdmin(GeoModelAdmin): class OSMGeoAdmin(GeoModelAdmin):
map_template = 'gis/admin/osm.html' map_template = 'gis/admin/osm.html'
extra_js = ['http://www.openstreetmap.org/openlayers/OpenStreetMap.js']
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'

2
django/contrib/gis/templates/gis/admin/osm.js
View File

@ -1,2 +1,2 @@
{% extends "gis/admin/openlayers.js" %} {% 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 %}