Permalink
Browse files

Fixed problems found in the mapfile.xsd while trying to convert curre…

…nt mapfiles into xmlmapfiles
  • Loading branch information...
1 parent 547391d commit 41a73434b055522adcda977447c355944c6c5c26 @alexwells55 alexwells55 committed with tbonfort Jan 30, 2013
Showing with 10 additions and 10 deletions.
  1. +8 −8 xmlmapfile/mapfile.xsd
  2. +2 −2 xmlmapfile/tests/mapfile-test.xml
@@ -61,8 +61,8 @@
</xs:restriction>
</xs:simpleType>
<xs:complexType name="sizeType">
- <xs:attribute name="x" type="xs:positiveInteger"/>
- <xs:attribute name="y" type="xs:positiveInteger"/>
+ <xs:attribute name="x" type="xs:nonNegativeInteger"/>
+ <xs:attribute name="y" type="xs:nonNegativeInteger"/>
</xs:complexType>
<xs:complexType name="pointType">
<xs:attribute name="x" type="xs:float"/>
@@ -260,7 +260,7 @@
<!-- LABEL Definition -->
<xs:complexType name="Label">
<xs:sequence>
- <xs:element name="align" type="ms:alignEnum"/>
+ <xs:element name="align" type="ms:alignEnum" minOccurs="0"/>
<xs:element name="angle" minOccurs="0">
<xs:simpleType id="labelAngleType">
<xs:union memberTypes="ms:angleType ms:attributeType">
@@ -443,13 +443,13 @@
</xs:element>
<xs:element name="size" default="1" minOccurs="0">
<xs:simpleType>
- <xs:union memberTypes="xs:positiveInteger ms:attributeType"/>
+ <xs:union memberTypes="xs:double ms:attributeType"/>
</xs:simpleType>
</xs:element>
<xs:element name="symbol" type="ms:symbolType" default="1" minOccurs="0"/>
<xs:element name="width" default="1" minOccurs="0">
<xs:simpleType>
- <xs:union memberTypes="xs:positiveInteger ms:attributeType"/>
+ <xs:union memberTypes="xs:double ms:attributeType"/>
</xs:simpleType>
</xs:element>
</xs:sequence>
@@ -469,7 +469,7 @@
<xs:element name="maxSize" type="xs:integer" default="50" minOccurs="0"/>
<xs:element name="minScaleDenom" type="xs:double" minOccurs="0"/>
<xs:element name="minSize" type="xs:integer" default="0" minOccurs="0"/>
- <xs:choice>
+ <xs:choice minOccurs="0">
<xs:element name="outlineColor" type="ms:rgbColorType"/>
<xs:element name="outlineColorAttribute" type="ms:attributeType"/>
</xs:choice>
@@ -791,12 +791,12 @@
<xs:element name="QueryMap" type="ms:QueryMap" minOccurs="0"/>
<xs:element name="Reference" type="ms:Reference" minOccurs="0"/>
<xs:element name="resolution" type="xs:positiveInteger" default="72" minOccurs="0"/>
+ <xs:element name="ScaleBar" type="ms:ScaleBar" minOccurs="0"/>
<xs:element name="scaleDenom" type="xs:double" minOccurs="0"/>
- <xs:element name="ScaleBar" type="ms:ScaleBar"/>
<xs:element name="shapePath" type="xs:string" minOccurs="0"/>
<xs:element name="size" type="ms:sizeType" minOccurs="0"/>
- <xs:element name="symbolSet" type="xs:string" minOccurs="0"/>
<xs:element name="Symbol" type="ms:Symbol" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="symbolSet" type="xs:string" minOccurs="0"/>
<xs:element name="templatePattern" type="xs:string" minOccurs="0"/>
<xs:element name="units" default="METERS" minOccurs="0">
<xs:simpleType>
@@ -94,7 +94,6 @@
<size x="6" y="4"/>
</Reference>
<resolution>72</resolution>
- <scaleDenom>24000</scaleDenom>
<ScaleBar status="EMBED">
<align>CENTER</align>
<backgroundColor red="244" green="43" blue="22"/>
@@ -142,9 +141,9 @@
<transparent>ON</transparent>
<units>NAUTICALMILES</units>
</ScaleBar>
+ <scaleDenom>24000</scaleDenom>
<shapePath>../data</shapePath>
<size x="600" y="400"/>
- <symbolSet>/tmp/mySymbolSet.sym</symbolSet>
<Symbol name="mySymbol2-test2" type="SIMPLE">
<antialias>FALSE</antialias>
<character>C</character>
@@ -167,6 +166,7 @@
</Points>
<transparent>123</transparent>
</Symbol>
+ <symbolSet>/tmp/mySymbolSet.sym</symbolSet>
<templatePattern>[$ir-wz]*.html</templatePattern>
<units>MILES</units>
<Web>

0 comments on commit 41a7343

Please sign in to comment.