Add support for expressions in labels to XML mapfile XSD and XSL

MapServer · Sep 27, 2013 · 8b767ff · 8b767ff
1 parent a09f2ae
commit 8b767ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/xmlmapfile/mapfile.xsd b/xmlmapfile/mapfile.xsd
@@ -280,6 +280,7 @@
 				<xs:element name="colorAttribute" type="ms:attributeType"/>
 			</xs:choice>
 			<xs:element name="encoding" minOccurs="0"/>
+			<xs:element name="expression" type="ms:expressionType" minOccurs="0"/>
 			<xs:element name="font" type="xs:string" minOccurs="0"/>
 			<xs:element name="force" type="ms:booleanEnum" default="FALSE" minOccurs="0"/>
 			<xs:element name="maxLength" type="xs:integer" default="0" minOccurs="0"/>

diff --git a/xmlmapfile/mapfile.xsl b/xmlmapfile/mapfile.xsl
@@ -609,6 +609,10 @@
       <xsl:with-param name="node" select="'ms:encoding'"/>
       <xsl:with-param name="quote" select="1"/>
     </xsl:call-template>
+    <xsl:call-template name="printExpression">
+      <xsl:with-param name="indent" select="$indent"/>
+      <xsl:with-param name="node" select="'ms:expression'"/>
+    </xsl:call-template>
     <xsl:call-template name="print">
       <xsl:with-param name="indent" select="$indent"/>
       <xsl:with-param name="node" select="'ms:font'"/>