Merge pull request openlayers#1113 from tschaub/point-symbolizers

ol.style.Shape and ol.style.Icon don't inherit from ol.style.Point.
dasakigr · Oct 9, 2013 · 3893351 · 3893351
2 parents 7be9087 + d5ab5ec
commit 3893351
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/src/ol/style/iconsymbolizer.js b/src/ol/style/iconsymbolizer.js
@@ -17,6 +17,7 @@ goog.require('ol.style.Point');
  * @param {ol.style.IconOptions} options Icon options.
  */
 ol.style.Icon = function(options) {
+  goog.base(this);
 
   goog.asserts.assert(options.url, 'url must be set');
 
@@ -91,6 +92,7 @@ ol.style.Icon = function(options) {
           options.zIndex : new ol.expr.Literal(options.zIndex);
 
 };
+goog.inherits(ol.style.Icon, ol.style.Point);
 
 
 /**

diff --git a/src/ol/style/shapesymbolizer.js b/src/ol/style/shapesymbolizer.js
@@ -20,6 +20,7 @@ goog.require('ol.style.Stroke');
  * @param {ol.style.ShapeOptions} options Shape options.
  */
 ol.style.Shape = function(options) {
+  goog.base(this);
 
   /**
    * @type {ol.style.ShapeType}
@@ -63,6 +64,7 @@ ol.style.Shape = function(options) {
           options.zIndex : new ol.expr.Literal(options.zIndex);
 
 };
+goog.inherits(ol.style.Shape, ol.style.Point);
 
 
 /**

diff --git a/test/spec/ol/style/iconsymbolizer.test.js b/test/spec/ol/style/iconsymbolizer.test.js
@@ -15,6 +15,7 @@ describe('ol.style.Icon', function() {
         yOffset: 15
       });
       expect(symbolizer).to.be.a(ol.style.Icon);
+      expect(symbolizer).to.be.a(ol.style.Point);
     });
 
     it('accepts expressions', function() {
@@ -527,3 +528,4 @@ goog.require('ol.geom.GeometryType');
 goog.require('ol.geom.Point');
 goog.require('ol.style.Icon');
 goog.require('ol.style.IconLiteral');
+goog.require('ol.style.Point');
diff --git a/test/spec/ol/style/shapesymbolizer.test.js b/test/spec/ol/style/shapesymbolizer.test.js
@@ -12,6 +12,7 @@ describe('ol.style.Shape', function() {
         })
       });
       expect(symbolizer).to.be.a(ol.style.Shape);
+      expect(symbolizer).to.be.a(ol.style.Point);
     });
 
     it('accepts expressions', function() {
@@ -329,6 +330,7 @@ goog.require('ol.geom.GeometryType');
 goog.require('ol.geom.Point');
 goog.require('ol.expr');
 goog.require('ol.style.Fill');
+goog.require('ol.style.Point');
 goog.require('ol.style.Shape');
 goog.require('ol.style.ShapeLiteral');
 goog.require('ol.style.ShapeType');