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

Add animation duration to ol.View2D.zoom

Browse Source
This commit is contained in:
Tom Payne
2013-01-17 15:36:36 +01:00
parent 0257db05df
commit 965d5e2cc8
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/animation.js
View File

@@ -1,10 +1,10 @@
// FIXME works for View2D only // FIXME works for View2D only
// FIXME dependency on ol.View2D suppressed to prevent dependency loop
goog.provide('ol.animation'); goog.provide('ol.animation');
goog.require('goog.fx.easing'); goog.require('goog.fx.easing');
goog.require('ol.PreRenderFunction'); goog.require('ol.PreRenderFunction');
goog.require('ol.View2D');
goog.require('ol.easing'); goog.require('ol.easing');

12
src/ol/view2d.js
View File

@@ -12,6 +12,7 @@ goog.require('ol.Projection');
goog.require('ol.ResolutionConstraint'); goog.require('ol.ResolutionConstraint');
goog.require('ol.RotationConstraint'); goog.require('ol.RotationConstraint');
goog.require('ol.View'); goog.require('ol.View');
goog.require('ol.animation');
/** /**
@@ -289,9 +290,16 @@ ol.View2D.prototype.zoom_ = function(map, resolution, opt_anchor) {
* @param {ol.Map} map Map. * @param {ol.Map} map Map.
* @param {number} delta Delta from previous zoom level. * @param {number} delta Delta from previous zoom level.
* @param {ol.Coordinate=} opt_anchor Anchor coordinate. * @param {ol.Coordinate=} opt_anchor Anchor coordinate.
* @param {number=} opt_duration Duration.
*/ */
ol.View2D.prototype.zoom = function(map, delta, opt_anchor) { ol.View2D.prototype.zoom = function(map, delta, opt_anchor, opt_duration) {
var resolution = this.constraints_.resolution(this.getResolution(), delta); var currentResolution = this.getResolution();
if (goog.isDef(currentResolution) && goog.isDef(opt_duration)) {
map.requestRenderFrame();
map.addPreRenderFunction(ol.animation.createZoomFrom(
currentResolution, opt_duration));
}
var resolution = this.constraints_.resolution(currentResolution, delta);
this.zoom_(map, resolution, opt_anchor); this.zoom_(map, resolution, opt_anchor);
}; };