Move geometry from metadata of a component to a domain geometricData

apis/database.graphql

@@ -219,6 +219,11 @@ type Query {
     locale: Locale
   ): CalorimetricData!
 
+  """
+  See `Query#data`.
+  """
+  geometricData(id: Uuid!, timestamp: DateTime, locale: Locale): GeometricData!
+
   """
   See `Query#data`.
   """
@@ -325,6 +330,19 @@ type Query {
     before: Cursor
   ): CalorimetricDataConnection!
 
+  """
+  See `Query#allData`.
+  """
+  allGeometricData(
+    where: GeometricDataPropositionInput
+    timestamp: DateTime
+    locale: Locale
+    first: NonNegativeInt
+    after: Cursor
+    last: NonNegativeInt
+    before: Cursor
+  ): GeometricDataConnection!
+
   """
   See `Query#allData`.
   """
@@ -386,6 +404,15 @@ type Query {
     locale: Locale
   ): Boolean!
 
+  """
+  See `Query#hasData`.
+  """
+  hasGeometricData(
+    where: GeometricDataPropositionInput
+    timestamp: DateTime
+    locale: Locale
+  ): Boolean!
+
   """
   See `Query#hasData`.
   """
@@ -712,6 +739,12 @@ input DataPropositionInput {
   """
   uValues: FloatsPropositionInput
 
+  """
+  True for data whose list of `thickness` values satisfies the proposition `thicknesses`,
+  otherwise false.
+  """
+  thicknesses: FloatsPropositionInput
+
   """
   True for data whose list of nearnormal hemispherical visible transmittance
   values satisfies the proposition
@@ -838,6 +871,18 @@ input CalorimetricDataPropositionInput {
   uValues: FloatsPropositionInput
 }
 
+"""
+See `DataPropositionInput`.
+"""
+input GeometricDataPropositionInput {
+  componentId: UuidPropositionInput
+  and: [GeometricDataPropositionInput!]
+  not: GeometricDataPropositionInput
+  or: [GeometricDataPropositionInput!]
+  resources: GetHttpsResourcesPropositionInput
+  thicknesses: FloatsPropositionInput
+}
+
 """
 See `DataPropositionInput`.
 """
@@ -996,6 +1041,16 @@ type CalorimetricDataConnection {
   timestamp: DateTime!
 }
 
+"""
+See `DataConnection`.
+"""
+type GeometricDataConnection {
+  edges: [GeometricDataEdge!]!
+  nodes: [GeometricData!]!
+  pageInfo: PageInfo!
+  timestamp: DateTime!
+}
+
 """
 See `DataEdge`.
 """
@@ -1004,6 +1059,14 @@ type CalorimetricDataEdge {
   node: CalorimetricData!
 }
 
+"""
+See `DataEdge`.
+"""
+type GeometricDataEdge {
+  cursor: Cursor!
+  node: GeometricData!
+}
+
 """
 Measured, simulated, or calculated data.
 
@@ -1217,6 +1280,30 @@ type CalorimetricData implements Node & Data {
   uValues: [Float!]!
 }
 
+type GeometricData implements Node & Data {
+  id: ID!
+  uuid: Uuid!
+  timestamp: DateTime!
+  locale: Locale!
+  databaseId: Uuid!
+  componentId: Uuid!
+  name: String
+  description: String
+  warnings: [String!]!
+  creatorId: Uuid!
+  createdAt: DateTime!
+  appliedMethod: AppliedMethod!
+  resources: [GetHttpsResource!]!
+  resourceTree: GetHttpsResourceTree!
+  approvals: [DataApproval!]!
+  approval: ResponseApproval!
+
+  """
+  Mirrored `thickness` values that occur in the data
+  """
+  thicknesses: [Float!]!
+}
+
 type HygrothermalData implements Node & Data {
   id: ID!
   uuid: Uuid!

apis/metabase.graphql

@@ -487,6 +487,15 @@ type Database implements Node {
     timestamp: DateTime
     where: DataPropositionInput
   ): DataConnection
+  allGeometricData(
+    after: String
+    before: String
+    first: NonNegativeInt
+    last: NonNegativeInt
+    locale: String
+    timestamp: DateTime
+    where: GeometricDataPropositionInput
+  ): GeometricDataConnection
   allHygrothermalData(
     after: String
     before: String
@@ -521,6 +530,7 @@ type Database implements Node {
   ): CalorimetricData
   data(id: Uuid!, locale: String, timestamp: DateTime): Data
   description: String!
+  geometricData(id: Uuid!, locale: String, timestamp: DateTime): GeometricData
   hasCalorimetricData(
     locale: String
     timestamp: DateTime
@@ -531,6 +541,11 @@ type Database implements Node {
     timestamp: DateTime
     where: DataPropositionInput
   ): Boolean
+  hasGeometricData(
+    locale: String
+    timestamp: DateTime
+    where: GeometricDataPropositionInput
+  ): Boolean
   hasHygrothermalData(
     locale: String
     timestamp: DateTime
@@ -688,6 +703,36 @@ type GenerateUserTwoFactorRecoveryCodesPayload {
   user: User
 }
 
+type GeometricData implements Data {
+  appliedMethod: AppliedMethod!
+  component: Component
+  componentId: Uuid!
+  createdAt: DateTime!
+  creatorId: Uuid!
+  description: String
+  id: String!
+  locale: String!
+  name: String
+  resourceTree: GetHttpsResourceTree!
+  resources: [GetHttpsResource!]!
+  thicknesses: [Float!]!
+  timestamp: DateTime!
+  uuid: Uuid!
+  warnings: [String!]!
+}
+
+type GeometricDataConnection {
+  edges: [GeometricDataEdge!]!
+  nodes: [GeometricData!]!
+  timestamp: DateTime!
+  totalCount: NonNegativeInt
+}
+
+type GeometricDataEdge {
+  cursor: String!
+  node: GeometricData!
+}
+
 type GetHttpsResource {
   dataFormat: DataFormat
   dataFormatId: Uuid!
@@ -1879,6 +1924,16 @@ input FloatsPropositionInput {
   some: FloatPropositionInput
 }
 
+input GeometricDataPropositionInput {
+  and: [GeometricDataPropositionInput!]
+  componentId: UuidPropositionInput
+  gValues: FloatsPropositionInput
+  not: GeometricDataPropositionInput
+  or: [GeometricDataPropositionInput!]
+  resources: GetHttpsResourcesPropositionInput
+  uValues: FloatsPropositionInput
+}
+
 input GetHttpsResourcePropositionInput {
   archivedFilesMetaInformation: FilesMetaInformationPropositionInput
   dataFormatId: UuidPropositionInput

examples/dbe/assembly/collectorFieldAsGeometricAssembly.json

@@ -2,61 +2,57 @@
   "components": [
     {
       "id": "cd7aed0a-2b9a-4748-8d98-e9d278cd12e4",
-      "description": "This example represents the solar thermal collectors of a building.",
-      "characteristics": {
-        "geometry": {
-          "origin": {
-            "latitude": 48.00883171395494,
-            "longitude": 7.834452327404689,
-            "elevation": 278
-          },
-          "definitionOfSurfacesAndPrimeDirections": {
-            "description": "On each collector, the product number is at the bottom right corner facing the interior. The direction from the bottom to the top in parallel to the largest dimension of the collector is the prime direction. The collector surface facing the exterior is the non-prime surface."
-          },
-          "assemblyList": [
+      "description": "This component represents the solar thermal collectors of a building. It is assembled from two subcomponents.",
+      "geometric": [
+        {
+          "data": [
             {
-              "id": "cd85554f-e909-405e-9b7b-2f08ca201f63",
-              "dimensions": {
-                "independent": {
-                  "smallest": 0.1,
-                  "intermediate": 0.9,
-                  "largest": 1.4
+              "assembly": [
+                {
+                  "id": "cd85554f-e909-405e-9b7b-2f08ca201f63",
+                  "dimensions": {
+                    "independent": {
+                      "smallest": 0.1,
+                      "intermediate": 0.9,
+                      "largest": 1.4
+                    }
+                  },
+                  "location": {
+                    "east": 5,
+                    "north": 0,
+                    "elevation": 5
+                  },
+                  "orientation": {
+                    "azimuth": 180,
+                    "componentTilt": 90,
+                    "rotation": 0
+                  }
+                },
+                {
+                  "id": "cd95554f-e909-405e-9b7b-2f08ca201f63",
+                  "dimensions": {
+                    "independent": {
+                      "smallest": 0.1,
+                      "intermediate": 0.9,
+                      "largest": 1.4
+                    }
+                  },
+                  "location": {
+                    "east": 0,
+                    "north": 5,
+                    "elevation": 5
+                  },
+                  "orientation": {
+                    "azimuth": 270,
+                    "componentTilt": 90,
+                    "rotation": 0
+                  }
                 }
-              },
-              "location": {
-                "east": 5,
-                "north": 0,
-                "elevation": 5
-              },
-              "orientation": {
-                "azimuth": 180,
-                "componentTilt": 90,
-                "rotation": 0
-              }
-            },
-            {
-              "id": "cd95554f-e909-405e-9b7b-2f08ca201f63",
-              "dimensions": {
-                "independent": {
-                  "smallest": 0.1,
-                  "intermediate": 0.9,
-                  "largest": 1.4
-                }
-              },
-              "location": {
-                "east": 0,
-                "north": 5,
-                "elevation": 5
-              },
-              "orientation": {
-                "azimuth": 270,
-                "componentTilt": 90,
-                "rotation": 0
-              }
+              ]
             }
           ]
         }
-      }
+      ]
     }
   ]
 }

examples/dbe/assembly/geometricAssemblyWhichIsPartOfAnotherAssembly.json

@@ -10,18 +10,22 @@
           "86089938-f045-4039-b41a-76c70db22369"
         ]
       },
-      "characteristics": {
-        "geometry": {
-          "assemblyList": [
+      "geometric": [
+        {
+          "data": [
             {
-              "id": "b511af56-891e-4828-a2d1-a4454112e8f8"
-            },
-            {
-              "id": "86089938-f045-4039-b41a-76c70db22369"
+              "assembly": [
+                {
+                  "id": "b511af56-891e-4828-a2d1-a4454112e8f8"
+                },
+                {
+                  "id": "86089938-f045-4039-b41a-76c70db22369"
+                }
+              ]
             }
           ]
         }
-      }
+      ]
     }
   ]
 }