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

Line literal color instead of strokeColor etc.

Browse Source
This commit is contained in:
Tim Schaub
2013-08-15 09:55:10 -04:00
parent a5991aee03
commit 6078fe7b02
9 changed files with 58 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/spec/ol/layer/vectorlayer.test.js
View File

@@ -137,9 +137,9 @@ describe('ol.layer.Vector', function() {
var groups = layer.groupFeaturesBySymbolizerLiteral(features);
expect(groups.length).to.be(2);
expect(groups[0][0].length).to.be(1);
expect(groups[0][1].strokeColor).to.be('#BADA55');
expect(groups[0][1].color).to.be('#BADA55');
expect(groups[1][0].length).to.be(2);
expect(groups[1][1].strokeColor).to.be('#013');
expect(groups[1][1].color).to.be('#013');
});
it('groups equal symbolizers also when defined on features', function() {
@@ -167,7 +167,7 @@ describe('ol.layer.Vector', function() {
var groups = layer.groupFeaturesBySymbolizerLiteral(features);
expect(groups).to.have.length(3);
expect(groups[2][0].length).to.be(2);
expect(groups[2][1].strokeWidth).to.be(3);
expect(groups[2][1].width).to.be(3);
});

6
test/spec/ol/parser/kml.test.js
View File

@@ -189,9 +189,9 @@ describe('ol.parser.KML', function() {
var literal = stroke.createLiteral(ol.geom.GeometryType.LINESTRING);
expect(literal).to.be.a(ol.style.LineLiteral);
expect(literal.strokeColor).to.eql('#ff0000');
expect(literal.strokeOpacity).to.eql(0.5294117647058824);
expect(literal.strokeWidth).to.eql(10);
expect(literal.color).to.eql('#ff0000');
expect(literal.opacity).to.eql(0.5294117647058824);
expect(literal.width).to.eql(10);
});
it('reads PolyStyle fill', function() {

34
test/spec/ol/style/lineliteral.test.js
View File

@@ -6,22 +6,34 @@ describe('ol.style.LineLiteral', function() {
it('identifies equal literals', function() {
var literal = new ol.style.LineLiteral({
strokeWidth: 3,
strokeColor: '#BADA55',
strokeOpacity: 1
width: 3,
color: '#BADA55',
opacity: 1
});
var equalLiteral = new ol.style.LineLiteral({
strokeColor: '#BADA55',
strokeWidth: 3,
strokeOpacity: 1
color: '#BADA55',
width: 3,
opacity: 1
});
var differentLiteral = new ol.style.LineLiteral({
strokeColor: '#013',
strokeWidth: 3,
strokeOpacity: 1
var differentColor = new ol.style.LineLiteral({
width: 3,
color: '#ff0000',
opacity: 1
});
var differentWidth = new ol.style.LineLiteral({
width: 3.5,
color: '#BADA55',
opacity: 1
});
var differentOpacity = new ol.style.LineLiteral({
width: 3,
color: '#BADA55',
opacity: 0.5
});
expect(literal.equals(equalLiteral)).to.be(true);
expect(literal.equals(differentLiteral)).to.be(false);
expect(literal.equals(differentColor)).to.be(false);
expect(literal.equals(differentWidth)).to.be(false);
expect(literal.equals(differentOpacity)).to.be(false);
});
});

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

@@ -38,8 +38,8 @@ describe('ol.style.Stroke', function() {
var literal = symbolizer.createLiteral(feature);
expect(literal).to.be.a(ol.style.LineLiteral);
expect(literal.strokeOpacity).to.be(42 / 100);
expect(literal.strokeWidth).to.be(1.5);
expect(literal.opacity).to.be(42 / 100);
expect(literal.width).to.be(1.5);
});
it('applies the default values', function() {
@@ -47,9 +47,9 @@ describe('ol.style.Stroke', function() {
var literal = symbolizer.createLiteral(ol.geom.GeometryType.LINESTRING);
expect(literal).to.be.a(ol.style.LineLiteral);
expect(literal.strokeColor).to.be('#696969');
expect(literal.strokeOpacity).to.be(0.75);
expect(literal.strokeWidth).to.be(1.5);
expect(literal.color).to.be('#696969');
expect(literal.opacity).to.be(0.75);
expect(literal.width).to.be(1.5);
});
});

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

@@ -65,9 +65,9 @@ describe('ol.style.Style', function() {
var literal = literals[0];
expect(literal).to.be.a(ol.style.LineLiteral);
expect(literal.strokeColor).to.be(ol.style.StrokeDefaults.color);
expect(literal.strokeOpacity).to.be(ol.style.StrokeDefaults.opacity);
expect(literal.strokeWidth).to.be(ol.style.StrokeDefaults.width);
expect(literal.color).to.be(ol.style.StrokeDefaults.color);
expect(literal.opacity).to.be(ol.style.StrokeDefaults.opacity);
expect(literal.width).to.be(ol.style.StrokeDefaults.width);
});
it('returns an array with the Polygon default for polygons', function() {