Ensure that sld elements are written in the sld namespace. r=bartvde (closes #2087)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@9584 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Tim Schaub
@@ -431,7 +431,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
"sld": {
|
||||
"StyledLayerDescriptor": function(sld) {
|
||||
var root = this.createElementNSPlus(
|
||||
"StyledLayerDescriptor",
|
||||
"sld:StyledLayerDescriptor",
|
||||
{attributes: {
|
||||
"version": this.VERSION,
|
||||
"xsi:schemaLocation": this.schemaLocation
|
||||
@@ -463,18 +463,18 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
return root;
|
||||
},
|
||||
"Name": function(name) {
|
||||
return this.createElementNSPlus("Name", {value: name});
|
||||
return this.createElementNSPlus("sld:Name", {value: name});
|
||||
},
|
||||
"Title": function(title) {
|
||||
return this.createElementNSPlus("Title", {value: title});
|
||||
return this.createElementNSPlus("sld:Title", {value: title});
|
||||
},
|
||||
"Abstract": function(description) {
|
||||
return this.createElementNSPlus(
|
||||
"Abstract", {value: description}
|
||||
"sld:Abstract", {value: description}
|
||||
);
|
||||
},
|
||||
"NamedLayer": function(layer) {
|
||||
var node = this.createElementNSPlus("NamedLayer");
|
||||
var node = this.createElementNSPlus("sld:NamedLayer");
|
||||
|
||||
// add in required name
|
||||
this.writeNode("Name", layer.name, node);
|
||||
@@ -502,12 +502,12 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
return node;
|
||||
},
|
||||
"NamedStyle": function(name) {
|
||||
var node = this.createElementNSPlus("NamedStyle");
|
||||
var node = this.createElementNSPlus("sld:NamedStyle");
|
||||
this.writeNode("Name", name, node);
|
||||
return node;
|
||||
},
|
||||
"UserStyle": function(style) {
|
||||
var node = this.createElementNSPlus("UserStyle");
|
||||
var node = this.createElementNSPlus("sld:UserStyle");
|
||||
|
||||
// add in optional name
|
||||
if(style.name) {
|
||||
@@ -534,11 +534,11 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
},
|
||||
"IsDefault": function(bool) {
|
||||
return this.createElementNSPlus(
|
||||
"IsDefault", {value: (bool) ? "1" : "0"}
|
||||
"sld:IsDefault", {value: (bool) ? "1" : "0"}
|
||||
);
|
||||
},
|
||||
"FeatureTypeStyle": function(style) {
|
||||
var node = this.createElementNSPlus("FeatureTypeStyle");
|
||||
var node = this.createElementNSPlus("sld:FeatureTypeStyle");
|
||||
|
||||
// OpenLayers currently stores no Name, Title, Abstract,
|
||||
// FeatureTypeName, or SemanticTypeIdentifier information
|
||||
@@ -552,7 +552,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
return node;
|
||||
},
|
||||
"Rule": function(rule) {
|
||||
var node = this.createElementNSPlus("Rule");
|
||||
var node = this.createElementNSPlus("sld:Rule");
|
||||
|
||||
// add in optional name
|
||||
if(rule.name) {
|
||||
@@ -604,25 +604,25 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
|
||||
},
|
||||
"ElseFilter": function() {
|
||||
return this.createElementNSPlus("ElseFilter");
|
||||
return this.createElementNSPlus("sld:ElseFilter");
|
||||
},
|
||||
"MinScaleDenominator": function(scale) {
|
||||
return this.createElementNSPlus(
|
||||
"MinScaleDenominator", {value: scale}
|
||||
"sld:MinScaleDenominator", {value: scale}
|
||||
);
|
||||
},
|
||||
"MaxScaleDenominator": function(scale) {
|
||||
return this.createElementNSPlus(
|
||||
"MaxScaleDenominator", {value: scale}
|
||||
"sld:MaxScaleDenominator", {value: scale}
|
||||
);
|
||||
},
|
||||
"LineSymbolizer": function(symbolizer) {
|
||||
var node = this.createElementNSPlus("LineSymbolizer");
|
||||
var node = this.createElementNSPlus("sld:LineSymbolizer");
|
||||
this.writeNode("Stroke", symbolizer, node);
|
||||
return node;
|
||||
},
|
||||
"Stroke": function(symbolizer) {
|
||||
var node = this.createElementNSPlus("Stroke");
|
||||
var node = this.createElementNSPlus("sld:Stroke");
|
||||
|
||||
// GraphicFill here
|
||||
// GraphicStroke here
|
||||
@@ -653,13 +653,13 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
},
|
||||
"CssParameter": function(obj) {
|
||||
// not handling ogc:expressions for now
|
||||
return this.createElementNSPlus("CssParameter", {
|
||||
return this.createElementNSPlus("sld:CssParameter", {
|
||||
attributes: {name: this.getCssProperty(obj.key)},
|
||||
value: obj.symbolizer[obj.key]
|
||||
});
|
||||
},
|
||||
"TextSymbolizer": function(symbolizer) {
|
||||
var node = this.createElementNSPlus("TextSymbolizer");
|
||||
var node = this.createElementNSPlus("sld:TextSymbolizer");
|
||||
// add in optional Label
|
||||
if(symbolizer.label != null) {
|
||||
this.writeNode("Label", symbolizer.label, node);
|
||||
@@ -685,7 +685,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
return node;
|
||||
},
|
||||
"Font": function(symbolizer) {
|
||||
var node = this.createElementNSPlus("Font");
|
||||
var node = this.createElementNSPlus("sld:Font");
|
||||
// add in CssParameters
|
||||
if(symbolizer.fontFamily) {
|
||||
this.writeNode(
|
||||
@@ -720,7 +720,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
"Label": function(label) {
|
||||
// only the simplest of ogc:expression handled
|
||||
// {label: "some text and a ${propertyName}"}
|
||||
var node = this.createElementNSPlus("Label");
|
||||
var node = this.createElementNSPlus("sld:Label");
|
||||
var tokens = label.split("${");
|
||||
node.appendChild(this.createTextNode(tokens[0]));
|
||||
var item, last;
|
||||
@@ -746,7 +746,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
return node;
|
||||
},
|
||||
"Halo": function(symbolizer) {
|
||||
var node = this.createElementNSPlus("Halo");
|
||||
var node = this.createElementNSPlus("sld:Halo");
|
||||
if(symbolizer.haloRadius) {
|
||||
this.writeNode("Radius", symbolizer.haloRadius, node);
|
||||
}
|
||||
@@ -759,12 +759,12 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
return node;
|
||||
},
|
||||
"Radius": function(value) {
|
||||
return node = this.createElementNSPlus("Radius", {
|
||||
return node = this.createElementNSPlus("sld:Radius", {
|
||||
value: value
|
||||
});
|
||||
},
|
||||
"PolygonSymbolizer": function(symbolizer) {
|
||||
var node = this.createElementNSPlus("PolygonSymbolizer");
|
||||
var node = this.createElementNSPlus("sld:PolygonSymbolizer");
|
||||
if(symbolizer.fillColor != undefined ||
|
||||
symbolizer.fillOpacity != undefined) {
|
||||
this.writeNode("Fill", symbolizer, node);
|
||||
@@ -778,7 +778,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
return node;
|
||||
},
|
||||
"Fill": function(symbolizer) {
|
||||
var node = this.createElementNSPlus("Fill");
|
||||
var node = this.createElementNSPlus("sld:Fill");
|
||||
|
||||
// GraphicFill here
|
||||
|
||||
@@ -800,12 +800,12 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
return node;
|
||||
},
|
||||
"PointSymbolizer": function(symbolizer) {
|
||||
var node = this.createElementNSPlus("PointSymbolizer");
|
||||
var node = this.createElementNSPlus("sld:PointSymbolizer");
|
||||
this.writeNode("Graphic", symbolizer, node);
|
||||
return node;
|
||||
},
|
||||
"Graphic": function(symbolizer) {
|
||||
var node = this.createElementNSPlus("Graphic");
|
||||
var node = this.createElementNSPlus("sld:Graphic");
|
||||
if(symbolizer.externalGraphic != undefined) {
|
||||
this.writeNode("ExternalGraphic", symbolizer, node);
|
||||
} else {
|
||||
@@ -824,7 +824,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
return node;
|
||||
},
|
||||
"ExternalGraphic": function(symbolizer) {
|
||||
var node = this.createElementNSPlus("ExternalGraphic");
|
||||
var node = this.createElementNSPlus("sld:ExternalGraphic");
|
||||
this.writeNode(
|
||||
"OnlineResource", symbolizer.externalGraphic, node
|
||||
);
|
||||
@@ -834,7 +834,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
return node;
|
||||
},
|
||||
"Mark": function(symbolizer) {
|
||||
var node = this.createElementNSPlus("Mark");
|
||||
var node = this.createElementNSPlus("sld:Mark");
|
||||
if(symbolizer.graphicName) {
|
||||
this.writeNode("WellKnownName", symbolizer.graphicName, node);
|
||||
}
|
||||
@@ -843,27 +843,27 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
return node;
|
||||
},
|
||||
"WellKnownName": function(name) {
|
||||
return this.createElementNSPlus("WellKnownName", {
|
||||
return this.createElementNSPlus("sld:WellKnownName", {
|
||||
value: name
|
||||
});
|
||||
},
|
||||
"Opacity": function(value) {
|
||||
return this.createElementNSPlus("Opacity", {
|
||||
return this.createElementNSPlus("sld:Opacity", {
|
||||
value: value
|
||||
});
|
||||
},
|
||||
"Size": function(value) {
|
||||
return this.createElementNSPlus("Size", {
|
||||
return this.createElementNSPlus("sld:Size", {
|
||||
value: value
|
||||
});
|
||||
},
|
||||
"Rotation": function(value) {
|
||||
return this.createElementNSPlus("Rotation", {
|
||||
return this.createElementNSPlus("sld:Rotation", {
|
||||
value: value
|
||||
});
|
||||
},
|
||||
"OnlineResource": function(href) {
|
||||
return this.createElementNSPlus("OnlineResource", {
|
||||
return this.createElementNSPlus("sld:OnlineResource", {
|
||||
attributes: {
|
||||
"xlink:type": "simple",
|
||||
"xlink:href": href
|
||||
@@ -871,7 +871,7 @@ OpenLayers.Format.SLD.v1 = OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0, {
|
||||
});
|
||||
},
|
||||
"Format": function(format) {
|
||||
return this.createElementNSPlus("Format", {
|
||||
return this.createElementNSPlus("sld:Format", {
|
||||
value: format
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user