Transformed
This commit is contained in:
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user