From a37af32c669fec604d4f8b6860053cbacff6a84b Mon Sep 17 00:00:00 2001 From: Jason Fox Date: Thu, 30 May 2024 13:03:25 +0200 Subject: [PATCH] Update User Context --- data-models/alternate-context.jsonld | 8 ++++-- data-models/json-context.jsonld | 43 +++++++++++++++------------- data-models/ngsi-context.jsonld | 10 +++++-- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/data-models/alternate-context.jsonld b/data-models/alternate-context.jsonld index c5c89cf..21c34dc 100644 --- a/data-models/alternate-context.jsonld +++ b/data-models/alternate-context.jsonld @@ -26,6 +26,9 @@ "aktuator": "https://w3id.org/saref#actuator", "zusätzlicherName": "schema:additionalName", "adresse": "schema:address", + "addressCountry": "schema:addressCountry", + "addressLocality": "schema:addressLocality", + "addressRegion": "schema:addressRegion", "airPollution": "https://w3id.org/saref#airPollution", "atmosphericPressure": "https://w3id.org/saref#atmosphericPressure", "scheune": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dbarn", @@ -91,7 +94,7 @@ "öffnungszeiten": "fiware:openingHours", "osVersion": "fiware:osVersion", "inhaber": "fiware:owner", - + "postalCode": "schema:postalCode", "niederschlag": "https://w3id.org/saref#precipitation", "druck": "https://w3id.org/saref#pressure", "anbieter": "fiware:provider", @@ -135,8 +138,7 @@ "spezies": "fiware:species", "sex": "fiware:sex", - "rechtlicheIdentität": "fiware:legalID", - "City": "fiware:Grossstadt" + "rechtlicheIdentität": "fiware:legalID" }, "@graph": [ { diff --git a/data-models/json-context.jsonld b/data-models/json-context.jsonld index 0782fcb..1d66011 100644 --- a/data-models/json-context.jsonld +++ b/data-models/json-context.jsonld @@ -25,10 +25,13 @@ "Water": "tutorial:Water", "actuator": "https://w3id.org/saref#actuator", "additionalName": { - "@id": "schema:additionalName", + "@id": "https://schema.org/additionalName", "@type": "xsd:string" }, "address": "schema:address", + "addressCountry": "schema:addressCountry", + "addressLocality": "schema:addressLocality", + "addressRegion": "schema:addressRegion", "airPollution": "https://w3id.org/saref#airPollution", "atmosphericPressure": "https://w3id.org/saref#atmosphericPressure", "barn": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dbarn", @@ -102,18 +105,18 @@ "digester": "https://wiki.openstreetmap.org/wiki/Tag:building%3Ddigester", "eatingActivity": "https://w3id.org/saref#eatingActivity", "email": { - "@id": "schema:email", + "@id": "https://schema.org/email", "@type": "xsd:string" }, "endgun": "https://w3id.org/saref#endgun", "familyName": { - "@id": "schema:familyName", + "@id": "https://schema.org/familyName", "@type": "xsd:string" }, "farm": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dfarm", "farm_auxiliary": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dfarm_auxiliary", "faxNumber": { - "@id": "schema:faxNumber", + "@id": "https://schema.org/faxNumber", "@type": "xsd:string" }, "filling": "https://w3id.org/saref#fillingLevel", @@ -130,11 +133,11 @@ "@type": "xsd:integer" }, "gender": { - "@id": "schema:gender", + "@id": "https://schema.org/gender", "@type": "@vocab" }, "givenName": { - "@id": "schema:givenName", + "@id": "https://schema.org/givenName", "@type": "xsd:string" }, "greenhouse": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dgreenhouse", @@ -144,11 +147,11 @@ "@type": "xsd:string" }, "honorificPrefix": { - "@id": "schema:honorificPrefix", + "@id": "https://schema.org/honorificPrefix", "@type": "xsd:string" }, "honorificSuffix": { - "@id": "schema:honorificSuffix", + "@id": "https://schema.org/honorificSuffix", "@type": "xsd:string" }, "humidity": "https://w3id.org/saref#humidity", @@ -161,11 +164,11 @@ "irrSection": "https://w3id.org/saref#irrSection", "irrSystem": "https://w3id.org/saref#irrSystem", "isicV4": { - "@id": "schema:isicV4", + "@id": "https://schema.org/isicV4", "@type": "xsd:string" }, "jobTitle": { - "@id": "schema:jobTitle", + "@id": "https://schema.org/jobTitle", "@type": "xsd:string" }, "location": "https://w3id.org/saref#location", @@ -187,7 +190,7 @@ "movementActivity": "https://w3id.org/saref#movementActivity", "multimedia": "https://w3id.org/saref#multimedia", "name": { - "@id": "schema:name", "@type": "xsd:string" + "@id": "https://schema.org/name", "@type": "xsd:string" }, "network": "https://w3id.org/saref#network", "occupancy": "https://w3id.org/saref#occupancy", @@ -207,6 +210,7 @@ "@id": "fiware:owner", "@type": "@id" }, + "postalCode": "schema:postalCode", "precipitation": "https://w3id.org/saref#precipitation", "pressure": "https://w3id.org/saref#pressure", "provider": { @@ -249,11 +253,11 @@ "@type": "@vocab" }, "taxID": { - "@id": "schema:taxID", + "@id": "https://schema.org/taxID", "@type": "xsd:string" }, "telephone": { - "@id": "schema:telephone", + "@id": "https://schema.org/telephone", "@type": "xsd:string" }, "temperature": "https://w3id.org/saref#temperature", @@ -263,7 +267,7 @@ "@type": "xsd:string" }, "vatID": { - "@id": "schema:vatID", + "@id": "https://schema.org/vatID", "@type": "xsd:string" }, "waterConsumption": "https://w3id.org/saref#waterConsumption", @@ -293,8 +297,7 @@ "verified": "fiware:verified", "species": "fiware:species", "sex": "fiware:sex", - "legalID": "fiware:legalID", - "City": "fiware:City" + "legalID": "fiware:legalID" }, "@graph": [ { @@ -313,7 +316,7 @@ } ], "rdfs:subClassOf": { - "@id": "schema:Thing" + "@id": "https://schema.org/Thing" } }, { @@ -332,7 +335,7 @@ } ], "rdfs:subClassOf": { - "@id": "schema:Thing" + "@id": "https://schema.org/Thing" } }, { @@ -351,7 +354,7 @@ } ], "rdfs:subClassOf": { - "@id": "schema:Thing" + "@id": "https://schema.org/Thing" } }, { @@ -370,7 +373,7 @@ } ], "rdfs:subClassOf": { - "@id": "schema:Thing" + "@id": "https://schema.org/Thing" } }, { diff --git a/data-models/ngsi-context.jsonld b/data-models/ngsi-context.jsonld index 3befa99..4b61537 100644 --- a/data-models/ngsi-context.jsonld +++ b/data-models/ngsi-context.jsonld @@ -6,7 +6,7 @@ "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", + "Building": "https://uri.fiware.org/ns/dataModels#Building", "Device": "fiware:Device", "Animal": "fiware:Animal", "Female": "schema:Female", @@ -24,6 +24,9 @@ "actuator": "https://w3id.org/saref#actuator", "additionalName": "schema:additionalName", "address": "schema:address", + "addressCountry": "schema:addressCountry", + "addressLocality": "schema:addressLocality", + "addressRegion": "schema:addressRegion", "airPollution": "https://w3id.org/saref#airPollution", "atmosphericPressure": "https://w3id.org/saref#atmosphericPressure", "barn": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dbarn", @@ -90,6 +93,7 @@ "openingHours": "fiware:openingHours", "osVersion": "fiware:osVersion", "owner": "fiware:owner", + "postalCode": "schema:postalCode", "precipitation": "https://w3id.org/saref#precipitation", "pressure": "https://w3id.org/saref#pressure", "providedBy": "fiware:providedBy", @@ -106,6 +110,7 @@ "solarRadiation": "https://w3id.org/saref#solarRadiation", "source": "fiware:source", "stable": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dstable", + "streetAddress": "schema:streetAddress", "sty": "https://wiki.openstreetmap.org/wiki/Tag:building%3Dsty", "supportedProtocol": "fiware:supportedProtocol", "taxID": "schema:taxID", @@ -133,7 +138,6 @@ "verified": "fiware:verified", "species": "fiware:species", "sex": "fiware:sex", - "legalID": "fiware:legalID", - "City": "fiware:City" + "legalID": "fiware:legalID" } }