Relax some internal ids required formats

[wdef_schemas.git] / wdef.xsd

diff --git a/wdef.xsd b/wdef.xsd
index 178d3ee655028eac2879832b2c2a7aced8c05c97..8c1fdff28dc5993492d4cf4bd0105ca9159b2314 100644 (file)
--- a/wdef.xsd
+++ b/wdef.xsd
@@ -162,26 +162,33 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
        
        <xsd:element name="coordinate">
                <xsd:complexType>
-                       <xsd:simpleContent>
-                               <xsd:extension base="wdef:date-time">
-                                       <xsd:attribute name="latitude" use="required">
-                                               <xsd:simpleType>
-                                                       <xsd:restriction base="xsd:float">
-                                                               <xsd:minInclusive value="-90" />
-                                                               <xsd:maxInclusive value="90" />
-                                                       </xsd:restriction>
-                                               </xsd:simpleType>
-                                       </xsd:attribute>
-                                       <xsd:attribute name="longitude" use="required">
-                                               <xsd:simpleType>
-                                                       <xsd:restriction base="xsd:float">
-                                                               <xsd:minInclusive value="-180" />
-                                                               <xsd:maxInclusive value="180" />
-                                                       </xsd:restriction>
-                                               </xsd:simpleType>
-                                       </xsd:attribute>
-                               </xsd:extension>
-                       </xsd:simpleContent>
+                       <xsd:all maxOccurs="1">
+                               <xsd:element ref="wdef:ref-element" />
+                       </xsd:all>
+                       <xsd:attribute name="latitude" use="required">
+                               <xsd:simpleType>
+                                       <xsd:restriction base="xsd:float">
+                                               <xsd:minInclusive value="-90" />
+                                               <xsd:maxInclusive value="90" />
+                                       </xsd:restriction>
+                               </xsd:simpleType>
+                       </xsd:attribute>
+                       <xsd:attribute name="longitude" use="required">
+                               <xsd:simpleType>
+                                       <xsd:restriction base="xsd:float">
+                                               <xsd:minInclusive value="-180" />
+                                               <xsd:maxInclusive value="180" />
+                                       </xsd:restriction>
+                               </xsd:simpleType>
+                       </xsd:attribute>
+                       <xsd:attribute name="precision" use="required">
+                               <xsd:simpleType>
+                                       <xsd:restriction base="xsd:float">
+                                               <xsd:minExclusive value="0" />
+                                               <xsd:maxInclusive value="1" />
+                                       </xsd:restriction>
+                               </xsd:simpleType>
+                       </xsd:attribute>
                </xsd:complexType>
        </xsd:element>
        
@@ -764,7 +771,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
        <xsd:simpleType name="element-id">
                <xsd:restriction base="xsd:normalizedString">
-                       <xsd:pattern value="(\?E|Q)[0-9]+" />
+                       <xsd:pattern value="(Q[0-9]+|\?.+)" />
                </xsd:restriction>
        </xsd:simpleType>
 
@@ -776,13 +783,13 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
        <xsd:simpleType name="property-id2">
                <xsd:restriction base="xsd:normalizedString">
-                       <xsd:pattern value="\?P[0-9\?\-EP]+" />
+                       <xsd:pattern value="(P[0-9]+|\?.+)" />
                </xsd:restriction>
        </xsd:simpleType>
 
        <xsd:simpleType name="value-id">
                <xsd:restriction base="xsd:normalizedString">
-                       <xsd:pattern value="\?V.+" />
+                       <xsd:pattern value="\?.+" />
                </xsd:restriction>
        </xsd:simpleType>