Skip to content

Commit

Permalink
Move embedded type eements to global position
Browse files Browse the repository at this point in the history
  • Loading branch information
@dponti
dponti committed Dec 15, 2024
1 parent 0993cb6 commit e577c5e
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 46 deletions.
28 changes: 22 additions & 6 deletions Construction.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3154,7 +3154,8 @@
zone (water table)</documentation>
</annotation>
</element>
<element minOccurs="0" name="pressureMeasurementConfiguration" type="diggs:pressureMeasurementConfigurationEnumType">
<element minOccurs="0" name="pressureMeasurementConfiguration"
type="diggs:pressureMeasurementConfigurationEnumType">
<annotation>
<documentation>Describes how pressure is measured during the test; from
a controlled list. Allowed values are: - pressure gauge - borehole
Expand Down Expand Up @@ -3187,14 +3188,14 @@
</extension>
</complexContent>
</complexType>

<simpleType name="pressureMeasurementConfigurationEnumType">
<restriction base="string">
<enumeration value="pressure gauge"/>
<enumeration value="borehole transducer"/>
</restriction>
</simpleType>

<complexType name="LugeonStepPropertyType">
<sequence>
<element maxOccurs="1" minOccurs="1" ref="diggs:LugeonStep"/>
Expand Down Expand Up @@ -4150,8 +4151,7 @@
</complexContent>
</complexType>
<element name="TimeSeriesTrial" substitutionGroup="diggs:AbstractObject"
type="diggs:TimeSeriesTrialType">
</element>
type="diggs:TimeSeriesTrialType"> </element>
<complexType name="TimeSeriesTrialType">
<complexContent>
<extension base="diggs:AbstractObjectType">
Expand Down Expand Up @@ -4516,13 +4516,29 @@
shovel</documentation>
</annotation>
</element>
<element name="depthIncrement"/>
<element name="wallSectionDepths" type="diggs:WallDepthsArrayPropertyType"/>
</sequence>
</extension>
</complexContent>
</complexType>
<element name="GroutTrenchCutoffWall" substitutionGroup="diggs:AbstractLinearSamplingFeature"
type="diggs:GroutTrenchCutoffWallType"/>
<complexType name="WallSectionDepthsArrayPropertyType">
<sequence maxOccurs="unbounded">
<element ref="diggs:CutoffWallSectionDepth"/>
</sequence>
</complexType>
<element name="CutoffWallSectionDepth" type="diggs:CutoffWallSectionDepthType"/>
<complexType name="CutoffWallSectionDepthType">
<complexContent>
<extension base="diggs:AbstractComponentObjectBaseType">
<sequence>
<element name="sectionLocation" type="diggs:LinearExtentPropertyType"/>
<element name="wallDepth" type="eml:LengthMeasureExt"/>
</sequence>
</extension>
</complexContent>
</complexType>
<complexType name="CutterSoilMixingToolType">
<complexContent>
<extension base="diggs:AbstractEquipmentType">
Expand Down
8 changes: 4 additions & 4 deletions Diggs_procedures_temp.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
produce a liquid_limit_oven_dried reportable result</documentation>
</annotation>
</element>
<element minOccurs="0" name="sieveProcedure" type="diggs:SieveProcedureEnumType">
<element minOccurs="0" name="sieveProcedure" type="diggs:sieveProcedureEnumType">
<annotation>
<documentation>Value is wet if wet sieving on No. 40 screen (0.425 mm)
is performed; dry if dry sieving on No. 40 screen (0.425 mm) is
Expand Down Expand Up @@ -89,7 +89,7 @@
</documentation>
</annotation>
</element>
<element minOccurs="0" name="waxDensity" type="diggs:WaxDensityType">
<element minOccurs="0" name="waxDensity" type="diggs:WaxDensityMeasureType">
<annotation>
<documentation>For determination of shrinkage limit, the density of the wax used to seal the soil pat. This may be an assigned value, reported from the manufacturer or determined by a test procedure such as described in ASTM D 4943.</documentation>
</annotation>
Expand Down Expand Up @@ -130,7 +130,7 @@
</complexContent>
</complexType>

<simpleType name="SieveProcedureEnumType">
<simpleType name="sieveProcedureEnumType">
<restriction base="string">
<enumeration value="wet"/>
<enumeration value="dry"/>
Expand All @@ -139,7 +139,7 @@
</restriction>
</simpleType>

