@@ -73,28 +73,27 @@ void QgsRendererCategoryV2::toSld( QDomDocument &doc, QDomElement &element, QgsS
73
73
if ( !mSymbol || props.value ( " attribute" , " " ).isEmpty () )
74
74
return ;
75
75
76
+ QString attrName = props[ " attribute" ];
77
+
76
78
QDomElement ruleElem = doc.createElement ( " se:Rule" );
77
79
element.appendChild ( ruleElem );
78
80
79
- QString valueStr = QString ( " value: %1" ).arg ( mValue .toString () );
80
-
81
81
QDomElement nameElem = doc.createElement ( " se:Name" );
82
- nameElem.appendChild ( doc.createTextNode ( ! mLabel . isEmpty () ? mLabel : valueStr ) );
82
+ nameElem.appendChild ( doc.createTextNode ( mLabel ) );
83
83
ruleElem.appendChild ( nameElem );
84
84
85
- QString descrName = props.value ( " version" , " 1.1" ) < " 1.1" ? " Abstract" : " se:Description" ;
86
- QString descrValue = QString ( " Categorized symbol rendererV2 - %1" ).arg ( valueStr );
87
-
88
- QDomElement descrElem = doc.createElement ( descrName );
89
- descrElem.appendChild ( doc.createTextNode ( descrValue ) );
85
+ QDomElement descrElem = doc.createElement ( " se:Description" );
86
+ QString descrStr = QString ( " %1 is '%2'" ).arg ( attrName ).arg ( mValue .toString () );
87
+ descrElem.appendChild ( doc.createTextNode ( !mLabel .isEmpty () ? mLabel : descrStr ) );
90
88
ruleElem.appendChild ( descrElem );
91
89
92
90
// create the ogc:Filter for the range
93
91
QDomElement filterElem = doc.createElement ( " ogc:Filter" );
94
-
95
92
QString filterFunc = QString ( " %1 = '%2'" )
96
- .arg ( props[ " attribute" ] ).arg ( mValue .toString ().replace ( " '" , " ''" ) );
93
+ .arg ( attrName.replace ( " \" " , " \"\" " ) )
94
+ .arg ( mValue .toString ().replace ( " '" , " ''" ) );
97
95
QgsSymbolLayerV2Utils::createFunctionElement ( doc, filterElem, filterFunc );
96
+ ruleElem.appendChild ( filterElem );
98
97
99
98
mSymbol ->toSld ( doc, ruleElem, props );
100
99
}
0 commit comments