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

Rename _ol_style_Stroke_ to Stroke

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 13:24:13 -07:00
parent dc6ae2293d
commit f4484455aa
75 changed files with 333 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/rendering/ol/layer/clip.test.js
View File

@@ -3,7 +3,7 @@ import View from '../../../../src/ol/View.js';
import MultiPolygon from '../../../../src/ol/geom/MultiPolygon.js';
import TileLayer from '../../../../src/ol/layer/Tile.js';
import XYZ from '../../../../src/ol/source/XYZ.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
import Style from '../../../../src/ol/style/Style.js';
@@ -70,7 +70,7 @@ describe('layer clipping', function() {
]).transform('EPSG:4326', 'EPSG:3857');
var style = new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
width: 2,
color: 'blue'
})

4
test/rendering/ol/layer/tile.test.js
View File

@@ -9,7 +9,7 @@ import TileImage from '../../../../src/ol/source/TileImage.js';
import XYZ from '../../../../src/ol/source/XYZ.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
@@ -282,7 +282,7 @@ describe('ol.rendering.layer.Tile', function() {
radius: 5,
snapToPixel: false,
fill: new Fill({color: 'yellow'}),
stroke: new _ol_style_Stroke_({color: 'red', width: 1})
stroke: new Stroke({color: 'red', width: 1})
}));
e.vectorContext.drawPoint(new Point(
transform([-123, 38], 'EPSG:4326', 'EPSG:3857')));

60
test/rendering/ol/layer/vector.test.js
View File

