Skip to content
Browse files

Allow literal from symbolizer without feature

  • Loading branch information...
1 parent 95f3fe5 commit c0c8faaf9f909ac7636153bd2e653d2e885204e2 @tschaub tschaub committed Mar 6, 2013
Showing with 19 additions and 7 deletions.
  1. +6 −2 src/ol/style/line.js
  2. +6 −2 src/ol/style/polygon.js
  3. +6 −2 src/ol/style/shape.js
  4. +1 −1 src/ol/style/symbolizer.js
View
8 src/ol/style/line.js
@@ -94,8 +94,12 @@ goog.inherits(ol.style.Line, ol.style.Symbolizer);
* @inheritDoc
* @return {ol.style.LineLiteral} Literal line symbolizer.
*/
-ol.style.Line.prototype.createLiteral = function(feature) {
- var attrs = feature.getAttributes();
+ol.style.Line.prototype.createLiteral = function(opt_feature) {
+ var attrs,
+ feature = opt_feature;
+ if (goog.isDef(feature)) {
+ attrs = feature.getAttributes();
+ }
var strokeStyle = this.strokeStyle_.evaluate(feature, attrs);
goog.asserts.assertString(strokeStyle, 'strokeStyle must be a string');
View
8 src/ol/style/polygon.js
@@ -109,8 +109,12 @@ goog.inherits(ol.style.Polygon, ol.style.Symbolizer);
* @inheritDoc
* @return {ol.style.PolygonLiteral} Literal shape symbolizer.
*/
-ol.style.Polygon.prototype.createLiteral = function(feature) {
- var attrs = feature.getAttributes();
+ol.style.Polygon.prototype.createLiteral = function(opt_feature) {
+ var attrs,
+ feature = opt_feature;
+ if (goog.isDef(feature)) {
+ attrs = feature.getAttributes();
+ }
var fillStyle = this.fillStyle_.evaluate(feature, attrs);
goog.asserts.assertString(fillStyle, 'fillStyle must be a string');
View
8 src/ol/style/shape.js
@@ -143,8 +143,12 @@ ol.style.Shape = function(options) {
* @inheritDoc
* @return {ol.style.ShapeLiteral} Literal shape symbolizer.
*/
-ol.style.Shape.prototype.createLiteral = function(feature) {
- var attrs = feature.getAttributes();
+ol.style.Shape.prototype.createLiteral = function(opt_feature) {
+ var attrs,
+ feature = opt_feature;
+ if (goog.isDef(feature)) {
+ attrs = feature.getAttributes();
+ }
var size = this.size_.evaluate(feature, attrs);
goog.asserts.assertNumber(size, 'size must be a number');
View
2 src/ol/style/symbolizer.js
@@ -27,7 +27,7 @@ ol.style.Symbolizer = function() {};
/**
- * @param {ol.Feature} feature Feature for evaluating expressions.
+ * @param {ol.Feature=} opt_feature Feature for evaluating expressions.
* @return {ol.style.SymbolizerLiteral} Literal symbolizer.
*/
ol.style.Symbolizer.prototype.createLiteral = goog.abstractMethod;

0 comments on commit c0c8faa

Please sign in to comment.
Something went wrong with that request. Please try again.