GT-3502 GT-3495-bis

GT-3502 MapViewerControl::SetMapViewPan should accept one element for
panning
GT-3495-bis Complete some descriptions

2 files changed, 9 insertions, 23 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 5929cba..6093567 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -447,31 +447,24 @@ class  MapViewerControl
 	}
 
     void
-    SetMapViewPan(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const DBusCommonAPIEnumeration& panningAction, const std::vector< ::DBus::Struct< uint16_t, uint16_t > >& pixelCoordinates)
+    SetMapViewPan(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const DBusCommonAPIEnumeration& panningAction, const ::DBus::Struct< uint16_t, uint16_t >& pixelCoordinates)
     {
-        ::DBus::Struct< uint16_t, uint16_t > pixel;
         MapViewerControlObj *obj=handles[mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
         else {
-            if (pixelCoordinates.size())
-            {
-                pixel = pixelCoordinates.at(0);
-                obj->SetMapViewPan(sessionHandle, panningAction, pixel);
-            }
+            obj->SetMapViewPan(sessionHandle, panningAction, pixelCoordinates);
         }
     }
 
-    std::vector< ::DBus::Struct< uint16_t, uint16_t > >
+    ::DBus::Struct< uint16_t, uint16_t >
     GetMapViewPan(const uint32_t& mapViewInstanceHandle, const int32_t& valueToReturn)
     {
-        std::vector< ::DBus::Struct< uint16_t, uint16_t > > pixelCoordinates;
-        ::DBus::Struct< uint16_t, uint16_t > pixel;
+        ::DBus::Struct< uint16_t, uint16_t > pixelCoordinates;
         MapViewerControlObj *obj=handles[mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        else obj->GetMapViewPan(valueToReturn, pixel); //limited to one pixel coordinate
-        pixelCoordinates.push_back(pixel);
+        else obj->GetMapViewPan(valueToReturn, pixelCoordinates); //limited to one pixel coordinate
         return pixelCoordinates;
     }
 
diff --git a/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx
index be56f53..c818db1 100644
--- a/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -802,17 +802,12 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
     /**
      * description: setMapViewPan = This method pans a given map instance
      */
-    void setMapViewPan(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _sessionHandle, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, MapViewerControl::PanAction _panningAction, std::vector<MapViewerControl::Pixel> _pixelCoordinates, setMapViewPanReply_t _reply){
-        MapViewerControl::Pixel pixel;
+    void setMapViewPan(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _sessionHandle, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, MapViewerControl::PanAction _panningAction, MapViewerControl::Pixel _pixelCoordinates, setMapViewPanReply_t _reply){
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
         else {
-            if (_pixelCoordinates.size())
-            {
-                pixel = _pixelCoordinates.at(0);
-                obj->SetMapViewPan(_sessionHandle, _panningAction, pixel);
-            }
+                obj->SetMapViewPan(_sessionHandle, _panningAction, _pixelCoordinates);
         }
         _reply();
     }
@@ -821,13 +816,11 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
      * description: getMapViewPan
      */
     void getMapViewPan(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, MapViewerControl::PanAction _valueToReturn, getMapViewPanReply_t _reply){
-        MapViewerControl::Pixel pixel;
-        std::vector<MapViewerControl::Pixel> _pixelCoordinates;
+        MapViewerControl::Pixel _pixelCoordinates;
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        else obj->GetMapViewPan(_valueToReturn, pixel); //limited to one pixel coordinate
-        _pixelCoordinates.push_back(pixel);
+        else obj->GetMapViewPan(_valueToReturn, _pixelCoordinates); //limited to one pixel coordinate
         _reply(_pixelCoordinates);
     }