From 18f9eeab12f7935063a7824d2a2bf40d20e68712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 5 Dec 2013 11:30:18 +0100 Subject: [PATCH] No default style in ol.render.Box --- src/ol/render/box.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/ol/render/box.js b/src/ol/render/box.js index d5c60c9b1f..4ea8e0cf6f 100644 --- a/src/ol/render/box.js +++ b/src/ol/render/box.js @@ -7,17 +7,15 @@ goog.require('goog.asserts'); goog.require('goog.events'); goog.require('ol.geom.Polygon'); goog.require('ol.render.EventType'); -goog.require('ol.style.Fill'); -goog.require('ol.style.Style'); /** * @constructor * @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 @@ -53,15 +51,7 @@ ol.render.Box = function(opt_style) { * @private * @type {ol.style.Style} */ - this.style_ = goog.isDef(opt_style) ? opt_style : new ol.style.Style({ - fill: new ol.style.Fill({ - color: 'rgba(0,0,0,0.5)' - }), - image: null, - stroke: null, - text: null, - zIndex: 0 - }); + this.style_ = style; }; goog.inherits(ol.render.Box, goog.Disposable); @@ -113,6 +103,7 @@ ol.render.Box.prototype.handleMapPostCompose_ = function(event) { var extent = event.getFrameState().extent; this.geometry_ = this.createGeometry_(extent); var style = this.style_; + goog.asserts.assert(!goog.isNull(style)); var render = event.getRender(); render.setFillStrokeStyle(style.getFill(), style.getStroke()); render.drawPolygonGeometry(this.geometry_, null);