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

Rename _ol_style_Fill_ to Fill

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 13:23:27 -07:00
parent 4f4c90fc20
commit dc6ae2293d
65 changed files with 268 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/style/circle.test.js
+15 -15
View File
@@ -1,6 +1,6 @@
import AtlasManager from '../../../../src/ol/style/AtlasManager.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
@@ -24,7 +24,7 @@ describe('ol.style.Circle', function() {
it('creates a canvas if no atlas is used (fill-style)', function() {
var style = new _ol_style_Circle_({
radius: 10,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#FFFF00'
})
});
@@ -58,7 +58,7 @@ describe('ol.style.Circle', function() {
var style = new _ol_style_Circle_({
radius: 10,
atlasManager: atlasManager,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#FFFF00'
})
});
@@ -85,7 +85,7 @@ describe('ol.style.Circle', function() {
it('copies all values', function() {
var original = new _ol_style_Circle_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -107,7 +107,7 @@ describe('ol.style.Circle', function() {
it('the clone does not reference the same objects as the original', function() {
var original = new _ol_style_Circle_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -155,7 +155,7 @@ describe('ol.style.Circle', function() {
it('calculates not the same hash code (color)', function() {
var style1 = new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
})
});
@@ -171,7 +171,7 @@ describe('ol.style.Circle', function() {
it('calculates the same hash code (everything set)', function() {
var style1 = new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -185,7 +185,7 @@ describe('ol.style.Circle', function() {
});
var style2 = new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -203,7 +203,7 @@ describe('ol.style.Circle', function() {
it('calculates not the same hash code (stroke width differs)', function() {
var style1 = new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -217,7 +217,7 @@ describe('ol.style.Circle', function() {
});
var style2 = new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -235,7 +235,7 @@ describe('ol.style.Circle', function() {
it('invalidates a cached checksum if values change (fill)', function() {
var style1 = new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -244,7 +244,7 @@ describe('ol.style.Circle', function() {
});
var style2 = new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -260,7 +260,7 @@ describe('ol.style.Circle', function() {
it('invalidates a cached checksum if values change (stroke)', function() {
var style1 = new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -269,7 +269,7 @@ describe('ol.style.Circle', function() {
});
var style2 = new _ol_style_Circle_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -288,7 +288,7 @@ describe('ol.style.Circle', function() {
it('changes the circle radius', function() {
var style = new _ol_style_Circle_({
radius: 10,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#FFFF00'
})
});
test/spec/ol/style/fill.test.js
+5 -5
View File
@@ -1,18 +1,18 @@
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import Fill from '../../../../src/ol/style/Fill.js';
describe('ol.style.Fill', function() {
describe('#clone', function() {
it('creates a new ol.style.Fill', function() {
var original = new _ol_style_Fill_();
var original = new Fill();
var clone = original.clone();
expect(clone).to.be.an(_ol_style_Fill_);
expect(clone).to.be.an(Fill);
expect(clone).to.not.be(original);
});
it('copies all values', function() {
var original = new _ol_style_Fill_({
var original = new Fill({
color: '#319FD3'
});
var clone = original.clone();
@@ -20,7 +20,7 @@ describe('ol.style.Fill', function() {
});
it('the clone does not reference the same objects as the original', function() {
var original = new _ol_style_Fill_({
var original = new Fill({
color: [63, 255, 127, 0.7]
});
var clone = original.clone();
test/spec/ol/style/regularshape.test.js
+14 -14
View File
@@ -1,6 +1,6 @@
import AtlasManager from '../../../../src/ol/style/AtlasManager.js';
import _ol_style_RegularShape_ from '../../../../src/ol/style/RegularShape.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
@@ -50,7 +50,7 @@ describe('ol.style.RegularShape', function() {
it('creates a canvas if no atlas is used (fill-style)', function() {
var style = new _ol_style_RegularShape_({
radius: 10,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#FFFF00'
})
});
@@ -85,7 +85,7 @@ describe('ol.style.RegularShape', function() {
var style = new _ol_style_RegularShape_({
radius: 10,
atlasManager: atlasManager,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#FFFF00'
})
});
@@ -114,7 +114,7 @@ describe('ol.style.RegularShape', function() {
it('copies all values', function() {
var original = new _ol_style_RegularShape_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
points: 5,
@@ -146,7 +146,7 @@ describe('ol.style.RegularShape', function() {
it('the clone does not reference the same objects as the original', function() {
var original = new _ol_style_RegularShape_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -204,7 +204,7 @@ describe('ol.style.RegularShape', function() {
it('calculates not the same hash code (color)', function() {
var style1 = new _ol_style_RegularShape_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
})
});
@@ -223,7 +223,7 @@ describe('ol.style.RegularShape', function() {
radius2: 3,
angle: 1.41,
points: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -240,7 +240,7 @@ describe('ol.style.RegularShape', function() {
radius2: 3,
angle: 1.41,
points: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -261,7 +261,7 @@ describe('ol.style.RegularShape', function() {
radius2: 3,
angle: 1.41,
points: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -278,7 +278,7 @@ describe('ol.style.RegularShape', function() {
radius2: 3,
angle: 1.41,
points: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -296,7 +296,7 @@ describe('ol.style.RegularShape', function() {
it('invalidates a cached checksum if values change (fill)', function() {
var style1 = new _ol_style_RegularShape_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -305,7 +305,7 @@ describe('ol.style.RegularShape', function() {
});
var style2 = new _ol_style_RegularShape_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -321,7 +321,7 @@ describe('ol.style.RegularShape', function() {
it('invalidates a cached checksum if values change (stroke)', function() {
var style1 = new _ol_style_RegularShape_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
@@ -330,7 +330,7 @@ describe('ol.style.RegularShape', function() {
});
var style2 = new _ol_style_RegularShape_({
radius: 5,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
test/spec/ol/style/style.test.js
+5 -5
View File
@@ -1,7 +1,7 @@
import Feature from '../../../../src/ol/Feature.js';
import Point from '../../../../src/ol/geom/Point.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
@@ -9,7 +9,7 @@ import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
describe('ol.style.Style', function() {
var testFill = new _ol_style_Fill_({
var testFill = new Fill({
color: 'rgba(255, 255, 255, 0.6)'
});
@@ -20,7 +20,7 @@ describe('ol.style.Style', function() {
var testText = new _ol_style_Text_({
font: '12px Calibri,sans-serif',
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#000'
}),
stroke: new _ol_style_Stroke_({
@@ -45,7 +45,7 @@ describe('ol.style.Style', function() {
it('copies all values', function() {
var original = new Style({
geometry: new Point([0, 0, 0]),
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
image: new _ol_style_Circle_({
@@ -71,7 +71,7 @@ describe('ol.style.Style', function() {
it('the clone does not reference the same objects as the original', function() {
var original = new Style({
geometry: new Point([0, 0, 0]),
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
image: new _ol_style_Circle_({
test/spec/ol/style/text.test.js
+5 -5
View File
@@ -1,4 +1,4 @@
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
@@ -14,7 +14,7 @@ describe('ol.style.Text', function() {
it('uses a provided fill style if one passed', function() {
var style = new _ol_style_Text_({
fill: new _ol_style_Fill_({color: '#123456'})
fill: new Fill({color: '#123456'})
});
expect(style.getFill().getColor()).to.be('#123456');
});
@@ -47,13 +47,13 @@ describe('ol.style.Text', function() {
text: 'test',
textAlign: 'center',
textBaseline: 'top',
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
color: '#319FD3'
}),
backgroundFill: new _ol_style_Fill_({
backgroundFill: new Fill({
color: 'white'
}),
backgroundStroke: new _ol_style_Stroke_({
@@ -78,7 +78,7 @@ describe('ol.style.Text', function() {
it('the clone does not reference the same objects as the original', function() {
var original = new _ol_style_Text_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({