update for #162

buildingSMART · Jun 20, 2023 · 4149538 · 4149538
1 parent e2bb882
commit 4149538
Showing 1 changed file with 10 additions and 28 deletions.
diff --git a/Development/ids.xsd b/Development/ids.xsd
@@ -1,5 +1,5 @@
-<!-- June 16, 2023 - DRAFT  -->
-<xs:schema xmlns:ids="http://standards.buildingsmart.org/IDS" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:altova="http://www.altova.com/xml-schema-extensions" targetNamespace="http://standards.buildingsmart.org/IDS" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.9.5">
+<!-- June 20, 2023 - DRAFT  -->
+<xs:schema xmlns:ids="http://standards.buildingsmart.org/IDS" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:altova="http://www.altova.com/xml-schema-extensions" targetNamespace="http://standards.buildingsmart.org/IDS" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.9.6">
 	<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
 	<xs:import namespace="http://www.w3.org/2001/XMLSchema" schemaLocation="http://www.w3.org/2001/XMLSchema.xsd"/>
 	<xs:import namespace="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://www.w3.org/2001/XMLSchema-instance"/>
@@ -26,13 +26,7 @@
 						</xs:sequence>
 					</xs:complexType>
 				</xs:element>
-				<xs:element name="specifications">
-					<xs:complexType>
-						<xs:complexContent>
-							<xs:extension base="ids:specificationsType"/>
-						</xs:complexContent>
-					</xs:complexType>
-				</xs:element>
+				<xs:element name="specifications" type="ids:specificationsType"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
@@ -67,20 +61,8 @@
 			<xs:element name="partOf" type="ids:partOfType" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="classification" type="ids:classificationType" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="attribute" type="ids:attributeType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="property" minOccurs="0" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="ids:propertyType"/>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="material" minOccurs="0">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="ids:materialType"/>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
+			<xs:element name="property" type="ids:propertyType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="material" type="ids:materialType" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="propertyType">
@@ -90,10 +72,10 @@
 			<xs:element name="value" type="ids:idsValue" minOccurs="0"/>
 		</xs:sequence>
 		<xs:attribute name="datatype" use="required">
-					<xs:annotation>
-						<xs:documentation>This is the name of an IFC Defined Type. See the full list for IFC 4 on https://standards.buildingsmart.org/IFC/RELEASE/IFC4/ADD2_TC1/HTML/link/alphabeticalorder-defined-types.htm  Documentation and default units on https://github.com/buildingSMART/IDS/blob/master/Documentation/units.md</xs:documentation>
-					</xs:annotation>
-					<!-- renamed 'measure' to data type to better represent reality -->
+			<xs:annotation>
+				<xs:documentation>This is the name of an IFC Defined Type. See the full list for IFC 4 on https://standards.buildingsmart.org/IFC/RELEASE/IFC4/ADD2_TC1/HTML/link/alphabeticalorder-defined-types.htm  Documentation and default units on https://github.com/buildingSMART/IDS/blob/master/Documentation/units.md</xs:documentation>
+			</xs:annotation>
+			<!-- renamed 'measure' to data type to better represent reality -->
 		</xs:attribute>
 	</xs:complexType>
 	<xs:complexType name="attributeType">
@@ -219,10 +201,10 @@
 				<xs:list>
 					<xs:simpleType>
 						<xs:restriction base="xs:string">
+							<xs:minLength value="1"/>
 							<xs:enumeration value="IFC2X3"/>
 							<xs:enumeration value="IFC4"/>
 							<xs:enumeration value="IFC4X3"/>
-							<xs:minLength value="1"/>
 						</xs:restriction>
 					</xs:simpleType>
 				</xs:list>