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

Transformed

Browse Source
This commit is contained in:
Tim Schaub
2017-12-11 16:29:33 -07:00
parent 1cdb6a66f0
commit 7f47883c48
737 changed files with 22216 additions and 21609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/spec/ol/renderer/canvas/imagelayer.test.js
View File

@@ -1,8 +1,8 @@
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.layer.Image');
goog.require('ol.proj.Projection');
goog.require('ol.source.ImageStatic');
import _ol_Map_ from '../../../../../src/ol/Map.js';
import _ol_View_ from '../../../../../src/ol/View.js';
import _ol_layer_Image_ from '../../../../../src/ol/layer/Image.js';
import _ol_proj_Projection_ from '../../../../../src/ol/proj/Projection.js';
import _ol_source_ImageStatic_ from '../../../../../src/ol/source/ImageStatic.js';
describe('ol.renderer.canvas.ImageLayer', function() {
@@ -11,7 +11,7 @@ describe('ol.renderer.canvas.ImageLayer', function() {
var map, target, source;
beforeEach(function(done) {
var projection = new ol.proj.Projection({
var projection = new _ol_proj_Projection_({
code: 'custom-image',
units: 'pixels',
extent: [0, 0, 200, 200]
@@ -20,18 +20,18 @@ describe('ol.renderer.canvas.ImageLayer', function() {
target.style.width = '100px';
target.style.height = '100px';
document.body.appendChild(target);
source = new ol.source.ImageStatic({
source = new _ol_source_ImageStatic_({
url: 'spec/ol/data/dot.png',
projection: projection,
imageExtent: [0, 0, 20, 20]
});
map = new ol.Map({
map = new _ol_Map_({
pixelRatio: 1,
target: target,
layers: [new ol.layer.Image({
layers: [new _ol_layer_Image_({
source: source
})],
view: new ol.View({
view: new _ol_View_({
projection: projection,
center: [10, 10],
zoom: 2,

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

@@ -1,9 +1,7 @@
goog.require('ol.transform');
goog.require('ol.layer.Image');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.canvas.IntermediateCanvas');
import _ol_transform_ from '../../../../../src/ol/transform.js';
import _ol_layer_Image_ from '../../../../../src/ol/layer/Image.js';
import _ol_renderer_Map_ from '../../../../../src/ol/renderer/Map.js';
import _ol_renderer_canvas_IntermediateCanvas_ from '../../../../../src/ol/renderer/canvas/IntermediateCanvas.js';
describe('ol.renderer.canvas.IntermediateCanvas', function() {
@@ -11,10 +9,10 @@ describe('ol.renderer.canvas.IntermediateCanvas', function() {
describe('#composeFrame()', function() {
var renderer, frameState, layerState, context;
beforeEach(function() {
var layer = new ol.layer.Image({
var layer = new _ol_layer_Image_({
extent: [1, 2, 3, 4]
});
renderer = new ol.renderer.canvas.IntermediateCanvas(layer);
renderer = new _ol_renderer_canvas_IntermediateCanvas_(layer);
var image = new Image();
image.width = 3;
image.height = 3;
@@ -29,13 +27,13 @@ describe('ol.renderer.canvas.IntermediateCanvas', function() {
},
size: [10, 10],
pixelRatio: 1,
coordinateToPixelTransform: ol.transform.create(),
pixelToCoordinateTransform: ol.transform.create()
coordinateToPixelTransform: _ol_transform_.create(),
pixelToCoordinateTransform: _ol_transform_.create()
};
renderer.getImageTransform = function() {
return ol.transform.create();
return _ol_transform_.create();
};
ol.renderer.Map.prototype.calculateMatrices2D(frameState);
_ol_renderer_Map_.prototype.calculateMatrices2D(frameState);
layerState = layer.getLayerState();
context = {
save: sinon.spy(),

64
test/spec/ol/renderer/canvas/map.test.js
View File

@@ -1,28 +1,26 @@
goog.require('ol');
goog.require('ol.Feature');
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.geom.Point');
goog.require('ol.layer.Tile');
goog.require('ol.layer.Vector');
goog.require('ol.renderer.canvas.Layer');
goog.require('ol.renderer.canvas.Map');
goog.require('ol.source.Vector');
goog.require('ol.style.Icon');
goog.require('ol.style.Style');
import _ol_ from '../../../../../src/ol.js';
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 _ol_geom_Point_ from '../../../../../src/ol/geom/Point.js';
import _ol_layer_Tile_ 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';
import _ol_source_Vector_ from '../../../../../src/ol/source/Vector.js';
import _ol_style_Icon_ from '../../../../../src/ol/style/Icon.js';
import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
describe('ol.renderer.canvas.Map', function() {
describe('constructor', function() {
it('creates a new instance', function() {
var map = new ol.Map({
var map = new _ol_Map_({
target: document.createElement('div')
});
var renderer = new ol.renderer.canvas.Map(map.viewport_, map);
expect(renderer).to.be.a(ol.renderer.canvas.Map);
var renderer = new _ol_renderer_canvas_Map_(map.viewport_, map);
expect(renderer).to.be.a(_ol_renderer_canvas_Map_);
});
});
@@ -36,10 +34,10 @@ describe('ol.renderer.canvas.Map', function() {
target.style.width = '100px';
target.style.height = '100px';
document.body.appendChild(target);
map = new ol.Map({
map = new _ol_Map_({
pixelRatio: 1,
target: target,
view: new ol.View({
view: new _ol_View_({
center: [0, 0],
zoom: 0
})
@@ -52,16 +50,16 @@ describe('ol.renderer.canvas.Map', function() {
};
img.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg==';
layer = new ol.layer.Vector({
source: new ol.source.Vector({
layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [
new ol.Feature({
geometry: new ol.geom.Point([0, 0])
new _ol_Feature_({
geometry: new _ol_geom_Point_([0, 0])
})
]
}),
style: new ol.style.Style({
image: new ol.style.Icon({
style: new _ol_style_Style_({
image: new _ol_style_Icon_({
img: img,
imgSize: [1, 1]
})
@@ -94,8 +92,8 @@ describe('ol.renderer.canvas.Map', function() {
it('calls callback with main layer when skipped feature on unmanaged layer', function() {
var feature = layer.getSource().getFeatures()[0];
var managedLayer = new ol.layer.Vector({
source: new ol.source.Vector({
var managedLayer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [feature]
})
});
@@ -122,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 _ol_layer_Tile_());
map.renderSync();
expect(function() {
map.forEachFeatureAtPixel(map.getPixelFromCoordinate([0, 0]),
@@ -169,21 +167,21 @@ describe('ol.renderer.canvas.Map', function() {
var layer, map, renderer;
beforeEach(function() {
map = new ol.Map({});
map = new _ol_Map_({});
map.on('postcompose', function() {});
layer = new ol.layer.Vector({
source: new ol.source.Vector({wrapX: true})
layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({wrapX: true})
});
renderer = map.getRenderer();
renderer.layerRenderers_ = {};
var layerRenderer = new ol.renderer.canvas.Layer(layer);
var layerRenderer = new _ol_renderer_canvas_Layer_(layer);
layerRenderer.prepareFrame = function() {
return true;
};
layerRenderer.getImage = function() {
return null;
};
renderer.layerRenderers_[ol.getUid(layer)] = layerRenderer;
renderer.layerRenderers_[_ol_.getUid(layer)] = layerRenderer;
});
});

184
test/spec/ol/renderer/canvas/replay.test.js
View File

@@ -1,23 +1,21 @@
goog.require('ol');
goog.require('ol.Feature');
goog.require('ol.geom.GeometryCollection');
goog.require('ol.geom.LineString');
goog.require('ol.geom.MultiLineString');
goog.require('ol.geom.MultiPoint');
goog.require('ol.geom.MultiPolygon');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.render.canvas.LineStringReplay');
goog.require('ol.render.canvas.PolygonReplay');
goog.require('ol.render.canvas.Replay');
goog.require('ol.render.canvas.ReplayGroup');
goog.require('ol.renderer.vector');
goog.require('ol.style.Fill');
goog.require('ol.style.Stroke');
goog.require('ol.style.Style');
goog.require('ol.transform');
import _ol_ from '../../../../../src/ol.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import _ol_geom_GeometryCollection_ from '../../../../../src/ol/geom/GeometryCollection.js';
import _ol_geom_LineString_ from '../../../../../src/ol/geom/LineString.js';
import _ol_geom_MultiLineString_ from '../../../../../src/ol/geom/MultiLineString.js';
import _ol_geom_MultiPoint_ from '../../../../../src/ol/geom/MultiPoint.js';
import _ol_geom_MultiPolygon_ from '../../../../../src/ol/geom/MultiPolygon.js';
import _ol_geom_Point_ from '../../../../../src/ol/geom/Point.js';
import _ol_geom_Polygon_ from '../../../../../src/ol/geom/Polygon.js';
import _ol_render_canvas_LineStringReplay_ from '../../../../../src/ol/render/canvas/LineStringReplay.js';
import _ol_render_canvas_PolygonReplay_ from '../../../../../src/ol/render/canvas/PolygonReplay.js';
import _ol_render_canvas_Replay_ from '../../../../../src/ol/render/canvas/Replay.js';
import _ol_render_canvas_ReplayGroup_ from '../../../../../src/ol/render/canvas/ReplayGroup.js';
import _ol_renderer_vector_ from '../../../../../src/ol/renderer/vector.js';
import _ol_style_Fill_ from '../../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
import _ol_transform_ from '../../../../../src/ol/transform.js';
describe('ol.render.canvas.ReplayGroup', function() {
@@ -29,29 +27,29 @@ describe('ol.render.canvas.ReplayGroup', function() {
var 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 ol.Feature(new ol.geom.Polygon(
transform = _ol_transform_.create();
replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 1, false);
feature0 = new _ol_Feature_(new _ol_geom_Polygon_(
[[[-90, 0], [-45, 45], [0, 0], [1, 1], [0, -45], [-90, 0]]]));
feature1 = new ol.Feature(new ol.geom.Polygon(
feature1 = new _ol_Feature_(new _ol_geom_Polygon_(
[[[-90, -45], [-90, 0], [0, 0], [0, -45], [-90, -45]]]));
feature2 = new ol.Feature(new ol.geom.Polygon(
feature2 = new _ol_Feature_(new _ol_geom_Polygon_(
[[[90, 45], [90, 0], [0, 0], [0, 45], [90, 45]]]));
feature3 = new ol.Feature(new ol.geom.Polygon(
feature3 = new _ol_Feature_(new _ol_geom_Polygon_(
[[[-90, -45], [-90, 45], [90, 45], [90, -45], [-90, -45]]]));
fill0 = new ol.style.Style({
fill: new ol.style.Fill({color: 'black'})
fill0 = new _ol_style_Style_({
fill: new _ol_style_Fill_({color: 'black'})
});
fill1 = new ol.style.Style({
fill: new ol.style.Fill({color: 'red'})
fill1 = new _ol_style_Style_({
fill: new _ol_style_Fill_({color: 'red'})
});
style1 = new ol.style.Style({
fill: new ol.style.Fill({color: 'black'}),
stroke: new ol.style.Stroke({color: 'white', width: 1})
style1 = new _ol_style_Style_({
fill: new _ol_style_Fill_({color: 'black'}),
stroke: new _ol_style_Stroke_({color: 'white', width: 1})
});
style2 = new ol.style.Style({
fill: new ol.style.Fill({color: 'white'}),
stroke: new ol.style.Stroke({color: 'black', width: 1, lineDash: [3, 6],
style2 = new _ol_style_Style_({
fill: new _ol_style_Fill_({color: 'white'}),
stroke: new _ol_style_Stroke_({color: 'black', width: 1, lineDash: [3, 6],
lineDashOffset: 2})
});
fillCount = 0;
@@ -90,26 +88,26 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
it('omits lineTo for repeated coordinates', function() {
ol.renderer.vector.renderFeature(replay, feature0, fill0, 1);
_ol_renderer_vector_.renderFeature(replay, feature0, fill0, 1);
replay.replay(context, transform, 0, {});
expect(lineToCount).to.be(4);
lineToCount = 0;
ol.transform.scale(transform, 0.25, 0.25);
_ol_transform_.scale(transform, 0.25, 0.25);
replay.replay(context, transform, 0, {});
expect(lineToCount).to.be(3);
});
it('does not omit moveTo for repeated coordinates', function() {
ol.renderer.vector.renderFeature(replay, feature0, fill0, 1);
ol.renderer.vector.renderFeature(replay, feature1, fill1, 1);
_ol_renderer_vector_.renderFeature(replay, feature0, fill0, 1);
_ol_renderer_vector_.renderFeature(replay, feature1, fill1, 1);
replay.replay(context, transform, 0, {});
expect(moveToCount).to.be(2);
});
it('batches fill and stroke instructions for same style', function() {
ol.renderer.vector.renderFeature(replay, feature1, style1, 1);
ol.renderer.vector.renderFeature(replay, feature2, style1, 1);
ol.renderer.vector.renderFeature(replay, feature3, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature1, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature2, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature3, style1, 1);
replay.replay(context, transform, 0, {});
expect(fillCount).to.be(1);
expect(strokeCount).to.be(1);
@@ -117,9 +115,9 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
it('batches fill and stroke instructions for different styles', 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);
_ol_renderer_vector_.renderFeature(replay, feature1, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature2, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature3, style2, 1);
replay.replay(context, transform, 0, {});
expect(fillCount).to.be(2);
expect(strokeCount).to.be(2);
@@ -127,9 +125,9 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
it('batches fill and stroke instructions for changing styles', function() {
ol.renderer.vector.renderFeature(replay, feature1, style1, 1);
ol.renderer.vector.renderFeature(replay, feature2, style2, 1);
ol.renderer.vector.renderFeature(replay, feature3, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature1, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature2, style2, 1);
_ol_renderer_vector_.renderFeature(replay, feature3, style1, 1);
replay.replay(context, transform, 0, {});
expect(fillCount).to.be(3);
expect(strokeCount).to.be(3);
@@ -137,11 +135,11 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
it('batches fill and stroke instructions for skipped feature at the beginning', 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);
_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 = {};
skippedUids[ol.getUid(feature1)] = true;
skippedUids[_ol_.getUid(feature1)] = true;
replay.replay(context, transform, 0, skippedUids);
expect(fillCount).to.be(1);
expect(strokeCount).to.be(1);
@@ -149,11 +147,11 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
it('batches fill and stroke instructions for skipped feature at the end', 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);
_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 = {};
skippedUids[ol.getUid(feature3)] = true;
skippedUids[_ol_.getUid(feature3)] = true;
replay.replay(context, transform, 0, skippedUids);
expect(fillCount).to.be(1);
expect(strokeCount).to.be(1);
@@ -161,12 +159,12 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
it('batches fill and stroke instructions for skipped features', 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);
_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 = {};
skippedUids[ol.getUid(feature1)] = true;
skippedUids[ol.getUid(feature2)] = true;
skippedUids[_ol_.getUid(feature1)] = true;
skippedUids[_ol_.getUid(feature2)] = true;
replay.replay(context, transform, 0, skippedUids);
expect(fillCount).to.be(1);
expect(strokeCount).to.be(1);
@@ -174,10 +172,10 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
it('does not batch when overlaps is set to true', function() {
replay = new ol.render.canvas.ReplayGroup(1, [-180, -90, 180, 90], 1, 1, true);
ol.renderer.vector.renderFeature(replay, feature1, style1, 1);
ol.renderer.vector.renderFeature(replay, feature2, style1, 1);
ol.renderer.vector.renderFeature(replay, feature3, style1, 1);
replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 1, true);
_ol_renderer_vector_.renderFeature(replay, feature1, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature2, style1, 1);
_ol_renderer_vector_.renderFeature(replay, feature3, style1, 1);
replay.replay(context, transform, 0, {});
expect(fillCount).to.be(3);
expect(strokeCount).to.be(3);
@@ -186,7 +184,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
it('applies the pixelRatio to the linedash array and offset', function() {
// replay with a pixelRatio of 2
replay = new ol.render.canvas.ReplayGroup(1, [-180, -90, 180, 90], 1, 2, true);
replay = new _ol_render_canvas_ReplayGroup_(1, [-180, -90, 180, 90], 1, 2, true);
var lineDash, lineDashCount = 0,
lineDashOffset, lineDashOffsetCount = 0;
@@ -203,8 +201,8 @@ describe('ol.render.canvas.ReplayGroup', function() {
}
});
ol.renderer.vector.renderFeature(replay, feature1, style2, 1);
ol.renderer.vector.renderFeature(replay, feature2, style2, 1);
_ol_renderer_vector_.renderFeature(replay, feature1, style2, 1);
_ol_renderer_vector_.renderFeature(replay, feature2, style2, 1);
replay.replay(context, transform, 0, {});
expect(lineDashCount).to.be(1);
@@ -218,7 +216,7 @@ describe('ol.render.canvas.ReplayGroup', function() {
it('calls the renderer function configured for the style', function() {
var calls = [];
var style = new ol.style.Style({
var style = new _ol_style_Style_({
renderer: function(coords, state) {
calls.push({
coords: coords,
@@ -231,27 +229,27 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
}
});
var point = new ol.Feature(new ol.geom.Point([45, 90]));
var multipoint = new ol.Feature(new ol.geom.MultiPoint(
var point = new _ol_Feature_(new _ol_geom_Point_([45, 90]));
var multipoint = new _ol_Feature_(new _ol_geom_MultiPoint_(
[[45, 90], [90, 45]]));
var linestring = new ol.Feature(new ol.geom.LineString(
var linestring = new _ol_Feature_(new _ol_geom_LineString_(
[[45, 90], [45, 45], [90, 45]]));
var multilinestring = new ol.Feature(new ol.geom.MultiLineString(
var multilinestring = new _ol_Feature_(new _ol_geom_MultiLineString_(
[linestring.getGeometry().getCoordinates(), linestring.getGeometry().getCoordinates()]));
var polygon = feature1;
var multipolygon = new ol.Feature(new ol.geom.MultiPolygon(
var multipolygon = new _ol_Feature_(new _ol_geom_MultiPolygon_(
[polygon.getGeometry().getCoordinates(), polygon.getGeometry().getCoordinates()]));
var geometrycollection = new ol.Feature(new ol.geom.GeometryCollection(
var geometrycollection = new _ol_Feature_(new _ol_geom_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);
ol.renderer.vector.renderFeature(replay, linestring, style, 1);
ol.renderer.vector.renderFeature(replay, multilinestring, style, 1);
ol.renderer.vector.renderFeature(replay, polygon, style, 1);
ol.renderer.vector.renderFeature(replay, multipolygon, style, 1);
ol.renderer.vector.renderFeature(replay, geometrycollection, style, 1);
ol.transform.scale(transform, 0.1, 0.1);
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);
_ol_renderer_vector_.renderFeature(replay, linestring, style, 1);
_ol_renderer_vector_.renderFeature(replay, multilinestring, style, 1);
_ol_renderer_vector_.renderFeature(replay, polygon, style, 1);
_ol_renderer_vector_.renderFeature(replay, multipolygon, style, 1);
_ol_renderer_vector_.renderFeature(replay, geometrycollection, style, 1);
_ol_transform_.scale(transform, 0.1, 0.1);
replay.replay(context, transform, 0, {});
expect(calls.length).to.be(9);
expect(calls[0].geometry).to.be(point.getGeometry());
@@ -287,8 +285,8 @@ describe('ol.render.canvas.Replay', 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);
expect(replay).to.be.a(ol.render.canvas.Replay);
var replay = new _ol_render_canvas_Replay_(tolerance, extent, 1, 1, true);
expect(replay).to.be.a(_ol_render_canvas_Replay_);
});
});
@@ -297,7 +295,7 @@ describe('ol.render.canvas.Replay', function() {
var replay;
beforeEach(function() {
replay = new ol.render.canvas.Replay(1, [-180, -90, 180, 90], 1, 1, true);
replay = new _ol_render_canvas_Replay_(1, [-180, -90, 180, 90], 1, 1, true);
});
it('appends coordinates that are within the max extent', function() {
@@ -448,9 +446,9 @@ describe('ol.render.canvas.LineStringReplay', function() {
var tolerance = 1;
var extent = [-180, -90, 180, 90];
var resolution = 10;
var replay = new ol.render.canvas.LineStringReplay(tolerance, extent,
var replay = new _ol_render_canvas_LineStringReplay_(tolerance, extent,
resolution);
var stroke = new ol.style.Stroke({
var stroke = new _ol_style_Stroke_({
width: 2
});
replay.setFillStrokeStyle(null, stroke);
@@ -470,7 +468,7 @@ describe('ol.render.canvas.PolygonReplay', function() {
var tolerance = 1;
var extent = [-180, -90, 180, 90];
var resolution = 10;
replay = new ol.render.canvas.PolygonReplay(tolerance, extent,
replay = new _ol_render_canvas_PolygonReplay_(tolerance, extent,
resolution);
});
@@ -478,7 +476,7 @@ describe('ol.render.canvas.PolygonReplay', 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 ol.style.Stroke({
var stroke = new _ol_style_Stroke_({
width: 5
});
replay.setFillStrokeStyle(null, stroke);
@@ -493,7 +491,7 @@ describe('ol.render.canvas.PolygonReplay', function() {
describe('#getBufferedMaxExtent()', function() {
it('buffers the max extent to accommodate stroke width', function() {
var stroke = new ol.style.Stroke({
var stroke = new _ol_style_Stroke_({
width: 5
});
replay.setFillStrokeStyle(null, stroke);

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

@@ -1,14 +1,12 @@
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.layer.Tile');
goog.require('ol.proj');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.canvas.TileLayer');
goog.require('ol.source.TileWMS');
goog.require('ol.source.XYZ');
goog.require('ol.transform');
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 _ol_proj_ 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';
import _ol_source_TileWMS_ from '../../../../../src/ol/source/TileWMS.js';
import _ol_source_XYZ_ from '../../../../../src/ol/source/XYZ.js';
import _ol_transform_ from '../../../../../src/ol/transform.js';
describe('ol.renderer.canvas.TileLayer', function() {
@@ -21,7 +19,7 @@ describe('ol.renderer.canvas.TileLayer', function() {
target.style.width = '100px';
target.style.height = '100px';
document.body.appendChild(target);
source = new ol.source.TileWMS({
source = new _ol_source_TileWMS_({
url: 'spec/ol/data/osm-0-0-0.png',
params: {LAYERS: 'foo', TIME: '0'}
});
@@ -29,12 +27,12 @@ describe('ol.renderer.canvas.TileLayer', function() {
tile = e.tile;
done();
});
map = new ol.Map({
map = new _ol_Map_({
target: target,
layers: [new ol.layer.Tile({
layers: [new _ol_layer_Tile_({
source: source
})],
view: new ol.View({
view: new _ol_View_({
zoom: 0,
center: [0, 0]
})
@@ -72,34 +70,34 @@ describe('ol.renderer.canvas.TileLayer', function() {
});
it('uses correct draw scale when rotating (HiDPI)', function() {
var layer = new ol.layer.Tile({
source: new ol.source.XYZ({
var layer = new _ol_layer_Tile_({
source: new _ol_source_XYZ_({
tileSize: 1
})
});
var renderer = new ol.renderer.canvas.TileLayer(layer);
var renderer = new _ol_renderer_canvas_TileLayer_(layer);
renderer.renderedTiles = [];
var frameState = {
viewHints: [],
time: Date.now(),
viewState: {
center: [10, 5],
projection: ol.proj.get('EPSG:3857'),
projection: _ol_proj_.get('EPSG:3857'),
resolution: 1,
rotation: Math.PI
},
extent: [0, 0, 20, 10],
size: [20, 10],
pixelRatio: 2,
coordinateToPixelTransform: ol.transform.create(),
pixelToCoordinateTransform: ol.transform.create(),
coordinateToPixelTransform: _ol_transform_.create(),
pixelToCoordinateTransform: _ol_transform_.create(),
usedTiles: {},
wantedTiles: {}
};
renderer.getImageTransform = function() {
return ol.transform.create();
return _ol_transform_.create();
};
ol.renderer.Map.prototype.calculateMatrices2D(frameState);
_ol_renderer_Map_.prototype.calculateMatrices2D(frameState);
var layerState = layer.getLayerState();
var canvas = document.createElement('canvas');
canvas.width = 200;

134
test/spec/ol/renderer/canvas/vectorlayer.test.js
View File

@@ -1,19 +1,17 @@
goog.require('ol');
goog.require('ol.Feature');
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.extent');
goog.require('ol.geom.Point');
goog.require('ol.layer.Vector');
goog.require('ol.obj');
goog.require('ol.proj');
goog.require('ol.render.canvas');
goog.require('ol.renderer.canvas.VectorLayer');
goog.require('ol.source.Vector');
goog.require('ol.style.Style');
goog.require('ol.style.Text');
import _ol_ from '../../../../../src/ol.js';
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 _ol_extent_ from '../../../../../src/ol/extent.js';
import _ol_geom_Point_ from '../../../../../src/ol/geom/Point.js';
import _ol_layer_Vector_ from '../../../../../src/ol/layer/Vector.js';
import _ol_obj_ from '../../../../../src/ol/obj.js';
import _ol_proj_ from '../../../../../src/ol/proj.js';
import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
import _ol_renderer_canvas_VectorLayer_ from '../../../../../src/ol/renderer/canvas/VectorLayer.js';
import _ol_source_Vector_ from '../../../../../src/ol/source/Vector.js';
import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
import _ol_style_Text_ from '../../../../../src/ol/style/Text.js';
describe('ol.renderer.canvas.VectorLayer', function() {
@@ -39,11 +37,11 @@ describe('ol.renderer.canvas.VectorLayer', function() {
});
it('creates a new instance', function() {
var layer = new ol.layer.Vector({
source: new ol.source.Vector()
var layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_()
});
var renderer = new ol.renderer.canvas.VectorLayer(layer);
expect(renderer).to.be.a(ol.renderer.canvas.VectorLayer);
var renderer = new _ol_renderer_canvas_VectorLayer_(layer);
expect(renderer).to.be.a(_ol_renderer_canvas_VectorLayer_);
});
it('gives precedence to feature styles over layer styles', function() {
@@ -51,28 +49,28 @@ describe('ol.renderer.canvas.VectorLayer', function() {
target.style.width = '256px';
target.style.height = '256px';
document.body.appendChild(target);
var map = new ol.Map({
view: new ol.View({
var map = new _ol_Map_({
view: new _ol_View_({
center: [0, 0],
zoom: 0
}),
target: target
});
var layerStyle = [new ol.style.Style({
text: new ol.style.Text({
var layerStyle = [new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'layer'
})
})];
var featureStyle = [new ol.style.Style({
text: new ol.style.Text({
var featureStyle = [new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'feature'
})
})];
var feature1 = new ol.Feature(new ol.geom.Point([0, 0]));
var feature2 = new ol.Feature(new ol.geom.Point([0, 0]));
var feature1 = new _ol_Feature_(new _ol_geom_Point_([0, 0]));
var feature2 = new _ol_Feature_(new _ol_geom_Point_([0, 0]));
feature2.setStyle(featureStyle);
var layer = new ol.layer.Vector({
source: new ol.source.Vector({
var layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [feature1, feature2]
}),
style: layerStyle
@@ -87,24 +85,24 @@ 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 ol.Map({
view: new ol.View({
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
var map = new _ol_Map_({
view: new _ol_View_({
center: [0, 0],
zoom: 0
}),
target: target
});
var layerStyle = new ol.style.Style({
text: new ol.style.Text({
var layerStyle = new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'layer',
font: '12px "Unavailable Font",sans-serif'
})
});
var feature = new ol.Feature(new ol.geom.Point([0, 0]));
var layer = new ol.layer.Vector({
source: new ol.source.Vector({
var feature = new _ol_Feature_(new _ol_geom_Point_([0, 0]));
var layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [feature]
}),
style: layerStyle
@@ -118,24 +116,24 @@ 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 ol.Map({
view: new ol.View({
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
var map = new _ol_Map_({
view: new _ol_View_({
center: [0, 0],
zoom: 0
}),
target: target
});
var layerStyle = new ol.style.Style({
text: new ol.style.Text({
var layerStyle = new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'layer',
font: '12px sans-serif'
})
});
var feature = new ol.Feature(new ol.geom.Point([0, 0]));
var layer = new ol.layer.Vector({
source: new ol.source.Vector({
var feature = new _ol_Feature_(new _ol_geom_Point_([0, 0]));
var layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [feature]
}),
style: layerStyle
@@ -149,25 +147,25 @@ describe('ol.renderer.canvas.VectorLayer', function() {
});
it('re-renders for fonts that become available', function(done) {
ol.obj.clear(ol.render.canvas.checkedFonts_);
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
head.appendChild(font);
var map = new ol.Map({
view: new ol.View({
var map = new _ol_Map_({
view: new _ol_View_({
center: [0, 0],
zoom: 0
}),
target: target
});
var layerStyle = new ol.style.Style({
text: new ol.style.Text({
var layerStyle = new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'layer',
font: '12px "Droid Sans",sans-serif'
})
});
var feature = new ol.Feature(new ol.geom.Point([0, 0]));
var layer = new ol.layer.Vector({
source: new ol.source.Vector({
var feature = new _ol_Feature_(new _ol_geom_Point_([0, 0]));
var layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({
features: [feature]
}),
style: layerStyle
@@ -187,15 +185,15 @@ describe('ol.renderer.canvas.VectorLayer', function() {
var layer, renderer;
beforeEach(function() {
layer = new ol.layer.Vector({
source: new ol.source.Vector()
layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_()
});
renderer = new ol.renderer.canvas.VectorLayer(layer);
renderer = new _ol_renderer_canvas_VectorLayer_(layer);
var replayGroup = {};
renderer.replayGroup_ = replayGroup;
replayGroup.forEachFeatureAtCoordinate = function(coordinate,
resolution, rotation, hitTolerance, skippedFeaturesUids, callback) {
var feature = new ol.Feature();
var feature = new _ol_Feature_();
callback(feature);
callback(feature);
};
@@ -212,7 +210,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
rotation: 0
}
};
frameState.layerStates[ol.getUid(layer)] = {};
frameState.layerStates[_ol_.getUid(layer)] = {};
renderer.forEachFeatureAtCoordinate(
coordinate, frameState, 0, spy, undefined);
expect(spy.callCount).to.be(1);
@@ -224,13 +222,13 @@ describe('ol.renderer.canvas.VectorLayer', function() {
var frameState, projExtent, renderer, worldWidth, buffer;
beforeEach(function() {
var layer = new ol.layer.Vector({
source: new ol.source.Vector({wrapX: true})
var layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_({wrapX: true})
});
renderer = new ol.renderer.canvas.VectorLayer(layer);
var projection = ol.proj.get('EPSG:3857');
renderer = new _ol_renderer_canvas_VectorLayer_(layer);
var projection = _ol_proj_.get('EPSG:3857');
projExtent = projection.getExtent();
worldWidth = ol.extent.getWidth(projExtent);
worldWidth = _ol_extent_.getWidth(projExtent);
buffer = layer.getRenderBuffer();
frameState = {
skippedFeatureUids: {},
@@ -248,7 +246,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
frameState.extent =
[projExtent[0] - 10000, -10000, projExtent[0] + 10000, 10000];
renderer.prepareFrame(frameState, {});
expect(renderer.replayGroup_.maxExtent_).to.eql(ol.extent.buffer([
expect(renderer.replayGroup_.maxExtent_).to.eql(_ol_extent_.buffer([
projExtent[0] - worldWidth + buffer,
-10000, projExtent[2] + worldWidth - buffer, 10000
], buffer));
@@ -260,7 +258,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
frameState.extent =
[projExtent[0] - 10000, -10000, projExtent[1] - 10000, 10000];
renderer.prepareFrame(frameState, {});
expect(renderer.replayGroup_.maxExtent_).to.eql(ol.extent.buffer([
expect(renderer.replayGroup_.maxExtent_).to.eql(_ol_extent_.buffer([
projExtent[0] - worldWidth + buffer,
-10000, projExtent[2] + worldWidth - buffer, 10000
], buffer));
@@ -271,7 +269,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
frameState.extent =
[2 * projExtent[0] - 10000, -10000, 2 * projExtent[1] + 10000, 10000];
renderer.prepareFrame(frameState, {});
expect(renderer.replayGroup_.maxExtent_).to.eql(ol.extent.buffer([
expect(renderer.replayGroup_.maxExtent_).to.eql(_ol_extent_.buffer([
projExtent[0] - worldWidth + buffer,
-10000, projExtent[2] + worldWidth - buffer, 10000
], buffer));
@@ -284,7 +282,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
-10000, projExtent[1] + 2 * worldWidth + 10000, 10000
];
renderer.prepareFrame(frameState, {});
expect(renderer.replayGroup_.maxExtent_).to.eql(ol.extent.buffer([
expect(renderer.replayGroup_.maxExtent_).to.eql(_ol_extent_.buffer([
projExtent[0] - 2 * worldWidth - 10000,
-10000, projExtent[2] + 2 * worldWidth + 10000, 10000
], buffer));

172
test/spec/ol/renderer/canvas/vectortilelayer.test.js
View File

@@ -1,24 +1,24 @@
goog.require('ol');
goog.require('ol.obj');
goog.require('ol.Feature');
goog.require('ol.Map');
goog.require('ol.TileState');
goog.require('ol.VectorImageTile');
goog.require('ol.VectorTile');
goog.require('ol.View');
goog.require('ol.extent');
goog.require('ol.format.MVT');
goog.require('ol.geom.Point');
goog.require('ol.layer.VectorTile');
goog.require('ol.proj');
goog.require('ol.proj.Projection');
goog.require('ol.render.canvas');
goog.require('ol.render.Feature');
goog.require('ol.renderer.canvas.VectorTileLayer');
goog.require('ol.source.VectorTile');
goog.require('ol.style.Style');
goog.require('ol.style.Text');
goog.require('ol.tilegrid');
import _ol_ from '../../../../../src/ol.js';
import _ol_obj_ from '../../../../../src/ol/obj.js';
import _ol_Feature_ from '../../../../../src/ol/Feature.js';
import _ol_Map_ from '../../../../../src/ol/Map.js';
import _ol_TileState_ from '../../../../../src/ol/TileState.js';
import _ol_VectorImageTile_ from '../../../../../src/ol/VectorImageTile.js';
import _ol_VectorTile_ from '../../../../../src/ol/VectorTile.js';
import _ol_View_ from '../../../../../src/ol/View.js';
import _ol_extent_ from '../../../../../src/ol/extent.js';
import _ol_format_MVT_ from '../../../../../src/ol/format/MVT.js';
import _ol_geom_Point_ from '../../../../../src/ol/geom/Point.js';
import _ol_layer_VectorTile_ from '../../../../../src/ol/layer/VectorTile.js';
import _ol_proj_ from '../../../../../src/ol/proj.js';
import _ol_proj_Projection_ from '../../../../../src/ol/proj/Projection.js';
import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
import _ol_render_Feature_ from '../../../../../src/ol/render/Feature.js';
import _ol_renderer_canvas_VectorTileLayer_ from '../../../../../src/ol/renderer/canvas/VectorTileLayer.js';
import _ol_source_VectorTile_ from '../../../../../src/ol/source/VectorTile.js';
import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
import _ol_style_Text_ from '../../../../../src/ol/style/Text.js';
import _ol_tilegrid_ from '../../../../../src/ol/tilegrid.js';
describe('ol.renderer.canvas.VectorTileLayer', function() {
@@ -38,46 +38,46 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
target.style.width = '256px';
target.style.height = '256px';
document.body.appendChild(target);
map = new ol.Map({
view: new ol.View({
map = new _ol_Map_({
view: new _ol_View_({
center: [0, 0],
zoom: 0
}),
target: target
});
layerStyle = [new ol.style.Style({
text: new ol.style.Text({
layerStyle = [new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'layer'
})
})];
var featureStyle = [new ol.style.Style({
text: new ol.style.Text({
var featureStyle = [new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'feature'
})
})];
feature1 = new ol.Feature(new ol.geom.Point([1, -1]));
feature2 = new ol.Feature(new ol.geom.Point([0, 0]));
feature3 = new ol.render.Feature('Point', [1, -1], []);
feature1 = new _ol_Feature_(new _ol_geom_Point_([1, -1]));
feature2 = new _ol_Feature_(new _ol_geom_Point_([0, 0]));
feature3 = new _ol_render_Feature_('Point', [1, -1], []);
feature2.setStyle(featureStyle);
var TileClass = function() {
ol.VectorTile.apply(this, arguments);
_ol_VectorTile_.apply(this, arguments);
this.setState('loaded');
this.setFeatures([feature1, feature2, feature3]);
this.setProjection(ol.proj.get('EPSG:4326'));
this.setProjection(_ol_proj_.get('EPSG:4326'));
tileCallback(this);
};
ol.inherits(TileClass, ol.VectorTile);
source = new ol.source.VectorTile({
format: new ol.format.MVT(),
_ol_.inherits(TileClass, _ol_VectorTile_);
source = new _ol_source_VectorTile_({
format: new _ol_format_MVT_(),
tileClass: TileClass,
tileGrid: ol.tilegrid.createXYZ()
tileGrid: _ol_tilegrid_.createXYZ()
});
source.getTile = function() {
var tile = ol.source.VectorTile.prototype.getTile.apply(source, arguments);
tile.setState(ol.TileState.LOADED);
var tile = _ol_source_VectorTile_.prototype.getTile.apply(source, arguments);
tile.setState(_ol_TileState_.LOADED);
return tile;
};
layer = new ol.layer.VectorTile({
layer = new _ol_layer_VectorTile_({
source: source,
style: layerStyle
});
@@ -90,20 +90,20 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
it('creates a new instance', function() {
var renderer = new ol.renderer.canvas.VectorTileLayer(layer);
expect(renderer).to.be.a(ol.renderer.canvas.VectorTileLayer);
var renderer = new _ol_renderer_canvas_VectorTileLayer_(layer);
expect(renderer).to.be.a(_ol_renderer_canvas_VectorTileLayer_);
expect(renderer.zDirection).to.be(0);
});
it('uses lower resolution for pure vector rendering', function() {
layer.renderMode_ = 'vector';
var renderer = new ol.renderer.canvas.VectorTileLayer(layer);
var renderer = new _ol_renderer_canvas_VectorTileLayer_(layer);
expect(renderer.zDirection).to.be(1);
});
it('does not render images for pure vector rendering', function() {
layer.renderMode_ = 'vector';
var spy = sinon.spy(ol.renderer.canvas.VectorTileLayer.prototype,
var spy = sinon.spy(_ol_renderer_canvas_VectorTileLayer_.prototype,
'renderTileImage_');
map.renderSync();
expect(spy.callCount).to.be(0);
@@ -112,7 +112,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
it('does not render replays for pure image rendering', function() {
layer.renderMode_ = 'image';
var spy = sinon.spy(ol.renderer.canvas.VectorTileLayer.prototype,
var spy = sinon.spy(_ol_renderer_canvas_VectorTileLayer_.prototype,
'getTransform');
map.renderSync();
expect(spy.callCount).to.be(0);
@@ -120,9 +120,9 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
it('renders both replays and images for hybrid rendering', function() {
var spy1 = sinon.spy(ol.renderer.canvas.VectorTileLayer.prototype,
var spy1 = sinon.spy(_ol_renderer_canvas_VectorTileLayer_.prototype,
'getTransform');
var spy2 = sinon.spy(ol.renderer.canvas.VectorTileLayer.prototype,
var spy2 = sinon.spy(_ol_renderer_canvas_VectorTileLayer_.prototype,
'renderTileImage_');
map.renderSync();
expect(spy1.callCount).to.be(1);
@@ -133,10 +133,10 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
it('renders replays with custom renderers as direct replays', function() {
layer.renderMode_ = 'image';
layer.setStyle(new ol.style.Style({
layer.setStyle(new _ol_style_Style_({
renderer: function() {}
}));
var spy = sinon.spy(ol.renderer.canvas.VectorTileLayer.prototype,
var spy = sinon.spy(_ol_renderer_canvas_VectorTileLayer_.prototype,
'getTransform');
map.renderSync();
expect(spy.callCount).to.be(1);
@@ -154,7 +154,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
it('does not re-render for unavailable fonts', function(done) {
map.renderSync();
ol.obj.clear(ol.render.canvas.checkedFonts_);
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
layerStyle[0].getText().setFont('12px "Unavailable font",sans-serif');
layer.changed();
var revision = layer.getRevision();
@@ -166,7 +166,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
it('does not re-render for available fonts', function(done) {
map.renderSync();
ol.obj.clear(ol.render.canvas.checkedFonts_);
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
layerStyle[0].getText().setFont('12px sans-serif');
layer.changed();
var revision = layer.getRevision();
@@ -178,7 +178,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
it('re-renders for fonts that become available', function(done) {
map.renderSync();
ol.obj.clear(ol.render.canvas.checkedFonts_);
_ol_obj_.clear(_ol_render_canvas_.checkedFonts_);
head.appendChild(font);
layerStyle[0].getText().setFont('12px "Dancing Script",sans-serif');
layer.changed();
@@ -196,38 +196,38 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
tile = t;
};
map.renderSync();
expect(tile.getProjection()).to.equal(ol.proj.get('EPSG:3857'));
expect(tile.getProjection()).to.equal(_ol_proj_.get('EPSG:3857'));
expect(feature1.getGeometry().getCoordinates()).to.eql(
ol.proj.fromLonLat([1, -1]));
_ol_proj_.fromLonLat([1, -1]));
});
it('Geometries are transformed from tile-pixels', function() {
var proj = new ol.proj.Projection({code: 'EPSG:3857', units: 'tile-pixels'});
var proj = new _ol_proj_Projection_({code: 'EPSG:3857', units: 'tile-pixels'});
var tile;
tileCallback = function(t) {
t.setProjection(proj);
tile = t;
};
map.renderSync();
expect(tile.getProjection()).to.equal(ol.proj.get('EPSG:3857'));
expect(tile.getProjection()).to.equal(_ol_proj_.get('EPSG:3857'));
expect(feature1.getGeometry().getCoordinates()).to.eql([-20027724.40316874, 20047292.282409746]);
expect(feature3.flatCoordinates_).to.eql([-20027724.40316874, 20047292.282409746]);
});
it('works for multiple layers that use the same source', function() {
var layer2 = new ol.layer.VectorTile({
var layer2 = new _ol_layer_VectorTile_({
source: source,
style: new ol.style.Style({
text: new ol.style.Text({
style: new _ol_style_Style_({
text: new _ol_style_Text_({
text: 'layer2'
})
})
});
map.addLayer(layer2);
var spy1 = sinon.spy(ol.VectorTile.prototype,
var spy1 = sinon.spy(_ol_VectorTile_.prototype,
'getReplayGroup');
var spy2 = sinon.spy(ol.VectorTile.prototype,
var spy2 = sinon.spy(_ol_VectorTile_.prototype,
'setReplayGroup');
map.renderSync();
expect(spy1.callCount).to.be(4);
@@ -240,31 +240,31 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
describe('#prepareFrame', function() {
it('re-renders when layer changed', function() {
var layer = new ol.layer.VectorTile({
source: new ol.source.VectorTile({
tileGrid: ol.tilegrid.createXYZ(),
var layer = new _ol_layer_VectorTile_({
source: new _ol_source_VectorTile_({
tileGrid: _ol_tilegrid_.createXYZ(),
transition: 0
})
});
var sourceTile = new ol.VectorTile([0, 0, 0], 2);
sourceTile.setProjection(ol.proj.get('EPSG:3857'));
var sourceTile = new _ol_VectorTile_([0, 0, 0], 2);
sourceTile.setProjection(_ol_proj_.get('EPSG:3857'));
sourceTile.features_ = [];
sourceTile.getImage = function() {
return document.createElement('canvas');
};
var tile = new ol.VectorImageTile([0, 0, 0]);
var tile = new _ol_VectorImageTile_([0, 0, 0]);
tile.transition_ = 0;
tile.wrappedTileCoord = [0, 0, 0];
tile.setState(ol.TileState.LOADED);
tile.setState(_ol_TileState_.LOADED);
tile.getSourceTile = function() {
return sourceTile;
};
layer.getSource().getTile = function() {
return tile;
};
var renderer = new ol.renderer.canvas.VectorTileLayer(layer);
var renderer = new _ol_renderer_canvas_VectorTileLayer_(layer);
renderer.renderTileImage_ = sinon.spy();
var proj = ol.proj.get('EPSG:3857');
var proj = _ol_proj_.get('EPSG:3857');
var frameState = {
extent: proj.getExtent(),
pixelRatio: 1,
@@ -292,10 +292,10 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
describe('#forEachFeatureAtCoordinate', function() {
var layer, renderer, replayGroup;
var TileClass = function() {
ol.VectorImageTile.apply(this, arguments);
_ol_VectorImageTile_.apply(this, arguments);
this.setState('loaded');
var sourceTile = new ol.VectorTile([0, 0, 0]);
sourceTile.setProjection(ol.proj.get('EPSG:3857'));
var sourceTile = new _ol_VectorTile_([0, 0, 0]);
sourceTile.setProjection(_ol_proj_.get('EPSG:3857'));
sourceTile.getReplayGroup = function() {
return replayGroup;
};
@@ -305,20 +305,20 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
this.sourceTiles_[key] = sourceTile;
this.wrappedTileCoord = arguments[0];
};
ol.inherits(TileClass, ol.VectorImageTile);
_ol_.inherits(TileClass, _ol_VectorImageTile_);
beforeEach(function() {
replayGroup = {};
layer = new ol.layer.VectorTile({
source: new ol.source.VectorTile({
layer = new _ol_layer_VectorTile_({
source: new _ol_source_VectorTile_({
tileClass: TileClass,
tileGrid: ol.tilegrid.createXYZ()
tileGrid: _ol_tilegrid_.createXYZ()
})
});
renderer = new ol.renderer.canvas.VectorTileLayer(layer);
renderer = new _ol_renderer_canvas_VectorTileLayer_(layer);
replayGroup.forEachFeatureAtCoordinate = function(coordinate,
resolution, rotation, hitTolerance, skippedFeaturesUids, callback) {
var feature = new ol.Feature();
var feature = new _ol_Feature_();
callback(feature);
callback(feature);
};
@@ -331,12 +331,12 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
layerStates: {},
skippedFeatureUids: {},
viewState: {
projection: ol.proj.get('EPSG:3857'),
projection: _ol_proj_.get('EPSG:3857'),
resolution: 1,
rotation: 0
}
};
frameState.layerStates[ol.getUid(layer)] = {};
frameState.layerStates[_ol_.getUid(layer)] = {};
renderer.renderedTiles = [new TileClass([0, 0, -1])];
renderer.forEachFeatureAtCoordinate(
coordinate, frameState, 0, spy, undefined);
@@ -350,22 +350,22 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
target.style.height = '100px';
document.body.appendChild(target);
var extent = [1824704.739223726, 6141868.096770482, 1827150.7241288517, 6144314.081675608];
var source = new ol.source.VectorTile({
format: new ol.format.MVT(),
var source = new _ol_source_VectorTile_({
format: new _ol_format_MVT_(),
url: 'spec/ol/data/14-8938-5680.vector.pbf',
minZoom: 14,
maxZoom: 14
});
var map = new ol.Map({
var map = new _ol_Map_({
target: target,
layers: [
new ol.layer.VectorTile({
new _ol_layer_VectorTile_({
extent: extent,
source: source
})
],
view: new ol.View({
center: ol.extent.getCenter(extent),
view: new _ol_View_({
center: _ol_extent_.getCenter(extent),
zoom: 19
})
});

34
test/spec/ol/renderer/layer.test.js
View File

@@ -1,11 +1,11 @@
goog.require('ol.Image');
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.layer.Layer');
goog.require('ol.layer.Tile');
goog.require('ol.renderer.Layer');
goog.require('ol.source.XYZ');
goog.require('ol.tilecoord');
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 _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';
describe('ol.renderer.Layer', function() {
@@ -13,8 +13,8 @@ describe('ol.renderer.Layer', function() {
var eventType = 'change';
beforeEach(function() {
var layer = new ol.layer.Layer({});
renderer = new ol.renderer.Layer(layer);
var layer = new _ol_layer_Layer_({});
renderer = new _ol_renderer_Layer_(layer);
});
describe('#loadImage', function() {
@@ -28,7 +28,7 @@ describe('ol.renderer.Layer', function() {
var src = '';
var crossOrigin = '';
imageLoadFunction = sinon.spy();
image = new ol.Image(extent, resolution, pixelRatio, src, crossOrigin, imageLoadFunction);
image = new _ol_Image_(extent, resolution, pixelRatio, src, crossOrigin, imageLoadFunction);
});
describe('load IDLE image', function() {
@@ -98,20 +98,20 @@ describe('ol.renderer.Layer', function() {
});
document.body.appendChild(target);
view = new ol.View({
view = new _ol_View_({
center: [0, 0],
zoom: 0
});
source = new ol.source.XYZ({
source = new _ol_source_XYZ_({
url: '#{x}/{y}/{z}'
});
map = new ol.Map({
map = new _ol_Map_({
target: target,
view: view,
layers: [
new ol.layer.Tile({
new _ol_layer_Tile_({
source: source
})
]
@@ -129,13 +129,13 @@ 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);
var 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);
var tileCoord = _ol_tilecoord_.fromKey(key);
expect(tileCoord[0]).to.be(4);
done();
});

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

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

88
test/spec/ol/renderer/vector.test.js
View File

@@ -1,20 +1,18 @@
goog.require('ol');
goog.require('ol.events');
goog.require('ol.geom.LineString');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.geom.MultiLineString');
goog.require('ol.geom.MultiPoint');
goog.require('ol.geom.MultiPolygon');
goog.require('ol.render.canvas.ReplayGroup');
goog.require('ol.renderer.vector');
goog.require('ol.style.Fill');
goog.require('ol.style.Icon');
goog.require('ol.style.Stroke');
goog.require('ol.style.Style');
goog.require('ol.Feature');
import _ol_ from '../../../../src/ol.js';
import _ol_events_ from '../../../../src/ol/events.js';
import _ol_geom_LineString_ from '../../../../src/ol/geom/LineString.js';
import _ol_geom_Point_ from '../../../../src/ol/geom/Point.js';
import _ol_geom_Polygon_ from '../../../../src/ol/geom/Polygon.js';
import _ol_geom_MultiLineString_ from '../../../../src/ol/geom/MultiLineString.js';
import _ol_geom_MultiPoint_ from '../../../../src/ol/geom/MultiPoint.js';
import _ol_geom_MultiPolygon_ from '../../../../src/ol/geom/MultiPolygon.js';
import _ol_render_canvas_ReplayGroup_ from '../../../../src/ol/render/canvas/ReplayGroup.js';
import _ol_renderer_vector_ from '../../../../src/ol/renderer/vector.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_Icon_ from '../../../../src/ol/style/Icon.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
import _ol_Feature_ from '../../../../src/ol/Feature.js';
describe('ol.renderer.vector', function() {
@@ -24,15 +22,15 @@ describe('ol.renderer.vector', function() {
var iconStyleLoadSpy;
beforeEach(function() {
replayGroup = new ol.render.canvas.ReplayGroup(1);
feature = new ol.Feature();
iconStyle = new ol.style.Icon({
replayGroup = new _ol_render_canvas_ReplayGroup_(1);
feature = new _ol_Feature_();
iconStyle = new _ol_style_Icon_({
src: 'http://example.com/icon.png'
});
style = new ol.style.Style({
style = new _ol_style_Style_({
image: iconStyle,
fill: new ol.style.Fill({}),
stroke: new ol.style.Stroke({})
fill: new _ol_style_Fill_({}),
stroke: new _ol_style_Stroke_({})
});
squaredTolerance = 1;
listener = function() {};
@@ -52,20 +50,20 @@ describe('ol.renderer.vector', function() {
var listeners;
// call #1
ol.renderer.vector.renderFeature(replayGroup, feature,
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(iconStyleLoadSpy.calledOnce).to.be.ok();
listeners = ol.events.getListeners(
listeners = _ol_events_.getListeners(
iconStyle.iconImage_, 'change');
expect(listeners.length).to.eql(1);
// call #2
ol.renderer.vector.renderFeature(replayGroup, feature,
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(iconStyleLoadSpy.calledOnce).to.be.ok();
listeners = ol.events.getListeners(
listeners = _ol_events_.getListeners(
iconStyle.iconImage_, 'change');
expect(listeners.length).to.eql(1);
});
@@ -75,12 +73,12 @@ describe('ol.renderer.vector', function() {
describe('call renderFeature with a loading icon', function() {
it('does not render the point', function() {
feature.setGeometry(new ol.geom.Point([0, 0]));
feature.setGeometry(new _ol_geom_Point_([0, 0]));
var imageReplay = replayGroup.getReplay(
style.getZIndex(), 'Image');
var setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle');
var drawPointSpy = sinon.stub(imageReplay, 'drawPoint').callsFake(ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
var drawPointSpy = sinon.stub(imageReplay, 'drawPoint').callsFake(_ol_.nullFunction);
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setImageStyleSpy.called).to.be(false);
setImageStyleSpy.restore();
@@ -88,12 +86,12 @@ describe('ol.renderer.vector', function() {
});
it('does not render the multipoint', function() {
feature.setGeometry(new ol.geom.MultiPoint([[0, 0], [1, 1]]));
feature.setGeometry(new _ol_geom_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(ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
var drawMultiPointSpy = sinon.stub(imageReplay, 'drawMultiPoint').callsFake(_ol_.nullFunction);
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setImageStyleSpy.called).to.be(false);
setImageStyleSpy.restore();
@@ -101,13 +99,13 @@ describe('ol.renderer.vector', function() {
});
it('does render the linestring', function() {
feature.setGeometry(new ol.geom.LineString([[0, 0], [1, 1]]));
feature.setGeometry(new _ol_geom_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(ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
var drawLineStringSpy = sinon.stub(lineStringReplay, 'drawLineString').callsFake(_ol_.nullFunction);
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
expect(drawLineStringSpy.called).to.be(true);
@@ -116,13 +114,13 @@ describe('ol.renderer.vector', function() {
});
it('does render the multilinestring', function() {
feature.setGeometry(new ol.geom.MultiLineString([[[0, 0], [1, 1]]]));
feature.setGeometry(new _ol_geom_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(ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
var drawMultiLineStringSpy = sinon.stub(lineStringReplay, 'drawMultiLineString').callsFake(_ol_.nullFunction);
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
expect(drawMultiLineStringSpy.called).to.be(true);
@@ -131,14 +129,14 @@ describe('ol.renderer.vector', function() {
});
it('does render the polygon', function() {
feature.setGeometry(new ol.geom.Polygon(
feature.setGeometry(new _ol_geom_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(ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
var drawPolygonSpy = sinon.stub(polygonReplay, 'drawPolygon').callsFake(_ol_.nullFunction);
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
expect(drawPolygonSpy.called).to.be(true);
@@ -147,14 +145,14 @@ describe('ol.renderer.vector', function() {
});
it('does render the multipolygon', function() {
feature.setGeometry(new ol.geom.MultiPolygon(
feature.setGeometry(new _ol_geom_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(ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature,
var drawMultiPolygonSpy = sinon.stub(polygonReplay, 'drawMultiPolygon').callsFake(_ol_.nullFunction);
_ol_renderer_vector_.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true);
expect(drawMultiPolygonSpy.called).to.be(true);

30
test/spec/ol/renderer/webgl/imagelayer.test.js
View File

@@ -1,10 +1,8 @@
goog.require('ol.transform');
goog.require('ol.Map');
goog.require('ol.layer.Image');
goog.require('ol.source.Image');
goog.require('ol.renderer.webgl.ImageLayer');
import _ol_transform_ from '../../../../../src/ol/transform.js';
import _ol_Map_ from '../../../../../src/ol/Map.js';
import _ol_layer_Image_ from '../../../../../src/ol/layer/Image.js';
import _ol_source_Image_ from '../../../../../src/ol/source/Image.js';
import _ol_renderer_webgl_ImageLayer_ from '../../../../../src/ol/renderer/webgl/ImageLayer.js';
describe('ol.renderer.webgl.ImageLayer', function() {
@@ -20,15 +18,15 @@ describe('ol.renderer.webgl.ImageLayer', function() {
var imageExtent;
beforeEach(function() {
map = new ol.Map({
map = new _ol_Map_({
target: document.createElement('div')
});
var layer = new ol.layer.Image({
source: new ol.source.Image({
var layer = new _ol_layer_Image_({
source: new _ol_source_Image_({
extent: [0, 0, 1, 1]
})
});
renderer = new ol.renderer.webgl.ImageLayer(map.renderer_, layer);
renderer = new _ol_renderer_webgl_ImageLayer_(map.renderer_, layer);
// input params
canvasWidth = 512;
@@ -54,23 +52,23 @@ describe('ol.renderer.webgl.ImageLayer', function() {
pixelRatio, viewCenter, viewResolution, viewRotation, imageExtent);
var matrix = renderer.getProjectionMatrix();
var output = ol.transform.apply(matrix, [-1, -1]);
var output = _ol_transform_.apply(matrix, [-1, -1]);
expect(output[0]).to.eql(-6);
expect(output[1]).to.eql(-6);
output = ol.transform.apply(matrix, [1, -1]);
output = _ol_transform_.apply(matrix, [1, -1]);
expect(output[0]).to.eql(2);
expect(output[1]).to.eql(-6);
output = ol.transform.apply(matrix, [-1, 1]);
output = _ol_transform_.apply(matrix, [-1, 1]);
expect(output[0]).to.eql(-6);
expect(output[1]).to.eql(6);
output = ol.transform.apply(matrix, [1, 1]);
output = _ol_transform_.apply(matrix, [1, 1]);
expect(output[0]).to.eql(2);
expect(output[1]).to.eql(6);
output = ol.transform.apply(matrix, [0, 0]);
output = _ol_transform_.apply(matrix, [0, 0]);
expect(output[0]).to.eql(-2);
expect(output[1]).to.eql(0);
});