No default style in ol.render.Box

This commit is contained in:
Éric Lemoine
2013-12-05 11:30:18 +01:00
committed by Antoine Abt
parent de329b02d3
commit 18f9eeab12
+4 -13
View File
@@ -7,17 +7,15 @@ goog.require('goog.asserts');
goog.require('goog.events'); goog.require('goog.events');
goog.require('ol.geom.Polygon'); goog.require('ol.geom.Polygon');
goog.require('ol.render.EventType'); goog.require('ol.render.EventType');
goog.require('ol.style.Fill');
goog.require('ol.style.Style');
/** /**
* @constructor * @constructor
* @extends {goog.Disposable} * @extends {goog.Disposable}
* @param {ol.style.Style=} opt_style Style. * @param {ol.style.Style} style Style.
*/ */
ol.render.Box = function(opt_style) { ol.render.Box = function(style) {
/** /**
* @private * @private
@@ -53,15 +51,7 @@ ol.render.Box = function(opt_style) {
* @private * @private
* @type {ol.style.Style} * @type {ol.style.Style}
*/ */
this.style_ = goog.isDef(opt_style) ? opt_style : new ol.style.Style({ this.style_ = style;
fill: new ol.style.Fill({
color: 'rgba(0,0,0,0.5)'
}),
image: null,
stroke: null,
text: null,
zIndex: 0
});
}; };
goog.inherits(ol.render.Box, goog.Disposable); goog.inherits(ol.render.Box, goog.Disposable);
@@ -113,6 +103,7 @@ ol.render.Box.prototype.handleMapPostCompose_ = function(event) {
var extent = event.getFrameState().extent; var extent = event.getFrameState().extent;
this.geometry_ = this.createGeometry_(extent); this.geometry_ = this.createGeometry_(extent);
var style = this.style_; var style = this.style_;
goog.asserts.assert(!goog.isNull(style));
var render = event.getRender(); var render = event.getRender();
render.setFillStrokeStyle(style.getFill(), style.getStroke()); render.setFillStrokeStyle(style.getFill(), style.getStroke());
render.drawPolygonGeometry(this.geometry_, null); render.drawPolygonGeometry(this.geometry_, null);