<complexType name="WaxDensityType">
<complexType name="WaxDensityMeasureType">
<simpleContent>
<extension base="diggs:DensityOrUnitWeightMeasureType">
<attribute name="howDetermined" type="diggs:DescriptorMethodEnumType"/>
Expand Down
64 changes: 28 additions & 36 deletions Geotechnical.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
produce a liquid_limit_oven_dried reportable result</documentation>
</annotation>
</element>
<element minOccurs="0" name="sieveProcedure">
<element minOccurs="0" name="sieveProcedure"
type="diggs_geo:sieveProcedureEnumtType">
<annotation>
<documentation>Value is wet if wet sieving on No. 40 screen (0.425 mm)
is performed; dry if dry sieving on No. 40 screen (0.425 mm) is
Expand All @@ -58,14 +59,6 @@
unknown if not known. If value is None, the property handRemoved
should be used.</documentation>
</annotation>
<simpleType>
<restriction base="string">
<enumeration value="wet"/>
<enumeration value="dry"/>
<enumeration value="none"/>
<enumeration value="unknown"/>
</restriction>
</simpleType>
</element>
<element minOccurs="0" name="handRemoved" type="boolean">
<annotation>
Expand All @@ -91,24 +84,17 @@
test</documentation>
</annotation>
</element>
<element minOccurs="0" name="waterDensity" type="diggs:SpecificGravityMeasureType">
<element minOccurs="0" name="waterDensity"
type="diggs:SpecificGravityMeasureType">
<annotation>
<documentation>Usually assigned a value of 1.0, this value could be modified to account for temperature differences, as indicated in the attributes of this type.
</documentation>
</annotation>
</element>
<element minOccurs="0" name="waxDensity">
<element minOccurs="0" name="waxDensity" type="diggs_geo:WaxDensityMeasureType">
<annotation>
<documentation>For determination of shrinkage limit, the density of the wax used to seal the soil pat. This may be an assigned value, reported from the manufacturer or determined by a test procedure such as described in ASTM D 4943.</documentation>
</annotation>
<complexType>
<simpleContent>
<extension base="diggs:DensityOrUnitWeightMeasureType">
<attribute name="howDetermined"
type="diggs:DescriptorMethodEnumType"/>
</extension>
</simpleContent>
</complexType>
</element>
<element minOccurs="0" name="casagrandeTrial"
type="diggs_geo:CasagrandeTrialPropertyType" maxOccurs="unbounded">
Expand Down Expand Up @@ -145,6 +131,25 @@
</extension>
</complexContent>
</complexType>

<simpleType name="sieveProcedureEnumtType">
<restriction base="string">
<enumeration value="wet"/>
<enumeration value="dry"/>
<enumeration value="none"/>
<enumeration value="unknown"/>
</restriction>
</simpleType>

<complexType name="WaxDensityMeasureType">
<simpleContent>
<extension base="diggs:DensityOrUnitWeightMeasureType">
<attribute name="howDetermined" type="diggs:DescriptorMethodEnumType"/>
</extension>
</simpleContent>
</complexType>


<element name="CasagrandeTrial" type="diggs_geo:CasagrandeTrialType"
substitutionGroup="diggs:AbstractProcedureTrial">
<annotation>
Expand Down Expand Up @@ -2066,20 +2071,7 @@ consolidation (ch) and in situ horizontal coefficient of permeability (kh)</docu
</annotation>
</element>
</sequence>
<attribute name="index" use="required">
<simpleType>
<union>
<simpleType>
<restriction base="string">
<enumeration value=""/>
</restriction>
</simpleType>
<simpleType>
<restriction base="integer"/>
</simpleType>
</union>
</simpleType>
</attribute>
<attribute use="required" ref="diggs:index"> </attribute>
</extension>
</complexContent>
</complexType>
Expand Down Expand Up @@ -3006,8 +2998,8 @@ soil, which is dependent upon the water content of the soil, along with the type
<complexContent>
<extension base="diggs:AbstractLaboratoryTestProcedureType">
<sequence>
<element maxOccurs="unbounded" minOccurs="0" name="reading" type="diggs_geo:ReadingMeasureType">
</element>
<element maxOccurs="unbounded" minOccurs="0" name="reading"
type="diggs_geo:ReadingMeasureType"> </element>
</sequence>
</extension>
</complexContent>
Expand All @@ -3023,7 +3015,7 @@ soil, which is dependent upon the water content of the soil, along with the type
</extension>
</complexContent>
</complexType>

<element name="RedoxTest" substitutionGroup="diggs:AbstractLaboratoryTestProcedure"
type="diggs_geo:RedoxTestType">
<annotation>
Expand Down

0 comments on commit e577c5e

Please sign in to comment.