Merge remote-tracking branch 'openlayers/master' into vector-api

old/src/ol/style/rule.js

@@ -54,6 +54,20 @@ ol.style.Rule = function(options) {
   this.maxResolution_ = goog.isDef(options.maxResolution) ?
       options.maxResolution : Infinity;
 
+  /**
+   * @type {string|undefined}
+   * @private
+   */
+  this.name_ = goog.isDef(options.name) ?
+      options.name : undefined;
+
+  /**
+   * @type {string|undefined}
+   * @private
+   */
+  this.title_ = goog.isDef(options.title) ?
+      options.title : undefined;
+
 };
 
 
@@ -78,3 +92,43 @@ ol.style.Rule.prototype.applies = function(feature, resolution) {
 ol.style.Rule.prototype.getSymbolizers = function() {
   return this.symbolizers_;
 };
+
+
+/**
+ * @return {ol.expr.Expression}
+ */
+ol.style.Rule.prototype.getFilter = function() {
+  return this.filter_;
+};
+
+
+/**
+ * @return {number}
+ */
+ol.style.Rule.prototype.getMinResolution = function() {
+  return this.minResolution_;
+};
+
+
+/**
+ * @return {number}
+ */
+ol.style.Rule.prototype.getMaxResolution = function() {
+  return this.maxResolution_;
+};
+
+
+/**
+ * @return {string|undefined}
+ */
+ol.style.Rule.prototype.getName = function() {
+  return this.name_;
+};
+
+
+/**
+ * @return {string|undefined}
+ */
+ol.style.Rule.prototype.getTitle = function() {
+  return this.title_;
+};

old/src/ol/style/textsymbolizer.js

@@ -215,6 +215,15 @@ ol.style.Text.prototype.getZIndex = function() {
 };
 
 
+/**
+ * Get the stroke.
+ * @return {ol.style.Stroke} Stroke.
+ */
+ol.style.Text.prototype.getStroke = function() {
+  return this.stroke_;
+};
+
+
 /**
  * Set the font color.
  * @param {ol.expr.Expression} color Font color.