Merge remote-tracking branch 'origin/master' into develop

smartdevicelink · Feb 22, 2018 · c86505c · c86505c
2 parents a7a60c7 + 7fd694e
commit c86505c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/app/controller/NavigationController.js b/app/controller/NavigationController.js
@@ -49,7 +49,7 @@ SDL.NavigationController = Em.Object.create(
      * @param {Object} request
      */
     sendLocation: function(request) {
-      this.model.push(
+      this.model.LocationDetails.push(
         {
           coordinate: {
             latitudeDegrees: request.params.latitudeDegrees,
@@ -109,7 +109,8 @@ SDL.NavigationController = Em.Object.create(
             FFW.Navigation.wayPointSend(
               SDL.SDLModel.data.resultCode.SUCCESS,
               SDL.NavigationModel.LocationDetails,
-              request.id
+              request.id,
+              request.params.appID
             );
             SDL.NavigationModel.appReqPull.splice(
               SDL.NavigationModel.appReqPull.indexOf(request.params.appID), 1

diff --git a/app/model/NavigationModel.js b/app/model/NavigationModel.js
@@ -77,11 +77,11 @@ SDL.NavigationModel = Em.Object.create({
           longitudeDegrees: 0
         },
         locationName: 'locationName',
-        addressLines: 'addressLines',
+        addressLines: ['addressLines'],
         locationDescription: 'locationDescription',
         phoneNumber: 'phoneNumber',
         locationImage: {
-          value: '',
+          value: 'images/common/defaultButtonImage.png',
           imageType: 'DYNAMIC'
         },
         searchAddress: {
@@ -102,7 +102,7 @@ SDL.NavigationModel = Em.Object.create({
           longitudeDegrees: 0
         },
         locationName: 'locationName',
-        addressLines: 'addressLines',
+        addressLines: ['addressLines'],
         locationDescription: 'locationDescription',
         phoneNumber: 'phoneNumber',
         locationImage: {
@@ -127,11 +127,11 @@ SDL.NavigationModel = Em.Object.create({
           longitudeDegrees: 0
         },
         locationName: 'locationName',
-        addressLines: 'addressLines',
+        addressLines: ['addressLines'],
         locationDescription: 'locationDescription',
         phoneNumber: 'phoneNumber',
         locationImage: {
-          value: '',
+          value: 'images/common/defaultButtonImage.png',
           imageType: 'DYNAMIC'
         },
         searchAddress: {
@@ -152,7 +152,7 @@ SDL.NavigationModel = Em.Object.create({
           longitudeDegrees: 0
         },
         locationName: 'locationName',
-        addressLines: 'addressLines',
+        addressLines: ['addressLines'],
         locationDescription: 'locationDescription',
         phoneNumber: 'phoneNumber',
         locationImage: {

diff --git a/ffw/NavigationRPC.js b/ffw/NavigationRPC.js
@@ -511,14 +511,16 @@ FFW.Navigation = FFW.RPCObserver.create(
      * @param {Object} data
      * @param {number} id
      */
-    wayPointSend: function(resultCode, data, id) {
+    wayPointSend: function(resultCode, data, id, appID) {
       if (resultCode == SDL.SDLModel.data.resultCode.SUCCESS &&
         data && id) {
         // send repsonse
         var JSONMessage = {
           'jsonrpc': '2.0',
           'id': id,
           'result': {
+            'code': resultCode, // type (enum) from SDL protocol
+            'appID': appID,
             'wayPoints': data,
             'method': 'Navigation.GetWayPoints'
           }

diff --git a/ffw/UIRPC.js b/ffw/UIRPC.js
@@ -293,8 +293,8 @@ FFW.UI = FFW.RPCObserver.create(
               request.params.appID
             ).sdlSetMediaClockTimer(request.params);
             if (resultCode === SDL.SDLModel.data.resultCode.SUCCESS) {
-              if(params.enableSeek) {
-                this.OnSeekMediaClockTimer(params.startTime, params.appID);
+              if(request.params.enableSeek) {
+                this.OnSeekMediaClockTimer(request.params.startTime, request.params.appID);
               }
               this.sendUIResult(resultCode, request.id, request.method);
             } else {