Permalink
Browse files

Add support for multiple LABEL per CLASS

  • Loading branch information...
markathomas committed Sep 27, 2013
1 parent 8b767ff commit 0b8c9abe4aab6cdd09f6617ad1ac7824aaa24319
Showing with 6 additions and 4 deletions.
  1. +1 −1 xmlmapfile/mapfile.xsd
  2. +5 −3 xmlmapfile/mapfile.xsl
View
@@ -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"/>
View
@@ -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>

0 comments on commit 0b8c9ab

Please sign in to comment.