Support fontWeight in text symbolizer

This commit is contained in:
Tim Schaub
2013-10-09 11:52:00 -06:00
parent 7be90877fe
commit 2ee776d9f6
7 changed files with 112 additions and 1 deletions
+34
View File
@@ -44,6 +44,15 @@ ol.style.Text = function(options) {
(options.fontSize instanceof ol.expr.Expression) ?
options.fontSize : new ol.expr.Literal(options.fontSize);
/**
* @type {ol.expr.Expression}
* @private
*/
this.fontWeight_ = !goog.isDef(options.fontWeight) ?
new ol.expr.Literal(ol.style.TextDefaults.fontWeight) :
(options.fontWeight instanceof ol.expr.Expression) ?
options.fontWeight : new ol.expr.Literal(options.fontWeight);
/**
* @type {ol.expr.Expression}
* @private
@@ -102,6 +111,9 @@ ol.style.Text.prototype.createLiteral = function(featureOrType) {
var fontSize = Number(ol.expr.evaluateFeature(this.fontSize_, feature));
goog.asserts.assert(!isNaN(fontSize), 'fontSize must be a number');
var fontWeight = ol.expr.evaluateFeature(this.fontWeight_, feature);
goog.asserts.assertString(fontWeight, 'fontWeight must be a string');
var text = ol.expr.evaluateFeature(this.text_, feature);
goog.asserts.assertString(text, 'text must be a string');
@@ -129,6 +141,7 @@ ol.style.Text.prototype.createLiteral = function(featureOrType) {
color: color,
fontFamily: fontFamily,
fontSize: fontSize,
fontWeight: fontWeight,
text: text,
opacity: opacity,
strokeColor: strokeColor,
@@ -166,6 +179,15 @@ ol.style.Text.prototype.getFontSize = function() {
};
/**
* Get the font weight.
* @return {ol.expr.Expression} Font weight.
*/
ol.style.Text.prototype.getFontWeight = function() {
return this.fontWeight_;
};
/**
* Get the opacity.
* @return {ol.expr.Expression} Opacity.
@@ -223,6 +245,16 @@ ol.style.Text.prototype.setFontSize = function(fontSize) {
};
/**
* Set the font weight.
* @param {ol.expr.Expression} fontWeight Font weight.
*/
ol.style.Text.prototype.setFontWeight = function(fontWeight) {
goog.asserts.assertInstanceof(fontWeight, ol.expr.Expression);
this.fontWeight_ = fontWeight;
};
/**
* Set the opacity.
* @param {ol.expr.Expression} opacity Opacity.
@@ -257,6 +289,7 @@ ol.style.Text.prototype.setZIndex = function(zIndex) {
* @typedef {{color: string,
* fontFamily: string,
* fontSize: number,
* fontWeight: string,
* opacity: number,
* zIndex: number}}
*/
@@ -264,6 +297,7 @@ ol.style.TextDefaults = {
color: '#000',
fontFamily: 'sans-serif',
fontSize: 10,
fontWeight: 'normal',
opacity: 1,
zIndex: 0
};