From a0cb980a8f9382b9685ad3846bb01b4b32755b9d Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Thu, 20 Jun 2024 17:37:14 +1000
Subject: [PATCH] See #4896. Bump to IDS v1.0.

---
 src/ifctester/ifctester/ids.py  |  4 ++--
 src/ifctester/ifctester/ids.xsd | 11 ++---------
 src/ifctester/test/test_ids.py  |  8 ++++----
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/ifctester/ifctester/ids.py b/src/ifctester/ifctester/ids.py
index 694af9d374..06f37ef23c 100644
--- a/src/ifctester/ifctester/ids.py
+++ b/src/ifctester/ifctester/ids.py
@@ -108,7 +108,7 @@ class Ids:
             "@xmlns": "http://standards.buildingsmart.org/IDS",
             "@xmlns:xs": "http://www.w3.org/2001/XMLSchema",
             "@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,
             "specifications": {"specification": []},
         }
@@ -158,7 +158,7 @@ class Specification:
         name="Unnamed",
         minOccurs=0,
         maxOccurs="unbounded",
-        ifcVersion=["IFC2X3", "IFC4"],
+        ifcVersion=["IFC2X3", "IFC4", "IFC4X3_ADD2"],
         identifier=None,
         description=None,
         instructions=None,
diff --git a/src/ifctester/ifctester/ids.xsd b/src/ifctester/ifctester/ids.xsd
index 62bb820697..edab179d83 100644
--- a/src/ifctester/ifctester/ids.xsd
+++ b/src/ifctester/ifctester/ids.xsd
@@ -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" xmlns:altova="http://www.altova.com/xml-schema-extensions" targetNamespace="http://standards.buildingsmart.org/IDS" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.9.7">
+<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: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"/>
@@ -64,12 +63,6 @@
 			<xs:element name="property" type="ids:propertyType" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="material" type="ids:materialType" minOccurs="0" maxOccurs="unbounded"/>
 		</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:complexType>
 	<xs:complexType name="propertyType">
@@ -238,7 +231,7 @@
 							<xs:minLength value="1"/>
 							<xs:enumeration value="IFC2X3"/>
 							<xs:enumeration value="IFC4"/>
-							<xs:enumeration value="IFC4X3"/>
+							<xs:enumeration value="IFC4X3_ADD2"/>
 						</xs:restriction>
 					</xs:simpleType>
 				</xs:list>
diff --git a/src/ifctester/test/test_ids.py b/src/ifctester/test/test_ids.py
index 9059519b3e..0278ded943 100644
--- a/src/ifctester/test/test_ids.py
+++ b/src/ifctester/test/test_ids.py
@@ -60,7 +60,7 @@ class TestIds:
             "@xmlns": "http://standards.buildingsmart.org/IDS",
             "@xmlns:xs": "http://www.w3.org/2001/XMLSchema",
             "@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"},
             "specifications": {"specification": []},
         }
@@ -80,7 +80,7 @@ class TestIds:
             "@xmlns": "http://standards.buildingsmart.org/IDS",
             "@xmlns:xs": "http://www.w3.org/2001/XMLSchema",
             "@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": "title",
                 "copyright": "copyright",
@@ -100,7 +100,7 @@ class TestIds:
             "@xmlns": "http://standards.buildingsmart.org/IDS",
             "@xmlns:xs": "http://www.w3.org/2001/XMLSchema",
             "@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"},
             "specifications": {"specification": []},
         }
@@ -255,7 +255,7 @@ class TestSpecification:
         spec = ids.Specification()
         assert spec.asdict() == {
             "@name": "Unnamed",
-            "@ifcVersion": ["IFC2X3", "IFC4"],
+            "@ifcVersion": ["IFC2X3", "IFC4", "IFC4X3_ADD2"],
             "applicability": {},
             "requirements": {},
         }