Commit e280900a authored by Jason Fox's avatar Jason Fox
Browse files

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

parents 81aa1621 903f70b3

md/annex-b.md

+92 −54
Original line number Diff line number Diff line
@@ -72,7 +72,22 @@ Such definition has been tested using [i.19]. 
        "triggerReason": "ngsi-ld:triggerReason"

      }

    },

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

    "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",
@@ -153,13 +168,9 @@ Such definition has been tested using [i.19]. 
    "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",

    "Query": {

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

      "@context": {

        "aggrParams": {

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

          "@context": {
@@ -168,11 +179,47 @@ Such definition has been tested using [i.19]. 
          }

        },

        "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"

            },

            "geometry": "geojson:geometry",

            "orderBy": {

              "@container": "@list",

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

            }

          }

        },

        "splitEntities": "ngsi-ld:hasSplitEntities"

      }

    },

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

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

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

    "Subscription": {

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

      "@context": {

        "status": "ngsi-ld:status"

      }

    },

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

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

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

    "bbox": {

      "@container": "@list",

      "@id": "geojson:bbox"

    },

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

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

    "coordinates": {

      "@container": "@list",
@@ -222,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",
@@ -249,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"
@@ -292,18 +336,6 @@ 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",

      "@type": "DateTime"

    },

    "lastNotification": {

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

      "@type": "DateTime"

    },

    "lastSuccess": {

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

      "@type": "DateTime"

    },

    "lastUsedAt": {

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

      "@type": "DateTime"
@@ -359,8 +391,27 @@ Such definition has been tested using [i.19]. 
          "@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",

        "sysAttrs": "ngsi-ld:sysAttrs"

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

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

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

        "timesSent": "ngsi-ld:timesSent"

      }

    },

    "notificationTrigger": "ngsi-ld:notificationTrigger",
@@ -368,7 +419,16 @@ Such definition has been tested using [i.19]. 
      "@id": "ngsi-ld:notifiedAt",

      "@type": "DateTime"

    },

    "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"
@@ -427,25 +487,8 @@ Such definition has been tested using [i.19]. 
      "@id": "ngsi-ld:observedAt",

      "@type": "DateTime"

    },

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

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

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

    "ordering": {

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

      "@context": {

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

        "coordinates": {

          "@container": "@list",

          "@id": "geojson:coordinates"

        },

        "geometry": "geojson:geometry",

        "orderBy": {

          "@container": "@list",

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

        }

      }

    },

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

    "previousJson": {

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

      "@type": "@json"
@@ -480,7 +523,6 @@ Such definition has been tested using [i.19]. 
      "@type": "@vocab"

    },

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

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

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

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

    "registrationName": "ngsi-ld:registrationName",
@@ -511,12 +553,6 @@ Such definition has been tested using [i.19]. 
      "@id": "ngsi-ld:snapshotTemporalQueriesDetails",

      "@container": "@list"

    },

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

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

    "stddev": {

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

      "@container": "@list"

    },

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

    "success": {

      "@id": "ngsi-ld:success",
@@ -548,8 +584,6 @@ Such definition has been tested using [i.19]. 
    },

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

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

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

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

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

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

    "unitCode": "ngsi-ld:unitCode",
@@ -593,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

+140 −74

File changed.

Preview size limit exceeded, changes collapsed.