processed meeting agreements

#49 matching case #46 made 'name' mandatory - some general improvements - updated examples - made some fixes to xsd patterns
buildingSMART · Feb 15, 2022 · c4c8d5b · c4c8d5b
1 parent 4545515
commit c4c8d5b
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 50 deletions.
diff --git a/Development/0.5/IDS_Aedes_example.xml b/Development/0.5/IDS_Aedes_example.xml
@@ -9,7 +9,7 @@
             <ids:applicability>
                 <ids:entity>
                     <ids:name>
-                        <ids:simpleValue>IfcWindow</ids:simpleValue>
+                        <ids:simpleValue>IFCWINDOW</ids:simpleValue>
                     </ids:name>
                     <ids:predefinedType>
 						<ids:simpleValue>WINDOW</ids:simpleValue>
@@ -18,7 +18,7 @@
                 <ids:classification location="any">
 					<ids:value>
 						<xs:restriction>
-							<xs:pattern value="31.2[0-9]"/>
+							<xs:pattern value="31\.2[0-9]"/>
 						</xs:restriction>
 					</ids:value>
 				</ids:classification>

diff --git a/Development/0.5/IDS_ArcDox.xml b/Development/0.5/IDS_ArcDox.xml
@@ -10,7 +10,7 @@
             <ids:applicability>
                 <ids:entity>
                     <ids:name>
-                        <ids:simpleValue>IfcProject</ids:simpleValue>
+                        <ids:simpleValue>IFCPROJECT</ids:simpleValue>
                     </ids:name>
                 </ids:entity>
             </ids:applicability>
@@ -37,11 +37,11 @@
                 </ids:attribute>
             </ids:requirements>
         </ids:specification>
-        <ids:specification use="required" ifcVersion="IFC2X3">
+        <ids:specification name="name1" use="required" ifcVersion="IFC2X3">
 			<ids:applicability>
 				<ids:entity>
 					<ids:name>
-						<ids:simpleValue>IfcBuilding</ids:simpleValue>
+						<ids:simpleValue>IFCBUILDING</ids:simpleValue>
 					</ids:name>
 				</ids:entity>
 			</ids:applicability>
@@ -94,11 +94,11 @@
 				</ids:property>
 			</ids:requirements>
 		</ids:specification>
-		<ids:specification use="required" ifcVersion="IFC2X3">
+		<ids:specification name="name2" use="required" ifcVersion="IFC2X3">
 			<ids:applicability>
 				<ids:entity>
 					<ids:name>
-						<ids:simpleValue>IfcUnitAssignment</ids:simpleValue>
+						<ids:simpleValue>IFCUNITASSIGNMENT</ids:simpleValue>
 					</ids:name>
 				</ids:entity>
 			</ids:applicability>
@@ -110,11 +110,11 @@
 				</ids:attribute>
 			</ids:requirements>
 		</ids:specification>
-		<ids:specification use="required" ifcVersion="IFC2X3">
+		<ids:specification name="name3" use="required" ifcVersion="IFC2X3">
 			<ids:applicability>
 				<ids:entity>
 					<ids:name>
-						<ids:simpleValue>IfcPostalAddress</ids:simpleValue>
+						<ids:simpleValue>IFCPOSTALADDRESS</ids:simpleValue>
 					</ids:name>
 				</ids:entity>
 			</ids:applicability>
@@ -149,11 +149,11 @@
 				</ids:attribute>
 			</ids:requirements>
 		</ids:specification>
-		<ids:specification use="required" ifcVersion="IFC2X3">
+		<ids:specification name="name4" use="required" ifcVersion="IFC2X3">
 			<ids:applicability>
 				<ids:entity>
 					<ids:name>
-						<ids:simpleValue>IfcSite</ids:simpleValue>
+						<ids:simpleValue>IFCSITE</ids:simpleValue>
 					</ids:name>
 				</ids:entity>
 			</ids:applicability>

diff --git a/Development/0.5/IDS_SimpleBIM_examples.xml b/Development/0.5/IDS_SimpleBIM_examples.xml
@@ -8,7 +8,7 @@
             <ids:applicability>
                 <ids:entity>
                     <ids:name>
-                        <ids:simpleValue>IfcSpace</ids:simpleValue>
+                        <ids:simpleValue>IFCSPACE</ids:simpleValue>
                     </ids:name>
                 </ids:entity>
                 <ids:classification location="any">
@@ -20,7 +20,7 @@
             <ids:requirements>
                 <ids:attribute location="instance">
                     <ids:name>
