Ticket #893: patch-893-A3.diff

tests/Layer/test_Vector.html

@@ -158 +158 @@
-    }
-
-    function test_Layer_Vector_externalGraphic(t) {
-9
+11
-        // base layer is needed for getResolution() to return a value,
-        // otherwise VML test will fail because style.left and style.top
-        // cannot be set
@@ -169 +169 @@
-               format: 'image/png'});
-            
-        var layer = new OpenLayers.Layer.Vector("Test Layer");
+        var renderer = layer.renderer;
-        var map = new OpenLayers.Map('map');
-        map.addLayers([baseLayer, layer]);
-
-
+
+
+
-        var feature = new OpenLayers.Feature.Vector(geometry);
-
+        map.zoomToMaxExtent();
+
-        var customStyle1 = new Object({
-                externalGraphic: 'test.png',
-                pointRadius: 10
@@ -197 +202 @@
-                graphicWidth: 24,
-                graphicOpacity: 1
-        });
+        var customStyle6 = new Object({
+                externalGraphic: 'test.png',
+                graphicWidth: 24,
+                graphicHeight: 16,
+                graphicXOffset: -24,
+                graphicYOffset: -16
+        });
-               
-layer.
+
-        if (layer.renderer.CLASS_NAME == 'OpenLayers.Renderer.SVG') {
-                feature.style = customStyle1;
-                layer.drawFeature(feature);
@@ -237 +249 @@
-                t.eq(root.firstChild.getAttributeNS(null, 'style'),
-                            'opacity: '+customStyle5.graphicOpacity.toString()+';',
-                            "graphicOpacity correctly set");
+                feature.style = customStyle6;
+                layer.drawFeature(feature);
+                var x = geometryX / renderer.getResolution() + renderer.left;
+                var y = geometryY / renderer.getResolution() - renderer.top;
+                // SVG setStyle() gets x and y using getAttributeNS(), which returns
+                // a value with only 3 decimal digits. To mimic this we use toFixed(3) here
+                x = x.toFixed(3);
+                y = y.toFixed(3);
+                // toFixed() returns a string
+                x = parseFloat(x);
+                y = parseFloat(y);
+                t.eq(root.firstChild.getAttributeNS(null, 'x'),
+                        (x + customStyle6.graphicXOffset).toFixed().toString(),
+                        "graphicXOffset correctly set");
+                t.eq(root.firstChild.getAttributeNS(null, 'y'),
+                        (-y + customStyle6.graphicYOffset).toFixed().toString(),
+                        "graphicYOffset correctly set");
-        }
-        if (layer.renderer.CLASS_NAME == 'OpenLayers.Renderer.VML') {
-                feature.style = customStyle1;
@@ -279 +308 @@
-                t.eq(opacity,
-                            customStyle5.graphicOpacity,
-                            "graphicOpacity correctly set"); 
+                feature.style = customStyle6;
+                layer.drawFeature(feature);
+                var x = geometryX / renderer.getResolution();
+                var y = geometryY / renderer.getResolution();
+                t.eq(root.firstChild.style.left,
+                            (x + customStyle6.graphicXOffset).toFixed().toString()+'px',
+                            "graphicXOffset correctly set");
+                            
+                t.eq(root.firstChild.style.top,
+                            (y - (customStyle6.graphicYOffset+parseInt(root.firstChild.style.height))).toFixed().toString()+'px',
+                            "graphicYOffset correctly set");
-
-        }
-    }

lib/OpenLayers/Feature/Vector.js

@@ -263 +263 @@
- *  - graphicWidth,
- *  - graphicHeight,
- *  - graphicOpacity
+ *  - graphicXOffset
+ *  - graphicYOffset
- */ 
-OpenLayers.Feature.Vector.style = {
-    'default': {

lib/OpenLayers/Renderer/VML.js

@@ -181 +181 @@
-                var height = style.graphicHeight || style.graphicWidth;
-                width = width ? width : style.pointRadius*2;
-                height = height ? height : style.pointRadius*2;
+
-                var resolution = this.getResolution();
-
-
+
+
+
+
+
+
+
-                node.style.width = width;
-                node.style.height = height;    
-                

lib/OpenLayers/Renderer/SVG.js

@@ -184 +184 @@
-            if (style.externalGraphic) {
-                // remove old node
-                var id = node.getAttributeNS(null, "id");
-node.getAttributeNS(null, "cx"
-node.getAttributeNS(null, "cy"
+parseFloat(node.getAttributeNS(null, "cx")
+parseFloat(node.getAttributeNS(null, "cy")
-                var _featureId = node._featureId;
-                var _geometryClass = node._geometryClass;
-                var _style = node._style;
@@ -206 +206 @@
-                var height = style.graphicHeight || style.graphicWidth;
-                width = width ? width : style.pointRadius*2;
-                height = height ? height : style.pointRadius*2;
+                var xOffset = (style.graphicXOffset != undefined) ?
+                    style.graphicXOffset : -(0.5 * width);
+                var yOffset = (style.graphicYOffset != undefined) ?
+                    style.graphicYOffset : -(0.5 * height);
-                var opacity = style.graphicOpacity || style.fillOpacity;
-                
-x-(.5*width
--y-(.5*heigh
+(x + xOffset
+(-y + yOffse
-                node.setAttributeNS(null, "width", width);
-                node.setAttributeNS(null, "height", height);
-                node.setAttributeNS("http://www.w3.org/1999/xlink", "href", style.externalGraphic);

examples/vector-features.html

@@ -58 +58 @@
-            // of the image will be ignored
-            style_mark.graphicWidth = 24;
-            style_mark.graphicHeight = 20;
+            style_mark.graphicXOffset = -(style_mark.graphicWidth/2);  // this is the default value
+            style_mark.graphicYOffset = -style_mark.graphicHeight;
-            style_mark.externalGraphic = "../img/marker.png";
-            
-            var vectorLayer = new OpenLayers.Layer.Vector("Simple Geometry", {style: layer_style});