Merge branch 'master' into megumi-szk-patch-28

smart-data-models · Jan 16, 2025 · d3ccec8 · d3ccec8
2 parents 2156c75 + df5728c
commit d3ccec8
Show file tree

Hide file tree

Showing 81 changed files with 133 additions and 133 deletions.
diff --git a/ZBE/CONTRIBUTORS.yaml → ZEB/CONTRIBUTORS.yaml b/ZBE/CONTRIBUTORS.yaml → ZEB/CONTRIBUTORS.yaml
diff --git a/ZBE/Column/ADOPTERS.yaml → ZEB/Column/ADOPTERS.yaml b/ZBE/Column/ADOPTERS.yaml → ZEB/Column/ADOPTERS.yaml
diff --git a/ZBE/Column/examples/example-normalized.json → ZEB/Column/examples/example-normalized.json b/ZBE/Column/examples/example-normalized.json → ZEB/Column/examples/example-normalized.json
diff --git a/...Column/examples/example-normalized.jsonld → ...Column/examples/example-normalized.jsonld b/...Column/examples/example-normalized.jsonld → ...Column/examples/example-normalized.jsonld
diff --git a/ZBE/Column/examples/example.json → ZEB/Column/examples/example.json b/ZBE/Column/examples/example.json → ZEB/Column/examples/example.json
diff --git a/ZBE/Column/examples/example.jsonld → ZEB/Column/examples/example.jsonld b/ZBE/Column/examples/example.jsonld → ZEB/Column/examples/example.jsonld
diff --git a/ZBE/Column/notes.yaml → ZEB/Column/notes.yaml b/ZBE/Column/notes.yaml → ZEB/Column/notes.yaml
diff --git a/ZBE/Column/schema.json → ZEB/Column/schema.json b/ZBE/Column/schema.json → ZEB/Column/schema.json
diff --git a/ZBE/Door/ADOPTERS.yaml → ZEB/Door/ADOPTERS.yaml b/ZBE/Door/ADOPTERS.yaml → ZEB/Door/ADOPTERS.yaml
diff --git a/ZBE/Door/examples/example-normalized.json → ZEB/Door/examples/example-normalized.json b/ZBE/Door/examples/example-normalized.json → ZEB/Door/examples/example-normalized.json
diff --git a/ZBE/Door/examples/example-normalized.jsonld → ZEB/Door/examples/example-normalized.jsonld b/ZBE/Door/examples/example-normalized.jsonld → ZEB/Door/examples/example-normalized.jsonld
diff --git a/ZBE/Door/examples/example.json → ZEB/Door/examples/example.json b/ZBE/Door/examples/example.json → ZEB/Door/examples/example.json
diff --git a/ZBE/Door/examples/example.jsonld → ZEB/Door/examples/example.jsonld b/ZBE/Door/examples/example.jsonld → ZEB/Door/examples/example.jsonld
diff --git a/ZBE/Door/notes.yaml → ZEB/Door/notes.yaml b/ZBE/Door/notes.yaml → ZEB/Door/notes.yaml
diff --git a/ZBE/Door/schema.json → ZEB/Door/schema.json b/ZBE/Door/schema.json → ZEB/Door/schema.json
diff --git a/ZBE/Glass/ADOPTERS.yaml → ZEB/Glass/ADOPTERS.yaml b/ZBE/Glass/ADOPTERS.yaml → ZEB/Glass/ADOPTERS.yaml
diff --git a/ZBE/Glass/examples/example-normalized.json → ZEB/Glass/examples/example-normalized.json b/ZBE/Glass/examples/example-normalized.json → ZEB/Glass/examples/example-normalized.json
diff --git a/ZBE/Glass/examples/example-normalized.jsonld → ZEB/Glass/examples/example-normalized.jsonld b/ZBE/Glass/examples/example-normalized.jsonld → ZEB/Glass/examples/example-normalized.jsonld
diff --git a/ZBE/Glass/examples/example.json → ZEB/Glass/examples/example.json b/ZBE/Glass/examples/example.json → ZEB/Glass/examples/example.json
diff --git a/ZBE/Glass/examples/example.jsonld → ZEB/Glass/examples/example.jsonld b/ZBE/Glass/examples/example.jsonld → ZEB/Glass/examples/example.jsonld
diff --git a/ZBE/Glass/notes.yaml → ZEB/Glass/notes.yaml b/ZBE/Glass/notes.yaml → ZEB/Glass/notes.yaml
diff --git a/ZBE/Glass/schema.json → ZEB/Glass/schema.json b/ZBE/Glass/schema.json → ZEB/Glass/schema.json
diff --git a/ZBE/Material/ADOPTERS.yaml → ZEB/Material/ADOPTERS.yaml b/ZBE/Material/ADOPTERS.yaml → ZEB/Material/ADOPTERS.yaml
diff --git a/...Material/examples/example-normalized.json → ...Material/examples/example-normalized.json b/...Material/examples/example-normalized.json → ...Material/examples/example-normalized.json
diff --git a/...terial/examples/example-normalized.jsonld → ...terial/examples/example-normalized.jsonld b/...terial/examples/example-normalized.jsonld → ...terial/examples/example-normalized.jsonld
diff --git a/ZBE/Material/examples/example.json → ZEB/Material/examples/example.json b/ZBE/Material/examples/example.json → ZEB/Material/examples/example.json
diff --git a/ZBE/Material/examples/example.jsonld → ZEB/Material/examples/example.jsonld b/ZBE/Material/examples/example.jsonld → ZEB/Material/examples/example.jsonld
diff --git a/ZBE/Material/notes.yaml → ZEB/Material/notes.yaml b/ZBE/Material/notes.yaml → ZEB/Material/notes.yaml
diff --git a/ZBE/Material/schema.json → ZEB/Material/schema.json b/ZBE/Material/schema.json → ZEB/Material/schema.json
diff --git a/ZBE/MaterialLayer/ADOPTERS.yaml → ZEB/MaterialLayer/ADOPTERS.yaml b/ZBE/MaterialLayer/ADOPTERS.yaml → ZEB/MaterialLayer/ADOPTERS.yaml
diff --git a/...ialLayer/examples/example-normalized.json → ...ialLayer/examples/example-normalized.json b/...ialLayer/examples/example-normalized.json → ...ialLayer/examples/example-normalized.json
diff --git a/...lLayer/examples/example-normalized.jsonld → ...lLayer/examples/example-normalized.jsonld b/...lLayer/examples/example-normalized.jsonld → ...lLayer/examples/example-normalized.jsonld
diff --git a/ZBE/MaterialLayer/examples/example.json → ZEB/MaterialLayer/examples/example.json b/ZBE/MaterialLayer/examples/example.json → ZEB/MaterialLayer/examples/example.json
diff --git a/ZBE/MaterialLayer/examples/example.jsonld → ZEB/MaterialLayer/examples/example.jsonld b/ZBE/MaterialLayer/examples/example.jsonld → ZEB/MaterialLayer/examples/example.jsonld
diff --git a/ZBE/MaterialLayer/notes.yaml → ZEB/MaterialLayer/notes.yaml b/ZBE/MaterialLayer/notes.yaml → ZEB/MaterialLayer/notes.yaml
diff --git a/ZBE/MaterialLayer/schema.json → ZEB/MaterialLayer/schema.json b/ZBE/MaterialLayer/schema.json → ZEB/MaterialLayer/schema.json
diff --git a/ZBE/Opening/ADOPTERS.yaml → ZEB/Opening/ADOPTERS.yaml b/ZBE/Opening/ADOPTERS.yaml → ZEB/Opening/ADOPTERS.yaml
diff --git a/ZBE/Opening/examples/example-normalized.json → ZEB/Opening/examples/example-normalized.json b/ZBE/Opening/examples/example-normalized.json → ZEB/Opening/examples/example-normalized.json
diff --git a/...pening/examples/example-normalized.jsonld → ...pening/examples/example-normalized.jsonld b/...pening/examples/example-normalized.jsonld → ...pening/examples/example-normalized.jsonld
diff --git a/ZBE/Opening/examples/example.json → ZEB/Opening/examples/example.json b/ZBE/Opening/examples/example.json → ZEB/Opening/examples/example.json
diff --git a/ZBE/Opening/examples/example.jsonld → ZEB/Opening/examples/example.jsonld b/ZBE/Opening/examples/example.jsonld → ZEB/Opening/examples/example.jsonld
diff --git a/ZBE/Opening/notes.yaml → ZEB/Opening/notes.yaml b/ZBE/Opening/notes.yaml → ZEB/Opening/notes.yaml
diff --git a/ZBE/Opening/schema.json → ZEB/Opening/schema.json b/ZBE/Opening/schema.json → ZEB/Opening/schema.json
diff --git a/ZBE/README.md → ZEB/README.md b/ZBE/README.md → ZEB/README.md
diff --git a/ZBE/Slab/ADOPTERS.yaml → ZEB/Slab/ADOPTERS.yaml b/ZBE/Slab/ADOPTERS.yaml → ZEB/Slab/ADOPTERS.yaml
diff --git a/ZBE/Slab/examples/example-normalized.json → ZEB/Slab/examples/example-normalized.json b/ZBE/Slab/examples/example-normalized.json → ZEB/Slab/examples/example-normalized.json
diff --git a/ZBE/Slab/examples/example-normalized.jsonld → ZEB/Slab/examples/example-normalized.jsonld b/ZBE/Slab/examples/example-normalized.jsonld → ZEB/Slab/examples/example-normalized.jsonld
diff --git a/ZBE/Slab/examples/example.json → ZEB/Slab/examples/example.json b/ZBE/Slab/examples/example.json → ZEB/Slab/examples/example.json
diff --git a/ZBE/Slab/examples/example.jsonld → ZEB/Slab/examples/example.jsonld b/ZBE/Slab/examples/example.jsonld → ZEB/Slab/examples/example.jsonld
diff --git a/ZBE/Slab/notes.yaml → ZEB/Slab/notes.yaml b/ZBE/Slab/notes.yaml → ZEB/Slab/notes.yaml
diff --git a/ZBE/Slab/schema.json → ZEB/Slab/schema.json b/ZBE/Slab/schema.json → ZEB/Slab/schema.json
diff --git a/ZBE/Stair/ADOPTERS.yaml → ZEB/Stair/ADOPTERS.yaml b/ZBE/Stair/ADOPTERS.yaml → ZEB/Stair/ADOPTERS.yaml
diff --git a/ZBE/Stair/examples/example-normalized.json → ZEB/Stair/examples/example-normalized.json b/ZBE/Stair/examples/example-normalized.json → ZEB/Stair/examples/example-normalized.json
diff --git a/ZBE/Stair/examples/example-normalized.jsonld → ZEB/Stair/examples/example-normalized.jsonld b/ZBE/Stair/examples/example-normalized.jsonld → ZEB/Stair/examples/example-normalized.jsonld
diff --git a/ZBE/Stair/examples/example.json → ZEB/Stair/examples/example.json b/ZBE/Stair/examples/example.json → ZEB/Stair/examples/example.json
diff --git a/ZBE/Stair/examples/example.jsonld → ZEB/Stair/examples/example.jsonld b/ZBE/Stair/examples/example.jsonld → ZEB/Stair/examples/example.jsonld
diff --git a/ZBE/Stair/notes.yaml → ZEB/Stair/notes.yaml b/ZBE/Stair/notes.yaml → ZEB/Stair/notes.yaml
diff --git a/ZBE/Stair/schema.json → ZEB/Stair/schema.json b/ZBE/Stair/schema.json → ZEB/Stair/schema.json
diff --git a/ZBE/Wall/ADOPTERS.yaml → ZEB/Wall/ADOPTERS.yaml b/ZBE/Wall/ADOPTERS.yaml → ZEB/Wall/ADOPTERS.yaml
diff --git a/ZBE/Wall/examples/example-normalized.json → ZEB/Wall/examples/example-normalized.json b/ZBE/Wall/examples/example-normalized.json → ZEB/Wall/examples/example-normalized.json
diff --git a/ZBE/Wall/examples/example-normalized.jsonld → ZEB/Wall/examples/example-normalized.jsonld b/ZBE/Wall/examples/example-normalized.jsonld → ZEB/Wall/examples/example-normalized.jsonld
diff --git a/ZBE/Wall/examples/example.json → ZEB/Wall/examples/example.json b/ZBE/Wall/examples/example.json → ZEB/Wall/examples/example.json
diff --git a/ZBE/Wall/examples/example.jsonld → ZEB/Wall/examples/example.jsonld b/ZBE/Wall/examples/example.jsonld → ZEB/Wall/examples/example.jsonld
diff --git a/ZBE/Wall/notes.yaml → ZEB/Wall/notes.yaml b/ZBE/Wall/notes.yaml → ZEB/Wall/notes.yaml
diff --git a/ZBE/Wall/schema.json → ZEB/Wall/schema.json b/ZBE/Wall/schema.json → ZEB/Wall/schema.json
diff --git a/ZBE/Window/ADOPTERS.yaml → ZEB/Window/ADOPTERS.yaml b/ZBE/Window/ADOPTERS.yaml → ZEB/Window/ADOPTERS.yaml
diff --git a/ZBE/Window/examples/example-normalized.json → ZEB/Window/examples/example-normalized.json b/ZBE/Window/examples/example-normalized.json → ZEB/Window/examples/example-normalized.json
diff --git a/...Window/examples/example-normalized.jsonld → ...Window/examples/example-normalized.jsonld b/...Window/examples/example-normalized.jsonld → ...Window/examples/example-normalized.jsonld
diff --git a/ZBE/Window/examples/example.json → ZEB/Window/examples/example.json b/ZBE/Window/examples/example.json → ZEB/Window/examples/example.json
diff --git a/ZBE/Window/examples/example.jsonld → ZEB/Window/examples/example.jsonld b/ZBE/Window/examples/example.jsonld → ZEB/Window/examples/example.jsonld
diff --git a/ZBE/Window/notes.yaml → ZEB/Window/notes.yaml b/ZBE/Window/notes.yaml → ZEB/Window/notes.yaml
diff --git a/ZBE/Window/schema.json → ZEB/Window/schema.json b/ZBE/Window/schema.json → ZEB/Window/schema.json
diff --git a/ZBE/notes.yaml → ZEB/notes.yaml b/ZBE/notes.yaml → ZEB/notes.yaml
diff --git a/dataModel.AAS/TimeSeries/ADOPTERS.yaml b/dataModel.AAS/TimeSeries/ADOPTERS.yaml
@@ -1,10 +1,10 @@
 description: This is a compilation list of the current adopters of the data model MachineTool of the Subject dataModel.OPCUA.  All fields are non mandatory. More info at https://smart-data-models.github.io/data-models/templates/dataModel/CURRENT_ADOPTERS.yaml
 currentAdopters:
 -
