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

Rename _ol_style_Style_ to Style

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 13:22:43 -07:00
parent 5f40eec148
commit 4f4c90fc20
80 changed files with 420 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/rendering/ol/style/circle.test.js
+10 -10
View File
@@ -7,7 +7,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 _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
@@ -48,7 +48,7 @@ describe('ol.rendering.style.Circle', function() {
feature = new Feature({
geometry: multi ? new MultiPoint([[-20, 18]]) : new Point([-20, 18])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 2,
fill: new _ol_style_Fill_({
@@ -61,7 +61,7 @@ describe('ol.rendering.style.Circle', function() {
feature = new Feature({
geometry: multi ? new MultiPoint([[-10, 18]]) : new Point([-10, 18])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 4,
fill: new _ol_style_Fill_({
@@ -74,7 +74,7 @@ describe('ol.rendering.style.Circle', function() {
feature = new Feature({
geometry: multi ? new MultiPoint([[4, 18]]) : new Point([4, 18])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 6,
fill: new _ol_style_Fill_({
@@ -87,7 +87,7 @@ describe('ol.rendering.style.Circle', function() {
feature = new Feature({
geometry: multi ? new MultiPoint([[-20, 3]]) : new Point([-20, 3])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 2,
fill: new _ol_style_Fill_({
@@ -104,7 +104,7 @@ describe('ol.rendering.style.Circle', function() {
feature = new Feature({
geometry: multi ? new MultiPoint([[-10, 3]]) : new Point([-10, 3])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 4,
fill: new _ol_style_Fill_({
@@ -121,7 +121,7 @@ describe('ol.rendering.style.Circle', function() {
feature = new Feature({
geometry: multi ? new MultiPoint([[4, 3]]) : new Point([4, 3])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 6,
fill: new _ol_style_Fill_({
@@ -138,7 +138,7 @@ describe('ol.rendering.style.Circle', function() {
feature = new Feature({
geometry: multi ? new MultiPoint([[-20, -15]]) : new Point([-20, -15])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 2,
stroke: new _ol_style_Stroke_({
@@ -152,7 +152,7 @@ describe('ol.rendering.style.Circle', function() {
feature = new Feature({
geometry: multi ? new MultiPoint([[-10, -15]]) : new Point([-10, -15])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 4,
fill: new _ol_style_Fill_({
@@ -169,7 +169,7 @@ describe('ol.rendering.style.Circle', function() {
feature = new Feature({
geometry: multi ? new MultiPoint([[4, -15]]) : new Point([4, -15])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 6,
fill: new _ol_style_Fill_({
test/rendering/ol/style/icon.test.js
+2 -2
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 _ol_style_Icon_ from '../../../../src/ol/style/Icon.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
import Style from '../../../../src/ol/style/Style.js';
describe('ol.rendering.style.Icon', function() {
@@ -58,7 +58,7 @@ describe('ol.rendering.style.Icon', function() {
var img = new Image();
img.onload = function() {
imgInfo.img = img;
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_Icon_(/** @type {olx.style.IconOptions} */ (imgInfo))
}));
vectorSource.addFeature(feature);
test/rendering/ol/style/linestring.test.js
+7 -7
View File
@@ -4,7 +4,7 @@ import Map from '../../../../src/ol/Map.js';
import View from '../../../../src/ol/View.js';
import VectorLayer from '../../../../src/ol/layer/Vector.js';
import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
@@ -48,7 +48,7 @@ describe('ol.rendering.style.LineString', function() {
[[-20, 20], [15, 20]]
)
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
stroke: new _ol_style_Stroke_({color: '#DE213A', width: 3})
}));
vectorSource.addFeature(feature);
@@ -58,7 +58,7 @@ describe('ol.rendering.style.LineString', function() {
[[-20, 15], [15, 15]]
)
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
stroke: new _ol_style_Stroke_({color: '#9696EB', width: 1})
}));
vectorSource.addFeature(feature);
@@ -68,9 +68,9 @@ describe('ol.rendering.style.LineString', function() {
[[-20, 10], [15, 10]]
)
});
feature.setStyle([new _ol_style_Style_({
feature.setStyle([new Style({
stroke: new _ol_style_Stroke_({color: '#F2F211', width: 5})
}), new _ol_style_Style_({
}), new Style({
stroke: new _ol_style_Stroke_({color: '#292921', width: 1})
})]);
vectorSource.addFeature(feature);
@@ -80,7 +80,7 @@ describe('ol.rendering.style.LineString', function() {
[[-20, -20], [-2, 0], [15, -20]]
)
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
stroke: new _ol_style_Stroke_({
color: '#000000',
width: 2,
@@ -96,7 +96,7 @@ describe('ol.rendering.style.LineString', function() {
[[-20, -15], [-2, 5], [15, -15]]
)
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
stroke: new _ol_style_Stroke_({
color: '#000000',
width: 2,
test/rendering/ol/style/polygon.test.js
+14 -14
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 _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
@@ -53,7 +53,7 @@ describe('ol.rendering.style.Polygon', function() {
[[-20, 10], [-20, 20], [-5, 20], [-5, 10], [-20, 10]]
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
fill: fill
}));
vectorSource.addFeature(feature);
@@ -66,7 +66,7 @@ describe('ol.rendering.style.Polygon', function() {
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
fill: fill
}));
vectorSource.addFeature(feature);
@@ -80,7 +80,7 @@ describe('ol.rendering.style.Polygon', function() {
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
fill: fill
}));
vectorSource.addFeature(feature);
@@ -118,7 +118,7 @@ describe('ol.rendering.style.Polygon', function() {
[[-20, 10], [-20, 20], [-5, 20], [-5, 10], [-20, 10]]
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
stroke: stroke
}));
vectorSource.addFeature(feature);
@@ -131,7 +131,7 @@ describe('ol.rendering.style.Polygon', function() {
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
stroke: stroke
}));
vectorSource.addFeature(feature);
@@ -145,7 +145,7 @@ describe('ol.rendering.style.Polygon', function() {
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
stroke: stroke
}));
vectorSource.addFeature(feature);
@@ -178,7 +178,7 @@ describe('ol.rendering.style.Polygon', function() {
[[-20, 10], [-20, 20], [-0, 20], [-0, 10], [-20, 10]]
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: '#E31E10'}),
zIndex: 2
}));
@@ -190,7 +190,7 @@ describe('ol.rendering.style.Polygon', function() {
[[-15, 5], [-15, 15], [5, 15], [5, 5], [-15, 5]]
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: '#1A5E42'}),
zIndex: 3
}));
@@ -202,7 +202,7 @@ describe('ol.rendering.style.Polygon', function() {
[[-10, 0], [-10, 10], [10, 10], [10, 0], [-10, 0]]
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: '#DEDE21'}),
zIndex: 1
}));
@@ -235,7 +235,7 @@ describe('ol.rendering.style.Polygon', function() {
[[-20, 10], [-20, 20], [-5, 20], [-5, 10], [-20, 10]]
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: '#9696EB'}),
stroke: new _ol_style_Stroke_({color: '#9696EB', width: 1})
}));
@@ -247,7 +247,7 @@ describe('ol.rendering.style.Polygon', function() {
[[0, 10], [0, 20], [15, 20], [15, 10], [0, 10]]
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: 'rgba(255, 0, 0, 0.1)'}),
stroke: new _ol_style_Stroke_({color: '#DE213A', width: 3})
}));
@@ -259,7 +259,7 @@ describe('ol.rendering.style.Polygon', function() {
[[-20, -20], [-20, 5], [15, 5], [15, -20], [-20, -20]]
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: 'rgba(18, 204, 105, 0.3)'}),
stroke: new _ol_style_Stroke_({color: '#032E17', width: 2})
}));
@@ -321,7 +321,7 @@ describe('ol.rendering.style.Polygon', function() {
[[-20, -20], [-20, 20], [18, 20], [-20, -20]]
])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: createPattern()}),
stroke: new _ol_style_Stroke_({color: createRainbowGradient(), width: 3})
}));
test/rendering/ol/style/regularshape.test.js
+5 -5
View File
@@ -6,7 +6,7 @@ import VectorLayer from '../../../../src/ol/layer/Vector.js';
import VectorSource from '../../../../src/ol/source/Vector.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_RegularShape_ from '../../../../src/ol/style/RegularShape.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
@@ -46,7 +46,7 @@ describe('ol.rendering.style.RegularShape', function() {
geometry: new Point([-15, 15])
});
// square
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_RegularShape_({
fill: fill,
stroke: stroke,
@@ -61,7 +61,7 @@ describe('ol.rendering.style.RegularShape', function() {
geometry: new Point([8, 15])
});
// triangle
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_RegularShape_({
fill: fill,
stroke: stroke,
@@ -77,7 +77,7 @@ describe('ol.rendering.style.RegularShape', function() {
geometry: new Point([-10, -8])
});
// star
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_RegularShape_({
fill: fill,
stroke: stroke,
@@ -93,7 +93,7 @@ describe('ol.rendering.style.RegularShape', function() {
geometry: new Point([12, -8])
});
// cross
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
image: new _ol_style_RegularShape_({
fill: fill,
stroke: stroke,
test/rendering/ol/style/text.test.js
+16 -16
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_Text_ from '../../../../src/ol/style/Text.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
import Style from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
describe('ol.rendering.style.Text', function() {
@@ -52,7 +52,7 @@ describe('ol.rendering.style.Text', function() {
feature = new Feature({
geometry: new Point([-20, 18])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
scale: scale,
text: 'hello',
@@ -64,7 +64,7 @@ describe('ol.rendering.style.Text', function() {
feature = new Feature({
geometry: new Point([-10, 0])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
scale: scale,
text: 'hello',
@@ -83,7 +83,7 @@ describe('ol.rendering.style.Text', function() {
feature = new Feature({
geometry: new Point([20, 10])
});
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
scale: scale,
rotateWithView: true,
@@ -107,7 +107,7 @@ describe('ol.rendering.style.Text', function() {
function createLineString(coords, textAlign, maxAngle, strokeColor, strokeWidth, scale) {
var geom = new LineString();
geom.setFlatCoordinates('XY', coords);
var style = new _ol_style_Style_({
var style = new Style({
stroke: new _ol_style_Stroke_({
color: 'red'
}),
@@ -176,7 +176,7 @@ describe('ol.rendering.style.Text', function() {
createMap('canvas');
var feature;
feature = new Feature(new Point([25, 0]));
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
text: 'Hello world\nleft',
font: 'bold 14px sans-serif',
@@ -185,7 +185,7 @@ describe('ol.rendering.style.Text', function() {
}));
vectorSource.addFeature(feature);
feature = new Feature(new Point([-25, 0]));
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
text: 'Hello world\nright',
font: 'bold 14px sans-serif',
@@ -194,7 +194,7 @@ describe('ol.rendering.style.Text', function() {
}));
vectorSource.addFeature(feature);
feature = new Feature(new Point([0, 25]));
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
text: 'Hello world\nbottom',
font: 'bold 14px sans-serif',
@@ -203,7 +203,7 @@ describe('ol.rendering.style.Text', function() {
}));
vectorSource.addFeature(feature);
feature = new Feature(new Point([0, -25]));
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
text: 'top\nHello world',
font: 'bold 14px sans-serif',
@@ -218,7 +218,7 @@ describe('ol.rendering.style.Text', function() {
createMap('canvas');
var feature;
feature = new Feature(new Point([0, 0]));
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
text: 'Hello world\nleft',
font: 'bold 14px sans-serif',
@@ -228,7 +228,7 @@ describe('ol.rendering.style.Text', function() {
}));
vectorSource.addFeature(feature);
feature = new Feature(new Point([0, 0]));
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
text: 'Hello world\nright',
font: 'bold 14px sans-serif',
@@ -238,7 +238,7 @@ describe('ol.rendering.style.Text', function() {
}));
vectorSource.addFeature(feature);
feature = new Feature(new Point([0, 0]));
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
text: 'Hello world\nbottom',
font: 'bold 14px sans-serif',
@@ -248,7 +248,7 @@ describe('ol.rendering.style.Text', function() {
}));
vectorSource.addFeature(feature);
feature = new Feature(new Point([0, 0]));
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
text: 'top\nHello world',
font: 'bold 14px sans-serif',
@@ -273,7 +273,7 @@ describe('ol.rendering.style.Text', function() {
line.translate(0, -100);
geom.appendLineString(line);
var feature = new Feature(geom);
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
text: 'Hello world',
placement: 'line',
@@ -290,7 +290,7 @@ describe('ol.rendering.style.Text', function() {
var geom = new Polygon(null);
geom.setFlatCoordinates('XY', polygon, [polygon.length]);
var feature = new Feature(geom);
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
text: 'Hello world',
font: 'bold 24px sans-serif',
@@ -316,7 +316,7 @@ describe('ol.rendering.style.Text', function() {
geom.translate(0, -60);
multiPolygon.appendPolygon(geom);
var feature = new Feature(multiPolygon);
feature.setStyle(new _ol_style_Style_({
feature.setStyle(new Style({
text: new _ol_style_Text_({
text: 'Hello world',
font: 'bold 24px sans-serif',