diff --git a/package.json b/package.json
index 8dd09c717a..da06b26597 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
"moment": "2.13.0",
"object-assign": "4.1.1",
"ogc-schemas": "2.6.1",
- "openlayers": "4.0.1",
+ "openlayers": "4.6.4",
"pdfviewer": "0.3.2",
"proj4": "https://github.com/geosolutions-it/proj4js/tarball/mapstore2_fixes",
"prop-types": "15.6.0",
diff --git a/project/custom/templates/index.html b/project/custom/templates/index.html
index c9796167f4..0a41ea6d27 100644
--- a/project/custom/templates/index.html
+++ b/project/custom/templates/index.html
@@ -7,14 +7,14 @@
__PROJECTDESCRIPTION__
-
+
-
+
diff --git a/project/standard/templates/index.html b/project/standard/templates/index.html
index 90622258f3..74364f3ee2 100644
--- a/project/standard/templates/index.html
+++ b/project/standard/templates/index.html
@@ -7,13 +7,13 @@
__PROJECTDESCRIPTION__
-
+
-
+
diff --git a/web/client/components/map/openlayers/__tests__/Map-test.jsx b/web/client/components/map/openlayers/__tests__/Map-test.jsx
index 8164a0362e..37f759d1ef 100644
--- a/web/client/components/map/openlayers/__tests__/Map-test.jsx
+++ b/web/client/components/map/openlayers/__tests__/Map-test.jsx
@@ -275,8 +275,6 @@ describe('OpenlayersMap', () => {
, document.getElementById("map"));
const olMap = map.map;
- olMap.getView().setZoom(12);
-
olMap.on('moveend', () => {
// The first call is triggered as soon as the map component is mounted, the second one is as a result of setZoom
expect(spy.calls.length).toEqual(2);
@@ -290,6 +288,8 @@ describe('OpenlayersMap', () => {
expect(spy.calls[1].arguments[3].width).toExist();
done();
});
+ olMap.getView().setZoom(12);
+ olMap.dispatchEvent('moveend');
});
it('check if the handler for "moveend" event is called after setCenter', (done) => {
@@ -307,8 +307,6 @@ describe('OpenlayersMap', () => {
, document.getElementById("map"));
const olMap = map.map;
- olMap.getView().setCenter(ol.proj.transform([10, 44], 'EPSG:4326', 'EPSG:3857'));
-
olMap.on('moveend', () => {
// The first call is triggered as soon as the map component is mounted, the second one is as a result of setCenter
expect(spy.calls.length).toEqual(2);
@@ -322,6 +320,8 @@ describe('OpenlayersMap', () => {
expect(spy.calls[1].arguments[3].width).toExist();
done();
});
+ olMap.getView().setCenter(ol.proj.transform([10, 44], 'EPSG:4326', 'EPSG:3857'));
+ olMap.dispatchEvent('moveend');
});
it('check if the map changes when receive new props', () => {
diff --git a/web/client/examples/api/index.html b/web/client/examples/api/index.html
index 3f2665aad4..e93ab0fb48 100644
--- a/web/client/examples/api/index.html
+++ b/web/client/examples/api/index.html
@@ -7,7 +7,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
diff --git a/web/client/examples/queryform/index.html b/web/client/examples/queryform/index.html
index f7b0dd4082..3d8141866f 100644
--- a/web/client/examples/queryform/index.html
+++ b/web/client/examples/queryform/index.html
@@ -6,13 +6,13 @@
QueryForm
-
+
-
+