ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure that sld elements are written in the sld namespace. r=bartvde (closes #2087)

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