summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2015-10-03 12:36:39 +0200
committerClaude Paroz <claude@2xlibre.net>2015-10-03 12:36:39 +0200
commit41ed6338a40240112f242d76970bfa473da2209f (patch)
treedea75388a4be246c9bff39495c84ebfe855d5dad
parentd2ef521a53e765585cb31a053e4b0158b5faefe6 (diff)
Upgraded OpenLayers version from 2.13 to 2.13.1
Thanks Daniel Hahler for the initial patch.
-rw-r--r--django/contrib/gis/admin/options.py2
-rw-r--r--django/contrib/gis/forms/widgets.py4
-rw-r--r--docs/ref/contrib/gis/admin.txt2
-rw-r--r--docs/releases/1.9.txt3
4 files changed, 7 insertions, 4 deletions
diff --git a/django/contrib/gis/admin/options.py b/django/contrib/gis/admin/options.py
index dca46829fd..ed983a1337 100644
--- a/django/contrib/gis/admin/options.py
+++ b/django/contrib/gis/admin/options.py
@@ -35,7 +35,7 @@ class GeoModelAdmin(ModelAdmin):
map_height = 400
map_srid = 4326
map_template = 'gis/admin/openlayers.html'
- openlayers_url = 'http://openlayers.org/api/2.13/OpenLayers.js'
+ openlayers_url = 'http://openlayers.org/api/2.13.1/OpenLayers.js'
point_zoom = num_zoom - 6
wms_url = 'http://vmap0.tiles.osgeo.org/wms/vmap0'
wms_layer = 'basic'
diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py
index 37c9be8fbc..1fbe19b082 100644
--- a/django/contrib/gis/forms/widgets.py
+++ b/django/contrib/gis/forms/widgets.py
@@ -82,7 +82,7 @@ class OpenLayersWidget(BaseGeometryWidget):
class Media:
js = (
- 'http://openlayers.org/api/2.13/OpenLayers.js',
+ 'http://openlayers.org/api/2.13.1/OpenLayers.js',
'gis/js/OLMapWidget.js',
)
@@ -97,7 +97,7 @@ class OSMWidget(BaseGeometryWidget):
class Media:
js = (
- 'http://openlayers.org/api/2.13/OpenLayers.js',
+ 'http://openlayers.org/api/2.13.1/OpenLayers.js',
'http://www.openstreetmap.org/openlayers/OpenStreetMap.js',
'gis/js/OLMapWidget.js',
)
diff --git a/docs/ref/contrib/gis/admin.txt b/docs/ref/contrib/gis/admin.txt
index b91a2158f3..41cda39a88 100644
--- a/docs/ref/contrib/gis/admin.txt
+++ b/docs/ref/contrib/gis/admin.txt
@@ -42,7 +42,7 @@ GeoDjango's admin site
.. attribute:: openlayers_url
Link to the URL of the OpenLayers JavaScript. Defaults to
- ``'http://openlayers.org/api/2.13/OpenLayers.js'``.
+ ``'http://openlayers.org/api/2.13.1/OpenLayers.js'``.
.. attribute:: modifiable
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index 1f8a127c4f..42f4707064 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -254,6 +254,9 @@ Minor features
* The new :class:`~django.contrib.gis.geoip2.GeoIP2` class allows using
MaxMind's GeoLite2 databases which includes support for IPv6 addresses.
+* The default OpenLayers library version included in widgets has been updated
+ from 2.13 to 2.13.1.
+
:mod:`django.contrib.postgres`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^