-                        <ids:simpleValue>name</ids:simpleValue>
+                        <ids:simpleValue>Name</ids:simpleValue>
                     </ids:name>
                     <ids:value>
                         <xs:restriction>
@@ -50,7 +50,7 @@
                 <ids:entity>
                     <ids:name>
                         <xs:restriction>
-                            <xs:pattern value="IfcWall|IfcWallStandardCase"/>
+                            <xs:pattern value="IFCWALL|IFCWALLSTANDARDCASE"/>
                         </xs:restriction>
                     </ids:name>
                 </ids:entity>
@@ -59,12 +59,12 @@
                 <ids:property measure="String" location="type"> <!-- currently there is no real good way to say 'all walls need to have a type'. This solution is to state that all walls need to have a property on the 'type' level with any kind of value. Not nice, but currently no alternativel.  -->
                     <ids:propertySet>
                         <xs:restriction>
-                        <xs:pattern value="[*]"/>
+                        <xs:pattern value=".*"/>
                         </xs:restriction>
                     </ids:propertySet>
                     <ids:name>
                         <xs:restriction>
-                        <xs:pattern value="[*]"/>
+                        <xs:pattern value=".*"/>
                         </xs:restriction>
                     </ids:name>
                 </ids:property>
@@ -75,7 +75,7 @@
                 <ids:entity>
                     <ids:name>
                         <xs:restriction>
-                            <xs:pattern value="IfcWall|IfcWallStandardCase"/>
+                            <xs:pattern value="IFCWALL|IFCWALLSTANDARDCASE"/>
                         </xs:restriction>
                     </ids:name>
                 </ids:entity>

diff --git a/Development/0.5/IDS_aachen_example.xml b/Development/0.5/IDS_aachen_example.xml
@@ -10,7 +10,7 @@
             <ids:applicability>
                 <ids:entity>
                     <ids:name>
-                        <ids:simpleValue>IfcOpeningElement</ids:simpleValue>
+                        <ids:simpleValue>IFCOPENINGELEMENT</ids:simpleValue>
                     </ids:name>
                 </ids:entity>
             </ids:applicability>

diff --git a/Development/0.5/IDS_random_example.xml b/Development/0.5/IDS_random_example.xml
@@ -11,7 +11,7 @@
                 <ids:entity>
                     <ids:name>
                         <xs:restriction base="xs:string">
-                            <xs:pattern value="IfcCovering"/>
+                            <xs:pattern value="IFCCOVERING"/>
                             <xs:totalDigits value="11"/>
                         </xs:restriction>
                     </ids:name>
@@ -24,7 +24,7 @@
                 <ids:property measure="String" location="any">
                     <ids:propertySet>
                         <xs:restriction>
-                            <xs:pattern value="anas"/>
+                            <xs:pattern value="anas.*"/>
                         </xs:restriction>
                     </ids:propertySet>
                     <ids:name>
@@ -47,13 +47,13 @@
             <ids:applicability>
                 <ids:entity>
                     <ids:name>
-                        <ids:simpleValue>IfcWindow</ids:simpleValue>
+                        <ids:simpleValue>IFCWINDOW</ids:simpleValue>
                     </ids:name>
                 </ids:entity>
                 <ids:classification location="any">
                     <ids:value>
                         <xs:restriction base="xs:string">
-                            <xs:pattern value="[0-9].[0-9]"/>
+                            <xs:pattern value="[0-9]\.[0-9]"/>
                         </xs:restriction>
                     </ids:value>
                     <ids:system>

diff --git a/Development/0.5/IDS_ucms_prefab_pipes_IFC2x3.xml b/Development/0.5/IDS_ucms_prefab_pipes_IFC2x3.xml
@@ -12,7 +12,7 @@
             <ids:applicability>
                 <ids:entity>
                     <ids:name>
-                        <ids:simpleValue>IfcDiscreteAccessory</ids:simpleValue>
+                        <ids:simpleValue>IFCDISCRETEACCESSORY</ids:simpleValue>
                     </ids:name>
                 </ids:entity>
             </ids:applicability>
@@ -53,7 +53,7 @@
                         <ids:simpleValue>pipe diameter</ids:simpleValue>
                     </ids:name>
                     <ids:value>
-                        <xs:restriction base="xs:integer">
+                        <xs:restriction base="xs:decimal">
                             <xs:minInclusive value="0.02"/>
                             <xs:maxInclusive value="0.06"/>
                         </xs:restriction>
@@ -108,7 +108,7 @@
                 <ids:entity>
                     <ids:name>
                         <xs:restriction>
