Skip to content

Commit

Permalink
Switching to user-context
Browse files Browse the repository at this point in the history
  • Loading branch information
@jason-fox
jason-fox committed Jul 10, 2024
1 parent 6dcceab commit 8640fe1
Show file tree
Hide file tree
Showing 4 changed files with 147 additions and 141 deletions.
142 changes: 5 additions & 137 deletions data-models/ngsi-context.jsonld
View file
Original file line number Diff line number Diff line change
@@ -1,138 +1,6 @@
{
"@context": {
"type": "@type",
"id": "@id",
"ngsi-ld": "https://uri.etsi.org/ngsi-ld/",
"fiware": "https://uri.fiware.org/ns/dataModels#",
"schema": "https://schema.org/",
"tutorial": "https://ngsi-ld-tutorials.readthedocs.io/en/latest/datamodels.html#",
"Building": "fiware:Building",
"Device": "fiware:Device",
"Animal": "fiware:Animal",
"Female": "schema:Female",
"FillingLevelSensor": "tutorial:FillingLevelSensor",
"Herbicide": "tutorial:Product",
"HVAC": "https://w3id.org/saref#HVAC",
"Male": "schema:Male",
"PartField": "tutorial:PartField",
"Person": "fiware:Person",
"SoilSensor": "tutorial:SoilSensor",
"TemperatureSensor": "tutorial:TemperatureSensor",
"Task": "fiware:Activity",
"Tractor": "tutorial:Tractor",
"Water": "tutorial:Water",
"actuator": "https://w3id.org/saref#actuator",
"additionalName": "schema:additionalName",
"address": "schema:address",
"airPollution": "https://w3id.org/saref#airPollution",
"atmosphericPressure": "https://w3id.org/saref#atmosphericPressure",
"barn": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dbarn",
"batteryLevel": "fiware:batteryLevel",
"category": "fiware:category",
"configuration": "fiware:configuration",
"conservatory": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dconservatory",
"containedInPlace": "fiware:containedInPlace",
"controlledAsset": "fiware:controlledAsset",
"controlledProperty": "fiware:controlledProperty",
"cowshed": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dcowshed",
"dataProvider": "fiware:dataProvider",
"dateCreated": "fiware:dateCreated",
"dateFirstUsed": "fiware:dateFirstUsed",
"dateInstalled": "fiware:dateInstalled",
"dateLastCalibration": "fiware:dateLastCalibration",
"dateLastValueReported": "fiware:dateLastValueReported",
"dateManufactured": "fiware:dateManufactured",
"dateModified": "fiware:dateModified",
"depth": "https://w3id.org/saref#depth",
"description": "ngsi-ld:description",
"deviceState": "fiware:deviceState",
"digester": "https://wiki.openstreetmap.org/wiki/Tag:building%3Ddigester",
"eatingActivity": "https://w3id.org/saref#eatingActivity",
"email": "schema:email",
"endgun": "https://w3id.org/saref#endgun",
"familyName": "schema:familyName",
"farm": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dfarm",
"farm_auxiliary": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dfarm_auxiliary",
"faxNumber": "schema:faxNumber",
"filling": "https://w3id.org/saref#fillingLevel",
"firmwareVersion": "fiware:firmwareVersion",
"floorsAboveGround": "fiware:floorsAboveGround",
"floorsBelowGround": "fiware:floorsBelowGround",
"gender": "schema:gender",
"givenName": "schema:givenName",
"greenhouse": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dgreenhouse",
"hangar": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dhangar",
"hardwareVersion": "fiware:hardwareVersion",
"honorificPrefix": "schema:honorificPrefix",
"honorificSuffix": "schema:honorificSuffix",
"humidity": "https://w3id.org/saref#humidity",
"hut": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dhut",
"implement": "https://w3id.org/saref#implement",
"ipAddress": "fiware:ipAddress",
"irrSection": "https://w3id.org/saref#irrSection",
"irrSystem": "https://w3id.org/saref#irrSystem",
"isicV4": "schema:isicV4",
"jobTitle": "schema:jobTitle",
"location": "https://w3id.org/saref#location",
"macAddress": "fiware:macAddress",
"mcc": "fiware:mcc",
"meter": "https://w3id.org/saref#meter",
"milking": "https://w3id.org/saref#milking",
"mnc": "fiware:mnc",
"motion": "https://w3id.org/saref#motion",
"movementActivity": "https://w3id.org/saref#movementActivity",
"multimedia": "https://w3id.org/saref#multimedia",
"name": "schema:name",
"network": "https://w3id.org/saref#network",
"observedAt": "ngsi-ld:observedAt",
"occupancy": "https://w3id.org/saref#occupancy",
"occupier": "fiware:occupier",
"openingHours": "fiware:openingHours",
"osVersion": "fiware:osVersion",
"owner": "fiware:owner",
"precipitation": "https://w3id.org/saref#precipitation",
"pressure": "https://w3id.org/saref#pressure",
"providedBy": "fiware:providedBy",
"provider": "fiware:provider",
"refDeviceModel": "fiware:refDeviceModel",
"refMap": "fiware:refMap",
"rssi": "fiware:rssi",
"sensor": "https://w3id.org/saref#sensor",
"serialNumber": "fiware:serialNumber",
"service": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dservice",
"shed": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dshed",
"softwareVersion": "fiware:softwareVersion",
"soilMoisture": "https://w3id.org/saref#soilMoisture",
"solarRadiation": "https://w3id.org/saref#solarRadiation",
"source": "fiware:source",
"stable": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dstable",
"sty": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dsty",
"supportedProtocol": "fiware:supportedProtocol",
"taxID": "schema:taxID",
"telephone": "schema:telephone",
"temperature": "https://w3id.org/saref#temperature",
"transformer_tower": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dtransformer_tower",
"unitCode": "ngsi-ld:unitCode",
"value": "fiware:value",
"vatID": "schema:vatID",
"waterConsumption": "https://w3id.org/saref#waterConsumption",
"water_tower": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dwater_tower",
"weatherConditions": "https://w3id.org/saref#weatherConditions",
"weight": "https://w3id.org/saref#weight",
"windDirection": "https://w3id.org/saref#windDirection",
"windSpeed": "https://w3id.org/saref#windSpeed",
"status": "https://saref.etsi.org/core/status",
"state": "https://saref.etsi.org/core/hasState",
"heartRate": "https://purl.bioontology.org/ontology/MESH/D006339",
"product": "fiware:refObject",
"worker": "fiware:refAgent",
"field": "fiware:refTarget",

"on": "https://w3id.org/saref#on",
"off": "https://w3id.org/saref#off",
"verified": "fiware:verified",
"species": "fiware:species",
"sex": "fiware:sex",
"legalID": "fiware:legalID"
}
}
"@context": [
"http://context/user-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
]
}
138 changes: 138 additions & 0 deletions data-models/user-context.jsonld
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
{
"@context": {
"type": "@type",
"id": "@id",
"ngsi-ld": "https://uri.etsi.org/ngsi-ld/",
"fiware": "https://uri.fiware.org/ns/dataModels#",
"schema": "https://schema.org/",
"tutorial": "https://ngsi-ld-tutorials.readthedocs.io/en/latest/datamodels.html#",
"Building": "fiware:Building",
"Device": "fiware:Device",
"Animal": "fiware:Animal",
"Female": "schema:Female",
"FillingLevelSensor": "tutorial:FillingLevelSensor",
"Herbicide": "tutorial:Product",
"HVAC": "https://w3id.org/saref#HVAC",
"Male": "schema:Male",
"PartField": "tutorial:PartField",
"Person": "fiware:Person",
"SoilSensor": "tutorial:SoilSensor",
"TemperatureSensor": "tutorial:TemperatureSensor",
"Task": "fiware:Activity",
"Tractor": "tutorial:Tractor",
"Water": "tutorial:Water",
"actuator": "https://w3id.org/saref#actuator",
"additionalName": "schema:additionalName",
"address": "schema:address",
"airPollution": "https://w3id.org/saref#airPollution",
"atmosphericPressure": "https://w3id.org/saref#atmosphericPressure",
"barn": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dbarn",
"batteryLevel": "fiware:batteryLevel",
"category": "fiware:category",
"configuration": "fiware:configuration",
"conservatory": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dconservatory",
"containedInPlace": "fiware:containedInPlace",
"controlledAsset": "fiware:controlledAsset",
"controlledProperty": "fiware:controlledProperty",
"cowshed": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dcowshed",
"dataProvider": "fiware:dataProvider",
"dateCreated": "fiware:dateCreated",
"dateFirstUsed": "fiware:dateFirstUsed",
"dateInstalled": "fiware:dateInstalled",
"dateLastCalibration": "fiware:dateLastCalibration",
"dateLastValueReported": "fiware:dateLastValueReported",
"dateManufactured": "fiware:dateManufactured",
"dateModified": "fiware:dateModified",
"depth": "https://w3id.org/saref#depth",
"description": "ngsi-ld:description",
"deviceState": "fiware:deviceState",
"digester": "https://wiki.openstreetmap.org/wiki/Tag:building%3Ddigester",
"eatingActivity": "https://w3id.org/saref#eatingActivity",
"email": "schema:email",
"endgun": "https://w3id.org/saref#endgun",
"familyName": "schema:familyName",
"farm": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dfarm",
"farm_auxiliary": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dfarm_auxiliary",
"faxNumber": "schema:faxNumber",
"filling": "https://w3id.org/saref#fillingLevel",
"firmwareVersion": "fiware:firmwareVersion",
"floorsAboveGround": "fiware:floorsAboveGround",
"floorsBelowGround": "fiware:floorsBelowGround",
"gender": "schema:gender",
"givenName": "schema:givenName",
"greenhouse": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dgreenhouse",
"hangar": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dhangar",
"hardwareVersion": "fiware:hardwareVersion",
"honorificPrefix": "schema:honorificPrefix",
"honorificSuffix": "schema:honorificSuffix",
"humidity": "https://w3id.org/saref#humidity",
"hut": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dhut",
"implement": "https://w3id.org/saref#implement",
"ipAddress": "fiware:ipAddress",
"irrSection": "https://w3id.org/saref#irrSection",
"irrSystem": "https://w3id.org/saref#irrSystem",
"isicV4": "schema:isicV4",
"jobTitle": "schema:jobTitle",
"location": "https://w3id.org/saref#location",
"macAddress": "fiware:macAddress",
"mcc": "fiware:mcc",
"meter": "https://w3id.org/saref#meter",
"milking": "https://w3id.org/saref#milking",
"mnc": "fiware:mnc",
"motion": "https://w3id.org/saref#motion",
"movementActivity": "https://w3id.org/saref#movementActivity",
"multimedia": "https://w3id.org/saref#multimedia",
"name": "schema:name",
"network": "https://w3id.org/saref#network",
"observedAt": "ngsi-ld:observedAt",
"occupancy": "https://w3id.org/saref#occupancy",
"occupier": "fiware:occupier",
"openingHours": "fiware:openingHours",
"osVersion": "fiware:osVersion",
"owner": "fiware:owner",
"precipitation": "https://w3id.org/saref#precipitation",
"pressure": "https://w3id.org/saref#pressure",
"providedBy": "fiware:providedBy",
"provider": "fiware:provider",
"refDeviceModel": "fiware:refDeviceModel",
"refMap": "fiware:refMap",
"rssi": "fiware:rssi",
"sensor": "https://w3id.org/saref#sensor",
"serialNumber": "fiware:serialNumber",
"service": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dservice",
"shed": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dshed",
"softwareVersion": "fiware:softwareVersion",
"soilMoisture": "https://w3id.org/saref#soilMoisture",
"solarRadiation": "https://w3id.org/saref#solarRadiation",
"source": "fiware:source",
"stable": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dstable",
"sty": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dsty",
"supportedProtocol": "fiware:supportedProtocol",
"taxID": "schema:taxID",
"telephone": "schema:telephone",
"temperature": "https://w3id.org/saref#temperature",
"transformer_tower": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dtransformer_tower",
"unitCode": "ngsi-ld:unitCode",
"value": "fiware:value",
"vatID": "schema:vatID",
"waterConsumption": "https://w3id.org/saref#waterConsumption",
"water_tower": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dwater_tower",
"weatherConditions": "https://w3id.org/saref#weatherConditions",
"weight": "https://w3id.org/saref#weight",
"windDirection": "https://w3id.org/saref#windDirection",
"windSpeed": "https://w3id.org/saref#windSpeed",
"status": "https://saref.etsi.org/core/status",
"state": "https://saref.etsi.org/core/hasState",
"heartRate": "https://purl.bioontology.org/ontology/MESH/D006339",
"product": "fiware:refObject",
"worker": "fiware:refAgent",
"field": "fiware:refTarget",

"on": "https://w3id.org/saref#on",
"off": "https://w3id.org/saref#off",
"verified": "fiware:verified",
"species": "fiware:species",
"sex": "fiware:sex",
"legalID": "fiware:legalID"
}
}
4 changes: 2 additions & 2 deletions docker-compose/common.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ services:
target: /usr/local/apache2/conf/mime.types
read_only: true
healthcheck:
test: (wget --server-response --spider --quiet http://ld-context/ngsi-context.jsonld 2>&1 | awk 'NR==1{print $$2}'| grep -q -e "200") || exit 1
test: (wget --server-response --spider --quiet http://context/user-context.jsonld 2>&1 | awk 'NR==1{print $$2}'| grep -q -e "200") || exit 1

# Databases
mongo-db:
Expand Down Expand Up @@ -88,7 +88,7 @@ services:
- TWITTER_CONSUMER_KEY=<ADD_YOUR_CONSUMER_KEY>
- TWITTER_CONSUMER_SECRET=<ADD_YOUR_CONSUMER_SECRET>
- MONGO_URL=mongodb://mongo-db:27017
- IOTA_JSON_LD_CONTEXT=http://context/ngsi-context.jsonld
- IOTA_JSON_LD_CONTEXT=http://context/user-context.jsonld


networks:
Expand Down
4 changes: 2 additions & 2 deletions services
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -e
STELLIO="http://stellio:8080/actuator/health"
SCORPIO="http://scorpio:9090/scorpio/"
ORION="http://orion:1026/version"
CONTEXT="http://context/ngsi-context.jsonld"
CONTEXT="http://context/user-context.jsonld"
CORE_CONTEXT="https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"

dockerCmd="docker compose"
Expand Down Expand Up @@ -116,7 +116,7 @@ loadData () {
docker run --rm -v $(pwd)/import-data:/import-data \
--network fiware_default \
-e CONTEXT_BROKER=${CONTEXT_BROKER} \
-e TUTORIAL_DATA_MODELS_CONTEXT="http://context/ngsi-context.jsonld" \
-e TUTORIAL_DATA_MODELS_CONTEXT="http://context/user-context.jsonld" \
-e PIG_COUNT=${PIG_COUNT:-4} \
-e COW_COUNT=${COW_COUNT:-4} \
--entrypoint /bin/ash quay.io/curl/curl:${CURL_VERSION} /import-data
Expand Down

0 comments on commit 8640fe1

Please sign in to comment.