Skip to content

Commit

Permalink
Updating to core context 1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
jason-fox committed Aug 15, 2023
1 parent 078a1c9 commit 5042f9c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ EXPOSED_PORT=1026

# Orion LD variables
ORION_LD_PORT=1026
ORION_LD_VERSION=1.3.0
ORION_LD_VERSION=1.4.0-pre-1415

# Scorpio variables
SCORPIO_PORT=9090
Expand Down
10 changes: 5 additions & 5 deletions README.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ Context Broker は `@context` で示されているすべてのファイルを

`Content-Type: application/ld+json` なので、`@context` はリクエストのボディで提供されます。すべての **NGSI-LD**
相互作用と同様に、core **NGSI-LD** `@context`
([`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld`](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-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.6.jsonld))
も暗黙的に含まれています。

つまり、実際の `@context` は次のとおりです:
Expand All @@ -410,7 +410,7 @@ Context Broker は `@context` で示されているすべてのファイルを
{
"@context": [
"http://context/ngsi-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
]
}
```
Expand Down Expand Up @@ -534,7 +534,7 @@ curl -G -X GET \
#### レスポンス:

リクエストで明示的な `@context` が送信されなかったため、レスポンスはデフォルト
(`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld`) で core `@context` を返し、
(`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld`) で core `@context` を返し、
すべての属性は可能な限り展開されます。

- `id`, `type`, `location` および `name` は core context で定義され、展開されません
Expand All @@ -546,7 +546,7 @@ curl -G -X GET \
```jsonld
[
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"id": "urn:ngsi-ld:Building:farm001",
"type": "https://uri.fiware.org/ns/dataModels#Building",
"https://schema.org/address": {
Expand Down Expand Up @@ -582,7 +582,7 @@ curl -G -X GET \
}
},
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"id": "urn:ngsi-ld:Building:barn002",
"type": "https://uri.fiware.org/ns/dataModels#Building",
"https://schema.org/address": {
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ The first request will take some time, as the context broker must navigate and l

Since the `Content-Type: application/ld+json` the `@context` is supplied in the body of the request. As with all
**NGSI-LD** interactions, the core **NGSI-LD** `@context`
([`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld`](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-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.6.jsonld))
is implicitly included as well.

This means that the actual `@context` is:
Expand All @@ -412,7 +412,7 @@ This means that the actual `@context` is:
{
"@context": [
"http://context/ngsi-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
]
}
```
Expand Down Expand Up @@ -527,7 +527,7 @@ curl -G -X GET \
#### Response:

Since no explicit `@context` was sent in the request, the response returns the Core `@context` by default
(`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld`) and all attributes are expanded whenever possible.
(`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld`) and all attributes are expanded whenever possible.

- `id`, `type`, `location` and `name` are defined in the core context and are not expanded.
- `address` has been mapped to `http://schema.org/address`
Expand All @@ -539,7 +539,7 @@ be displayed.
```jsonld
[
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"id": "urn:ngsi-ld:Building:farm001",
"type": "https://uri.fiware.org/ns/dataModels#Building",
"https://schema.org/address": {
Expand Down Expand Up @@ -575,7 +575,7 @@ be displayed.
}
},
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"id": "urn:ngsi-ld:Building:barn002",
"type": "https://uri.fiware.org/ns/dataModels#Building",
"https://schema.org/address": {
Expand Down
2 changes: 1 addition & 1 deletion services
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SCORPIO="http://scorpio:9090/"
ORION="http://orion:1026/version"
STELLIO="http://stellio:8080/actuator/health"
CONTEXT="http://context/ngsi-context.jsonld"
CORE_CONTEXT="https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld"
CORE_CONTEXT="https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"

dockerCmd="docker compose"
if (( $# == 2 )); then
Expand Down

0 comments on commit 5042f9c

Please sign in to comment.