Give precedence to feature style

This commit is contained in:
Antoine Abt
2014-07-10 12:11:02 +02:00
parent 0b9936107d
commit 60f1874766
14 changed files with 172 additions and 176 deletions

View File

@@ -1,5 +1,7 @@
goog.provide('ol.test.layer.Vector');
goog.require('ol.feature');
describe('ol.layer.Vector', function() {
describe('constructor', function() {
@@ -74,9 +76,10 @@ describe('ol.layer.Vector', function() {
var layer = new ol.layer.Vector({
source: source
});
expect(layer.getStyleFunction()).to.be(undefined);
expect(layer.getStyleFunction()).to.be(ol.style.defaults.styleFunction);
layer.setStyle(style);
expect(layer.getStyleFunction()).to.be.a('function');
expect(layer.getStyleFunction()).not.to.be(
ol.feature.defaultStyleFunction);
});
});
@@ -91,7 +94,7 @@ describe('ol.layer.Vector', function() {
source: source
});
expect(layer.getStyle()).to.be(null);
expect(layer.getStyle()).to.be(ol.style.defaults.styleFunction);
layer.setStyle(style);
expect(layer.getStyle()).to.be(style);
@@ -115,3 +118,4 @@ goog.require('ol.layer.Layer');
goog.require('ol.layer.Vector');
goog.require('ol.source.Vector');
goog.require('ol.style.Style');
goog.require('ol.style.defaults');