From 4881791ec64be1233eb3907c8b092369c2543a31 Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:09:11 +0100 Subject: [PATCH 01/11] Create metadata.json --- io.catenax.iot_sensor_data/2.0.0/metadata.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 io.catenax.iot_sensor_data/2.0.0/metadata.json diff --git a/io.catenax.iot_sensor_data/2.0.0/metadata.json b/io.catenax.iot_sensor_data/2.0.0/metadata.json new file mode 100644 index 00000000..c22749ae --- /dev/null +++ b/io.catenax.iot_sensor_data/2.0.0/metadata.json @@ -0,0 +1 @@ +{ "status" : "release"} From ecb93c5309b737ce58afc21e8d05fe0791111281 Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:10:49 +0100 Subject: [PATCH 02/11] IotSensorData v.2.0.0 As described in issue #427. --- .../2.0.0/IotSensorData.ttl | 172 ++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl diff --git a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl new file mode 100644 index 00000000..3c8b6794 --- /dev/null +++ b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl @@ -0,0 +1,172 @@ +@prefix samm: . +@prefix samm-c: . +@prefix samm-e: . +@prefix unit: . +@prefix rdf: . +@prefix rdfs: . +@prefix xsd: . +@prefix : . + +:IotSensorData a samm:Aspect ; + samm:preferredName "Iot Sensor Data"@en ; + samm:description "The data collected by an IoT Sensor Device."@en ; + samm:properties ( :catenaXId :sensorRuntimeData ) ; + samm:operations ( ) ; + samm:events ( ) . + +:catenaXId a samm:Property ; + samm:preferredName "Catena-X Identifier"@en ; + samm:description "The fully anonymous Catena-X ID of the asset, valid for the Catena-X dataspace."@en ; + samm:characteristic :CatenaXIdTrait ; + samm:exampleValue "urn:uuid:ed85f17e-29dd-473c-9cb8-d7ad1dc44d2f" . + +:sensorRuntimeData a samm:Property ; + samm:preferredName "Sensor Runtime Data"@en ; + samm:description "The information collected by a Sensor device at an instance in time."@en ; + samm:characteristic :SensorRuntimeDataCharacteristics . + +:CatenaXIdTrait a samm-c:Trait ; + samm:preferredName "Catena-X Id Trait"@en ; + samm:description "Trait to ensure UUID v4 data format."@en ; + samm-c:baseCharacteristic :UUIDv4 ; + samm-c:constraint :CatenaXIdRegularExpression . + +:SensorRuntimeDataCharacteristics a samm-c:List ; + samm:preferredName "Sensor Runtime Data Characteristics"@en ; + samm:description "Characteristic describing the list of the Sensor Runtime Data property."@en ; + samm:dataType :SensorRuntimeDataEntity . + +:UUIDv4 a samm:Characteristic ; + samm:preferredName "UUIDv4"@en ; + samm:description "A version 4 UUID is a universally unique identifier that is generated using random 32 hexadecimal characters."@en ; + samm:dataType xsd:string . + +:CatenaXIdRegularExpression a samm-c:RegularExpressionConstraint ; + samm:preferredName "Catena-X Id Regular Expression"@en ; + samm:description "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI."@en ; + samm:value "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" . + +:SensorRuntimeDataEntity a samm:Entity ; + samm:preferredName "Sensor Runtime Data Entity"@en ; + samm:description "Encapsulates the Sensor Data relevant attributes."@en ; + samm:properties ( :sensorGeoLocation :batteryLevel :timestamp :sensorData :transmissionMethod ) . + +:sensorGeoLocation a samm:Property ; + samm:preferredName "Sensor Geo Location"@en ; + samm:description "Geodata, geographic data or geospatial data, refers to data and information that has explicit or implicit association with a location relative to Earth."@en ; + samm:characteristic :SensorGeoLocationCharacteristics . + +:batteryLevel a samm:Property ; + samm:preferredName "Battery Level"@en ; + samm:description "The battery level displays how much charge of the battery has been left."@en ; + samm:characteristic :BatteryLevelCharacteristic ; + samm:exampleValue "50.00"^^xsd:decimal . + +:timestamp a samm:Property ; + samm:preferredName "Timestamp"@en ; + samm:description "The timestamp of the latest sensor reading."@en ; + samm:characteristic samm-c:Timestamp ; + samm:exampleValue "2023-02-04T14:48:54"^^xsd:dateTime . + +:sensorData a samm:Property ; + samm:preferredName "Sensor Data"@en ; + samm:description "The data collected by an IoT Sensor Device."@en ; + samm:characteristic :SensorDataCharacteristics . + +:transmissionMethod a samm:Property ; + samm:preferredName "Transmission Method"@en ; + samm:description "The method under which the sensing data is transmitted from the source to the remote node."@en ; + samm:characteristic :TransmissionMethodCharacteristic ; + samm:exampleValue "LoRaWAN" . + +:SensorGeoLocationCharacteristics a samm:Characteristic ; + samm:preferredName "Sensor Geo Location Characteristics"@en ; + samm:description "Characteristic to describe the related Geo data."@en ; + samm:dataType :SensorGeoLocationEntity . + +:BatteryLevelCharacteristic a samm-c:Measurement ; + samm:preferredName "Battery Level Characteristic"@en ; + samm:description "Characteristic to describe the property battery level."@en ; + samm:dataType xsd:decimal ; + samm-c:unit unit:percent . + +:SensorDataCharacteristics a samm-c:List ; + samm:preferredName "Sensor Data Characteristics"@en ; + samm:description "Characteristic to describe the related Sensor data."@en ; + samm:dataType :SensorDataEntity . + +:TransmissionMethodCharacteristic a samm:Characteristic ; + samm:preferredName "Transmission Method Characteristic"@en ; + samm:description "Characteristic that describes the property transmission method."@en ; + samm:dataType xsd:string . + +:SensorGeoLocationEntity a samm:Entity ; + samm:preferredName "Sensor Geo Location Entity"@en ; + samm:description "Encapsulates the Geo Data relevant attributes."@en ; + samm:properties ( :latitude :longitude :altitude :geoDataTimestamp ) . + +:SensorDataEntity a samm:Entity ; + samm:preferredName "Sensor Data Entity"@en ; + samm:description "Encapsulates the Sensor Data relevant attributes."@en ; + samm:properties ( :sensorType :sensorValue :sensorUnit ) . + +:latitude a samm:Property ; + samm:preferredName "Latitude"@en ; + samm:description "The angle between zenith and a plane parallel to the equator."@en ; + samm:characteristic :LatitudeCharacteristic ; + samm:exampleValue "40.20361"^^xsd:decimal . + +:longitude a samm:Property ; + samm:preferredName "Longitude"@en ; + samm:description "Geographic coordinate that specifies the east-west position of a point on the Earth's surface."@en ; + samm:characteristic :LongitudeCharacteristic ; + samm:exampleValue "11.3102"^^xsd:decimal . + +:altitude a samm:Property ; + samm:preferredName "Altitude"@en ; + samm:description "Antenna Altitude above/below mean-sea-level (geoid)."@en ; + samm:characteristic :AltitudeCharacteristic ; + samm:exampleValue "280.20"^^xsd:decimal . + +:geoDataTimestamp a samm:Property ; + samm:preferredName "Geo Data Timestamp"@en ; + samm:description "The timestamp of the latest sensor reading of the geo data."@en ; + samm:characteristic samm-c:Timestamp ; + samm:exampleValue "2023-02-04T14:48:54"^^xsd:dateTime . + +:sensorType a samm:Property ; + samm:preferredName "Sensor Type"@en ; + samm:description "Different types of sensors that are commonly used in various applications, measuring one of the physical properties like Temperature, Pressure, Resistance, Shock, Conduction, Heat Transfer etc."@en ; + samm:characteristic samm-c:Text ; + samm:exampleValue "Temperature" . + +:sensorValue a samm:Property ; + samm:preferredName "Sensor Value"@en ; + samm:description "The measured value of the sensor type."@en ; + samm:characteristic :SensorValueCharacteristics ; + samm:exampleValue "32.00"^^xsd:decimal . + +:sensorUnit a samm:Property ; + samm:preferredName "Sensor Unit"@en ; + samm:characteristic samm-c:UnitReference ; + samm:exampleValue "Celsius"^^samm:curie . + +:LatitudeCharacteristic a samm:Characteristic ; + samm:preferredName "Latitude Characteristic"@en ; + samm:description "Characteristic describing the property latitude."@en ; + samm:dataType xsd:decimal . + +:LongitudeCharacteristic a samm:Characteristic ; + samm:preferredName "Longitude Characteristic"@en ; + samm:description "Characteristic describing the property longitude."@en ; + samm:dataType xsd:decimal . + +:AltitudeCharacteristic a samm:Characteristic ; + samm:preferredName "Altitude Characteristic"@en ; + samm:description "Characteristic describing the property altitude."@en ; + samm:dataType xsd:decimal . + +:SensorValueCharacteristics a samm:Characteristic ; + samm:description "Describes the property which contains a sensor value of data type decimal."@en ; + samm:dataType xsd:decimal . + From 63c6aafa937b0a641a3bd05e408e6adc2c349f8c Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:13:18 +0100 Subject: [PATCH 03/11] Update RELEASE_NOTES.md --- io.catenax.iot_sensor_data/RELEASE_NOTES.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/io.catenax.iot_sensor_data/RELEASE_NOTES.md b/io.catenax.iot_sensor_data/RELEASE_NOTES.md index 35833d3a..c8365d1d 100644 --- a/io.catenax.iot_sensor_data/RELEASE_NOTES.md +++ b/io.catenax.iot_sensor_data/RELEASE_NOTES.md @@ -3,6 +3,15 @@ All notable changes to this model will be documented in this file. ## [Unreleased] +## [1.0.0] - 2023-11-13 +### Added + +### Changed +* From static to dynamic data attributes. +* Converted from BAMM to SAMM. + +### Removed + ## [1.0.0] - 2023-02-22 ### Added - initial model From cd315697f0d70474df9125befafb37eecc3a411b Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:13:35 +0100 Subject: [PATCH 04/11] Update RELEASE_NOTES.md --- io.catenax.iot_sensor_data/RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.catenax.iot_sensor_data/RELEASE_NOTES.md b/io.catenax.iot_sensor_data/RELEASE_NOTES.md index c8365d1d..2ce15ecb 100644 --- a/io.catenax.iot_sensor_data/RELEASE_NOTES.md +++ b/io.catenax.iot_sensor_data/RELEASE_NOTES.md @@ -3,7 +3,7 @@ All notable changes to this model will be documented in this file. ## [Unreleased] -## [1.0.0] - 2023-11-13 +## [2.0.0] - 2023-11-13 ### Added ### Changed From 4be75d5ba03307f7d2a7ef679fcf700f3aea3ab0 Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Mon, 13 Nov 2023 13:15:23 +0100 Subject: [PATCH 05/11] Update IotSensorData.ttl --- io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl index 3c8b6794..39f6cf68 100644 --- a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl +++ b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl @@ -5,7 +5,7 @@ @prefix rdf: . @prefix rdfs: . @prefix xsd: . -@prefix : . +@prefix : . :IotSensorData a samm:Aspect ; samm:preferredName "Iot Sensor Data"@en ; From a054610aff158664c659b4ede480a701d1a38f91 Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:03:50 +0100 Subject: [PATCH 06/11] Update IotSensorData.ttl Adjusted to use the shared aspect for UUID. --- .../2.0.0/IotSensorData.ttl | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl index 39f6cf68..d42b0e24 100644 --- a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl +++ b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl @@ -1,3 +1,20 @@ +####################################################################### +# Copyright (c) 2023 BASF SE +# Copyright (c) 2023 Henkel AG & Co. KGaA +# Copyright (c) 2023 ZF Friedrichshafen AG +# Copyright (c) 2023 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This work is made available under the terms of the +# Creative Commons Attribution 4.0 International (CC-BY-4.0) license, +# which is available at +# https://creativecommons.org/licenses/by/4.0/legalcode. +# +# SPDX-License-Identifier: CC-BY-4.0 +####################################################################### + @prefix samm: . @prefix samm-c: . @prefix samm-e: . @@ -5,7 +22,8 @@ @prefix rdf: . @prefix rdfs: . @prefix xsd: . -@prefix : . +@prefix : . +@prefix ext-uuid: . :IotSensorData a samm:Aspect ; samm:preferredName "Iot Sensor Data"@en ; @@ -17,7 +35,7 @@ :catenaXId a samm:Property ; samm:preferredName "Catena-X Identifier"@en ; samm:description "The fully anonymous Catena-X ID of the asset, valid for the Catena-X dataspace."@en ; - samm:characteristic :CatenaXIdTrait ; + samm:characteristic ext-uuid:UuidV4Trait ; samm:exampleValue "urn:uuid:ed85f17e-29dd-473c-9cb8-d7ad1dc44d2f" . :sensorRuntimeData a samm:Property ; @@ -25,27 +43,11 @@ samm:description "The information collected by a Sensor device at an instance in time."@en ; samm:characteristic :SensorRuntimeDataCharacteristics . -:CatenaXIdTrait a samm-c:Trait ; - samm:preferredName "Catena-X Id Trait"@en ; - samm:description "Trait to ensure UUID v4 data format."@en ; - samm-c:baseCharacteristic :UUIDv4 ; - samm-c:constraint :CatenaXIdRegularExpression . - :SensorRuntimeDataCharacteristics a samm-c:List ; samm:preferredName "Sensor Runtime Data Characteristics"@en ; samm:description "Characteristic describing the list of the Sensor Runtime Data property."@en ; samm:dataType :SensorRuntimeDataEntity . -:UUIDv4 a samm:Characteristic ; - samm:preferredName "UUIDv4"@en ; - samm:description "A version 4 UUID is a universally unique identifier that is generated using random 32 hexadecimal characters."@en ; - samm:dataType xsd:string . - -:CatenaXIdRegularExpression a samm-c:RegularExpressionConstraint ; - samm:preferredName "Catena-X Id Regular Expression"@en ; - samm:description "The provided regular expression ensures that the UUID is composed of five groups of characters separated by hyphens, in the form 8-4-4-4-12 for a total of 36 characters (32 hexadecimal characters and 4 hyphens), optionally prefixed by \"urn:uuid:\" to make it an IRI."@en ; - samm:value "(^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)|(^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)" . - :SensorRuntimeDataEntity a samm:Entity ; samm:preferredName "Sensor Runtime Data Entity"@en ; samm:description "Encapsulates the Sensor Data relevant attributes."@en ; From e45aa207df05c13ab4148febbf6053038202816d Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:21:13 +0100 Subject: [PATCH 07/11] Update IotSensorData.ttl example value changed to: unit: Celsius --- io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl index d42b0e24..390417e0 100644 --- a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl +++ b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl @@ -151,7 +151,7 @@ :sensorUnit a samm:Property ; samm:preferredName "Sensor Unit"@en ; samm:characteristic samm-c:UnitReference ; - samm:exampleValue "Celsius"^^samm:curie . + samm:exampleValue "unit: Celsius"^^samm:curie . :LatitudeCharacteristic a samm:Characteristic ; samm:preferredName "Latitude Characteristic"@en ; From 264b306ba0b32c472cbf3b1318422c63c8a0e51b Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:40:05 +0100 Subject: [PATCH 08/11] Update IotSensorData.ttl --- io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl index 390417e0..11c9f453 100644 --- a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl +++ b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl @@ -151,7 +151,7 @@ :sensorUnit a samm:Property ; samm:preferredName "Sensor Unit"@en ; samm:characteristic samm-c:UnitReference ; - samm:exampleValue "unit: Celsius"^^samm:curie . + samm:exampleValue "unit:Celsius"^^samm:curie . :LatitudeCharacteristic a samm:Characteristic ; samm:preferredName "Latitude Characteristic"@en ; From 27faee403ed8f4b0d08fe1bdb1386038909e0986 Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:42:55 +0100 Subject: [PATCH 09/11] Update IotSensorData.ttl prefered name added. --- io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl | 1 + 1 file changed, 1 insertion(+) diff --git a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl index 11c9f453..6288c6f9 100644 --- a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl +++ b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl @@ -169,6 +169,7 @@ samm:dataType xsd:decimal . :SensorValueCharacteristics a samm:Characteristic ; + samm:preferredName "Sensor Value Characteristic"@en ; samm:description "Describes the property which contains a sensor value of data type decimal."@en ; samm:dataType xsd:decimal . From 50e9be66843ba5449d8d9850a14d894ce7d374f5 Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Thu, 16 Nov 2023 11:46:14 +0100 Subject: [PATCH 10/11] Update RELEASE_NOTES.md Release Date changed. --- io.catenax.iot_sensor_data/RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.catenax.iot_sensor_data/RELEASE_NOTES.md b/io.catenax.iot_sensor_data/RELEASE_NOTES.md index 2ce15ecb..ccf6c151 100644 --- a/io.catenax.iot_sensor_data/RELEASE_NOTES.md +++ b/io.catenax.iot_sensor_data/RELEASE_NOTES.md @@ -3,7 +3,7 @@ All notable changes to this model will be documented in this file. ## [Unreleased] -## [2.0.0] - 2023-11-13 +## [2.0.0] - 2023-11-20 ### Added ### Changed From a811716145a2c2159fada0117bca9c9a6329bcd5 Mon Sep 17 00:00:00 2001 From: Cvetanka Drevon <107257966+Cvetanka-ZF@users.noreply.github.com> Date: Mon, 20 Nov 2023 16:42:29 +0100 Subject: [PATCH 11/11] Update IotSensorData.ttl Added "see" links for GeoData --- io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl index 6288c6f9..a7d00bce 100644 --- a/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl +++ b/io.catenax.iot_sensor_data/2.0.0/IotSensorData.ttl @@ -156,16 +156,19 @@ :LatitudeCharacteristic a samm:Characteristic ; samm:preferredName "Latitude Characteristic"@en ; samm:description "Characteristic describing the property latitude."@en ; + samm:see ; samm:dataType xsd:decimal . :LongitudeCharacteristic a samm:Characteristic ; samm:preferredName "Longitude Characteristic"@en ; samm:description "Characteristic describing the property longitude."@en ; + samm:see ; samm:dataType xsd:decimal . :AltitudeCharacteristic a samm:Characteristic ; samm:preferredName "Altitude Characteristic"@en ; samm:description "Characteristic describing the property altitude."@en ; + samm:see ; samm:dataType xsd:decimal . :SensorValueCharacteristics a samm:Characteristic ;