From 0a19da601c00e49eb00be3adf483863a4d0d6579 Mon Sep 17 00:00:00 2001
From: Jerome Villeneuve Larouche <jlarouche@mapgears.com>
Date: Fri, 29 Jun 2012 14:07:32 +0000
Subject: [PATCH] Updated XML support for 6.2

---
 xmlmapfile/mapfile.xsd            | 10 ++++++++++
 xmlmapfile/mapfile.xsl            | 17 ++++++++++++++++-
 xmlmapfile/tests/layerset.xml     |  1 +
 xmlmapfile/tests/mapfile-test.xml |  3 +++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/xmlmapfile/mapfile.xsd b/xmlmapfile/mapfile.xsd
index e2df4c1289..a55137576a 100644
--- a/xmlmapfile/mapfile.xsd
+++ b/xmlmapfile/mapfile.xsd
@@ -193,6 +193,7 @@
 			<xs:element name="Validation" type="ms:itemType" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
+	<!-- OUTPUTFORMAT Definition -->
 	<xs:complexType name="OutputFormat">
 		<xs:sequence>
 			<xs:element name="driver" type="xs:string" minOccurs="0"/>
@@ -207,6 +208,7 @@
 						<xs:enumeration value="BYTE"/>
 						<xs:enumeration value="INT16"/>
 						<xs:enumeration value="FLOAT32"/>
+						<xs:enumeration value="FEATURE"/>
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
@@ -389,6 +391,7 @@
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
+            <xs:element name="initialGap" type="xs:double" minOccurs="0"/>
 			<xs:element name="lineCap" default="BUTT" minOccurs="0">
 				<xs:simpleType>
 					<xs:restriction base="xs:string">
@@ -425,6 +428,11 @@
 					<xs:list itemType="xs:float"/>
 				</xs:simpleType>
 			</xs:element>
+            <xs:element name="polarOffset" minOccurs="0">
+                <xs:simpleType>
+                    <xs:union memberTypes="xs:positiveInteger ms:attributeType xs:positiveInteger ms:attributeType"/>
+                </xs:simpleType>
+            </xs:element>
 			<xs:element name="size" default="1" minOccurs="0">
 				<xs:simpleType>
 					<xs:union memberTypes="xs:positiveInteger ms:attributeType"/>
@@ -468,6 +476,7 @@
 	<!-- SYMBOL Definition -->
 	<xs:complexType name="Symbol">
 		<xs:sequence>
+            <xs:element name="anchorPoint" type="ms:pointType" minOccurs="0"/>
 			<xs:element name="antialias" type="ms:booleanEnum" minOccurs="0"/>
 			<xs:element name="character" type="xs:string" minOccurs="0"/>
 			<xs:element name="filled" type="ms:booleanEnum" minOccurs="0"/>
@@ -630,6 +639,7 @@
 			<xs:element name="labelMaxScaleDenom" type="xs:double" minOccurs="0"/>
 			<xs:element name="labelMinScaleDenom" type="xs:double" minOccurs="0"/>
 			<xs:element name="labelRequires" type="xs:string" minOccurs="0"/>
+			<xs:element name="mask" type="xs:string" minOccurs="0"/>
 			<xs:element name="maxFeatures" type="xs:positiveInteger" minOccurs="0"/>
 			<xs:element name="maxGeoWidth" type="xs:double" minOccurs="0"/>
 			<xs:element name="maxScaleDenom" type="xs:double" minOccurs="0"/>
diff --git a/xmlmapfile/mapfile.xsl b/xmlmapfile/mapfile.xsl
index f5fe59458e..2a6cb8780e 100644
--- a/xmlmapfile/mapfile.xsl
+++ b/xmlmapfile/mapfile.xsl
@@ -175,7 +175,7 @@
   </xsl:call-template>
 </xsl:template>
 
