diff options
author | asanoaozora <fifitaneki@hotmail.com> | 2016-11-14 21:41:08 +0100 |
---|---|---|
committer | asanoaozora <fifitaneki@hotmail.com> | 2016-11-14 21:41:08 +0100 |
commit | 88cedd35fcc2c493115f01a9bae20ce7a6b1cce2 (patch) | |
tree | d1a60faf58a42096e17c16aa5568afb01f47b9c8 /api | |
parent | e599b957799ba65a1512711c0e2617f8fd3c0d2b (diff) | |
download | poi-service-88cedd35fcc2c493115f01a9bae20ce7a6b1cce2.tar.gz |
GT-3328 GT-3432: Update of mapviewer
Diffstat (limited to 'api')
-rwxr-xr-x | api/franca/navigation/mapviewer/MapViewerControl.fidl | 22 | ||||
-rw-r--r-- | api/map-viewer/genivi-mapviewer-mapviewercontrol.xml | 18 |
2 files changed, 15 insertions, 25 deletions
diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl index c773ff8..64c8676 100755 --- a/api/franca/navigation/mapviewer/MapViewerControl.fidl +++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl @@ -836,7 +836,7 @@ interface MapViewerControl { <** @description : mapViewScaleChanged = This signal is emitted when the mapview scale changes **> - broadcast mapViewScaleChanged { + broadcast mapViewScaleChanged selective { out { <** @@ -873,18 +873,6 @@ interface MapViewerControl { } <** - @description : addMapViewScaleChangedListener = This method adds a listener which is notified when map view scale changes. - **> - method addMapViewScaleChangedListener { - } - - <** - @description : removeMapViewScaleChangedListener = This method removes a listener which is notified when map view scale changes. - **> - method removeMapViewScaleChangedListener { - } - - <** @description : setCameraHeight = This method sets the camera height **> method setCameraHeight { @@ -1837,6 +1825,10 @@ interface MapViewerControl { out { Coordinate2D [] geoCoordinates } + error { + OK + MAPVIEWERCONTROL_ERROR_INVALID_INPUT // wrong input coordinates + } } <** @@ -1862,6 +1854,10 @@ interface MapViewerControl { Pixel [] pixelCoordinates } + error { + OK + MAPVIEWERCONTROL_ERROR_INVALID_INPUT // wrong input coordinates + } } <** diff --git a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml index 1104ead..621e2a6 100644 --- a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml +++ b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml @@ -607,16 +607,6 @@ </doc> </arg> </signal> - <method name="AddMapViewScaleChangedListener"> - <doc> - <line>AddMapViewScaleChangedListener = This method adds a listener which is notified when map view scale changes.</line> - </doc> - </method> - <method name="RemoveMapViewScaleChangedListener"> - <doc> - <line>RemoveMapViewScaleChangedListener = This method removes a listener which is notified when map view scale changes.</line> - </doc> - </method> <method name="SetCameraHeight"> <doc> <line>SetCameraHeight = This method sets the camera height</line> @@ -1559,7 +1549,9 @@ cover with other windows or user interface elements</line> <line>y = y-coordinate (y=0 indicates the first top pixel of the map view)</line> </doc> </arg> - <arg name="geoCoordinates" type="a(dd)" direction="out"> + <arg name="error" type="i" direction="out"> + </arg> + <arg name="geoCoordinates" type="a(dd)" direction="out"> <doc> <line>geoCoordinates = array[struct(lat,lon)]</line> <line>lat = latitude in format %3.6f. Range[-90:+90]</line> @@ -1588,7 +1580,9 @@ cover with other windows or user interface elements</line> <line>lon = longitude in format %3.6f. Range[-180:+180]</line> </doc> </arg> - <arg name="pixelCoordinates" type="a(qq)" direction="out"> + <arg name="error" type="i" direction="out"> + </arg> + <arg name="pixelCoordinates" type="a(qq)" direction="out"> <doc> <line>pixelCoordinates = array[struct(x,y)]</line> <line>x = x-coordinate (x=0 indicates the first left pixel of the map view)</line> |