ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ZoomSlider uses non-existing View2D functions

Browse Source
This commit is contained in:
Éric Lemoine
2013-04-17 10:53:23 +02:00
parent 71fb6087fe
commit 6f34595312
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/control/zoomslidercontrol.js
+19 -8
View File
@@ -5,6 +5,7 @@
goog.provide('ol.control.ZoomSlider'); goog.provide('ol.control.ZoomSlider');
goog.require('goog.array'); goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.dom'); goog.require('goog.dom');
goog.require('goog.dom.TagName'); goog.require('goog.dom.TagName');
goog.require('goog.events'); goog.require('goog.events');
@@ -14,8 +15,10 @@ goog.require('goog.fx.Dragger.EventType');
goog.require('goog.math'); goog.require('goog.math');
goog.require('goog.math.Rect'); goog.require('goog.math.Rect');
goog.require('goog.style'); goog.require('goog.style');
goog.require('ol.animation');
goog.require('ol.control.Control'); goog.require('ol.control.Control');
goog.require('ol.css'); goog.require('ol.css');
goog.require('ol.easing');
/** /**
@@ -251,17 +254,25 @@ ol.control.ZoomSlider.prototype.amountForResolution_ = function(res) {
* @private * @private
*/ */
ol.control.ZoomSlider.prototype.handleSliderChange_ = function(e) { ol.control.ZoomSlider.prototype.handleSliderChange_ = function(e) {
var map = this.getMap(), var map = this.getMap();
amountDragged = this.amountDragged_(e), var view = map.getView().getView2D();
res = this.resolutionForAmount_(amountDragged); var resolution;
if (e.type === goog.fx.Dragger.EventType.DRAG) { if (e.type === goog.fx.Dragger.EventType.DRAG) {
if (res !== this.currentResolution_) { var amountDragged = this.amountDragged_(e);
this.currentResolution_ = res; resolution = this.resolutionForAmount_(amountDragged);
map.getView().getView2D().zoomWithoutConstraints(map, res); if (resolution !== this.currentResolution_) {
this.currentResolution_ = resolution;
view.setResolution(resolution);
} }
} else { } else {
map.getView().getView2D().zoom(map, this.currentResolution_, undefined, goog.asserts.assert(goog.isDef(this.currentResolution_));
ol.control.ZOOMSLIDER_ANIMATION_DURATION); map.addPreRenderFunction(ol.animation.zoom({
resolution: this.currentResolution_,
duration: ol.control.ZOOMSLIDER_ANIMATION_DURATION,
easing: ol.easing.easeOut
}));
resolution = view.constrainResolution(this.currentResolution_);
view.setResolution(resolution);
} }
}; };