Add support for multiple LABEL per CLASS

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

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/xmlmapfile/mapfile.xsd b/xmlmapfile/mapfile.xsd
@@ -465,7 +465,7 @@
 			<xs:element name="expression" type="ms:expressionType" minOccurs="0"/>
 			<xs:element name="group" type="xs:string" minOccurs="0"/>
 			<xs:element name="keyImage" type="xs:string" minOccurs="0"/>
-			<xs:element name="Label" type="ms:Label" minOccurs="0"/>
+			<xs:element name="Label" type="ms:Label" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="LabelLeader" type="ms:LabelLeader" minOccurs="0"/>
 			<xs:element name="maxScaleDenom" type="xs:double" minOccurs="0"/>
 			<xs:element name="maxSize" type="xs:integer" default="50" minOccurs="0"/>

diff --git a/xmlmapfile/mapfile.xsl b/xmlmapfile/mapfile.xsl
@@ -932,9 +932,11 @@
       <xsl:with-param name="node" select="'ms:keyImage'"/>
       <xsl:with-param name="quote" select="1"/>
     </xsl:call-template>
-    <xsl:apply-templates select="ms:Label">
-      <xsl:with-param name="indent" select="$indent + 1"/>
-    </xsl:apply-templates>
+    <xsl:for-each select="ms:Label">
+      <xsl:apply-templates select=".">
+        <xsl:with-param name="indent" select="$indent + 1"/>
+      </xsl:apply-templates>
+    </xsl:for-each>
     <xsl:apply-templates select="ms:LabelLeader">
       <xsl:with-param name="indent" select="$indent + 1"/>
     </xsl:apply-templates>