align DBus xml content to allow selective sending of signals

4 files changed, 56 insertions, 48 deletions

diff --git a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml
index 621e2a6..2104486 100644
--- a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml
+++ b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml
@@ -607,6 +607,12 @@
         </doc>
       </arg>
     </signal>
+    <method name="subscribeForMapViewScaleChangedSelective">
+      <arg direction="out" name="status" type="b">
+      </arg>
+    </method>
+    <method name="unsubscribeFromMapViewScaleChangedSelective">
+    </method>  
     <method name="SetCameraHeight">
       <doc>
         <line>SetCameraHeight = This method sets the camera height</line>
diff --git a/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml b/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml
index 0470dd9..948ac18 100644
--- a/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml
+++ b/api/navigation-core/genivi-navigationcore-mapmatchedposition.xml
@@ -80,6 +80,12 @@
         </doc>
       </arg>
     </signal>
+    <method name="subscribeForSimulationStatusChangedSelective">
+      <arg direction="out" name="status" type="b">
+      </arg>
+    </method>
+    <method name="unsubscribeFromSimulationStatusChangedSelective">
+    </method>  
     <method name="SetSimulationSpeed">
       <doc>
         <line>SetSimulationSpeed = This method sets the speed factor for the simulation mode</line>
@@ -119,6 +125,12 @@
         </doc>
       </arg>
     </signal>
+    <method name="subscribeForSimulationSpeedChangedSelective">
+      <arg direction="out" name="status" type="b">
+      </arg>
+    </method>
+    <method name="unsubscribeFromSimulationSpeedChangedSelective">
+    </method>  
     <method name="StartSimulation">
       <doc>
         <line>StartSimulation = This method starts, or resumes, a Follow Active Route simulation</line>
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 04be7ae..de48904 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -375,7 +375,8 @@ class  MapViewerControl
             return(1);
         }
     }
-	void
+
+    void
     SetMapViewPerspective(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const DBusCommonAPIEnumeration& perspective)
 	{
         MapViewerControlObj *obj=handles[mapViewInstanceHandle];
@@ -826,26 +827,20 @@ class  MapViewerControl
         throw DBus::ErrorNotSupported("Not yet supported");
     }
 
-	std::vector< ::DBus::Struct< double, double > >
-    ConvertPixelCoordsToGeoCoords(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< ::DBus::Struct< uint16_t, uint16_t > >& pixelCoordinates)
+    void ConvertPixelCoordsToGeoCoords(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< ::DBus::Struct< uint16_t, uint16_t > >& pixelCoordinates, int32_t& error, std::vector< ::DBus::Struct< double, double > >& geoCoordinates)
 	{
-            std::vector< ::DBus::Struct< double, double > >ret;
-                MapViewerControlObj *obj=handles[mapViewInstanceHandle];
+        MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
-			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-                else obj->ConvertPixelCoordsToGeoCoords(sessionHandle, pixelCoordinates, ret);
-		return ret;
+            throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
+        else obj->ConvertPixelCoordsToGeoCoords(sessionHandle, pixelCoordinates, geoCoordinates);
 	}
 
-	std::vector< ::DBus::Struct< uint16_t, uint16_t > >
-    ConvertGeoCoordsToPixelCoords(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< ::DBus::Struct< double, double > >& geoCoordinates)
-	{
-            std::vector< ::DBus::Struct< uint16_t, uint16_t > >ret;
-                MapViewerControlObj *obj=handles[mapViewInstanceHandle];
+    void ConvertGeoCoordsToPixelCoords(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< ::DBus::Struct< double, double > >& geoCoordinates, int32_t& error, std::vector< ::DBus::Struct< uint16_t, uint16_t > >& pixelCoordinates)
+    {
+        MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-                else obj->ConvertGeoCoordsToPixelCoords(sessionHandle, geoCoordinates, ret);
-		return ret;
+        else obj->ConvertGeoCoordsToPixelCoords(sessionHandle, geoCoordinates, pixelCoordinates);
 	}
 
 	void
@@ -892,19 +887,6 @@ class  MapViewerControl
         throw DBus::ErrorNotSupported("Not yet supported");
     }
 
-    void
-    AddMapViewScaleChangedListener()
-    {
-        throw DBus::ErrorNotSupported("Not yet supported");
-    }
-
-    void
-    RemoveMapViewScaleChangedListener()
-    {
-        throw DBus::ErrorNotSupported("Not yet supported");
-    }
-
-
 	void
     SetPoiCategoriesNotVisible(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< uint32_t >& poiCategoryIds)
 	{
@@ -940,6 +922,17 @@ class  MapViewerControl
 	{
 		throw DBus::ErrorNotSupported("Not yet supported");
 	}
+
+    bool subscribeForMapViewScaleChangedSelective()
+    {//not implemented yet, always return true
+        return true;
+    }
+
+    void unsubscribeFromMapViewScaleChangedSelective()
+    {//not implemented yet
+
+    }
+
 };
 
 void
diff --git a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
index bef9760..3cb5337 100644
--- a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
+++ b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
@@ -212,23 +212,25 @@ class  MapMatchedPosition
 		return simulationMode;
 	}
 
-	void
-	RemoveSimulationSpeedListener()
-	{
-		throw DBus::ErrorNotSupported("Not yet supported");
-	}
+    bool subscribeForSimulationStatusChangedSelective()
+    { //not implemented yet, always return true
+        return true;
+    }
 
-	void
-	AddSimulationStatusListener()
-	{
-		throw DBus::ErrorNotSupported("Not yet supported");
-	}
+    void unsubscribeFromSimulationStatusChangedSelective()
+    { //not implemented yet
 
-	void
-	AddSimulationSpeedListener()
-	{
-		throw DBus::ErrorNotSupported("Not yet supported");
-	}
+    }
+
+    bool subscribeForSimulationSpeedChangedSelective()
+    { //not implemented yet, always return true
+        return true;
+    }
+
+    void unsubscribeFromSimulationSpeedChangedSelective()
+    { //not implemented yet
+
+    }
 
     void
     SetPosition(const uint32_t& sessionHandle, const std::map< int32_t, ::DBus::Struct< uint8_t, ::DBus::Variant > >& position)
@@ -298,11 +300,6 @@ class  MapMatchedPosition
 		return vehicle_speed.u.num*4/40;
 	}
 
-	void
-	RemoveSimulationStatusListener()
-	{
-		throw DBus::ErrorNotSupported("Not yet supported");
-	}
 };
 
 static void