From e22d7b5cf131fd3d935767588717d6d237cb17f5 Mon Sep 17 00:00:00 2001
From: Benoit Orihuela <benoit.orihuela@egm.io>
Date: Tue, 19 Dec 2023 09:33:12 +0100
Subject: [PATCH 1/2] fix(020_04/017_01/015_01): a single temporal instance is
 always rendered as an object

---
 ...ral-representation-020-04-02-expectation.jsonld | 10 ++++------
 ...ral-representation-020-04-03-expectation.jsonld |  4 ++--
 ...resentation-delete-fuelLevel-expectation.jsonld | 14 ++++++--------
 ...sentation-delete-speed-instanceid-sample.jsonld | 12 +++++-------
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-02-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-02-expectation.jsonld
index 605f67d9..8efc2ba3 100644
--- a/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-02-expectation.jsonld
+++ b/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-02-expectation.jsonld
@@ -1,16 +1,14 @@
 {
    "id":"urn:ngsi-ld:Vehicle:randomUUID",
    "type":"Vehicle",
-   "fuelLevel":[{
+   "fuelLevel":{
       "type":"Property",
       "value":67,
       "observedAt":"2020-08-01T12:03:00Z"
-   }],
-   "speed":[
-      {
+   },
+   "speed":{
          "type":"Property",
          "value":120,
          "observedAt":"2020-08-01T12:03:00Z"
-      }
-   ]
+   }
 }
\ No newline at end of file
diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-03-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-03-expectation.jsonld
index c0390362..e5bb683d 100644
--- a/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-03-expectation.jsonld
+++ b/data/temporalEntities/expectations/vehicle-temporal-representation-020-04-03-expectation.jsonld
@@ -1,11 +1,11 @@
 {
    "id":"urn:ngsi-ld:Vehicle:randomUUID",
    "type":"Vehicle",
-   "fuelLevel":[{
+   "fuelLevel":{
       "type":"Property",
       "value":67,
       "observedAt":"2020-08-01T12:03:00Z"
-   }],
+   },
    "speed":[
       {
          "type":"Property",
diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-expectation.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-expectation.jsonld
index 6b84b98c..77db2073 100644
--- a/data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-expectation.jsonld
+++ b/data/temporalEntities/expectations/vehicle-temporal-representation-delete-fuelLevel-expectation.jsonld
@@ -13,14 +13,12 @@
          "observedAt":"2020-09-01T12:05:00Z"
       }
    ],
-   "fuelLevel":[
-      {
-         "type":"Property",
-         "value":40,
-         "observedAt":"2020-09-01T14:07:00Z",
-         "datasetId":"urn:ngsi-ld:Vehicle:12345-fuel"
-      }
-   ],
+   "fuelLevel":{
+     "type":"Property",
+     "value":40,
+     "observedAt":"2020-09-01T14:07:00Z",
+     "datasetId":"urn:ngsi-ld:Vehicle:12345-fuel"
+  },
    "@context":[
       "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
    ]
diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld
index 3bfbec07..9c31bb90 100644
--- a/data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld
+++ b/data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld
@@ -1,13 +1,11 @@
 {
    "id":"urn:ngsi-ld:Vehicle:randomUUID",
    "type":"Vehicle",
-   "speed":[
-      {
-         "type":"Property",
-         "value":80,
-         "observedAt":"2020-09-01T12:05:00Z"
-      }
-   ],
+   "speed":{
+     "type":"Property",
+     "value":80,
+     "observedAt":"2020-09-01T12:05:00Z"
+   },
    "fuelLevel":[
       {
          "type":"Property",
-- 
GitLab


From de739dbc9e79654d15ea4f36eb2d2ef781937d1c Mon Sep 17 00:00:00 2001
From: Benoit Orihuela <benoit.orihuela@egm.io>
Date: Fri, 29 Dec 2023 14:43:32 +0100
Subject: [PATCH 2/2] fix(016): EntityTemporal Fragment expected by 5.6.14 is
 an object, not a list

---
 ...emporal-modify-attribute-instance-fragment.jsonld | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/data/temporalEntities/fragments/vehicle-temporal-modify-attribute-instance-fragment.jsonld b/data/temporalEntities/fragments/vehicle-temporal-modify-attribute-instance-fragment.jsonld
index f9261a45..632a63a5 100644
--- a/data/temporalEntities/fragments/vehicle-temporal-modify-attribute-instance-fragment.jsonld
+++ b/data/temporalEntities/fragments/vehicle-temporal-modify-attribute-instance-fragment.jsonld
@@ -1,7 +1,5 @@
-[
-   {
-       "type":"Property",
-       "value":129,
-       "observedAt":"2020-09-01T12:03:00Z"
-   }
-]
\ No newline at end of file
+{
+   "type":"Property",
+   "value":129,
+   "observedAt":"2020-09-01T12:03:00Z"
+}
-- 
GitLab