Ticket #873: patch-graphicOpacity.diff

tests/Layer/test_Vector.html

@@ -157 +157 @@
-    }
-
-    function test_Layer_Vector_externalGraphic(t) {
-       t.plan(8
-       
-       
-       
-       
-               
-               
-    
-    
+    t.plan(9
+    
+    
+    
+    
+            
+            
+
+
-            
-        var layer = new OpenLayers.Layer.Vector("Test Layer");
-        var map = new OpenLayers.Map('map');
@@ -191 +191 @@
-                graphicWidth: 24,
-                graphicHeight: 16
-        });
+        var customStyle5 = new Object({
+                externalGraphic: 'test.png',
+                graphicWidth: 24,
+                graphicOpacity: 1
+        });
-               
-        var root = layer.renderer.root;
-        if (layer.renderer.CLASS_NAME == 'OpenLayers.Renderer.SVG') {
@@ -222 +227 @@
-                layer.drawFeature(feature);
-                t.eq(root.firstChild.getAttributeNS(null, 'height'),
-                            customStyle4.graphicHeight.toString(),
-
+;
-                t.eq(root.firstChild.getAttributeNS(null, 'width'),
-                            customStyle4.graphicWidth.toString(),
-
+
+
+
+
+
+
-        }
-        if (layer.renderer.CLASS_NAME == 'OpenLayers.Renderer.VML') {
-                feature.style = customStyle1;
@@ -256 +266 @@
-                layer.drawFeature(feature);
-                t.eq(root.firstChild.style.height,
-                            customStyle4.graphicHeight.toString()+'px',
-
+;
-                t.eq(root.firstChild.style.width,
-                            customStyle4.graphicWidth.toString()+'px',
-
+
+
+
+
+
+
+
+
+
+
-        }
-    }
-

lib/OpenLayers/Feature/Vector.js

@@ -257 +257 @@
- *  - hoverPointRadius: 1,
- *  - hoverPointUnit: "%",
- *  - pointerEvents: "visiblePainted"
+ *
+ * Other style properties that have no default values:
+ *
+ *  - externalGraphic,
+ *  - graphicWidth,
+ *  - graphicHeight,
+ *  - graphicOpacity
- */ 
-
-OpenLayers.Feature.Vector.style = {

lib/OpenLayers/Renderer/VML.js

@@ -210 +210 @@
-                fill = this.createNode('v:fill', node.id + "_fill");
-                node.appendChild(fill);
-            }
-
+
+
+
+
+
+
-                fill.setAttribute("opacity", style.fillOpacity);
-            }
-        }

lib/OpenLayers/Renderer/SVG.js

@@ -206 +206 @@
-                var height = style.graphicHeight || style.graphicWidth;
-                width = width ? width : style.pointRadius*2;
-                height = height ? height : style.pointRadius*2;
+                var opacity = style.graphicOpacity || style.fillOpacity;
-                
-                node.setAttributeNS(null, "x", x-(.5*width).toFixed());
-                node.setAttributeNS(null, "y", -y-(.5*height).toFixed());
@@ -213 +214 @@
-                node.setAttributeNS(null, "height", height);
-                node.setAttributeNS("http://www.w3.org/1999/xlink", "href", style.externalGraphic);
-                node.setAttributeNS(null, "transform", "scale(1,-1)");
-style.fillO
+o
-            } else {
-                node.setAttributeNS(null, "r", style.pointRadius);
-            }

examples/vector-features.html

@@ -17 +17 @@
-            var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
-            map.addLayer(layer);
+
+            /*
+             * Layer style
+             */
+            // we want opaque external graphics and non-opaque internal graphics
+            var layer_style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
+            layer_style.fillOpacity = 0.2;
+            layer_style.graphicOpacity = 1;
-            
-
+
+
+
+
-            style_blue.strokeColor = "blue"; 
-            style_blue.fillColor = "blue"; 
-            style_blue.externalGraphic = "../img/marker.png";
-            
-            // each of the three lines below means the same, if only one of
-            // them is active: the image will have a size of 24px, and the
-            // aspect ratio will be kept
@@ -30 +40 @@
-            //style_blue.graphicWidth = 24;
-            //style_blue.graphicHeight = 24;
-            
-
+
+
+
-            var style_green = {
-                strokeColor: "#00FF00",
-                strokeOpacity: 1,
@@ -38 +50 @@
-                pointRadius: 6,
-                pointerEvents: "visiblePainted"
-            };
+
+            /*
+             * Mark style
+             */
-            var style_mark = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
-            
-            // if graphicWidth and graphicHeight are both set, the aspect ratio
-            // of the image will be ignored
-            style_mark.graphicWidth = 24;
-            style_mark.graphicHeight = 20;
-            
-            style_mark.externalGraphic = "../img/marker.png";
-            
-
+, {style: layer_style}
-            
-            // create a point feature
-            var point = new OpenLayers.Geometry.Point(-111.04, 45.68);