Merge pull request #6134 from dnlkoch/add-style-setters

Add setter methods for fill, image, stroke and text styles

src/ol/style/style.js

@@ -125,6 +125,16 @@ ol.style.Style.prototype.getFill = function() {
 };
 
 
+/**
+ * Set the fill style.
+ * @param {ol.style.Fill} fill Fill style.
+ * @api
+ */
+ol.style.Style.prototype.setFill = function(fill) {
+  this.fill_ = fill;
+};
+
+
 /**
  * Get the image style.
  * @return {ol.style.Image} Image style.
@@ -135,6 +145,16 @@ ol.style.Style.prototype.getImage = function() {
 };
 
 
+/**
+ * Set the image style.
+ * @param {ol.style.Image} image Image style.
+ * @api
+ */
+ol.style.Style.prototype.setImage = function(image) {
+  this.image_ = image;
+};
+
+
 /**
  * Get the stroke style.
  * @return {ol.style.Stroke} Stroke style.
@@ -145,6 +165,16 @@ ol.style.Style.prototype.getStroke = function() {
 };
 
 
+/**
+ * Set the stroke style.
+ * @param {ol.style.Stroke} stroke Stroke style.
+ * @api
+ */
+ol.style.Style.prototype.setStroke = function(stroke) {
+  this.stroke_ = stroke;
+};
+
+
 /**
  * Get the text style.
  * @return {ol.style.Text} Text style.
@@ -155,6 +185,16 @@ ol.style.Style.prototype.getText = function() {
 };
 
 
+/**
+ * Set the text style.
+ * @param {ol.style.Text} text Text style.
+ * @api
+ */
+ol.style.Style.prototype.setText = function(text) {
+  this.text_ = text;
+};
+
+
 /**
  * Get the z-index for the style.
  * @return {number|undefined} ZIndex.

test/spec/ol/style/style.test.js

@@ -11,6 +11,30 @@ goog.require('ol.style.Text');
 
 describe('ol.style.Style', function() {
 
+  var testFill = new ol.style.Fill({
+    color: 'rgba(255, 255, 255, 0.6)'
+  });
+
+  var testStroke = new ol.style.Stroke({
+    color: '#319FD3',
+    width: 1
+  });
+
+  var testText = new ol.style.Text({
+    font: '12px Calibri,sans-serif',
+    fill: new ol.style.Fill({
+      color: '#000'
+    }),
+    stroke: new ol.style.Stroke({
+      color: '#fff',
+      width: 3
+    })
+  });
+
+  var testImage = new ol.style.Circle({
+    radius: 5
+  });
+
   describe('#clone', function() {
 
     it('creates a new ol.style.Style', function() {
@@ -92,6 +116,82 @@ describe('ol.style.Style', function() {
     });
   });
 
+  describe('#getFill', function() {
+    var style = new ol.style.Style({
+      fill: testFill
+    });
+
+    it('returns the fill style of a style', function() {
+      expect(style.getFill()).to.eql(testFill);
+    });
+  });
+
+  describe('#setFill', function() {
+    var style = new ol.style.Style();
+
+    it('sets the fill style of a style', function() {
+      style.setFill(testFill);
+      expect(style.getFill()).to.eql(testFill);
+    });
+  });
+
+  describe('#getImage', function() {
+    var style = new ol.style.Style({
+      image: testImage
+    });
+
+    it('returns the image style of a style', function() {
+      expect(style.getImage()).to.eql(testImage);
+    });
+  });
+
+  describe('#setImage', function() {
+    var style = new ol.style.Style();
+
+    it('sets the image style of a style', function() {
+      style.setImage(testImage);
+      expect(style.getImage()).to.eql(testImage);
+    });
+  });
+
+  describe('#getStroke', function() {
+    var style = new ol.style.Style({
+      stroke: testStroke
+    });
+
+    it('returns the stroke style of a style', function() {
+      expect(style.getStroke()).to.eql(testStroke);
+    });
+  });
+
+  describe('#setStroke', function() {
+    var style = new ol.style.Style();
+
+    it('sets the stroke style of a style', function() {
+      style.setStroke(testStroke);
+      expect(style.getStroke()).to.eql(testStroke);
+    });
+  });
+
+  describe('#getText', function() {
+    var style = new ol.style.Style({
+      text: testText
+    });
+
+    it('returns the text style of a style', function() {
+      expect(style.getText()).to.eql(testText);
+    });
+  });
+
+  describe('#setText', function() {
+    var style = new ol.style.Style();
+
+    it('sets the text style of a style', function() {
+      style.setText(testText);
+      expect(style.getText()).to.eql(testText);
+    });
+  });
+
   describe('#setGeometry', function() {
     var style = new ol.style.Style();