Formatting

FIWARE · Aug 2, 2023 · 3d06de6 · 3d06de6
1 parent f231f2c
commit 3d06de6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/app/lib/formatter.js b/app/lib/formatter.js
@@ -5,7 +5,6 @@ const port = process.env.WEB_APP_PORT || '3000';
 const dataModelContext =
     process.env.IOTA_JSON_LD_CONTEXT || 'http://localhost:' + port + '/data-models/ngsi-context.jsonld';
 
-
 //
 // Entity types are typically title cased following Schema.org
 //
@@ -54,7 +53,7 @@ function formatResponse(req, inputData, attributeValueCallback) {
     const mappedAttributes = parseMapping(req.params.mapping);
     const regex = /:.*/gi;
     const type = req.params.id.replace('urn:ngsi-ld:', '').replace(regex, '');
-    const links = req.headers.link ? parseLinks(req.headers.link) : {context: dataModelContext};
+    const links = req.headers.link ? parseLinks(req.headers.link) : { context: dataModelContext };
     const attrs = (req.query.attrs || '').split(',');
 
     const response = {

diff --git a/app/public/data-models/alternate-context.jsonld b/app/public/data-models/alternate-context.jsonld
@@ -84,7 +84,7 @@
         "bewegung": "https://w3id.org/saref#motion",
         "bewegungsaktivität": "https://w3id.org/saref#movementActivity",
         "multimedia": "https://w3id.org/saref#multimedia",
-        "name": "ngsi-ld:name",
+        "name": "schema:name",
         "netzwerk": "https://w3id.org/saref#network",
         "belegung": "https://w3id.org/saref#occupancy",
         "besatzer": "fiware:occupier",

diff --git a/app/public/data-models/json-context.jsonld b/app/public/data-models/json-context.jsonld
@@ -187,7 +187,7 @@
         "movementActivity": "https://w3id.org/saref#movementActivity",
         "multimedia": "https://w3id.org/saref#multimedia",
         "name": {
-            "@id": "ngsi-ld:name",
+            "@id": "schema:name",            
             "@type": "xsd:string"
         },
         "network": "https://w3id.org/saref#network",

diff --git a/app/public/data-models/ngsi-context.jsonld b/app/public/data-models/ngsi-context.jsonld
@@ -82,7 +82,7 @@
         "motion": "https://w3id.org/saref#motion",
         "movementActivity": "https://w3id.org/saref#movementActivity",
         "multimedia": "https://w3id.org/saref#multimedia",
-        "name": "ngsi-ld:name",
+        "name": "schema:name",
         "network": "https://w3id.org/saref#network",
         "observedAt": "ngsi-ld:observedAt",
         "occupancy": "https://w3id.org/saref#occupancy",

diff --git a/app/routes/index.js b/app/routes/index.js
@@ -123,11 +123,10 @@ router.get('/app/monitor', function (req, res) {
 router.get('/device/history', function (req, res) {
     const stores = [];
     if (process.env.CRATE_DB_SERVICE_URL || process.env.STH_COMET_SERVICE_URL) {
-
         for (let i = 1; i <= numberOfPigs; i++) {
             stores.push({
-                name: ('Device' + i.toString().padStart(3, '0')),
-                href: ('history/' + i.toString().padStart(3, '0'))
+                name: 'Device' + i.toString().padStart(3, '0'),
+                href: 'history/' + i.toString().padStart(3, '0')
             });
         }
     }