From 4761e62bdf6ea3a65f41409174c6f68b813832e1 Mon Sep 17 00:00:00 2001
From: asanoaozora <fifitaneki@hotmail.com>
Date: Fri, 19 Jan 2018 17:11:13 +0100
Subject: GT-3504

MapViewerControl - Add broadcast for scale changed event which reports
scale value in meters per pixel
---
 .../navigation/mapviewer/MapViewerControl.fidl      | 18 ++++++++++++++++++
 .../genivi-mapviewer-mapviewercontrol.xml           | 21 +++++++++++++++++++++
 .../genivi_mapviewer_mapviewercontrol.cxx           | 10 ++++++++++
 3 files changed, 49 insertions(+)

diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl
index fff1dea..aeb6e7c 100755
--- a/api/franca/navigation/mapviewer/MapViewerControl.fidl
+++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl
@@ -1172,6 +1172,24 @@ interface MapViewerControl {
 		}
 	}
 
+	<**
+		@description : mapViewScaleByMetersPerPixelChanged = This signal is emitted when the mapview scale ByMetersPerPixel changes
+	**>
+	broadcast mapViewScaleByMetersPerPixelChanged selective {
+		out {
+
+			<**
+				@description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
+			**>
+			Handle mapViewInstanceHandle
+
+			<**
+				@description : metersPerPixel = scale value in meters per pixel
+			**>
+			Double metersPerPixel
+		}
+	}
+
 	<**
 		@description : getMapViewScale = This method returns the currently used map scale
 	**>
diff --git a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml
index cee04ca..2f763ff 100644
--- a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml
+++ b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml
@@ -613,6 +613,27 @@
     </method>
     <method name="unsubscribeFrommapViewScaleChangedSelective">
     </method>  
+    <signal name="MapViewScaleByMetersPerPixelChanged">
+      <doc>
+        <line>MapViewScaleByMetersPerPixelChanged = This signal is emitted when the mapview scale ByMetersPerPixel changes</line>
+      </doc>
+      <arg name="mapViewInstanceHandle" type="u">
+        <doc>
+          <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line>
+        </doc>
+      </arg>
+      <arg name="metersPerPixel" type="d">
+        <doc>
+          <line>metersPerPixel = meters per pixel</line>
+        </doc>
+      </arg>
+    </signal>
+    <method name="subscribeFormapViewScaleByMetersPerPixelChangedSelective">
+      <arg direction="out" name="status" type="b">
+      </arg>
+    </method>
+    <method name="unsubscribeFrommapViewScaleByMetersPerPixelChangedSelective">
+    </method>  
     <method name="SetCameraHeight">
       <doc>
         <line>SetCameraHeight = This method sets the camera height</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 bd61f43..627f157 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -981,6 +981,16 @@ class  MapViewerControl
 
     }
 
+    bool subscribeFormapViewScaleByMetersPerPixelChangedSelective()
+    {//not implemented yet, always return true
+        return true;
+    }
+
+    void unsubscribeFrommapViewScaleByMetersPerPixelChangedSelective()
+    {//not implemented yet
+
+    }
+
     int32_t MapViewRotateBegin(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const ::DBus::Struct< uint16_t, uint16_t >& anchorPoint)
     {
         throw DBus::ErrorNotSupported("Not yet supported");
-- 
cgit v1.2.1