From: Pierre Choffet <peuc@wanadoo.fr>
Date: Wed, 23 Oct 2019 23:48:15 +0000 (-0400)
Subject: Fix the schema to validate all the monthly files
X-Git-Url: https://git.wikimedia.ca/?p=eccc_schema.git;a=commitdiff_plain;h=c14d0d4edae22b0ef5aa477dbe35a8f0cd216751

Fix the schema to validate all the monthly files

The monthly files however have wrong namespace declaration at its root. Fixing this is beyond the scope of this repo. See eccc_to_commons for this.
---

diff --git a/bulkschema.xsd b/bulkschema.xsd
index bb73eaa..ccc4633 100644
--- a/bulkschema.xsd
+++ b/bulkschema.xsd
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <xsd:element name="climatedata">
         <xsd:complexType>
@@ -10,10 +11,51 @@
                         </xsd:restriction>
                     </xsd:simpleType>
                 </xsd:element>
+                <xsd:element name="stationinformation">
+                    <xsd:complexType>
+                        <xsd:sequence>
+                            <xsd:element name="name" type="xsd:string"/>
+                            <xsd:element name="province" type="xsd:string"/>
+                            <xsd:element name="stationoperator" type="xsd:string" minOccurs="0"/>
+                            <xsd:element name="latitude" type="xsd:float"/>
+                            <xsd:element name="longitude" type="xsd:float"/>
+                            <xsd:element name="elevation">
+                              <xsd:simpleType>
+                                <xsd:union>
+                                  <xsd:simpleType>
+                                    <xsd:restriction base="xsd:float"/>
+                                  </xsd:simpleType>
+                                  <xsd:simpleType>
+                                    <xsd:restriction base="xsd:string">
+                                      <xsd:length value="0"/>
+                                    </xsd:restriction>
+                                  </xsd:simpleType>
+                                </xsd:union>
+                              </xsd:simpleType>
+                            </xsd:element>
+                            <xsd:element name="climate_identifier" type="xsd:string"/>
+                            <xsd:element name="wmo_identifier">
+                              <xsd:simpleType>
+                                <xsd:union>
+                                  <xsd:simpleType>
+                                    <xsd:restriction base="xsd:integer"/>
+                                  </xsd:simpleType>
+                                  <xsd:simpleType>
+                                    <xsd:restriction base="xsd:string">
+                                      <xsd:length value="0"/>
+                                    </xsd:restriction>
+                                  </xsd:simpleType>
+                                </xsd:union>
+                              </xsd:simpleType>
+                            </xsd:element>
+                            <xsd:element name="tc_identifier" type="xsd:string"/>
+                        </xsd:sequence>
+                    </xsd:complexType>
+                </xsd:element>
                 <xsd:element name="legend">
                     <xsd:complexType>
                         <xsd:sequence>
-                            <xsd:element name="flag">
+                          <xsd:element name="flag" maxOccurs="unbounded">
                                 <xsd:complexType>
                                     <xsd:sequence>
                                         <xsd:element name="symbol"/>
@@ -24,37 +66,143 @@
                         </xsd:sequence>
                     </xsd:complexType>
                 </xsd:element>
-                <xsd:element name="stationinformation">
-                    <xsd:complexType>
-                        <xsd:sequence>
-                            <xsd:element name="name" type="xsd:string"/>
-                            <xsd:element name="province" type="xsd:string"/>
-                            <xsd:element name="latitude" type="xsd:integer"/>
-                            <xsd:element name="longitude" type="xsd:integer"/>
-                            <xsd:element name="elevation" type="xsd:integer"/>
-                            <xsd:element name="climate_identifier" type="xsd:integer"/>
-                            <xsd:element name="wmo_identifier" type="xsd:integer"/>
-                            <xsd:element name="tc_identifier" type="xsd:string"/>
-                        </xsd:sequence>
-                    </xsd:complexType>
-                </xsd:element>
-                <xsd:element name="stationdata">
+                <xsd:element name="stationdata" maxOccurs="unbounded">
                     <xsd:complexType>
                         <xsd:sequence>
-                            <xsd:element name="meanmaxtemp" type="xsd:string"/>
-                            <xsd:element name="meanmintemp" type="xsd:string"/>
-                            <xsd:element name="meanmonthtemp" type="xsd:string"/>
-                            <xsd:element name="extrmaxtemp" type="xsd:string"/>
-                            <xsd:element name="extrmintemp" type="xsd:string"/>
-                            <xsd:element name="totrain" type="xsd:string"/>
-                            <xsd:element name="totsnow" type="xsd:string"/>
-                            <xsd:element name="snowonground" type="xsd:string"/>
-                            <xsd:element name="totprecip" type="xsd:string"/>
-                            <xsd:element name="grndsnowlastday" type="xsd:string"/>
-                            <xsd:element name="dirmaxgust" type="xsd:string"/>
-                            <xsd:element name="speedmaxgust" type="xsd:string"/>
+                          <xsd:element name="meanmaxtemp">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:string">
+                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="meanmintemp">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:string">
+                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="meanmonthtemp">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:string">
+                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="extrmaxtemp">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:string">
+                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="extrmintemp">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:string">
+                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="totrain">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:string">
+                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="totsnow">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:string">
+                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="snowonground" minOccurs="0">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:string">
+                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="totprecip">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:string">
+                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="grndsnowlastday">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:string">
+                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="dirmaxgust">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:string">
+                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
+                          <xsd:element name="speedmaxgust">
+                            <xsd:complexType>
+                              <xsd:simpleContent>
+                                <xsd:extension base="xsd:string">
+                                  <xsd:attribute name="description" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="units" type="xsd:string" use="optional"/>
+                                  <xsd:attribute name="flag" type="xsd:string" use="optional"/>
+                                </xsd:extension>
+                              </xsd:simpleContent>
+                            </xsd:complexType>
+                          </xsd:element>
                         </xsd:sequence>
-                        <xsd:attribute name="day" type="xsd:string" use="required"/>
+                        <xsd:attribute name="day" type="xsd:string" use="optional"/>
                         <xsd:attribute name="month" type="xsd:string" use="required"/>
                         <xsd:attribute name="year" type="xsd:string" use="required"/>
                     </xsd:complexType>
@@ -62,4 +210,4 @@
             </xsd:sequence>
         </xsd:complexType>
     </xsd:element>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>