summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-12-22 16:58:32 +0100
committerClaude Paroz <claude@2xlibre.net>2018-05-10 16:25:37 +0200
commit1e20fedb352dde5db2657cad73f998ccdb1aa607 (patch)
tree2c58829507e20ed1858174134f8c9f618f7f30df /django
parent78912ccd0e1fcdfe98ca85081c9eb8acb7aa1f6d (diff)
Upgraded OpenLayers to 4.6.5 for OpenLayersWidget
Diffstat (limited to 'django')
-rw-r--r--django/contrib/gis/forms/widgets.py4
-rw-r--r--django/contrib/gis/static/gis/js/OLMapWidget.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py
index cd9bff9f68..611bed9f6d 100644
--- a/django/contrib/gis/forms/widgets.py
+++ b/django/contrib/gis/forms/widgets.py
@@ -80,12 +80,12 @@ class OpenLayersWidget(BaseGeometryWidget):
class Media:
css = {
'all': (
- 'https://cdnjs.cloudflare.com/ajax/libs/ol3/3.20.1/ol.css',
+ 'https://cdnjs.cloudflare.com/ajax/libs/ol3/4.6.5/ol.css',
'gis/css/ol3.css',
)
}
js = (
- 'https://cdnjs.cloudflare.com/ajax/libs/ol3/3.20.1/ol.js',
+ 'https://cdnjs.cloudflare.com/ajax/libs/ol3/4.6.5/ol.js',
'gis/js/OLMapWidget.js',
)
diff --git a/django/contrib/gis/static/gis/js/OLMapWidget.js b/django/contrib/gis/static/gis/js/OLMapWidget.js
index 4cd98e2f1a..52864ed9ba 100644
--- a/django/contrib/gis/static/gis/js/OLMapWidget.js
+++ b/django/contrib/gis/static/gis/js/OLMapWidget.js
@@ -102,7 +102,7 @@ ol.inherits(GeometryTypeControl, ol.control.Control);
ol.extent.extend(extent, feature.getGeometry().getExtent());
}, this);
// Center/zoom the map
- this.map.getView().fit(extent, this.map.getSize(), {maxZoom: this.options.default_zoom});
+ this.map.getView().fit(extent, {maxZoom: this.options.default_zoom});
} else {
this.map.getView().setCenter(this.defaultCenter());
}