Commit 8ffc43ab authored by Giuseppe Tropea's avatar Giuseppe Tropea
Browse files

Merge branch 'fix/examples' into 'master' 

DATA(26)000015_NGSI-LD_Core_Add_Missing_Examples

See merge request !29
parents b56c3956 79c8bda0

md/annex-b.md

+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": {
@@ -319,17 +327,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",
@@ -339,17 +337,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": {
@@ -380,6 +368,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",
@@ -455,31 +451,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",
@@ -561,11 +537,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": {
@@ -590,6 +578,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",
@@ -603,56 +595,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"
@@ -663,18 +611,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"

md/annex-c.md

+38 −42
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ level of the graph only. 
Below is an example, where temporal evolution of the speed of the car is

provided by two different sources. As both may be relevant at the same time,

there are two individual attribute instances for speed; each is identified by a

_`datasetId`_ and both instances are represented in an array. The combination of

_`datasetId`_ and both instances are represented in the array. The combination of

an Attribute's _`datasetId`_ and the _`instanceId`_ associated to each value

enables modification of a particular instance value without affecting instances

from other sources.
@@ -1118,50 +1118,46 @@ from other sources. 
  "speed": [

    {

      "type": "Property",

      "values": [

        {

      "value": 55,

      "source": {

        "type": "Property",

        "value": "Speedometer"

      },

      "instanceId": "urn:ngsi-ld:instance:31451425367",

          "observedAt": "2022-08-09T18:25:02Z"

      "observedAt": "2022-08-09T18:25:02Z",

      "datasetId": "urn:ngsi-ld:Property:speedometerA4567-speed"

    },

    {

      "type": "Property",

      "value": 56,

      "source": {

        "type": "Property",

        "value": "Speedometer"

      },

      "instanceId": "urn:ngsi-ld:instance:23856477893",

          "observedAt": "2022-08-09T18:26:02Z"

        }

      ],

      "observedAt": "2022-08-09T18:26:02Z",

      "datasetId": "urn:ngsi-ld:Property:speedometerA4567-speed"

    },

    {

      "type": "Property",

      "values": [

        {

      "value": 54.5,

      "source": {

        "type": "Property",

        "value": "GPS"

      },

      "instanceId": "urn:ngsi-ld:instance:456234894533",

          "observedAt": "2022-08-09T18:30:02Z"

      "observedAt": "2022-08-09T18:30:02Z",

      "datasetId": "urn:ngsi-ld:Property:gpsBxyz123-speed"

    },

    {

      "type": "Property",

      "value": 54.5,

      "source": {

        "type": "Property",

        "value": "GPS"

      },

      "instanceId": "urn:ngsi-ld:instance:720930032567",

          "observedAt": "2022-08-09T18:33:02Z"

        }

      ],

      "observedAt": "2022-08-09T18:33:02Z",

      "datasetId": "urn:ngsi-ld:Property:gpsBxyz123-speed"

    }

  ],
@@ -1327,7 +1323,7 @@ one. 
}

```



#### C.2.3.2 Concise represenatation

#### C.2.3.2 Concise representation



The concise representation is a terser, lossless form of the normalized

representation, where redundant Attribute _`type`_ members are omitted and the

md/clause-5.md

+89 −45

File changed.

Preview size limit exceeded, changes collapsed.