- adopter: 
- description: 
- mail: 
- organization: 
- project: 
+ adopter: ARISE TEFs
+ description: Testing and Experimentation Facilities for ARISE EU Project
+ mail: [email protected]
+ organization: Engineering Ingegneria Informatica S.p.A.
+ project: ARISE(https://arise-middleware.eu/)
  comments: 
- startDate: 
+ startDate: December 2024
diff --git a/dataModel.AAS/TimeSeries/examples/example-normalized.json b/dataModel.AAS/TimeSeries/examples/example-normalized.json
@@ -1,6 +1,6 @@
 {
     "id": "TimeSeriesData",
-    "type": "TimeSeriesData",
+    "type": "TimeSeries",
     "timeSeries": {
         "type": "StructuredValue",
         "value": {

diff --git a/dataModel.AAS/TimeSeries/examples/example-normalized.jsonld b/dataModel.AAS/TimeSeries/examples/example-normalized.jsonld
@@ -1,6 +1,6 @@
 {
     "id": "urn:ngsi-ld:TimeSeriesData:TimeSeriesData",
-    "type": "TimeSeriesData",
+    "type": "TimeSeries",
     "timeSeries": {
         "type": "Property",
         "value": {

diff --git a/dataModel.AAS/TimeSeries/examples/example.json b/dataModel.AAS/TimeSeries/examples/example.json
@@ -1,6 +1,6 @@
 {
     "id": "TimeSeriesData",
-    "type": "TimeSeriesData",
+    "type": "TimeSeries",
     "timeSeries": {
         "segments": [
             {

diff --git a/dataModel.AAS/TimeSeries/examples/example.jsonld b/dataModel.AAS/TimeSeries/examples/example.jsonld
@@ -1,6 +1,6 @@
 {
     "id": "urn:ngsi-ld:TimeSeriesData:TimeSeriesData",
-    "type": "TimeSeriesData",
+    "type": "TimeSeries",
     "timeSeries": {
         "segments": 
         [

diff --git a/dataModel.AAS/TimeSeries/schema.json b/dataModel.AAS/TimeSeries/schema.json
@@ -25,108 +25,108 @@
         },
         "timeSeries": {
           "type": "object",
-          "description": "Property. ",
+          "description": "Property. Main object for TimeSeries model",
           "properties": {
             "segments": {
               "type": "array",
-              "description": "Property. ",
+              "description": "Property. List of time series segments",
               "items": {
                 "type": "object",
                 "properties": {
                   "name": {
                     "type": "string",
-                    "description": "Property. "
+                    "description": "Property. Name of the time series segment"
                   },
                   "description": {
                     "type": "string",
-                    "description": "Property. "
+                    "description": "Property. Description of the time series segment"
                   },
                   "recordCount": {
                     "type": "integer",
-                    "description": "Property. "
+                    "description": "Property. Indicates how many records are present in a segment"
                   },
                   "startTime": {
                     "type": "string",
-                    "description": "Property. "
+                    "description": "Property. Contains the first recorded timestamp of the time series segment"
                   },
                   "endTime": {
                     "type": "string",
-                    "description": "Property. "
+                    "description": "Property. Contains the last recorded timestamp of the time series segment"
                   },
                   "duration": {
                     "type": "string",
-                    "description": "Property. "
+                    "description": "Property. Period covered by the segment, represented according to ISO 8601"
                   },
                   "samplingInterval": {
                     "type": "integer",
-                    "description": "Property. "
+                    "description": "Property. The time period between two time series records"
                   },
                   "samplingRate": {
                     "type": "integer",
-                    "description": "Property. "
+                    "description": "Property. Defines the number of samples per second for a regular time series in Hz"
                   },
                   "state": {
                     "type": "integer",
-                    "description": "Property. "
+                    "description": "Property. State of the time series related to its progress"
                   },
                   "lastUpdate": {
                     "type": "string",
-                    "description": "Property. "
+                    "description": "Property. Time of the last chance"
                   },
                   "externalSegment": {
                     "type": "object",
-                    "description": "Property. ",
+                    "description": "Property. Reference to a file of data points in sequential order over a period of time",
                     "properties": {
                       "data": {
                         "type": "string",
-                        "description": "Property. "
+                        "description": "Property.  Sequence of data points in sequential order over a period of time "
                       }
                     }
                   },
                   "linkedSegment": {
                     "type": "object",
-                    "description": "Property. ",
+                    "description": "Property. Reference to an endpoint of data points in sequential order over a period of time",
                     "properties": {
                       "endpoint": {
                         "type": "string",
-                        "description": "Property. "
+                        "description": "Property. Specifies a location of a resource on an API server through which time series can be requested "
                       },
                       "query": {
                         "type": "string",
-                        "description": "Property. "
+                        "description": "Property. Generic query component to read time series data from an API"
                       }
                     }
                   },
                   "internalSegment": {
                     "type": "object",
-                    "description": "Property. ",
+                    "description": "Property. Grouped sequence of data points in successive order over a specified period of time",
                     "properties": {
                       "records": {
                         "type": "array",
-                        "description": "Property. ",
+                        "description": "Property. List of data points in successive order over a specified period of time",
                         "items": {
                           "type": "object",
-                          "description": "Property. ",
+                          "description": "Property. Items of the record",
                           "properties": {
                             "record00": {
                               "type": "object",
-                              "description": "Property. ",
+                              "description": "Property. A time series record is unique by its ID within the time series and contains the timestamps and variable values referenced to the ID",
                               "properties": {
                                 "time": {
                                   "type": "string",
-                                  "description": "Property. "
+                                  "description": "Property. Time of time series record"
                                 },
                                 "sampleAccelerationX": {
                                   "type": "number",
-                                  "description": "Property. "
+                                  "description": "Property. Acceleration along the x-axis "
                                 },
                                 "sampleAccelerationY": {
                                   "type": "number",
-                                  "description": "Property. "
+                                  "description": "Property. Acceleration along the y-axis"
                                 },
                                 "sampleAccelerationZ": {
                                   "type": "number",
-                                  "description": "Property. "
+                                  "description": "Property. Acceleration along the z-axis"
                                 }
                               }
                             }
@@ -140,35 +140,35 @@
             },
             "metadata": {
               "type": "object",
-              "description": "Property. ",
+              "description": "Property.  A set of data describing and providing information about the time series",
               "properties": {
                 "name": {
                   "type": "string",
-                  "description": "Property. "
+                  "description": "Property. Meaningful name for labeling"
                 },
                 "description": {
                   "type": "string",
-                  "description": "Property. "
+                  "description": "Property. Short description of the time series"
                 },
                 "record": {
                   "type": "object",
-                  "description": "Property. ",
+                  "description": "Property. A time series record is unique by its ID within the time series and contains the timestamps and variable values referenced to the ID",
                   "properties": {
                     "time": {
                       "type": "string",
-                      "description": "Property. "
+                      "description": "Property. Time of time series record"
                     },
                     "sampleAccelerationX": {
                       "type": "number",
-                      "description": "Property. "
+                      "description": "Property. Acceleration along the x-axis"
                     },
                     "sampleAccelerationY": {
                       "type": "number",
-                      "description": "Property. "
+                      "description": "Property. Acceleration along the y-axis"
                     },
                     "sampleAccelerationZ": {
                       "type": "number",
-                      "description": "Property. "
+                      "description": "Property. Acceleration along the z-axis"
                     }
                   }
                 }

diff --git a/dataModel.OPCUA/MachineTool/ADOPTERS.yaml b/dataModel.OPCUA/MachineTool/ADOPTERS.yaml
@@ -1,10 +1,10 @@
 description: This is a compilation list of the current adopters of the data model MachineTool of the Subject dataModel.OPCUA.  All fields are non mandatory. More info at https://smart-data-models.github.io/data-models/templates/dataModel/CURRENT_ADOPTERS.yaml
 currentAdopters:
 -
- adopter: 
- description: 
- mail: 
- organization: 
- project: 
+ adopter: ARISE TEFs
+ description: Testing and Experimentation Facilities for ARISE EU Project
+ mail: [email protected]
+ organization: Engineering Ingegneria Informatica S.p.A.
+ project: ARISE(https://arise-middleware.eu/)
  comments: 
- startDate: 
+ startDate: December 2024