-<xsl:template match="ms:size | ms:offset | ms:keySize | ms:keySpacing | ms:shadowSize">
+<xsl:template match="ms:size | ms:offset | ms:keySize | ms:keySpacing | ms:shadowSize | ms:anchorPoint">
   <xsl:param name="indent"/>
   <xsl:choose>
     <xsl:when test="starts-with(name(), 'ms:')">
@@ -783,6 +783,10 @@
       <xsl:with-param name="indent" select="$indent"/>
       <xsl:with-param name="node" select="'ms:geomTransform'"/>
     </xsl:call-template>
+    <xsl:call-template name="print">
+      <xsl:with-param name="indent" select="$indent"/>
+      <xsl:with-param name="node" select="'ms:initialGap'"/>
+    </xsl:call-template>
     <xsl:call-template name="print">
       <xsl:with-param name="indent" select="$indent"/>
       <xsl:with-param name="node" select="'ms:maxSize'"/>
@@ -818,6 +822,10 @@
     <xsl:apply-templates select="ms:pattern">
       <xsl:with-param name="indent" select="$indent"/>
     </xsl:apply-templates>
+    <xsl:call-template name="print">
+      <xsl:with-param name="indent" select="$indent"/>
+      <xsl:with-param name="node" select="'ms:polarOffset'"/>
+    </xsl:call-template>
     <xsl:apply-templates select="ms:offset">
       <xsl:with-param name="indent" select="$indent"/>
     </xsl:apply-templates>
@@ -963,6 +971,9 @@
       <xsl:with-param name="node" select="@type"/>
       <xsl:with-param name="quote" select="1"/>
     </xsl:call-template>
+    <xsl:apply-templates select="ms:anchorPoint">
+      <xsl:with-param name="indent" select="$indent"/>
+    </xsl:apply-templates>
     <xsl:call-template name="print">
       <xsl:with-param name="indent" select="$indent"/>
       <xsl:with-param name="node" select="'ms:antialias'"/>
@@ -1251,6 +1262,10 @@
       <xsl:with-param name="node" select="'ms:labelRequires'"/>
       <xsl:with-param name="quote" select="1"/>
     </xsl:call-template>
+    <xsl:call-template name="print">
+      <xsl:with-param name="indent" select="$indent"/>
+      <xsl:with-param name="node" select="'ms:mask'"/>
+    </xsl:call-template>
     <xsl:call-template name="print">
       <xsl:with-param name="indent" select="$indent"/>
       <xsl:with-param name="node" select="'ms:maxFeatures'"/>
diff --git a/xmlmapfile/tests/layerset.xml b/xmlmapfile/tests/layerset.xml
index 93cb9671f7..fc75092bdd 100644
--- a/xmlmapfile/tests/layerset.xml
+++ b/xmlmapfile/tests/layerset.xml
@@ -17,6 +17,7 @@
         <encoding>ISO 8859-1</encoding>
         <font>serif</font>
         <force>TRUE</force>
+        <mask>layerName</mask>
         <maxLength>244</maxLength>
         <maxSize>244</maxSize>
         <minDistance>24</minDistance>
diff --git a/xmlmapfile/tests/mapfile-test.xml b/xmlmapfile/tests/mapfile-test.xml
index ecf5c6bee6..9b36d2743a 100644
--- a/xmlmapfile/tests/mapfile-test.xml
+++ b/xmlmapfile/tests/mapfile-test.xml
@@ -126,6 +126,8 @@
 			<size>SMALL</size>
                         <Style>
                           <geomTransform>VERTICES</geomTransform>
+                          <initialGap>20.5</initialGap>
+                          <polarOffset>[uv_angle]</polarOffset>
                         </Style>
 			<wrap>\n</wrap>
 		</Label>
@@ -141,6 +143,7 @@
 	<size x="600" y="400"/>
 	<symbolSet>/tmp/mySymbolSet.sym</symbolSet>
 	<Symbol name="mySymbol2-test2" type="SIMPLE">
+        <anchorPoint x="0.5" y="0.6"/>
 		<antialias>FALSE</antialias>
 		<character>C</character>
 		<filled>TRUE</filled>