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

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

@@ -8,7 +8,7 @@ import {transform} from '../../../../src/ol/proj.js';
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 _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_tilegrid_ from '../../../../src/ol/tilegrid.js';
@@ -281,7 +281,7 @@ describe('ol.rendering.layer.Tile', function() {
e.vectorContext.setImageStyle(new _ol_style_Circle_({
radius: 5,
snapToPixel: false,
fill: new _ol_style_Fill_({color: 'yellow'}),
fill: new Fill({color: 'yellow'}),
stroke: new _ol_style_Stroke_({color: 'red', width: 1})
}));
e.vectorContext.drawPoint(new Point(

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

@@ -9,7 +9,7 @@ import Polygon from '../../../../src/ol/geom/Polygon.js';
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 Fill from '../../../../src/ol/style/Fill.js';
import _ol_style_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';
@@ -255,7 +255,7 @@ describe('ol.rendering.layer.Vector', function() {
renderMode: 'image',
source: source,
style: new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(255,0,0,0.5)'
}),
stroke: new _ol_style_Stroke_({
@@ -355,7 +355,7 @@ describe('ol.rendering.layer.Vector', function() {
color: alternateColor(),
width: 1.25
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: alternateColor()
})
});
@@ -406,7 +406,7 @@ describe('ol.rendering.layer.Vector', function() {
color: alternateColor(),
width: 1.25
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: alternateColor()
})
});
@@ -471,7 +471,7 @@ describe('ol.rendering.layer.Vector', function() {
features: [feature]
}),
style: new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'blue'
})
})
@@ -539,7 +539,7 @@ describe('ol.rendering.layer.Vector', function() {
color: [0, 0, 0, 1],
width: 2
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: [255, 0, 0, 1]
})
}));
@@ -551,7 +551,7 @@ describe('ol.rendering.layer.Vector', function() {
it('renders partially out-of-view polygons with a fill', function(done) {
layer.setStyle(new Style({
fill: new _ol_style_Fill_({
fill: new Fill({
color: [0, 0, 0, 1]
})
}));

6
test/rendering/ol/layer/vectortile.test.js
View File

@@ -9,7 +9,7 @@ import _ol_obj_ from '../../../../src/ol/obj.js';
import VectorSource from '../../../../src/ol/source/Vector.js';
import VectorTileSource from '../../../../src/ol/source/VectorTile.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 Style from '../../../../src/ol/style/Style.js';
import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
@@ -107,7 +107,7 @@ describe('ol.rendering.layer.VectorTile', function() {
style: new Style({
image: new _ol_style_Circle_({
radius: 10,
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'red'
})
})
@@ -146,7 +146,7 @@ describe('ol.rendering.layer.VectorTile', function() {
return new Style({
image: new _ol_style_Circle_({
radius: 7,
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'red'
})
}),

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

@@ -5,7 +5,7 @@ import _ol_render_ from '../../../src/ol/render.js';
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 _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 Style from '../../../src/ol/style/Style.js';
@@ -35,7 +35,7 @@ describe('ol.render', function() {
var style = new Style({
image: new _ol_style_Circle_({
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'green'
}),
radius: 10
@@ -136,7 +136,7 @@ describe('ol.render', function() {
color: 'blue',
width: 8
}),
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0,0,255,0.5)'
})
});

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

@@ -6,7 +6,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_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 Style from '../../../../src/ol/style/Style.js';
import _ol_style_Stroke_ from '../../../../src/ol/style/Stroke.js';
@@ -51,7 +51,7 @@ describe('ol.rendering.style.Circle', function() {
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 2,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#91E339'
})
})
@@ -64,7 +64,7 @@ describe('ol.rendering.style.Circle', function() {
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 4,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#5447E6'
})
})
@@ -77,7 +77,7 @@ describe('ol.rendering.style.Circle', function() {
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 6,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#92A8A6'
})
})
@@ -90,7 +90,7 @@ describe('ol.rendering.style.Circle', function() {
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 2,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#91E339'
}),
stroke: new _ol_style_Stroke_({
@@ -107,7 +107,7 @@ describe('ol.rendering.style.Circle', function() {
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 4,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#5447E6'
}),
stroke: new _ol_style_Stroke_({
@@ -124,7 +124,7 @@ describe('ol.rendering.style.Circle', function() {
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 6,
fill: new _ol_style_Fill_({
fill: new Fill({
color: '#92A8A6'
}),
stroke: new _ol_style_Stroke_({
@@ -155,7 +155,7 @@ describe('ol.rendering.style.Circle', function() {
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 4,
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(0, 0, 255, 0.3)'
}),
stroke: new _ol_style_Stroke_({
@@ -172,7 +172,7 @@ describe('ol.rendering.style.Circle', function() {
feature.setStyle(new Style({
image: new _ol_style_Circle_({
radius: 6,
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'rgba(235, 45, 70, 0.6)'
}),
stroke: new _ol_style_Stroke_({

18
test/rendering/ol/style/polygon.test.js
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_Fill_ from '../../../../src/ol/style/Fill.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';
@@ -44,7 +44,7 @@ describe('ol.rendering.style.Polygon', function() {
describe('different types', function() {
function createFeatures() {
var fill = new _ol_style_Fill_({color: 'red'});
var fill = new Fill({color: 'red'});
var feature;
// rectangle
@@ -179,7 +179,7 @@ describe('ol.rendering.style.Polygon', function() {
])
});
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: '#E31E10'}),
fill: new Fill({color: '#E31E10'}),
zIndex: 2
}));
vectorSource.addFeature(feature);
@@ -191,7 +191,7 @@ describe('ol.rendering.style.Polygon', function() {
])
});
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: '#1A5E42'}),
fill: new Fill({color: '#1A5E42'}),
zIndex: 3
}));
vectorSource.addFeature(feature);
@@ -203,7 +203,7 @@ describe('ol.rendering.style.Polygon', function() {
])
});
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: '#DEDE21'}),
fill: new Fill({color: '#DEDE21'}),
zIndex: 1
}));
vectorSource.addFeature(feature);
@@ -236,7 +236,7 @@ describe('ol.rendering.style.Polygon', function() {
])
});
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: '#9696EB'}),
fill: new Fill({color: '#9696EB'}),
stroke: new _ol_style_Stroke_({color: '#9696EB', width: 1})
}));
vectorSource.addFeature(feature);
@@ -248,7 +248,7 @@ describe('ol.rendering.style.Polygon', function() {
])
});
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: 'rgba(255, 0, 0, 0.1)'}),
fill: new Fill({color: 'rgba(255, 0, 0, 0.1)'}),
stroke: new _ol_style_Stroke_({color: '#DE213A', width: 3})
}));
vectorSource.addFeature(feature);
@@ -260,7 +260,7 @@ describe('ol.rendering.style.Polygon', function() {
])
});
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: 'rgba(18, 204, 105, 0.3)'}),
fill: new Fill({color: 'rgba(18, 204, 105, 0.3)'}),
stroke: new _ol_style_Stroke_({color: '#032E17', width: 2})
}));
vectorSource.addFeature(feature);
@@ -322,7 +322,7 @@ describe('ol.rendering.style.Polygon', function() {
])
});
feature.setStyle(new Style({
fill: new _ol_style_Fill_({color: createPattern()}),
fill: new Fill({color: createPattern()}),
stroke: new _ol_style_Stroke_({color: createRainbowGradient(), width: 3})
}));
vectorSource.addFeature(feature);