@@ -10,7 +10,7 @@ import VectorLayer from '../../../../src/ol/layer/Vector.js';
import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
@@ -81,7 +81,7 @@ describe('ol.rendering.layer.Vector', function() {
]));
smallLine.setStyle(new Style({
zIndex: -99,
stroke: new _ol_style_Stroke_({width: 75, color: 'red'})
stroke: new Stroke({width: 75, color: 'red'})
}));
source.addFeature(smallLine);
addPolygon(100);
@@ -107,7 +107,7 @@ describe('ol.rendering.layer.Vector', function() {
]));
smallLine.setStyle(new Style({
zIndex: -99,
stroke: new _ol_style_Stroke_({width: 75, color: 'red'})
stroke: new Stroke({width: 75, color: 'red'})
}));
source.addFeature(smallLine);
addPolygon(100);
@@ -134,10 +134,10 @@ describe('ol.rendering.layer.Vector', function() {
]));
smallLine.setStyle([
new Style({
stroke: new _ol_style_Stroke_({width: 75, color: 'red'})
stroke: new Stroke({width: 75, color: 'red'})
}),
new Style({
stroke: new _ol_style_Stroke_({width: 45, color: 'white'})
stroke: new Stroke({width: 45, color: 'white'})
})
]);
source.addFeature(smallLine);
@@ -147,10 +147,10 @@ describe('ol.rendering.layer.Vector', function() {
]));
smallLine2.setStyle([
new Style({
stroke: new _ol_style_Stroke_({width: 35, color: 'blue'})
stroke: new Stroke({width: 35, color: 'blue'})
}),
new Style({
stroke: new _ol_style_Stroke_({width: 15, color: 'green'})
stroke: new Stroke({width: 15, color: 'green'})
})
]);
source.addFeature(smallLine2);
@@ -173,10 +173,10 @@ describe('ol.rendering.layer.Vector', function() {
]));
smallLine.setStyle([
new Style({
stroke: new _ol_style_Stroke_({width: 75, color: 'red'})
stroke: new Stroke({width: 75, color: 'red'})
}),
new Style({
stroke: new _ol_style_Stroke_({width: 45, color: 'white'})
stroke: new Stroke({width: 45, color: 'white'})
})
]);
source.addFeature(smallLine);
@@ -186,10 +186,10 @@ describe('ol.rendering.layer.Vector', function() {
]));
smallLine2.setStyle([
new Style({
stroke: new _ol_style_Stroke_({width: 35, color: 'blue'})
stroke: new Stroke({width: 35, color: 'blue'})
}),
new Style({
stroke: new _ol_style_Stroke_({width: 15, color: 'green'})
stroke: new Stroke({width: 15, color: 'green'})
})
]);
source.addFeature(smallLine2);
@@ -213,7 +213,7 @@ describe('ol.rendering.layer.Vector', function() {
map.addLayer(new VectorLayer({
source: source,
style: new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
width: 2,
color: 'black'
})
@@ -234,7 +234,7 @@ describe('ol.rendering.layer.Vector', function() {
renderMode: 'image',
source: source,
style: new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
width: 2,
color: 'black'
})
@@ -258,7 +258,7 @@ describe('ol.rendering.layer.Vector', function() {
fill: new Fill({
color: 'rgba(255,0,0,0.5)'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
width: 2,
color: 'black'
})
@@ -286,7 +286,7 @@ describe('ol.rendering.layer.Vector', function() {
map.addLayer(new VectorLayer({
source: source,
style: new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#3399CC',
width: 1.25
})
@@ -310,7 +310,7 @@ describe('ol.rendering.layer.Vector', function() {
map.addLayer(new VectorLayer({
source: source,
style: new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#3399CC',
width: 1.25
})
@@ -351,7 +351,7 @@ describe('ol.rendering.layer.Vector', function() {
style: function(feature) {
alternateColor();
return new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: alternateColor(),
width: 1.25
}),
@@ -402,7 +402,7 @@ describe('ol.rendering.layer.Vector', function() {
style: function(feature) {
alternateColor();
return new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: alternateColor(),
width: 1.25
}),
@@ -535,7 +535,7 @@ describe('ol.rendering.layer.Vector', function() {
it('renders partially out-of-view polygons with a fill and stroke', function(done) {
layer.setStyle(new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: [0, 0, 0, 1],
width: 2
}),
@@ -563,7 +563,7 @@ describe('ol.rendering.layer.Vector', function() {
it('renders partially out-of-view polygons with a stroke', function(done) {
layer.setStyle(new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: [0, 0, 0, 1],
width: 2
})
@@ -726,7 +726,7 @@ describe('ol.rendering.layer.Vector', function() {
return new Style({
image: new _ol_style_Circle_({
radius: 15,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: 'blue'
})
})
@@ -766,7 +766,7 @@ describe('ol.rendering.layer.Vector', function() {
return new Style({
image: new _ol_style_Circle_({
radius: 15,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: 'blue'
})
})
@@ -808,7 +808,7 @@ describe('ol.rendering.layer.Vector', function() {
zIndex: feature.get('zIndex'),
image: new _ol_style_Circle_({
radius: 15,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: 'blue'
})
})
@@ -846,7 +846,7 @@ describe('ol.rendering.layer.Vector', function() {
return new Style({
image: new _ol_style_Circle_({
radius: 5,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: 'blue'
})
}),
@@ -876,7 +876,7 @@ describe('ol.rendering.layer.Vector', function() {
point.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 8,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: 'blue'
})
})
@@ -886,7 +886,7 @@ describe('ol.rendering.layer.Vector', function() {
[center[0] + 650, center[1] - 200]
]));
line.setStyle(new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#CCC',
width: 12
}),
@@ -919,7 +919,7 @@ describe('ol.rendering.layer.Vector', function() {
point.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 8,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: 'blue'
})
})
@@ -929,7 +929,7 @@ describe('ol.rendering.layer.Vector', function() {
[center[0] + 650, center[1] - 200]
]));
line.setStyle(new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#CCC',
width: 12
}),
@@ -963,7 +963,7 @@ describe('ol.rendering.layer.Vector', function() {
zIndex: 2,
image: new _ol_style_Circle_({
radius: 8,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: 'blue'
})
})
@@ -974,7 +974,7 @@ describe('ol.rendering.layer.Vector', function() {
]));
line.setStyle(new Style({
zIndex: 1,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#CCC',
width: 12
}),

14
test/rendering/ol/render.test.js
View File

@@ -6,7 +6,7 @@ import VectorContext from '../../../src/ol/render/VectorContext.js';
import CanvasImmediateRenderer from '../../../src/ol/render/canvas/Immediate.js';
import _ol_style_Circle_ from '../../../src/ol/style/Circle.js';
import Fill from '../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../src/ol/style/Stroke.js';
import Stroke from '../../../src/ol/style/Stroke.js';
import Style from '../../../src/ol/style/Style.js';
function getContext() {
@@ -58,7 +58,7 @@ describe('ol.render', function() {
});
var style = new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: 'red',
width: 14
})
@@ -82,7 +82,7 @@ describe('ol.render', function() {
});
var style = new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
lineCap: 'butt',
color: 'red',
width: 14
@@ -107,7 +107,7 @@ describe('ol.render', function() {
});
var style = new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
lineJoin: 'bevel',
color: 'red',
width: 14
@@ -132,7 +132,7 @@ describe('ol.render', function() {
});
var style = new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: 'blue',
width: 8
}),
@@ -161,7 +161,7 @@ describe('ol.render', function() {
});
var style = new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
lineDash: [10, 5]
})
});
@@ -186,7 +186,7 @@ describe('ol.render', function() {
});
var style = new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
lineDash: [10, 5],
lineDashOffset: 5
})

14
test/rendering/ol/style/circle.test.js
View File

@@ -8,7 +8,7 @@ import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import Fill from '../../../../src/ol/style/Fill.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
describe('ol.rendering.style.Circle', function() {
@@ -93,7 +93,7 @@ describe('ol.rendering.style.Circle', function() {
fill: new Fill({
color: '#91E339'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#000000',
width: 1
})
@@ -110,7 +110,7 @@ describe('ol.rendering.style.Circle', function() {
fill: new Fill({
color: '#5447E6'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#000000',
width: 2
})
@@ -127,7 +127,7 @@ describe('ol.rendering.style.Circle', function() {
fill: new Fill({
color: '#92A8A6'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#000000',
width: 3
})
@@ -141,7 +141,7 @@ describe('ol.rendering.style.Circle', function() {
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 2,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#256308',
width: 1
})
@@ -158,7 +158,7 @@ describe('ol.rendering.style.Circle', function() {
fill: new Fill({
color: 'rgba(0, 0, 255, 0.3)'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#256308',
width: 2
})
@@ -175,7 +175,7 @@ describe('ol.rendering.style.Circle', function() {
fill: new Fill({
color: 'rgba(235, 45, 70, 0.6)'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#256308',
width: 3
})

14
test/rendering/ol/style/linestring.test.js
View File

@@ -5,7 +5,7 @@ import View from '../../../../src/ol/View.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import VectorSource from '../../../../src/ol/source/Vector.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
describe('ol.rendering.style.LineString', function() {
@@ -49,7 +49,7 @@ describe('ol.rendering.style.LineString', function() {
)
});
feature.setStyle(new Style({
stroke: new _ol_style_Stroke_({color: '#DE213A', width: 3})
stroke: new Stroke({color: '#DE213A', width: 3})
}));
vectorSource.addFeature(feature);
@@ -59,7 +59,7 @@ describe('ol.rendering.style.LineString', function() {
)
});
feature.setStyle(new Style({
stroke: new _ol_style_Stroke_({color: '#9696EB', width: 1})
stroke: new Stroke({color: '#9696EB', width: 1})
}));
vectorSource.addFeature(feature);
@@ -69,9 +69,9 @@ describe('ol.rendering.style.LineString', function() {
)
});
feature.setStyle([new Style({
stroke: new _ol_style_Stroke_({color: '#F2F211', width: 5})
stroke: new Stroke({color: '#F2F211', width: 5})
}), new Style({
stroke: new _ol_style_Stroke_({color: '#292921', width: 1})
stroke: new Stroke({color: '#292921', width: 1})
})]);
vectorSource.addFeature(feature);
@@ -81,7 +81,7 @@ describe('ol.rendering.style.LineString', function() {
)
});
feature.setStyle(new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#000000',
width: 2,
lineCap: 'square',
@@ -97,7 +97,7 @@ describe('ol.rendering.style.LineString', function() {
)
});
feature.setStyle(new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#000000',
width: 2,
lineCap: 'square',

12
test/rendering/ol/style/polygon.test.js
View File

@@ -6,7 +6,7 @@ import VectorLayer from '../../../../src/ol/layer/Vector.js';
import VectorSource from '../../../../src/ol/source/Vector.js';
import Fill from '../../../../src/ol/style/Fill.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
describe('ol.rendering.style.Polygon', function() {
@@ -104,7 +104,7 @@ describe('ol.rendering.style.Polygon', function() {
describe('different types with stroke', function() {
function createFeatures() {
var stroke = new _ol_style_Stroke_({
var stroke = new Stroke({
width: 10,
color: '#000',
lineJoin: 'round',
@@ -237,7 +237,7 @@ describe('ol.rendering.style.Polygon', function() {
});
feature.setStyle(new Style({
fill: new Fill({color: '#9696EB'}),
stroke: new _ol_style_Stroke_({color: '#9696EB', width: 1})
stroke: new Stroke({color: '#9696EB', width: 1})
}));
vectorSource.addFeature(feature);
@@ -249,7 +249,7 @@ describe('ol.rendering.style.Polygon', function() {
});
feature.setStyle(new Style({
fill: new Fill({color: 'rgba(255, 0, 0, 0.1)'}),
stroke: new _ol_style_Stroke_({color: '#DE213A', width: 3})
stroke: new Stroke({color: '#DE213A', width: 3})
}));
vectorSource.addFeature(feature);
@@ -261,7 +261,7 @@ describe('ol.rendering.style.Polygon', function() {
});
feature.setStyle(new Style({
fill: new Fill({color: 'rgba(18, 204, 105, 0.3)'}),
stroke: new _ol_style_Stroke_({color: '#032E17', width: 2})
stroke: new Stroke({color: '#032E17', width: 2})
}));
vectorSource.addFeature(feature);
}
@@ -323,7 +323,7 @@ describe('ol.rendering.style.Polygon', function() {
});
feature.setStyle(new Style({
fill: new Fill({color: createPattern()}),
stroke: new _ol_style_Stroke_({color: createRainbowGradient(), width: 3})
stroke: new Stroke({color: createRainbowGradient(), width: 3})
}));
vectorSource.addFeature(feature);
}

10
test/rendering/ol/style/regularshape.test.js
View File

@@ -7,7 +7,7 @@ import VectorSource from '../../../../src/ol/source/Vector.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_RegularShape_ from '../../../../src/ol/style/RegularShape.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
describe('ol.rendering.style.RegularShape', function() {
@@ -108,7 +108,7 @@ describe('ol.rendering.style.RegularShape', function() {
describe('#render', function() {
var stroke = new _ol_style_Stroke_({width: 2});
var stroke = new Stroke({width: 2});
var fill = new Fill({color: 'red'});
it('tests the canvas renderer', function(done) {
@@ -119,7 +119,7 @@ describe('ol.rendering.style.RegularShape', function() {
it('supports lineDash', function(done) {
createMap('canvas');
createFeatures(new _ol_style_Stroke_({
createFeatures(new Stroke({
lineDash: [10, 5]
}));
expectResemble(map, 'rendering/ol/style/expected/regularshape-canvas-linedash.png', 5, done);
@@ -127,7 +127,7 @@ describe('ol.rendering.style.RegularShape', function() {
it('supports lineDashOffset', function(done) {
createMap('canvas');
createFeatures(new _ol_style_Stroke_({
createFeatures(new Stroke({
lineDash: [10, 5],
lineDashOffset: 5
}));
@@ -143,7 +143,7 @@ describe('ol.rendering.style.RegularShape', function() {
});
describe('uses the default fill and stroke color', function() {
var stroke = new _ol_style_Stroke_();
var stroke = new Stroke();
var fill = new Fill();
it('tests the canvas renderer', function(done) {

14
test/rendering/ol/style/text.test.js
View File

@@ -11,7 +11,7 @@ import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
import Fill from '../../../../src/ol/style/Fill.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
describe('ol.rendering.style.Text', function() {
@@ -72,7 +72,7 @@ describe('ol.rendering.style.Text', function() {
color: 'red',
font: '12px sans-serif'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#000',
width: 3
})
@@ -89,7 +89,7 @@ describe('ol.rendering.style.Text', function() {
rotateWithView: true,
text: 'hello',
font: '10px sans-serif',
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: [10, 10, 10, 0.5]
})
})
@@ -108,7 +108,7 @@ describe('ol.rendering.style.Text', function() {
var geom = new LineString();
geom.setFlatCoordinates('XY', coords);
var style = new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: 'red'
}),
text: new _ol_style_Text_({
@@ -118,7 +118,7 @@ describe('ol.rendering.style.Text', function() {
textAlign: textAlign,
maxAngle: maxAngle,
placement: 'line',
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: strokeColor || 'white',
width: strokeWidth
})
@@ -339,14 +339,14 @@ describe('ol.rendering.style.Text', function() {
features[1].getStyle().getText().setBackgroundFill(new Fill({
color: 'red'
}));
features[1].getStyle().getText().setBackgroundStroke(new _ol_style_Stroke_({
features[1].getStyle().getText().setBackgroundStroke(new Stroke({
color: 'blue',
width: 3
}));
features[2].getStyle().getText().setBackgroundFill(new Fill({
color: 'red'
}));
features[2].getStyle().getText().setBackgroundStroke(new _ol_style_Stroke_({
features[2].getStyle().getText().setBackgroundStroke(new Stroke({
color: 'blue',
width: 3
}));

10
test/spec/ol/format/kml.test.js
View File

@@ -18,7 +18,7 @@ import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Icon_ from '../../../../src/ol/style/Icon.js';
import IconAnchorUnits from '../../../../src/ol/style/IconAnchorUnits.js';
import IconOrigin from '../../../../src/ol/style/IconOrigin.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
import _ol_xml_ from '../../../../src/ol/xml.js';
@@ -1978,7 +1978,7 @@ describe('ol.format.KML', function() {
expect(style.getFill()).to.be(KML.DEFAULT_FILL_STYLE_);
expect(style.getImage()).to.be(KML.DEFAULT_IMAGE_STYLE_);
var strokeStyle = style.getStroke();
expect(strokeStyle).to.be.an(_ol_style_Stroke_);
expect(strokeStyle).to.be.an(Stroke);
expect(strokeStyle.getColor()).to.eql([0x78, 0x56, 0x34, 0x12 / 255]);
expect(strokeStyle.getWidth()).to.be(9);
expect(style.getText()).to.be(KML.DEFAULT_TEXT_STYLE_);
@@ -2049,7 +2049,7 @@ describe('ol.format.KML', function() {
expect(fillStyle.getColor()).to.eql([0x78, 0x56, 0x34, 0x12 / 255]);
expect(style.getImage()).to.be(KML.DEFAULT_IMAGE_STYLE_);
var strokeStyle = style.getStroke();
expect(strokeStyle).to.be.an(_ol_style_Stroke_);
expect(strokeStyle).to.be.an(Stroke);
expect(strokeStyle.getColor()).to.eql([0x78, 0x56, 0x34, 0x12 / 255]);
expect(strokeStyle.getWidth()).to.be(9);
expect(style.getText()).to.be(KML.DEFAULT_TEXT_STYLE_);
@@ -2086,7 +2086,7 @@ describe('ol.format.KML', function() {
expect(style.getFill()).to.be(null);
expect(style.getImage()).to.be(KML.DEFAULT_IMAGE_STYLE_);
var strokeStyle = style.getStroke();
expect(strokeStyle).to.be.an(_ol_style_Stroke_);
expect(strokeStyle).to.be.an(Stroke);
expect(strokeStyle.getColor()).to.eql([0x78, 0x56, 0x34, 0x12 / 255]);
expect(strokeStyle.getWidth()).to.be(9);
expect(style.getText()).to.be(KML.DEFAULT_TEXT_STYLE_);
@@ -2393,7 +2393,7 @@ describe('ol.format.KML', function() {
it('can write an feature\'s stroke style', function() {
var style = new Style({
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#112233',
width: 2
})

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

@@ -1,7 +1,7 @@
import Graticule from '../../../src/ol/Graticule.js';
import Map from '../../../src/ol/Map.js';
import {get as getProjection} from '../../../src/ol/proj.js';
import _ol_style_Stroke_ from '../../../src/ol/style/Stroke.js';
import Stroke from '../../../src/ol/style/Stroke.js';
import _ol_style_Text_ from '../../../src/ol/style/Text.js';
describe('ol.Graticule', function() {
@@ -54,12 +54,12 @@ describe('ol.Graticule', function() {
var actualStyle = graticule.strokeStyle_;
expect(actualStyle).not.to.be(undefined);
expect(actualStyle instanceof _ol_style_Stroke_).to.be(true);
expect(actualStyle instanceof Stroke).to.be(true);
});
it('can be configured with a stroke style', function() {
createGraticule();
var customStrokeStyle = new _ol_style_Stroke_({
var customStrokeStyle = new Stroke({
color: 'rebeccapurple'
});
var styledGraticule = new Graticule({

4
test/spec/ol/render/canvas/immediate.test.js
View File

@@ -10,7 +10,7 @@ import VectorContext from '../../../../../src/ol/render/VectorContext.js';
import CanvasImmediateRenderer from '../../../../../src/ol/render/canvas/Immediate.js';
import _ol_style_Circle_ from '../../../../../src/ol/style/Circle.js';
import Fill from '../../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../../src/ol/style/Stroke.js';
import Style from '../../../../../src/ol/style/Style.js';
import _ol_style_Text_ from '../../../../../src/ol/style/Text.js';
@@ -43,7 +43,7 @@ describe('ol.render.canvas.Immediate', function() {
sinon.spy(context, 'setImageStyle');
sinon.spy(context, 'setTextStyle');
var fill = new Fill({});
var stroke = new _ol_style_Stroke_({});
var stroke = new Stroke({});
var text = new _ol_style_Text_({});
var image = new _ol_style_Circle_({});
var style = new Style({

4
test/spec/ol/render/webgl/circlereplay.test.js
View File

@@ -5,12 +5,12 @@ import _ol_render_webgl_CircleReplay_ from '../../../../../src/ol/render/webgl/C
import _ol_render_webgl_circlereplay_defaultshader_ from '../../../../../src/ol/render/webgl/circlereplay/defaultshader.js';
import _ol_render_webgl_circlereplay_defaultshader_Locations_ from '../../../../../src/ol/render/webgl/circlereplay/defaultshader/Locations.js';
import Fill from '../../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../../src/ol/style/Stroke.js';
describe('ol.render.webgl.CircleReplay', function() {
var replay;
var strokeStyle = new _ol_style_Stroke_({
var strokeStyle = new Stroke({
color: [0, 255, 0, 0.4]
});

4
test/spec/ol/render/webgl/immediate.test.js
View File

@@ -14,7 +14,7 @@ import _ol_render_webgl_LineStringReplay_ from '../../../../../src/ol/render/web
import _ol_render_webgl_PolygonReplay_ from '../../../../../src/ol/render/webgl/PolygonReplay.js';
import _ol_style_Circle_ from '../../../../../src/ol/style/Circle.js';
import Fill from '../../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../../src/ol/style/Stroke.js';
import Style from '../../../../../src/ol/style/Style.js';
describe('ol.render.webgl.Immediate', function() {
@@ -24,7 +24,7 @@ describe('ol.render.webgl.Immediate', function() {
style = new Style({
image: new _ol_style_Circle_(),
fill: new Fill(),
stroke: new _ol_style_Stroke_()
stroke: new Stroke()
});
circle = new Circle([0, 0], 5);
line = new LineString([[0, 0], [5, 5]]);

16
test/spec/ol/render/webgl/linestringreplay.test.js
View File

@@ -5,16 +5,16 @@ import MultiLineString from '../../../../../src/ol/geom/MultiLineString.js';
import _ol_render_webgl_LineStringReplay_ from '../../../../../src/ol/render/webgl/LineStringReplay.js';
import _ol_render_webgl_linestringreplay_defaultshader_ from '../../../../../src/ol/render/webgl/linestringreplay/defaultshader.js';
import _ol_render_webgl_linestringreplay_defaultshader_Locations_ from '../../../../../src/ol/render/webgl/linestringreplay/defaultshader/Locations.js';
import _ol_style_Stroke_ from '../../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../../src/ol/style/Stroke.js';
describe('ol.render.webgl.LineStringReplay', function() {
var replay;
var strokeStyle1 = new _ol_style_Stroke_({
var strokeStyle1 = new Stroke({
color: [0, 255, 0, 0.4]
});
var strokeStyle2 = new _ol_style_Stroke_({
var strokeStyle2 = new Stroke({
color: [255, 0, 0, 1],
lineCap: 'square',
lineJoin: 'miter'
@@ -100,7 +100,7 @@ describe('ol.render.webgl.LineStringReplay', function() {
it('triangulates linestrings', function() {
var linestring;
var stroke = new _ol_style_Stroke_({
var stroke = new Stroke({
color: [0, 255, 0, 1],
lineCap: 'butt',
lineJoin: 'bevel'
@@ -121,7 +121,7 @@ describe('ol.render.webgl.LineStringReplay', function() {
it('optionally creates miters', function() {
var linestring;
var stroke = new _ol_style_Stroke_({
var stroke = new Stroke({
color: [0, 255, 0, 1],
lineCap: 'butt'
});
@@ -141,7 +141,7 @@ describe('ol.render.webgl.LineStringReplay', function() {
it('optionally creates caps', function() {
var linestring;
var stroke = new _ol_style_Stroke_({
var stroke = new Stroke({
color: [0, 255, 0, 1]
});
@@ -162,7 +162,7 @@ describe('ol.render.webgl.LineStringReplay', function() {
it('respects segment orientation', function() {
var linestring;
var stroke = new _ol_style_Stroke_({
var stroke = new Stroke({
color: [0, 255, 0, 1],
lineCap: 'butt',
lineJoin: 'bevel'
@@ -183,7 +183,7 @@ describe('ol.render.webgl.LineStringReplay', function() {
it('closes boundaries', function() {
var linestring;
var stroke = new _ol_style_Stroke_({
var stroke = new Stroke({
color: [0, 255, 0, 1],
lineCap: 'butt',
lineJoin: 'bevel'

4
test/spec/ol/render/webgl/polygonreplay.test.js
View File

@@ -8,7 +8,7 @@ import _ol_render_webgl_polygonreplay_defaultshader_Locations_ from '../../../..
import LinkedList from '../../../../../src/ol/structs/LinkedList.js';
import RBush from '../../../../../src/ol/structs/RBush.js';
import Fill from '../../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../../src/ol/style/Stroke.js';
describe('ol.render.webgl.PolygonReplay', function() {
var replay;
@@ -16,7 +16,7 @@ describe('ol.render.webgl.PolygonReplay', function() {
var fillStyle = new Fill({
color: [0, 0, 255, 0.5]
});
var strokeStyle = new _ol_style_Stroke_({
var strokeStyle = new Stroke({
color: [0, 255, 0, 0.4]
});

8
test/spec/ol/render/webgl/textreplay.test.js
View File

@@ -2,7 +2,7 @@ import {createCanvasContext2D} from '../../../../../src/ol/dom.js';
import Point from '../../../../../src/ol/geom/Point.js';
import _ol_render_webgl_TextReplay_ from '../../../../../src/ol/render/webgl/TextReplay.js';
import Fill from '../../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../../src/ol/style/Stroke.js';
import _ol_style_Text_ from '../../../../../src/ol/style/Text.js';
describe('ol.render.webgl.TextReplay', function() {
@@ -40,7 +40,7 @@ describe('ol.render.webgl.TextReplay', function() {
new Fill({
color: [0, 0, 0, 1]
}),
new _ol_style_Stroke_({
new Stroke({
width: 1,
color: [0, 0, 0, 1],
lineCap: 'butt',
@@ -54,7 +54,7 @@ describe('ol.render.webgl.TextReplay', function() {
new Fill({
color: [255, 255, 255, 1]
}),
new _ol_style_Stroke_({
new Stroke({
width: 1,
color: [255, 255, 255, 1]
}),
@@ -65,7 +65,7 @@ describe('ol.render.webgl.TextReplay', function() {
new Fill({
color: [0, 0, 0, 1]
}),
new _ol_style_Stroke_({
new Stroke({
width: 1,
color: [0, 0, 0, 1]
}),

12
test/spec/ol/renderer/canvas/replay.test.js
View File

@@ -13,7 +13,7 @@ import _ol_render_canvas_Replay_ from '../../../../../src/ol/render/canvas/Repla
import _ol_render_canvas_ReplayGroup_ from '../../../../../src/ol/render/canvas/ReplayGroup.js';
import _ol_renderer_vector_ from '../../../../../src/ol/renderer/vector.js';
import Fill from '../../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../../src/ol/style/Stroke.js';
import Style from '../../../../../src/ol/style/Style.js';
import _ol_transform_ from '../../../../../src/ol/transform.js';
@@ -45,11 +45,11 @@ describe('ol.render.canvas.ReplayGroup', function() {
});
style1 = new Style({
fill: new Fill({color: 'black'}),
stroke: new _ol_style_Stroke_({color: 'white', width: 1})
stroke: new Stroke({color: 'white', width: 1})
});
style2 = new Style({
fill: new Fill({color: 'white'}),
stroke: new _ol_style_Stroke_({color: 'black', width: 1, lineDash: [3, 6],
stroke: new Stroke({color: 'black', width: 1, lineDash: [3, 6],
lineDashOffset: 2})
});
fillCount = 0;
@@ -448,7 +448,7 @@ describe('ol.render.canvas.LineStringReplay', function() {
var resolution = 10;
var replay = new _ol_render_canvas_LineStringReplay_(tolerance, extent,
resolution);
var stroke = new _ol_style_Stroke_({
var stroke = new Stroke({
width: 2
});
replay.setFillStrokeStyle(null, stroke);
@@ -476,7 +476,7 @@ describe('ol.render.canvas.PolygonReplay', function() {
it('returns correct offset', function() {
var coords = [1, 2, 3, 4, 5, 6, 1, 2, 1, 2, 3, 4, 5, 6, 1, 2];
var ends = [7, 14];
var stroke = new _ol_style_Stroke_({
var stroke = new Stroke({
width: 5
});
replay.setFillStrokeStyle(null, stroke);
@@ -491,7 +491,7 @@ describe('ol.render.canvas.PolygonReplay', function() {
describe('#getBufferedMaxExtent()', function() {
it('buffers the max extent to accommodate stroke width', function() {
var stroke = new _ol_style_Stroke_({
var stroke = new Stroke({
width: 5
});
replay.setFillStrokeStyle(null, stroke);

4
test/spec/ol/renderer/vector.test.js
View File

@@ -10,7 +10,7 @@ import _ol_render_canvas_ReplayGroup_ from '../../../../src/ol/render/canvas/Rep
import _ol_renderer_vector_ from '../../../../src/ol/renderer/vector.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Icon_ from '../../../../src/ol/style/Icon.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
import Style from '../../../../src/ol/style/Style.js';
import Feature from '../../../../src/ol/Feature.js';
@@ -30,7 +30,7 @@ describe('ol.renderer.vector', function() {
style = new Style({
image: iconStyle,
fill: new Fill({}),
stroke: new _ol_style_Stroke_({})
stroke: new Stroke({})
});
squaredTolerance = 1;
listener = function() {};

24
test/spec/ol/style/circle.test.js
View File

@@ -1,7 +1,7 @@
import AtlasManager from '../../../../src/ol/style/AtlasManager.js';
import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
describe('ol.style.Circle', function() {
@@ -88,7 +88,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
}),
radius: 5,
@@ -110,7 +110,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -161,7 +161,7 @@ describe('ol.style.Circle', function() {
});
var style2 = new _ol_style_Circle_({
radius: 5,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -174,7 +174,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -188,7 +188,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -206,7 +206,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -220,7 +220,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -238,7 +238,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -247,7 +247,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -263,7 +263,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -272,7 +272,7 @@ describe('ol.style.Circle', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});

24
test/spec/ol/style/regularshape.test.js
View File

@@ -1,7 +1,7 @@
import AtlasManager from '../../../../src/ol/style/AtlasManager.js';
import _ol_style_RegularShape_ from '../../../../src/ol/style/RegularShape.js';
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
describe('ol.style.RegularShape', function() {
@@ -122,7 +122,7 @@ describe('ol.style.RegularShape', function() {
radius2: 6,
angle: 1,
snapToPixel: false,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
}),
rotation: 2,
@@ -149,7 +149,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -210,7 +210,7 @@ describe('ol.style.RegularShape', function() {
});
var style2 = new _ol_style_RegularShape_({
radius: 5,
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -226,7 +226,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -243,7 +243,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -264,7 +264,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -281,7 +281,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3',
lineCap: 'round',
lineDash: [5, 15, 25],
@@ -299,7 +299,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -308,7 +308,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -324,7 +324,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});
@@ -333,7 +333,7 @@ describe('ol.style.RegularShape', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});

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

@@ -1,18 +1,18 @@
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
describe('ol.style.Stroke', function() {
describe('#clone', function() {
it('creates a new ol.style.Stroke', function() {
var original = new _ol_style_Stroke_();
var original = new Stroke();
var clone = original.clone();
expect(clone).to.be.an(_ol_style_Stroke_);
expect(clone).to.be.an(Stroke);
expect(clone).to.not.be(original);
});
it('copies all values', function() {
var original = new _ol_style_Stroke_({
var original = new Stroke({
color: '#319FD3',
lineCap: 'square',
lineJoin: 'miter',
@@ -32,7 +32,7 @@ describe('ol.style.Stroke', function() {
});
it('the clone does not reference the same objects as the original', function() {
var original = new _ol_style_Stroke_({
var original = new Stroke({
color: [1, 2, 3, 0.4],
lineDash: [1, 2, 3]
});

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

@@ -3,7 +3,7 @@ import Point from '../../../../src/ol/geom/Point.js';
import Style from '../../../../src/ol/style/Style.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 Stroke from '../../../../src/ol/style/Stroke.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
@@ -13,7 +13,7 @@ describe('ol.style.Style', function() {
color: 'rgba(255, 255, 255, 0.6)'
});
var testStroke = new _ol_style_Stroke_({
var testStroke = new Stroke({
color: '#319FD3',
width: 1
});
@@ -23,7 +23,7 @@ describe('ol.style.Style', function() {
fill: new Fill({
color: '#000'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#fff',
width: 3
})
@@ -51,7 +51,7 @@ describe('ol.style.Style', function() {
image: new _ol_style_Circle_({
radius: 5
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
}),
text: new _ol_style_Text_({
@@ -77,7 +77,7 @@ describe('ol.style.Style', function() {
image: new _ol_style_Circle_({
radius: 5
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
}),
text: new _ol_style_Text_({

8
test/spec/ol/style/text.test.js
View File

@@ -1,5 +1,5 @@
import Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
import Stroke from '../../../../src/ol/style/Stroke.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
@@ -50,13 +50,13 @@ describe('ol.style.Text', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
}),
backgroundFill: new Fill({
color: 'white'
}),
backgroundStroke: new _ol_style_Stroke_({
backgroundStroke: new Stroke({
color: 'black'
})
});
@@ -81,7 +81,7 @@ describe('ol.style.Text', function() {
fill: new Fill({
color: '#319FD3'
}),
stroke: new _ol_style_Stroke_({
stroke: new Stroke({
color: '#319FD3'
})
});