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

Using ol.expression.parse

Browse Source
This commit is contained in:
Tim Schaub
2013-06-12 17:45:17 -06:00
parent 53abedaada
commit 5e309e244b
13 changed files with 145 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/style/line.test.js
+5 -5
View File
@@ -42,8 +42,8 @@ describe('ol.style.Line', function() {
it('accepts expressions', function() {
var symbolizer = new ol.style.Line({
opacity: new ol.Expression('value / 100'),
strokeWidth: ol.Expression('widthAttr')
opacity: ol.expression.parse('value / 100'),
strokeWidth: ol.expression.parse('widthAttr')
});
expect(symbolizer).to.be.a(ol.style.Line);
});
@@ -54,8 +54,8 @@ describe('ol.style.Line', function() {
it('evaluates expressions with the given feature', function() {
var symbolizer = new ol.style.Line({
opacity: new ol.Expression('value / 100'),
strokeWidth: ol.Expression('widthAttr')
opacity: ol.expression.parse('value / 100'),
strokeWidth: ol.expression.parse('widthAttr')
});
var feature = new ol.Feature({
@@ -73,7 +73,7 @@ describe('ol.style.Line', function() {
});
goog.require('ol.Expression');
goog.require('ol.Feature');
goog.require('ol.expression');
goog.require('ol.style.Line');
goog.require('ol.style.LineLiteral');
test/spec/ol/style/polygon.test.js
+5 -5
View File
@@ -45,8 +45,8 @@ describe('ol.style.Polygon', function() {
it('accepts expressions', function() {
var symbolizer = new ol.style.Polygon({
opacity: new ol.Expression('value / 100'),
fillColor: new ol.Expression('fillAttr')
opacity: ol.expression.parse('value / 100'),
fillColor: ol.expression.parse('fillAttr')
});
expect(symbolizer).to.be.a(ol.style.Polygon);
});
@@ -57,8 +57,8 @@ describe('ol.style.Polygon', function() {
it('evaluates expressions with the given feature', function() {
var symbolizer = new ol.style.Polygon({
opacity: new ol.Expression('value / 100'),
fillColor: new ol.Expression('fillAttr')
opacity: ol.expression.parse('value / 100'),
fillColor: ol.expression.parse('fillAttr')
});
var feature = new ol.Feature({
@@ -89,7 +89,7 @@ describe('ol.style.Polygon', function() {
});
goog.require('ol.Expression');
goog.require('ol.Feature');
goog.require('ol.expression');
goog.require('ol.style.Polygon');
goog.require('ol.style.PolygonLiteral');
test/spec/ol/style/shape.test.js
+7 -7
View File
@@ -51,8 +51,8 @@ describe('ol.style.Shape', function() {
it('accepts expressions', function() {
var symbolizer = new ol.style.Shape({
size: new ol.Expression('sizeAttr'),
strokeColor: new ol.Expression('color')
size: ol.expression.parse('sizeAttr'),
strokeColor: ol.expression.parse('color')
});
expect(symbolizer).to.be.a(ol.style.Shape);
});
@@ -63,8 +63,8 @@ describe('ol.style.Shape', function() {
it('evaluates expressions with the given feature', function() {
var symbolizer = new ol.style.Shape({
size: new ol.Expression('sizeAttr'),
opacity: new ol.Expression('opacityAttr'),
size: ol.expression.parse('sizeAttr'),
opacity: ol.expression.parse('opacityAttr'),
fillColor: '#BADA55'
});
@@ -99,8 +99,8 @@ describe('ol.style.Shape', function() {
it('applies default type if none provided', function() {
var symbolizer = new ol.style.Shape({
size: new ol.Expression('sizeAttr'),
opacity: new ol.Expression('opacityAttr'),
size: ol.expression.parse('sizeAttr'),
opacity: ol.expression.parse('opacityAttr'),
fillColor: '#BADA55'
});
@@ -119,8 +119,8 @@ describe('ol.style.Shape', function() {
});
goog.require('ol.Expression');
goog.require('ol.Feature');
goog.require('ol.expression');
goog.require('ol.style.Shape');
goog.require('ol.style.ShapeLiteral');
goog.require('ol.style.ShapeType');