Commit 26d7db44 authored by Giuseppe Tropea's avatar Giuseppe Tropea
Browse files

Merge branch 'fix/scoping-attrs' into 'master' 

DATA(25)000191_NGSI-LD_Core_Add_type_and_property_scoping

See merge request !20
parents 68885631 668f1a08

md/annex-b.md

+300 −146
Original line number Diff line number Diff line
@@ -14,20 +14,133 @@ Such definition has been tested using [i.19]. 
    "geojson": "https://purl.org/geojson/vocab#",

    "id": "@id",

    "type": "@type",

    "Attribute": "ngsi-ld:Attribute",

    "AttributeList": "ngsi-ld:AttributeList",

    "ContextSourceIdentity": "ngsi-ld:ContextSourceIdentity",

    "ContextSourceNotification": "ngsi-ld:ContextSourceNotification",

    "ContextSourceRegistration": "ngsi-ld:ContextSourceRegistration",

    "Attribute": {

      "@id": "ngsi-ld:Attribute",

      "@context": {

        "attributeName": {

          "@id": "ngsi-ld:attributeName",

          "@type": "@vocab"

        },

        "attributeCount": "attributeCount",

        "attributeTypes": {

          "@id": "ngsi-ld:attributeTypes",

          "@type": "@vocab"

        },

        "typeNames": {

          "@id": "ngsi-ld:typeNames",

          "@type": "@vocab"

        }

      }

    },

    "AttributeList": {

      "@id": "ngsi-ld:AttributeList",

      "@context": {

        "attributeList": {

          "@id": "ngsi-ld:attributeList",

          "@type": "@vocab"

        }

      }

    },

    "ContextSourceIdentity": {

      "@id": "ngsi-ld:ContextSourceIdentity",

      "@context": {

        "contextSourceAlias": "ngsi-ld:contextSourceAlias",

        "contextSourceExtras": {

          "@id": "ngsi-ld:contextSourceExtras",

          "@type": "@json"

        },

        "contextSourceInfo": "ngsi-ld:contextSourceInfo",

        "contextSourceTimeAt": {

          "@id": "ngsi-ld:contextSourceTimeAt",

          "@type": "DateTime"

        },

        "contextSourceUptime": "ngsi-ld:contextSourceUptime"

      }

    },

    "ContextSourceNotification": {

      "@id": "ngsi-ld:ContextSourceNotification",

      "@context": {

        "data": "ngsi-ld:data",

        "notifiedAt": {

          "@id": "ngsi-ld:notifiedAt",

          "@type": "DateTime"

        },

        "subscriptionId": {

          "@id": "ngsi-ld:subscriptionId",

          "@type": "@id"

        },

        "triggerReason": "ngsi-ld:triggerReason"

      }

    },

    "ContextSourceRegistration": {

      "@id": "ngsi-ld:ContextSourceRegistration",

      "@context": {

        "lastFailure": {

          "@id": "ngsi-ld:lastFailure",

          "@type": "DateTime"

        },

        "lastSuccess": {

          "@id": "ngsi-ld:lastSuccess",

          "@type": "DateTime"

        },

        "status": "ngsi-ld:status",

        "timesFailed": "ngsi-ld:timesFailed",

        "timesSent": "ngsi-ld:timesSent"

      }

    },

    "Date": "ngsi-ld:Date",

    "DateTime": "ngsi-ld:DateTime",

    "EntityMap": "ngsi-ld:EntityMap",

    "EntityType": "ngsi-ld:EntityType",

    "EntityTypeInfo": "ngsi-ld:EntityTypeInfo",

    "EntityTypeList": "ngsi-ld:EntityTypeList",

    "EntityType": {

      "@id": "ngsi-ld:EntityType",

      "@context": {

        "attributeNames": {

          "@id": "ngsi-ld:attributeNames",

          "@type": "@vocab"

        },

        "typeName": {

          "@id": "ngsi-ld:typeName",

          "@type": "@vocab"

        }

      }

    },

    "EntityTypeInfo": {

      "@id": "ngsi-ld:EntityTypeInfo",

      "@context": {

        "attributeDetails": "attributeDetails",

        "entityCount": "ngsi-ld:entityCount",

        "typeName": {

          "@id": "ngsi-ld:typeName",

          "@type": "@vocab"

        }

      }

    },

    "EntityTypeList": {

      "@id": "ngsi-ld:EntityTypeList",

      "@context": {

        "typeList": {

          "@id": "ngsi-ld:typeList",

          "@type": "@vocab"

        }

      }

    },

    "ExecutionResultDetails": "ngsi-ld:ExecutionResultDetails",

    "Feature": "geojson:Feature",

    "FeatureCollection": "geojson:FeatureCollection",

    "Feature": {

      "@id": "geojson:Feature",

      "@context": {

        "geometry": "geojson:geometry",

        "properties": "geojson:properties"

      }

    },

    "FeatureCollection": {

      "@id": "geojson:FeatureCollection",

      "@context": {

        "features": {

          "@container": "@set",

          "@id": "geojson:features"

        }

      }

    },

    "GeoProperty": "ngsi-ld:GeoProperty",

    "GeometryCollection": "geojson:GeometryCollection",

    "JsonProperty": "ngsi-ld:JsonProperty",
