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/spec/ol/renderer/canvas/imagelayer.test.js
+3 -3
View File
@@ -9,9 +9,9 @@ describe('ol.renderer.canvas.ImageLayer', function() {
describe('#forEachLayerAtCoordinate', function() {
var map, target, source;
let map, target, source;
beforeEach(function(done) {
var projection = new Projection({
const projection = new Projection({
code: 'custom-image',
units: 'pixels',
extent: [0, 0, 200, 200]
@@ -50,7 +50,7 @@ describe('ol.renderer.canvas.ImageLayer', function() {
it('properly detects pixels', function() {
map.renderSync();
var has = false;
let has = false;
function hasLayer() {
has = true;
}
test/spec/ol/renderer/canvas/intermediatecanvas.test.js
+6 -6
View File
@@ -7,13 +7,13 @@ import IntermediateCanvasRenderer from '../../../../../src/ol/renderer/canvas/In
describe('ol.renderer.canvas.IntermediateCanvas', function() {
describe('#composeFrame()', function() {
var renderer, frameState, layerState, context;
let renderer, frameState, layerState, context;
beforeEach(function() {
var layer = new ImageLayer({
const layer = new ImageLayer({
extent: [1, 2, 3, 4]
});
renderer = new IntermediateCanvasRenderer(layer);
var image = new Image();
const image = new Image();
image.width = 3;
image.height = 3;
renderer.getImage = function() {
@@ -62,7 +62,7 @@ describe('ol.renderer.canvas.IntermediateCanvas', function() {
expect(context.lineTo.thirdCall.args).to.eql([4, 6]);
expect(context.clip.callCount).to.be(1);
expect(context.drawImage.firstCall.args).to.eql(
[renderer.getImage(), 0, 0, 3, 3, 0, 0, 3, 3]);
[renderer.getImage(), 0, 0, 3, 3, 0, 0, 3, 3]);
expect(context.restore.callCount).to.be(1);
});
@@ -76,7 +76,7 @@ describe('ol.renderer.canvas.IntermediateCanvas', function() {
expect(context.beginPath.callCount).to.be(0);
expect(context.clip.callCount).to.be(0);
expect(context.drawImage.firstCall.args).to.eql(
[renderer.getImage(), 0, 0, 3, 3, 0, 0, 3, 3]);
[renderer.getImage(), 0, 0, 3, 3, 0, 0, 3, 3]);
expect(context.restore.callCount).to.be(0);
});
@@ -90,7 +90,7 @@ describe('ol.renderer.canvas.IntermediateCanvas', function() {
expect(context.beginPath.callCount).to.be(0);
expect(context.clip.callCount).to.be(0);
expect(context.drawImage.firstCall.args).to.eql(
[renderer.getImage(), 0, 0, 3, 3, 0, 0, 3, 3]);
[renderer.getImage(), 0, 0, 3, 3, 0, 0, 3, 3]);
expect(context.restore.callCount).to.be(0);
});
test/spec/ol/renderer/canvas/map.test.js
+20 -20
View File
@@ -16,10 +16,10 @@ describe('ol.renderer.canvas.Map', function() {
describe('constructor', function() {
it('creates a new instance', function() {
var map = new Map({
const map = new Map({
target: document.createElement('div')
});
var renderer = new CanvasMapRenderer(map.viewport_, map);
const renderer = new CanvasMapRenderer(map.viewport_, map);
expect(renderer).to.be.a(CanvasMapRenderer);
});
@@ -27,7 +27,7 @@ describe('ol.renderer.canvas.Map', function() {
describe('#forEachFeatureAtCoordinate', function() {
var layer, map, target;
let layer, map, target;
beforeEach(function(done) {
target = document.createElement('div');
@@ -44,7 +44,7 @@ describe('ol.renderer.canvas.Map', function() {
});
// 1 x 1 pixel black icon
var img = document.createElement('img');
const img = document.createElement('img');
img.onload = function() {
done();
};
@@ -75,7 +75,7 @@ describe('ol.renderer.canvas.Map', function() {
it('calls callback with layer for managed layers', function() {
map.addLayer(layer);
map.renderSync();
var cb = sinon.spy();
const cb = sinon.spy();
map.forEachFeatureAtPixel(map.getPixelFromCoordinate([0, 0]), cb);
expect(cb).to.be.called();
expect(cb.firstCall.args[1]).to.be(layer);
@@ -84,15 +84,15 @@ describe('ol.renderer.canvas.Map', function() {
it('calls callback with null for unmanaged layers', function() {
layer.setMap(map);
map.renderSync();
var cb = sinon.spy();
const cb = sinon.spy();
map.forEachFeatureAtPixel(map.getPixelFromCoordinate([0, 0]), cb);
expect(cb).to.be.called();
expect(cb.firstCall.args[1]).to.be(null);
});
it('calls callback with main layer when skipped feature on unmanaged layer', function() {
var feature = layer.getSource().getFeatures()[0];
var managedLayer = new VectorLayer({
const feature = layer.getSource().getFeatures()[0];
const managedLayer = new VectorLayer({
source: new VectorSource({
features: [feature]
})
@@ -101,7 +101,7 @@ describe('ol.renderer.canvas.Map', function() {
map.skipFeature(feature);
layer.setMap(map);
map.renderSync();
var cb = sinon.spy();
const cb = sinon.spy();
map.forEachFeatureAtPixel(map.getPixelFromCoordinate([0, 0]), cb);
expect(cb.callCount).to.be(1);
expect(cb.firstCall.args[1]).to.be(managedLayer);
@@ -110,7 +110,7 @@ describe('ol.renderer.canvas.Map', function() {
it('filters managed layers', function() {
map.addLayer(layer);
map.renderSync();
var cb = sinon.spy();
const cb = sinon.spy();
map.forEachFeatureAtPixel(map.getPixelFromCoordinate([0, 0]), cb, {
layerFilter: function() {
return false;
@@ -124,39 +124,39 @@ describe('ol.renderer.canvas.Map', function() {
map.renderSync();
expect(function() {
map.forEachFeatureAtPixel(map.getPixelFromCoordinate([0, 0]),
function() {});
function() {});
}).to.not.throwException();
});
it('calls callback for clicks inside of the hitTolerance', function() {
map.addLayer(layer);
map.renderSync();
var cb1 = sinon.spy();
var cb2 = sinon.spy();
const cb1 = sinon.spy();
const cb2 = sinon.spy();
var pixel = map.getPixelFromCoordinate([0, 0]);
const pixel = map.getPixelFromCoordinate([0, 0]);
var pixelsInside = [
const pixelsInside = [
[pixel[0] + 9, pixel[1]],
[pixel[0] - 9, pixel[1]],
[pixel[0], pixel[1] + 9],
[pixel[0], pixel[1] - 9]
];
var pixelsOutside = [
const pixelsOutside = [
[pixel[0] + 9, pixel[1] + 9],
[pixel[0] - 9, pixel[1] + 9],
[pixel[0] + 9, pixel[1] - 9],
[pixel[0] - 9, pixel[1] - 9]
];
for (var i = 0; i < 4; i++) {
for (let i = 0; i < 4; i++) {
map.forEachFeatureAtPixel(pixelsInside[i], cb1, {hitTolerance: 10});
}
expect(cb1.callCount).to.be(4);
expect(cb1.firstCall.args[1]).to.be(layer);
for (var j = 0; j < 4; j++) {
for (let j = 0; j < 4; j++) {
map.forEachFeatureAtPixel(pixelsOutside[j], cb2, {hitTolerance: 10});
}
expect(cb2).not.to.be.called();
@@ -164,7 +164,7 @@ describe('ol.renderer.canvas.Map', function() {
});
describe('#renderFrame()', function() {
var layer, map, renderer;
let layer, map, renderer;
beforeEach(function() {
map = new Map({});
@@ -174,7 +174,7 @@ describe('ol.renderer.canvas.Map', function() {
});
renderer = map.getRenderer();
renderer.layerRenderers_ = {};
var layerRenderer = new CanvasLayerRenderer(layer);
const layerRenderer = new CanvasLayerRenderer(layer);
layerRenderer.prepareFrame = function() {
return true;
};
test/spec/ol/renderer/canvas/replay.test.js
+69 -69
View File
@@ -21,22 +21,22 @@ describe('ol.render.canvas.ReplayGroup', function() {
describe('#replay', function() {
var context, replay, fillCount, transform;
var strokeCount, beginPathCount, moveToCount, lineToCount;
var feature0, feature1, feature2, feature3;
var fill0, fill1, style1, style2;
let context, replay, fillCount, transform;
let strokeCount, beginPathCount, moveToCount, lineToCount;
let feature0, feature1, feature2, feature3;
let fill0, fill1, style1, style2;
beforeEach(function() {
transform = _ol_transform_.create();
replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 1, false);
feature0 = new Feature(new Polygon(
[[[-90, 0], [-45, 45], [0, 0], [1, 1], [0, -45], [-90, 0]]]));
[[[-90, 0], [-45, 45], [0, 0], [1, 1], [0, -45], [-90, 0]]]));
feature1 = new Feature(new Polygon(
[[[-90, -45], [-90, 0], [0, 0], [0, -45], [-90, -45]]]));
[[[-90, -45], [-90, 0], [0, 0], [0, -45], [-90, -45]]]));
feature2 = new Feature(new Polygon(
[[[90, 45], [90, 0], [0, 0], [0, 45], [90, 45]]]));
[[[90, 45], [90, 0], [0, 0], [0, 45], [90, 45]]]));
feature3 = new Feature(new Polygon(
[[[-90, -45], [-90, 45], [90, 45], [90, -45], [-90, -45]]]));
[[[-90, -45], [-90, 45], [90, 45], [90, -45], [-90, -45]]]));
fill0 = new Style({
fill: new Fill({color: 'black'})
});
@@ -138,7 +138,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
_ol_renderer_vector_.renderFeature(replay, feature1, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature2, style2, 1);
_ol_renderer_vector_.renderFeature(replay, feature3, style2, 1);
var skippedUids = {};
const skippedUids = {};
skippedUids[getUid(feature1)] = true;
replay.replay(context, transform, 0, skippedUids);
expect(fillCount).to.be(1);
@@ -150,7 +150,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
_ol_renderer_vector_.renderFeature(replay, feature1, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature2, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature3, style2, 1);
var skippedUids = {};
const skippedUids = {};
skippedUids[getUid(feature3)] = true;
replay.replay(context, transform, 0, skippedUids);
expect(fillCount).to.be(1);
@@ -162,7 +162,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
_ol_renderer_vector_.renderFeature(replay, feature1, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature2, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature3, style2, 1);
var skippedUids = {};
const skippedUids = {};
skippedUids[getUid(feature1)] = true;
skippedUids[getUid(feature2)] = true;
replay.replay(context, transform, 0, skippedUids);
@@ -186,7 +186,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
// replay with a pixelRatio of 2
replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 2, true);
var lineDash, lineDashCount = 0,
let lineDash, lineDashCount = 0,
lineDashOffset, lineDashOffsetCount = 0;
context.setLineDash = function(lineDash_) {
@@ -215,8 +215,8 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
it('calls the renderer function configured for the style', function() {
var calls = [];
var style = new Style({
const calls = [];
const style = new Style({
renderer: function(coords, state) {
calls.push({
coords: coords,
@@ -229,18 +229,18 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
}
});
var point = new Feature(new Point([45, 90]));
var multipoint = new Feature(new MultiPoint(
[[45, 90], [90, 45]]));
var linestring = new Feature(new LineString(
[[45, 90], [45, 45], [90, 45]]));
var multilinestring = new Feature(new MultiLineString(
[linestring.getGeometry().getCoordinates(), linestring.getGeometry().getCoordinates()]));
var polygon = feature1;
var multipolygon = new Feature(new MultiPolygon(
[polygon.getGeometry().getCoordinates(), polygon.getGeometry().getCoordinates()]));
var geometrycollection = new Feature(new GeometryCollection(
[point.getGeometry(), linestring.getGeometry(), polygon.getGeometry()]));
const point = new Feature(new Point([45, 90]));
const multipoint = new Feature(new MultiPoint(
[[45, 90], [90, 45]]));
const linestring = new Feature(new LineString(
[[45, 90], [45, 45], [90, 45]]));
const multilinestring = new Feature(new MultiLineString(
[linestring.getGeometry().getCoordinates(), linestring.getGeometry().getCoordinates()]));
const polygon = feature1;
const multipolygon = new Feature(new MultiPolygon(
[polygon.getGeometry().getCoordinates(), polygon.getGeometry().getCoordinates()]));
const geometrycollection = new Feature(new GeometryCollection(
[point.getGeometry(), linestring.getGeometry(), polygon.getGeometry()]));
replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 1, true);
_ol_renderer_vector_.renderFeature(replay, point, style, 1);
_ol_renderer_vector_.renderFeature(replay, multipoint, style, 1);
@@ -283,9 +283,9 @@ describe('ol.render.canvas.Replay', function() {
describe('constructor', function() {
it('creates a new replay batch', function() {
var tolerance = 10;
var extent = [-180, -90, 180, 90];
var replay = new _ol_render_canvas_Replay_(tolerance, extent, 1, 1, true);
const tolerance = 10;
const extent = [-180, -90, 180, 90];
const replay = new _ol_render_canvas_Replay_(tolerance, extent, 1, 1, true);
expect(replay).to.be.a(_ol_render_canvas_Replay_);
});
@@ -293,31 +293,31 @@ describe('ol.render.canvas.Replay', function() {
describe('#appendFlatCoordinates()', function() {
var replay;
let replay;
beforeEach(function() {
replay = new _ol_render_canvas_Replay_(1, [-180, -90, 180, 90], 1, 1, true);
});
it('appends coordinates that are within the max extent', function() {
var flat = [-110, 45, 110, 45, 110, -45, -110, -45];
const flat = [-110, 45, 110, 45, 110, -45, -110, -45];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false);
expect(replay.coordinates).to.eql(flat);
});
it('appends polygon coordinates that are within the max extent', function() {
var flat = [-110, 45, 110, 45, 110, -45, -110, -45, -110, 45];
const flat = [-110, 45, 110, 45, 110, -45, -110, -45, -110, 45];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, false);
expect(replay.coordinates).to.eql(flat);
});
it('appends polygon coordinates that are within the max extent (skipping first)', function() {
var flat = [-110, 45, 110, 45, 110, -45, -110, -45, -110, 45];
const flat = [-110, 45, 110, 45, 110, -45, -110, -45, -110, 45];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, true);
expect(replay.coordinates).to.eql([110, 45, 110, -45, -110, -45, -110, 45]);
});
it('works with a single coordinate (inside)', function() {
var flat = [-110, 45];
const flat = [-110, 45];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false);
expect(replay.coordinates).to.eql(flat);
});
@@ -325,7 +325,7 @@ describe('ol.render.canvas.Replay', function() {
it('always appends first point (even if outside)', function() {
// this could be changed, but to make the code simpler for properly
// closing rings, we always add the first point
var flat = [-110, 145];
const flat = [-110, 145];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false);
expect(replay.coordinates).to.eql(flat);
});
@@ -333,13 +333,13 @@ describe('ol.render.canvas.Replay', function() {
it('always appends first polygon vertex (even if outside)', function() {
// this could be changed, but to make the code simpler for properly
// closing rings, we always add the first point
var flat = [-110, 145, -110, 145];
const flat = [-110, 145, -110, 145];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, false);
expect(replay.coordinates).to.eql(flat);
});
it('skips first polygon vertex upon request (also when outside)', function() {
var flat = [-110, 145, -110, 145];
const flat = [-110, 145, -110, 145];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, true);
expect(replay.coordinates).to.eql([-110, 145]);
});
@@ -347,13 +347,13 @@ describe('ol.render.canvas.Replay', function() {
it('appends points when segments cross (top to bottom)', function() {
// this means we get a few extra points when coordinates are not
// part of a linestring or ring, but only a few extra
var flat = [0, 200, 0, -200];
const flat = [0, 200, 0, -200];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false);
expect(replay.coordinates).to.eql(flat);
});
it('appends points when segments cross (top to inside)', function() {
var flat = [0, 200, 0, 0];
const flat = [0, 200, 0, 0];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false);
expect(replay.coordinates).to.eql(flat);
});
@@ -361,7 +361,7 @@ describe('ol.render.canvas.Replay', function() {
it('always appends the first segment (even when outside)', function() {
// this could be changed, but to make the code simpler for properly
// closing rings, we always add the first segment
var flat = [-10, 200, 10, 200];
const flat = [-10, 200, 10, 200];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false);
expect(replay.coordinates).to.eql(flat);
});
@@ -369,67 +369,67 @@ describe('ol.render.canvas.Replay', function() {
it('always appends the first polygon segment (even when outside)', function() {
// this could be changed, but to make the code simpler for properly
// closing rings, we always add the first segment
var flat = [-10, 200, 10, 200, -10, 200];
const flat = [-10, 200, 10, 200, -10, 200];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, false);
expect(replay.coordinates).to.eql(flat);
});
it('skips first polygon segment upon request (also when outside)', function() {
var flat = [-10, 200, 10, 200, -10, 200];
const flat = [-10, 200, 10, 200, -10, 200];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, true);
expect(replay.coordinates).to.eql([10, 200, -10, 200]);
});
it('eliminates segments outside (and not changing rel)', function() {
var flat = [0, 0, 0, 200, 5, 200, 10, 200];
const flat = [0, 0, 0, 200, 5, 200, 10, 200];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false);
expect(replay.coordinates).to.eql([0, 0, 0, 200]);
});
it('eliminates polygon segments outside (and not changing rel)', function() {
var flat = [0, 0, 0, 200, 5, 200, 10, 200, 0, 0];
const flat = [0, 0, 0, 200, 5, 200, 10, 200, 0, 0];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, false);
expect(replay.coordinates).to.eql([0, 0, 0, 200, 10, 200, 0, 0]);
});
it('eliminates polygon segments outside (skipping first and not changing rel)', function() {
var flat = [0, 0, 0, 10, 0, 200, 5, 200, 10, 200, 0, 0];
const flat = [0, 0, 0, 10, 0, 200, 5, 200, 10, 200, 0, 0];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, true);
expect(replay.coordinates).to.eql([0, 10, 0, 200, 10, 200, 0, 0]);
});
it('eliminates segments outside (and not changing rel)', function() {
var flat = [0, 0, 0, 200, 10, 200];
const flat = [0, 0, 0, 200, 10, 200];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false);
expect(replay.coordinates).to.eql([0, 0, 0, 200]);
});
it('includes polygon segments outside (and not changing rel) when on last segment', function() {
var flat = [0, 0, 0, 200, 10, 200, 0, 0];
const flat = [0, 0, 0, 200, 10, 200, 0, 0];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, false);
expect(replay.coordinates).to.eql(flat);
});
it('includes polygon segments outside (skipping first and not changing rel) when on last segment', function() {
var flat = [0, 0, 0, 200, 10, 200, 0, 0];
const flat = [0, 0, 0, 200, 10, 200, 0, 0];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, true);
expect(replay.coordinates).to.eql([0, 200, 10, 200, 0, 0]);
});
it('includes outside segments that change relationship', function() {
var flat = [0, 0, 0, 200, 200, 200, 250, 200];
const flat = [0, 0, 0, 200, 200, 200, 250, 200];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, false, false);
expect(replay.coordinates).to.eql([0, 0, 0, 200, 200, 200]);
});
it('includes outside polygon segments that change relationship when on last segment', function() {
var flat = [0, 0, 0, 200, 200, 200, 250, 200, 0, 0];
const flat = [0, 0, 0, 200, 200, 200, 250, 200, 0, 0];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, false);
expect(replay.coordinates).to.eql(flat);
});
it('includes outside polygon segments that change relationship when on last segment (when skipping first)', function() {
var flat = [0, 0, 0, 200, 200, 200, 250, 200, 0, 0];
const flat = [0, 0, 0, 200, 200, 200, 250, 200, 0, 0];
replay.appendFlatCoordinates(flat, 0, flat.length, 2, true, true);
expect(replay.coordinates).to.eql([0, 200, 200, 200, 250, 200, 0, 0]);
});
@@ -443,16 +443,16 @@ describe('ol.render.canvas.LineStringReplay', function() {
describe('#getBufferedMaxExtent()', function() {
it('buffers the max extent to accommodate stroke width', function() {
var tolerance = 1;
var extent = [-180, -90, 180, 90];
var resolution = 10;
var replay = new _ol_render_canvas_LineStringReplay_(tolerance, extent,
resolution);
var stroke = new Stroke({
const tolerance = 1;
const extent = [-180, -90, 180, 90];
const resolution = 10;
const replay = new _ol_render_canvas_LineStringReplay_(tolerance, extent,
resolution);
const stroke = new Stroke({
width: 2
});
replay.setFillStrokeStyle(null, stroke);
var buffered = replay.getBufferedMaxExtent();
const buffered = replay.getBufferedMaxExtent();
expect(buffered).to.eql([-195, -105, 195, 105]);
});
@@ -462,25 +462,25 @@ describe('ol.render.canvas.LineStringReplay', function() {
describe('ol.render.canvas.PolygonReplay', function() {
var replay;
let replay;
beforeEach(function() {
var tolerance = 1;
var extent = [-180, -90, 180, 90];
var resolution = 10;
const tolerance = 1;
const extent = [-180, -90, 180, 90];
const resolution = 10;
replay = new _ol_render_canvas_PolygonReplay_(tolerance, extent,
resolution);
resolution);
});
describe('#drawFlatCoordinatess_()', function() {
it('returns correct offset', function() {
var coords = [1, 2, 3, 4, 5, 6, 1, 2, 1, 2, 3, 4, 5, 6, 1, 2];
var ends = [7, 14];
var stroke = new Stroke({
const coords = [1, 2, 3, 4, 5, 6, 1, 2, 1, 2, 3, 4, 5, 6, 1, 2];
const ends = [7, 14];
const stroke = new Stroke({
width: 5
});
replay.setFillStrokeStyle(null, stroke);
var offset = replay.drawFlatCoordinatess_(coords, 0, ends, 2);
let offset = replay.drawFlatCoordinatess_(coords, 0, ends, 2);
expect(offset).to.be(14);
replay.setFillStrokeStyle(null, null);
offset = replay.drawFlatCoordinatess_(coords, 0, ends, 2);
@@ -491,11 +491,11 @@ describe('ol.render.canvas.PolygonReplay', function() {
describe('#getBufferedMaxExtent()', function() {
it('buffers the max extent to accommodate stroke width', function() {
var stroke = new Stroke({
const stroke = new Stroke({
width: 5
});
replay.setFillStrokeStyle(null, stroke);
var buffered = replay.getBufferedMaxExtent();
const buffered = replay.getBufferedMaxExtent();
expect(buffered).to.eql([-210, -120, 210, 120]);
});
test/spec/ol/renderer/canvas/tilelayer.test.js
+10 -10
View File
@@ -13,7 +13,7 @@ describe('ol.renderer.canvas.TileLayer', function() {
describe('#prepareFrame', function() {
var map, target, source, tile;
let map, target, source, tile;
beforeEach(function(done) {
target = document.createElement('div');
target.style.width = '100px';
@@ -45,10 +45,10 @@ describe('ol.renderer.canvas.TileLayer', function() {
});
it('properly handles interim tiles', function() {
var layer = map.getLayers().item(0);
const layer = map.getLayers().item(0);
source.updateParams({TIME: '1'});
map.renderSync();
var tiles = map.getRenderer().getLayerRenderer(layer).renderedTiles;
const tiles = map.getRenderer().getLayerRenderer(layer).renderedTiles;
expect(tiles.length).to.be(1);
expect(tiles[0]).to.equal(tile);
});
@@ -56,7 +56,7 @@ describe('ol.renderer.canvas.TileLayer', function() {
describe('#composeFrame()', function() {
var img = null;
let img = null;
beforeEach(function(done) {
img = new Image(1, 1);
img.onload = function() {
@@ -70,14 +70,14 @@ describe('ol.renderer.canvas.TileLayer', function() {
});
it('uses correct draw scale when rotating (HiDPI)', function() {
var layer = new TileLayer({
const layer = new TileLayer({
source: new XYZ({
tileSize: 1
})
});
var renderer = new CanvasTileLayerRenderer(layer);
const renderer = new CanvasTileLayerRenderer(layer);
renderer.renderedTiles = [];
var frameState = {
const frameState = {
viewHints: [],
time: Date.now(),
viewState: {
@@ -98,11 +98,11 @@ describe('ol.renderer.canvas.TileLayer', function() {
return _ol_transform_.create();
};
MapRenderer.prototype.calculateMatrices2D(frameState);
var layerState = layer.getLayerState();
var canvas = document.createElement('canvas');
const layerState = layer.getLayerState();
const canvas = document.createElement('canvas');
canvas.width = 200;
canvas.height = 100;
var context = {
const context = {
canvas: canvas,
drawImage: sinon.spy()
};
test/spec/ol/renderer/canvas/vectorlayer.test.js
+40 -40
View File
@@ -18,12 +18,12 @@ describe('ol.renderer.canvas.VectorLayer', function() {
describe('constructor', function() {
var head = document.getElementsByTagName('head')[0];
var font = document.createElement('link');
const head = document.getElementsByTagName('head')[0];
const font = document.createElement('link');
font.href = 'https://fonts.googleapis.com/css?family=Droid+Sans';
font.rel = 'stylesheet';
var target;
let target;
beforeEach(function() {
target = document.createElement('div');
@@ -37,47 +37,47 @@ describe('ol.renderer.canvas.VectorLayer', function() {
});
it('creates a new instance', function() {
var layer = new VectorLayer({
const layer = new VectorLayer({
source: new VectorSource()
});
var renderer = new CanvasVectorLayerRenderer(layer);
const renderer = new CanvasVectorLayerRenderer(layer);
expect(renderer).to.be.a(CanvasVectorLayerRenderer);
});
it('gives precedence to feature styles over layer styles', function() {
var target = document.createElement('div');
const target = document.createElement('div');
target.style.width = '256px';
target.style.height = '256px';
document.body.appendChild(target);
var map = new Map({
const map = new Map({
view: new View({
center: [0, 0],
zoom: 0
}),
target: target
});
var layerStyle = [new Style({
const layerStyle = [new Style({
text: new Text({
text: 'layer'
})
})];
var featureStyle = [new Style({
const featureStyle = [new Style({
text: new Text({
text: 'feature'
})
})];
var feature1 = new Feature(new Point([0, 0]));
var feature2 = new Feature(new Point([0, 0]));
const feature1 = new Feature(new Point([0, 0]));
const feature2 = new Feature(new Point([0, 0]));
feature2.setStyle(featureStyle);
var layer = new VectorLayer({
const layer = new VectorLayer({
source: new VectorSource({
features: [feature1, feature2]
}),
style: layerStyle
});
map.addLayer(layer);
var spy = sinon.spy(map.getRenderer().getLayerRenderer(layer),
'renderFeature');
const spy = sinon.spy(map.getRenderer().getLayerRenderer(layer),
'renderFeature');
map.renderSync();
expect(spy.getCall(0).args[3]).to.be(layerStyle);
expect(spy.getCall(1).args[3]).to.be(featureStyle);
@@ -86,29 +86,29 @@ describe('ol.renderer.canvas.VectorLayer', function() {
it('does not re-render for unavailable fonts', function(done) {
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
var map = new Map({
const map = new Map({
view: new View({
center: [0, 0],
zoom: 0
}),
target: target
});
var layerStyle = new Style({
const layerStyle = new Style({
text: new Text({
text: 'layer',
font: '12px "Unavailable Font",sans-serif'
})
});
var feature = new Feature(new Point([0, 0]));
var layer = new VectorLayer({
const feature = new Feature(new Point([0, 0]));
const layer = new VectorLayer({
source: new VectorSource({
features: [feature]
}),
style: layerStyle
});
map.addLayer(layer);
var revision = layer.getRevision();
const revision = layer.getRevision();
setTimeout(function() {
expect(layer.getRevision()).to.be(revision);
done();
@@ -117,29 +117,29 @@ describe('ol.renderer.canvas.VectorLayer', function() {
it('does not re-render for available fonts', function(done) {
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
var map = new Map({
const map = new Map({
view: new View({
center: [0, 0],
zoom: 0
}),
target: target
});
var layerStyle = new Style({
const layerStyle = new Style({
text: new Text({
text: 'layer',
font: '12px sans-serif'
})
});
var feature = new Feature(new Point([0, 0]));
var layer = new VectorLayer({
const feature = new Feature(new Point([0, 0]));
const layer = new VectorLayer({
source: new VectorSource({
features: [feature]
}),
style: layerStyle
});
map.addLayer(layer);
var revision = layer.getRevision();
const revision = layer.getRevision();
setTimeout(function() {
expect(layer.getRevision()).to.be(revision);
done();
@@ -149,29 +149,29 @@ describe('ol.renderer.canvas.VectorLayer', function() {
it('re-renders for fonts that become available', function(done) {
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
head.appendChild(font);
var map = new Map({
const map = new Map({
view: new View({
center: [0, 0],
zoom: 0
}),
target: target
});
var layerStyle = new Style({
const layerStyle = new Style({
text: new Text({
text: 'layer',
font: '12px "Droid Sans",sans-serif'
})
});
var feature = new Feature(new Point([0, 0]));
var layer = new VectorLayer({
const feature = new Feature(new Point([0, 0]));
const layer = new VectorLayer({
source: new VectorSource({
features: [feature]
}),
style: layerStyle
});
map.addLayer(layer);
var revision = layer.getRevision();
const revision = layer.getRevision();
setTimeout(function() {
expect(layer.getRevision()).to.be(revision + 1);
head.removeChild(font);
@@ -182,27 +182,27 @@ describe('ol.renderer.canvas.VectorLayer', function() {
});
describe('#forEachFeatureAtCoordinate', function() {
var layer, renderer;
let layer, renderer;
beforeEach(function() {
layer = new VectorLayer({
source: new VectorSource()
});
renderer = new CanvasVectorLayerRenderer(layer);
var replayGroup = {};
const replayGroup = {};
renderer.replayGroup_ = replayGroup;
replayGroup.forEachFeatureAtCoordinate = function(coordinate,
resolution, rotation, hitTolerance, skippedFeaturesUids, callback) {
var feature = new Feature();
resolution, rotation, hitTolerance, skippedFeaturesUids, callback) {
const feature = new Feature();
callback(feature);
callback(feature);
};
});
it('calls callback once per feature with a layer as 2nd arg', function() {
var spy = sinon.spy();
var coordinate = [0, 0];
var frameState = {
const spy = sinon.spy();
const coordinate = [0, 0];
const frameState = {
layerStates: {},
skippedFeatureUids: {},
viewState: {
@@ -212,21 +212,21 @@ describe('ol.renderer.canvas.VectorLayer', function() {
};
frameState.layerStates[getUid(layer)] = {};
renderer.forEachFeatureAtCoordinate(
coordinate, frameState, 0, spy, undefined);
coordinate, frameState, 0, spy, undefined);
expect(spy.callCount).to.be(1);
expect(spy.getCall(0).args[1]).to.equal(layer);
});
});
describe('#prepareFrame', function() {
var frameState, projExtent, renderer, worldWidth, buffer;
let frameState, projExtent, renderer, worldWidth, buffer;
beforeEach(function() {
var layer = new VectorLayer({
const layer = new VectorLayer({
source: new VectorSource({wrapX: true})
});
renderer = new CanvasVectorLayerRenderer(layer);
var projection = getProjection('EPSG:3857');
const projection = getProjection('EPSG:3857');
projExtent = projection.getExtent();
worldWidth = _ol_extent_.getWidth(projExtent);
buffer = layer.getRenderBuffer();
test/spec/ol/renderer/canvas/vectortilelayer.test.js
+52 -52
View File
@@ -25,12 +25,12 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
describe('constructor', function() {
var head = document.getElementsByTagName('head')[0];
var font = document.createElement('link');
const head = document.getElementsByTagName('head')[0];
const font = document.createElement('link');
font.href = 'https://fonts.googleapis.com/css?family=Dancing+Script';
font.rel = 'stylesheet';
var map, layer, layerStyle, source, feature1, feature2, feature3, target, tileCallback;
let map, layer, layerStyle, source, feature1, feature2, feature3, target, tileCallback;
beforeEach(function() {
tileCallback = function() {};
@@ -50,7 +50,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
text: 'layer'
})
})];
var featureStyle = [new Style({
const featureStyle = [new Style({
text: new Text({
text: 'feature'
})
@@ -59,7 +59,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
feature2 = new Feature(new Point([0, 0]));
feature3 = new RenderFeature('Point', [1, -1], []);
feature2.setStyle(featureStyle);
var TileClass = function() {
const TileClass = function() {
VectorTile.apply(this, arguments);
this.setState('loaded');
this.setFeatures([feature1, feature2, feature3]);
@@ -73,7 +73,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
tileGrid: _ol_tilegrid_.createXYZ()
});
source.getTile = function() {
var tile = VectorTileSource.prototype.getTile.apply(source, arguments);
const tile = VectorTileSource.prototype.getTile.apply(source, arguments);
tile.setState(TileState.LOADED);
return tile;
};
@@ -90,21 +90,21 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
it('creates a new instance', function() {
var renderer = new CanvasVectorTileLayerRenderer(layer);
const renderer = new CanvasVectorTileLayerRenderer(layer);
expect(renderer).to.be.a(CanvasVectorTileLayerRenderer);
expect(renderer.zDirection).to.be(0);
});
it('uses lower resolution for pure vector rendering', function() {
layer.renderMode_ = 'vector';
var renderer = new CanvasVectorTileLayerRenderer(layer);
const renderer = new CanvasVectorTileLayerRenderer(layer);
expect(renderer.zDirection).to.be(1);
});
it('does not render images for pure vector rendering', function() {
layer.renderMode_ = 'vector';
var spy = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'renderTileImage_');
const spy = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'renderTileImage_');
map.renderSync();
expect(spy.callCount).to.be(0);
spy.restore();
@@ -112,18 +112,18 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
it('does not render replays for pure image rendering', function() {
layer.renderMode_ = 'image';
var spy = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'getTransform');
const spy = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'getTransform');
map.renderSync();
expect(spy.callCount).to.be(0);
spy.restore();
});
it('renders both replays and images for hybrid rendering', function() {
var spy1 = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'getTransform');
var spy2 = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'renderTileImage_');
const spy1 = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'getTransform');
const spy2 = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'renderTileImage_');
map.renderSync();
expect(spy1.callCount).to.be(1);
expect(spy2.callCount).to.be(1);
@@ -136,16 +136,16 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
layer.setStyle(new Style({
renderer: function() {}
}));
var spy = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'getTransform');
const spy = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'getTransform');
map.renderSync();
expect(spy.callCount).to.be(1);
spy.restore();
});
it('gives precedence to feature styles over layer styles', function() {
var spy = sinon.spy(map.getRenderer().getLayerRenderer(layer),
'renderFeature');
const spy = sinon.spy(map.getRenderer().getLayerRenderer(layer),
'renderFeature');
map.renderSync();
expect(spy.getCall(0).args[2]).to.be(layer.getStyle());
expect(spy.getCall(1).args[2]).to.be(feature2.getStyle());
@@ -157,7 +157,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
layerStyle[0].getText().setFont('12px "Unavailable font",sans-serif');
layer.changed();
var revision = layer.getRevision();
const revision = layer.getRevision();
setTimeout(function() {
expect(layer.getRevision()).to.be(revision);
done();
@@ -169,7 +169,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
layerStyle[0].getText().setFont('12px sans-serif');
layer.changed();
var revision = layer.getRevision();
const revision = layer.getRevision();
setTimeout(function() {
expect(layer.getRevision()).to.be(revision);
done();
@@ -182,7 +182,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
head.appendChild(font);
layerStyle[0].getText().setFont('12px "Dancing Script",sans-serif');
layer.changed();
var revision = layer.getRevision();
const revision = layer.getRevision();
setTimeout(function() {
head.removeChild(font);
expect(layer.getRevision()).to.be(revision + 1);
@@ -191,7 +191,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
it('transforms geometries when tile and view projection are different', function() {
var tile;
let tile;
tileCallback = function(t) {
tile = t;
};
@@ -201,8 +201,8 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
it('Geometries are transformed from tile-pixels', function() {
var proj = new Projection({code: 'EPSG:3857', units: 'tile-pixels'});
var tile;
const proj = new Projection({code: 'EPSG:3857', units: 'tile-pixels'});
let tile;
tileCallback = function(t) {
t.setProjection(proj);
tile = t;
@@ -214,7 +214,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
it('works for multiple layers that use the same source', function() {
var layer2 = new VectorTileLayer({
const layer2 = new VectorTileLayer({
source: source,
style: new Style({
text: new Text({
@@ -224,10 +224,10 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
map.addLayer(layer2);
var spy1 = sinon.spy(VectorTile.prototype,
'getReplayGroup');
var spy2 = sinon.spy(VectorTile.prototype,
'setReplayGroup');
const spy1 = sinon.spy(VectorTile.prototype,
'getReplayGroup');
const spy2 = sinon.spy(VectorTile.prototype,
'setReplayGroup');
map.renderSync();
expect(spy1.callCount).to.be(4);
expect(spy2.callCount).to.be(2);
@@ -239,19 +239,19 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
describe('#prepareFrame', function() {
it('re-renders when layer changed', function() {
var layer = new VectorTileLayer({
const layer = new VectorTileLayer({
source: new VectorTileSource({
tileGrid: _ol_tilegrid_.createXYZ(),
transition: 0
})
});
var sourceTile = new VectorTile([0, 0, 0], 2);
const sourceTile = new VectorTile([0, 0, 0], 2);
sourceTile.setProjection(getProjection('EPSG:3857'));
sourceTile.features_ = [];
sourceTile.getImage = function() {
return document.createElement('canvas');
};
var tile = new VectorImageTile([0, 0, 0]);
const tile = new VectorImageTile([0, 0, 0]);
tile.transition_ = 0;
tile.wrappedTileCoord = [0, 0, 0];
tile.setState(TileState.LOADED);
@@ -261,10 +261,10 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
layer.getSource().getTile = function() {
return tile;
};
var renderer = new CanvasVectorTileLayerRenderer(layer);
const renderer = new CanvasVectorTileLayerRenderer(layer);
renderer.renderTileImage_ = sinon.spy();
var proj = getProjection('EPSG:3857');
var frameState = {
const proj = getProjection('EPSG:3857');
const frameState = {
extent: proj.getExtent(),
pixelRatio: 1,
time: Date.now(),
@@ -289,16 +289,16 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
describe('#forEachFeatureAtCoordinate', function() {
var layer, renderer, replayGroup;
var TileClass = function() {
let layer, renderer, replayGroup;
const TileClass = function() {
VectorImageTile.apply(this, arguments);
this.setState('loaded');
var sourceTile = new VectorTile([0, 0, 0]);
const sourceTile = new VectorTile([0, 0, 0]);
sourceTile.setProjection(getProjection('EPSG:3857'));
sourceTile.getReplayGroup = function() {
return replayGroup;
};
var key = sourceTile.tileCoord.toString();
const key = sourceTile.tileCoord.toString();
this.tileKeys = [key];
this.sourceTiles_ = {};
this.sourceTiles_[key] = sourceTile;
@@ -316,17 +316,17 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
renderer = new CanvasVectorTileLayerRenderer(layer);
replayGroup.forEachFeatureAtCoordinate = function(coordinate,
resolution, rotation, hitTolerance, skippedFeaturesUids, callback) {
var feature = new Feature();
resolution, rotation, hitTolerance, skippedFeaturesUids, callback) {
const feature = new Feature();
callback(feature);
callback(feature);
};
});
it('calls callback once per feature with a layer as 2nd arg', function() {
var spy = sinon.spy();
var coordinate = [0, 0];
var frameState = {
const spy = sinon.spy();
const coordinate = [0, 0];
const frameState = {
layerStates: {},
skippedFeatureUids: {},
viewState: {
@@ -338,24 +338,24 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
frameState.layerStates[getUid(layer)] = {};
renderer.renderedTiles = [new TileClass([0, 0, -1])];
renderer.forEachFeatureAtCoordinate(
coordinate, frameState, 0, spy, undefined);
coordinate, frameState, 0, spy, undefined);
expect(spy.callCount).to.be(1);
expect(spy.getCall(0).args[1]).to.equal(layer);
});
it('does not give false positives when overzoomed', function(done) {
var target = document.createElement('div');
const target = document.createElement('div');
target.style.width = '100px';
target.style.height = '100px';
document.body.appendChild(target);
var extent = [1824704.739223726, 6141868.096770482, 1827150.7241288517, 6144314.081675608];
var source = new VectorTileSource({
const extent = [1824704.739223726, 6141868.096770482, 1827150.7241288517, 6144314.081675608];
const source = new VectorTileSource({
format: new MVT(),
url: 'spec/ol/data/14-8938-5680.vector.pbf',
minZoom: 14,
maxZoom: 14
});
var map = new Map({
const map = new Map({
target: target,
layers: [
new VectorTileLayer({
@@ -370,7 +370,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
source.on('tileloadend', function() {
setTimeout(function() {
var features = map.getFeaturesAtPixel([96, 96]);
const features = map.getFeaturesAtPixel([96, 96]);
document.body.removeChild(target);
map.dispose();
expect(features).to.be(null);
test/spec/ol/renderer/layer.test.js
+21 -21
View File
@@ -9,24 +9,24 @@ import _ol_tilecoord_ from '../../../../src/ol/tilecoord.js';
describe('ol.renderer.Layer', function() {
var renderer;
var eventType = 'change';
let renderer;
const eventType = 'change';
beforeEach(function() {
var layer = new Layer({});
const layer = new Layer({});
renderer = new LayerRenderer(layer);
});
describe('#loadImage', function() {
var image;
var imageLoadFunction;
let image;
let imageLoadFunction;
beforeEach(function() {
var extent = [];
var resolution = 1;
var pixelRatio = 1;
var src = '';
var crossOrigin = '';
const extent = [];
const resolution = 1;
const pixelRatio = 1;
const src = '';
const crossOrigin = '';
imageLoadFunction = sinon.spy();
image = new _ol_Image_(extent, resolution, pixelRatio, src, crossOrigin, imageLoadFunction);
});
@@ -34,13 +34,13 @@ describe('ol.renderer.Layer', function() {
describe('load IDLE image', function() {
it('returns false', function() {
var loaded = renderer.loadImage(image);
const loaded = renderer.loadImage(image);
expect(loaded).to.be(false);
});
it('registers a listener', function() {
renderer.loadImage(image);
var listeners = image.getListeners(eventType, false);
const listeners = image.getListeners(eventType, false);
expect(listeners).to.have.length(1);
});
@@ -50,13 +50,13 @@ describe('ol.renderer.Layer', function() {
it('returns true', function() {
image.state = 2; // LOADED
var loaded = renderer.loadImage(image);
const loaded = renderer.loadImage(image);
expect(loaded).to.be(true);
});
it('does not register a listener', function() {
image.state = 2; // LOADED
var loaded = renderer.loadImage(image);
const loaded = renderer.loadImage(image);
expect(loaded).to.be(true);
});
@@ -70,13 +70,13 @@ describe('ol.renderer.Layer', function() {
});
it('returns false', function() {
var loaded = renderer.loadImage(image);
const loaded = renderer.loadImage(image);
expect(loaded).to.be(false);
});
it('does not register a new listener', function() {
renderer.loadImage(image);
var listeners = image.getListeners(eventType, false);
const listeners = image.getListeners(eventType, false);
expect(listeners).to.have.length(1);
});
@@ -85,7 +85,7 @@ describe('ol.renderer.Layer', function() {
});
describe('manageTilePyramid behavior', function() {
var target, map, view, source;
let target, map, view, source;
beforeEach(function(done) {
target = document.createElement('div');
@@ -128,14 +128,14 @@ describe('ol.renderer.Layer', function() {
it('accesses tiles from current zoom level last', function(done) {
// expect most recent tile in the cache to be from zoom level 0
var key = source.tileCache.peekFirstKey();
var tileCoord = _ol_tilecoord_.fromKey(key);
const key = source.tileCache.peekFirstKey();
const tileCoord = _ol_tilecoord_.fromKey(key);
expect(tileCoord[0]).to.be(0);
map.once('moveend', function() {
// expect most recent tile in the cache to be from zoom level 4
var key = source.tileCache.peekFirstKey();
var tileCoord = _ol_tilecoord_.fromKey(key);
const key = source.tileCache.peekFirstKey();
const tileCoord = _ol_tilecoord_.fromKey(key);
expect(tileCoord[0]).to.be(4);
done();
});
test/spec/ol/renderer/map.test.js
+2 -2
View File
@@ -8,8 +8,8 @@ describe('ol.renderer.Map', function() {
describe('constructor', function() {
it('createst an instance', function() {
var map = new Map({});
var renderer = new MapRenderer(null, map);
const map = new Map({});
const renderer = new MapRenderer(null, map);
expect(renderer).to.be.a(MapRenderer);
expect(renderer).to.be.a(Disposable);
renderer.dispose();
test/spec/ol/renderer/vector.test.js
+44 -44
View File
@@ -17,9 +17,9 @@ import Feature from '../../../../src/ol/Feature.js';
describe('ol.renderer.vector', function() {
describe('#renderFeature', function() {
var replayGroup;
var feature, iconStyle, style, squaredTolerance, listener, listenerThis;
var iconStyleLoadSpy;
let replayGroup;
let feature, iconStyle, style, squaredTolerance, listener, listenerThis;
let iconStyleLoadSpy;
beforeEach(function() {
replayGroup = new _ol_render_canvas_ReplayGroup_(1);
@@ -47,24 +47,24 @@ describe('ol.renderer.vector', function() {
describe('call multiple times', function() {
it('does not set multiple listeners', function() {
var listeners;
let listeners;
// call #1
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
style, squaredTolerance, listener, listenerThis);
expect(iconStyleLoadSpy.calledOnce).to.be.ok();
listeners = _ol_events_.getListeners(
iconStyle.iconImage_, 'change');
iconStyle.iconImage_, 'change');
expect(listeners.length).to.eql(1);
// call #2
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
style, squaredTolerance, listener, listenerThis);
expect(iconStyleLoadSpy.calledOnce).to.be.ok();
listeners = _ol_events_.getListeners(
iconStyle.iconImage_, 'change');
iconStyle.iconImage_, 'change');
expect(listeners.length).to.eql(1);
});
@@ -74,12 +74,12 @@ describe('ol.renderer.vector', function() {
it('does not render the point', function() {
feature.setGeometry(new Point([0, 0]));
var imageReplay = replayGroup.getReplay(
style.getZIndex(), 'Image');
var setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle');
var drawPointSpy = sinon.stub(imageReplay, 'drawPoint').callsFake(nullFunction);
const imageReplay = replayGroup.getReplay(
style.getZIndex(), 'Image');
const setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle');
const drawPointSpy = sinon.stub(imageReplay, 'drawPoint').callsFake(nullFunction);
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
style, squaredTolerance, listener, listenerThis);
expect(setImageStyleSpy.called).to.be(false);
setImageStyleSpy.restore();
drawPointSpy.restore();
@@ -87,12 +87,12 @@ describe('ol.renderer.vector', function() {
it('does not render the multipoint', function() {
feature.setGeometry(new MultiPoint([[0, 0], [1, 1]]));
var imageReplay = replayGroup.getReplay(
style.getZIndex(), 'Image');
var setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle');
var drawMultiPointSpy = sinon.stub(imageReplay, 'drawMultiPoint').callsFake(nullFunction);
const imageReplay = replayGroup.getReplay(
style.getZIndex(), 'Image');
const setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle');
const drawMultiPointSpy = sinon.stub(imageReplay, 'drawMultiPoint').callsFake(nullFunction);
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
style, squaredTolerance, listener, listenerThis);
expect(setImageStyleSpy.called).to.be(false);
setImageStyleSpy.restore();
drawMultiPointSpy.restore();
@@ -100,13 +100,13 @@ describe('ol.renderer.vector', function() {
it('does render the linestring', function() {
feature.setGeometry(new LineString([[0, 0], [1, 1]]));
var lineStringReplay = replayGroup.getReplay(
style.getZIndex(), 'LineString');
var setFillStrokeStyleSpy = sinon.spy(lineStringReplay,
'setFillStrokeStyle');
var drawLineStringSpy = sinon.stub(lineStringReplay, 'drawLineString').callsFake(nullFunction);
const lineStringReplay = replayGroup.getReplay(
style.getZIndex(), 'LineString');
const setFillStrokeStyleSpy = sinon.spy(lineStringReplay,
'setFillStrokeStyle');
const drawLineStringSpy = sinon.stub(lineStringReplay, 'drawLineString').callsFake(nullFunction);
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
expect(drawLineStringSpy.called).to.be(true);
setFillStrokeStyleSpy.restore();
@@ -115,13 +115,13 @@ describe('ol.renderer.vector', function() {
it('does render the multilinestring', function() {
feature.setGeometry(new MultiLineString([[[0, 0], [1, 1]]]));
var lineStringReplay = replayGroup.getReplay(
style.getZIndex(), 'LineString');
var setFillStrokeStyleSpy = sinon.spy(lineStringReplay,
'setFillStrokeStyle');
var drawMultiLineStringSpy = sinon.stub(lineStringReplay, 'drawMultiLineString').callsFake(nullFunction);
const lineStringReplay = replayGroup.getReplay(
style.getZIndex(), 'LineString');
const setFillStrokeStyleSpy = sinon.spy(lineStringReplay,
'setFillStrokeStyle');
const drawMultiLineStringSpy = sinon.stub(lineStringReplay, 'drawMultiLineString').callsFake(nullFunction);
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
expect(drawMultiLineStringSpy.called).to.be(true);
setFillStrokeStyleSpy.restore();
@@ -130,14 +130,14 @@ describe('ol.renderer.vector', function() {
it('does render the polygon', function() {
feature.setGeometry(new Polygon(
[[[0, 0], [1, 1], [1, 0], [0, 0]]]));
var polygonReplay = replayGroup.getReplay(
style.getZIndex(), 'Polygon');
var setFillStrokeStyleSpy = sinon.spy(polygonReplay,
'setFillStrokeStyle');
var drawPolygonSpy = sinon.stub(polygonReplay, 'drawPolygon').callsFake(nullFunction);
[[[0, 0], [1, 1], [1, 0], [0, 0]]]));
const polygonReplay = replayGroup.getReplay(
style.getZIndex(), 'Polygon');
const setFillStrokeStyleSpy = sinon.spy(polygonReplay,
'setFillStrokeStyle');
const drawPolygonSpy = sinon.stub(polygonReplay, 'drawPolygon').callsFake(nullFunction);
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
expect(drawPolygonSpy.called).to.be(true);
setFillStrokeStyleSpy.restore();
@@ -146,14 +146,14 @@ describe('ol.renderer.vector', function() {
it('does render the multipolygon', function() {
feature.setGeometry(new MultiPolygon(
[[[[0, 0], [1, 1], [1, 0], [0, 0]]]]));
var polygonReplay = replayGroup.getReplay(
style.getZIndex(), 'Polygon');
var setFillStrokeStyleSpy = sinon.spy(polygonReplay,
'setFillStrokeStyle');
var drawMultiPolygonSpy = sinon.stub(polygonReplay, 'drawMultiPolygon').callsFake(nullFunction);
[[[[0, 0], [1, 1], [1, 0], [0, 0]]]]));
const polygonReplay = replayGroup.getReplay(
style.getZIndex(), 'Polygon');
const setFillStrokeStyleSpy = sinon.spy(polygonReplay,
'setFillStrokeStyle');
const drawMultiPolygonSpy = sinon.stub(polygonReplay, 'drawMultiPolygon').callsFake(nullFunction);
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
expect(drawMultiPolygonSpy.called).to.be(true);
setFillStrokeStyleSpy.restore();
test/spec/ol/renderer/webgl/imagelayer.test.js
+13 -13
View File
@@ -7,21 +7,21 @@ import WebGLImageLayerRenderer from '../../../../../src/ol/renderer/webgl/ImageL
describe('ol.renderer.webgl.ImageLayer', function() {
describe('updateProjectionMatrix_', function() {
var map;
var renderer;
var canvasWidth;
var canvasHeight;
var pixelRatio;
var viewResolution;
var viewRotation;
var viewCenter;
var imageExtent;
let map;
let renderer;
let canvasWidth;
let canvasHeight;
let pixelRatio;
let viewResolution;
let viewRotation;
let viewCenter;
let imageExtent;
beforeEach(function() {
map = new Map({
target: document.createElement('div')
});
var layer = new ImageLayer({
const layer = new ImageLayer({
source: new ImageSource({
extent: [0, 0, 1, 1]
})
@@ -49,10 +49,10 @@ describe('ol.renderer.webgl.ImageLayer', function() {
it('produces a correct matrix', function() {
renderer.updateProjectionMatrix_(canvasWidth, canvasHeight,
pixelRatio, viewCenter, viewResolution, viewRotation, imageExtent);
var matrix = renderer.getProjectionMatrix();
pixelRatio, viewCenter, viewResolution, viewRotation, imageExtent);
const matrix = renderer.getProjectionMatrix();
var output = _ol_transform_.apply(matrix, [-1, -1]);
let output = _ol_transform_.apply(matrix, [-1, -1]);
expect(output[0]).to.eql(-6);
expect(output[1]).to.eql(-6);