-                            <xs:pattern value="(IfcFlowFitting|IfcFlowSegment).*"/>
+                            <xs:pattern value="IFCFLOWFITTING|IFCFLOWSEGMENT"/>
                         </xs:restriction>
                     </ids:name>
                 </ids:entity>
@@ -164,7 +164,7 @@
                         <ids:simpleValue>pipe diameter</ids:simpleValue>
                     </ids:name>
                     <ids:value>
-                        <xs:restriction>
+                        <xs:restriction base="xs:decimal">
                             <xs:minInclusive value="0.02"/>
                             <xs:maxInclusive value="0.06"/>
                         </xs:restriction>
@@ -193,7 +193,7 @@
                     </ids:name>
                     <ids:value>
                         <xs:restriction base="xs:string">
-                            <xs:pattern value="[0-9][0-9][0-9][0-9].[0-9][0-9]"/>
+                            <xs:pattern value="[0-9][0-9][0-9][0-9]\.[0-9][0-9]"/>
                         </xs:restriction>
                     </ids:value>
                 </ids:property>
@@ -219,7 +219,7 @@
                         <ids:simpleValue>outside diameter_general</ids:simpleValue>
                     </ids:name>
                     <ids:value>
-                        <xs:restriction>
+                        <xs:restriction base="xs:decimal">
                             <xs:minInclusive value="0.02"/>
                             <xs:maxInclusive value="0.06"/>
                         </xs:restriction>

diff --git a/Development/0.5/IDS_ucms_prefab_pipes_IFC4.3.xml b/Development/0.5/IDS_ucms_prefab_pipes_IFC4.3.xml
@@ -13,7 +13,7 @@
                 <ids:entity>
                     <ids:name>
                         <xs:restriction>
-                            <xs:pattern value="(IfcFlowFitting|IfcFlowSegment).*"/>
+                            <xs:pattern value="IFCFLOWFITTING|IFCFLOWSEGMENT"/>
                         </xs:restriction>
                     </ids:name>
                 </ids:entity>
@@ -41,7 +41,7 @@
                         <ids:simpleValue>medium</ids:simpleValue>
                     </ids:name>
                     <ids:value>
-                        <xs:restriction base="xs:String">
+                        <xs:restriction base="xs:string">
                             <xs:enumeration value="cold water"/>
                             <xs:enumeration value="something else"/>
                         </xs:restriction>
@@ -55,7 +55,7 @@
                         <ids:simpleValue>material</ids:simpleValue>
                     </ids:name>
                     <ids:value>
-                        <xs:restriction base="xs:String">
+                        <xs:restriction base="xs:string">
                             <xs:enumeration value="chrome steel 1.4401"/>
                             <xs:enumeration value="something else"/>
                         </xs:restriction>
@@ -69,7 +69,7 @@
                         <ids:simpleValue>pipe diameter</ids:simpleValue>
                     </ids:name>
                     <ids:value>
-                        <xs:restriction>
+                        <xs:restriction base="xs:decimal">
                             <xs:minInclusive value="0.02"/>
                             <xs:maxInclusive value="0.02"/>
                         </xs:restriction>
@@ -98,7 +98,7 @@
                     </ids:name>
                     <ids:value>
                         <xs:restriction base="xs:String">
-                            <xs:pattern value="[0-9][0-9][0-9][0-9].[0-9][0-9]"/>
+                            <xs:pattern value="[0-9][0-9][0-9][0-9]\.[0-9][0-9]"/>
                         </xs:restriction>
                     </ids:value>
                 </ids:property>
@@ -124,7 +124,7 @@
                         <ids:simpleValue>outside diameter_general</ids:simpleValue>
                     </ids:name>
                     <ids:value>
-                        <xs:restriction>
+                        <xs:restriction base="xs:decimal">
                             <xs:minInclusive value="0.02"/>
                             <xs:maxInclusive value="0.06"/>
                         </xs:restriction>

diff --git a/Development/0.5/Wooden windows/IDS_wooden-windows.xml b/Development/0.5/Wooden windows/IDS_wooden-windows.xml
@@ -12,7 +12,7 @@
             <ids:applicability>
                 <ids:entity>
                     <ids:name>
-                        <ids:simpleValue>IfcMember</ids:simpleValue>
+                        <ids:simpleValue>IFCMEMBER</ids:simpleValue>
                     </ids:name>
                 </ids:entity>
             </ids:applicability>
@@ -26,7 +26,7 @@
                         <ids:simpleValue>Kleurbinnenzijde</ids:simpleValue>
                     </ids:name>
                     <ids:value>
