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

Merge pull request #3010 from ahocevar/style-geometry

Browse Source 
Allow styles to override feature geometries
This commit is contained in:
Andreas Hocevar
2014-12-18 10:45:50 +01:00
parent e95a350203 784701641d
commit fe0e17fdaf
8 changed files with 384 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
test/spec/ol/style.test.js
View File

@@ -11,6 +11,53 @@ describe('ol.style.Style', function() {
expect(style.getZIndex()).to.be(0.7);
});
});
describe('#setGeometry', function() {
var style = new ol.style.Style();
it('creates a geometry function from a string', function() {
var feature = new ol.Feature();
feature.set('myGeom', new ol.geom.Point([0, 0]));
style.setGeometry('myGeom');
expect(style.getGeometryFunction()(feature))
.to.eql(feature.get('myGeom'));
});
it('creates a geometry function from a geometry', function() {
var geom = new ol.geom.Point([0, 0]);
style.setGeometry(geom);
expect(style.getGeometryFunction()())
.to.eql(geom);
});
it('returns the configured geometry function', function() {
var geom = new ol.geom.Point([0, 0]);
style.setGeometry(function() {
return geom;
});
expect(style.getGeometryFunction()())
.to.eql(geom);
});
});
describe('#getGeometry', function() {
it('returns whatever was passed to setGeometry', function() {
var style = new ol.style.Style();
style.setGeometry('foo');
expect(style.getGeometry()).to.eql('foo');
var geom = new ol.geom.Point([1, 2]);
style.setGeometry(geom);
expect(style.getGeometry()).to.eql(geom);
var fn = function() { return geom; };
style.setGeometry(fn);
expect(style.getGeometry()).to.eql(fn);
style.setGeometry(null);
expect(style.getGeometry()).to.eql(null);
});
});
});
describe('ol.style.createStyleFunction()', function() {
@@ -42,4 +89,6 @@ describe('ol.style.createStyleFunction()', function() {
});
goog.require('ol.Feature');
goog.require('ol.geom.Point');
goog.require('ol.style.Style');