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

Rename _ol_renderer_Map_ to MapRenderer

Browse Source
This commit is contained in:
Frederic Junod
2018-01-11 14:21:01 +01:00
parent d0cdd0441a
commit 68d9f37fec
7 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/ol/renderer/Map.js
View File

@@ -20,7 +20,7 @@ import _ol_transform_ from '../transform.js';
* @param {ol.PluggableMap} map Map.
* @struct
*/
var _ol_renderer_Map_ = function(container, map) {
var MapRenderer = function(container, map) {
Disposable.call(this);
@@ -45,14 +45,14 @@ var _ol_renderer_Map_ = function(container, map) {
};
inherits(_ol_renderer_Map_, Disposable);
inherits(MapRenderer, Disposable);
/**
* @param {olx.FrameState} frameState FrameState.
* @protected
*/
_ol_renderer_Map_.prototype.calculateMatrices2D = function(frameState) {
MapRenderer.prototype.calculateMatrices2D = function(frameState) {
var viewState = frameState.viewState;
var coordinateToPixelTransform = frameState.coordinateToPixelTransform;
var pixelToCoordinateTransform = frameState.pixelToCoordinateTransform;
@@ -71,7 +71,7 @@ _ol_renderer_Map_.prototype.calculateMatrices2D = function(frameState) {
/**
* Removes all layer renderers.
*/
_ol_renderer_Map_.prototype.removeLayerRenderers = function() {
MapRenderer.prototype.removeLayerRenderers = function() {
for (var key in this.layerRenderers_) {
this.removeLayerRendererByKey_(key).dispose();
}
@@ -83,7 +83,7 @@ _ol_renderer_Map_.prototype.removeLayerRenderers = function() {
* @param {olx.FrameState} frameState Frame state.
* @private
*/
_ol_renderer_Map_.expireIconCache_ = function(map, frameState) {
MapRenderer.expireIconCache_ = function(map, frameState) {
iconImageCache.expire();
};
@@ -103,7 +103,7 @@ _ol_renderer_Map_.expireIconCache_ = function(map, frameState) {
* @return {T|undefined} Callback result.
* @template S,T,U
*/
_ol_renderer_Map_.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg,
MapRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg,
layerFilter, thisArg2) {
var result;
var viewState = frameState.viewState;
@@ -173,7 +173,7 @@ _ol_renderer_Map_.prototype.forEachFeatureAtCoordinate = function(coordinate, fr
* @return {T|undefined} Callback result.
* @template S,T,U
*/
_ol_renderer_Map_.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg,
MapRenderer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg,
layerFilter, thisArg2) {};
@@ -189,7 +189,7 @@ _ol_renderer_Map_.prototype.forEachLayerAtPixel = function(pixel, frameState, ca
* @return {boolean} Is there a feature at the given coordinate?
* @template U
*/
_ol_renderer_Map_.prototype.hasFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, layerFilter, thisArg) {
MapRenderer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, layerFilter, thisArg) {
var hasFeature = this.forEachFeatureAtCoordinate(
coordinate, frameState, hitTolerance, TRUE, this, layerFilter, thisArg);
@@ -202,7 +202,7 @@ _ol_renderer_Map_.prototype.hasFeatureAtCoordinate = function(coordinate, frameS
* @protected
* @return {ol.renderer.Layer} Layer renderer.
*/
_ol_renderer_Map_.prototype.getLayerRenderer = function(layer) {
MapRenderer.prototype.getLayerRenderer = function(layer) {
var layerKey = getUid(layer).toString();
if (layerKey in this.layerRenderers_) {
return this.layerRenderers_[layerKey];
@@ -234,7 +234,7 @@ _ol_renderer_Map_.prototype.getLayerRenderer = function(layer) {
* @protected
* @return {ol.renderer.Layer} Layer renderer.
*/
_ol_renderer_Map_.prototype.getLayerRendererByKey = function(layerKey) {
MapRenderer.prototype.getLayerRendererByKey = function(layerKey) {
return this.layerRenderers_[layerKey];
};
@@ -243,7 +243,7 @@ _ol_renderer_Map_.prototype.getLayerRendererByKey = function(layerKey) {
* @protected
* @return {Object.<string, ol.renderer.Layer>} Layer renderers.
*/
_ol_renderer_Map_.prototype.getLayerRenderers = function() {
MapRenderer.prototype.getLayerRenderers = function() {
return this.layerRenderers_;
};
@@ -251,7 +251,7 @@ _ol_renderer_Map_.prototype.getLayerRenderers = function() {
/**
* @return {ol.PluggableMap} Map.
*/
_ol_renderer_Map_.prototype.getMap = function() {
MapRenderer.prototype.getMap = function() {
return this.map_;
};
@@ -260,14 +260,14 @@ _ol_renderer_Map_.prototype.getMap = function() {
* @abstract
* @return {ol.renderer.Type} Type
*/
_ol_renderer_Map_.prototype.getType = function() {};
MapRenderer.prototype.getType = function() {};
/**
* Handle changes in a layer renderer.
* @private
*/
_ol_renderer_Map_.prototype.handleLayerRendererChange_ = function() {
MapRenderer.prototype.handleLayerRendererChange_ = function() {
this.map_.render();
};
@@ -277,7 +277,7 @@ _ol_renderer_Map_.prototype.handleLayerRendererChange_ = function() {
* @return {ol.renderer.Layer} Layer renderer.
* @private
*/
_ol_renderer_Map_.prototype.removeLayerRendererByKey_ = function(layerKey) {
MapRenderer.prototype.removeLayerRendererByKey_ = function(layerKey) {
var layerRenderer = this.layerRenderers_[layerKey];
delete this.layerRenderers_[layerKey];
@@ -292,7 +292,7 @@ _ol_renderer_Map_.prototype.removeLayerRendererByKey_ = function(layerKey) {
* Render.
* @param {?olx.FrameState} frameState Frame state.
*/
_ol_renderer_Map_.prototype.renderFrame = nullFunction;
MapRenderer.prototype.renderFrame = nullFunction;
/**
@@ -300,7 +300,7 @@ _ol_renderer_Map_.prototype.renderFrame = nullFunction;
* @param {olx.FrameState} frameState Frame state.
* @private
*/
_ol_renderer_Map_.prototype.removeUnusedLayerRenderers_ = function(map, frameState) {
MapRenderer.prototype.removeUnusedLayerRenderers_ = function(map, frameState) {
var layerKey;
for (layerKey in this.layerRenderers_) {
if (!frameState || !(layerKey in frameState.layerStates)) {
@@ -314,9 +314,9 @@ _ol_renderer_Map_.prototype.removeUnusedLayerRenderers_ = function(map, frameSta
* @param {olx.FrameState} frameState Frame state.
* @protected
*/
_ol_renderer_Map_.prototype.scheduleExpireIconCache = function(frameState) {
MapRenderer.prototype.scheduleExpireIconCache = function(frameState) {
frameState.postRenderFunctions.push(
/** @type {ol.PostRenderFunction} */ (_ol_renderer_Map_.expireIconCache_)
/** @type {ol.PostRenderFunction} */ (MapRenderer.expireIconCache_)
);
};
@@ -325,7 +325,7 @@ _ol_renderer_Map_.prototype.scheduleExpireIconCache = function(frameState) {
* @param {!olx.FrameState} frameState Frame state.
* @protected
*/
_ol_renderer_Map_.prototype.scheduleRemoveUnusedLayerRenderers = function(frameState) {
MapRenderer.prototype.scheduleRemoveUnusedLayerRenderers = function(frameState) {
var layerKey;
for (layerKey in this.layerRenderers_) {
if (!(layerKey in frameState.layerStates)) {
@@ -343,7 +343,7 @@ _ol_renderer_Map_.prototype.scheduleRemoveUnusedLayerRenderers = function(frameS
* @param {ol.LayerState} state2 Second layer state.
* @return {number} The zIndex difference.
*/
_ol_renderer_Map_.sortByZIndex = function(state1, state2) {
MapRenderer.sortByZIndex = function(state1, state2) {
return state1.zIndex - state2.zIndex;
};
export default _ol_renderer_Map_;
export default MapRenderer;

8
src/ol/renderer/canvas/Map.js
View File

@@ -13,7 +13,7 @@ import _ol_render_Event_ from '../../render/Event.js';
import RenderEventType from '../../render/EventType.js';
import _ol_render_canvas_ from '../../render/canvas.js';
import _ol_render_canvas_Immediate_ from '../../render/canvas/Immediate.js';
import _ol_renderer_Map_ from '../Map.js';
import MapRenderer from '../Map.js';
import RendererType from '../Type.js';
import SourceState from '../../source/State.js';
@@ -26,7 +26,7 @@ import SourceState from '../../source/State.js';
*/
var CanvasMapRenderer = function(container, map) {
_ol_renderer_Map_.call(this, container, map);
MapRenderer.call(this, container, map);
/**
* @private
@@ -60,7 +60,7 @@ var CanvasMapRenderer = function(container, map) {
};
inherits(CanvasMapRenderer, _ol_renderer_Map_);
inherits(CanvasMapRenderer, MapRenderer);
/**
@@ -166,7 +166,7 @@ CanvasMapRenderer.prototype.renderFrame = function(frameState) {
this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, frameState);
var layerStatesArray = frameState.layerStatesArray;
stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
stableSort(layerStatesArray, MapRenderer.sortByZIndex);
if (rotation) {
context.save();

10
src/ol/renderer/webgl/Map.js
View File

@@ -12,7 +12,7 @@ import _ol_layer_Layer_ from '../../layer/Layer.js';
import _ol_render_Event_ from '../../render/Event.js';
import RenderEventType from '../../render/EventType.js';
import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
import _ol_renderer_Map_ from '../Map.js';
import MapRenderer from '../Map.js';
import RendererType from '../Type.js';
import SourceState from '../../source/State.js';
import LRUCache from '../../structs/LRUCache.js';
@@ -36,7 +36,7 @@ var WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK = 1024;
* @api
*/
var WebGLMapRenderer = function(container, map) {
_ol_renderer_Map_.call(this, container, map);
MapRenderer.call(this, container, map);
/**
* @private
@@ -166,7 +166,7 @@ var WebGLMapRenderer = function(container, map) {
this.initializeGL_();
};
inherits(WebGLMapRenderer, _ol_renderer_Map_);
inherits(WebGLMapRenderer, MapRenderer);
/**
@@ -301,7 +301,7 @@ WebGLMapRenderer.prototype.disposeInternal = function() {
});
}
this.context_.dispose();
_ol_renderer_Map_.prototype.disposeInternal.call(this);
MapRenderer.prototype.disposeInternal.call(this);
};
@@ -443,7 +443,7 @@ WebGLMapRenderer.prototype.renderFrame = function(frameState) {
/** @type {Array.<ol.LayerState>} */
var layerStatesToDraw = [];
var layerStatesArray = frameState.layerStatesArray;
stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
stableSort(layerStatesArray, MapRenderer.sortByZIndex);
var viewResolution = frameState.viewState.resolution;
var i, ii, layerRenderer, layerState;

6
test/spec/ol/layer/group.test.js
View File

@@ -5,7 +5,7 @@ import * as _ol_extent_ from '../../../../src/ol/extent.js';
import _ol_layer_Group_ from '../../../../src/ol/layer/Group.js';
import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
import _ol_obj_ from '../../../../src/ol/obj.js';
import _ol_renderer_Map_ from '../../../../src/ol/renderer/Map.js';
import MapRenderer from '../../../../src/ol/renderer/Map.js';
import Source from '../../../../src/ol/source/Source.js';
@@ -452,7 +452,7 @@ describe('ol.layer.Group', function() {
var layerStatesArray = layerGroup.getLayerStatesArray();
var initialArray = layerStatesArray.slice();
stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
stableSort(layerStatesArray, MapRenderer.sortByZIndex);
expect(layerStatesArray[0]).to.eql(initialArray[0]);
expect(layerStatesArray[1]).to.eql(initialArray[1]);
@@ -480,7 +480,7 @@ describe('ol.layer.Group', function() {
var layerStatesArray = layerGroup.getLayerStatesArray();
var initialArray = layerStatesArray.slice();
stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
stableSort(layerStatesArray, MapRenderer.sortByZIndex);
expect(layerStatesArray[0]).to.eql(initialArray[3]);
expect(layerStatesArray[1]).to.eql(initialArray[0]);
expect(layerStatesArray[2]).to.eql(initialArray[2]);

4
test/spec/ol/renderer/canvas/intermediatecanvas.test.js
View File

@@ -1,6 +1,6 @@
import _ol_transform_ from '../../../../../src/ol/transform.js';
import ImageLayer from '../../../../../src/ol/layer/Image.js';
import _ol_renderer_Map_ from '../../../../../src/ol/renderer/Map.js';
import MapRenderer from '../../../../../src/ol/renderer/Map.js';
import _ol_renderer_canvas_IntermediateCanvas_ from '../../../../../src/ol/renderer/canvas/IntermediateCanvas.js';
@@ -33,7 +33,7 @@ describe('ol.renderer.canvas.IntermediateCanvas', function() {
renderer.getImageTransform = function() {
return _ol_transform_.create();
};
_ol_renderer_Map_.prototype.calculateMatrices2D(frameState);
MapRenderer.prototype.calculateMatrices2D(frameState);
layerState = layer.getLayerState();
context = {
save: sinon.spy(),

4
test/spec/ol/renderer/canvas/tilelayer.test.js
View File

@@ -2,7 +2,7 @@ import Map from '../../../../../src/ol/Map.js';
import View from '../../../../../src/ol/View.js';
import TileLayer from '../../../../../src/ol/layer/Tile.js';
import {get as getProjection} from '../../../../../src/ol/proj.js';
import _ol_renderer_Map_ from '../../../../../src/ol/renderer/Map.js';
import MapRenderer from '../../../../../src/ol/renderer/Map.js';
import CanvasTileLayerRenderer from '../../../../../src/ol/renderer/canvas/TileLayer.js';
import TileWMS from '../../../../../src/ol/source/TileWMS.js';
import XYZ from '../../../../../src/ol/source/XYZ.js';
@@ -97,7 +97,7 @@ describe('ol.renderer.canvas.TileLayer', function() {
renderer.getImageTransform = function() {
return _ol_transform_.create();
};
_ol_renderer_Map_.prototype.calculateMatrices2D(frameState);
MapRenderer.prototype.calculateMatrices2D(frameState);
var layerState = layer.getLayerState();
var canvas = document.createElement('canvas');
canvas.width = 200;

6
test/spec/ol/renderer/map.test.js
View File

@@ -1,6 +1,6 @@
import Disposable from '../../../../src/ol/Disposable.js';
import Map from '../../../../src/ol/Map.js';
import _ol_renderer_Map_ from '../../../../src/ol/renderer/Map.js';
import MapRenderer from '../../../../src/ol/renderer/Map.js';
describe('ol.renderer.Map', function() {
@@ -9,8 +9,8 @@ describe('ol.renderer.Map', function() {
it('createst an instance', function() {
var map = new Map({});
var renderer = new _ol_renderer_Map_(null, map);
expect(renderer).to.be.a(_ol_renderer_Map_);
var renderer = new MapRenderer(null, map);
expect(renderer).to.be.a(MapRenderer);
expect(renderer).to.be.a(Disposable);
renderer.dispose();
map.dispose();