From 39d0ef68dbd66d1b1933eeb851bb85c65657e2e3 Mon Sep 17 00:00:00 2001
From: Oleksandra Podhurska <oleksandra@idunrealestate.com>
Date: Mon, 8 Apr 2024 10:28:28 +0300
Subject: [PATCH 1/3] PointGroup improvement

---
 .../RealEstateCore/PointGroup/PointGroup.json | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 Source/DTDLv2/RealEstateCore/PointGroup/PointGroup.json

diff --git a/Source/DTDLv2/RealEstateCore/PointGroup/PointGroup.json b/Source/DTDLv2/RealEstateCore/PointGroup/PointGroup.json
new file mode 100644
index 00000000..e6b8f9e0
--- /dev/null
+++ b/Source/DTDLv2/RealEstateCore/PointGroup/PointGroup.json
@@ -0,0 +1,79 @@
+{
+  "@id": "dtmi:org:w3id:rec:PointGroup;1",
+  "@type": "Interface",
+  "contents": [
+    {
+      "@type": "Relationship",
+      "displayName": {
+        "en": "located in"
+      },
+      "name": "locatedIn",
+      "target": "dtmi:org:w3id:rec:Space;1",
+      "maxMultiplicity": 1,
+      "writable": true
+    },
+    {
+      "@type": "Relationship",
+      "displayName": {
+        "en": "has point"
+      },
+      "name": "hasPoint",
+      "target": "dtmi:org:w3id:rec:Point;1",
+      "writable": true
+    },
+
+    {
+      "@type": "Property",
+      "displayName": {
+        "en": "Custom Tags"
+      },
+      "name": "customTags",
+      "schema": {
+        "@type": "Map",
+        "mapKey": {
+          "name": "tagName",
+          "schema": "string"
+        },
+        "mapValue": {
+          "name": "tagValue",
+          "schema": "boolean"
+        }
+      },
+      "writable": true
+    },
+    {
+      "@type": "Property",
+      "displayName": {
+        "en": "Identifiers"
+      },
+      "name": "identifiers",
+      "schema": {
+        "@type": "Map",
+        "mapKey": {
+          "name": "namespace",
+          "schema": "string"
+        },
+        "mapValue": {
+          "name": "identifier",
+          "schema": "string"
+        }
+      },
+      "writable": true
+    },
+    {
+      "@type": "Property",
+      "displayName": {
+        "en": "name"
+      },
+      "name": "name",
+      "schema": "string",
+      "writable": true
+    }
+  ],
+  "displayName": {
+    "en": "Point Group"
+  },
+  "@context": [
+    "dtmi:dtdl:context;2"
+  ]
+}
\ No newline at end of file

From b52a25c266274096e444655b686f745a8ad82e5d Mon Sep 17 00:00:00 2001
From: Oleksandra Podhurska <oleksandra@idunrealestate.com>
Date: Tue, 16 Apr 2024 15:38:41 +0300
Subject: [PATCH 2/3] Point relations

---
 Source/DTDLv2/Brick/Point/Point.json          | 20 +++++++++++++++++++
 .../RealEstateCore/PointGroup/PointGroup.json |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Source/DTDLv2/Brick/Point/Point.json b/Source/DTDLv2/Brick/Point/Point.json
index a5b55443..d19713ea 100644
--- a/Source/DTDLv2/Brick/Point/Point.json
+++ b/Source/DTDLv2/Brick/Point/Point.json
@@ -739,6 +739,26 @@
       },
       "name": "isPointOf",
       "writable": true
+    },
+    {
+      "@type": "Relationship",
+      "displayName": {
+        "en": "has location"
+      },
+      "name": "hasLocation",
+      "target": "dtmi:org:w3id:rec:Architecture;1",
+      "writable": true,
+      "maxMultiplicity": 1
+    },
+    {
+      "@type": "Relationship",
+      "displayName": {
+        "en": "is member of"
+      },
+      "name": "isMemberOf",
+      "target": "dtmi:org:w3id:rec:PointGroup;1",
+      "writable": true,
+      "maxMultiplicity": 1
     }
   ],
   "displayName": {
diff --git a/Source/DTDLv2/RealEstateCore/PointGroup/PointGroup.json b/Source/DTDLv2/RealEstateCore/PointGroup/PointGroup.json
index e6b8f9e0..039488b6 100644
--- a/Source/DTDLv2/RealEstateCore/PointGroup/PointGroup.json
+++ b/Source/DTDLv2/RealEstateCore/PointGroup/PointGroup.json
@@ -15,9 +15,9 @@
     {
       "@type": "Relationship",
       "displayName": {
-        "en": "has point"
+        "en": "has member"
       },
-      "name": "hasPoint",
+      "name": "hasMember",
       "target": "dtmi:org:w3id:rec:Point;1",
       "writable": true
     },

From 5e66541b639ef456814fd48f033f5527b4080c77 Mon Sep 17 00:00:00 2001
From: Oleksandra Podhurska <oleksandra@idunrealestate.com>
Date: Mon, 22 Apr 2024 13:20:11 +0300
Subject: [PATCH 3/3] Added relation from PointGroup to Asset

---
 Source/DTDLv2/Brick/Point/Point.json                  |  4 ++--
 .../DTDLv2/RealEstateCore/PointGroup/PointGroup.json  | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Source/DTDLv2/Brick/Point/Point.json b/Source/DTDLv2/Brick/Point/Point.json
index d19713ea..641dbd40 100644
--- a/Source/DTDLv2/Brick/Point/Point.json
+++ b/Source/DTDLv2/Brick/Point/Point.json
@@ -743,9 +743,9 @@
     {
       "@type": "Relationship",
       "displayName": {
-        "en": "has location"
+        "en": "located in"
       },
-      "name": "hasLocation",
+      "name": "locatedIn",
       "target": "dtmi:org:w3id:rec:Architecture;1",
       "writable": true,
       "maxMultiplicity": 1
diff --git a/Source/DTDLv2/RealEstateCore/PointGroup/PointGroup.json b/Source/DTDLv2/RealEstateCore/PointGroup/PointGroup.json
index 039488b6..9e8cc22f 100644
--- a/Source/DTDLv2/RealEstateCore/PointGroup/PointGroup.json
+++ b/Source/DTDLv2/RealEstateCore/PointGroup/PointGroup.json
@@ -18,7 +18,16 @@
         "en": "has member"
       },
       "name": "hasMember",
-      "target": "dtmi:org:w3id:rec:Point;1",
+      "target": "dtmi:org:brickschema:schema:Brick:Point;1",
+      "writable": true
+    },
+    {
+      "@type": "Relationship",
+      "displayName": {
+        "en": "is point group of"
+      },
+      "name": "isPointGroupOf",
+      "target": "dtmi:org:w3id:rec:Asset;1",
       "writable": true
     },