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
Loading
Loading
Loading
Loading
+98 −36
Original line number Original line Diff line number Diff line
@@ -76,10 +76,6 @@ Such definition has been tested using [i.19].
      "@type": "@vocab"
      "@type": "@vocab"
    },
    },
    "attrs": "ngsi-ld:attrs",
    "attrs": "ngsi-ld:attrs",
    "avg": {
      "@id": "ngsi-ld:avg",
      "@container": "@list"
    },
    "bbox": {
    "bbox": {
      "@container": "@list",
      "@container": "@list",
      "@id": "geojson:bbox"
      "@id": "geojson:bbox"
@@ -123,10 +119,6 @@ Such definition has been tested using [i.19].
    },
    },
    "description":  "http://purl.org/dc/terms/description",
    "description":  "http://purl.org/dc/terms/description",
    "detail": "ngsi-ld:detail",
    "detail": "ngsi-ld:detail",
    "distinctCount": {
      "@id": "ngsi-ld:distinctCount",
      "@container": "@list"
    },
    "endAt": {
    "endAt": {
      "@id": "ngsi-ld:endAt",
      "@id": "ngsi-ld:endAt",
      "@type": "DateTime"
      "@type": "DateTime"
@@ -185,7 +177,17 @@ Such definition has been tested using [i.19].
    "jsonldContext": "ngsi-ld:jsonldContext",
    "jsonldContext": "ngsi-ld:jsonldContext",
    "jsons": {
    "jsons": {
      "@id": "ngsi-ld:jsons",
      "@id": "ngsi-ld:jsons",
      "@container": "@list",
      "@context": {
        "distinctCount": {
          "@id": "ngsi-ld:distinctCount",
          "@container": "@list"
        },
        "totalCount": {
          "@id": "ngsi-ld:totalCount",
          "@container": "@list"
          "@container": "@list"
        }
      }
    },
    },
    "key": "ngsi-ld:hasKey",
    "key": "ngsi-ld:hasKey",
    "lang": "ngsi-ld:lang",
    "lang": "ngsi-ld:lang",
@@ -195,8 +197,18 @@ Such definition has been tested using [i.19].
    },
    },
    "languageMaps": {
    "languageMaps": {
      "@id": "ngsi-ld:hasLanguageMaps",
      "@id": "ngsi-ld:hasLanguageMaps",
      "@container": "@list",
      "@context": {
        "distinctCount": {
          "@id": "ngsi-ld:distinctCount",
          "@container": "@list"
          "@container": "@list"
        },
        },
        "totalCount": {
          "@id": "ngsi-ld:totalCount",
          "@container": "@list"
        }
      }
    },
    "langString": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString",
    "langString": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString",
    "lastFailure": {
    "lastFailure": {
      "@id": "ngsi-ld:lastFailure",
      "@id": "ngsi-ld:lastFailure",
@@ -220,14 +232,6 @@ Such definition has been tested using [i.19].
    "location": "ngsi-ld:location",
    "location": "ngsi-ld:location",
    "management": "ngsi-ld:management",
    "management": "ngsi-ld:management",
    "managementInterval": "ngsi-ld:managementInterval",
    "managementInterval": "ngsi-ld:managementInterval",
    "max": {
      "@id": "ngsi-ld:max",
      "@container": "@list"
    },
    "min": {
      "@id": "ngsi-ld:min",
      "@container": "@list"
    },
    "mode": "ngsi-ld:mode",
    "mode": "ngsi-ld:mode",
    "modifiedAt": {
    "modifiedAt": {
      "@id": "ngsi-ld:modifiedAt",
      "@id": "ngsi-ld:modifiedAt",
@@ -265,11 +269,31 @@ Such definition has been tested using [i.19].
    },
    },
    "objectLists": {
    "objectLists": {
      "@id": "ngsi-ld:hasObjectLists",
      "@id": "ngsi-ld:hasObjectLists",
      "@container": "@list",
      "@context": {
        "distinctCount": {
          "@id": "ngsi-ld:distinctCount",
          "@container": "@list"
          "@container": "@list"
        },
        },
        "totalCount": {
          "@id": "ngsi-ld:totalCount",
          "@container": "@list"
        }
      }
    },
    "objects": {
    "objects": {
      "@id": "ngsi-ld:hasObjects",
      "@id": "ngsi-ld:hasObjects",
      "@container": "@list",
      "@context": {
        "distinctCount": {
          "@id": "ngsi-ld:distinctCount",
          "@container": "@list"
        },
        "totalCount": {
          "@id": "ngsi-ld:totalCount",
          "@container": "@list"
          "@container": "@list"
        }
      }
    },
    },
    "objectType": {
    "objectType": {
      "@id": "ngsi-ld:hasObjectType",
      "@id": "ngsi-ld:hasObjectType",
@@ -377,14 +401,6 @@ Such definition has been tested using [i.19].
      "@id": "ngsi-ld:success",
      "@id": "ngsi-ld:success",
      "@type": "@id"
      "@type": "@id"
    },
    },
    "sum": {
      "@id": "ngsi-ld:sum",
      "@container": "@list"
    },
    "sumsq": {
      "@id": "ngsi-ld:sumsq",
      "@container": "@list"
    },
    "sysAttrs": "ngsi-ld:sysAttrs",
    "sysAttrs": "ngsi-ld:sysAttrs",
    "temporalQ": "ngsi-ld:temporalQ",
    "temporalQ": "ngsi-ld:temporalQ",
    "tenant": {
    "tenant": {
@@ -403,10 +419,6 @@ Such definition has been tested using [i.19].
    "timesFailed": "ngsi-ld:timesFailed",
    "timesFailed": "ngsi-ld:timesFailed",
    "timesSent": "ngsi-ld:timesSent",
    "timesSent": "ngsi-ld:timesSent",
    "title": "http://purl.org/dc/terms/title",
    "title": "http://purl.org/dc/terms/title",
    "totalCount": {
      "@id": "ngsi-ld:totalCount",
      "@container": "@list"
    },
    "triggerReason": "ngsi-ld:triggerReason",
    "triggerReason": "ngsi-ld:triggerReason",
    "typeList": {
    "typeList": {
      "@id": "ngsi-ld:typeList",
      "@id": "ngsi-ld:typeList",
@@ -431,12 +443,52 @@ Such definition has been tested using [i.19].
    },
    },
    "valueLists": {
    "valueLists": {
      "@id": "ngsi-ld:hasValueLists",
      "@id": "ngsi-ld:hasValueLists",
      "@container": "@list",
      "@context": {
        "distinctCount": {
          "@id": "ngsi-ld:distinctCount",
          "@container": "@list"
        },
        "totalCount": {
          "@id": "ngsi-ld:totalCount",
          "@container": "@list"
          "@container": "@list"
        }
      }
    },
    },
    "values": {
    "values": {
      "@id": "ngsi-ld:hasValues",
      "@id": "ngsi-ld:hasValues",
      "@container": "@list",
      "@context": {
        "avg": {
          "@id": "ngsi-ld:avg",
          "@container": "@list"
          "@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": {
    "valueType": {
      "@id": "ngsi-ld:hasValueType",
      "@id": "ngsi-ld:hasValueType",
      "@type": "@vocab"
      "@type": "@vocab"
@@ -447,8 +499,18 @@ Such definition has been tested using [i.19].
    },
    },
    "vocabs": {
    "vocabs": {
      "@id": "ngsi-ld:hasVocabs",
      "@id": "ngsi-ld:hasVocabs",
      "@container": "@list",
      "@context": {
        "distinctCount": {
          "@id": "ngsi-ld:distinctCount",
          "@container": "@list"
          "@container": "@list"
        },
        },
        "totalCount": {
          "@id": "ngsi-ld:totalCount",
          "@container": "@list"
        }
      }
    },
    "watchedAttributes": {
    "watchedAttributes": {
      "@id": "ngsi-ld:watchedAttributes",
      "@id": "ngsi-ld:watchedAttributes",
      "@type": "@vocab"
      "@type": "@vocab"