Skip to content

Commit e4f9090

Browse files
committed
Amend data model links
1 parent 57d9d37 commit e4f9090

6 files changed

Lines changed: 37 additions & 37 deletions

File tree

context-provider/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ The mapping path element is assumes that mappings are defined in the path as fol
119119
- `windSpeed` NGSI attribute maps to `wind_speed` attribute on the API data
120120

121121
For the full guidelines see the
122-
[FIWARE Data Models](https://fiware-datamodels.readthedocs.io/en/latest/guidelines/index.html)
122+
[Smart Data Models](https://smartdatamodels.org/)
123123

124124
## Health Check Endpoints
125125

docs/application-mashups.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,8 @@ Amend the coordinates setting as shown below and click accept.
426426

427427
![](https://fiware.github.io/tutorials.Application-Mashup/img/ngsi-to-poi-settings.png)
428428

429-
According to the FIWARE Data Models
430-
[Guidelines](https://fiware-datamodels.readthedocs.io/en/latest/guidelines/index.html#modelling-location) an attribute
429+
According to the Smart Data Models
430+
[Guidelines](https://smartdatamodels.org/) an attribute
431431
called `location` should be used for geographical coordinates. Coordinates should be encoded using GeoJSON. Since this
432432
convention has been used for the tutorial data, the widget knows how to extract a location from the `Store` entity.
433433

@@ -463,5 +463,5 @@ Clicking on the POIs retrieves additional data from each stores.
463463

464464
Currently the data is displayed as unformatted JSON. This is because the `Store` context data entities with the tutorial
465465
example are not using a standard FIWARE data model. If a standard data model such as
466-
[Building](https://fiware-datamodels.readthedocs.io/en/latest/Building/Building/doc/spec/index.html) had been used the
466+
[Building](https://github.com/smart-data-models/dataModel.Building) had been used the
467467
data would be formatted in an appropriate manner and a **Building** specific icon would be used.

docs/entity-relationships.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,9 @@ As you can see there are currently three additional property attributes present
320320
In databases, foreign keys are often used to designate a one-to-many relationship - for example every shelf is found in
321321
a single store and a single store can hold many shelving units. In order to remember this information we need to add an
322322
association relationship similar to a foreign key. Batch processing can again be used to amend the existing the
323-
**Shelf** entities to add a `refStore` attribute holding the relationship to each store. According to the FIWARE Data
324-
Modelling Guidelines on
325-
[linked data](https://fiware-datamodels.readthedocs.io/en/latest/guidelines/index.html#modelling-linked-data), when an
323+
**Shelf** entities to add a `refStore` attribute holding the relationship to each store. According to the Smart Data
324+
Models Guidelines on
325+
[linked data](https://smartdatamodels.org/), when an
326326
entity attribute is used as a link to other entities it should be named with the prefix `ref` plus the name of the
327327
target (linked) entity type.
328328

docs/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ curl -iX POST \
264264

265265
Although the each data entity within your context will vary according to your use case, the common structure within each
266266
data entity should be standardized order to promote reuse. The full FIWARE data model guidelines can be found
267-
[here](https://fiware-datamodels.readthedocs.io/en/latest/guidelines/index.html). This tutorial demonstrates the usage
267+
[here](https://smartdatamodels.org/). This tutorial demonstrates the usage
268268
of the following recommendations:
269269

270270
#### All terms are defined in American English

docs/linked-data.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ JSON-LD introduces the concept of the `@context` element which provides addition
7171
interpret the rest of the data with more clarity and depth.
7272

7373
Furthermore the JSON-LD specification enables you to define a unique `@type` associating a well-defined
74-
[data model](https://fiware-datamodels.readthedocs.io/en/latest/guidelines/index.html) to the data itself.
74+
[data model](https://smartdatamodels.org/) to the data itself.
7575

7676
### Video: What is JSON-LD?
7777

@@ -118,7 +118,7 @@ Once again, _entity_ can be considered to be the core element. Every entity must
118118
often a [URN](https://en.wikipedia.org/wiki/Uniform_resource_name), there is also a `type`, used to define the structure
119119
of the data held, which must also be a URI. This URI should correspond to a well-defined data model which can be found
120120
on the web. For example the URI `https://uri.fiware.org/ns/data-models#Building` is used to define common data model for
121-
a [Building](https://fiware-datamodels.readthedocs.io/en/latest/Building/Building/doc/spec/index.html).
121+
a [Building](https://github.com/smart-data-models/dataModel.Building).
122122

123123
_Entities_ can have _properties_ and _relationships_. Ideally the name of each _property_ should also be a well defined
124124
URI which corresponds to a common concept found across the web (e.g. `http://schema.org/address` is a common URI for the
@@ -284,7 +284,7 @@ from multiple sources and remove ambiguity when comparing data coming from diffe
284284

285285
Creating linked data using fully qualified names throughout would be painful, as each attribute would need to be a URI,
286286
so JSON-LD introduces the idea of an `@context` attribute which can hold pointers to context definitions. To add a
287-
FIWARE [Building](https://fiware-datamodels.readthedocs.io/en/latest/Building/Building/doc/spec/index.html) data entity,
287+
FIWARE [Building](https://github.com/smart-data-models/dataModel.Building) data entity,
288288
the following `@context` would be required
289289

290290
```json
@@ -293,7 +293,7 @@ the following `@context` would be required
293293
"type": "Building",
294294
... other data attributes
295295
"@context": [
296-
"https://fiware.github.io/data-models/context.jsonld",
296+
"https://smartdatamodels.org/context.jsonld",
297297
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
298298
]
299299
}
@@ -306,11 +306,11 @@ refers to the Core `@context` of NGSI-LD, this defines element such as `id` and
306306
entities, as well as defining terms such as `Property` and `Relationship`. The core context is so fundamental to
307307
NGSI-LD, that it is added by default to any `@context` sent to a request.
308308

309-
### FIWARE Data Models
309+
### Smart Data Models
310310

311-
[https://fiware.github.io/data-models/context.jsonld](https://fiware.github.io/data-models/context.jsonld) refers to the
312-
definition of standard data models supplied by FIWARE. Adding this to the `@context` will load the definitions of all
313-
the [data models](https://fiwaredata-models.readthedocs.io) defined by the FIWARE Foundation in collaboration with other
311+
[https://smartdatamodels.org/context.jsonld](https://smartdatamodels.org/context.jsonld) refers to the
312+
definition of standard data models supplied by the Smart Data Models project. Adding this to the `@context` will load the definitions of all
313+
the [data models](https://smartdatamodels.org/) defined by the FIWARE Foundation in collaboration with other
314314
organizations such as [GSMA](https://www.gsma.com/) and [TM Forum](https://www.tmforum.org/). A summary of the FQNs
315315
related to **Building** can be seen below:
316316

@@ -372,7 +372,7 @@ curl -iX POST \
372372
"value": "Bösebrücke Einkauf"
373373
},
374374
"@context": [
375-
"https://fiware.github.io/data-models/context.jsonld",
375+
"https://smartdatamodels.org/context.jsonld",
376376
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
377377
]
378378
}'
@@ -381,7 +381,7 @@ curl -iX POST \
381381
The first request will take some time, as the context broker must navigate and load all of the files mentioned in the
382382
`@context`.
383383

384-
> **Note**: if `https://fiware.github.io/data-models/context.jsonld` is unavailable for some reason the request will
384+
> **Note**: if `https://smartdatamodels.org/context.jsonld` is unavailable for some reason the request will
385385
> fail
386386
>
387387
> For a working production system it is essential that the `@context` files are always available to ensure third parties
@@ -428,7 +428,7 @@ curl -iX POST \
428428
"value": "Checkpoint Markt"
429429
},
430430
"@context": [
431-
"https://fiware.github.io/data-models/context.jsonld",
431+
"https://smartdatamodels.org/context.jsonld",
432432
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
433433
]
434434
}'
@@ -638,7 +638,7 @@ A [`Link` header](https://www.w3.org/wiki/LinkHeader) must be supplied to associ
638638
with the FQN `https://uri.fiware.org/ns/data-models#Building`. The full link header syntax can be seen below:
639639

640640
```text
641-
Link: <https://fiware.github.io/data-models/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json
641+
Link: <https://smartdatamodels.org/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json
642642
```
643643

644644
The standard HTTP `Link` header allows metadata (in this case the `@context`) to be passed in without actually touching
@@ -649,7 +649,7 @@ the resource in question. In the case of NGSI-LD, the metadata is a file in `app
649649
```bash
650650
curl -G -X GET \
651651
'http://localhost:1026/ngsi-ld/v1/entities' \
652-
-H 'Link: <https://fiware.github.io/data-models/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' \
652+
-H 'Link: <https://smartdatamodels.org/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' \
653653
'http://localhost:1026/ngsi-ld/v1/entities' \
654654
-H 'Accept: application/ld+json' \
655655
-d 'type=Building' \
@@ -679,7 +679,7 @@ used as the `@context` returned in the response.
679679
"type": "Point",
680680
"coordinates": [13.3986, 52.5547]
681681
},
682-
"@context": "https://fiware.github.io/data-models/context.jsonld"
682+
"@context": "https://smartdatamodels.org/context.jsonld"
683683
},
684684
{
685685
"id": "urn:ngsi-ld:Building:store002",
@@ -696,7 +696,7 @@ used as the `@context` returned in the response.
696696
"type": "Point",
697697
"coordinates": [13.3903, 52.5075]
698698
},
699-
"@context": "https://fiware.github.io/data-models/context.jsonld"
699+
"@context": "https://smartdatamodels.org/context.jsonld"
700700
}
701701
]
702702
```
@@ -712,7 +712,7 @@ the `q` parameter - if a string has spaces in it, it can be URL encoded and held
712712
```bash
713713
curl -G -X GET \
714714
'http://localhost:1026/ngsi-ld/v1/entities' \
715-
-H 'Link: <https://fiware.github.io/data-models/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"'
715+
-H 'Link: <https://smartdatamodels.org/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"'
716716
-H 'Accept: application/ld+json' \
717717
-d 'type=Building' \
718718
-d 'q=name==%22Checkpoint%20Markt%22' \
@@ -721,12 +721,12 @@ curl -G -X GET \
721721

722722
#### Response:
723723

724-
The `Link` header `https://fiware.github.io/data-models/context.jsonld` holds an array of `@context` as shown:
724+
The `Link` header `https://smartdatamodels.org/context.jsonld` holds an array of `@context` as shown:
725725

726726
```json
727727
{
728728
"@context": [
729-
"https://fiware.github.io/data-models/context.jsonld",
729+
"https://smartdatamodels.org/context.jsonld",
730730
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld"
731731
]
732732
}
@@ -754,7 +754,7 @@ JSON-LD as shown:
754754
"type": "Point",
755755
"coordinates": [13.3903, 52.5075]
756756
},
757-
"@context": "https://fiware.github.io/data-models/context.jsonld"
757+
"@context": "https://smartdatamodels.org/context.jsonld"
758758
}
759759
]
760760
```
@@ -770,7 +770,7 @@ done using the `q` parameter, comma separating the acceptable values.
770770
```bash
771771
curl -G -X GET \
772772
'http://localhost:1026/ngsi-ld/v1/entities' \
773-
-H 'Link: <https://fiware.github.io/data-models/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"'
773+
-H 'Link: <https://smartdatamodels.org/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"'
774774
-H 'Accept: application/ld+json' \
775775
-d 'type=Building' \
776776
-d 'q=category==%22commercial%22,%22office%22 \
@@ -798,7 +798,7 @@ The response is returned in JSON-LD format with short form attribute names:
798798
"type": "Point",
799799
"coordinates": [13.3986, 52.5547]
800800
},
801-
"@context": "https://fiware.github.io/data-models/context.jsonld"
801+
"@context": "https://smartdatamodels.org/context.jsonld"
802802
},
803803
{
804804
"id": "urn:ngsi-ld:Building:store002",
@@ -815,7 +815,7 @@ The response is returned in JSON-LD format with short form attribute names:
815815
"type": "Point",
816816
"coordinates": [13.3903, 52.5075]
817817
},
818-
"@context": "https://fiware.github.io/data-models/context.jsonld"
818+
"@context": "https://smartdatamodels.org/context.jsonld"
819819
}
820820
]
821821
```
@@ -832,7 +832,7 @@ Filtering can be done using the `q` parameter - sub-attributes are annotated usi
832832
```bash
833833
curl -G -X GET \
834834
'http://localhost:1026/ngsi-ld/v1/entities' \
835-
-H 'Link: <https://fiware.github.io/data-models/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"'
835+
-H 'Link: <https://smartdatamodels.org/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"'
836836
-H 'Accept: application/ld+json' \
837837
-d 'type=Building' \
838838
-d 'q=address[addressLocality]==%22Kreuzberg%22' \
@@ -860,7 +860,7 @@ Use of the `Link` header and the `options=keyValues` parameter reduces the respo
860860
"type": "Point",
861861
"coordinates": [13.3903, 52.5075]
862862
},
863-
"@context": "https://fiware.github.io/data-models/context.jsonld"
863+
"@context": "https://smartdatamodels.org/context.jsonld"
864864
}
865865
]
866866
```
@@ -878,7 +878,7 @@ This supersedes the `mq` parameter from NGSI v2.
878878
```bash
879879
curl -G -X GET \
880880
'http://localhost:1026/ngsi-ld/v1/entities' \
881-
-H 'Link: <https://fiware.github.io/data-models/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"'
881+
-H 'Link: <https://smartdatamodels.org/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"'
882882
-H 'Accept: application/json' \
883883
-d 'type=Building' \
884884
-d 'q=address.verified==true' \
@@ -942,7 +942,7 @@ If another attribute is to be used, an additional `geoproperty` parameter is req
942942
```bash
943943
curl -G -X GET \
944944
'http://localhost:1026/ngsi-ld/v1/entities' \
945-
-H 'Link: <https://fiware.github.io/data-models/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/json"'
945+
-H 'Link: <https://smartdatamodels.org/context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/json"'
946946
-H 'Accept: application/json' \
947947
-d 'type=Building' \
948948
-d 'geometry=Point' \

docs/relationships-linked-data.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ described below:
8282

8383
- The [**Store** model](https://fiware.github.io/tutorials.Step-by-Step/schema/Store/) is now based on and extends the
8484
FIWARE
85-
[**Building** model](https://fiware-datamodels.readthedocs.io/en/latest/Building/Building/doc/spec/index.html). This
85+
[**Building** model](https://github.com/smart-data-models/dataModel.Building). This
8686
ensures that it offers standard properties for `name`, `address` and category.
8787
- A Building will hold `furniture` this is a 1-many relationship.
8888
- Building ➡ Shelf.
@@ -348,8 +348,8 @@ computer readable JSON-LD `@context` Data Models is included in the request.
348348

349349
### Display all Buildings
350350

351-
The Stores of the supermarket have been created using the FIWARE
352-
[**Building** model](https://fiware-datamodels.readthedocs.io/en/latest/Building/Building/doc/spec/index.html) and the
351+
The Stores of the supermarket have been created using the Smart data
352+
[**Building** model](https://github.com/smart-data-models/dataModel.Building) and the
353353
enumerated value of this type is `fiware:Building` which expands to `https://uri.fiware.org/ns/datamodels%23Building`.
354354
It is therefore possible to request all building entities without supplying a known context.
355355

0 commit comments

Comments
 (0)