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

Use oli.FrameState instead of ol.FrameState

Browse Source
This commit is contained in:
Tom Payne
2014-03-10 14:48:23 +01:00
parent 8aca7ce140
commit 022a7a03e0
14 changed files with 43 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ol/renderer/maprenderer.js
View File

@@ -5,7 +5,6 @@ goog.require('goog.asserts');
goog.require('goog.dispose');
goog.require('goog.object');
goog.require('goog.vec.Mat4');
goog.require('ol.FrameState');
goog.require('ol.layer.Layer');
goog.require('ol.renderer.Layer');
goog.require('ol.style.IconImageCache');
@@ -42,7 +41,7 @@ goog.inherits(ol.renderer.Map, goog.Disposable);
/**
* @param {ol.FrameState} frameState FrameState.
* @param {oli.FrameState} frameState FrameState.
* @protected
*/
ol.renderer.Map.prototype.calculateMatrices2D = function(frameState) {
@@ -83,7 +82,7 @@ ol.renderer.Map.prototype.disposeInternal = function() {
/**
* @param {ol.Coordinate} coordinate Coordinate.
* @param {ol.FrameState} frameState FrameState.
* @param {oli.FrameState} frameState FrameState.
* @param {function(this: S, ol.Feature, ol.layer.Layer): T} callback Feature
* callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
@@ -175,14 +174,14 @@ ol.renderer.Map.prototype.removeLayerRendererByKey_ = function(layerKey) {
/**
* Render.
* @param {?ol.FrameState} frameState Frame state.
* @param {?oli.FrameState} frameState Frame state.
*/
ol.renderer.Map.prototype.renderFrame = goog.nullFunction;
/**
* @param {ol.Map} map Map.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @private
*/
ol.renderer.Map.prototype.removeUnusedLayerRenderers_ =
@@ -197,14 +196,14 @@ ol.renderer.Map.prototype.removeUnusedLayerRenderers_ =
/**
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @protected
*/
ol.renderer.Map.prototype.scheduleExpireIconCache = function(frameState) {
frameState.postRenderFunctions.push(
/**
* @param {ol.Map} map Map.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
*/
function(map, frameState) {
ol.style.IconImageCache.getInstance().expire();
@@ -213,7 +212,7 @@ ol.renderer.Map.prototype.scheduleExpireIconCache = function(frameState) {
/**
* @param {!ol.FrameState} frameState Frame state.
* @param {!oli.FrameState} frameState Frame state.
* @protected
*/
ol.renderer.Map.prototype.scheduleRemoveUnusedLayerRenderers =