Remove opacity for fill style for now

This commit is contained in:
Tom Payne
2013-11-10 01:40:25 +01:00
parent b95a19ba30
commit 913029f26d
+4 -6
View File
@@ -1,5 +1,6 @@
// FIXME decide how to handle fill opacity // FIXME decide how to handle fill opacity
goog.provide('ol.style');
goog.provide('ol.style.DefaultStyleFunction'); goog.provide('ol.style.DefaultStyleFunction');
goog.provide('ol.style.Style'); goog.provide('ol.style.Style');
goog.provide('ol.style.StyleFunction'); goog.provide('ol.style.StyleFunction');
@@ -10,8 +11,7 @@ goog.require('goog.functions');
/** /**
* @typedef {{color: string, * @typedef {{color: string}}
* opacity: number}}
*/ */
ol.style.Fill; ol.style.Fill;
@@ -24,8 +24,7 @@ ol.style.Fill;
ol.style.fill.equals = function(fillStyle1, fillStyle2) { ol.style.fill.equals = function(fillStyle1, fillStyle2) {
return fillStyle1 === fillStyle2 || ( return fillStyle1 === fillStyle2 || (
!goog.isNull(fillStyle1) && !goog.isNull(fillStyle2) && !goog.isNull(fillStyle1) && !goog.isNull(fillStyle2) &&
fillStyle1.color == fillStyle2.color && fillStyle1.color == fillStyle2.color);
fillStyle1.opacity == fillStyle2.opacity);
}; };
@@ -78,8 +77,7 @@ ol.style.StyleFunction;
* @type {ol.style.Fill} * @type {ol.style.Fill}
*/ */
ol.style.DEFAULT_FILL_STYLE = { ol.style.DEFAULT_FILL_STYLE = {
color: 'rgba(255, 0, 0, 0.1)', color: 'rgba(255, 0, 0, 0.1)'
opacity: 0.1
}; };