Changeset 4114

Timestamp:

08/30/07 01:59:29 (1 year ago)

Author:

elemoine

Message:

add new vector style property "graphicOpacity"
enabling mixing non-opaque vector geometries with opaque external graphics on the same vector layer
(closes #873)

Files:

• trunk/openlayers/examples/vector-features.html (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Feature/Vector.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Renderer/SVG.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Renderer/VML.js (modified) (1 diff)
• trunk/openlayers/tests/Layer/test_Vector.html (modified) (4 diffs)

trunk/openlayers/examples/vector-features.html

@@ -18 +18 @@
-                    "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
@@ -31 +41 @@
-            //style_blue.graphicHeight = 24;
-            
-
+
+
+
-            var style_green = {
-                strokeColor: "#00FF00",
@@ -39 +51 @@
-                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

trunk/openlayers/lib/OpenLayers/Feature/Vector.js

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

trunk/openlayers/lib/OpenLayers/Renderer/SVG.js

@@ -207 +207 @@
-                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());
@@ -214 +215 @@
-                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);

trunk/openlayers/lib/OpenLayers/Renderer/VML.js

@@ -211 +211 @@
-                node.appendChild(fill);
-            }
-
+
+
+
+
+
+
-                fill.setAttribute("opacity", style.fillOpacity);
-            }

trunk/openlayers/tests/Layer/test_Vector.html

@@ -158 +158 @@
-
-    function test_Layer_Vector_externalGraphic(t) {
-       t.plan(8
-       
-       
-       
-       
-               
-               
-    
-    
+    t.plan(9
+    
+    
+    
+    
+            
+            
+
+
-            
-        var layer = new OpenLayers.Layer.Vector("Test Layer");
@@ -192 +192 @@
-                graphicHeight: 16
-        });
+        var customStyle5 = new Object({
+                externalGraphic: 'test.png',
+                graphicWidth: 24,
+                graphicOpacity: 1
+        });
-               
-        var root = layer.renderer.root;
@@ -223 +228 @@
-                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') {
@@ -257 +267 @@
-                t.eq(root.firstChild.style.height,
-                            customStyle4.graphicHeight.toString()+'px',
-
+;
-                t.eq(root.firstChild.style.width,
-                            customStyle4.graphicWidth.toString()+'px',
-
+
+
+
+
+
+
+
+
+
+
-        }
-    }