Add @type and @context to json; Add multiple types to Thing.h

WebThingsIO · Jun 28, 2018 · 0843ad3 · 0843ad3
1 parent 2192069
commit 0843ad3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/ESP32WebThingAdapter.h b/ESP32WebThingAdapter.h
@@ -115,8 +115,16 @@ class WebThingAdapter {
 
   void serializeDevice(JsonObject& descr, ThingDevice* device) {
     descr["name"] = device->name;
-    descr["type"] = device->type;
     descr["href"] = "/things/" + device->id;
+    descr["@context"] = "https://iot.mozilla.org/schemas";
+
+    JsonArray& typeJson = descr.createNestedArray("@type");
+    const char** type = device->type;
+    while ((*type) != nullptr) {
+      typeJson.add(*type);
+      type++;
+    }
+
     JsonObject& props = descr.createNestedObject("properties");
 
     ThingProperty* property = device->firstProperty;
@@ -133,6 +141,7 @@ class WebThingAdapter {
         prop["type"] = "string";
         break;
       }
+      prop["@type"] = property->atType;
       prop["href"] = "/things/" + device->id + "/properties/" + property->id;
       property = property->next;
     }

diff --git a/ESP8266WebThingAdapter.h b/ESP8266WebThingAdapter.h
@@ -107,10 +107,17 @@ class WebThingAdapter {
 
   void serializeDevice(JsonObject& descr, ThingDevice* device) {
     descr["name"] = device->name;
-    descr["type"] = device->type;
     descr["href"] = "/things/" + device->id;
-    JsonObject& props = descr.createNestedObject("properties");
+    descr["@context"] = "https://iot.mozilla.org/schemas";
+
+    JsonArray& typeJson = descr.createNestedArray("@type");
+    const char** type = device->type;
+    while ((*type) != nullptr) {
+      typeJson.add(*type);
+      type++;
+    }
 
+    JsonObject& props = descr.createNestedObject("properties");
     ThingProperty* property = device->firstProperty;
     while (property != nullptr) {
       JsonObject& prop = props.createNestedObject(property->id);
@@ -125,6 +132,7 @@ class WebThingAdapter {
         prop["type"] = "string";
         break;
       }
+      prop["@type"] = property->atType;
       prop["href"] = "/things/" + device->id + "/properties/" + property->id;
       property = property->next;
     }

diff --git a/Thing.h b/Thing.h
@@ -29,12 +29,14 @@ class ThingProperty {
   String id;
   String description;
   ThingPropertyType type;
+  String atType;
   ThingProperty* next = nullptr;
 
-  ThingProperty(const char* id_, const char* description_, ThingPropertyType type_):
+  ThingProperty(const char* id_, const char* description_, ThingPropertyType type_, const char* atType_):
     id(id_),
     description(description_),
-    type(type_) {
+    type(type_),
+    atType(atType_) {
   }
 
   void setValue(ThingPropertyValue newValue) {
@@ -53,12 +55,12 @@ class ThingDevice {
 public:
   String id;
   String name;
-  String type;
+  const char** type;
   ThingDevice* next = nullptr;
   ThingProperty* firstProperty = nullptr;
   ThingProperty* lastProperty = nullptr;
 
-  ThingDevice(const char* _id, const char* _name, const char* _type):
+  ThingDevice(const char* _id, const char* _name, const char** _type):
     id(_id),
     name(_name),
     type(_type) {

diff --git a/WiFi101WebThingAdapter.h b/WiFi101WebThingAdapter.h
@@ -337,8 +337,16 @@ class WebThingAdapter {
 
   void serializeDevice(JsonObject& descr, ThingDevice* device) {
     descr["name"] = device->name;
-    descr["type"] = device->type;
     descr["href"] = "/things/" + device->id;
+    descr["@context"] = "https://iot.mozilla.org/schemas";
+
+    JsonArray& typeJson = descr.createNestedArray("@type");
+    const char** type = device->type;
+    while ((*type) != nullptr) {
+      typeJson.add(*type);
+      type++;
+    }
+
     JsonObject& props = descr.createNestedObject("properties");
 
     ThingProperty* property = device->firstProperty;
@@ -355,6 +363,7 @@ class WebThingAdapter {
         prop["type"] = "string";
         break;
       }
+      prop["@type"] = property->atType;
       prop["href"] = "/things/" + device->id + "/properties/" + property->id;
       property = property->next;
     }