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
test/spec/ol/layer/group.test.js
+60 -62
View File
@@ -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]);
test/spec/ol/layer/heatmap.test.js
+3 -5
View File
@@ -1,6 +1,4 @@
goog.require('ol.layer.Heatmap');
import _ol_layer_Heatmap_ from '../../../../src/ol/layer/Heatmap.js';
describe('ol.layer.Heatmap', function() {
@@ -8,8 +6,8 @@ describe('ol.layer.Heatmap', function() {
describe('constructor', function() {
it('can be constructed without arguments', function() {
var instance = new ol.layer.Heatmap();
expect(instance).to.be.an(ol.layer.Heatmap);
var instance = new _ol_layer_Heatmap_();
expect(instance).to.be.an(_ol_layer_Heatmap_);
});
});
test/spec/ol/layer/layer.test.js
+60 -62
View File
@@ -1,11 +1,9 @@
goog.require('ol');
goog.require('ol.Map');
goog.require('ol.layer.Layer');
goog.require('ol.proj');
goog.require('ol.render.Event');
goog.require('ol.source.Source');
import _ol_ from '../../../../src/ol.js';
import _ol_Map_ from '../../../../src/ol/Map.js';
import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
import _ol_proj_ from '../../../../src/ol/proj.js';
import _ol_render_Event_ from '../../../../src/ol/render/Event.js';
import _ol_source_Source_ from '../../../../src/ol/source/Source.js';
describe('ol.layer.Layer', function() {
@@ -15,9 +13,9 @@ describe('ol.layer.Layer', function() {
var layer;
beforeEach(function() {
layer = new ol.layer.Layer({
source: new ol.source.Source({
projection: ol.proj.get('EPSG:4326')
layer = new _ol_layer_Layer_({
source: new _ol_source_Source_({
projection: _ol_proj_.get('EPSG:4326')
})
});
});
@@ -27,7 +25,7 @@ describe('ol.layer.Layer', function() {
});
it('creates an instance', function() {
expect(layer).to.be.a(ol.layer.Layer);
expect(layer).to.be.a(_ol_layer_Layer_);
});
it('provides default opacity', function() {
@@ -65,9 +63,9 @@ describe('ol.layer.Layer', function() {
describe('constructor (options)', function() {
it('accepts options', function() {
var layer = new ol.layer.Layer({
source: new ol.source.Source({
projection: ol.proj.get('EPSG:4326')
var layer = new _ol_layer_Layer_({
source: new _ol_source_Source_({
projection: _ol_proj_.get('EPSG:4326')
}),
opacity: 0.5,
visible: false,
@@ -103,9 +101,9 @@ describe('ol.layer.Layer', function() {
var layer;
beforeEach(function() {
layer = new ol.layer.Layer({
source: new ol.source.Source({
projection: ol.proj.get('EPSG:4326')
layer = new _ol_layer_Layer_({
source: new _ol_source_Source_({
projection: _ol_proj_.get('EPSG:4326')
})
});
});
@@ -119,7 +117,7 @@ describe('ol.layer.Layer', function() {
layer.setMinResolution(3);
layer.setMaxResolution(5);
var layerState = layer.getLayerState();
expect(ol.layer.Layer.visibleAtResolution(layerState, 4)).to.be(false);
expect(_ol_layer_Layer_.visibleAtResolution(layerState, 4)).to.be(false);
});
it('returns false if resolution lower than minResolution', function() {
@@ -127,7 +125,7 @@ describe('ol.layer.Layer', function() {
layer.setMinResolution(3);
layer.setMaxResolution(5);
var layerState = layer.getLayerState();
expect(ol.layer.Layer.visibleAtResolution(layerState, 2)).to.be(false);
expect(_ol_layer_Layer_.visibleAtResolution(layerState, 2)).to.be(false);
});
it('returns false if resolution greater than maxResolution', function() {
@@ -135,7 +133,7 @@ describe('ol.layer.Layer', function() {
layer.setMinResolution(3);
layer.setMaxResolution(5);
var layerState = layer.getLayerState();
expect(ol.layer.Layer.visibleAtResolution(layerState, 6)).to.be(false);
expect(_ol_layer_Layer_.visibleAtResolution(layerState, 6)).to.be(false);
});
it('returns true otherwise', function() {
@@ -143,7 +141,7 @@ describe('ol.layer.Layer', function() {
layer.setMinResolution(3);
layer.setMaxResolution(5);
var layerState = layer.getLayerState();
expect(ol.layer.Layer.visibleAtResolution(layerState, 4)).to.be(true);
expect(_ol_layer_Layer_.visibleAtResolution(layerState, 4)).to.be(true);
});
});
@@ -153,9 +151,9 @@ describe('ol.layer.Layer', function() {
var layer;
beforeEach(function() {
layer = new ol.layer.Layer({
source: new ol.source.Source({
projection: ol.proj.get('EPSG:4326')
layer = new _ol_layer_Layer_({
source: new _ol_source_Source_({
projection: _ol_proj_.get('EPSG:4326')
})
});
});
@@ -218,47 +216,47 @@ describe('ol.layer.Layer', function() {
describe('#getSource', function() {
it('gets the layer source', function() {
var source = new ol.source.Source({projection: ol.proj.get('EPSG:4326')});
var layer = new ol.layer.Layer({source: source});
var source = new _ol_source_Source_({projection: _ol_proj_.get('EPSG:4326')});
var layer = new _ol_layer_Layer_({source: source});
expect(layer.getSource()).to.be(source);
});
});
describe('#set("source", source)', function() {
var projection = ol.proj.get('EPSG:4326');
var projection = _ol_proj_.get('EPSG:4326');
it('sets the layer source', function() {
var layer = new ol.layer.Layer({
source: new ol.source.Source({projection: projection})
var layer = new _ol_layer_Layer_({
source: new _ol_source_Source_({projection: projection})
});
var source = new ol.source.Source({projection: projection});
var source = new _ol_source_Source_({projection: projection});
layer.set('source', source);
expect(layer.getSource()).to.be(source);
});
it('calls changed', function() {
var layer = new ol.layer.Layer({
source: new ol.source.Source({projection: projection})
var layer = new _ol_layer_Layer_({
source: new _ol_source_Source_({projection: projection})
});
sinon.spy(layer, 'changed');
var source = new ol.source.Source({projection: projection});
var source = new _ol_source_Source_({projection: projection});
layer.set('source', source);
expect(layer.changed.calledOnce).to.be(true);
});
it('sets up event listeners', function() {
sinon.spy(ol.layer.Layer.prototype, 'handleSourceChange_');
sinon.spy(_ol_layer_Layer_.prototype, 'handleSourceChange_');
var first = new ol.source.Source({projection: projection});
var layer = new ol.layer.Layer({source: first});
var first = new _ol_source_Source_({projection: projection});
var layer = new _ol_layer_Layer_({source: first});
first.setState('ready');
expect(layer.handleSourceChange_.calledOnce).to.be(true);
var second = new ol.source.Source({projection: projection});
var second = new _ol_source_Source_({projection: projection});
layer.set('source', second);
expect(layer.handleSourceChange_.calledOnce).to.be(true);
@@ -266,45 +264,45 @@ describe('ol.layer.Layer', function() {
expect(layer.handleSourceChange_.callCount).to.be(2);
// remove spy
ol.layer.Layer.prototype.handleSourceChange_.restore();
_ol_layer_Layer_.prototype.handleSourceChange_.restore();
});
});
describe('#setSource()', function() {
var projection = ol.proj.get('EPSG:4326');
var projection = _ol_proj_.get('EPSG:4326');
it('sets the layer source', function() {
var layer = new ol.layer.Layer({
source: new ol.source.Source({projection: projection})
var layer = new _ol_layer_Layer_({
source: new _ol_source_Source_({projection: projection})
});
var source = new ol.source.Source({projection: projection});
var source = new _ol_source_Source_({projection: projection});
layer.setSource(source);
expect(layer.getSource()).to.be(source);
});
it('calls changed', function() {
var layer = new ol.layer.Layer({
source: new ol.source.Source({projection: projection})
var layer = new _ol_layer_Layer_({
source: new _ol_source_Source_({projection: projection})
});
sinon.spy(layer, 'changed');
var source = new ol.source.Source({projection: projection});
var source = new _ol_source_Source_({projection: projection});
layer.setSource(source);
expect(layer.changed.calledOnce).to.be(true);
});
it('sets up event listeners', function() {
sinon.spy(ol.layer.Layer.prototype, 'handleSourceChange_');
sinon.spy(_ol_layer_Layer_.prototype, 'handleSourceChange_');
var first = new ol.source.Source({projection: projection});
var layer = new ol.layer.Layer({source: first});
var first = new _ol_source_Source_({projection: projection});
var layer = new _ol_layer_Layer_({source: first});
first.setState('ready');
expect(layer.handleSourceChange_.calledOnce).to.be(true);
var second = new ol.source.Source({projection: projection});
var second = new _ol_source_Source_({projection: projection});
layer.setSource(second);
expect(layer.handleSourceChange_.calledOnce).to.be(true);
@@ -312,7 +310,7 @@ describe('ol.layer.Layer', function() {
expect(layer.handleSourceChange_.callCount).to.be(2);
// remove spy
ol.layer.Layer.prototype.handleSourceChange_.restore();
_ol_layer_Layer_.prototype.handleSourceChange_.restore();
});
});
@@ -323,9 +321,9 @@ describe('ol.layer.Layer', function() {
var layer;
beforeEach(function() {
layer = new ol.layer.Layer({
source: new ol.source.Source({
projection: ol.proj.get('EPSG:4326')
layer = new _ol_layer_Layer_({
source: new _ol_source_Source_({
projection: _ol_proj_.get('EPSG:4326')
})
});
});
@@ -353,9 +351,9 @@ describe('ol.layer.Layer', function() {
var layer;
beforeEach(function() {
layer = new ol.layer.Layer({
source: new ol.source.Source({
projection: ol.proj.get('EPSG:4326')
layer = new _ol_layer_Layer_({
source: new _ol_source_Source_({
projection: _ol_proj_.get('EPSG:4326')
})
});
});
@@ -389,24 +387,24 @@ describe('ol.layer.Layer', function() {
var map;
beforeEach(function() {
map = new ol.Map({});
map = new _ol_Map_({});
});
describe('with map in constructor options', function() {
it('renders the layer', function() {
var layer = new ol.layer.Layer({
var layer = new _ol_layer_Layer_({
map: map
});
var frameState = {
layerStatesArray: [],
layerStates: {}
};
map.dispatchEvent(new ol.render.Event('precompose', null,
map.dispatchEvent(new _ol_render_Event_('precompose', null,
frameState, null, null));
expect(frameState.layerStatesArray.length).to.be(1);
var layerState = frameState.layerStatesArray[0];
expect(layerState.layer).to.equal(layer);
expect(frameState.layerStates[ol.getUid(layer)]).to.equal(layerState);
expect(frameState.layerStates[_ol_.getUid(layer)]).to.equal(layerState);
});
});
@@ -422,7 +420,7 @@ describe('ol.layer.Layer', function() {
});
it('requests a render frame', function() {
var layer = new ol.layer.Layer({});
var layer = new _ol_layer_Layer_({});
layer.setMap(map);
expect(mapRenderSpy.callCount).to.be(1);
test/spec/ol/layer/tile.test.js
+5 -7
View File
@@ -1,7 +1,5 @@
goog.require('ol.layer.Tile');
goog.require('ol.source.OSM');
import _ol_layer_Tile_ from '../../../../src/ol/layer/Tile.js';
import _ol_source_OSM_ from '../../../../src/ol/source/OSM.js';
describe('ol.layer.Tile', function() {
@@ -11,8 +9,8 @@ describe('ol.layer.Tile', function() {
var layer;
beforeEach(function() {
layer = new ol.layer.Tile({
source: new ol.source.OSM()
layer = new _ol_layer_Tile_({
source: new _ol_source_OSM_()
});
});
@@ -21,7 +19,7 @@ describe('ol.layer.Tile', function() {
});
it('creates an instance', function() {
expect(layer).to.be.a(ol.layer.Tile);
expect(layer).to.be.a(_ol_layer_Tile_);
});
it('provides default preload', function() {
test/spec/ol/layer/vector.test.js
+23 -25
View File
@@ -1,25 +1,23 @@
goog.require('ol.layer.Layer');
goog.require('ol.layer.Vector');
goog.require('ol.source.Vector');
goog.require('ol.style.Style');
import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
describe('ol.layer.Vector', function() {
describe('constructor', function() {
var source = new ol.source.Vector();
var style = new ol.style.Style();
var source = new _ol_source_Vector_();
var style = new _ol_style_Style_();
it('creates a new layer', function() {
var layer = new ol.layer.Vector({source: source});
expect(layer).to.be.a(ol.layer.Vector);
expect(layer).to.be.a(ol.layer.Layer);
var layer = new _ol_layer_Vector_({source: source});
expect(layer).to.be.a(_ol_layer_Vector_);
expect(layer).to.be.a(_ol_layer_Layer_);
});
it('accepts a style option with a single style', function() {
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: source,
style: style
});
@@ -29,7 +27,7 @@ describe('ol.layer.Vector', function() {
});
it('accepts a style option with an array of styles', function() {
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: source,
style: [style]
});
@@ -39,7 +37,7 @@ describe('ol.layer.Vector', function() {
});
it('accepts a style option with a style function', function() {
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: source,
style: function(feature, resolution) {
return [style];
@@ -57,10 +55,10 @@ describe('ol.layer.Vector', function() {
var layer, style;
beforeEach(function() {
layer = new ol.layer.Vector({
source: new ol.source.Vector()
layer = new _ol_layer_Vector_({
source: new _ol_source_Vector_()
});
style = new ol.style.Style();
style = new _ol_style_Style_();
});
it('allows the style to be set after construction', function() {
@@ -76,10 +74,10 @@ describe('ol.layer.Vector', function() {
});
it('updates the internal style function', function() {
expect(layer.getStyleFunction()).to.be(ol.style.Style.defaultFunction);
expect(layer.getStyleFunction()).to.be(_ol_style_Style_.defaultFunction);
layer.setStyle(style);
expect(layer.getStyleFunction()).not.to.be(
ol.style.Style.defaultFunction);
_ol_style_Style_.defaultFunction);
});
it('allows setting an null style', function() {
@@ -91,23 +89,23 @@ describe('ol.layer.Vector', function() {
it('sets the default style when passing undefined', function() {
layer.setStyle(style);
layer.setStyle(undefined);
expect(layer.getStyle()).to.be(ol.style.Style.defaultFunction);
expect(layer.getStyleFunction()).to.be(ol.style.Style.defaultFunction);
expect(layer.getStyle()).to.be(_ol_style_Style_.defaultFunction);
expect(layer.getStyleFunction()).to.be(_ol_style_Style_.defaultFunction);
});
});
describe('#getStyle()', function() {
var source = new ol.source.Vector();
var style = new ol.style.Style();
var source = new _ol_source_Vector_();
var style = new _ol_style_Style_();
it('returns what is provided to setStyle', function() {
var layer = new ol.layer.Vector({
var layer = new _ol_layer_Vector_({
source: source
});
expect(layer.getStyle()).to.be(ol.style.Style.defaultFunction);
expect(layer.getStyle()).to.be(_ol_style_Style_.defaultFunction);
layer.setStyle(style);
expect(layer.getStyle()).to.be(style);
test/spec/ol/layer/vectortile.test.js
+11 -13
View File
@@ -1,7 +1,5 @@
goog.require('ol.layer.VectorTile');
goog.require('ol.source.VectorTile');
import _ol_layer_VectorTile_ from '../../../../src/ol/layer/VectorTile.js';
import _ol_source_VectorTile_ from '../../../../src/ol/source/VectorTile.js';
describe('ol.layer.VectorTile', function() {
@@ -11,8 +9,8 @@ describe('ol.layer.VectorTile', function() {
var layer;
beforeEach(function() {
layer = new ol.layer.VectorTile({
source: new ol.source.VectorTile({})
layer = new _ol_layer_VectorTile_({
source: new _ol_source_VectorTile_({})
});
});
@@ -21,7 +19,7 @@ describe('ol.layer.VectorTile', function() {
});
it('creates an instance', function() {
expect(layer).to.be.a(ol.layer.VectorTile);
expect(layer).to.be.a(_ol_layer_VectorTile_);
});
it('provides default preload', function() {
@@ -40,20 +38,20 @@ describe('ol.layer.VectorTile', function() {
describe('constructor (options)', function() {
it('works with options', function() {
var layer = new ol.layer.VectorTile({
var layer = new _ol_layer_VectorTile_({
renderMode: 'vector',
source: new ol.source.VectorTile({})
source: new _ol_source_VectorTile_({})
});
expect(layer.getRenderMode()).to.be('vector');
layer = new ol.layer.VectorTile({
layer = new _ol_layer_VectorTile_({
renderMode: 'image',
source: new ol.source.VectorTile({})
source: new _ol_source_VectorTile_({})
});
expect(layer.getRenderMode()).to.be('image');
expect(function() {
layer = new ol.layer.VectorTile({
layer = new _ol_layer_VectorTile_({
renderMode: 'foo',
source: new ol.source.VectorTile({})
source: new _ol_source_VectorTile_({})
});
}).to.throwException();
});