stop the renderers from flashing black and filling white - ahhh, much prettier vector drawing now - thanks to pgiraud and crschmidt (closes #1042).
git-svn-id: http://svn.openlayers.org/trunk/openlayers@5158 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -127,10 +127,10 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
|
|||||||
node._featureId = featureId;
|
node._featureId = featureId;
|
||||||
node._geometryClass = geometry.CLASS_NAME;
|
node._geometryClass = geometry.CLASS_NAME;
|
||||||
node._style = style;
|
node._style = style;
|
||||||
this.root.appendChild(node);
|
|
||||||
|
|
||||||
//now actually draw the node, and style it
|
//now actually draw the node, and style it
|
||||||
this.drawGeometryNode(node, geometry);
|
node = this.drawGeometryNode(node, geometry);
|
||||||
|
this.root.appendChild(node);
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -180,7 +180,7 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
|
|||||||
|
|
||||||
//set style
|
//set style
|
||||||
//TBD simplify this
|
//TBD simplify this
|
||||||
this.setStyle(node, style, options, geometry);
|
return this.setStyle(node, style, options, geometry);
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -179,7 +179,6 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
setStyle: function(node, style, options) {
|
setStyle: function(node, style, options) {
|
||||||
style = style || node._style;
|
style = style || node._style;
|
||||||
options = options || node._options;
|
options = options || node._options;
|
||||||
|
|
||||||
if (node._geometryClass == "OpenLayers.Geometry.Point") {
|
if (node._geometryClass == "OpenLayers.Geometry.Point") {
|
||||||
if (style.externalGraphic) {
|
if (style.externalGraphic) {
|
||||||
// remove old node
|
// remove old node
|
||||||
@@ -189,14 +188,12 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
var _featureId = node._featureId;
|
var _featureId = node._featureId;
|
||||||
var _geometryClass = node._geometryClass;
|
var _geometryClass = node._geometryClass;
|
||||||
var _style = node._style;
|
var _style = node._style;
|
||||||
this.root.removeChild(node);
|
|
||||||
|
|
||||||
// create new image node
|
// create new image node
|
||||||
var node = this.createNode("image", id);
|
node = this.createNode("image", id);
|
||||||
node._featureId = _featureId;
|
node._featureId = _featureId;
|
||||||
node._geometryClass = _geometryClass;
|
node._geometryClass = _geometryClass;
|
||||||
node._style = _style;
|
node._style = _style;
|
||||||
this.root.appendChild(node);
|
|
||||||
|
|
||||||
// now style the new node
|
// now style the new node
|
||||||
if (style.graphicWidth && style.graphicHeight) {
|
if (style.graphicWidth && style.graphicHeight) {
|
||||||
@@ -247,6 +244,7 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
if (style.cursor) {
|
if (style.cursor) {
|
||||||
node.setAttributeNS(null, "cursor", style.cursor);
|
node.setAttributeNS(null, "cursor", style.cursor);
|
||||||
}
|
}
|
||||||
|
return node;
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -157,16 +157,14 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
var _featureId = node._featureId;
|
var _featureId = node._featureId;
|
||||||
var _geometryClass = node._geometryClass;
|
var _geometryClass = node._geometryClass;
|
||||||
var _style = node._style;
|
var _style = node._style;
|
||||||
this.root.removeChild(node);
|
|
||||||
|
|
||||||
// create new image node
|
// create new image node
|
||||||
var node = this.createNode("v:rect", id);
|
node = this.createNode("v:rect", id);
|
||||||
var fill = this.createNode("v:fill", id+"_image");
|
var fill = this.createNode("v:fill", id+"_image");
|
||||||
node.appendChild(fill);
|
node.appendChild(fill);
|
||||||
node._featureId = _featureId;
|
node._featureId = _featureId;
|
||||||
node._geometryClass = _geometryClass;
|
node._geometryClass = _geometryClass;
|
||||||
node._style = _style;
|
node._style = _style;
|
||||||
this.root.appendChild(node);
|
|
||||||
|
|
||||||
fill.src = style.externalGraphic;
|
fill.src = style.externalGraphic;
|
||||||
fill.type = "frame";
|
fill.type = "frame";
|
||||||
@@ -202,9 +200,12 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//fill
|
// fill
|
||||||
var fillColor = (options.isFilled) ? style.fillColor : "none";
|
if (options.isFilled) {
|
||||||
node.setAttribute("fillcolor", fillColor);
|
node.setAttribute("fillcolor", style.fillColor);
|
||||||
|
} else {
|
||||||
|
node.setAttribute("filled", "false");
|
||||||
|
}
|
||||||
var fills = node.getElementsByTagName("fill");
|
var fills = node.getElementsByTagName("fill");
|
||||||
var fill = (fills.length == 0) ? null : fills[0];
|
var fill = (fills.length == 0) ? null : fills[0];
|
||||||
if (!options.isFilled) {
|
if (!options.isFilled) {
|
||||||
@@ -227,10 +228,13 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//stroke
|
// stroke
|
||||||
var strokeColor = (options.isStroked) ? style.strokeColor : "none";
|
if (options.isStroked) {
|
||||||
node.setAttribute("strokecolor", strokeColor);
|
node.setAttribute("strokecolor", style.strokeColor);
|
||||||
node.setAttribute("strokeweight", style.strokeWidth);
|
node.setAttribute("strokeweight", style.strokeWidth);
|
||||||
|
} else {
|
||||||
|
node.setAttribute("stroked", "false");
|
||||||
|
}
|
||||||
var strokes = node.getElementsByTagName("stroke");
|
var strokes = node.getElementsByTagName("stroke");
|
||||||
var stroke = (strokes.length == 0) ? null : strokes[0];
|
var stroke = (strokes.length == 0) ? null : strokes[0];
|
||||||
if (!options.isStroked) {
|
if (!options.isStroked) {
|
||||||
@@ -249,6 +253,7 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
if (style.cursor) {
|
if (style.cursor) {
|
||||||
node.style.cursor = style.cursor;
|
node.style.cursor = style.cursor;
|
||||||
}
|
}
|
||||||
|
return node;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user