From c5ce7df958b34a69397e88cc18d7251e331b6b68 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 23 Sep 2016 16:20:15 +0200
Subject: [PATCH] Added map sensor data text

---
 resource/web/map.tmpl                          | 17 ++++++++++-------
 .../plugin/tellstick/device/Oregon0x1A2D.java  | 18 ++++++++++++------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/resource/web/map.tmpl b/resource/web/map.tmpl
index 7ddafa35..a0094a59 100755
--- a/resource/web/map.tmpl
+++ b/resource/web/map.tmpl
@@ -147,10 +147,12 @@
             // Sensors
             $.each(json.sensors, function(i, sensor) {
                 var group = svg.group();
-                group.image("/img/temperature.svg")
-                    .addClass("draggable").addClass("sensor")
+                group.image("/img/temperature.svg");
+                group.text(sensor.data).move(45,15).fill('#999');
+
+                group.addClass("draggable").addClass("sensor")
                     .x(sensor.x).y(sensor.y)
-                    .attr("device-id", sensor.id)
+                    .attr("device-id", sensor.id);
                 group.title(sensor.name);
             });
             // Events
@@ -158,11 +160,12 @@
                 var group = svg.group();
                 var img = "/img/lightbulb_off.svg";
                 if (event.data == "ON")
-                    var img = "/img/lightbulb_on.svg";
-                group.image(img)
-                    .addClass("draggable").addClass("event")
+                    img = "/img/lightbulb_on.svg";
+                group.image(img);
+
+                group.addClass("draggable").addClass("event")
                     .x(event.x).y(event.y)
-                    .attr("device-id", event.id)
+                    .attr("device-id", event.id);
                 group.title(event.name);
             });
         });
diff --git a/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java b/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java
index c84b880f..f961e0f9 100755
--- a/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java
+++ b/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java
@@ -79,13 +79,19 @@ public class Oregon0x1A2D implements HalSensorConfig,TellstickDevice {
 
     @Override
     public Class<? extends HalSensorData> getSensorDataClass() {
-        switch (sensorType){
-            case HUMIDITY:      return HumiditySensorData.class;
-            case LIGHT:         return LightSensorData.class;
-            case POWER:         return PowerConsumptionSensorData.class;
-            case TEMPERATURE:   return TemperatureSensorData.class;
+        if (sensorType != null) {
+            switch (sensorType) {
+                case HUMIDITY:
+                    return HumiditySensorData.class;
+                case LIGHT:
+                    return LightSensorData.class;
+                case POWER:
+                    return PowerConsumptionSensorData.class;
+                case TEMPERATURE:
+                    return TemperatureSensorData.class;
+            }
         }
-        return null;
+        return TemperatureSensorData.class;
     }
 
     @Override