6
test/rendering/ol/style/regularshape.test.js
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_Fill_ from '../../../../src/ol/style/Fill.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';
@@ -109,7 +109,7 @@ describe('ol.rendering.style.RegularShape', function() {
describe('#render', function() {
var stroke = new _ol_style_Stroke_({width: 2});
var fill = new _ol_style_Fill_({color: 'red'});
var fill = new Fill({color: 'red'});
it('tests the canvas renderer', function(done) {
createMap('canvas');
@@ -144,7 +144,7 @@ describe('ol.rendering.style.RegularShape', function() {
describe('uses the default fill and stroke color', function() {
var stroke = new _ol_style_Stroke_();
var fill = new _ol_style_Fill_();
var fill = new Fill();
it('tests the canvas renderer', function(done) {
createMap('canvas');

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

@@ -9,7 +9,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_Text_ from '../../../../src/ol/style/Text.js';
import _ol_style_Fill_ from '../../../../src/ol/style/Fill.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';
@@ -68,7 +68,7 @@ describe('ol.rendering.style.Text', function() {
text: new _ol_style_Text_({
scale: scale,
text: 'hello',
fill: new _ol_style_Fill_({
fill: new Fill({
color: 'red',
font: '12px sans-serif'
}),
@@ -333,17 +333,17 @@ describe('ol.rendering.style.Text', function() {
createMap('canvas');
createFeatures();
var features = vectorSource.getFeatures();
features[0].getStyle().getText().setBackgroundFill(new _ol_style_Fill_({
features[0].getStyle().getText().setBackgroundFill(new Fill({
color: 'red'
}));
features[1].getStyle().getText().setBackgroundFill(new _ol_style_Fill_({
features[1].getStyle().getText().setBackgroundFill(new Fill({
color: 'red'
}));
features[1].getStyle().getText().setBackgroundStroke(new _ol_style_Stroke_({
color: 'blue',
width: 3
}));
features[2].getStyle().getText().setBackgroundFill(new _ol_style_Fill_({
features[2].getStyle().getText().setBackgroundFill(new Fill({
color: 'red'
}));
features[2].getStyle().getText().setBackgroundStroke(new _ol_style_Stroke_({