From aeb5c7d0c03e35b7be168945cf4c8c37bbbb6e7c Mon Sep 17 00:00:00 2001
From: Brian Jones <brian.j.jones@intel.com>
Date: Thu, 16 Oct 2014 11:23:05 -0700
Subject: [PATCH] Removing zones for now, plus a AMB subscribe fix

Change-Id: I920365fef7f67c4f0513176c2bcf32c64c55d563
---
 js/services/carIndicator.js      | 42 ++++++++++++++++++++--------------------
 packaging/Modello-Common.spec    |  2 +-
 packaging/modello-common.changes |  3 +++
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/js/services/carIndicator.js b/js/services/carIndicator.js
index a8fabfe..2b3a84d 100644
--- a/js/services/carIndicator.js
+++ b/js/services/carIndicator.js
@@ -169,29 +169,29 @@ CarIndicator.prototype._mappingTable = {
 		attributeName : "leftFront",
 		callBackPropertyName : "tirePressureLeftFront",
 		interfaceName : "tire",
-		conversionFunction : parseTirePressure,
-		zone : new Zone(["Front","Left"])
+		conversionFunction : parseTirePressure
+		//zone : new Zone(["Front","Left"])
 	},
 	"TirePressureRightFront" : {
 		attributeName : "rightFront",
 		callBackPropertyName : "tirePressureRightFront",
 		interfaceName : "tire",
-		conversionFunction : parseTirePressure,
-		zone : new Zone(["Front","Right"])
+		conversionFunction : parseTirePressure
+		//zone : new Zone(["Front","Right"])
 	},
 	"TirePressureLeftRear" : {
 		attributeName : "leftRear",
 		callBackPropertyName : "tirePressureLeftRear",
 		interfaceName : "tire",
-		conversionFunction : parseTirePressure,
-		zone : new Zone(["Rear","Left"])
+		conversionFunction : parseTirePressure
+		//zone : new Zone(["Rear","Left"])
 	},
 	"TirePressureRightRear" : {
 		attributeName : "rightRear",
 		callBackPropertyName : "tirePressureRightRear",
 		interfaceName : "tire",
-		conversionFunction : parseTirePressure,
-		zone : new Zone(["Rear","Right"])
+		conversionFunction : parseTirePressure
+		//zone : new Zone(["Rear","Right"])
 	},
 	"ChildLock" : {
 		attributeName : "childLock",
@@ -201,14 +201,14 @@ CarIndicator.prototype._mappingTable = {
 	"FrontDefrost" : {
 		attributeName : "defrostWindow",
 		callBackPropertyName : "frontDefrost",
-		interfaceName : "defrost",
-		zone : new Zone(["Front"])
+		interfaceName : "defrost"
+		//zone : new Zone(["Front"])
 	},
 	"RearDefrost" : {
 		attributeName : "defrostWindow",
 		callBackPropertyName : "rearDefrost",
-		interfaceName : "defrost",
-		zone : new Zone(["Rear"])
+		interfaceName : "defrost"
+		//zone : new Zone(["Rear"])
 	},
 	"FanSpeed" : {
 		attributeName : "fanSpeed",
@@ -220,15 +220,15 @@ CarIndicator.prototype._mappingTable = {
 		attributeName : "targetTemperature",
 		callBackPropertyName : "targetTemperatureRight",
 		interfaceName : "climateControl",
-		conversionFunction : parseInteger,
-		zone : new Zone(["Right"])
+		conversionFunction : parseInteger
+		//zone : new Zone(["Right"])
 	},
 	"TargetTemperatureLeft" : {
 		attributeName : "targetTemperature",
 		callBackPropertyName : "targetTemperatureLeft",
 		interfaceName : "climateControl",
-		conversionFunction : parseInteger,
-		zone : new Zone(["Left"])
+		conversionFunction : parseInteger
+		//zone : new Zone(["Left"])
 	},
 	"Hazard" : {
 		attributeName : "hazard",
@@ -243,14 +243,14 @@ CarIndicator.prototype._mappingTable = {
 	"SeatHeaterRight" : {
 		attributeName : "seatHeater",
 		callBackPropertyName : "seatHeaterRight",
-		interfaceName : "climateControl",
-		zone : new Zone(["Right"])
+		interfaceName : "climateControl"
+		//zone : new Zone(["Right"])
 	},
 	"SeatHeaterLeft" : {
 		attributeName : "seatHeater",
 		callBackPropertyName : "seatHeaterLeft",
-		interfaceName : "climateControl",
-		zone : new Zone(["Left"])
+		interfaceName : "climateControl"
+		//zone : new Zone(["Left"])
 	},
 	"Parking" : {
 		attributeName : "parking",
@@ -473,7 +473,7 @@ CarIndicator.prototype.addListener = function(aCallbackObject) {
 					var interfaceName = signal;
 
 					if (mapping.interfaceName !== "undefined") {
-						interfaceName = mapping.subscribeName;
+						interfaceName = mapping.interfaceName;
 					}
 
 					if (mapping.callBackPropertyName.toLowerCase() === prop.toLowerCase() && !mapping.subscribeCount) {
diff --git a/packaging/Modello-Common.spec b/packaging/Modello-Common.spec
index 12a5685..44f3730 100644
--- a/packaging/Modello-Common.spec
+++ b/packaging/Modello-Common.spec
@@ -1,6 +1,6 @@
 Name:       Modello-Common
 Summary:    Pure html5 UI
-Version:    0.0.2
+Version:    0.0.3
 Release:    0
 Group:      Automotive/Modello
 License:    Apache-2.0
diff --git a/packaging/modello-common.changes b/packaging/modello-common.changes
index 452ddf1..4fa8f2b 100644
--- a/packaging/modello-common.changes
+++ b/packaging/modello-common.changes
@@ -1,3 +1,6 @@
+* Thu Oct 16 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20141016.164956-1-g9a44462
+- Removing zones for now, plus a AMB subscribe fix
+
 * Wed Oct 15 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20141015.162448-1-gfba0135
 - Remove totally TC-1388 Work around.
 - Updating AMB calls
-- 
2.7.4