Rename _ol_layer_Tile_ to TileLayer

This commit is contained in:
Marc Jansen
2017-12-19 08:45:00 +01:00
parent afa99f5788
commit 25946b4541
147 changed files with 350 additions and 350 deletions

View File

@@ -1,7 +1,7 @@
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import MultiPolygon from '../../../../src/ol/geom/MultiPolygon.js';
import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js';
import TileLayer from '../../../../src/ol/layer/Tile.js';
import _ol_source_XYZ_ from '../../../../src/ol/source/XYZ.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
@@ -60,7 +60,7 @@ describe('layer clipping', function() {
transition: 0
});
var layer = new _ol_layer_Tile_({
var layer = new TileLayer({
source: source
});

View File

@@ -2,7 +2,7 @@ import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import * as _ol_extent_ from '../../../../src/ol/extent.js';
import Point from '../../../../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js';
import TileLayer from '../../../../src/ol/layer/Tile.js';
import _ol_obj_ from '../../../../src/ol/obj.js';
import {transform} from '../../../../src/ol/proj.js';
import _ol_source_TileImage_ from '../../../../src/ol/source/TileImage.js';
@@ -66,7 +66,7 @@ describe('ol.rendering.layer.Tile', function() {
source: source
};
_ol_obj_.assign(options, layerOptions[i] || layerOptions);
map.addLayer(new _ol_layer_Tile_(options));
map.addLayer(new TileLayer(options));
});
}

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js';
import TileLayer from '../../../../src/ol/layer/Tile.js';
import _ol_source_TileWMS_ from '../../../../src/ol/source/TileWMS.js';
describe('ol.rendering.source.TileWMS', function() {
@@ -62,7 +62,7 @@ describe('ol.rendering.source.TileWMS', function() {
tilesLoaded(source, function() {
expectResemble(map, 'rendering/ol/source/expected/0_1.canvas.png', IMAGE_TOLERANCE, done);
});
map.addLayer(new _ol_layer_Tile_({
map.addLayer(new TileLayer({
source: source
}));
});
@@ -74,7 +74,7 @@ describe('ol.rendering.source.TileWMS', function() {
tilesLoaded(source, function() {
expectResemble(map, 'rendering/ol/source/expected/0_1.webgl.png', IMAGE_TOLERANCE, done);
});
map.addLayer(new _ol_layer_Tile_({
map.addLayer(new TileLayer({
source: source
}));
});
@@ -87,7 +87,7 @@ describe('ol.rendering.source.TileWMS', function() {
tilesLoaded(source, function() {
expectResemble(map, 'rendering/ol/source/expected/0_2.canvas.png', IMAGE_TOLERANCE, done);
});
map.addLayer(new _ol_layer_Tile_({
map.addLayer(new TileLayer({
source: source
}));
});
@@ -99,7 +99,7 @@ describe('ol.rendering.source.TileWMS', function() {
tilesLoaded(source, function() {
expectResemble(map, 'rendering/ol/source/expected/0_2.webgl.png', IMAGE_TOLERANCE, done);
});
map.addLayer(new _ol_layer_Tile_({
map.addLayer(new TileLayer({
source: source
}));
});
@@ -113,7 +113,7 @@ describe('ol.rendering.source.TileWMS', function() {
tilesLoaded(source, function() {
expectResemble(map, 'rendering/ol/source/expected/20_1.canvas.png', IMAGE_TOLERANCE, done);
});
map.addLayer(new _ol_layer_Tile_({
map.addLayer(new TileLayer({
source: source
}));
});
@@ -125,7 +125,7 @@ describe('ol.rendering.source.TileWMS', function() {
tilesLoaded(source, function() {
expectResemble(map, 'rendering/ol/source/expected/20_1.webgl.png', IMAGE_TOLERANCE, done);
});
map.addLayer(new _ol_layer_Tile_({
map.addLayer(new TileLayer({
source: source
}));
});
@@ -138,7 +138,7 @@ describe('ol.rendering.source.TileWMS', function() {
tilesLoaded(source, function() {
expectResemble(map, 'rendering/ol/source/expected/20_2.canvas.png', IMAGE_TOLERANCE, done);
});
map.addLayer(new _ol_layer_Tile_({
map.addLayer(new TileLayer({
source: source
}));
});
@@ -150,7 +150,7 @@ describe('ol.rendering.source.TileWMS', function() {
tilesLoaded(source, function() {
expectResemble(map, 'rendering/ol/source/expected/20_2.webgl.png', IMAGE_TOLERANCE, done);
});
map.addLayer(new _ol_layer_Tile_({
map.addLayer(new TileLayer({
source: source
}));
});

View File

@@ -2,7 +2,7 @@ import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_Tile_ from '../../../../src/ol/Tile.js';
import _ol_View_ from '../../../../src/ol/View.js';
import Attribution from '../../../../src/ol/control/Attribution.js';
import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js';
import TileLayer from '../../../../src/ol/layer/Tile.js';
import _ol_source_Tile_ from '../../../../src/ol/source/Tile.js';
import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
@@ -20,21 +20,21 @@ describe('ol.control.Attribution', function() {
collapsible: false
})],
layers: [
new _ol_layer_Tile_({
new TileLayer({
source: new _ol_source_Tile_({
projection: 'EPSG:3857',
tileGrid: _ol_tilegrid_.createXYZ(),
attributions: 'foo'
})
}),
new _ol_layer_Tile_({
new TileLayer({
source: new _ol_source_Tile_({
projection: 'EPSG:3857',
tileGrid: _ol_tilegrid_.createXYZ(),
attributions: 'bar'
})
}),
new _ol_layer_Tile_({
new TileLayer({
source: new _ol_source_Tile_({
projection: 'EPSG:3857',
tileGrid: _ol_tilegrid_.createXYZ(),

View File

@@ -1,4 +1,4 @@
import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js';
import TileLayer from '../../../../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../../../../src/ol/source/OSM.js';
@@ -9,7 +9,7 @@ describe('ol.layer.Tile', function() {
var layer;
beforeEach(function() {
layer = new _ol_layer_Tile_({
layer = new TileLayer({
source: new _ol_source_OSM_()
});
});
@@ -19,7 +19,7 @@ describe('ol.layer.Tile', function() {
});
it('creates an instance', function() {
expect(layer).to.be.a(_ol_layer_Tile_);
expect(layer).to.be.a(TileLayer);
});
it('provides default preload', function() {

View File

@@ -10,7 +10,7 @@ import DoubleClickZoom from '../../../src/ol/interaction/DoubleClickZoom.js';
import Interaction from '../../../src/ol/interaction/Interaction.js';
import _ol_interaction_MouseWheelZoom_ from '../../../src/ol/interaction/MouseWheelZoom.js';
import _ol_interaction_PinchZoom_ from '../../../src/ol/interaction/PinchZoom.js';
import _ol_layer_Tile_ from '../../../src/ol/layer/Tile.js';
import TileLayer from '../../../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../../../src/ol/layer/Vector.js';
import _ol_renderer_canvas_IntermediateCanvas_ from '../../../src/ol/renderer/canvas/IntermediateCanvas.js';
import _ol_source_Vector_ from '../../../src/ol/source/Vector.js';
@@ -56,7 +56,7 @@ describe('ol.Map', function() {
describe('#addLayer()', function() {
it('adds a layer to the map', function() {
var map = new _ol_Map_({});
var layer = new _ol_layer_Tile_();
var layer = new TileLayer();
map.addLayer(layer);
expect(map.getLayers().item(0)).to.be(layer);
@@ -64,7 +64,7 @@ describe('ol.Map', function() {
it('throws if a layer is added twice', function() {
var map = new _ol_Map_({});
var layer = new _ol_layer_Tile_();
var layer = new TileLayer();
map.addLayer(layer);
var call = function() {
@@ -124,7 +124,7 @@ describe('ol.Map', function() {
target: target,
view: view,
layers: [
new _ol_layer_Tile_({
new TileLayer({
source: new _ol_source_XYZ_({
url: '#{x}/{y}/{z}'
})
@@ -264,13 +264,13 @@ describe('ol.Map', function() {
zoom: 1
}),
layers: [
new _ol_layer_Tile_({
new TileLayer({
source: new _ol_source_XYZ_()
}),
new _ol_layer_Tile_({
new TileLayer({
source: new _ol_source_XYZ_()
}),
new _ol_layer_Tile_({
new TileLayer({
source: new _ol_source_XYZ_()
})
]

View File

@@ -3,7 +3,7 @@ import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import _ol_Map_ from '../../../../../src/ol/Map.js';
import _ol_View_ from '../../../../../src/ol/View.js';
import Point from '../../../../../src/ol/geom/Point.js';
import _ol_layer_Tile_ from '../../../../../src/ol/layer/Tile.js';
import TileLayer from '../../../../../src/ol/layer/Tile.js';
import _ol_layer_Vector_ from '../../../../../src/ol/layer/Vector.js';
import _ol_renderer_canvas_Layer_ from '../../../../../src/ol/renderer/canvas/Layer.js';
import _ol_renderer_canvas_Map_ from '../../../../../src/ol/renderer/canvas/Map.js';
@@ -120,7 +120,7 @@ describe('ol.renderer.canvas.Map', function() {
});
it('doesn\'t fail with layer with no source', function() {
map.addLayer(new _ol_layer_Tile_());
map.addLayer(new TileLayer());
map.renderSync();
expect(function() {
map.forEachFeatureAtPixel(map.getPixelFromCoordinate([0, 0]),

View File

@@ -1,6 +1,6 @@
import _ol_Map_ from '../../../../../src/ol/Map.js';
import _ol_View_ from '../../../../../src/ol/View.js';
import _ol_layer_Tile_ from '../../../../../src/ol/layer/Tile.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 _ol_renderer_canvas_TileLayer_ from '../../../../../src/ol/renderer/canvas/TileLayer.js';
@@ -29,7 +29,7 @@ describe('ol.renderer.canvas.TileLayer', function() {
});
map = new _ol_Map_({
target: target,
layers: [new _ol_layer_Tile_({
layers: [new TileLayer({
source: source
})],
view: new _ol_View_({
@@ -70,7 +70,7 @@ describe('ol.renderer.canvas.TileLayer', function() {
});
it('uses correct draw scale when rotating (HiDPI)', function() {
var layer = new _ol_layer_Tile_({
var layer = new TileLayer({
source: new _ol_source_XYZ_({
tileSize: 1
})

View File

@@ -2,7 +2,7 @@ import _ol_Image_ from '../../../../src/ol/Image.js';
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_View_ from '../../../../src/ol/View.js';
import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js';
import TileLayer from '../../../../src/ol/layer/Tile.js';
import _ol_renderer_Layer_ from '../../../../src/ol/renderer/Layer.js';
import _ol_source_XYZ_ from '../../../../src/ol/source/XYZ.js';
import _ol_tilecoord_ from '../../../../src/ol/tilecoord.js';
@@ -111,7 +111,7 @@ describe('ol.renderer.Layer', function() {
target: target,
view: view,
layers: [
new _ol_layer_Tile_({
new TileLayer({
source: source
})
]