diff --git a/src/ol/render/canvas/canvas.js b/src/ol/render/canvas/canvas.js index d12b63f3dc..bf136ec0cd 100644 --- a/src/ol/render/canvas/canvas.js +++ b/src/ol/render/canvas/canvas.js @@ -3,6 +3,12 @@ goog.provide('ol.render.canvas'); goog.require('ol.color'); +/** + * @const {string} + */ +ol.render.canvas.defaultFont = '10px sans-serif'; + + /** * @const {ol.Color} */ @@ -39,6 +45,18 @@ ol.render.canvas.defaultMiterLimit = 10; ol.render.canvas.defaultStrokeStyle = ol.color.fromString('black'); +/** + * @const {string} + */ +ol.render.canvas.defaultTextAlign = 'start'; + + +/** + * @const {string} + */ +ol.render.canvas.defaultTextBaseline = 'alphabetic'; + + /** * @const {number} */ diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js index ff6b3d3ceb..55d143e279 100644 --- a/src/ol/render/canvas/canvasimmediate.js +++ b/src/ol/render/canvas/canvasimmediate.js @@ -452,11 +452,11 @@ ol.render.canvas.Immediate.prototype.setTextStyle = function(textStyle) { if (!ol.style.Text.equals(state.textStyle, textStyle)) { if (goog.isDefAndNotNull(textStyle)) { context.font = goog.isDef(textStyle.font) ? - textStyle.font : '10px sans-serif'; + textStyle.font : ol.render.canvas.defaultFont; context.textAlign = goog.isDef(textStyle.textAlign) ? - textStyle.textAlign : 'start'; + textStyle.textAlign : ol.render.canvas.defaultTextAlign; context.textBaseline = goog.isDef(textStyle.textBaseline) ? - textStyle.textBaseline : 'alphabetic'; + textStyle.textBaseline : ol.render.canvas.defaultTextBaseline; } state.textStyle = textStyle; }