beta version of DTDL digital twin

smart-data-models · Dec 20, 2023 · 4327c6e · 4327c6e
1 parent dc14e86
commit 4327c6e
Showing 1 changed file with 25 additions and 42 deletions.
diff --git a/UnmannedAerialVehicle/schemaDTDL.json b/UnmannedAerialVehicle/schemaDTDL.json
@@ -6,11 +6,6 @@
     "description": "This entity contains a harmonised description of a specific Unmanned Aerial Vehicle (UAV). This entity is primarily associated with UAV command and control and related UAV transport applications.",
     "displayName": "UnmannedAerialVehicle",
     "contents": [
-        {
-            "name": "UnmannedAerialVehicleModel",
-            "writable": true,
-            "displayName": "UnmannedAerialVehicleModel"
-        },
         {
             "name": "alternateName",
             "writable": true,
@@ -33,23 +28,23 @@
             "displayName": "dataProvider",
             "@type": "Property",
             "schema": "string",
-            "comment": "A sequence of characters identifying the provider of the harmonised data entity."
+            "comment": "A sequence of characters identifying the provider of the harmonised data entity"
         },
         {
             "name": "dateCreated",
             "writable": true,
             "displayName": "dateCreated",
             "@type": "Property",
             "schema": "dateTime",
-            "comment": "Entity creation timestamp. This will usually be allocated by the storage platform."
+            "comment": "Entity creation timestamp. This will usually be allocated by the storage platform"
         },
         {
             "name": "dateModified",
             "writable": true,
             "displayName": "dateModified",
             "@type": "Property",
             "schema": "dateTime",
-            "comment": "Timestamp of the last modification of the entity. This will usually be allocated by the storage platform."
+            "comment": "Timestamp of the last modification of the entity. This will usually be allocated by the storage platform"
         },
         {
             "name": "description",
@@ -65,7 +60,7 @@
             "displayName": "elevation",
             "@type": "Property",
             "schema": "long",
-            "comment": "The elevation of the UAV (relative to ground level at the specified location). Specify value and units of measure."
+            "comment": "The elevation of the UAV (relative to ground level at the specified location). Specify value and units of measure"
         },
         {
             "name": "fuel",
@@ -83,21 +78,26 @@
             "schema": "long",
             "comment": "The latest reported ground speed of the UAV. Specify value and units of measure"
         },
+        {
+            "name": "location",
+            "writable": true,
+            "displayName": "location"
+        },
         {
             "name": "name",
             "writable": true,
             "displayName": "name",
             "@type": "Property",
             "schema": "string",
-            "comment": "The name of this item."
+            "comment": "The name of this item"
         },
         {
             "name": "observedAt",
             "writable": true,
             "displayName": "observedAt",
             "@type": "Property",
             "schema": "dateTime",
-            "comment": "Indicates the date/time of the latest monitoring report or update."
+            "comment": "Indicates the date/time of the latest monitoring report or update"
         },
         {
             "name": "seeAlso",
@@ -110,7 +110,12 @@
             "displayName": "source",
             "@type": "Property",
             "schema": "string",
-            "comment": "A sequence of characters giving the original source of the entity data as a URL. Recommended to be the fully qualified domain name of the source provider, or the URL to the source object."
+            "comment": "A sequence of characters giving the original source of the entity data as a URL. Recommended to be the fully qualified domain name of the source provider, or the URL to the source object"
+        },
+        {
+            "name": "uavModel",
+            "writable": true,
+            "displayName": "uavModel"
         },
         {
             "@type": "Telemetry",
@@ -150,6 +155,10 @@
                     "name": "addressRegion",
                     "schema": "string"
                 },
+                {
+                    "name": "district",
+                    "schema": "string"
+                },
                 {
                     "name": "postOfficeBoxNumber",
                     "schema": "string"
@@ -161,39 +170,13 @@
                 {
                     "name": "streetAddress",
                     "schema": "string"
+                },
+                {
+                    "name": "streetNr",
+                    "schema": "string"
                 }
             ]
         },
-        {
-            "@type": "Telemetry",
-            "name": "location_Point",
-            "schema": "point"
-        },
-        {
-            "@type": "Telemetry",
-            "name": "location_LineString",
-            "schema": "lineString"
-        },
-        {
-            "@type": "Telemetry",
-            "name": "location_Polygon",
-            "schema": "polygon"
-        },
-        {
-            "@type": "Telemetry",
-            "name": "location_MultiPoint",
-            "schema": "multiPoint"
-        },
-        {
-            "@type": "Telemetry",
-            "name": "location_MultiLineString",
-            "schema": "multiLineString"
-        },
-        {
-            "@type": "Telemetry",
-            "name": "location_MultiPolygon",
-            "schema": "multiPolygon"
-        },
         {
             "@type": "Telemetry",
             "name": "flightStatus",