summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2010-11-02 19:31:14 +0000
committerJustin Bronn <jbronn@gmail.com>2010-11-02 19:31:14 +0000
commitd8e311c8d17872162dcb0c43238abd432f124b72 (patch)
treebfaaff88b5ba1e77e32540b7963f56ecd7c4ae05
parent222c73261650201f5ce99e8dd4b1ce0d30a69eb4 (diff)
Updated OpenLayers (now points to 2.10) and OpenStreetMap JavaScript URLs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/gis/admin/options.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/gis/admin/options.py b/django/contrib/gis/admin/options.py
index 1814933f7b..ae8fda5a29 100644
--- a/django/contrib/gis/admin/options.py
+++ b/django/contrib/gis/admin/options.py
@@ -32,7 +32,7 @@ class GeoModelAdmin(ModelAdmin):
map_height = 400
map_srid = 4326
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
wms_url = 'http://labs.metacarta.com/wms/vmap0'
wms_layer = 'basic'
@@ -115,7 +115,7 @@ from django.contrib.gis import gdal
if gdal.HAS_GDAL:
class OSMGeoAdmin(GeoModelAdmin):
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
map_srid = 900913
max_extent = '-20037508,-20037508,20037508,20037508'