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

Merge pull request #7661 from ahocevar/background-fill-stroke

Browse Source 
Background fill stroke
This commit is contained in:
Andreas Hocevar
2017-12-26 19:57:54 +01:00
committed by GitHub
parent f2f5c5e958 c5a2c2fd22
commit 4fc8eff921
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/render/canvas/Replay.js
View File

@@ -993,7 +993,9 @@ _ol_render_canvas_Replay_.prototype.applyStroke = function(state) {
_ol_render_canvas_Replay_.prototype.updateFillStyle = function(state, applyFill, geometry) { _ol_render_canvas_Replay_.prototype.updateFillStyle = function(state, applyFill, geometry) {
var fillStyle = state.fillStyle; var fillStyle = state.fillStyle;
if (typeof fillStyle !== 'string' || state.currentFillStyle != fillStyle) { if (typeof fillStyle !== 'string' || state.currentFillStyle != fillStyle) {
applyFill.call(this, state, geometry); if (fillStyle !== undefined) {
applyFill.call(this, state, geometry);
}
state.currentFillStyle = fillStyle; state.currentFillStyle = fillStyle;
} }
}; };
@@ -1018,7 +1020,9 @@ _ol_render_canvas_Replay_.prototype.updateStrokeStyle = function(state, applyStr
state.currentLineJoin != lineJoin || state.currentLineJoin != lineJoin ||
state.currentLineWidth != lineWidth || state.currentLineWidth != lineWidth ||
state.currentMiterLimit != miterLimit) { state.currentMiterLimit != miterLimit) {
applyStroke.call(this, state); if (strokeStyle !== undefined) {
applyStroke.call(this, state);
}
state.currentStrokeStyle = strokeStyle; state.currentStrokeStyle = strokeStyle;
state.currentLineCap = lineCap; state.currentLineCap = lineCap;
state.currentLineDash = lineDash; state.currentLineDash = lineDash;

4
src/ol/style/Text.js
View File

@@ -151,7 +151,9 @@ _ol_style_Text_.prototype.clone = function() {
fill: this.getFill() ? this.getFill().clone() : undefined, fill: this.getFill() ? this.getFill().clone() : undefined,
stroke: this.getStroke() ? this.getStroke().clone() : undefined, stroke: this.getStroke() ? this.getStroke().clone() : undefined,
offsetX: this.getOffsetX(), offsetX: this.getOffsetX(),
offsetY: this.getOffsetY() offsetY: this.getOffsetY(),
backgroundFill: this.getBackgroundFill() ? this.getBackgroundFill().clone() : undefined,
backgroundStroke: this.getBackgroundStroke() ? this.getBackgroundStroke().clone() : undefined
}); });
}; };

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

@@ -52,6 +52,12 @@ describe('ol.style.Text', function() {
}), }),
stroke: new _ol_style_Stroke_({ stroke: new _ol_style_Stroke_({
color: '#319FD3' color: '#319FD3'
}),
backgroundFill: new _ol_style_Fill_({
color: 'white'
}),
backgroundStroke: new _ol_style_Stroke_({
color: 'black'
}) })
}); });
var clone = original.clone(); var clone = original.clone();
@@ -66,6 +72,8 @@ describe('ol.style.Text', function() {
expect(original.getTextBaseline()).to.eql(clone.getTextBaseline()); expect(original.getTextBaseline()).to.eql(clone.getTextBaseline());
expect(original.getStroke().getColor()).to.eql(clone.getStroke().getColor()); expect(original.getStroke().getColor()).to.eql(clone.getStroke().getColor());
expect(original.getFill().getColor()).to.eql(clone.getFill().getColor()); expect(original.getFill().getColor()).to.eql(clone.getFill().getColor());
expect(original.getBackgroundStroke().getColor()).to.eql(clone.getBackgroundStroke().getColor());
expect(original.getBackgroundFill().getColor()).to.eql(clone.getBackgroundFill().getColor());
}); });
it('the clone does not reference the same objects as the original', function() { it('the clone does not reference the same objects as the original', function() {