From a521a6b91565701b8e2c2086eadcc6eea1741e7e Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Fri, 21 Nov 2025 18:17:26 +0100 Subject: [PATCH 1/2] Scope Aggregation terms --- md/annex-b.md | 145 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 108 insertions(+), 37 deletions(-) diff --git a/md/annex-b.md b/md/annex-b.md index bf85277..4c427be 100644 --- a/md/annex-b.md +++ b/md/annex-b.md @@ -76,10 +76,6 @@ Such definition has been tested using [i.19]. "@type": "@vocab" }, "attrs": "ngsi-ld:attrs", - "avg": { - "@id": "ngsi-ld:avg", - "@container": "@list" - }, "bbox": { "@container": "@list", "@id": "geojson:bbox" @@ -121,12 +117,11 @@ Such definition has been tested using [i.19]. "@id": "ngsi-ld:deletedAt", "@type": "DateTime" }, - "description": "http://purl.org/dc/terms/description", - "detail": "ngsi-ld:detail", - "distinctCount": { - "@id": "ngsi-ld:distinctCount", - "@container": "@list" + "description": { + "@id": "http://purl.org/dc/terms/description", + "@protected": false }, + "detail": "ngsi-ld:detail", "endAt": { "@id": "ngsi-ld:endAt", "@type": "DateTime" @@ -185,7 +180,17 @@ Such definition has been tested using [i.19]. "jsonldContext": "ngsi-ld:jsonldContext", "jsons": { "@id": "ngsi-ld:jsons", - "@container": "@list" + "@container": "@list", + "@context": { + "distinctCount": { + "@id": "ngsi-ld:distinctCount", + "@container": "@list" + }, + "totalCount": { + "@id": "ngsi-ld:totalCount", + "@container": "@list" + } + } }, "key": "ngsi-ld:hasKey", "lang": "ngsi-ld:lang", @@ -195,7 +200,17 @@ Such definition has been tested using [i.19]. }, "languageMaps": { "@id": "ngsi-ld:hasLanguageMaps", - "@container": "@list" + "@container": "@list", + "@context": { + "distinctCount": { + "@id": "ngsi-ld:distinctCount", + "@container": "@list" + }, + "totalCount": { + "@id": "ngsi-ld:totalCount", + "@container": "@list" + } + } }, "langString": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString", "lastFailure": { @@ -220,14 +235,6 @@ Such definition has been tested using [i.19]. "location": "ngsi-ld:location", "management": "ngsi-ld:management", "managementInterval": "ngsi-ld:managementInterval", - "max": { - "@id": "ngsi-ld:max", - "@container": "@list" - }, - "min": { - "@id": "ngsi-ld:min", - "@container": "@list" - }, "mode": "ngsi-ld:mode", "modifiedAt": { "@id": "ngsi-ld:modifiedAt", @@ -265,11 +272,31 @@ Such definition has been tested using [i.19]. }, "objectLists": { "@id": "ngsi-ld:hasObjectLists", - "@container": "@list" + "@container": "@list", + "@context": { + "distinctCount": { + "@id": "ngsi-ld:distinctCount", + "@container": "@list" + }, + "totalCount": { + "@id": "ngsi-ld:totalCount", + "@container": "@list" + } + } }, "objects": { "@id": "ngsi-ld:hasObjects", - "@container": "@list" + "@container": "@list", + "@context": { + "distinctCount": { + "@id": "ngsi-ld:distinctCount", + "@container": "@list" + }, + "totalCount": { + "@id": "ngsi-ld:totalCount", + "@container": "@list" + } + } }, "objectType": { "@id": "ngsi-ld:hasObjectType", @@ -319,7 +346,10 @@ Such definition has been tested using [i.19]. "@id": "ngsi-ld:problemDetails", "@type": "@json" }, - "properties": "geojson:properties", + "properties": { + "@id": "geojson:properties", + "@protected": false + }, "propertyNames": { "@id": "ngsi-ld:propertyNames", "@type": "@vocab" @@ -377,14 +407,6 @@ Such definition has been tested using [i.19]. "@id": "ngsi-ld:success", "@type": "@id" }, - "sum": { - "@id": "ngsi-ld:sum", - "@container": "@list" - }, - "sumsq": { - "@id": "ngsi-ld:sumsq", - "@container": "@list" - }, "sysAttrs": "ngsi-ld:sysAttrs", "temporalQ": "ngsi-ld:temporalQ", "tenant": { @@ -402,10 +424,9 @@ Such definition has been tested using [i.19]. "timerel": "ngsi-ld:timerel", "timesFailed": "ngsi-ld:timesFailed", "timesSent": "ngsi-ld:timesSent", - "title": "http://purl.org/dc/terms/title", - "totalCount": { - "@id": "ngsi-ld:totalCount", - "@container": "@list" + "title": { + "@id": "http://purl.org/dc/terms/title", + "@protected": false }, "triggerReason": "ngsi-ld:triggerReason", "typeList": { @@ -431,11 +452,51 @@ Such definition has been tested using [i.19]. }, "valueLists": { "@id": "ngsi-ld:hasValueLists", - "@container": "@list" + "@container": "@list", + "@context": { + "distinctCount": { + "@id": "ngsi-ld:distinctCount", + "@container": "@list" + }, + "totalCount": { + "@id": "ngsi-ld:totalCount", + "@container": "@list" + } + } }, "values": { "@id": "ngsi-ld:hasValues", - "@container": "@list" + "@container": "@list", + "@context": { + "avg": { + "@id": "ngsi-ld:avg", + "@container": "@list" + }, + "distinctCount": { + "@id": "ngsi-ld:distinctCount", + "@container": "@list" + }, + "max": { + "@id": "ngsi-ld:max", + "@container": "@list" + }, + "min": { + "@id": "ngsi-ld:min", + "@container": "@list" + }, + "sum": { + "@id": "ngsi-ld:sum", + "@container": "@list" + }, + "sumsq": { + "@id": "ngsi-ld:sumsq", + "@container": "@list" + }, + "totalCount": { + "@id": "ngsi-ld:totalCount", + "@container": "@list" + } + } }, "valueType": { "@id": "ngsi-ld:hasValueType", @@ -447,7 +508,17 @@ Such definition has been tested using [i.19]. }, "vocabs": { "@id": "ngsi-ld:hasVocabs", - "@container": "@list" + "@container": "@list", + "@context": { + "distinctCount": { + "@id": "ngsi-ld:distinctCount", + "@container": "@list" + }, + "totalCount": { + "@id": "ngsi-ld:totalCount", + "@container": "@list" + } + } }, "watchedAttributes": { "@id": "ngsi-ld:watchedAttributes", -- GitLab From 3c5574bfad7a02034aa3bc087477897fd5e6ad54 Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Tue, 2 Dec 2025 11:51:30 +0100 Subject: [PATCH 2/2] Remove scoping --- md/annex-b.md | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/md/annex-b.md b/md/annex-b.md index 4c427be..6f85bf6 100644 --- a/md/annex-b.md +++ b/md/annex-b.md @@ -117,10 +117,7 @@ Such definition has been tested using [i.19]. "@id": "ngsi-ld:deletedAt", "@type": "DateTime" }, - "description": { - "@id": "http://purl.org/dc/terms/description", - "@protected": false - }, + "description": "http://purl.org/dc/terms/description", "detail": "ngsi-ld:detail", "endAt": { "@id": "ngsi-ld:endAt", @@ -346,10 +343,7 @@ Such definition has been tested using [i.19]. "@id": "ngsi-ld:problemDetails", "@type": "@json" }, - "properties": { - "@id": "geojson:properties", - "@protected": false - }, + "properties": "geojson:properties", "propertyNames": { "@id": "ngsi-ld:propertyNames", "@type": "@vocab" @@ -424,10 +418,7 @@ Such definition has been tested using [i.19]. "timerel": "ngsi-ld:timerel", "timesFailed": "ngsi-ld:timesFailed", "timesSent": "ngsi-ld:timesSent", - "title": { - "@id": "http://purl.org/dc/terms/title", - "@protected": false - }, + "title": "http://purl.org/dc/terms/title", "triggerReason": "ngsi-ld:triggerReason", "typeList": { "@id": "ngsi-ld:typeList", -- GitLab