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

Accept an expression string for rule filter

Browse Source
This commit is contained in:
Tim Schaub
2013-06-17 17:30:44 -06:00
parent 38b784d672
commit a663d8fcae
6 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/spec/ol/style/rule.test.js
View File

@@ -13,14 +13,14 @@ describe('ol.style.Rule', function() {
it('returns false when the rule does not apply', function() {
rule = new ol.style.Rule({
filter: new ol.filter.Filter(function() { return false; })
filter: new ol.expression.Literal(false)
});
expect(rule.applies(feature)).to.be(false);
});
it('returns true when the rule applies', function() {
rule = new ol.style.Rule({
filter: new ol.filter.Filter(function() { return true; })
filter: new ol.expression.Literal(true)
});
expect(rule.applies(feature)).to.be(true);
});
@@ -29,5 +29,5 @@ describe('ol.style.Rule', function() {
});
goog.require('ol.Feature');
goog.require('ol.filter.Filter');
goog.require('ol.expression.Literal');
goog.require('ol.style.Rule');

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

@@ -9,9 +9,7 @@ describe('ol.style.Style', function() {
var style = new ol.style.Style({
rules: [
new ol.style.Rule({
filter: new ol.filter.Filter(function(feature) {
return feature.get('foo') == 'bar';
}),
filter: 'foo == "bar"',
symbolizers: [
new ol.style.Shape({
size: 4,
@@ -66,7 +64,6 @@ goog.require('ol.Feature');
goog.require('ol.geom.LineString');
goog.require('ol.geom.Point');
goog.require('ol.geom.Polygon');
goog.require('ol.filter.Filter');
goog.require('ol.style.Rule');
goog.require('ol.style.Shape');
goog.require('ol.style.ShapeLiteral');