Commit 41ed6338 authored by Claude Paroz's avatar Claude Paroz
Browse files

Upgraded OpenLayers version from 2.13 to 2.13.1 

Thanks Daniel Hahler for the initial patch.
parent d2ef521a

django/contrib/gis/admin/options.py

+1 −1
Original line number Diff line number Diff line
@@ -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'

django/contrib/gis/forms/widgets.py

+2 −2
Original line number Diff line number Diff line
@@ -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',

        )

docs/ref/contrib/gis/admin.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

docs/releases/1.9.txt

+3 −0
Original line number Diff line number Diff line
@@ -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`

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^