diff --git a/src/ol/interaction/dblclickzoom.js b/src/ol/interaction/dblclickzoom.js index 128d6c56da..097ec28888 100644 --- a/src/ol/interaction/dblclickzoom.js +++ b/src/ol/interaction/dblclickzoom.js @@ -26,11 +26,8 @@ ol.interaction.DblClickZoom.prototype.handleMapBrowserEvent = mapBrowserEvent.isMouseActionButton()) { var map = mapBrowserEvent.map; var anchor = mapBrowserEvent.getCoordinate(); - if (mapBrowserEvent.browserEvent.shiftKey) { - map.zoomOut(anchor); - } else { - map.zoomIn(anchor); - } + var delta = mapBrowserEvent.browserEvent.shiftKey ? -4 : 4; + map.zoom(delta, anchor); mapBrowserEvent.preventDefault(); } }; diff --git a/src/ol/interaction/keyboardzoom.js b/src/ol/interaction/keyboardzoom.js index dcce3c0e23..d02249755b 100644 --- a/src/ol/interaction/keyboardzoom.js +++ b/src/ol/interaction/keyboardzoom.js @@ -27,11 +27,8 @@ ol.interaction.KeyboardZoom.prototype.handleMapBrowserEvent = var charCode = keyEvent.charCode; if (charCode == '+'.charCodeAt(0) || charCode == '-'.charCodeAt(0)) { var map = mapBrowserEvent.map; - if (charCode == '+'.charCodeAt(0)) { - map.zoomIn(); - } else { - map.zoomOut(); - } + var delta = (charCode == '+'.charCodeAt(0)) ? 4 : -4; + map.zoom(delta); keyEvent.preventDefault(); mapBrowserEvent.preventDefault(); } diff --git a/src/ol/map.js b/src/ol/map.js index d5c3671f47..62c68daaca 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -838,28 +838,12 @@ ol.Map.prototype.zoom_ = function(resolution, opt_anchor) { * @param {number} delta Delta from previous zoom level. * @param {ol.Coordinate=} opt_anchor Anchor coordinate. */ -ol.Map.prototype.zoomByDelta = function(delta, opt_anchor) { +ol.Map.prototype.zoom = function(delta, opt_anchor) { var resolution = this.constraints_.resolution(this.getResolution(), delta); this.zoom_(resolution, opt_anchor); }; -/** - * @param {ol.Coordinate=} opt_anchor Anchor coordinate. - */ -ol.Map.prototype.zoomIn = function(opt_anchor) { - this.zoomByDelta(4, opt_anchor); -}; - - -/** - * @param {ol.Coordinate=} opt_anchor Anchor coordinate. - */ -ol.Map.prototype.zoomOut = function(opt_anchor) { - this.zoomByDelta(-4, opt_anchor); -}; - - /** * @param {number|undefined} resolution Resolution to go to. * @param {ol.Coordinate=} opt_anchor Anchor coordinate.