Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-24 12:07:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

See #4896. Bump to IDS v1.0.

Browse Source
This commit is contained in:
Dion Moult
2024-06-20 17:37:14 +10:00
parent fc0e9e900f
commit a0cb980a8f
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifctester/ifctester/ids.py
+2 -2
View File
@@ -108,7 +108,7 @@ class Ids:
"@xmlns": "http://standards.buildingsmart.org/IDS", "@xmlns": "http://standards.buildingsmart.org/IDS",
"@xmlns:xs": "http://www.w3.org/2001/XMLSchema", "@xmlns:xs": "http://www.w3.org/2001/XMLSchema",
"@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
"@xsi:schemaLocation": "http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/0.9.7/ids.xsd", "@xsi:schemaLocation": "http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/1.0/ids.xsd",
"info": info, "info": info,
"specifications": {"specification": []}, "specifications": {"specification": []},
} }
@@ -158,7 +158,7 @@ class Specification:
name="Unnamed", name="Unnamed",
minOccurs=0, minOccurs=0,
maxOccurs="unbounded", maxOccurs="unbounded",
ifcVersion=["IFC2X3", "IFC4"], ifcVersion=["IFC2X3", "IFC4", "IFC4X3_ADD2"],
identifier=None, identifier=None,
description=None, description=None,
instructions=None, instructions=None,
src/ifctester/ifctester/ids.xsd
+2 -9
View File
@@ -1,5 +1,4 @@
<!-- Draft - Do not use in production --> <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" targetNamespace="http://standards.buildingsmart.org/IDS" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0.0">
<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.7">
<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/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" 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"/> <xs:import namespace="http://www.w3.org/2001/XMLSchema-instance" schemaLocation="http://www.w3.org/2001/XMLSchema-instance"/>
@@ -64,12 +63,6 @@
<xs:element name="property" type="ids:propertyType" minOccurs="0" maxOccurs="unbounded"/> <xs:element name="property" type="ids:propertyType" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="material" type="ids:materialType" minOccurs="0" maxOccurs="unbounded"/> <xs:element name="material" type="ids:materialType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence> </xs:sequence>
<!-- Please note there is an implementation agreement on the use of minOccurs and maxOccurs.
Valid values are:
a. 0 to unbounded, meaning Optional
b. 1 to unbounded, meaning Required
c. 0 to 0, meaning Prohibited
-->
<xs:attributeGroup ref="xs:occurs"/> <xs:attributeGroup ref="xs:occurs"/>
</xs:complexType> </xs:complexType>
<xs:complexType name="propertyType"> <xs:complexType name="propertyType">
@@ -238,7 +231,7 @@
<xs:minLength value="1"/> <xs:minLength value="1"/>
<xs:enumeration value="IFC2X3"/> <xs:enumeration value="IFC2X3"/>
<xs:enumeration value="IFC4"/> <xs:enumeration value="IFC4"/>
<xs:enumeration value="IFC4X3"/> <xs:enumeration value="IFC4X3_ADD2"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:list> </xs:list>
src/ifctester/test/test_ids.py
+4 -4
View File
@@ -60,7 +60,7 @@ class TestIds:
"@xmlns": "http://standards.buildingsmart.org/IDS", "@xmlns": "http://standards.buildingsmart.org/IDS",
"@xmlns:xs": "http://www.w3.org/2001/XMLSchema", "@xmlns:xs": "http://www.w3.org/2001/XMLSchema",
"@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
"@xsi:schemaLocation": "http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/0.9.7/ids.xsd", "@xsi:schemaLocation": "http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/1.0/ids.xsd",
"info": {"title": "Untitled"}, "info": {"title": "Untitled"},
"specifications": {"specification": []}, "specifications": {"specification": []},
} }
@@ -80,7 +80,7 @@ class TestIds:
"@xmlns": "http://standards.buildingsmart.org/IDS", "@xmlns": "http://standards.buildingsmart.org/IDS",
"@xmlns:xs": "http://www.w3.org/2001/XMLSchema", "@xmlns:xs": "http://www.w3.org/2001/XMLSchema",
"@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
"@xsi:schemaLocation": "http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/0.9.7/ids.xsd", "@xsi:schemaLocation": "http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/1.0/ids.xsd",
"info": { "info": {
"title": "title", "title": "title",
"copyright": "copyright", "copyright": "copyright",
@@ -100,7 +100,7 @@ class TestIds:
"@xmlns": "http://standards.buildingsmart.org/IDS", "@xmlns": "http://standards.buildingsmart.org/IDS",
"@xmlns:xs": "http://www.w3.org/2001/XMLSchema", "@xmlns:xs": "http://www.w3.org/2001/XMLSchema",
"@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", "@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
"@xsi:schemaLocation": "http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/0.9.7/ids.xsd", "@xsi:schemaLocation": "http://standards.buildingsmart.org/IDS http://standards.buildingsmart.org/IDS/1.0/ids.xsd",
"info": {"title": "Untitled"}, "info": {"title": "Untitled"},
"specifications": {"specification": []}, "specifications": {"specification": []},
} }
@@ -255,7 +255,7 @@ class TestSpecification:
spec = ids.Specification() spec = ids.Specification()
assert spec.asdict() == { assert spec.asdict() == {
"@name": "Unnamed", "@name": "Unnamed",
"@ifcVersion": ["IFC2X3", "IFC4"], "@ifcVersion": ["IFC2X3", "IFC4", "IFC4X3_ADD2"],
"applicability": {}, "applicability": {},
"requirements": {}, "requirements": {},
} }