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,117 @@
+goog.provide('ol.style.Fill');
+
+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.PolygonLiteral');
+goog.require('ol.style.Symbolizer');
+
+
+
+/**
+ * @constructor
+ * @extends {ol.style.Symbolizer}
+ * @param {ol.style.FillOptions=} opt_options Polygon options.
+ */
+ol.style.Fill = 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.FillDefaults.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.FillDefaults.opacity) :
+      (options.opacity instanceof ol.expr.Expression) ?
+          options.opacity : new ol.expr.Literal(options.opacity);
+
+};
+goog.inherits(ol.style.Fill, ol.style.Symbolizer);
+
+
+/**
+ * @inheritDoc
+ * @return {ol.style.PolygonLiteral} Literal shape symbolizer.
+ */
+ol.style.Fill.prototype.createLiteral = function(type, opt_feature) {
+  var literal = null;
+
+  if (type === ol.geom.GeometryType.POLYGON ||
+      type === ol.geom.GeometryType.MULTIPOLYGON) {
+
+    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, 'color must be a number');
+
+    literal = new ol.style.PolygonLiteral({
+      fillColor: color,
+      fillOpacity: opacity
+    });
+  }
+
+  return literal;
+};
+
+
+/**
+ * Get the fill color.
+ * @return {ol.expr.Expression} Fill color.
+ */
+ol.style.Fill.prototype.getColor = function() {
+  return this.color_;
+};
+
+
+/**
+ * Get the fill opacity.
+ * @return {ol.expr.Expression} Fill opacity.
+ */
+ol.style.Fill.prototype.getOpacity = function() {
+  return this.opacity_;
+};
+
+
+/**
+ * Set the fill color.
+ * @param {ol.expr.Expression} color Fill color.
+ */
+ol.style.Fill.prototype.setColor = function(color) {
+  goog.asserts.assertInstanceof(color, ol.expr.Expression);
+  this.color_ = color;
+};
+
+
+/**
+ * Set the fill opacity.
+ * @param {ol.expr.Expression} opacity Fill opacity.
+ */
+ol.style.Fill.prototype.setOpacity = function(opacity) {
+  goog.asserts.assertInstanceof(opacity, ol.expr.Expression);
+  this.opacity_ = opacity;
+};
+
+
+/**
+ * @typedef {{fillColor: (string),
+ *            fillOpacity: (number)}}
+ */
+ol.style.FillDefaults = {
+  color: '#ffffff',
+  opacity: 0.4
+};