p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgraded OpenLayers version from 2.13 to 2.13.1 

Thanks Daniel Hahler for the initial patch.
This commit is contained in:
Claude Paroz 2015-10-03 12:36:39 +02:00
parent d2ef521a53
commit 41ed6338a4
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,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.13/OpenLayers.js' openlayers_url = 'http://openlayers.org/api/2.13.1/OpenLayers.js'
point_zoom = num_zoom - 6 point_zoom = num_zoom - 6
wms_url = 'http://vmap0.tiles.osgeo.org/wms/vmap0' wms_url = 'http://vmap0.tiles.osgeo.org/wms/vmap0'
wms_layer = 'basic' wms_layer = 'basic'

4
django/contrib/gis/forms/widgets.py
View File

@ -82,7 +82,7 @@ class OpenLayersWidget(BaseGeometryWidget):
class Media: class Media:
js = ( js = (
'http://openlayers.org/api/2.13/OpenLayers.js', 'http://openlayers.org/api/2.13.1/OpenLayers.js',
'gis/js/OLMapWidget.js', 'gis/js/OLMapWidget.js',
) )
@ -97,7 +97,7 @@ class OSMWidget(BaseGeometryWidget):
class Media: class Media:
js = ( 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', 'http://www.openstreetmap.org/openlayers/OpenStreetMap.js',
'gis/js/OLMapWidget.js', 'gis/js/OLMapWidget.js',
) )

2
docs/ref/contrib/gis/admin.txt
View File

@ -42,7 +42,7 @@ GeoDjango's admin site
.. attribute:: openlayers_url .. attribute:: openlayers_url
Link to the URL of the OpenLayers JavaScript. Defaults to 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 .. attribute:: modifiable

3
docs/releases/1.9.txt
View File

@ -254,6 +254,9 @@ Minor features
* The new :class:`~django.contrib.gis.geoip2.GeoIP2` class allows using * The new :class:`~django.contrib.gis.geoip2.GeoIP2` class allows using
MaxMind's GeoLite2 databases which includes support for IPv6 addresses. 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` :mod:`django.contrib.postgres`
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^