Merge remote branch 'jlarouche/xmlmapfile_6.2' into branch-6-2

MapServer · Aug 28, 2012 · 55db254 · 55db254
2 parents c64d1bb + 195610f
commit 55db254
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 2 deletions.
diff --git 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>
@@ -344,7 +346,7 @@
 					</xs:union>
 				</xs:simpleType>
 			</xs:element>
-			<xs:element name="Style" type="ms:Style" minOccurs="0"/>
+			<xs:element name="Style" type="ms:Style" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="wrap" type="xs:string" minOccurs="0"/>
 		</xs:sequence>
 		<xs:attribute name="type" use="required">
@@ -356,6 +358,14 @@
 			</xs:simpleType>
 		</xs:attribute>
 	</xs:complexType>
+    <!-- LABELLEADER Definition -->
+    <xs:complexType name="LabelLeader">
+        <xs:sequence>
+            <xs:element name="gridstep" type="xs:positiveInteger" minOccurs="0"/>
+            <xs:element name="maxdistance" type="xs:positiveInteger" minOccurs="0"/>
+            <xs:element name="Style"  type="ms:Style" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+    </xs:complexType>
 	<!-- STYLE Definition -->
 	<xs:complexType name="Style">
 		<xs:sequence>
@@ -389,6 +399,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 +436,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"/>
@@ -448,6 +464,7 @@
 			<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="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"/>
 			<xs:element name="minScaleDenom" type="xs:double" minOccurs="0"/>
@@ -468,6 +485,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 +648,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
@@ -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:')">
@@ -755,6 +755,29 @@
     </xsl:call-template>
   </xsl:template>
 
+  <xsl:template match="ms:LabelLeader">
+    <xsl:param name="indent"/>
+    <xsl:call-template name="print">
+      <xsl:with-param name="text" select="'LEADER'"/>
+      <xsl:with-param name="indent" select="$indent - 1"/>
+    </xsl:call-template>
+    <xsl:call-template name="print">
+      <xsl:with-param name="indent" select="$indent"/>
+      <xsl:with-param name="node" select="'ms:gridstep'"/>
+    </xsl:call-template>
+    <xsl:call-template name="print">
+      <xsl:with-param name="indent" select="$indent"/>
+      <xsl:with-param name="node" select="'ms:maxdistance'"/>
+    </xsl:call-template>
+    <xsl:apply-templates select="ms:Style">
+      <xsl:with-param name="indent" select="$indent + 1"/>
+    </xsl:apply-templates>
+    <xsl:call-template name="print">
+      <xsl:with-param name="text" select="'END'"/>
+      <xsl:with-param name="indent" select="$indent - 1"/>
+    </xsl:call-template>
+  </xsl:template>
+
   <xsl:template match="ms:Style">
     <xsl:param name="indent"/>
     <xsl:call-template name="print">
@@ -783,6 +806,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 +845,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>
@@ -895,6 +926,9 @@
     <xsl:apply-templates select="ms:Label">
       <xsl:with-param name="indent" select="$indent + 1"/>
     </xsl:apply-templates>
+    <xsl:apply-templates select="ms:LabelLeader">
+      <xsl:with-param name="indent" select="$indent + 1"/>
+    </xsl:apply-templates>
     <xsl:call-template name="print">
       <xsl:with-param name="indent" select="$indent"/>
       <xsl:with-param name="node" select="'ms:maxScaleDenom'"/>
@@ -963,6 +997,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 +1288,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
@@ -34,6 +34,13 @@
         <size>TINY</size>
         <wrap>\n</wrap>
       </Label>
+      <LabelLeader>
+        <gridstep>6</gridstep>
+        <maxdistance>15</maxdistance>
+            <Style>
+                <initialGap>2</initialGap>
+            </Style>
+      </LabelLeader>
       <maxScaleDenom>24000</maxScaleDenom>
       <maxSize>50</maxSize>
       <minScaleDenom>1000000</minScaleDenom>
@@ -62,6 +69,9 @@
         <symbol type="NAME">star.gif</symbol>
         <width>[myWidth]</width>
       </Style>
+            <Style>
+                <initialGap>2</initialGap>
+            </Style>
       <symbol type="ID">261</symbol>
       <template>http://mapgears.com/templates/myTemplates1.html</template>
       <text>myText1</text>
@@ -111,6 +121,7 @@
     <labelMaxScaleDenom>2334342</labelMaxScaleDenom>
     <labelMinScaleDenom>100000</labelMinScaleDenom>
     <labelRequires>![orthoquads]</labelRequires>
+    <mask>layerName</mask>
     <maxFeatures>250000</maxFeatures>
     <maxScaleDenom>300000</maxScaleDenom>
     <Metadata>

diff --git a/xmlmapfile/tests/mapfile-test.xml b/xmlmapfile/tests/mapfile-test.xml
@@ -126,6 +126,11 @@
 			<size>SMALL</size>
                         <Style>
                           <geomTransform>VERTICES</geomTransform>
+                          <initialGap>20.5</initialGap>
+                          <polarOffset>[uv_length_2] [uv_angle]</polarOffset>
+                        </Style>
+                        <Style>
+                          <initialGap>2</initialGap>
                         </Style>
 			<wrap>\n</wrap>
 		</Label>

diff --git a/xmlmapfile/tests/symbolset.xml b/xmlmapfile/tests/symbolset.xml
@@ -12,6 +12,7 @@
 		<transparent>0</transparent>
 	</Symbol>
         <Symbol name="mySymbol222" type="SIMPLE">
+          <anchorPoint x="0.5" y="0.2"/>
           <antialias>FALSE</antialias>
           <character>C</character>
           <filled>TRUE</filled>