Updates to annotations

DIGGSml · Mar 27, 2024 · e78e224 · e78e224
1 parent a3f0742
commit e78e224
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/Construction.xsd b/Construction.xsd
@@ -188,8 +188,7 @@
     <element name="BleedTest" type="diggs:BleedTestType"
         substitutionGroup="diggs:AbstractMaterialTestProcedure">
         <annotation>
-            <documentation>A test procedure object that holds intermediate data and metadata for a
-                bleed test.</documentation>
+            <documentation>A test to measure the degree to which solid particles from a grout mix separates from the fluid, resulting in a layer of clear water at the surface of the grout..</documentation>
         </annotation>
     </element>
     <complexType name="BleedTestType">
@@ -4647,7 +4646,7 @@
             </extension>
         </complexContent>
     </complexType>
-    <element name="GroutTrenchCutoffWall" substitutionGroup="diggs:AbstractSamplingFeature"
+    <element name="GroutTrenchCutoffWall" substitutionGroup="diggs:AbstractLinearSamplingFeature"
         type="diggs:GroutTrenchCutoffWallType"/>
     <complexType name="CutterSoilMixingToolType">
         <complexContent>

diff --git a/Geophysics.xsd b/Geophysics.xsd
@@ -148,7 +148,7 @@ DSB: REMOVED FROM PROFILE
         </sequence>
     </complexType>
 
-    <element name="VolumeSpace" substitutionGroup="diggs:AbstractSamplingFeature"
+    <element name="VolumeSpace" substitutionGroup="diggs:AbstractVolumeSamplingFeature"
         type="diggs:VolumeSpaceType">
         <annotation>
             <documentation>A generic Diggs 3D sampling feature that represents a volume that defines the sampling space. The featureExtent properties uses Solid geometry.</documentation>
@@ -516,7 +516,7 @@ DSB: REMOVED FROM PROFILE
             </element>
         </sequence>
     </complexType>
-    <element name="GP_ArealSurvey" substitutionGroup="diggs:AbstractSamplingFeature"
+    <element name="GP_ArealSurvey" substitutionGroup="diggs:AbstractPlanarSamplingFeature"
         type="diggs:GP_ArealSurveyType"/>
     <complexType name="GP_ArealSurveyType">
         <complexContent>
@@ -537,7 +537,7 @@ DSB: REMOVED FROM PROFILE
             </extension>
         </complexContent>
     </complexType>
-    <element name="GP_Trackline" substitutionGroup="diggs:AbstractSamplingFeature"
+    <element name="GP_Trackline" substitutionGroup="diggs:AbstractLinearSamplingFeature"
         type="diggs:GP_TracklineType">
         <annotation>
             <documentation>A linear sampling feature that records the geographic location of a

diff --git a/Kernel.xsd b/Kernel.xsd
@@ -4755,7 +4755,7 @@ DSB: REMOVED FROM PROFILE
                                 <annotation>
                                     <documentation>The value that describes the lithology as a controlled term (classification code or controlled name), rather than a simply descriptive one. Examples:
 
-1) For soils described using the Unified Soil Classification, this value should be the "group name" as defined in Figures 1,2 and 3 of ASTM D 2487, eg "Silty sand" or "Gravelly silt with sand". Where the group name is not specified, the "group symbol" should be used (eg. "SM" "ML").
+1) For soils described using the Unified Soil Classification, this value should be the "group name" as defined in Figures 1,2 and 3 of ASTM D 2487 or Figures 1 and 2 of ASTM D 2488, eg "Silty sand" or "Gravelly silt with sand". Where the group name is not specified, the "group symbol" should be used instead (eg. "SM" "ML").
 
 2) For soils described using the AASHTO soil classification system, this value should be the group or subgroup classification (eg. "A-3", "A-2-6").
 
@@ -4767,7 +4767,7 @@ DSB: REMOVED FROM PROFILE
 
 Either a classificationCode value or lithDescription value must be present.
 
-The codespace attribute should contain te authority code for any standard system, or a pointer to the authority or dictionary of a non-standard or proprietary system. Standard codespace codes are as follows:
+The codespace attribute is mandatory and preferably is a link to the appropriate DIGGS codelist dictionary, should contain te authority code for any standard system, or a link to a dictionary of a non-standard or proprietary system. Standard codespace codes are as follows:
 
 USCS - Unified Soil Classification System
 AASHTO - AASHTO System for subgrades
@@ -4780,10 +4780,10 @@ FOLK16 - Folk 16-class system for sediments
 AGI - American Geosciences Institute Glossary</documentation>
                                 </annotation>
                             </element>
-                            <element minOccurs="0" name="classificationSymbol" maxOccurs="unbounded"
+                            <element minOccurs="0" name="classificationSymbol" maxOccurs="1"
                                 type="gml:CodeWithAuthorityType">
                                 <annotation>
-                                    <documentation>For USCS, AASHTO or BSCS soil classification systems, this property holds the group symbol (for USCS) or the group or appropriate subgroup classification (for AASHTO and BSCS). Symbology for nan-standard or proprietary classifications may also be reported here. Codespace attribute is mandatory and should be either USCS, AASHTO, or BSCS for those systems, or an authority code for non-standard systems.</documentation>
+                                    <documentation>For USCS, AASHTO or BSCS soil classification systems, this property holds the group symbol (for USCS) or the group or appropriate subgroup classification (for AASHTO and BSCS). Symbology for nan-standard or proprietary classifications may also be reported here. Codespace attribute is mandatory and should preferably a link to the associated DIGGS dictionary, or be either USCS, AASHTO, or BSCS for those systems, or an authority code for non-standard systems.</documentation>
                                 </annotation>
                             </element>
                             <element minOccurs="0" name="groupIndexAASHTO" type="positiveInteger">
@@ -6294,11 +6294,7 @@ DSB: REMOVED FROM PROFILE
                                 equipment.</documentation>
                         </annotation>
                     </element>
-                    <element minOccurs="0" name="procedureRef" type="diggs:FeatureReferenceType">
-                        <annotation>
-                            <documentation>A reference to the Procedure that produced this result. In most cases, the source procedure is unambiguous where a test contains only one procedure object. However, in situations where the results of a test may derive from more than one procedure, this reference specifically ties the resultant property to the specific procedure used.</documentation>
-                        </annotation>
-                    </element>
+                    <element minOccurs="0" name="procedureRef" type="diggs:FeatureReferenceType"/>
                     <element name="detectorRef" type="gml:ReferenceType" minOccurs="0" maxOccurs="1">
                         <annotation>
                             <appinfo source="urn:x-gml:targetElement">diggs:Equipment</appinfo>