@@ -38,63 +151,76 @@ Such definition has been tested using [i.19]. 
    "MultiLineString": "geojson:MultiLineString",

    "MultiPoint": "geojson:MultiPoint",

    "MultiPolygon": "geojson:MultiPolygon",

    "Notification": "ngsi-ld:Notification",

    "Notification": {

      "@id": "ngsi-ld:Notification",

      "@context": {

        "data": "ngsi-ld:data",

        "notifiedAt": {

          "@id": "ngsi-ld:notifiedAt",

          "@type": "DateTime"

        },

        "subscriptionId": {

          "@id": "ngsi-ld:subscriptionId",

          "@type": "@id"

        }

      }

    },

    "Point": "geojson:Point",

    "Polygon": "geojson:Polygon",

    "Property": "ngsi-ld:Property",

    "Relationship": "ngsi-ld:Relationship",

    "Snapshot": "ngsi-ld:Snapshot",

    "SnapshotNotification": "ngsi-ld:SnapshotNotification",

    "Subscription": "ngsi-ld:Subscription",

    "TemporalProperty": "ngsi-ld:TemporalProperty",

    "Time": "ngsi-ld:Time",

    "VocabProperty": "ngsi-ld:VocabProperty",

    "accept": "ngsi-ld:accept",

    "aggrParams": "ngsi-ld:aggrParams",

    "Query": {

      "@id": "ngsi-ld:Query",

      "@context": {

        "aggrParams": {

          "@id": "ngsi-ld:aggrParams",

          "@context": {

            "aggrMethods": "ngsi-ld:aggrMethods",

    "aggrPeriodDuration": "ngsi-ld:aggrPeriodDuration",

    "attributeCount": "attributeCount",

    "attributeDetails": "attributeDetails",

    "attributeList": {

      "@id": "ngsi-ld:attributeList",

      "@type": "@vocab"

            "aggrPeriodDuration": "ngsi-ld:aggrPeriodDuration"

          }

        },

    "attributeName": {

      "@id": "ngsi-ld:attributeName",

      "@type": "@vocab"

        "attrs": "ngsi-ld:attrs",

        "containedBy": "ngsi-ld:isContainedBy",

        "createEntityMap": "ngsi-ld:createEntityMap",

        "entityMapLifetime": "ngsi-ld:hasEntityMapLifetime",

        "join": "ngsi-ld:join",

        "joinLevel": "ngsi-ld:hasJoinLevel",

        "omit": "ngsi-ld:omit",

        "pick": "ngsi-ld:pick",

        "ordering": {

          "@id": "ngsi-ld:ordering",

          "@context": {

            "collation": "ngsi-ld:collation",

            "coordinates": {

              "@container": "@list",

              "@id": "geojson:coordinates"

            },

    "attributeNames": {

      "@id": "ngsi-ld:attributeNames",

      "@type": "@vocab"

            "geometry": "geojson:geometry",

            "orderBy": {

              "@container": "@list",

              "@id": "ngsi-ld:orderBy"

            }

          }

        },

    "attributeTypes": {

      "@id": "ngsi-ld:attributeTypes",

      "@type": "@vocab"

        "splitEntities": "ngsi-ld:hasSplitEntities"

      }

    },

    "attributes": {

      "@id": "ngsi-ld:attributes",

      "@type": "@vocab"

    "Relationship": "ngsi-ld:Relationship",

    "Snapshot": "ngsi-ld:Snapshot",

    "SnapshotNotification": "ngsi-ld:SnapshotNotification",

    "Subscription": {

      "@id": "ngsi-ld:Subscription",

      "@context": {

        "status": "ngsi-ld:status"

      }

    },

    "attrs": "ngsi-ld:attrs",

    "TemporalProperty": "ngsi-ld:TemporalProperty",

    "Time": "ngsi-ld:Time",

    "VocabProperty": "ngsi-ld:VocabProperty",

    "bbox": {

      "@container": "@list",

      "@id": "geojson:bbox"

    },

    "cacheDuration": "ngsi-ld:cacheDuration",

    "collation": "ngsi-ld:collation",

    "containedBy": "ngsi-ld:isContainedBy",

    "contextSourceAlias": "ngsi-ld:contextSourceAlias",

    "contextSourceExtras": {

      "@id": "ngsi-ld:contextSourceExtras",

      "@type": "@json"

    },

    "contextSourceInfo": "ngsi-ld:contextSourceInfo",

    "contextSourceTimeAt": {

      "@id": "ngsi-ld:contextSourceTimeAt",

      "@type": "DateTime"

    },

    "contextSourceUptime": "ngsi-ld:contextSourceUptime",

    "cooldown": "ngsi-ld:cooldown",

    "coordinates": {

      "@container": "@list",

      "@id": "geojson:coordinates"
@@ -104,7 +230,6 @@ Such definition has been tested using [i.19]. 
      "@type": "DateTime"

    },

    "csf": "ngsi-ld:csf",

    "data": "ngsi-ld:data",

    "dataset": {

      "@id": "ngsi-ld:hasDataset",

      "@container": "@index"
@@ -119,18 +244,19 @@ Such definition has been tested using [i.19]. 
    },

    "description": "http://purl.org/dc/terms/description",

    "detail": "ngsi-ld:detail",

    "endAt": {

      "@id": "ngsi-ld:endAt",

      "@type": "DateTime"

    },

    "endTimeAt": {

      "@id": "ngsi-ld:endTimeAt",

      "@type": "DateTime"

    "endpoint": {

      "@id": "ngsi-ld:endpoint",

      "@context": {

        "accept": "ngsi-ld:accept",

        "cooldown": "ngsi-ld:cooldown",

        "notifierInfo": "ngsi-ld:notifierInfo",

        "receiverInfo": "ngsi-ld:receiverInfo",

        "timeout": "ngsi-ld:timeout",

        "uri": "ngsi-ld:uri"

      }

    },

    "endpoint": "ngsi-ld:endpoint",

    "entities": "ngsi-ld:entities",

    "entity": "ngsi-ld:entity",

    "entityCount": "ngsi-ld:entityCount",

    "entityId": {

      "@id": "ngsi-ld:entityId",

      "@type": "@id"
@@ -143,7 +269,6 @@ Such definition has been tested using [i.19]. 
      "@id": "ngsi-ld:hasEntityMap",

      "@container": "@index"

    },

    "entityMapLifetime": "ngsi-ld:hasEntityMapLifetime",

    "error": "ngsi-ld:error",

    "errors": "ngsi-ld:errors",

    "expandValues": "ngsi-ld:expandValues",
@@ -151,16 +276,18 @@ Such definition has been tested using [i.19]. 
      "@id": "ngsi-ld:expiresAt",

      "@type": "DateTime"

    },

    "features": {

      "@container": "@set",

      "@id": "geojson:features"

    "geoQ": {

      "@id": "ngsi-ld:geoQ",

      "@context": {

        "coordinates": {

          "@container": "@list",

          "@id": "geojson:coordinates"

        },

    "firstN": "ngsi-ld:firstN",

    "format": "ngsi-ld:format",

    "geoQ": "ngsi-ld:geoQ",

        "geometry": "geojson:geometry",

        "geoproperty": "ngsi-ld:geoproperty",

    "georel": "ngsi-ld:georel",

        "georel": "ngsi-ld:georel"

      }

    },

    "idPattern": "ngsi-ld:idPattern",

    "information": "ngsi-ld:information",

    "instanceId": {
@@ -168,8 +295,6 @@ Such definition has been tested using [i.19]. 
      "@type": "@id"

    },

    "isActive": "ngsi-ld:isActive",

    "join": "ngsi-ld:join",

    "joinLevel": "ngsi-ld:hasJoinLevel",

    "json": {

      "@id": "ngsi-ld:hasJSON",

      "@type": "@json"
@@ -211,28 +336,34 @@ Such definition has been tested using [i.19]. 
      }

    },

    "langString": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString",

    "lastFailure": {

      "@id": "ngsi-ld:lastFailure",

    "lastUsedAt": {

      "@id": "ngsi-ld:lastUsedAt",

      "@type": "DateTime"

    },

    "lastN": "ngsi-ld:lastN",

    "lastNotification": {

      "@id": "ngsi-ld:lastNotification",

      "@type": "DateTime"

    "linkedMaps": "ngsi-ld:linkedMaps",

    "location": "ngsi-ld:location",

    "management": {

      "@id": "ngsi-ld:management",

      "@context": {

        "cacheDuration": "ngsi-ld:cacheDuration",

        "cooldown": "ngsi-ld:cooldown",

        "localOnly": "ngsi-ld:localOnly",

        "timeout": "ngsi-ld:timeout"

      }

    },

    "lastSuccess": {

      "@id": "ngsi-ld:lastSuccess",

    "managementInterval": {

      "@id": "ngsi-ld:managementInterval",

      "@context": {

        "endAt": {

          "@id": "ngsi-ld:endAt",

          "@type": "DateTime"

        },

    "lastUsedAt": {

      "@id": "ngsi-ld:lastUsedAt",

        "startAt": {

          "@id": "ngsi-ld:startAt",

          "@type": "DateTime"

        }

      }

    },

    "linkedMaps": "ngsi-ld:linkedMaps",

    "localOnly": "ngsi-ld:localOnly",

    "location": "ngsi-ld:location",

    "management": "ngsi-ld:management",

    "managementInterval": "ngsi-ld:managementInterval",

    "mode": "ngsi-ld:mode",

    "modifiedAt": {

      "@id": "ngsi-ld:modifiedAt",
@@ -252,14 +383,52 @@ Such definition has been tested using [i.19]. 
      ]

    },

    "ngsildConformance": "ngsi-ld:ngsildConformance",

    "notification": "ngsi-ld:notification",

    "notification": {

      "@id": "ngsi-ld:notification",

      "@context": {

        "attributes": {

          "@id": "ngsi-ld:attributes",

          "@type": "@vocab"

        },

        "format": "ngsi-ld:format",

        "join": "ngsi-ld:join",

        "joinLevel": "ngsi-ld:hasJoinLevel",

        "lastFailure": {

          "@id": "ngsi-ld:lastFailure",

          "@type": "DateTime"

        },

        "lastNotification": {

          "@id": "ngsi-ld:lastNotification",

          "@type": "DateTime"

        },

        "lastSuccess": {

          "@id": "ngsi-ld:lastSuccess",

          "@type": "DateTime"

        },

        "omit": "ngsi-ld:omit",

        "pick": "ngsi-ld:pick",

        "showChanges": "ngsi-ld:showChanges",

        "status": "ngsi-ld:status",

        "sysAttrs": "ngsi-ld:sysAttrs",

        "timesFailed": "ngsi-ld:timesFailed",

        "timesSent": "ngsi-ld:timesSent"

      }

    },

    "notificationTrigger": "ngsi-ld:notificationTrigger",

    "notifiedAt": {

      "@id": "ngsi-ld:notifiedAt",

      "@type": "DateTime"

    },

    "notifierInfo": "ngsi-ld:notifierInfo",

    "notUpdated": "ngsi-ld:notUpdated",

    "notUpdated": {

      "@id": "ngsi-ld:notUpdated",

      "@context": {

        "attributeName": {

          "@id": "ngsi-ld:attributeName",

          "@type": "@vocab"

        },

        "reason": "ngsi-ld:reason"

      }

    },

    "object": {

      "@id": "ngsi-ld:hasObject",

      "@type": "@id"
@@ -300,22 +469,26 @@ Such definition has been tested using [i.19]. 
      "@id": "ngsi-ld:hasObjectType",

      "@type": "@vocab"

    },

    "observationInterval": "ngsi-ld:observationInterval",

    "observationInterval": {

      "@id": "ngsi-ld:observationInterval",

      "@context": {

        "endAt": {

          "@id": "ngsi-ld:endAt",

          "@type": "DateTime"

        },

        "startAt": {

          "@id": "ngsi-ld:startAt",

          "@type": "DateTime"

        }

      }

    },

    "observationSpace": "ngsi-ld:observationSpace",

    "observedAt": {

      "@id": "ngsi-ld:observedAt",

      "@type": "DateTime"

    },

    "offsetN": "ngsi-ld:offsetN",

    "omit": "ngsi-ld:omit",

    "operations": "ngsi-ld:operations",

    "operationSpace": "ngsi-ld:operationSpace",

    "orderBy": {

      "@container": "@list",

      "@id": "ngsi-ld:orderBy"

    },

    "ordering": "ngsi-ld:ordering",

    "pick": "ngsi-ld:pick",

    "previousJson": {

      "@id": "ngsi-ld:hasPreviousJson",

      "@type": "@json"
@@ -345,14 +518,11 @@ Such definition has been tested using [i.19]. 
      "@id": "ngsi-ld:problemDetails",

      "@type": "@json"

    },

    "properties": "geojson:properties",

    "propertyNames": {

      "@id": "ngsi-ld:propertyNames",

      "@type": "@vocab"

    },

    "q": "ngsi-ld:q",

    "reason": "ngsi-ld:reason",

    "receiverInfo": "ngsi-ld:receiverInfo",

    "refreshRate": "ngsi-ld:refreshRate",

    "registrationId": "ngsi-ld:registrationId",

    "registrationName": "ngsi-ld:registrationName",
@@ -363,7 +533,6 @@ Such definition has been tested using [i.19]. 
    "resultStatus": "ngsi-ld:resultStatus",

    "scope": "ngsi-ld:scope",

    "scopeQ": "ngsi-ld:scopeQ",

    "showChanges": "ngsi-ld:showChanges",

    "snapshotId": "ngsi-ld:snapshotId",

    "snapshotLifetime": "ngsi-ld:snapshotLifetime",

    "snapshotPriority": "ngsi-ld:snapshotPriority",
@@ -384,60 +553,41 @@ Such definition has been tested using [i.19]. 
      "@id": "ngsi-ld:snapshotTemporalQueriesDetails",

      "@container": "@list"

    },

    "splitEntities": "ngsi-ld:hasSplitEntities",

    "startAt": {

      "@id": "ngsi-ld:startAt",

      "@type": "DateTime"

    },

    "status": "ngsi-ld:status",

    "stddev": {

      "@id": "ngsi-ld:stddev",

      "@container": "@list"

    },

    "subscriptionId": {

      "@id": "ngsi-ld:subscriptionId",

      "@type": "@id"

    },

    "subscriptionName": "ngsi-ld:subscriptionName",

    "success": {

      "@id": "ngsi-ld:success",

      "@type": "@id"

    },

    "sysAttrs": "ngsi-ld:sysAttrs",

    "temporalQ": "ngsi-ld:temporalQ",

    "tenant": {

      "@id": "ngsi-ld:tenant",

      "@type": "@id"

    "temporalQ": {

      "@id": "ngsi-ld:temporalQ",

      "@context": {

        "aggrMethods": "ngsi-ld:aggrMethods",

        "aggrPeriodDuration": "ngsi-ld:aggrPeriodDuration",

        "endTimeAt": {

          "@id": "ngsi-ld:endTimeAt",

          "@type": "DateTime"

        },

    "throttling": "ngsi-ld:throttling",

        "firstN": "ngsi-ld:firstN",

        "lastN": "ngsi-ld:lastN",

        "offsetN": "ngsi-ld:offsetN",

        "timeAt": {

          "@id": "ngsi-ld:timeAt",

          "@type": "DateTime"

        },

    "timeInterval": "ngsi-ld:timeInterval",

    "timeout": "ngsi-ld:timeout",

        "timeproperty": "ngsi-ld:timeproperty",

    "timerel": "ngsi-ld:timerel",

    "timesFailed": "ngsi-ld:timesFailed",

    "timesSent": "ngsi-ld:timesSent",

    "title": "http://purl.org/dc/terms/title",

    "triggerReason": "ngsi-ld:triggerReason",

    "typeList": {

      "@id": "ngsi-ld:typeList",

      "@type": "@vocab"

    },

    "typeName": {

      "@id": "ngsi-ld:typeName",

      "@type": "@vocab"

        "timerel": "ngsi-ld:timerel"

      }

    },

    "typeNames": {

      "@id": "ngsi-ld:typeNames",

      "@type": "@vocab"

    "tenant": {

      "@id": "ngsi-ld:tenant",

      "@type": "@id"

    },

    "throttling": "ngsi-ld:throttling",

    "timeInterval": "ngsi-ld:timeInterval",

    "title": "http://purl.org/dc/terms/title",

    "unchanged": "ngsi-ld:unchanged",

    "unitCode": "ngsi-ld:unitCode",

    "updated": "ngsi-ld:updated",

    "uri": "ngsi-ld:uri",

    "value": "ngsi-ld:hasValue",

    "valueList": {

      "@id": "ngsi-ld:hasValueList",
@@ -477,6 +627,10 @@ Such definition has been tested using [i.19]. 
          "@id": "ngsi-ld:min",

          "@container": "@list"

        },

        "stddev": {

          "@id": "ngsi-ld:stddev",

          "@container": "@list"

        },

        "sum": {

          "@id": "ngsi-ld:sum",

          "@container": "@list"

md/clause-5.md

+501 −361

File changed.

Preview size limit exceeded, changes collapsed.