Filtering unnecessary GPS data in SisData

The filter created to manage data in terms of SisData->StationLocation->GPSData,
since GPSData should not contain more params then latitude, longitude, altitude

8 files changed, 50 insertions, 10 deletions

diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h
index 86697add18..11d3f79588 100644
--- a/src/components/application_manager/include/application_manager/smart_object_keys.h
+++ b/src/components/application_manager/include/application_manager/smart_object_keys.h
@@ -344,10 +344,6 @@ extern const char* activate;
 extern const char* set_as_default;
 extern const char* origin_app;
 
-// gps data
-extern const char* shifted;
-extern const char* altitude;
-
 // sis data
 extern const char* station_short_name;
 extern const char* station_location;
@@ -375,8 +371,11 @@ extern const char* global_ign_on_counter;
 extern const char* connection_info;
 extern const char* is_download_complete;
 
+extern const char* shifted;
+extern const char* altitude;
 extern const char* longitude_degrees;
 extern const char* latitude_degrees;
+
 extern const char* address;
 extern const char* country_name;
 extern const char* country_code;
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h
index cd87ad326e..f5896e0ecb 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h
@@ -91,6 +91,15 @@ class RCHelpers {
       AppsModules;
   static AppsModules GetApplicationsAllowedModules(
       application_manager::ApplicationManager& app_mngr);
+
+  /**
+   * @brief RemoveRedundantGPSDataFromVIDataMsg removes redundant GPS data
+   * params from interrior vehicle data response message if one contains radio
+   * station location data
+   * @param msg_params Params of the interrion vehicle data response message
+   */
+  static void RemoveRedundantGPSDataFromIVDataMsg(
+      smart_objects::SmartObject& msg_params);
 };
 
 }  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h
index 19b1bf88f8..92ff7e5f01 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2019, Ford Motor Company
+ Copyright (c) 2018, Ford Motor Company
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_response.cc
index a7572f1d62..b1fa8d6ea0 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_response.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_response.cc
@@ -31,6 +31,7 @@
  */
 
 #include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_response.h"
+#include "rc_rpc_plugin/rc_helpers.h"
 #include "utils/macro.h"
 
 namespace rc_rpc_plugin {
@@ -49,6 +50,9 @@ GetInteriorVehicleDataResponse::~GetInteriorVehicleDataResponse() {}
 
 void GetInteriorVehicleDataResponse::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
+
+  RCHelpers::RemoveRedundantGPSDataFromIVDataMsg(
+      (*message_)[app_mngr::strings::msg_params]);
   application_manager_.GetRPCService().SendMessageToMobile(message_);
 }
 
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc
index 53b04ce3ef..06b5218bb3 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc
@@ -75,6 +75,8 @@ void OnInteriorVehicleDataNotification::Run() {
   typedef std::vector<application_manager::ApplicationSharedPtr> AppPtrs;
   AppPtrs apps = RCRPCPlugin::GetRCApplications(application_manager_);
 
+  RCHelpers::RemoveRedundantGPSDataFromIVDataMsg(
+      (*message_)[app_mngr::strings::msg_params]);
   for (AppPtrs::iterator it = apps.begin(); it != apps.end(); ++it) {
     DCHECK(*it);
     application_manager::Application& app = **it;
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc
index b39b67d669..5785e58e5b 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc
@@ -115,4 +115,30 @@ RCHelpers::AppsModules RCHelpers::GetApplicationsAllowedModules(
   }
   return result;
 }
+
+void RCHelpers::RemoveRedundantGPSDataFromIVDataMsg(
+    smart_objects::SmartObject& msg_params) {
+  using namespace message_params;
+  using namespace application_manager::strings;
+
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto& module_data = msg_params[kModuleData];
+  if (!module_data.keyExists(kRadioControlData) ||
+      !module_data[kRadioControlData].keyExists(kSisData) ||
+      !module_data[kRadioControlData][kSisData].keyExists(station_location)) {
+    return;
+  }
+
+  auto& location_data =
+      module_data[kRadioControlData][kSisData][station_location];
+  auto new_location_data =
+      smart_objects::SmartObject(smart_objects::SmartType_Map);
+  new_location_data[latitude_degrees] = location_data[latitude_degrees];
+  new_location_data[longitude_degrees] = location_data[longitude_degrees];
+  if (location_data.keyExists(altitude)) {
+    new_location_data[altitude] = location_data[altitude];
+
+    location_data = new_location_data;
+  }
+}
 }  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc
index 6ef76ad125..7d34bbbe37 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc
@@ -72,7 +72,7 @@ void OnVehicleDataNotification::Run() {
 
   for (; vehicle_data.end() != it; ++it) {
     if (true == (*message_)[strings::msg_params].keyExists(it->first)) {
-      LOG4CXX_ERROR(logger_, "vehicle_data nanme" << it->first);
+      LOG4CXX_DEBUG(logger_, "vehicle_data name" << it->first);
       auto vehicle_data_value =
           (*message_)[strings::msg_params][it->first].asInt();
 
diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc
index 590519381c..23b7fd2b34 100644
--- a/src/components/application_manager/src/smart_object_keys.cc
+++ b/src/components/application_manager/src/smart_object_keys.cc
@@ -311,10 +311,6 @@ const char* activate = "activate";
 const char* set_as_default = "setAsDefault";
 const char* origin_app = "originApp";
 
-// gps data
-const char* shifted = "shifted";
-const char* altitude = "altitude";
-
 // sis data
 const char* station_short_name = "stationShortName";
 const char* station_location = "stationLocation";
@@ -347,8 +343,12 @@ const char* time_stamp = "timeStamp";
 const char* manual_text_entry = "manualTextEntry";
 const char* image_type_supported = "imageTypeSupported";
 const char* unexpected_disconnect = "unexpectedDisconnect";
+
+const char* shifted = "shifted";
+const char* altitude = "altitude";
 const char* longitude_degrees = "longitudeDegrees";
 const char* latitude_degrees = "latitudeDegrees";
+
 const char* address = "address";
 const char* country_name = "countryName";
 const char* country_code = "countryCode";