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

Use blocked scoped variables

Browse Source 
In addition to using const and let, this also upgrades our linter config and removes lint (mostly whitespace).
This commit is contained in:
Tim Schaub
2018-01-11 23:32:36 -07:00
parent 0bf2b04dee
commit ad62739a6e
684 changed files with 18120 additions and 18184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/rendering/ol/layer/clip.test.js
+12 -12
View File
@@ -10,9 +10,9 @@ import Style from '../../../../src/ol/style/Style.js';
describe('layer clipping', function() {
function onLoad(source, callback) {
var loading = 0;
var loaded = 0;
var called = false;
let loading = 0;
let loaded = 0;
let called = false;
function check() {
if (!called && loading > 0 && loaded === loading) {
@@ -36,7 +36,7 @@ describe('layer clipping', function() {
describe('MultiPolygon clipping', function() {
var map = null;
let map = null;
beforeEach(function() {
map = new Map({
pixelRatio: 1,
@@ -55,21 +55,21 @@ describe('layer clipping', function() {
it('clips to all parts of the MultiPolygon', function(done) {
var source = new XYZ({
const source = new XYZ({
url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png',
transition: 0
});
var layer = new TileLayer({
const layer = new TileLayer({
source: source
});
var geometry = new MultiPolygon([
const geometry = new MultiPolygon([
[[[-80, -40], [-40, 0], [-80, 40], [-120, 0], [-80, -40]]],
[[[80, -40], [120, 0], [80, 40], [40, 0], [80, -40]]]
]).transform('EPSG:4326', 'EPSG:3857');
var style = new Style({
const style = new Style({
stroke: new Stroke({
width: 2,
color: 'blue'
@@ -77,10 +77,10 @@ describe('layer clipping', function() {
});
layer.on('precompose', function(event) {
var context = event.context;
const context = event.context;
context.save();
var vectorContext = event.vectorContext;
const vectorContext = event.vectorContext;
vectorContext.setStyle(style);
vectorContext.drawGeometry(geometry);
@@ -88,10 +88,10 @@ describe('layer clipping', function() {
});
layer.on('postcompose', function(event) {
var context = event.context;
const context = event.context;
context.restore();
var vectorContext = event.vectorContext;
const vectorContext = event.vectorContext;
vectorContext.setStyle(style);
vectorContext.drawGeometry(geometry);
});
test/rendering/ol/layer/image.test.js
+13 -13
View File
@@ -9,7 +9,7 @@ import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
describe('ol.rendering.layer.Image', function() {
var map;
let map;
function createMap(renderer) {
map = new Map({
@@ -18,7 +18,7 @@ describe('ol.rendering.layer.Image', function() {
renderer: renderer,
view: new View({
center: transform(
[-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'),
[-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'),
zoom: 5
})
});
@@ -32,10 +32,10 @@ describe('ol.rendering.layer.Image', function() {
});
function waitForImages(sources, layerOptions, onImagesLoaded) {
var imagesLoading = 0;
var imagesLoaded = 0;
let imagesLoading = 0;
let imagesLoaded = 0;
var update = function() {
const update = function() {
if (imagesLoading === imagesLoaded) {
onImagesLoaded();
}
@@ -53,7 +53,7 @@ describe('ol.rendering.layer.Image', function() {
expect().fail('Image failed to load');
});
var options = {
const options = {
source: source
};
_ol_obj_.assign(options, layerOptions);
@@ -62,13 +62,13 @@ describe('ol.rendering.layer.Image', function() {
}
describe('single image layer', function() {
var source;
let source;
beforeEach(function() {
source = new Static({
url: 'rendering/ol/data/tiles/osm/5/5/12.png',
imageExtent: _ol_tilegrid_.createXYZ().getTileCoordExtent(
[5, 5, -12 - 1]),
[5, 5, -12 - 1]),
projection: getProjection('EPSG:3857')
});
});
@@ -77,7 +77,7 @@ describe('ol.rendering.layer.Image', function() {
createMap('canvas');
waitForImages([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/image-canvas.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
@@ -86,19 +86,19 @@ describe('ol.rendering.layer.Image', function() {
createMap('webgl');
waitForImages([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/image-webgl.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
});
describe('single image layer - scaled', function() {
var source;
let source;
beforeEach(function() {
source = new Static({
url: 'rendering/ol/data/tiles/osm/5/5/12.png',
imageExtent: transformExtent(
[-123, 37, -122, 38], 'EPSG:4326', 'EPSG:3857')
[-123, 37, -122, 38], 'EPSG:4326', 'EPSG:3857')
});
});
@@ -106,7 +106,7 @@ describe('ol.rendering.layer.Image', function() {
createMap('canvas');
waitForImages([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/image-scaled.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
});
test/rendering/ol/layer/tile.test.js
+38 -38
View File
@@ -15,10 +15,10 @@ import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
describe('ol.rendering.layer.Tile', function() {
var map;
let map;
function createMap(renderer, opt_center, opt_size, opt_pixelRatio, opt_resolutions) {
var size = opt_size !== undefined ? opt_size : [50, 50];
const size = opt_size !== undefined ? opt_size : [50, 50];
map = new Map({
pixelRatio: opt_pixelRatio || 1,
@@ -26,7 +26,7 @@ describe('ol.rendering.layer.Tile', function() {
renderer: renderer,
view: new View({
center: opt_center !== undefined ? opt_center : transform(
[-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'),
[-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'),
resolutions: opt_resolutions,
zoom: 5
})
@@ -41,10 +41,10 @@ describe('ol.rendering.layer.Tile', function() {
});
function waitForTiles(sources, layerOptions, onTileLoaded) {
var tilesLoading = 0;
var tileLoaded = 0;
let tilesLoading = 0;
let tileLoaded = 0;
var update = function() {
const update = function() {
if (tilesLoading === tileLoaded) {
onTileLoaded();
}
@@ -62,7 +62,7 @@ describe('ol.rendering.layer.Tile', function() {
expect().fail('Tile failed to load');
});
var options = {
const options = {
source: source
};
_ol_obj_.assign(options, layerOptions[i] || layerOptions);
@@ -73,20 +73,20 @@ describe('ol.rendering.layer.Tile', function() {
describe('with tile transition', function() {
it('renders correctly after the transition', function(done) {
createMap('canvas');
var source = new XYZ({
const source = new XYZ({
url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png'
});
waitForTiles([source], {}, function() {
setTimeout(function() {
expectResemble(map, 'rendering/ol/layer/expected/osm-canvas.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
}, 500);
});
});
});
describe('single tile layer', function() {
var source;
let source;
beforeEach(function() {
source = new XYZ({
@@ -99,7 +99,7 @@ describe('ol.rendering.layer.Tile', function() {
createMap('canvas');
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/osm-canvas.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
@@ -108,13 +108,13 @@ describe('ol.rendering.layer.Tile', function() {
createMap('webgl');
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/osm-webgl.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
});
describe('two tile layers', function() {
var source1, source2;
let source1, source2;
beforeEach(function() {
source1 = new XYZ({
@@ -131,7 +131,7 @@ describe('ol.rendering.layer.Tile', function() {
createMap('canvas');
waitForTiles([source1, source2], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/2-layers-canvas.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
@@ -140,14 +140,14 @@ describe('ol.rendering.layer.Tile', function() {
createMap('webgl');
waitForTiles([source1, source2], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/2-layers-webgl.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
function centerExtent(map) {
var c = map.getView().calculateExtent(map.getSize());
var qw = _ol_extent_.getSize(c)[0] / 4;
var qh = _ol_extent_.getSize(c)[1] / 4;
const c = map.getView().calculateExtent(map.getSize());
const qw = _ol_extent_.getSize(c)[0] / 4;
const qh = _ol_extent_.getSize(c)[1] / 4;
return [c[0] + qw, c[1] + qh, c[2] - qw, c[3] - qh];
}
@@ -155,7 +155,7 @@ describe('ol.rendering.layer.Tile', function() {
createMap('canvas');
waitForTiles([source1, source2], [{}, {extent: centerExtent(map)}], function() {
expectResemble(map, 'rendering/ol/layer/expected/2-layers-canvas-extent.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
@@ -164,7 +164,7 @@ describe('ol.rendering.layer.Tile', function() {
map.getView().setRotation(Math.PI / 2);
waitForTiles([source1, source2], [{}, {extent: centerExtent(map)}], function() {
expectResemble(map, 'rendering/ol/layer/expected/2-layers-canvas-extent-rotate.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
@@ -172,7 +172,7 @@ describe('ol.rendering.layer.Tile', function() {
createMap('canvas', undefined, undefined, 2);
waitForTiles([source1, source2], [{}, {extent: centerExtent(map)}], function() {
expectResemble(map, 'rendering/ol/layer/expected/2-layers-canvas-extent-hidpi.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
@@ -181,14 +181,14 @@ describe('ol.rendering.layer.Tile', function() {
map.getView().setRotation(Math.PI / 2);
waitForTiles([source1, source2], [{}, {extent: centerExtent(map)}], function() {
expectResemble(map, 'rendering/ol/layer/expected/2-layers-canvas-extent-rotate-hidpi.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
});
describe('tile layer with opacity', function() {
var source;
let source;
beforeEach(function() {
source = new XYZ({
@@ -201,7 +201,7 @@ describe('ol.rendering.layer.Tile', function() {
createMap('canvas');
waitForTiles([source], {opacity: 0.2}, function() {
expectResemble(map, 'rendering/ol/layer/expected/opacity-canvas.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
@@ -210,7 +210,7 @@ describe('ol.rendering.layer.Tile', function() {
createMap('webgl');
waitForTiles([source], {opacity: 0.2}, function() {
expectResemble(map, 'rendering/ol/layer/expected/opacity-webgl.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
});
@@ -228,48 +228,48 @@ describe('ol.rendering.layer.Tile', function() {
}
it('512x256 renders correcly using the canvas renderer', function(done) {
var source = createSource('512x256');
const source = createSource('512x256');
createMap('canvas', [-10997148, 4569099]);
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/512x256-canvas.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
where('WebGL').it('512x256 renders correcly using the webgl renderer', function(done) {
assertWebGL();
var source = createSource('512x256');
const source = createSource('512x256');
createMap('webgl', [-10997148, 4569099]);
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/512x256-webgl.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
it('192x256 renders correcly using the canvas renderer', function(done) {
var source = createSource('192x256');
const source = createSource('192x256');
createMap('canvas', [-11271098, 3747248], [100, 100], undefined,
source.getTileGrid().getResolutions());
source.getTileGrid().getResolutions());
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/192x256-canvas.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
where('WebGL').it('192x256 renders correcly using the webgl renderer', function(done) {
assertWebGL();
var source = createSource('192x256');
const source = createSource('192x256');
createMap('webgl', [-11271098, 3747248], [100, 100], undefined,
source.getTileGrid().getResolutions());
source.getTileGrid().getResolutions());
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/192x256-webgl.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
});
describe('tile layer with render listener', function() {
var source, onAddLayer;
let source, onAddLayer;
beforeEach(function() {
source = new XYZ({
@@ -285,7 +285,7 @@ describe('ol.rendering.layer.Tile', function() {
stroke: new Stroke({color: 'red', width: 1})
}));
e.vectorContext.drawPoint(new Point(
transform([-123, 38], 'EPSG:4326', 'EPSG:3857')));
transform([-123, 38], 'EPSG:4326', 'EPSG:3857')));
});
};
});
@@ -295,7 +295,7 @@ describe('ol.rendering.layer.Tile', function() {
map.getLayers().on('add', onAddLayer);
waitForTiles([source], {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/render-canvas.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
});
test/rendering/ol/layer/vector.test.js
+72 -72
View File
@@ -17,9 +17,9 @@ import Text from '../../../../src/ol/style/Text.js';
describe('ol.rendering.layer.Vector', function() {
var center = [1825927.7316762917, 6143091.089223046];
const center = [1825927.7316762917, 6143091.089223046];
var map;
let map;
function createMap(renderer) {
map = new Map({
pixelRatio: 1,
@@ -39,7 +39,7 @@ describe('ol.rendering.layer.Vector', function() {
map = null;
});
var source;
let source;
function addCircle(r) {
source.addFeature(new Feature(new Circle(center, r)));
@@ -75,7 +75,7 @@ describe('ol.rendering.layer.Vector', function() {
it('renders opacity correctly with the canvas renderer', function(done) {
createMap('canvas');
var smallLine = new Feature(new LineString([
const smallLine = new Feature(new LineString([
[center[0], center[1] - 1],
[center[0], center[1] + 1]
]));
@@ -95,13 +95,13 @@ describe('ol.rendering.layer.Vector', function() {
}));
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas.png',
17, done);
17, done);
});
});
it('renders opacity correctly with renderMode: \'image\'', function(done) {
createMap('canvas');
var smallLine = new Feature(new LineString([
const smallLine = new Feature(new LineString([
[center[0], center[1] - 1],
[center[0], center[1] + 1]
]));
@@ -122,13 +122,13 @@ describe('ol.rendering.layer.Vector', function() {
}));
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas.png',
17, done);
17, done);
});
});
it('renders transparent layers correctly with the canvas renderer', function(done) {
createMap('canvas');
var smallLine = new Feature(new LineString([
const smallLine = new Feature(new LineString([
[center[0], center[1] - 1],
[center[0], center[1] + 1]
]));
@@ -141,7 +141,7 @@ describe('ol.rendering.layer.Vector', function() {
})
]);
source.addFeature(smallLine);
var smallLine2 = new Feature(new LineString([
const smallLine2 = new Feature(new LineString([
[center[0], center[1] - 1000],
[center[0], center[1] + 1000]
]));
@@ -161,13 +161,13 @@ describe('ol.rendering.layer.Vector', function() {
}));
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-transparent.png',
7, done);
7, done);
});
});
it('renders transparent layers correctly with renderMode: \'image\'', function(done) {
createMap('canvas');
var smallLine = new Feature(new LineString([
const smallLine = new Feature(new LineString([
[center[0], center[1] - 1],
[center[0], center[1] + 1]
]));
@@ -180,7 +180,7 @@ describe('ol.rendering.layer.Vector', function() {
})
]);
source.addFeature(smallLine);
var smallLine2 = new Feature(new LineString([
const smallLine2 = new Feature(new LineString([
[center[0], center[1] - 1000],
[center[0], center[1] + 1000]
]));
@@ -201,7 +201,7 @@ describe('ol.rendering.layer.Vector', function() {
}));
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-transparent.png',
7, done);
7, done);
});
});
@@ -221,7 +221,7 @@ describe('ol.rendering.layer.Vector', function() {
}));
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-rotated.png',
1.7, done);
1.7, done);
});
});
@@ -242,7 +242,7 @@ describe('ol.rendering.layer.Vector', function() {
}));
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-rotated.png',
2.9, done);
2.9, done);
});
});
@@ -268,7 +268,7 @@ describe('ol.rendering.layer.Vector', function() {
map.unskipFeature(source.getFeatures()[1]);
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
@@ -294,7 +294,7 @@ describe('ol.rendering.layer.Vector', function() {
}));
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-opaque.png',
24.34, done);
24.34, done);
});
});
@@ -318,13 +318,13 @@ describe('ol.rendering.layer.Vector', function() {
}));
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-stroke.png',
7, done);
7, done);
});
});
it('interrupts fill/stroke batches correctly with the canvas renderer', function(done) {
createMap('canvas');
var color;
let color;
function createSource(overlaps) {
color = '#3399CC';
source = new VectorSource({
@@ -346,7 +346,7 @@ describe('ol.rendering.layer.Vector', function() {
}
return color;
}
var layer = new VectorLayer({
const layer = new VectorLayer({
source: createSource(true),
style: function(feature) {
alternateColor();
@@ -363,9 +363,9 @@ describe('ol.rendering.layer.Vector', function() {
});
map.addLayer(layer);
map.once('postrender', function() {
var canvas = map.getRenderer().canvas_;
const canvas = map.getRenderer().canvas_;
// take a snapshot of this `overlaps: true` image
var referenceImage = canvas.toDataURL('image/png');
const referenceImage = canvas.toDataURL('image/png');
// now render the same with `overlaps: false`
layer.setSource(createSource(false));
// result should be the same as with `overlaps: true`
@@ -377,7 +377,7 @@ describe('ol.rendering.layer.Vector', function() {
it('interrupts stroke batches correctly with the canvas renderer', function(done) {
createMap('canvas');
var color;
let color;
function createSource(overlaps) {
color = '#3399CC';
source = new VectorSource({
@@ -397,7 +397,7 @@ describe('ol.rendering.layer.Vector', function() {
}
return color;
}
var layer = new VectorLayer({
const layer = new VectorLayer({
source: createSource(true),
style: function(feature) {
alternateColor();
@@ -414,9 +414,9 @@ describe('ol.rendering.layer.Vector', function() {
});
map.addLayer(layer);
map.once('postrender', function() {
var canvas = map.getRenderer().canvas_;
const canvas = map.getRenderer().canvas_;
// take a snapshot of this `overlaps: true` image
var referenceImage = canvas.toDataURL('image/png');
const referenceImage = canvas.toDataURL('image/png');
// now render the same with `overlaps: false`
layer.setSource(createSource(false));
// result should be exactly the same as with `overlaps: true`
@@ -429,7 +429,7 @@ describe('ol.rendering.layer.Vector', function() {
describe('polygon rendering', function() {
var map2;
let map2;
beforeEach(function() {
map2 = new Map({
pixelRatio: 1,
@@ -447,7 +447,7 @@ describe('ol.rendering.layer.Vector', function() {
});
it('renders a feature that spans the world', function(done) {
var json = {
const json = {
type: 'Feature',
geometry: {
type: 'Polygon',
@@ -463,10 +463,10 @@ describe('ol.rendering.layer.Vector', function() {
properties: {}
};
var format = new GeoJSON({featureProjection: 'EPSG:3857'});
var feature = format.readFeature(json);
const format = new GeoJSON({featureProjection: 'EPSG:3857'});
const feature = format.readFeature(json);
var layer = new VectorLayer({
const layer = new VectorLayer({
source: new VectorSource({
features: [feature]
}),
@@ -489,10 +489,10 @@ describe('ol.rendering.layer.Vector', function() {
describe('Polygon simplification', function() {
var layer, map3;
let layer, map3;
beforeEach(function() {
var src = new VectorSource({
const src = new VectorSource({
features: [
new Feature(new Polygon([[
[-22, 58],
@@ -514,7 +514,7 @@ describe('ol.rendering.layer.Vector', function() {
renderBuffer: 0,
source: src
});
var view = new View({
const view = new View({
center: [-9.5, 78],
zoom: 2,
projection: 'EPSG:4326'
@@ -545,7 +545,7 @@ describe('ol.rendering.layer.Vector', function() {
}));
map3.once('postrender', function() {
expectResemble(map3, 'rendering/ol/layer/expected/vector-canvas-simplified.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
@@ -557,7 +557,7 @@ describe('ol.rendering.layer.Vector', function() {
}));
map3.once('postrender', function() {
expectResemble(map3, 'rendering/ol/layer/expected/vector-canvas-simplified-fill.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
@@ -570,7 +570,7 @@ describe('ol.rendering.layer.Vector', function() {
}));
map3.once('postrender', function() {
expectResemble(map3, 'rendering/ol/layer/expected/vector-canvas-simplified-stroke.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
@@ -584,12 +584,12 @@ describe('ol.rendering.layer.Vector', function() {
it('declutters text', function(done) {
createMap('canvas');
var layer = new VectorLayer({
const layer = new VectorLayer({
source: source
});
map.addLayer(layer);
var centerFeature = new Feature({
const centerFeature = new Feature({
geometry: new Point(center),
text: 'center'
});
@@ -614,23 +614,23 @@ describe('ol.rendering.layer.Vector', function() {
});
map.once('postrender', function() {
var hitDetected = map.getFeaturesAtPixel([42, 42]);
const hitDetected = map.getFeaturesAtPixel([42, 42]);
expect(hitDetected).to.have.length(1);
expect(hitDetected[0]).to.equal(centerFeature);
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-declutter.png',
2.2, done);
2.2, done);
});
});
it('declutters text with renderMode: \'image\'', function(done) {
createMap('canvas');
var layer = new VectorLayer({
const layer = new VectorLayer({
renderMode: 'image',
source: source
});
map.addLayer(layer);
var centerFeature = new Feature({
const centerFeature = new Feature({
geometry: new Point(center),
text: 'center'
});
@@ -655,17 +655,17 @@ describe('ol.rendering.layer.Vector', function() {
});
map.once('postrender', function() {
var hitDetected = map.getFeaturesAtPixel([42, 42]);
const hitDetected = map.getFeaturesAtPixel([42, 42]);
expect(hitDetected).to.have.length(1);
expect(hitDetected[0]).to.equal(centerFeature);
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-declutter.png',
2.2, done);
2.2, done);
});
});
it('declutters text and respects z-index', function(done) {
createMap('canvas');
var layer = new VectorLayer({
const layer = new VectorLayer({
source: source
});
map.addLayer(layer);
@@ -699,18 +699,18 @@ describe('ol.rendering.layer.Vector', function() {
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-declutter-zindex.png',
3.9, done);
3.9, done);
});
});
it('declutters images', function(done) {
createMap('canvas');
var layer = new VectorLayer({
const layer = new VectorLayer({
source: source
});
map.addLayer(layer);
var centerFeature = new Feature({
const centerFeature = new Feature({
geometry: new Point(center)
});
source.addFeature(centerFeature);
@@ -734,23 +734,23 @@ describe('ol.rendering.layer.Vector', function() {
});
map.once('postrender', function() {
var hitDetected = map.getFeaturesAtPixel([40, 40]);
const hitDetected = map.getFeaturesAtPixel([40, 40]);
expect(hitDetected).to.have.length(1);
expect(hitDetected[0]).to.equal(centerFeature);
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-declutter-image.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
it('declutters images with renderMode: \'image\'', function(done) {
createMap('canvas');
var layer = new VectorLayer({
const layer = new VectorLayer({
renderMode: 'image',
source: source
});
map.addLayer(layer);
var centerFeature = new Feature({
const centerFeature = new Feature({
geometry: new Point(center)
});
source.addFeature(centerFeature);
@@ -774,17 +774,17 @@ describe('ol.rendering.layer.Vector', function() {
});
map.once('postrender', function() {
var hitDetected = map.getFeaturesAtPixel([40, 40]);
const hitDetected = map.getFeaturesAtPixel([40, 40]);
expect(hitDetected).to.have.length(1);
expect(hitDetected[0]).to.equal(centerFeature);
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-declutter-image.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
it('declutters images and respects z-index', function(done) {
createMap('canvas');
var layer = new VectorLayer({
const layer = new VectorLayer({
source: source
});
map.addLayer(layer);
@@ -817,13 +817,13 @@ describe('ol.rendering.layer.Vector', function() {
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-declutter-image-zindex.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
it('declutters image & text groups', function(done) {
createMap('canvas');
var layer = new VectorLayer({
const layer = new VectorLayer({
source: source
});
map.addLayer(layer);
@@ -861,18 +861,18 @@ describe('ol.rendering.layer.Vector', function() {
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-declutter-group.png',
2.2, done);
2.2, done);
});
});
it('declutters text along lines and images', function(done) {
createMap('canvas');
var layer = new VectorLayer({
const layer = new VectorLayer({
source: source
});
map.addLayer(layer);
var point = new Feature(new Point(center));
const point = new Feature(new Point(center));
point.setStyle(new Style({
image: new CircleStyle({
radius: 8,
@@ -881,7 +881,7 @@ describe('ol.rendering.layer.Vector', function() {
})
})
}));
var line = new Feature(new LineString([
const line = new Feature(new LineString([
[center[0] - 650, center[1] - 200],
[center[0] + 650, center[1] - 200]
]));
@@ -904,18 +904,18 @@ describe('ol.rendering.layer.Vector', function() {
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-declutter-line.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
it('declutters text along lines and images with renderMode: \'image\'', function(done) {
createMap('canvas');
var layer = new VectorLayer({
const layer = new VectorLayer({
source: source
});
map.addLayer(layer);
var point = new Feature(new Point(center));
const point = new Feature(new Point(center));
point.setStyle(new Style({
image: new CircleStyle({
radius: 8,
@@ -924,7 +924,7 @@ describe('ol.rendering.layer.Vector', function() {
})
})
}));
var line = new Feature(new LineString([
const line = new Feature(new LineString([
[center[0] - 650, center[1] - 200],
[center[0] + 650, center[1] - 200]
]));
@@ -947,18 +947,18 @@ describe('ol.rendering.layer.Vector', function() {
map.once('postrender', function() {
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-declutter-line.png',
IMAGE_TOLERANCE, done);
IMAGE_TOLERANCE, done);
});
});
it('declutters text along lines and images with z-index', function(done) {
createMap('canvas');
var layer = new VectorLayer({
const layer = new VectorLayer({
source: source
});
map.addLayer(layer);
var point = new Feature(new Point(center));
const point = new Feature(new Point(center));
point.setStyle(new Style({
zIndex: 2,
image: new CircleStyle({
@@ -968,7 +968,7 @@ describe('ol.rendering.layer.Vector', function() {
})
})
}));
var line = new Feature(new LineString([
const line = new Feature(new LineString([
[center[0] - 650, center[1] - 200],
[center[0] + 650, center[1] - 200]
]));
@@ -991,11 +991,11 @@ describe('ol.rendering.layer.Vector', function() {
layer.setDeclutter(true);
map.once('postrender', function() {
var hitDetected = map.getFeaturesAtPixel([35, 46]);
const hitDetected = map.getFeaturesAtPixel([35, 46]);
expect(hitDetected).to.have.length(1);
expect(hitDetected[0]).to.equal(line);
expectResemble(map, 'rendering/ol/layer/expected/vector-canvas-declutter-line-zindex.png',
4.1, done);
4.1, done);
});
});
});
test/rendering/ol/layer/vectortile.test.js
+16 -16
View File
@@ -17,10 +17,10 @@ import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
describe('ol.rendering.layer.VectorTile', function() {
var map;
let map;
function createMap(renderer, opt_pixelRatio, opt_size) {
var size = opt_size || 50;
const size = opt_size || 50;
map = new Map({
pixelRatio: opt_pixelRatio || 1,
target: createMapDiv(size, size),
@@ -38,10 +38,10 @@ describe('ol.rendering.layer.VectorTile', function() {
});
function waitForTiles(source, layerOptions, onTileLoaded) {
var tilesLoading = 0;
var tileLoaded = 0;
let tilesLoading = 0;
let tileLoaded = 0;
var update = function() {
const update = function() {
if (tilesLoading === tileLoaded) {
onTileLoaded();
}
@@ -58,7 +58,7 @@ describe('ol.rendering.layer.VectorTile', function() {
expect().fail('Tile failed to load');
});
var options = {
const options = {
source: source
};
_ol_obj_.assign(options, layerOptions);
@@ -66,7 +66,7 @@ describe('ol.rendering.layer.VectorTile', function() {
}
describe('vector tile layer', function() {
var source;
let source;
beforeEach(function() {
source = new VectorTileSource({
@@ -81,7 +81,7 @@ describe('ol.rendering.layer.VectorTile', function() {
createMap('canvas');
waitForTiles(source, {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/vectortile-canvas.png',
22, done);
22, done);
});
});
@@ -90,13 +90,13 @@ describe('ol.rendering.layer.VectorTile', function() {
map.getView().setRotation(Math.PI / 4);
waitForTiles(source, {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/vectortile-canvas-rotated.png',
14, done);
14, done);
});
});
it('renders rotated view correctly with vector layer on top', function(done) {
createMap('canvas');
var vectorSource = new VectorSource({
const vectorSource = new VectorSource({
features: [
new Feature(new Point([1825727.7316762917, 6143091.089223046]))
]
@@ -116,7 +116,7 @@ describe('ol.rendering.layer.VectorTile', function() {
map.getView().setRotation(Math.PI / 4);
waitForTiles(source, {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/vectortile-vector-rotated.png',
14, done);
14, done);
});
});
@@ -124,7 +124,7 @@ describe('ol.rendering.layer.VectorTile', function() {
createMap('canvas', 2);
waitForTiles(source, {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/vectortile-canvas-hidpi.png',
11.3, done);
11.3, done);
});
});
@@ -133,15 +133,15 @@ describe('ol.rendering.layer.VectorTile', function() {
map.getView().setRotation(Math.PI / 4);
waitForTiles(source, {}, function() {
expectResemble(map, 'rendering/ol/layer/expected/vectortile-canvas-rotated-hidpi.png',
14.8, done);
14.8, done);
});
});
it('declutters text and images', function(done) {
createMap('canvas', 1, 100);
map.getView().setZoom(13.8);
var style = function(feature, resolution) {
var geom = feature.getGeometry();
const style = function(feature, resolution) {
const geom = feature.getGeometry();
if (geom.getType() == 'Point') {
return new Style({
image: new CircleStyle({
@@ -161,7 +161,7 @@ describe('ol.rendering.layer.VectorTile', function() {
};
waitForTiles(source, {declutter: true, style: style}, function() {
expectResemble(map, 'rendering/ol/layer/expected/vectortile-canvas-declutter.png',
8.5, done);
8.5, done);
});
});