New minimumSymbolizer object on Renderer.Elements, which defines only those properties that are needed to ensure that nothing breaks. r=tschaub (closes #1345)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@6317 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -41,6 +41,17 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
|
|||||||
*/
|
*/
|
||||||
xmlns: null,
|
xmlns: null,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Property: minimumSymbolizer
|
||||||
|
* {Object}
|
||||||
|
*/
|
||||||
|
minimumSymbolizer: {
|
||||||
|
strokeLinecap: "round",
|
||||||
|
strokeOpacity: 1,
|
||||||
|
fillOpacity: 1,
|
||||||
|
pointRadius: 0
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor: OpenLayers.Renderer.Elements
|
* Constructor: OpenLayers.Renderer.Elements
|
||||||
*
|
*
|
||||||
@@ -161,6 +172,7 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
|
|||||||
*/
|
*/
|
||||||
drawGeometryNode: function(node, geometry, style) {
|
drawGeometryNode: function(node, geometry, style) {
|
||||||
style = style || node._style;
|
style = style || node._style;
|
||||||
|
OpenLayers.Util.applyDefaults(style, this.minimumSymbolizer);
|
||||||
|
|
||||||
var options = {
|
var options = {
|
||||||
'isFilled': true,
|
'isFilled': true,
|
||||||
|
|||||||
@@ -197,10 +197,7 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
if (!fill) {
|
if (!fill) {
|
||||||
fill = this.createNode('v:fill', node.id + "_fill");
|
fill = this.createNode('v:fill', node.id + "_fill");
|
||||||
}
|
}
|
||||||
|
fill.setAttribute("opacity", style.fillOpacity);
|
||||||
if (style.fillOpacity) {
|
|
||||||
fill.setAttribute("opacity", style.fillOpacity);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node._geometryClass == "OpenLayers.Geometry.Point" &&
|
if (node._geometryClass == "OpenLayers.Geometry.Point" &&
|
||||||
style.externalGraphic) {
|
style.externalGraphic) {
|
||||||
@@ -242,9 +239,7 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
stroke = this.createNode('v:stroke', node.id + "_stroke");
|
stroke = this.createNode('v:stroke', node.id + "_stroke");
|
||||||
node.appendChild(stroke);
|
node.appendChild(stroke);
|
||||||
}
|
}
|
||||||
if (style.strokeOpacity) {
|
stroke.setAttribute("opacity", style.strokeOpacity);
|
||||||
stroke.setAttribute("opacity", style.strokeOpacity);
|
|
||||||
}
|
|
||||||
stroke.setAttribute("endcap", !style.strokeLinecap || style.strokeLinecap == 'butt' ? 'flat' : style.strokeLinecap);
|
stroke.setAttribute("endcap", !style.strokeLinecap || style.strokeLinecap == 'butt' ? 'flat' : style.strokeLinecap);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -410,9 +405,6 @@ OpenLayers.Renderer.VML = OpenLayers.Class(OpenLayers.Renderer.Elements, {
|
|||||||
* radius - {float}
|
* radius - {float}
|
||||||
*/
|
*/
|
||||||
drawCircle: function(node, geometry, radius) {
|
drawCircle: function(node, geometry, radius) {
|
||||||
if (typeof radius == "undefined") {
|
|
||||||
radius = 0;
|
|
||||||
}
|
|
||||||
if(!isNaN(geometry.x)&& !isNaN(geometry.y)) {
|
if(!isNaN(geometry.x)&& !isNaN(geometry.y)) {
|
||||||
var resolution = this.getResolution();
|
var resolution = this.getResolution();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user