Line literal color instead of strokeColor etc.

This commit is contained in:
Tim Schaub
2013-08-15 09:55:10 -04:00
parent a5991aee03
commit 6078fe7b02
9 changed files with 58 additions and 46 deletions

View File

@@ -668,10 +668,10 @@ ol.parser.KML = function(opt_options) {
var literal = obj.symbolizer.createLiteral(
ol.geom.GeometryType.LINESTRING);
this.writeNode('color', {
color: literal.strokeColor.substring(1),
opacity: literal.strokeOpacity
color: literal.color.substring(1),
opacity: literal.opacity
}, null, node);
this.writeNode('width', literal.strokeWidth, null, node);
this.writeNode('width', literal.width, null, node);
return node;
},
'color': function(colorObj) {

View File

@@ -153,9 +153,9 @@ ol.renderer.canvas.VectorRenderer.prototype.renderLineStringFeatures_ =
i, ii, feature, id, currentSize, geometry, components, j, jj, line, dim,
k, kk, vec, strokeSize;
context.globalAlpha = symbolizer.strokeOpacity;
context.strokeStyle = symbolizer.strokeColor;
context.lineWidth = symbolizer.strokeWidth;
context.globalAlpha = symbolizer.opacity;
context.strokeStyle = symbolizer.color;
context.lineWidth = symbolizer.width;
context.lineCap = 'round'; // TODO: accept this as a symbolizer property
context.lineJoin = 'round'; // TODO: accept this as a symbolizer property
strokeSize = context.lineWidth * this.inverseScale_;

View File

@@ -5,9 +5,9 @@ goog.require('ol.style.Literal');
/**
* @typedef {{strokeColor: (string),
* strokeOpacity: (number),
* strokeWidth: (number)}}
* @typedef {{color: (string),
* opacity: (number),
* width: (number)}}
*/
ol.style.LineLiteralOptions;
@@ -22,19 +22,19 @@ ol.style.LineLiteral = function(options) {
goog.base(this);
goog.asserts.assertString(
options.strokeColor, 'strokeColor must be a string');
options.color, 'color must be a string');
/** @type {string} */
this.strokeColor = options.strokeColor;
this.color = options.color;
goog.asserts.assertNumber(
options.strokeOpacity, 'strokeOpacity must be a number');
options.opacity, 'opacity must be a number');
/** @type {number} */
this.strokeOpacity = options.strokeOpacity;
this.opacity = options.opacity;
goog.asserts.assertNumber(
options.strokeWidth, 'strokeWidth must be a number');
options.width, 'width must be a number');
/** @type {number} */
this.strokeWidth = options.strokeWidth;
this.width = options.width;
};
goog.inherits(ol.style.LineLiteral, ol.style.Literal);
@@ -44,7 +44,7 @@ goog.inherits(ol.style.LineLiteral, ol.style.Literal);
* @inheritDoc
*/
ol.style.LineLiteral.prototype.equals = function(lineLiteral) {
return this.strokeColor == lineLiteral.strokeColor &&
this.strokeOpacity == lineLiteral.strokeOpacity &&
this.strokeWidth == lineLiteral.strokeWidth;
return this.color == lineLiteral.color &&
this.opacity == lineLiteral.opacity &&
this.width == lineLiteral.width;
};

View File

@@ -82,9 +82,9 @@ ol.style.Stroke.prototype.createLiteral = function(featureOrType) {
if (type === ol.geom.GeometryType.LINESTRING ||
type === ol.geom.GeometryType.MULTILINESTRING) {
literal = new ol.style.LineLiteral({
strokeColor: color,
strokeOpacity: opacity,
strokeWidth: width
color: color,
opacity: opacity,
width: width
});
} else if (type === ol.geom.GeometryType.POLYGON ||
type === ol.geom.GeometryType.MULTIPOLYGON) {