Skip to content

Commit

Permalink
Update Year
Browse files Browse the repository at this point in the history
  • Loading branch information
jason-fox committed Jan 13, 2025
1 parent bc8c3ec commit 2371d17
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018-2023 FIWARE Foundation e.V.
Copyright (c) 2018-2025 FIWARE Foundation e.V.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,4 @@ Full instructions can be found within the [documentation](https://fiware-tutoria

## License

[MIT](LICENSE) © 2018-2024 FIWARE Foundation e.V.
[MIT](LICENSE) © 2018-2025 FIWARE Foundation e.V.
2 changes: 1 addition & 1 deletion context-provider/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ All Keys and Secrets must be passed in using Environment variables. The followin

## License

MIT © 2018-2023 FIWARE Foundation e.V.
MIT © 2018-2025 FIWARE Foundation e.V.

See the LICENSE file in the root of this project for license details.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"座標": "core:coordinates",
"場所": "core:location",
"名前": "schema:name",
"グロッサリープロパティ": "core:VocabularyProperty",
"グロッサリープロパティ": "core:VocabProperty",
"プロパティ": "core:Property",
"リレーションシップ": "core:Relationship",
"ジオプロパティ": "core:GeoProperty",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"Subscription": "ngsi-ld:Subscription",
"TemporalProperty": "ngsi-ld:TemporalProperty",
"Time": "ngsi-ld:Time",
"VocabularyProperty": "ngsi-ld:VocabularyProperty",
"VocabProperty": "ngsi-ld:VocabProperty",
"accept": "ngsi-ld:accept",
"attributeCount": "ngsi-ld:attributeCount",
"attributeDetails": "ngsi-ld:attributeDetails",
Expand Down
2 changes: 1 addition & 1 deletion docs/edge-computing.md
Original file line number Diff line number Diff line change
Expand Up @@ -581,4 +581,4 @@ other FIWARE GEs.

## License

[MIT](LICENSE) © 2020-2023 FIWARE Foundation e.V.
[MIT](LICENSE) © 2020-2025 FIWARE Foundation e.V.
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ defined `type` and a `value` attribute.
> - For GeoProperties, define the position using [GeoJSON](https://geojson.org/) and use the attribute type:
> `"type": "geo:json"`
> - Use of [NGSI-LD](https://ngsi-ld-tutorials.readthedocs.io/) Property sub-classes such `LanguageProperty`,
> `VocabularyProperty`, `JsonProperty` and `ListProperty` can be useful if it is enviaged that an NGSI-v2 system is
> `VocabProperty`, `JsonProperty` and `ListProperty` can be useful if it is enviaged that an NGSI-v2 system is
> expected to later connect with NGSI-LD systems for Federations and Data Spaces
> - By convention `"type": "Relationship"` is used for [Relationships](entity-relationships.md)
Expand Down
44 changes: 22 additions & 22 deletions docs/linked-data.md
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ required

### Core Context

[https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld)
[https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld)
refers to the Core `@context` of NGSI-LD, this defines terms such as `id` and `type` which are common to all NGSI
entities, as well as defining terms such as `Property` and `Relationship`. The core context is so fundamental to
NGSI-LD, that it is added by default to any `@context` sent to a request.
Expand Down Expand Up @@ -350,7 +350,7 @@ not unexpected if elements such as `https://smartdatamodels.org/name` do not act
many IRIs within JSON-LD `@context` files, such as `http://schema.org/address` do indeed return web pages with more
information about themselves.

If you take the NGSI-LD [Core @context](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld)
If you take the NGSI-LD [Core @context](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld)

```json
{
Expand Down Expand Up @@ -386,7 +386,7 @@ curl -iX POST \
"id": "urn:ngsi-ld:Building:store001",
"type": "Building",
"category": {
"type": "VocabularyProperty",
"type": "VocabProperty",
"vocab": "commercial"
},
"address": {
Expand Down Expand Up @@ -415,7 +415,7 @@ curl -iX POST \
},
"@context": [
"https://smart-data-models.github.io/dataModel.Building/context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
]
}'
```
Expand Down Expand Up @@ -444,7 +444,7 @@ curl -iX POST \
"id": "urn:ngsi-ld:Building:store002",
"type": "Building",
"category": {
"type": "VocabularyProperty",
"type": "VocabProperty",
"vocab": "commercial"
},
"address": {
Expand Down Expand Up @@ -473,7 +473,7 @@ curl -iX POST \
},
"@context": [
"https://smart-data-models.github.io/dataModel.Building/context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
]
}'
```
Expand All @@ -490,7 +490,7 @@ The `type` of a _property_ attribute must be one of the following:
- `"GeoProperty"`: `"http://uri.etsi.org/ngsi-ld/GeoProperty"` for locations. Locations should be specified as
Longitude-Latitude pairs in [GeoJSON format](https://tools.ietf.org/html/rfc7946). The preferred name for the
primary location attribute is `location`
- `"VocabularyProperty"` holds enumerated values and is a mapping of a URI to a value within the user'`@context`
- `"VocabProperty"` holds enumerated values and is a mapping of a URI to a value within the user'`@context`
- `"LanguageProperty"` holds a set of internationalized strings.
- `"Property"`: `"http://uri.etsi.org/ngsi-ld/Property"` - for everything else.
- For time-based values, `"Property"` shall be used as well, but the property value should be Date, Time or DateTime
Expand Down Expand Up @@ -551,7 +551,7 @@ curl -G -X GET \

#### Response:

The response returns the Core `@context` by default (`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld`)
The response returns the Core `@context` by default (`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld`)
and all attributes are expanded whenever possible.

- `id`, `type` and `location` are defined in the core context and are not expanded.
Expand All @@ -566,11 +566,11 @@ user `@context` when inserting the context data.
```json
[
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld",
"id": "urn:ngsi-ld:Building:store001",
"type": "https://smartdatamodels.org/dataModel.Building/Building",
"https://smartdatamodels.org/dataModel.Building/category": {
"type": "VocabularyProperty",
"type": "VocabProperty",
"vocab": "commercial"
},
"https://smartdatamodels.org/address": {
Expand Down Expand Up @@ -599,11 +599,11 @@ user `@context` when inserting the context data.
}
},
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld",
"id": "urn:ngsi-ld:Building:store002",
"type": "https://smartdatamodels.org/dataModel.Building/Building",
"https://smartdatamodels.org/dataModel.Building/category": {
"type": "VocabularyProperty",
"type": "VocabProperty",
"vocab": "commercial"
},
"https://smartdatamodels.org/address": {
Expand Down Expand Up @@ -648,16 +648,16 @@ curl -G -X GET \

#### Response:

The response returns the Core `@context` by default (`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld`)
The response returns the Core `@context` by default (`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld`)
and all attributes are expanded whenever possible.

```json
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld",
"id": "urn:ngsi-ld:Building:store001",
"type": "https://smartdatamodels.org/dataModel.Building/Building",
"https://smartdatamodels.org/dataModel.Building/category": {
"type": "VocabularyProperty",
"type": "VocabProperty",
"vocab": "commercial"
},
"https://smartdatamodels.org/address": {
Expand Down Expand Up @@ -713,7 +713,7 @@ used as the `@context` returned in the response.
{
"@context": [
"https://smart-data-models.github.io/dataModel.Building/context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:store001",
"type": "Building",
Expand All @@ -735,7 +735,7 @@ used as the `@context` returned in the response.
{
"@context": [
"https://smart-data-models.github.io/dataModel.Building/context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:store002",
"type": "Building",
Expand Down Expand Up @@ -788,7 +788,7 @@ JSON-LD as shown:
{
"@context": [
"https://smart-data-models.github.io/dataModel.Building/context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:store002",
"type": "Building",
Expand Down Expand Up @@ -818,7 +818,7 @@ Filtering can be done using the `q` parameter, comma separating the acceptable v

> [!NOTE]

> `category` has been defined as a **VocabularyProperty**, which would usually mean that the `vocab` value should be a
> `category` has been defined as a **VocabProperty**, which would usually mean that the `vocab` value should be a
> URI defined in the `@context`. The `expandValues` hint indicates that URI expansion is required for the `category`
> attribute when querying the context data.

Expand All @@ -844,7 +844,7 @@ The response is returned in JSON-LD format with short form attribute names:
{
"@context": [
"https://smart-data-models.github.io/dataModel.Building/context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:store001",
"type": "Building",
Expand All @@ -866,7 +866,7 @@ The response is returned in JSON-LD format with short form attribute names:
{
"@context": [
"https://smart-data-models.github.io/dataModel.Building/context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:store002",
"type": "Building",
Expand Down Expand Up @@ -916,7 +916,7 @@ Use of the `Link` header and the `options=keyValues` parameter reduces the respo
{
"@context": [
"https://smart-data-models.github.io/dataModel.Building/context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:store002",
"type": "Building",
Expand Down
14 changes: 7 additions & 7 deletions docs/relationships-linked-data.md
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ The response returns all the existing **Building** entities, with the attributes
```json
[
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld",
"id": "urn:ngsi-ld:Building:store001",
"type": "https://uri.fiware.org/ns/datamodels#Building",
"https://schema.org/name": "Bösebrücke Einkauf",
Expand All @@ -439,7 +439,7 @@ The response returns all the existing **Building** entities, with the attributes
}
},
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld",
"id": "urn:ngsi-ld:Building:store002",
"type": "https://uri.fiware.org/ns/datamodels#Building",
"https://schema.org/name": "Checkpoint Markt",
Expand Down Expand Up @@ -469,7 +469,7 @@ According to the [defined data model](https://fiware.github.io/tutorials.Step-by
- The `category` attribute has the FQN `https://uri.fiware.org/ns/datamodels#category`.

`type`, `name` and `location` are defined in the NGSI-LD Core Context:
[`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld`](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld).
[`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld`](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld).
The other attributes are defined using the Tutorial's own Context:
[`http://context/user-context.jsonld`](https://github.com/FIWARE/tutorials.Relationships-Linked-Data/blob/NGSI-v2/data-models/user-context.jsonld).
Both `category` and `address` are _common_ attributes the definitions of which are brought in from the FIWARE data
Expand Down Expand Up @@ -678,7 +678,7 @@ curl -iX POST \
},
"@context": [
"http://context/user-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
]
}'
```
Expand All @@ -705,7 +705,7 @@ passed in the previous request.

```json
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld",
"id": "urn:ngsi-ld:Shelf:unit001",
"type": "https://fiware.github.io/tutorials.Step-by-Step/schema/Shelf",
"https://schema.org/name": {
Expand Down Expand Up @@ -837,7 +837,7 @@ curl -G -X GET \
{
"@context": [
"http://context/user-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld",
],
"id": "urn:ngsi-ld:Shelf:unit001",
"type": "Shelf",
Expand Down Expand Up @@ -1065,7 +1065,7 @@ The response returns the fully expanded entity.

```json
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld",
"id": "urn:ngsi-ld:StockOrder:001",
"type": "https://fiware.github.io/tutorials.Step-by-Step/schema/StockOrder",
"https://fiware.github.io/tutorials.Step-by-Step/schema/orderDate": {
Expand Down
8 changes: 4 additions & 4 deletions docs/working-with-linked-data.md
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ curl -L -X POST 'http://localhost:1026/ngsi-ld/v1/entities/' \
"id": "urn:ngsi-ld:Building:store005",
"type": "ビル",
"カテゴリー": {
"type": "VocabularyProperty",
"type": "VocabProperty",
"vocab": ["コマーシャル"]
},
"住所": {
Expand Down Expand Up @@ -684,7 +684,7 @@ And the response is an HTTP 201 status code with no data.

Note that in this example the name and address have been supplied as simple strings - JSON-LD does support a
**LanguageProperty** `@lang` definition to allow for internationalization, but this is an advanced topic which will not
be discussed here. Note that the `category`/ `カテゴリー` has been defined using a **VocabularyProperty**, so that the
be discussed here. Note that the `category`/ `カテゴリー` has been defined using a **VocabProperty**, so that the
enumerated value `commercial`/ `"コマーシャル` can also be amended via the `@context`.

### Reading an Entity using the default schema
Expand Down Expand Up @@ -722,7 +722,7 @@ also returns the standard enumeration for **Building** `category`.
"id": "urn:ngsi-ld:Building:store005",
"type": "Building",
"category": {
"type": "VocabularyProperty",
"type": "VocabProperty",
"vocab": "commercial"
},
"address": {
Expand Down Expand Up @@ -783,7 +783,7 @@ exceptions. NGSI-LD **is not** JSON-LD, in that the core context is always appli
"id": "urn:ngsi-ld:Building:store003",
"type": "ビル",
"カテゴリー": {
"type": "VocabularyProperty",
"type": "VocabProperty",
"vocab": "コマーシャル"
},
"住所": {
Expand Down

0 comments on commit 2371d17

Please sign in to comment.