From e36c53dd2319523b18801d59ee82579bdcf7ec5f Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 9 Oct 2013 09:01:30 -0600 Subject: [PATCH 1/2] Icon symbolizer extends point symbolizer --- src/ol/style/iconsymbolizer.js | 2 ++ test/spec/ol/style/iconsymbolizer.test.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/ol/style/iconsymbolizer.js b/src/ol/style/iconsymbolizer.js index 284dce51fe..d8e8c0556e 100644 --- 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/test/spec/ol/style/iconsymbolizer.test.js b/test/spec/ol/style/iconsymbolizer.test.js index 0f0a736f7d..cd34550842 100644 --- 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'); From d5ab5ec1d28aa2dd58beccd334fdf006e2c2a2ff Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 9 Oct 2013 09:01:51 -0600 Subject: [PATCH 2/2] Shape symbolizer extends point symbolizer --- src/ol/style/shapesymbolizer.js | 2 ++ test/spec/ol/style/shapesymbolizer.test.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/ol/style/shapesymbolizer.js b/src/ol/style/shapesymbolizer.js index 6c4ffde4f8..699ad9b364 100644 --- 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/shapesymbolizer.test.js b/test/spec/ol/style/shapesymbolizer.test.js index d6c1b56450..a0e2e685f7 100644 --- 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');