From 664a785fe03155266ba6dd18a42aadd573913599 Mon Sep 17 00:00:00 2001 From: jtdemer Date: Fri, 25 Oct 2024 17:26:51 +0200 Subject: [PATCH] update manifest Signed-off-by: jtdemer --- .../EVES/manifest/manifest_shacl.ttl | 32 ++- .../general/VARIABLES.md | 3 +- .../general/general_instance.json | 4 - .../general/general_shacl.ttl | 14 +- .../used-shacls/domainMetadata_shacl.ttl | 14 +- asset/README.md | 2 +- .../manifest.json | 262 +++++++++--------- .../metadata/domainMetadata.json | 4 - 8 files changed, 163 insertions(+), 172 deletions(-) diff --git a/Shacls_and_Ontologies/EVES/manifest/manifest_shacl.ttl b/Shacls_and_Ontologies/EVES/manifest/manifest_shacl.ttl index f5a5326..b44921c 100644 --- a/Shacls_and_Ontologies/EVES/manifest/manifest_shacl.ttl +++ b/Shacls_and_Ontologies/EVES/manifest/manifest_shacl.ttl @@ -35,15 +35,33 @@ manifest:DataShape a sh:NodeShape ; sh:order 2 ; sh:path manifest:assetData ], - [ skos:example "screenshot, video, routing, 3d preview" ; - sh:description "Reference to media data as relativePath"@en ; - sh:message "Validation of media failed!"@en ; + [ skos:example "license type" ; + sh:in ("OpenSource" "ProviderSpecific") ; + sh:message "Validation of license type failed!"@en ; + sh:minCount 1 ; + sh:maxCount 1 ; + sh:name "licenseType"@en ; + sh:order 3 ; + sh:path manifest:licenseType + ], + [ skos:example "link to licenseData" ; + sh:description "link to licenseData as relativePath"@en ; + sh:message "Validation of licenseData failed!"@en ; + sh:minCount 1 ; + sh:maxCount 1 ; + sh:name "licenseData"@en ; + sh:node manifest:LinkShape ; + sh:order 4 ; + sh:path manifest:licenseData + ], + [ skos:example "screenshot, video, routing, 3d preview" ; + sh:description "Reference to content data as relativePath"@en ; + sh:message "Validation of content failed!"@en ; sh:name "contentData"@en ; sh:node manifest:LinkShape ; - sh:order 3 ; + sh:order 5 ; sh:path manifest:contentData ]; - sh:targetClass manifest:Data . manifest:LinkShape a sh:NodeShape ; @@ -59,7 +77,7 @@ manifest:LinkShape a sh:NodeShape ; sh:path manifest:accessRole ], [ sh:datatype xsd:string ; - sh:in ("Document" "Image" "Model" "Routing" "Video" "3DPreview" "Asset" "Metadata" "License" "Validation" "AssetData") ; + sh:in ("Document" "Image" "Model" "Routing" "Video" "3DPreview" "Asset" "Metadata" "License" "Validation" "AssetData" "other") ; sh:message "Validation of type failed!"@en ; sh:description "Choose type of link." ; sh:name "type"@en ; @@ -69,7 +87,7 @@ manifest:LinkShape a sh:NodeShape ; sh:path manifest:type ], [ sh:datatype xsd:string ; - sh:in ("pdf" "png" "mp4" "geojson" "zip" "json" "txt" "xodr" "md") ; + sh:in ("pdf" "png" "mp4" "geojson" "zip" "json" "txt" "xodr" "md" "other") ; sh:message "Validation of format failed!"@en ; sh:description "Choose an format." ; sh:name "format"@en ; diff --git a/Shacls_and_Ontologies/ontology-management-base/general/VARIABLES.md b/Shacls_and_Ontologies/ontology-management-base/general/VARIABLES.md index 601a539..98a3897 100644 --- a/Shacls_and_Ontologies/ontology-management-base/general/VARIABLES.md +++ b/Shacls_and_Ontologies/ontology-management-base/general/VARIABLES.md @@ -9,12 +9,11 @@ | Shape | Property prefix | Property | MinCount | MaxCount | Description | Datatype/NodeKind | Filename | | --- | --- | --- | --- | --- | --- | --- | --- | | GeneralShape | general | description | 1 | 1 | description object with property for name and description | | general_shacl.ttl | -| GeneralShape | general | data | 1 | 1 | data object with property for size, id and record time | | general_shacl.ttl | +| GeneralShape | general | data | 1 | 1 | data object with property for size and record time | | general_shacl.ttl | | GeneralShape | general | range2D | | 1 | min and max value of range2D object | | general_shacl.ttl | | DescriptionShape | general | name | 1 | 1 | A human readable name of the entity. | | general_shacl.ttl | | DescriptionShape | general | description | 1 | 1 | A free text description of the entity. | | general_shacl.ttl | | DataShape | general | size | 1 | 1 | Size of the file to be downloaded in MB. | | general_shacl.ttl | -| DataShape | general | contractId | 1 | 1 | Contract information in regards to the data exchange component. | | general_shacl.ttl | | DataShape | general | recordingTime | | 1 | Time of data acquisition used to generate the asset, if partial measurement: oldest date | | general_shacl.ttl | | Range2DShape | general | max | | | | | general_shacl.ttl | | Range2DShape | general | min | | | | | general_shacl.ttl | diff --git a/Shacls_and_Ontologies/ontology-management-base/general/general_instance.json b/Shacls_and_Ontologies/ontology-management-base/general/general_instance.json index b9019f2..f2cbfee 100644 --- a/Shacls_and_Ontologies/ontology-management-base/general/general_instance.json +++ b/Shacls_and_Ontologies/ontology-management-base/general/general_instance.json @@ -25,10 +25,6 @@ "@value": "5.8", "@type": "xsd:float" }, - "general:contractId": { - "@value": "ntract_zcdkr7kqd47y0w5b4tg91w1etw", - "@type": "xsd:string" - }, "general:recordingTime": { "@value": "2024-04-01T00:00:00", "@type": "xsd:dateTime" diff --git a/Shacls_and_Ontologies/ontology-management-base/general/general_shacl.ttl b/Shacls_and_Ontologies/ontology-management-base/general/general_shacl.ttl index ba218e4..55927f9 100644 --- a/Shacls_and_Ontologies/ontology-management-base/general/general_shacl.ttl +++ b/Shacls_and_Ontologies/ontology-management-base/general/general_shacl.ttl @@ -16,7 +16,7 @@ general:GeneralShape a sh:NodeShape ; sh:minCount 1 ; sh:node general:DataShape ; sh:name "data object" ; - sh:description "data object with property for size, id and record time" ; + sh:description "data object with property for size and record time" ; sh:order 2 ; sh:path general:data ], [ sh:maxCount 1 ; @@ -55,23 +55,13 @@ general:DataShape a sh:NodeShape ; sh:name "size" ; sh:order 1 ; sh:path general:size ], - # contractId ? - [ sh:datatype xsd:string ; - sh:description "Contract information in regards to the data exchange component." ; - skos:example "contract_zcdkr7kqd47y0w5b4tg91w1etw" ; - sh:maxCount 1 ; - sh:minCount 1 ; - sh:name "contractId" ; - sh:order 2 ; - sh:path general:contractId ], - # [ skos:example "2022-04-01 00:00:00" ; sh:datatype xsd:dateTime ; sh:description "Time of data acquisition used to generate the asset, if partial measurement: oldest date"@en ; sh:maxCount 1 ; sh:message "Validation of recordingTime failed!"@en ; sh:name "recordingTime"@en ; - sh:order 3 ; + sh:order 2 ; sh:path general:recordingTime ] ; sh:targetClass general:Data . diff --git a/Shacls_and_Ontologies/used-shacls/domainMetadata_shacl.ttl b/Shacls_and_Ontologies/used-shacls/domainMetadata_shacl.ttl index 0da2a52..5455a6f 100644 --- a/Shacls_and_Ontologies/used-shacls/domainMetadata_shacl.ttl +++ b/Shacls_and_Ontologies/used-shacls/domainMetadata_shacl.ttl @@ -309,24 +309,14 @@ general:DataShape a sh:NodeShape ; sh:minCount 1 ; sh:name "size" ; sh:order 1 ; - sh:path general:size ], - # contractId ? - [ sh:datatype xsd:string ; - sh:description "Contract information in regards to the data exchange component." ; - skos:example "contract_zcdkr7kqd47y0w5b4tg91w1etw" ; - sh:maxCount 1 ; - sh:minCount 1 ; - sh:name "contractId" ; - sh:order 2 ; - sh:path general:contractId ], - # + sh:path general:size ], [ skos:example "2022-04-01 00:00:00" ; sh:datatype xsd:dateTime ; sh:description "Time of data acquisition used to generate the asset, if partial measurement: oldest date"@en ; sh:maxCount 1 ; sh:message "Validation of recordingTime failed!"@en ; sh:name "recordingTime"@en ; - sh:order 3 ; + sh:order 2 ; sh:path general:recordingTime ] ; sh:targetClass general:Data . diff --git a/asset/README.md b/asset/README.md index da2377e..3bcfc78 100644 --- a/asset/README.md +++ b/asset/README.md @@ -5,7 +5,7 @@ This repo serves as a reference for onboarding an HD-Map asset into the data spa A complete **`asset`** in a specific domain includes the data itself and all necessary files for describing, evaluating, and visualizing the dataset. -The **'asset'** has a specific following folder structure and the sample can be downloaded here in this repo from the lastest release (**`asset.zip`**). +The **`asset`** has a specific following folder structure and the sample can be downloaded here in this repo from the lastest release (**`asset.zip`**). ## Asset Folder Structure diff --git a/asset/TestfeldNiedersachsen_ALKS_ODR_sample/manifest.json b/asset/TestfeldNiedersachsen_ALKS_ODR_sample/manifest.json index ceb1af9..1a09420 100644 --- a/asset/TestfeldNiedersachsen_ALKS_ODR_sample/manifest.json +++ b/asset/TestfeldNiedersachsen_ALKS_ODR_sample/manifest.json @@ -6,7 +6,7 @@ "sh": "http://www.w3.org/ns/shacl#", "manifest": "https://github.com/ASCS-eV/EVES/tree/onboarding/ontologyManifest/" }, - "@id": "did:web:registry.gaia-x.eu:Manifest:ti7GYImopv8XqLHT1tQeDm8XG4AvHCAtEQKs", + "@id": "did:web:registry.gaia-x.eu:Manifest:ZNh9Z-tHQpkpxJhNobhUVmauYxrfTAZdQy9L", "@type": "manifest:Manifest", "manifest:data": { "@type": "manifest:Data", @@ -31,12 +31,6 @@ "@type": "xsd:anyURI" } }, - { - "@type": "manifest:Link" - }, - { - "@type": "manifest:Link" - }, { "@type": "manifest:Link", "manifest:accessRole": "owner", @@ -48,130 +42,138 @@ } } ], + "manifest:licenseType": "ProviderSpecific", + "manifest:licenseData": { + "@type": "manifest:Link", + "manifest:accessRole": "publicUser", + "manifest:type": "License", + "manifest:format": "md", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/LICENSE", + "@type": "xsd:anyURI" + } + }, "manifest:contentData": [ { - "@type": "manifest:Link", - "manifest:accessRole": "publicUser", - "manifest:type": "License", - "manifest:format": "md", - "manifest:relativePath": { - "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/LICENSE", - "@type": "xsd:anyURI" - } - }, - { - "@type": "manifest:Link", - "manifest:accessRole": "publicUser", - "manifest:type": "Metadata", - "manifest:format": "json", - "manifest:relativePath": { - "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/metadata/domainMetadata.json", - "@type": "xsd:anyURI" - } - }, - { - "@type": "manifest:Link", - "manifest:accessRole": "publicUser", - "manifest:type": "Metadata", - "manifest:format": "json", - "manifest:relativePath": { - "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/metadata/gxMetadata.json", - "@type": "xsd:anyURI" - } - }, - { - "@type": "manifest:Link", - "manifest:accessRole": "registeredUser", - "manifest:type": "Document", - "manifest:format": "pdf", - "manifest:relativePath": { - "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/documentation/TestfeldNiedersachsen_ALKS_ODR_sample_Documentation.pdf", - "@type": "xsd:anyURI" - } - }, - { - "@type": "manifest:Link", - "manifest:accessRole": "registeredUser", - "manifest:type": "Document", - "manifest:format": "txt", - "manifest:relativePath": { - "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/documentation/TestfeldNiedersachsen_ALKS_ODR_sample_Documentation_stats.txt", - "@type": "xsd:anyURI" - } - }, - { - "@type": "manifest:Link", - "manifest:accessRole": "registeredUser", - "manifest:type": "Validation", - "manifest:format": "txt", - "manifest:relativePath": { - "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/validation/qcReport.txt", - "@type": "xsd:anyURI" - } - }, - { - "@type": "manifest:Link", - "manifest:accessRole": "publicUser", - "manifest:type": "Image", - "manifest:format": "png", - "manifest:relativePath": { - "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/visualization/TestfeldNiedersachsen_ALKS_ODR_sample_01.png", - "@type": "xsd:anyURI" - } - }, - { - "@type": "manifest:Link", - "manifest:accessRole": "publicUser", - "manifest:type": "Image", - "manifest:format": "png", - "manifest:relativePath": { - "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/visualization/TestfeldNiedersachsen_ALKS_ODR_sample_02.png", - "@type": "xsd:anyURI" - } - }, - { - "@type": "manifest:Link", - "manifest:accessRole": "publicUser", - "manifest:type": "Image", - "manifest:format": "png", - "manifest:relativePath": { - "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/visualization/TestfeldNiedersachsen_ALKS_ODR_sample_03.png", - "@type": "xsd:anyURI" - } - }, - { - "@type": "manifest:Link", - "manifest:accessRole": "publicUser", - "manifest:type": "3DPreview", - "manifest:format": "geojson", - "manifest:relativePath": { - "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/visualization/bbox.geojson", - "@type": "xsd:anyURI" - } - }, - { - "@type": "manifest:Link", - "manifest:accessRole": "publicUser", - "manifest:type": "3DPreview", - "manifest:format": "geojson", - "manifest:relativePath": { - "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/visualization/roadNetwork.geojson", - "@type": "xsd:anyURI" - } - }, - { - "@type": "manifest:Link", - "manifest:accessRole": "registeredUser", - "manifest:type": "3DPreview", - "manifest:format": "geojson", - "manifest:relativePath": { - "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/visualization/detailRoadNetwork.geojson", - "@type": "xsd:anyURI" - } - }, - { - "@type": "manifest:Link" + "@type": "manifest:Link", + "manifest:accessRole": "publicUser", + "manifest:type": "Metadata", + "manifest:format": "json", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/metadata/domainMetadata.json", + "@type": "xsd:anyURI" + } + }, + { + "@type": "manifest:Link", + "manifest:accessRole": "publicUser", + "manifest:type": "Metadata", + "manifest:format": "json", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/metadata/domainMetadata.json", + "@type": "xsd:anyURI" + } + }, + { + "@type": "manifest:Link", + "manifest:accessRole": "publicUser", + "manifest:type": "Metadata", + "manifest:format": "json", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/metadata/gxMetadata.json", + "@type": "xsd:anyURI" + } + }, + { + "@type": "manifest:Link", + "manifest:accessRole": "registeredUser", + "manifest:type": "Document", + "manifest:format": "pdf", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/documentation/TestfeldNiedersachsen_ALKS_ODR_sample_Documentation.pdf", + "@type": "xsd:anyURI" + } + }, + { + "@type": "manifest:Link", + "manifest:accessRole": "registeredUser", + "manifest:type": "Document", + "manifest:format": "txt", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/documentation/TestfeldNiedersachsen_ALKS_ODR_sample_Documentation_stats.txt", + "@type": "xsd:anyURI" + } + }, + { + "@type": "manifest:Link", + "manifest:accessRole": "registeredUser", + "manifest:type": "Validation", + "manifest:format": "txt", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/validation/qcReport.txt", + "@type": "xsd:anyURI" + } + }, + { + "@type": "manifest:Link", + "manifest:accessRole": "publicUser", + "manifest:type": "Image", + "manifest:format": "png", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/visualization/TestfeldNiedersachsen_ALKS_ODR_sample_01.png", + "@type": "xsd:anyURI" + } + }, + { + "@type": "manifest:Link", + "manifest:accessRole": "publicUser", + "manifest:type": "Image", + "manifest:format": "png", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/visualization/TestfeldNiedersachsen_ALKS_ODR_sample_02.png", + "@type": "xsd:anyURI" + } + }, + { + "@type": "manifest:Link", + "manifest:accessRole": "publicUser", + "manifest:type": "Image", + "manifest:format": "png", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/visualization/TestfeldNiedersachsen_ALKS_ODR_sample_03.png", + "@type": "xsd:anyURI" + } + }, + { + "@type": "manifest:Link", + "manifest:accessRole": "publicUser", + "manifest:type": "3DPreview", + "manifest:format": "geojson", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/visualization/bbox.geojson", + "@type": "xsd:anyURI" + } + }, + { + "@type": "manifest:Link", + "manifest:accessRole": "publicUser", + "manifest:type": "3DPreview", + "manifest:format": "geojson", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/visualization/roadNetwork.geojson", + "@type": "xsd:anyURI" + } + }, + { + "@type": "manifest:Link", + "manifest:accessRole": "registeredUser", + "manifest:type": "3DPreview", + "manifest:format": "geojson", + "manifest:relativePath": { + "@value": "./TestfeldNiedersachsen_ALKS_ODR_sample/visualization/detailRoadNetwork.geojson", + "@type": "xsd:anyURI" } - ] + } + ] } - } \ No newline at end of file +} \ No newline at end of file diff --git a/asset/TestfeldNiedersachsen_ALKS_ODR_sample/metadata/domainMetadata.json b/asset/TestfeldNiedersachsen_ALKS_ODR_sample/metadata/domainMetadata.json index a6a6489..3111416 100644 --- a/asset/TestfeldNiedersachsen_ALKS_ODR_sample/metadata/domainMetadata.json +++ b/asset/TestfeldNiedersachsen_ALKS_ODR_sample/metadata/domainMetadata.json @@ -29,10 +29,6 @@ "@value": "5", "@type": "xsd:float" }, - "general:contractId": { - "@value": "123456789", - "@type": "xsd:string" - }, "general:recordingTime": { "@value": "2020-05-26T12:00:00", "@type": "xsd:dateTime"