ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1113 from tschaub/point-symbolizers

Browse Source 
ol.style.Shape and ol.style.Icon don't inherit from ol.style.Point.
This commit is contained in:
Tim Schaub
2013-10-09 13:19:14 -07:00
parent 7be90877fe d5ab5ec1d2
commit 3893351d01
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/style/iconsymbolizer.js
+2
View File
@@ -17,6 +17,7 @@ goog.require('ol.style.Point');
* @param {ol.style.IconOptions} options Icon options. * @param {ol.style.IconOptions} options Icon options.
*/ */
ol.style.Icon = function(options) { ol.style.Icon = function(options) {
goog.base(this);
goog.asserts.assert(options.url, 'url must be set'); 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); options.zIndex : new ol.expr.Literal(options.zIndex);
}; };
goog.inherits(ol.style.Icon, ol.style.Point);
/** /**
src/ol/style/shapesymbolizer.js
+2
View File
@@ -20,6 +20,7 @@ goog.require('ol.style.Stroke');
* @param {ol.style.ShapeOptions} options Shape options. * @param {ol.style.ShapeOptions} options Shape options.
*/ */
ol.style.Shape = function(options) { ol.style.Shape = function(options) {
goog.base(this);
/** /**
* @type {ol.style.ShapeType} * @type {ol.style.ShapeType}
@@ -63,6 +64,7 @@ ol.style.Shape = function(options) {
options.zIndex : new ol.expr.Literal(options.zIndex); options.zIndex : new ol.expr.Literal(options.zIndex);
}; };
goog.inherits(ol.style.Shape, ol.style.Point);
/** /**
test/spec/ol/style/iconsymbolizer.test.js
+2
View File
@@ -15,6 +15,7 @@ describe('ol.style.Icon', function() {
yOffset: 15 yOffset: 15
}); });
expect(symbolizer).to.be.a(ol.style.Icon); expect(symbolizer).to.be.a(ol.style.Icon);
expect(symbolizer).to.be.a(ol.style.Point);
}); });
it('accepts expressions', function() { it('accepts expressions', function() {
@@ -527,3 +528,4 @@ goog.require('ol.geom.GeometryType');
goog.require('ol.geom.Point'); goog.require('ol.geom.Point');
goog.require('ol.style.Icon'); goog.require('ol.style.Icon');
goog.require('ol.style.IconLiteral'); goog.require('ol.style.IconLiteral');
goog.require('ol.style.Point');
test/spec/ol/style/shapesymbolizer.test.js
+2
View File
@@ -12,6 +12,7 @@ describe('ol.style.Shape', function() {
}) })
}); });
expect(symbolizer).to.be.a(ol.style.Shape); expect(symbolizer).to.be.a(ol.style.Shape);
expect(symbolizer).to.be.a(ol.style.Point);
}); });
it('accepts expressions', function() { it('accepts expressions', function() {
@@ -329,6 +330,7 @@ goog.require('ol.geom.GeometryType');
goog.require('ol.geom.Point'); goog.require('ol.geom.Point');
goog.require('ol.expr'); goog.require('ol.expr');
goog.require('ol.style.Fill'); goog.require('ol.style.Fill');
goog.require('ol.style.Point');
goog.require('ol.style.Shape'); goog.require('ol.style.Shape');
goog.require('ol.style.ShapeLiteral'); goog.require('ol.style.ShapeLiteral');
goog.require('ol.style.ShapeType'); goog.require('ol.style.ShapeType');