From 79fdbab70fee9e45a52c136ea21d4f86d238b85f Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 6 Feb 2017 08:44:09 -0700 Subject: [PATCH] Remove deprecated ol.animation functions --- src/ol/animation.js | 173 ----------------------------------------- src/ol/animation.jsdoc | 13 ---- 2 files changed, 186 deletions(-) delete mode 100644 src/ol/animation.js delete mode 100644 src/ol/animation.jsdoc diff --git a/src/ol/animation.js b/src/ol/animation.js deleted file mode 100644 index 980d28ee72..0000000000 --- a/src/ol/animation.js +++ /dev/null @@ -1,173 +0,0 @@ -goog.provide('ol.animation'); - -goog.require('ol.ViewHint'); -goog.require('ol.coordinate'); -goog.require('ol.easing'); - - -/** - * Generate an animated transition that will "bounce" the resolution as it - * approaches the final value. - * @param {olx.animation.BounceOptions} options Bounce options. - * @return {ol.PreRenderFunction} Pre-render function. - * @deprecated Use {@link ol.View#animate} instead. - * @api - */ -ol.animation.bounce = function(options) { - var resolution = options.resolution; - var start = options.start ? options.start : Date.now(); - var duration = options.duration !== undefined ? options.duration : 1000; - var easing = options.easing ? - options.easing : ol.easing.upAndDown; - return ( - /** - * @param {ol.Map} map Map. - * @param {?olx.FrameState} frameState Frame state. - * @return {boolean} Run this function in the next frame. - */ - function(map, frameState) { - if (frameState.time < start) { - frameState.animate = true; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; - return true; - } else if (frameState.time < start + duration) { - var delta = easing((frameState.time - start) / duration); - var deltaResolution = resolution - frameState.viewState.resolution; - frameState.animate = true; - frameState.viewState.resolution += delta * deltaResolution; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; - return true; - } else { - return false; - } - }); -}; - - -/** - * Generate an animated transition while updating the view center. - * @param {olx.animation.PanOptions} options Pan options. - * @return {ol.PreRenderFunction} Pre-render function. - * @deprecated Use {@link ol.View#animate} instead. - * @api - */ -ol.animation.pan = function(options) { - var source = options.source; - var start = options.start ? options.start : Date.now(); - var sourceX = source[0]; - var sourceY = source[1]; - var duration = options.duration !== undefined ? options.duration : 1000; - var easing = options.easing ? - options.easing : ol.easing.inAndOut; - return ( - /** - * @param {ol.Map} map Map. - * @param {?olx.FrameState} frameState Frame state. - * @return {boolean} Run this function in the next frame. - */ - function(map, frameState) { - if (frameState.time < start) { - frameState.animate = true; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; - return true; - } else if (frameState.time < start + duration) { - var delta = 1 - easing((frameState.time - start) / duration); - var deltaX = sourceX - frameState.viewState.center[0]; - var deltaY = sourceY - frameState.viewState.center[1]; - frameState.animate = true; - frameState.viewState.center[0] += delta * deltaX; - frameState.viewState.center[1] += delta * deltaY; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; - return true; - } else { - return false; - } - }); -}; - - -/** - * Generate an animated transition while updating the view rotation. - * @param {olx.animation.RotateOptions} options Rotate options. - * @return {ol.PreRenderFunction} Pre-render function. - * @deprecated Use {@link ol.View#animate} instead. - * @api - */ -ol.animation.rotate = function(options) { - var sourceRotation = options.rotation ? options.rotation : 0; - var start = options.start ? options.start : Date.now(); - var duration = options.duration !== undefined ? options.duration : 1000; - var easing = options.easing ? - options.easing : ol.easing.inAndOut; - var anchor = options.anchor ? - options.anchor : null; - - return ( - /** - * @param {ol.Map} map Map. - * @param {?olx.FrameState} frameState Frame state. - * @return {boolean} Run this function in the next frame. - */ - function(map, frameState) { - if (frameState.time < start) { - frameState.animate = true; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; - return true; - } else if (frameState.time < start + duration) { - var delta = 1 - easing((frameState.time - start) / duration); - var deltaRotation = - (sourceRotation - frameState.viewState.rotation) * delta; - frameState.animate = true; - frameState.viewState.rotation += deltaRotation; - if (anchor) { - var center = frameState.viewState.center; - ol.coordinate.sub(center, anchor); - ol.coordinate.rotate(center, deltaRotation); - ol.coordinate.add(center, anchor); - } - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; - return true; - } else { - return false; - } - }); -}; - - -/** - * Generate an animated transition while updating the view resolution. - * @param {olx.animation.ZoomOptions} options Zoom options. - * @return {ol.PreRenderFunction} Pre-render function. - * @deprecated Use {@link ol.View#animate} instead. - * @api - */ -ol.animation.zoom = function(options) { - var sourceResolution = options.resolution; - var start = options.start ? options.start : Date.now(); - var duration = options.duration !== undefined ? options.duration : 1000; - var easing = options.easing ? - options.easing : ol.easing.inAndOut; - return ( - /** - * @param {ol.Map} map Map. - * @param {?olx.FrameState} frameState Frame state. - * @return {boolean} Run this function in the next frame. - */ - function(map, frameState) { - if (frameState.time < start) { - frameState.animate = true; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; - return true; - } else if (frameState.time < start + duration) { - var delta = 1 - easing((frameState.time - start) / duration); - var deltaResolution = - sourceResolution - frameState.viewState.resolution; - frameState.animate = true; - frameState.viewState.resolution += delta * deltaResolution; - frameState.viewHints[ol.ViewHint.ANIMATING] += 1; - return true; - } else { - return false; - } - }); -}; diff --git a/src/ol/animation.jsdoc b/src/ol/animation.jsdoc deleted file mode 100644 index 3c56f28229..0000000000 --- a/src/ol/animation.jsdoc +++ /dev/null @@ -1,13 +0,0 @@ -/** - * The animation static methods are designed to be used with the - * {@link ol.Map#beforeRender} method. For example: - * - * var map = new ol.Map({ ... }); - * var zoom = ol.animation.zoom({ - * resolution: map.getView().getResolution() - * }); - * map.beforeRender(zoom); - * map.getView().setResolution(map.getView().getResolution() * 2); - * - * @namespace ol.animation - */