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

Revert of property-scoping of aggregate terms.

parent 72cc8556
Loading
Loading
Loading
Loading
Loading
+39 −101
Original line number Diff line number Diff line
@@ -216,6 +216,10 @@ Such definition has been tested using [i.19].
    "TemporalProperty": "ngsi-ld:TemporalProperty",
    "Time": "ngsi-ld:Time",
    "VocabProperty": "ngsi-ld:VocabProperty",
    "avg": {
      "@id": "ngsi-ld:avg",
      "@container": "@list"
    },
    "bbox": {
      "@container": "@list",
      "@id": "geojson:bbox"
@@ -244,6 +248,10 @@ 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"
    },
    "endpoint": {
      "@id": "ngsi-ld:endpoint",
      "@context": {
@@ -303,17 +311,7 @@ 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",
@@ -323,17 +321,7 @@ 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",
    "lastUsedAt": {
@@ -364,6 +352,14 @@ Such definition has been tested using [i.19].
        }
      }
    },
    "max": {
      "@id": "ngsi-ld:max",
      "@container": "@list"
    },
    "min": {
      "@id": "ngsi-ld:min",
      "@container": "@list"
    },
    "mode": "ngsi-ld:mode",
    "modifiedAt": {
      "@id": "ngsi-ld:modifiedAt",
@@ -439,31 +435,11 @@ 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",
@@ -553,11 +529,23 @@ Such definition has been tested using [i.19].
      "@id": "ngsi-ld:snapshotTemporalQueriesDetails",
      "@container": "@list"
    },
    "stddev": {
      "@id": "ngsi-ld:stddev",
      "@container": "@list"
    },
    "subscriptionName": "ngsi-ld:subscriptionName",
    "success": {
      "@id": "ngsi-ld:success",
      "@type": "@id"
    },
    "sum": {
      "@id": "ngsi-ld:sum",
      "@container": "@list"
    },
    "sumsq": {
      "@id": "ngsi-ld:sumsq",
      "@container": "@list"
    },
    "temporalQ": {
      "@id": "ngsi-ld:temporalQ",
      "@context": {
@@ -582,6 +570,10 @@ Such definition has been tested using [i.19].
      "@id": "ngsi-ld:tenant",
      "@type": "@id"
    },
    "totalCount": {
      "@id": "ngsi-ld:totalCount",
      "@container": "@list"
    },
    "throttling": "ngsi-ld:throttling",
    "timeInterval": "ngsi-ld:timeInterval",
    "title": "http://purl.org/dc/terms/title",
@@ -595,56 +587,12 @@ 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"
        },
        "stddev": {
          "@id": "ngsi-ld:stddev",
          "@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"
@@ -655,18 +603,8 @@ 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"
+2 −2
Original line number Diff line number Diff line
@@ -806,8 +806,8 @@ Core _`@context`_:
- ["avg"]{.HTML-Code}, ["distinctCount"]{.HTML-Code}, ["max"]{.HTML-Code},
  ["min"]{.HTML-Code}, ["stddev"]{.HTML-Code}, ["sum"]{.HTML-Code},
  ["sumsq"]{.HTML-Code}, ["totalCount"]{.HTML-Code} are Property-scoped and used
  by the Aggregated temporal representation of an Entity. See Clause 5.3.2.7
  ["sumsq"]{.HTML-Code}, ["totalCount"]{.HTML-Code} are used by the Aggregated
  temporal representation of an Entity. See Clause 5.3.2.7
- ["bbox"]{.HTML-Code}, ["properties"]{.HTML-Code}, ["coordinates"]{.HTML-Code}
  are used in geographic operations and retain their standard GeoJSON-LD