Changeset 5509

Timestamp:

12/19/07 10:00:49 (1 year ago)

Author:

fredj

Message:

OpenLayers.Layer.Markers - propagate layer's opacity to the markers. Thanks
ahughes for the bug report and crschmidt for review and advices. (Closes #1114)

Files:

• trunk/openlayers/lib/OpenLayers/Layer.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Markers.js (modified) (2 diffs)
• trunk/openlayers/tests/Layer/test_Markers.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Layer.js

@@ -29 +29 @@
-     */
-    div: null,
+
+    /**
+     * Property: opacity
+     * {Float} The layer's opacity. Float number between 0.0 and 1.0.
+     */
+    opacity: null,
-
-    /** 

trunk/openlayers/lib/OpenLayers/Layer/Markers.js

@@ -58 +58 @@
-    },
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /** 
-     * Method: moveTo
@@ -86 +101 @@
-    addMarker: function(marker) {
-        this.markers.push(marker);
+
+        if (this.opacity != null) {
+            marker.setOpacity(this.opacity);
+        }
+
-        if (this.map && this.map.getExtent()) {
-            marker.map = this.map;

trunk/openlayers/tests/Layer/test_Markers.html

@@ -78 +78 @@
-    }
-
+    function test_Layer_Markers_setOpacity(t) {
+        t.plan(1);
+
+        layer = new OpenLayers.Layer.Markers('Test Layer');
+
+        var opacity = 0.1234;
+        
+        for (var i = 0; i < 12; i++) {
+            layer.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(0,0), new OpenLayers.Icon()));
+        }
+
+        layer.setOpacity(opacity);
+
+        for (var i = 0; i < 4; i++) {
+            layer.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(0,0), new OpenLayers.Icon()));
+        }
+        
+        var itWorks = false;
+        for (var i = 0; i < layer.markers.length; i++) {
+            itWorks = parseFloat(layer.markers[i].icon.imageDiv.style.opacity) == opacity;
+            if (!itWorks) {
+                break;
+            }
+        }
+        t.ok(itWorks, "setOpacity change markers opacity");
+    }
-
-  </script>