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

Rename ol.expression to ol.expr

Browse Source
This commit is contained in:
Tim Schaub
2013-06-21 17:29:16 -06:00
parent 9928730bd3
commit 2577d3f7d6
28 changed files with 1550 additions and 1548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/spec/ol/style/line.test.js
View File

@@ -42,8 +42,8 @@ describe('ol.style.Line', function() {
it('accepts expressions', function() {
var symbolizer = new ol.style.Line({
opacity: ol.expression.parse('value / 100'),
strokeWidth: ol.expression.parse('widthAttr')
opacity: ol.expr.parse('value / 100'),
strokeWidth: ol.expr.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: ol.expression.parse('value / 100'),
strokeWidth: ol.expression.parse('widthAttr')
opacity: ol.expr.parse('value / 100'),
strokeWidth: ol.expr.parse('widthAttr')
});
var feature = new ol.Feature({
@@ -74,6 +74,6 @@ describe('ol.style.Line', function() {
});
goog.require('ol.Feature');
goog.require('ol.expression');
goog.require('ol.expr');
goog.require('ol.style.Line');
goog.require('ol.style.LineLiteral');

10
test/spec/ol/style/polygon.test.js
View File

@@ -45,8 +45,8 @@ describe('ol.style.Polygon', function() {
it('accepts expressions', function() {
var symbolizer = new ol.style.Polygon({
opacity: ol.expression.parse('value / 100'),
fillColor: ol.expression.parse('fillAttr')
opacity: ol.expr.parse('value / 100'),
fillColor: ol.expr.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: ol.expression.parse('value / 100'),
fillColor: ol.expression.parse('fillAttr')
opacity: ol.expr.parse('value / 100'),
fillColor: ol.expr.parse('fillAttr')
});
var feature = new ol.Feature({
@@ -90,6 +90,6 @@ describe('ol.style.Polygon', function() {
});
goog.require('ol.Feature');
goog.require('ol.expression');
goog.require('ol.expr');
goog.require('ol.style.Polygon');
goog.require('ol.style.PolygonLiteral');

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.expression.Literal(false)
filter: new ol.expr.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.expression.Literal(true)
filter: new ol.expr.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.expression.Literal');
goog.require('ol.expr.Literal');
goog.require('ol.style.Rule');

14
test/spec/ol/style/shape.test.js
View File

@@ -51,8 +51,8 @@ describe('ol.style.Shape', function() {
it('accepts expressions', function() {
var symbolizer = new ol.style.Shape({
size: ol.expression.parse('sizeAttr'),
strokeColor: ol.expression.parse('color')
size: ol.expr.parse('sizeAttr'),
strokeColor: ol.expr.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: ol.expression.parse('sizeAttr'),
opacity: ol.expression.parse('opacityAttr'),
size: ol.expr.parse('sizeAttr'),
opacity: ol.expr.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: ol.expression.parse('sizeAttr'),
opacity: ol.expression.parse('opacityAttr'),
size: ol.expr.parse('sizeAttr'),
opacity: ol.expr.parse('opacityAttr'),
fillColor: '#BADA55'
});
@@ -120,7 +120,7 @@ describe('ol.style.Shape', function() {
});
goog.require('ol.Feature');
goog.require('ol.expression');
goog.require('ol.expr');
goog.require('ol.style.Shape');
goog.require('ol.style.ShapeLiteral');
goog.require('ol.style.ShapeType');