diff --git a/examples/animation.js b/examples/animation.js index f6d8893b12..5b8d6d6d71 100644 --- a/examples/animation.js +++ b/examples/animation.js @@ -1,9 +1,7 @@ goog.require('ol.Map'); goog.require('ol.RendererHints'); goog.require('ol.View2D'); -goog.require('ol.animation.bounce'); -goog.require('ol.animation.pan'); -goog.require('ol.animation.rotate'); +goog.require('ol.animation'); goog.require('ol.easing'); goog.require('ol.layer.TileLayer'); goog.require('ol.proj'); diff --git a/src/ol/animation.js b/src/ol/animation.js index 1a17b97426..3d67b58af8 100644 --- a/src/ol/animation.js +++ b/src/ol/animation.js @@ -1,9 +1,6 @@ // FIXME works for View2D only -goog.provide('ol.animation.bounce'); -goog.provide('ol.animation.pan'); -goog.provide('ol.animation.rotate'); -goog.provide('ol.animation.zoom'); +goog.provide('ol.animation'); goog.require('ol.PreRenderFunction'); goog.require('ol.ViewHint'); diff --git a/src/ol/control/zoomcontrol.js b/src/ol/control/zoomcontrol.js index b1518aadce..1f97b321eb 100644 --- a/src/ol/control/zoomcontrol.js +++ b/src/ol/control/zoomcontrol.js @@ -6,7 +6,7 @@ goog.require('goog.dom'); goog.require('goog.dom.TagName'); goog.require('goog.events'); goog.require('goog.events.EventType'); -goog.require('ol.animation.zoom'); +goog.require('ol.animation'); goog.require('ol.control.Control'); goog.require('ol.css'); goog.require('ol.easing'); diff --git a/src/ol/control/zoomslidercontrol.js b/src/ol/control/zoomslidercontrol.js index a466606190..a258afc23e 100644 --- a/src/ol/control/zoomslidercontrol.js +++ b/src/ol/control/zoomslidercontrol.js @@ -15,7 +15,7 @@ goog.require('goog.fx.Dragger.EventType'); goog.require('goog.math'); goog.require('goog.math.Rect'); goog.require('goog.style'); -goog.require('ol.animation.zoom'); +goog.require('ol.animation'); goog.require('ol.control.Control'); goog.require('ol.css'); goog.require('ol.easing'); diff --git a/src/ol/interaction/interaction.js b/src/ol/interaction/interaction.js index b12b1f0abb..667a7a7e2f 100644 --- a/src/ol/interaction/interaction.js +++ b/src/ol/interaction/interaction.js @@ -3,9 +3,7 @@ goog.provide('ol.interaction.Interaction'); goog.require('ol.MapBrowserEvent'); -goog.require('ol.animation.pan'); -goog.require('ol.animation.rotate'); -goog.require('ol.animation.zoom'); +goog.require('ol.animation'); goog.require('ol.easing'); diff --git a/src/ol/kinetic.js b/src/ol/kinetic.js index 1838b56db7..17e1e27d9c 100644 --- a/src/ol/kinetic.js +++ b/src/ol/kinetic.js @@ -3,7 +3,7 @@ goog.provide('ol.Kinetic'); goog.require('ol.Coordinate'); goog.require('ol.PreRenderFunction'); -goog.require('ol.animation.pan'); +goog.require('ol.animation');