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

Use canvas style default values

Browse Source
This commit is contained in:
Éric Lemoine
2013-11-21 21:00:29 +01:00
parent 2a122f057c
commit c4731ff37b
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ol/render/canvas/canvasreplay.js
View File

@@ -13,6 +13,7 @@ goog.require('ol.extent');
goog.require('ol.geom.flat'); goog.require('ol.geom.flat');
goog.require('ol.render.IRender'); goog.require('ol.render.IRender');
goog.require('ol.render.IReplayGroup'); goog.require('ol.render.IReplayGroup');
goog.require('ol.render.canvas');
goog.require('ol.vec.Mat4'); goog.require('ol.vec.Mat4');
@@ -586,10 +587,11 @@ ol.render.canvas.LineStringReplay.prototype.setFillStrokeStyle =
goog.asserts.assert(!goog.isNull(this.state_)); goog.asserts.assert(!goog.isNull(this.state_));
goog.asserts.assert(goog.isNull(fillStyle)); goog.asserts.assert(goog.isNull(fillStyle));
goog.asserts.assert(!goog.isNull(strokeStyle)); goog.asserts.assert(!goog.isNull(strokeStyle));
goog.asserts.assert(goog.isDefAndNotNull(strokeStyle.color)); this.state_.strokeStyle = !goog.isNull(strokeStyle.color) ?
goog.asserts.assert(goog.isDef(strokeStyle.width)); ol.color.asString(strokeStyle.color) :
this.state_.strokeStyle = ol.color.asString(strokeStyle.color); ol.render.canvas.defaultStrokeStyle;
this.state_.lineWidth = strokeStyle.width; this.state_.lineWidth = goog.isDef(strokeStyle.width) ?
strokeStyle.width : ol.render.canvas.defaultLineWidth;
}; };
@@ -733,15 +735,22 @@ ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyle =
function(fillStyle, strokeStyle) { function(fillStyle, strokeStyle) {
goog.asserts.assert(!goog.isNull(this.state_)); goog.asserts.assert(!goog.isNull(this.state_));
goog.asserts.assert(!goog.isNull(fillStyle) || !goog.isNull(strokeStyle)); goog.asserts.assert(!goog.isNull(fillStyle) || !goog.isNull(strokeStyle));
var state = this.state_;
if (!goog.isNull(fillStyle)) { if (!goog.isNull(fillStyle)) {
goog.asserts.assert(goog.isDefAndNotNull(fillStyle.color)); state.fillStyle = !goog.isNull(fillStyle.color) ?
this.state_.fillStyle = ol.color.asString(fillStyle.color); ol.color.asString(fillStyle.color) : ol.render.canvas.defaultFillStyle;
} else {
state.fillStyle = undefined;
} }
if (!goog.isNull(strokeStyle)) { if (!goog.isNull(strokeStyle)) {
goog.asserts.assert(goog.isDefAndNotNull(strokeStyle.color)); state.strokeStyle = !goog.isNull(strokeStyle.color) ?
goog.asserts.assert(goog.isDef(strokeStyle.width)); ol.color.asString(strokeStyle.color) :
this.state_.strokeStyle = ol.color.asString(strokeStyle.color); ol.render.canvas.defaultStrokeStyle;
this.state_.lineWidth = strokeStyle.width; state.lineWidth = !goog.isDef(strokeStyle.width) ?
strokeStyle.width : ol.render.canvas.defaultLineWidth;
} else {
state.strokeStyle = undefined;
state.lineWidth = undefined;
} }
}; };