Fixed onInteriorVehicleDataNotification

Author: BSolonenko

app/model/media/RadioModel.js

@@ -758,13 +758,48 @@ SDL.RadioModel = Em.Object.create({
     if (data.radioEnable != null) {
       this.setRadioEnable(data.radioEnable);
       properties.push('radioEnable');
+      if(data.radioEnable){
+        properties.push('hdRadioEnable');
+        properties.push('frequencyInteger');
+        properties.push('band');
+        switch(this.radioControlStruct.band){
+          case 'AM':
+            properties.push('availableHDs');
+            properties.push('hdChannel');
+            if(this.radioControlStruct.hdRadioEnable){
+              properties.push('sisData.*');
+              properties.push('stationIDNumber.*');
+              properties.push('stationLocation.*');              
+            }
+            break;
+          case 'FM':
+            properties.push('availableHDs');
+            properties.push('hdChannel');
+            properties.push('frequencyFraction');
+            properties.push('rdsData.*');
+            if(this.radioControlStruct.hdRadioEnable){
+              properties.push('sisData.*');
+              properties.push('stationIDNumber.*');
+              properties.push('stationLocation.*');              
+            }
+            break;
+          default:
+            properties.push('signalStrength');
+            properties.push('signalChangeThreshold');
+            properties.push('state');
+        }
+      }
     }
 
     if (this.radioControlStruct.radioEnable) {
       if(data.hdRadioEnable != null){
         this.setHDRadioEnable(data.hdRadioEnable);
         this.set('radioControlCheckboxes.availableHDs',data.hdRadioEnable);
         this.set('radioControlCheckboxes.hdChannel',data.hdRadioEnable);
+        if(data.hdRadioEnable && properties.indexOf('availableHDs') == -1){
+          properties.push('availableHDs');
+          properties.push('hdChannel');
+        }
       }
       if (data.frequencyInteger != null) {
         this.setFrequencyInteger(data.frequencyInteger);
@@ -821,9 +856,10 @@ SDL.RadioModel = Em.Object.create({
         this.setRadioState(data.state);
       }
 
-      properties = [];
       for (var key in data) {
-        properties.push(key);
+        if(properties.indexOf(key) == -1){
+          properties.push(key);
+        }
       }
 
       if (properties.indexOf('band') >= 0) {
@@ -841,6 +877,7 @@ SDL.RadioModel = Em.Object.create({
     }
 
     var result = this.getRadioControlData(true);
+    this.sendRadioChangeNotification(properties);
     return SDL.SDLController.filterObjectProperty(result, properties);
   },
 
@@ -1214,7 +1251,7 @@ SDL.RadioModel = Em.Object.create({
       this.set('station', this.temp);
     }
 
-    if (this.optionsEnabled) {
+    if (this.optionsEnabled) { 
       this.toggleOptions();
     }
 
@@ -1229,7 +1266,10 @@ SDL.RadioModel = Em.Object.create({
                                         'band',
                                         'availableHDs',
                                         'hdChannel',
-                                        'rdsData.*'
+                                        'rdsData.*', 
+                                        this.radioControlStruct.hdRadioEnable ? 'sisData.*': '',
+                                        this.radioControlStruct.hdRadioEnable ? 'stationIDNumber.*': '',
+                                        this.radioControlStruct.hdRadioEnable ? 'stationLocation.*': ''
                                         ]);
 
     } else if (data.band == 'AM') {
@@ -1238,15 +1278,20 @@ SDL.RadioModel = Em.Object.create({
                                         'frequencyInteger',
                                         'band',
                                         'availableHDs',
-                                        'hdChannel']);
+                                        'hdChannel',
+                                        this.radioControlStruct.hdRadioEnable ? 'sisData.*': '',
+                                        this.radioControlStruct.hdRadioEnable ? 'stationIDNumber.*': '',
+                                        this.radioControlStruct.hdRadioEnable ? 'stationLocation.*': ''
+                                        ]);
     } else {
       this.sendRadioChangeNotification(['radioEnable',
                                         'hdRadioEnable',
                                         'frequencyInteger',
                                         'band',
                                         'signalStrength',
                                         'signalChangeThreshold',
-                                        'state']);
+                                        'state'
+                                        ]);
     }
   },