Separate stroke and fill

2013-08-14 17:44:22 -04:00
parent dc54128c77
commit c36ceab2a0
30 changed files with 1157 additions and 1568 deletions
@@ -0,0 +1,158 @@
+goog.provide('ol.style.Stroke');
+goog.provide('ol.style.StrokeDefaults');
+
+goog.require('goog.asserts');
+goog.require('ol.geom.GeometryType');
+goog.require('ol.expr');
+goog.require('ol.expr.Expression');
+goog.require('ol.expr.Literal');
+goog.require('ol.style.LineLiteral');
+goog.require('ol.style.Symbolizer');
+goog.require('ol.style.Literal');
+
+
+
+/**
+ * @constructor
+ * @extends {ol.style.Symbolizer}
+ * @param {ol.style.StrokeOptions=} opt_options Stroke options.
+ */
+ol.style.Stroke = function(opt_options) {
+  goog.base(this);
+  var options = opt_options || {};
+
+  /**
+   * @type {ol.expr.Expression}
+   * @private
+   */
+  this.color_ = !goog.isDefAndNotNull(options.color) ?
+      new ol.expr.Literal(ol.style.StrokeDefaults.color) :
+      (options.color instanceof ol.expr.Expression) ?
+          options.color : new ol.expr.Literal(options.color);
+
+  /**
+   * @type {ol.expr.Expression}
+   * @private
+   */
+  this.opacity_ = !goog.isDefAndNotNull(options.opacity) ?
+      new ol.expr.Literal(ol.style.StrokeDefaults.opacity) :
+      (options.opacity instanceof ol.expr.Expression) ?
+          options.opacity : new ol.expr.Literal(options.opacity);
+
+  /**
+   * @type {ol.expr.Expression}
+   * @private
+   */
+  this.width_ = !goog.isDefAndNotNull(options.width) ?
+      new ol.expr.Literal(ol.style.StrokeDefaults.width) :
+      (options.width instanceof ol.expr.Expression) ?
+          options.width : new ol.expr.Literal(options.width);
+
+};
+goog.inherits(ol.style.Stroke, ol.style.Symbolizer);
+
+
+/**
+ * @inheritDoc
+ * @return {ol.style.LineLiteral|ol.style.PolygonLiteral} Symbolizer literal.
+ */
+ol.style.Stroke.prototype.createLiteral = function(type, opt_feature) {
+  var color = ol.expr.evaluateFeature(
+      this.color_, opt_feature);
+  goog.asserts.assertString(color, 'color must be a string');
+
+  var opacity = ol.expr.evaluateFeature(
+      this.opacity_, opt_feature);
+  goog.asserts.assertNumber(opacity, 'opacity must be a number');
+
+  var width = ol.expr.evaluateFeature(
+      this.width_, opt_feature);
+  goog.asserts.assertNumber(width, 'width must be a number');
+
+  var literal = null;
+  if (type === ol.geom.GeometryType.LINESTRING ||
+      type === ol.geom.GeometryType.MULTILINESTRING) {
+    literal = new ol.style.LineLiteral({
+      strokeColor: color,
+      strokeOpacity: opacity,
+      strokeWidth: width
+    });
+  } else if (type === ol.geom.GeometryType.POLYGON ||
+      type === ol.geom.GeometryType.MULTIPOLYGON) {
+    literal = new ol.style.PolygonLiteral({
+      strokeColor: color,
+      strokeOpacity: opacity,
+      strokeWidth: width
+    });
+  }
+  return literal;
+};
+
+
+/**
+ * Get the stroke color.
+ * @return {ol.expr.Expression} Stroke color.
+ */
+ol.style.Stroke.prototype.getColor = function() {
+  return this.color_;
+};
+
+
+/**
+ * Get the stroke opacity.
+ * @return {ol.expr.Expression} Stroke opacity.
+ */
+ol.style.Stroke.prototype.getOpacity = function() {
+  return this.opacity_;
+};
+
+
+/**
+ * Get the stroke width.
+ * @return {ol.expr.Expression} Stroke width.
+ */
+ol.style.Stroke.prototype.getWidth = function() {
+  return this.width_;
+};
+
+
+/**
+ * Set the stroke color.
+ * @param {ol.expr.Expression} color Stroke color.
+ */
+ol.style.Stroke.prototype.setColor = function(color) {
+  goog.asserts.assertInstanceof(color, ol.expr.Expression);
+  this.color_ = color;
+};
+
+
+/**
+ * Set the stroke opacity.
+ * @param {ol.expr.Expression} opacity Stroke opacity.
+ */
+ol.style.Stroke.prototype.setOpacity = function(opacity) {
+  goog.asserts.assertInstanceof(opacity, ol.expr.Expression);
+  this.opacity_ = opacity;
+};
+
+
+/**
+ * Set the stroke width.
+ * @param {ol.expr.Expression} width Stroke width.
+ */
+ol.style.Stroke.prototype.setWidth = function(width) {
+  goog.asserts.assertInstanceof(width, ol.expr.Expression);
+  this.width_ = width;
+};
+
+
+/**
+ * @typedef {{strokeColor: (string),
+ *            strokeOpacity: (number),
+ *            strokeWidth: (number)}}
+ */
+ol.style.StrokeDefaults = {
+  color: '#696969',
+  opacity: 0.75,
+  width: 1.5
+};