Skip to content

Commit

Permalink
Updated OpenLayers (now points to 2.10) and OpenStreetMap JavaScript …
Browse files Browse the repository at this point in the history
…URLs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
jbronn committed Nov 2, 2010
1 parent 222c732 commit d8e311c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions django/contrib/gis/admin/options.py
Expand Up @@ -32,7 +32,7 @@ class GeoModelAdmin(ModelAdmin):
map_height = 400 map_height = 400
map_srid = 4326 map_srid = 4326
map_template = 'gis/admin/openlayers.html' map_template = 'gis/admin/openlayers.html'
openlayers_url = 'http://openlayers.org/api/2.8/OpenLayers.js' openlayers_url = 'http://openlayers.org/api/2.10/OpenLayers.js'
point_zoom = num_zoom - 6 point_zoom = num_zoom - 6
wms_url = 'http://labs.metacarta.com/wms/vmap0' wms_url = 'http://labs.metacarta.com/wms/vmap0'
wms_layer = 'basic' wms_layer = 'basic'
Expand Down Expand Up @@ -115,7 +115,7 @@ class OLMap(self.widget):
if gdal.HAS_GDAL: 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://openstreetmap.org/openlayers/OpenStreetMap.js'] extra_js = ['http://www.openstreetmap.org/openlayers/OpenStreetMap.js']
num_zoom = 20 num_zoom = 20
map_srid = 900913 map_srid = 900913
max_extent = '-20037508,-20037508,20037508,20037508' max_extent = '-20037508,-20037508,20037508,20037508'
Expand Down

0 comments on commit d8e311c

Please sign in to comment.