Merge pull request #4359 from camptocamp/greenkeeper/ol-5.3.0

Update ol to the latest version 🚀
camptocamp · Nov 7, 2018 · ed70f16 · ed70f16
2 parents e25f93e + 73f2f91
commit ed70f16
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -97,7 +97,7 @@
     "moment": "2.22.2",
     "node-sass": "4.10.0",
     "node-sass-importer": "1.0.0",
-    "ol": "5.2.0",
+    "ol": "5.3.0",
     "ol-cesium": "2.4.0",
     "phantomjs-polyfill-string-includes": "1.0.0",
     "phantomjs-prebuilt": "2.1.16",

diff --git a/src/interaction/DrawAzimut.js b/src/interaction/DrawAzimut.js
@@ -12,7 +12,7 @@ import olGeomCircle from 'ol/geom/Circle.js';
 import olGeomGeometryCollection from 'ol/geom/GeometryCollection.js';
 import olGeomLineString from 'ol/geom/LineString.js';
 import olGeomPoint from 'ol/geom/Point.js';
-import olInteractionPointer, {handleEvent as pointerHandleEvent} from 'ol/interaction/Pointer.js';
+import olInteractionPointer from 'ol/interaction/Pointer.js';
 import olLayerVector from 'ol/layer/Vector.js';
 import olSourceVector from 'ol/source/Vector.js';
 
@@ -148,7 +148,7 @@ exports.handleEvent_ = function(mapBrowserEvent) {
   } else if (mapBrowserEvent.type === 'dblclick') {
     pass = false;
   }
-  return pointerHandleEvent.call(this, mapBrowserEvent) && pass;
+  return olInteractionPointer.prototype.handleEvent.call(this, mapBrowserEvent) && pass;
 };
 
 

diff --git a/src/interaction/ModifyCircle.js b/src/interaction/ModifyCircle.js
@@ -16,7 +16,7 @@ import olGeomCircle from 'ol/geom/Circle.js';
 import olGeomLineString from 'ol/geom/LineString.js';
 import olGeomPoint from 'ol/geom/Point.js';
 import {fromCircle} from 'ol/geom/Polygon.js';
-import olInteractionPointer, {handleEvent as pointerHandleEvent} from 'ol/interaction/Pointer.js';
+import olInteractionPointer from 'ol/interaction/Pointer.js';
 import olLayerVector from 'ol/layer/Vector.js';
 import olSourceVector from 'ol/source/Vector.js';
 import olStructsRBush from 'ol/structs/RBush.js';
@@ -394,8 +394,7 @@ exports.handleEvent = function(mapBrowserEvent) {
     this.handlePointerMove_(mapBrowserEvent);
   }
 
-  return pointerHandleEvent.call(this, mapBrowserEvent) &&
-      !handled;
+  return olInteractionPointer.prototype.handleEvent.call(this, mapBrowserEvent) && !handled;
 };