summaryrefslogtreecommitdiff
path: root/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
diff options
context:
space:
mode:
authorasanoaozora <fifitaneki@hotmail.com>2017-08-17 16:48:37 +0200
committerasanoaozora <fifitaneki@hotmail.com>2017-08-17 16:48:37 +0200
commitfaed34d71ab44536cc077a6a6edf9e6903e40c1f (patch)
tree2f1c731d93e5b256748b9bb37212a53519ed9a71 /src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
parent14e7e553b2391915b50b2b990bf0d5a959fd5d01 (diff)
downloadpoi-service-faed34d71ab44536cc077a6a6edf9e6903e40c1f.tar.gz
improve test scripts and align to latest navit version
Diffstat (limited to 'src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx')
-rw-r--r--src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx24
1 files changed, 16 insertions, 8 deletions
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
index 56c2bd1..a26583a 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -612,9 +612,12 @@ class MapViewerControl
SetCameraTiltAngle(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const int32_t& tilt)
{
MapViewerControlObj *obj=handles[mapViewInstanceHandle];
- if (!obj)
+ if (!obj){
throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
- else obj->SetCameraTiltAngle(sessionHandle, tilt);
+ }else{
+ obj->SetCameraTiltAngle(sessionHandle, tilt);
+ CameraTiltAngleChanged(mapViewInstanceHandle,tilt);
+ }
}
int32_t
@@ -652,9 +655,12 @@ class MapViewerControl
SetCameraDistanceFromTargetPoint(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const uint32_t& distance)
{
MapViewerControlObj *obj=handles[mapViewInstanceHandle];
- if (!obj)
- throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
- else obj->SetCameraDistanceFromTargetPoint(sessionHandle, distance);
+ if (!obj){
+ throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
+ }else{
+ obj->SetCameraDistanceFromTargetPoint(sessionHandle, distance);
+ CameraDistanceFromTargetPointChanged(mapViewInstanceHandle,distance);
+ }
}
@@ -691,9 +697,11 @@ class MapViewerControl
SetCameraHeight(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const uint32_t& height)
{
MapViewerControlObj *obj=handles[mapViewInstanceHandle];
- if (!obj)
- throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
- else obj->SetCameraHeight(sessionHandle, height);
+ if (!obj){
+ throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
+ }else{
+ obj->SetCameraHeight(sessionHandle, height);
+ }
}
uint32_t