Sample updates

Author: dponti

core/Common.xsd

@@ -3,10 +3,10 @@
     xmlns:gml="http://www.opengis.net/gml/3.2"
     xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" vc:maxVersion="1.1" vc:minVersion="1.0"
     elementFormDefault="qualified" targetNamespace="http://diggsml.org/schemas/3" version="3.0.0">
-    
-    <!-- Uncomment to clear validation errors without a master file
+
+    <!-- Uncomment to clear validation errors without a master file-->
     <include schemaLocation="../Diggs.xsd"/>
--->  
+
     <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="gml3.2Profile_diggs.xsd"/>
     <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
 
@@ -2256,15 +2256,24 @@
         </annotation>
         <complexContent>
             <extension base="diggs:AbstractObjectType">
-                <sequence>
-                    <element minOccurs="0" ref="diggs:location"/>
-                    <element minOccurs="0" name="sampleTime" type="diggs:TimeIntervalPropertyType">
+                <choice>
+                    <sequence>
+                        <element minOccurs="1" ref="diggs:location"/>
+                        <element minOccurs="0" name="sampleTime"
+                            type="diggs:TimeIntervalPropertyType">
+                            <annotation>
+                                <documentation>The start and end time of sample
+                                collection.</documentation>
+                            </annotation>
+                        </element>
+                    </sequence>
+                    <element minOccurs="1" name="sampleTime" type="diggs:TimeIntervalPropertyType">
                         <annotation>
                             <documentation>The start and end time of sample
                                 collection.</documentation>
                         </annotation>
                     </element>
-                </sequence>
+                </choice>
             </extension>
         </complexContent>
     </complexType>

core/Core.xsd

@@ -14,9 +14,9 @@
     </annotation>
 
 
-    <!-- Uncomment to clear validation errors without a master file
+    <!-- Uncomment to clear validation errors without a master file-->
     <include schemaLocation="../Diggs.xsd"/>
--->  
+
 
     <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="gml3.2Profile_diggs.xsd"/>
     <import namespace="http://www.w3.org/1999/xlink" schemaLocation="xlinks.xsd"/>
@@ -2136,8 +2136,7 @@
             <extension base="diggs:AbstractSampleType">
                 <sequence>
                     <element name="relativeReferencingSystem"
-                        type="diggs:AbstractRelativeReferenceSystemPropertyType" minOccurs="0"
-                        maxOccurs="1">
+                        type="diggs:RelativeReferenceSystemPropertyType" minOccurs="0" maxOccurs="1">
                         <annotation>
                             <documentation>For a core or block sample, this property can be used to
                                 introduce a relative spatial reference system for describing the

core/LinearReferencing.xsd

@@ -5,6 +5,9 @@
     xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" vc:maxVersion="1.1" vc:minVersion="1.0"
     elementFormDefault="qualified" targetNamespace="http://diggsml.org/schemas/3" version="3.0.0">
 
+    <!-- Uncomment to clear validation errors without a master file-->
+    <include schemaLocation="../Diggs.xsd"/>
+    
     <annotation>
         <documentation>
             DIGGS Linear Referencing Schema - Version 3.0b
@@ -1181,16 +1184,18 @@
         <annotation>
             <appinfo>DEPRECATED 1/26.</appinfo>
             <documentation>Base type for linear or vector linear relative spatial reference
-                systems. DEPRECATED. Use diggs:LinearSRS for linear referencing, EngineeringCRS for 2D relative referencing.</documentation>
+                systems. DEPRECATED. Use diggs:LinearSRS for linear referencing, LocalCartesionCRS or EngineeringCRS for 2D relative referencing.</documentation>
         </annotation>
     </element>
-    <complexType name="AbstractRelativeReferenceSystemPropertyType">
+    <complexType name="RelativeReferenceSystemPropertyType">
         <annotation>
             <documentation>Property type for abstract relative reference system references. Used to wrap abstract relative reference system objects or references in properties.</documentation>
         </annotation>
-        <sequence>
+        <choice>
+            <element ref="diggs:LinearSpatialReferenceSystem"/>
+            <element ref="gml:AbstractCRS"/>
             <element maxOccurs="1" minOccurs="1" ref="diggs:AbstractRelativeReferenceSystem"/>
-        </sequence>
+        </choice>
     </complexType>
     <complexType name="AbstractRelativeReferenceSystemType">
         <annotation>