From d60bc61a720de75dc021bfee67193d91607cfff5 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 14 Nov 2013 00:05:18 +0100 Subject: [PATCH] Allow ol.style.Stroke#width to be undefined --- src/ol/render/canvas/canvasimmediate.js | 2 +- src/ol/render/canvas/canvasreplay.js | 2 +- src/ol/shape.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js index 4c230e9f30..4a50bfa2eb 100644 --- a/src/ol/render/canvas/canvasimmediate.js +++ b/src/ol/render/canvas/canvasimmediate.js @@ -278,7 +278,7 @@ ol.render.canvas.Immediate.prototype.setFillStrokeStyle = if (!ol.style.stroke.equals(state.strokeStyle, strokeStyle)) { if (goog.isDefAndNotNull(strokeStyle)) { context.strokeStyle = ol.color.asString(strokeStyle.color); - context.lineWidth = strokeStyle.width; + context.lineWidth = goog.isDef(strokeStyle.width) ? strokeStyle.width : 1; } state.strokeStyle = strokeStyle; } diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index ed9483efe3..c432a81df2 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -145,7 +145,7 @@ ol.render.canvas.Replay.prototype.draw = function(context, transform) { goog.asserts.assert(goog.isObject(instruction[1])); var strokeStyle = /** @type {ol.style.Stroke} */ (instruction[1]); context.strokeStyle = ol.color.asString(strokeStyle.color); - context.lineWidth = strokeStyle.width; + context.lineWidth = goog.isDef(strokeStyle.width) ? strokeStyle.width : 1; ++i; } else if (type == ol.render.canvas.Instruction.STROKE) { context.stroke(); diff --git a/src/ol/shape.js b/src/ol/shape.js index d82372341c..446994fb99 100644 --- a/src/ol/shape.js +++ b/src/ol/shape.js @@ -37,7 +37,7 @@ ol.shape.renderCircle = function(radius, fillStyle, strokeStyle) { } if (goog.isDefAndNotNull(strokeStyle)) { context.strokeStyle = ol.color.asString(strokeStyle.color); - context.lineWidth = strokeStyle.width; + context.lineWidth = goog.isDef(strokeStyle.width) ? strokeStyle.width : 1; context.stroke(); }