Merge pull request #979 from fredj/ol3_v3.15.0

Update openlayers to version 3.15.0
camptocamp · Apr 4, 2016 · f7b4b82 · f7b4b82
2 parents d7f8d78 + ad8d1e6
commit f7b4b82
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/buildtools/mako_build.json b/buildtools/mako_build.json
@@ -45,6 +45,7 @@ _ngeo_folder = '' if ngeo_folder is UNDEFINED else ngeo_folder
       "node_modules/openlayers/externs/example.js",
 %endif
       "node_modules/openlayers/externs/bingmaps.js",
+      "node_modules/openlayers/externs/cartodb.js",
       "node_modules/openlayers/externs/closure-compiler.js",
       "node_modules/openlayers/externs/esrijson.js",
       "node_modules/openlayers/externs/geojson.js",

diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
     "less-plugin-autoprefix": "1.5.1",
     "less-plugin-clean-css": "1.5.1",
     "nomnom": "1.8.1",
-    "openlayers": "openlayers/ol3#d5fb6dd",
+    "openlayers": "3.15.0",
     "phantomjs-prebuilt": "2.1.7",
     "proj4": "2.3.14",
     "temp": "0.8.3",

diff --git a/src/ol-ext/interaction/measureazimut.js b/src/ol-ext/interaction/measureazimut.js
@@ -227,10 +227,6 @@ ngeo.interaction.DrawAzimut.handleUpEvent_ = function(event) {
  * @private
  */
 ngeo.interaction.DrawAzimut.handleEvent_ = function(mapBrowserEvent) {
-  var map = mapBrowserEvent.map;
-  if (!map.isDef()) {
-    return true;
-  }
   var pass = true;
   if (mapBrowserEvent.type === ol.MapBrowserEvent.EventType.POINTERMOVE) {
     pass = this.handlePointerMove_(mapBrowserEvent);