Transformed
This commit is contained in:
@@ -1,14 +1,12 @@
|
||||
|
||||
|
||||
goog.require('ol');
|
||||
goog.require('ol.array');
|
||||
goog.require('ol.Collection');
|
||||
goog.require('ol.extent');
|
||||
goog.require('ol.layer.Group');
|
||||
goog.require('ol.layer.Layer');
|
||||
goog.require('ol.obj');
|
||||
goog.require('ol.renderer.Map');
|
||||
goog.require('ol.source.Source');
|
||||
import _ol_ from '../../../../src/ol.js';
|
||||
import _ol_array_ from '../../../../src/ol/array.js';
|
||||
import _ol_Collection_ from '../../../../src/ol/Collection.js';
|
||||
import _ol_extent_ from '../../../../src/ol/extent.js';
|
||||
import _ol_layer_Group_ from '../../../../src/ol/layer/Group.js';
|
||||
import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
|
||||
import _ol_obj_ from '../../../../src/ol/obj.js';
|
||||
import _ol_renderer_Map_ from '../../../../src/ol/renderer/Map.js';
|
||||
import _ol_source_Source_ from '../../../../src/ol/source/Source.js';
|
||||
|
||||
|
||||
describe('ol.layer.Group', function() {
|
||||
@@ -18,7 +16,7 @@ describe('ol.layer.Group', function() {
|
||||
var layerGroup;
|
||||
|
||||
beforeEach(function() {
|
||||
layerGroup = new ol.layer.Group();
|
||||
layerGroup = new _ol_layer_Group_();
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
@@ -26,7 +24,7 @@ describe('ol.layer.Group', function() {
|
||||
});
|
||||
|
||||
it('creates an instance', function() {
|
||||
expect(layerGroup).to.be.a(ol.layer.Group);
|
||||
expect(layerGroup).to.be.a(_ol_layer_Group_);
|
||||
});
|
||||
|
||||
it('provides default opacity', function() {
|
||||
@@ -52,7 +50,7 @@ describe('ol.layer.Group', function() {
|
||||
});
|
||||
|
||||
it('provides default empty layers collection', function() {
|
||||
expect(layerGroup.getLayers()).to.be.a(ol.Collection);
|
||||
expect(layerGroup.getLayers()).to.be.a(_ol_Collection_);
|
||||
expect(layerGroup.getLayers().getLength()).to.be(0);
|
||||
});
|
||||
|
||||
@@ -62,12 +60,12 @@ describe('ol.layer.Group', function() {
|
||||
|
||||
var layer, group, listener;
|
||||
beforeEach(function() {
|
||||
layer = new ol.layer.Layer({
|
||||
source: new ol.source.Source({
|
||||
layer = new _ol_layer_Layer_({
|
||||
source: new _ol_source_Source_({
|
||||
projection: 'EPSG:4326'
|
||||
})
|
||||
});
|
||||
group = new ol.layer.Group({
|
||||
group = new _ol_layer_Group_({
|
||||
layers: [layer]
|
||||
});
|
||||
listener = sinon.spy();
|
||||
@@ -101,12 +99,12 @@ describe('ol.layer.Group', function() {
|
||||
|
||||
var layer, group, listener;
|
||||
beforeEach(function() {
|
||||
layer = new ol.layer.Layer({
|
||||
source: new ol.source.Source({
|
||||
layer = new _ol_layer_Layer_({
|
||||
source: new _ol_source_Source_({
|
||||
projection: 'EPSG:4326'
|
||||
})
|
||||
});
|
||||
group = new ol.layer.Group({
|
||||
group = new _ol_layer_Group_({
|
||||
layers: [layer]
|
||||
});
|
||||
listener = sinon.spy();
|
||||
@@ -139,12 +137,12 @@ describe('ol.layer.Group', function() {
|
||||
describe('constructor (options)', function() {
|
||||
|
||||
it('accepts options', function() {
|
||||
var layer = new ol.layer.Layer({
|
||||
source: new ol.source.Source({
|
||||
var layer = new _ol_layer_Layer_({
|
||||
source: new _ol_source_Source_({
|
||||
projection: 'EPSG:4326'
|
||||
})
|
||||
});
|
||||
var layerGroup = new ol.layer.Group({
|
||||
var layerGroup = new _ol_layer_Group_({
|
||||
layers: [layer],
|
||||
opacity: 0.5,
|
||||
visible: false,
|
||||
@@ -168,7 +166,7 @@ describe('ol.layer.Group', function() {
|
||||
maxResolution: 500,
|
||||
minResolution: 0.25
|
||||
});
|
||||
expect(layerGroup.getLayers()).to.be.a(ol.Collection);
|
||||
expect(layerGroup.getLayers()).to.be.a(_ol_Collection_);
|
||||
expect(layerGroup.getLayers().getLength()).to.be(1);
|
||||
expect(layerGroup.getLayers().item(0)).to.be(layer);
|
||||
|
||||
@@ -177,14 +175,14 @@ describe('ol.layer.Group', function() {
|
||||
});
|
||||
|
||||
it('accepts an extent option', function() {
|
||||
var layer = new ol.layer.Layer({
|
||||
source: new ol.source.Source({
|
||||
var layer = new _ol_layer_Layer_({
|
||||
source: new _ol_source_Source_({
|
||||
projection: 'EPSG:4326'
|
||||
})
|
||||
});
|
||||
|
||||
var groupExtent = [-10, -5, 10, 5];
|
||||
var layerGroup = new ol.layer.Group({
|
||||
var layerGroup = new _ol_layer_Group_({
|
||||
layers: [layer],
|
||||
opacity: 0.5,
|
||||
visible: false,
|
||||
@@ -209,7 +207,7 @@ describe('ol.layer.Group', function() {
|
||||
maxResolution: 500,
|
||||
minResolution: 0.25
|
||||
});
|
||||
expect(layerGroup.getLayers()).to.be.a(ol.Collection);
|
||||
expect(layerGroup.getLayers()).to.be.a(_ol_Collection_);
|
||||
expect(layerGroup.getLayers().getLength()).to.be(1);
|
||||
expect(layerGroup.getLayers().item(0)).to.be(layer);
|
||||
|
||||
@@ -223,7 +221,7 @@ describe('ol.layer.Group', function() {
|
||||
var layerGroup;
|
||||
|
||||
beforeEach(function() {
|
||||
layerGroup = new ol.layer.Group();
|
||||
layerGroup = new _ol_layer_Group_();
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
@@ -286,16 +284,16 @@ describe('ol.layer.Group', function() {
|
||||
describe('layers events', function() {
|
||||
|
||||
it('listen / unlisten for layers added to the collection', function() {
|
||||
var layers = new ol.Collection();
|
||||
var layerGroup = new ol.layer.Group({
|
||||
var layers = new _ol_Collection_();
|
||||
var layerGroup = new _ol_layer_Group_({
|
||||
layers: layers
|
||||
});
|
||||
expect(Object.keys(layerGroup.listenerKeys_).length).to.eql(0);
|
||||
var layer = new ol.layer.Layer({});
|
||||
var layer = new _ol_layer_Layer_({});
|
||||
layers.push(layer);
|
||||
expect(Object.keys(layerGroup.listenerKeys_).length).to.eql(1);
|
||||
|
||||
var listeners = layerGroup.listenerKeys_[ol.getUid(layer)];
|
||||
var listeners = layerGroup.listenerKeys_[_ol_.getUid(layer)];
|
||||
expect(listeners.length).to.eql(2);
|
||||
expect(typeof listeners[0]).to.be('object');
|
||||
expect(typeof listeners[1]).to.be('object');
|
||||
@@ -312,13 +310,13 @@ describe('ol.layer.Group', function() {
|
||||
describe('#setLayers', function() {
|
||||
|
||||
it('sets layers property', function() {
|
||||
var layer = new ol.layer.Layer({
|
||||
source: new ol.source.Source({
|
||||
var layer = new _ol_layer_Layer_({
|
||||
source: new _ol_source_Source_({
|
||||
projection: 'EPSG:4326'
|
||||
})
|
||||
});
|
||||
var layers = new ol.Collection([layer]);
|
||||
var layerGroup = new ol.layer.Group();
|
||||
var layers = new _ol_Collection_([layer]);
|
||||
var layerGroup = new _ol_layer_Group_();
|
||||
|
||||
layerGroup.setLayers(layers);
|
||||
expect(layerGroup.getLayers()).to.be(layers);
|
||||
@@ -334,7 +332,7 @@ describe('ol.layer.Group', function() {
|
||||
describe('#getLayerStatesArray', function() {
|
||||
|
||||
it('returns an empty array if no layer', function() {
|
||||
var layerGroup = new ol.layer.Group();
|
||||
var layerGroup = new _ol_layer_Group_();
|
||||
|
||||
var layerStatesArray = layerGroup.getLayerStatesArray();
|
||||
expect(layerStatesArray).to.be.a(Array);
|
||||
@@ -343,13 +341,13 @@ describe('ol.layer.Group', function() {
|
||||
layerGroup.dispose();
|
||||
});
|
||||
|
||||
var layer1 = new ol.layer.Layer({
|
||||
source: new ol.source.Source({
|
||||
var layer1 = new _ol_layer_Layer_({
|
||||
source: new _ol_source_Source_({
|
||||
projection: 'EPSG:4326'
|
||||
})
|
||||
});
|
||||
var layer2 = new ol.layer.Layer({
|
||||
source: new ol.source.Source({
|
||||
var layer2 = new _ol_layer_Layer_({
|
||||
source: new _ol_source_Source_({
|
||||
projection: 'EPSG:4326'
|
||||
}),
|
||||
opacity: 0.5,
|
||||
@@ -357,15 +355,15 @@ describe('ol.layer.Group', function() {
|
||||
maxResolution: 500,
|
||||
minResolution: 0.25
|
||||
});
|
||||
var layer3 = new ol.layer.Layer({
|
||||
source: new ol.source.Source({
|
||||
var layer3 = new _ol_layer_Layer_({
|
||||
source: new _ol_source_Source_({
|
||||
projection: 'EPSG:4326'
|
||||
}),
|
||||
extent: [-5, -2, 5, 2]
|
||||
});
|
||||
|
||||
it('does not transform layerStates by default', function() {
|
||||
var layerGroup = new ol.layer.Group({
|
||||
var layerGroup = new _ol_layer_Group_({
|
||||
layers: [layer1, layer2]
|
||||
});
|
||||
|
||||
@@ -375,9 +373,9 @@ describe('ol.layer.Group', function() {
|
||||
expect(layerStatesArray[0]).to.eql(layer1.getLayerState());
|
||||
|
||||
// layer state should match except for layer reference
|
||||
var layerState = ol.obj.assign({}, layerStatesArray[0]);
|
||||
var layerState = _ol_obj_.assign({}, layerStatesArray[0]);
|
||||
delete layerState.layer;
|
||||
var groupState = ol.obj.assign({}, layerGroup.getLayerState());
|
||||
var groupState = _ol_obj_.assign({}, layerGroup.getLayerState());
|
||||
delete groupState.layer;
|
||||
expect(layerState).to.eql(groupState);
|
||||
|
||||
@@ -388,7 +386,7 @@ describe('ol.layer.Group', function() {
|
||||
|
||||
it('uses the layer group extent if layer has no extent', function() {
|
||||
var groupExtent = [-10, -5, 10, 5];
|
||||
var layerGroup = new ol.layer.Group({
|
||||
var layerGroup = new _ol_layer_Group_({
|
||||
extent: groupExtent,
|
||||
layers: [layer1]
|
||||
});
|
||||
@@ -399,18 +397,18 @@ describe('ol.layer.Group', function() {
|
||||
|
||||
it('uses the intersection of group and child extent', function() {
|
||||
var groupExtent = [-10, -5, 10, 5];
|
||||
var layerGroup = new ol.layer.Group({
|
||||
var layerGroup = new _ol_layer_Group_({
|
||||
extent: groupExtent,
|
||||
layers: [layer3]
|
||||
});
|
||||
var layerStatesArray = layerGroup.getLayerStatesArray();
|
||||
expect(layerStatesArray[0].extent).to.eql(
|
||||
ol.extent.getIntersection(layer3.getExtent(), groupExtent));
|
||||
_ol_extent_.getIntersection(layer3.getExtent(), groupExtent));
|
||||
layerGroup.dispose();
|
||||
});
|
||||
|
||||
it('transforms layerStates correctly', function() {
|
||||
var layerGroup = new ol.layer.Group({
|
||||
var layerGroup = new _ol_layer_Group_({
|
||||
layers: [layer1, layer2],
|
||||
opacity: 0.5,
|
||||
visible: false,
|
||||
@@ -424,14 +422,14 @@ describe('ol.layer.Group', function() {
|
||||
var groupState, layerState;
|
||||
|
||||
// layer state should match except for layer reference
|
||||
layerState = ol.obj.assign({}, layerStatesArray[0]);
|
||||
layerState = _ol_obj_.assign({}, layerStatesArray[0]);
|
||||
delete layerState.layer;
|
||||
groupState = ol.obj.assign({}, layerGroup.getLayerState());
|
||||
groupState = _ol_obj_.assign({}, layerGroup.getLayerState());
|
||||
delete groupState.layer;
|
||||
expect(layerState).to.eql(groupState);
|
||||
|
||||
// layer state should be transformed (and we ignore layer reference)
|
||||
layerState = ol.obj.assign({}, layerStatesArray[1]);
|
||||
layerState = _ol_obj_.assign({}, layerStatesArray[1]);
|
||||
delete layerState.layer;
|
||||
expect(layerState).to.eql({
|
||||
opacity: 0.25,
|
||||
@@ -448,13 +446,13 @@ describe('ol.layer.Group', function() {
|
||||
});
|
||||
|
||||
it('let order of layers without Z-index unchanged', function() {
|
||||
var layerGroup = new ol.layer.Group({
|
||||
var layerGroup = new _ol_layer_Group_({
|
||||
layers: [layer1, layer2]
|
||||
});
|
||||
|
||||
var layerStatesArray = layerGroup.getLayerStatesArray();
|
||||
var initialArray = layerStatesArray.slice();
|
||||
ol.array.stableSort(layerStatesArray, ol.renderer.Map.sortByZIndex);
|
||||
_ol_array_.stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
|
||||
expect(layerStatesArray[0]).to.eql(initialArray[0]);
|
||||
expect(layerStatesArray[1]).to.eql(initialArray[1]);
|
||||
|
||||
@@ -462,27 +460,27 @@ describe('ol.layer.Group', function() {
|
||||
});
|
||||
|
||||
it('orders layer with higher Z-index on top', function() {
|
||||
var layer10 = new ol.layer.Layer({
|
||||
source: new ol.source.Source({
|
||||
var layer10 = new _ol_layer_Layer_({
|
||||
source: new _ol_source_Source_({
|
||||
projection: 'EPSG:4326'
|
||||
})
|
||||
});
|
||||
layer10.setZIndex(10);
|
||||
|
||||
var layerM1 = new ol.layer.Layer({
|
||||
source: new ol.source.Source({
|
||||
var layerM1 = new _ol_layer_Layer_({
|
||||
source: new _ol_source_Source_({
|
||||
projection: 'EPSG:4326'
|
||||
})
|
||||
});
|
||||
layerM1.setZIndex(-1);
|
||||
|
||||
var layerGroup = new ol.layer.Group({
|
||||
var layerGroup = new _ol_layer_Group_({
|
||||
layers: [layer1, layer10, layer2, layerM1]
|
||||
});
|
||||
|
||||
var layerStatesArray = layerGroup.getLayerStatesArray();
|
||||
var initialArray = layerStatesArray.slice();
|
||||
ol.array.stableSort(layerStatesArray, ol.renderer.Map.sortByZIndex);
|
||||
_ol_array_.stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
|
||||
expect(layerStatesArray[0]).to.eql(initialArray[3]);
|
||||
expect(layerStatesArray[1]).to.eql(initialArray[0]);
|
||||
expect(layerStatesArray[2]).to.eql(initialArray[2]);
|
||||
|
||||
Reference in New Issue
Block a user