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

Add type-scoping to Query attributes.

parent c4fb532d

md/annex-b.md

+44 −34
Original line number Diff line number Diff line
@@ -153,13 +153,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 +164,42 @@ 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": "ngsi-ld:Subscription",

    "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 +249,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 +275,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"
@@ -359,6 +383,10 @@ Such definition has been tested using [i.19]. 
          "@type": "@vocab"

        },

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

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

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

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

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

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

        "sysAttrs": "ngsi-ld:sysAttrs"

      }
@@ -436,25 +464,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"
@@ -519,12 +530,7 @@ 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",
@@ -599,6 +605,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"