[OpenLayers-Commits] r12227 - in trunk/openlayers/lib/OpenLayers: . Format Format/OWSContext

[commits-20090109 at openlayers.org]

Author: ahocevar
Date: 2011-08-09 10:33:37 -0700 (Tue, 09 Aug 2011)
New Revision: 12227

Modified:
   trunk/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js
   trunk/openlayers/lib/OpenLayers/Format/WMC.js
   trunk/openlayers/lib/OpenLayers/Layer.js
Log:
making 1 the default for layer opacity. p=mosesonline,me r=me (closes #3441)

Modified: trunk/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js	2011-08-08 14:27:19 UTC (rev 12226)
+++ trunk/openlayers/lib/OpenLayers/Format/OWSContext/v0_3_1.js	2011-08-09 17:33:37 UTC (rev 12227)
@@ -466,7 +466,7 @@
                     name: layer.params.LAYERS,
                     queryable: layer.queryable ? "1" : "0",
                     hidden: layer.visibility ? "0" : "1",
-                    opacity: layer.opacity ? layer.opacity: null}
+                    opacity: layer.hasOwnProperty("opacity") ? layer.opacity : null}
                 });
                 this.writeNode("ows:Title", layer.name, node);
                 this.writeNode("ows:OutputFormat", layer.params.FORMAT, node);

Modified: trunk/openlayers/lib/OpenLayers/Format/WMC.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Format/WMC.js	2011-08-08 14:27:19 UTC (rev 12226)
+++ trunk/openlayers/lib/OpenLayers/Format/WMC.js	2011-08-09 17:33:37 UTC (rev 12227)
@@ -61,7 +61,7 @@
             numZoomLevels: layer.numZoomLevels,
             units: layer.units,
             isBaseLayer: layer.isBaseLayer,
-            opacity: layer.opacity,
+            opacity: layer.opacity == 1 ? undefined : layer.opacity,
             displayInLayerSwitcher: layer.displayInLayerSwitcher,
             singleTile: layer.singleTile,
             tileSize: (layer.singleTile || !layer.tileSize) ? 

Modified: trunk/openlayers/lib/OpenLayers/Layer.js
===================================================================
--- trunk/openlayers/lib/OpenLayers/Layer.js	2011-08-08 14:27:19 UTC (rev 12226)
+++ trunk/openlayers/lib/OpenLayers/Layer.js	2011-08-09 17:33:37 UTC (rev 12227)
@@ -35,9 +35,10 @@
 
     /**
      * Property: opacity
-     * {Float} The layer's opacity. Float number between 0.0 and 1.0.
+     * {Float} The layer's opacity. Float number between 0.0 and 1.0. Default
+     * is 1.
      */
-    opacity: null,
+    opacity: 1,
 
     /**
      * APIProperty: alwaysInRange
@@ -349,7 +350,7 @@
             this.div.style.width = "100%";
             this.div.style.height = "100%";
             this.div.dir = "ltr";
-            if (this.opacity != null) {
+            if (this.opacity != null && this.opacity < 1) {
                 OpenLayers.Util.modifyDOMElement(
                     this.div, null, null, null, null, null, null, this.opacity
                 );