From 0e8cafcae557d4dd78eb59a7f617689c132e5999 Mon Sep 17 00:00:00 2001
From: hoppen <hoppen@mmi.rwth-aachen.de>
Date: Wed, 8 Nov 2023 09:32:06 +0100
Subject: [PATCH] =?UTF-8?q?Minimale=20Anpassung=20an=20Capabilities=20Beis?=
=?UTF-8?q?pielen:=20ComposedOfContainer=20gem=C3=A4=C3=9F=20https://githu?=
=?UTF-8?q?b.com/admin-shell-io/submodel-templates/blob/main/development/C?=
=?UTF-8?q?apability/1/0/Faehigkeiten=5FTeilmodell=5FStatus=5F12=5F2021=5F?=
=?UTF-8?q?overview.pdf=20unter=20CapabilityRelationships=20verschoben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
fml40-to-aas/forwarder.json | 243 ++++++++++++++++++----------------
fml40-to-aas/harvester.json | 251 +++++++++++++++++++-----------------
2 files changed, 262 insertions(+), 232 deletions(-)
diff --git a/fml40-to-aas/forwarder.json b/fml40-to-aas/forwarder.json
index f0bcf60..303a688 100644
--- a/fml40-to-aas/forwarder.json
+++ b/fml40-to-aas/forwarder.json
@@ -22,7 +22,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4712/TechnicalData"
+ "value": "s3i:4712/capabilities"
}
]
},
@@ -31,7 +31,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4712/Location"
+ "value": "s3i:4712/JobManagement"
}
]
},
@@ -40,7 +40,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4712/JobManagement"
+ "value": "s3i:4712/TechnicalData"
}
]
},
@@ -58,7 +58,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4712/DigitalNameplate"
+ "value": "s3i:4712/OperationalData"
}
]
},
@@ -67,7 +67,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4712/OperationalData"
+ "value": "s3i:4712/DigitalNameplate"
}
]
},
@@ -76,7 +76,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4712/capabilities"
+ "value": "s3i:4712/Location"
}
]
}
@@ -442,142 +442,157 @@
},
"value": [
{
- "idShort": "ComposedOfContainer",
+ "idShort": "Forwarder",
+ "modelType": "Capability",
+ "semanticId": {
+ "type": "GlobalReference",
+ "keys": [
+ {
+ "type": "GlobalReference",
+ "value": "https://www.kwh40.de/forestml40/capabilities.owl#Forwarder"
+ }
+ ]
+ }
+ },
+ {
+ "idShort": "CapabilityRelationships",
"modelType": "SubmodelElementCollection",
"semanticId": {
"type": "GlobalReference",
"keys": [
{
"type": "GlobalReference",
- "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#ComposedOfContainer"
+ "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#CapabilityRelationships"
}
]
},
"value": [
{
- "idShort": "ComposedOfProvidesProductionData",
- "modelType": "RelationshipElement",
+ "idShort": "ComposedOfContainer",
+ "modelType": "SubmodelElementCollection",
"semanticId": {
"type": "GlobalReference",
"keys": [
{
"type": "GlobalReference",
- "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#ComposedOfRelationship"
+ "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#ComposedOfContainer"
}
]
},
- "first": {
- "type": "ModelReference",
- "keys": [
- {
- "type": "Submodel",
- "value": "s3i:4712/capabilities"
- },
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilitySet"
- },
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilityForwarderContainer"
- },
- {
- "type": "Capability",
- "value": "Forwarder"
- }
- ]
- },
- "second": {
- "type": "ModelReference",
- "keys": [
- {
- "type": "Submodel",
- "value": "s3i:4712/capabilities"
- },
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilitySet"
- },
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilityProvidesProductionDataContainer"
- },
- {
- "type": "Capability",
- "value": "ProvidesProductionData"
- }
- ]
- }
- },
- {
- "idShort": "ComposedOfAcceptsForwardingJobs",
- "modelType": "RelationshipElement",
- "semanticId": {
- "type": "GlobalReference",
- "keys": [
- {
+ "value": [
+ {
+ "idShort": "ComposedOfProvidesProductionData",
+ "modelType": "RelationshipElement",
+ "semanticId": {
"type": "GlobalReference",
- "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#ComposedOfRelationship"
- }
- ]
- },
- "first": {
- "type": "ModelReference",
- "keys": [
- {
- "type": "Submodel",
- "value": "s3i:4712/capabilities"
+ "keys": [
+ {
+ "type": "GlobalReference",
+ "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#ComposedOfRelationship"
+ }
+ ]
},
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilitySet"
+ "first": {
+ "type": "ModelReference",
+ "keys": [
+ {
+ "type": "Submodel",
+ "value": "s3i:4712/capabilities"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilitySet"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilityForwarderContainer"
+ },
+ {
+ "type": "Capability",
+ "value": "Forwarder"
+ }
+ ]
},
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilityForwarderContainer"
- },
- {
- "type": "Capability",
- "value": "Forwarder"
+ "second": {
+ "type": "ModelReference",
+ "keys": [
+ {
+ "type": "Submodel",
+ "value": "s3i:4712/capabilities"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilitySet"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilityProvidesProductionDataContainer"
+ },
+ {
+ "type": "Capability",
+ "value": "ProvidesProductionData"
+ }
+ ]
}
- ]
- },
- "second": {
- "type": "ModelReference",
- "keys": [
- {
- "type": "Submodel",
- "value": "s3i:4712/capabilities"
- },
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilitySet"
+ },
+ {
+ "idShort": "ComposedOfAcceptsForwardingJobs",
+ "modelType": "RelationshipElement",
+ "semanticId": {
+ "type": "GlobalReference",
+ "keys": [
+ {
+ "type": "GlobalReference",
+ "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#ComposedOfRelationship"
+ }
+ ]
},
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilityAcceptsForwardingJobsContainer"
+ "first": {
+ "type": "ModelReference",
+ "keys": [
+ {
+ "type": "Submodel",
+ "value": "s3i:4712/capabilities"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilitySet"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilityForwarderContainer"
+ },
+ {
+ "type": "Capability",
+ "value": "Forwarder"
+ }
+ ]
},
- {
- "type": "Capability",
- "value": "AcceptsForwardingJobs"
+ "second": {
+ "type": "ModelReference",
+ "keys": [
+ {
+ "type": "Submodel",
+ "value": "s3i:4712/capabilities"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilitySet"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilityAcceptsForwardingJobsContainer"
+ },
+ {
+ "type": "Capability",
+ "value": "AcceptsForwardingJobs"
+ }
+ ]
}
- ]
- }
+ }
+ ]
}
]
- },
- {
- "idShort": "Forwarder",
- "modelType": "Capability",
- "semanticId": {
- "type": "GlobalReference",
- "keys": [
- {
- "type": "GlobalReference",
- "value": "https://www.kwh40.de/forestml40/capabilities.owl#Forwarder"
- }
- ]
- }
}
]
},
diff --git a/fml40-to-aas/harvester.json b/fml40-to-aas/harvester.json
index bedcf8c..2449f61 100644
--- a/fml40-to-aas/harvester.json
+++ b/fml40-to-aas/harvester.json
@@ -22,7 +22,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4711/JobManagement"
+ "value": "s3i:4711/TechnicalData"
}
]
},
@@ -31,7 +31,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4711/DigitalNameplate_Crane"
+ "value": "s3i:4711/Location"
}
]
},
@@ -40,7 +40,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4711/PredictiveMaintenance"
+ "value": "s3i:4711/JobManagement"
}
]
},
@@ -49,7 +49,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4711/HierarchicalStructures"
+ "value": "s3i:4711/OperationalData"
}
]
},
@@ -58,7 +58,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4711/TechnicalData"
+ "value": "s3i:4711/ProductionData"
}
]
},
@@ -67,7 +67,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4711/OperationalData"
+ "value": "s3i:4711/capabilities"
}
]
},
@@ -76,7 +76,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4711/Location"
+ "value": "s3i:4711/DigitalNameplate_Crane"
}
]
},
@@ -85,7 +85,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4711/DigitalNameplate"
+ "value": "s3i:4711/PredictiveMaintenance"
}
]
},
@@ -94,7 +94,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4711/capabilities"
+ "value": "s3i:4711/DigitalNameplate"
}
]
},
@@ -103,7 +103,7 @@
"keys": [
{
"type": "Submodel",
- "value": "s3i:4711/ProductionData"
+ "value": "s3i:4711/HierarchicalStructures"
}
]
}
@@ -483,142 +483,157 @@
},
"value": [
{
- "idShort": "ComposedOfContainer",
+ "idShort": "Harvester",
+ "modelType": "Capability",
+ "semanticId": {
+ "type": "GlobalReference",
+ "keys": [
+ {
+ "type": "GlobalReference",
+ "value": "https://www.kwh40.de/forestml40/capabilities.owl#Harvester"
+ }
+ ]
+ }
+ },
+ {
+ "idShort": "CapabilityRelationships",
"modelType": "SubmodelElementCollection",
"semanticId": {
"type": "GlobalReference",
"keys": [
{
"type": "GlobalReference",
- "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#ComposedOfContainer"
+ "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#CapabilityRelationships"
}
]
},
"value": [
{
- "idShort": "ComposedOfProvidesProductionData",
- "modelType": "RelationshipElement",
+ "idShort": "ComposedOfContainer",
+ "modelType": "SubmodelElementCollection",
"semanticId": {
"type": "GlobalReference",
"keys": [
{
"type": "GlobalReference",
- "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#ComposedOfRelationship"
+ "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#ComposedOfContainer"
}
]
},
- "first": {
- "type": "ModelReference",
- "keys": [
- {
- "type": "Submodel",
- "value": "s3i:4711/capabilities"
- },
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilitySet"
- },
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilityHarvesterContainer"
- },
- {
- "type": "Capability",
- "value": "Harvester"
- }
- ]
- },
- "second": {
- "type": "ModelReference",
- "keys": [
- {
- "type": "Submodel",
- "value": "s3i:4711/capabilities"
- },
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilitySet"
- },
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilityProvidesProductionDataContainer"
- },
- {
- "type": "Capability",
- "value": "ProvidesProductionData"
- }
- ]
- }
- },
- {
- "idShort": "ComposedOfAcceptsFellingJobs",
- "modelType": "RelationshipElement",
- "semanticId": {
- "type": "GlobalReference",
- "keys": [
- {
+ "value": [
+ {
+ "idShort": "ComposedOfProvidesProductionData",
+ "modelType": "RelationshipElement",
+ "semanticId": {
"type": "GlobalReference",
- "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#ComposedOfRelationship"
- }
- ]
- },
- "first": {
- "type": "ModelReference",
- "keys": [
- {
- "type": "Submodel",
- "value": "s3i:4711/capabilities"
- },
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilitySet"
+ "keys": [
+ {
+ "type": "GlobalReference",
+ "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#ComposedOfRelationship"
+ }
+ ]
},
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilityHarvesterContainer"
+ "first": {
+ "type": "ModelReference",
+ "keys": [
+ {
+ "type": "Submodel",
+ "value": "s3i:4711/capabilities"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilitySet"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilityHarvesterContainer"
+ },
+ {
+ "type": "Capability",
+ "value": "Harvester"
+ }
+ ]
},
- {
- "type": "Capability",
- "value": "Harvester"
+ "second": {
+ "type": "ModelReference",
+ "keys": [
+ {
+ "type": "Submodel",
+ "value": "s3i:4711/capabilities"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilitySet"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilityProvidesProductionDataContainer"
+ },
+ {
+ "type": "Capability",
+ "value": "ProvidesProductionData"
+ }
+ ]
}
- ]
- },
- "second": {
- "type": "ModelReference",
- "keys": [
- {
- "type": "Submodel",
- "value": "s3i:4711/capabilities"
- },
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilitySet"
+ },
+ {
+ "idShort": "ComposedOfAcceptsFellingJobs",
+ "modelType": "RelationshipElement",
+ "semanticId": {
+ "type": "GlobalReference",
+ "keys": [
+ {
+ "type": "GlobalReference",
+ "value": "https://wiki.eclipse.org/BaSyx_/_Documentation_/_Submodels_/_Capability#ComposedOfRelationship"
+ }
+ ]
},
- {
- "type": "SubmodelElementCollection",
- "value": "CapabilityAcceptsFellingJobsContainer"
+ "first": {
+ "type": "ModelReference",
+ "keys": [
+ {
+ "type": "Submodel",
+ "value": "s3i:4711/capabilities"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilitySet"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilityHarvesterContainer"
+ },
+ {
+ "type": "Capability",
+ "value": "Harvester"
+ }
+ ]
},
- {
- "type": "Capability",
- "value": "AcceptsFellingJobs"
+ "second": {
+ "type": "ModelReference",
+ "keys": [
+ {
+ "type": "Submodel",
+ "value": "s3i:4711/capabilities"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilitySet"
+ },
+ {
+ "type": "SubmodelElementCollection",
+ "value": "CapabilityAcceptsFellingJobsContainer"
+ },
+ {
+ "type": "Capability",
+ "value": "AcceptsFellingJobs"
+ }
+ ]
}
- ]
- }
+ }
+ ]
}
]
- },
- {
- "idShort": "Harvester",
- "modelType": "Capability",
- "semanticId": {
- "type": "GlobalReference",
- "keys": [
- {
- "type": "GlobalReference",
- "value": "https://www.kwh40.de/forestml40/capabilities.owl#Harvester"
- }
- ]
- }
}
]
},
--
GitLab