Rename _ol_renderer_Map_ to MapRenderer

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

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]);

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(),

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;

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();