[HAM] fix implementation for calling GPS listener

Change-Id: I7b7b389e9ee895ab9dcde4a021cef70af9cb8ec8
Signed-off-by: taekeun.kang <taekeun.kang@samsung.com>

diff --git a/src/humanactivitymonitor/humanactivitymonitor_api.js b/src/humanactivitymonitor/humanactivitymonitor_api.js
index d78c2ad723789923d4c325bcb13bb74dfcb88314..dac030de8951111b3b0722832cfc9c17d91b3db4 100755 (executable)
--- a/src/humanactivitymonitor/humanactivitymonitor_api.js
+++ b/src/humanactivitymonitor/humanactivitymonitor_api.js
@@ -78,8 +78,8 @@ function convertActivityData(type, data) {
       return new HumanActivityHRMData(data);
     case HumanActivityType.GPS:
       var gpsInfo = [];
-      for (var i = 0, max = data.length; i < max; i++) {
-        gpsInfo.push(new HumanActivityGPSInfo(data[i]));
+      for (var i = 0, max = data.gpsInfo.length; i < max; i++) {
+        gpsInfo.push(new HumanActivityGPSInfo(data.gpsInfo[i]));
       }
       return new HumanActivityGPSInfoArray(gpsInfo);
     case HumanActivityType.SLEEP_MONITOR:

diff --git a/src/humanactivitymonitor/humanactivitymonitor_manager.cc b/src/humanactivitymonitor/humanactivitymonitor_manager.cc
index e002569e8e4626e2329f2cbf24d075513503d0d4..244d8fa083fb50441700233273aa5b4933326028 100755 (executable)
--- a/src/humanactivitymonitor/humanactivitymonitor_manager.cc
+++ b/src/humanactivitymonitor/humanactivitymonitor_manager.cc
@@ -738,7 +738,10 @@ class HumanActivityMonitorManager::Monitor::GpsMonitor : public HumanActivityMon
       return;
     }
 
-    callback(&gps_info);
+    picojson::value out{picojson::object{}};
+    (out.get<picojson::object>())["gpsInfo"] = gps_info;
+
+    callback(&out);
   }
 
   static bool ConvertGpsEvent(double latitude, double longitude, double altitude,