From c00fbd36525c69ccb85e7466b89c1627aaf9f26b Mon Sep 17 00:00:00 2001
From: Bob Florian <bob@smartthings.com>
Date: Wed, 9 Sep 2015 07:59:23 -0400
Subject: [PATCH] Wattvision updates from production

---
 .../wattvision-manager.groovy                      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/smartapps/smartthings/wattvision-manager.src/wattvision-manager.groovy b/smartapps/smartthings/wattvision-manager.src/wattvision-manager.groovy
index 186685d..ad81049 100644
--- a/smartapps/smartthings/wattvision-manager.src/wattvision-manager.groovy
+++ b/smartapps/smartthings/wattvision-manager.src/wattvision-manager.groovy
@@ -346,18 +346,20 @@ private getSensorJSON(id, key) {
 
 	def sensorUrl = "${wattvisionBaseURL()}/partners/smartthings/sensor_list?api_id=${id}&api_key=${key}"
 
-	httpGet(uri: sensorUrl) { response ->
+    httpGet(uri: sensorUrl) { response ->
 
-		def json = new org.json.JSONObject(response.data)
+		def sensors = [:]
 
-		state.sensors = json
-
-		json.each { sensorId, sensorName ->
+        response.data.each { sensorId, sensorName ->
+        	sensors[sensorId] = sensorName
 			createChild(sensorId, sensorName)
-		}
+        }
+        
+        state.sensors = sensors
 
 		return "success"
 	}
+    
 }
 
 def createChild(sensorId, sensorName) {