Commit ac2bc32c authored by Giuseppe Tropea's avatar Giuseppe Tropea
Browse files

Merge branch 'fix/scope-aggregation-terms' into 'master' 

DATA(25)000173_NGSI-LD_Core_Scope_Aggregation_Terms

See merge request !16
parents b091d6a8 3c5574bf

md/annex-b.md

+98 −36
Original line number Diff line number Diff line
@@ -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"
@@ -123,10 +119,6 @@ Such definition has been tested using [i.19]. 
    },

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

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

    "distinctCount": {

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

      "@container": "@list"

    },

    "endAt": {

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

      "@type": "DateTime"
@@ -185,7 +177,17 @@ Such definition has been tested using [i.19]. 
    "jsonldContext": "ngsi-ld:jsonldContext",

    "jsons": {

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

      "@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,8 +197,18 @@ Such definition has been tested using [i.19]. 
    },

    "languageMaps": {

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

      "@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": {

      "@id": "ngsi-ld:lastFailure",
@@ -220,14 +232,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 +269,31 @@ Such definition has been tested using [i.19]. 
    },

    "objectLists": {

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

      "@container": "@list",

      "@context": {

        "distinctCount": {

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

          "@container": "@list"

        },

        "totalCount": {

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

          "@container": "@list"

        }

      }

    },

    "objects": {

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

      "@container": "@list",

      "@context": {

        "distinctCount": {

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

          "@container": "@list"

        },

        "totalCount": {

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

          "@container": "@list"

        }

      }

    },

    "objectType": {

      "@id": "ngsi-ld:hasObjectType",
@@ -377,14 +401,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": {
@@ -403,10 +419,6 @@ Such definition has been tested using [i.19]. 
    "timesFailed": "ngsi-ld:timesFailed",

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

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

    "totalCount": {

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

      "@container": "@list"

    },

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

    "typeList": {

      "@id": "ngsi-ld:typeList",
@@ -431,12 +443,52 @@ Such definition has been tested using [i.19]. 
    },

    "valueLists": {

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

      "@container": "@list",

      "@context": {

        "distinctCount": {

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

          "@container": "@list"

        },

        "totalCount": {

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

          "@container": "@list"

        }

      }

    },

    "values": {

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

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

      "@type": "@vocab"
@@ -447,8 +499,18 @@ Such definition has been tested using [i.19]. 
    },

    "vocabs": {

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

      "@container": "@list",

      "@context": {

        "distinctCount": {

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

          "@container": "@list"

        },

        "totalCount": {

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

          "@container": "@list"

        }

      }

    },

    "watchedAttributes": {

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

      "@type": "@vocab"