-                        <xs:restriction base="xs:String">
+                        <xs:restriction base="xs:string">
                             <xs:pattern value="RAL.*"/>
                         </xs:restriction>
                     </ids:value>
@@ -47,7 +47,7 @@
                         <ids:simpleValue>Onderdeel</ids:simpleValue>
                     </ids:name>
                     <ids:value>
-                        <xs:restriction base="xs:String">
+                        <xs:restriction base="xs:string">
                             <xs:enumeration value="Stijl"/>
                             <xs:enumeration value="Dorpel"/>
                         </xs:restriction>
@@ -68,7 +68,7 @@
             <ids:applicability>
                 <ids:entity>
                     <ids:name>
-                        <ids:simpleValue>IfcDoor</ids:simpleValue>
+                        <ids:simpleValue>IFCDOOR</ids:simpleValue>
                     </ids:name>
                 </ids:entity>
             </ids:applicability>
@@ -96,7 +96,7 @@
                         <ids:simpleValue>Kleurbinnenzijde</ids:simpleValue>
                     </ids:name>
                     <ids:value>
-                        <xs:restriction base="xs:String">
+                        <xs:restriction base="xs:string">
                             <xs:pattern value="RAL.*"/>
                         </xs:restriction>
                     </ids:value>
@@ -124,7 +124,7 @@
 			<ids:applicability>
 				<ids:entity>
 					<ids:name>
-						<ids:simpleValue>IfcWindow</ids:simpleValue> 
+						<ids:simpleValue>IFCWINDOW</ids:simpleValue> 
 						<!-- this will clash with the other window applicability. We know that. Keeping it here for the sake of the testing -->
 					</ids:name>
 				</ids:entity>
@@ -147,7 +147,7 @@
                         <ids:simpleValue>Kleurbinnenzijde</ids:simpleValue>
                     </ids:name>
                     <ids:value>
-                        <xs:restriction base="xs:String">
+                        <xs:restriction base="xs:string">
                             <xs:pattern value="RAL.*"/>
                         </xs:restriction>
                     </ids:value>
@@ -174,11 +174,11 @@
                 </ids:property>
 			</ids:requirements>
 		</ids:specification>
-		<ids:specification use="optional" ifcVersion="IFC2X3"> <!-- this one will 'clash' with the previous one. We need some kind of 'alle values except' pattern. For example the ^ used in most regex languages, but not in XSD patterns -->
+		<ids:specification name="Raam met glas" use="optional" ifcVersion="IFC2X3"> <!-- this one will 'clash' with the previous one. We need some kind of 'alle values except' pattern. For example the ^ used in most regex languages, but not in XSD patterns -->
 			<ids:applicability>
 			<ids:entity>
 				<ids:name>
-					<ids:simpleValue>IfcWindow</ids:simpleValue>
+					<ids:simpleValue>IFCWINDOW</ids:simpleValue>
 				</ids:name>
 			</ids:entity>
 			<ids:material location="instance">
@@ -199,7 +199,7 @@
 						<ids:simpleValue>Onderdeel</ids:simpleValue>
 					</ids:name>
 					<ids:value>
-						<ids:simpleValue>Ruit</ids:simpleValue> <!-- this should probably be in the applicability, or in the 'everything except' applicability of hte other IfcWindow  -->
+						<ids:simpleValue>Ruit</ids:simpleValue> <!-- this should probably be in the applicability, or in the 'everything except' applicability of the other IfcWindow  -->
 					</ids:value>
 				</ids:property>
 			</ids:requirements>
@@ -208,7 +208,7 @@
 			<ids:applicability>
 				<ids:entity>
 					<ids:name>
-						<ids:simpleValue>IfcPlate</ids:simpleValue>
+						<ids:simpleValue>IFCPLATE</ids:simpleValue>
 					</ids:name>
 				</ids:entity>
 			</ids:applicability>
@@ -222,7 +222,7 @@
                         <ids:simpleValue>Kleurbinnenzijde</ids:simpleValue>
                     </ids:name>
                     <ids:value>
-                        <xs:restriction base="xs:String">
+                        <xs:restriction base="xs:string">
                             <xs:pattern value="RAL.*"/>
                         </xs:restriction>
                     </ids:value>
@@ -271,7 +271,7 @@
 						<ids:simpleValue>ThermalTransmittance</ids:simpleValue>
 					</ids:name>
 					<ids:value>
-						<xs:restriction base="xs:double">
+						<xs:restriction base="xs:decimal">
 							<xs:minExclusive value="0.5" />
 							<xs:maxExclusive value="2.1" />
 						</xs:restriction>