diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2016-08-02 16:57:21 +0200 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2016-08-02 16:57:21 +0200 |
| commit | bccb55317b6bcabe63ccf89a81a82babeac6d0b5 (patch) | |
| tree | 1038d6f1e1091614a2533fcee21f679985c86ee2 /api | |
| parent | 2a9e440c4974ee2afc68d36e8ccf5c7f4faeece3 (diff) | |
| download | poi-service-bccb55317b6bcabe63ccf89a81a82babeac6d0b5.tar.gz | |
CommonAPI: other files migrated but not tested yet
Diffstat (limited to 'api')
5 files changed, 12 insertions, 4 deletions
diff --git a/api/franca/CMakeLists.txt b/api/franca/CMakeLists.txt index 95c72fc..ee3c795 100644 --- a/api/franca/CMakeLists.txt +++ b/api/franca/CMakeLists.txt @@ -29,7 +29,13 @@ option(COMMONAPI_TOOL_DIR option(COMMONAPI_DBUS_TOOL_DIR "Absolute path to CommonAPI-DBus tool" "") -set(COMMONAPI_GEN_DIR ${CMAKE_CURRENT_BINARY_DIR}) +get_directory_property(hasParent PARENT_DIRECTORY) + +if(hasParent) + set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen" PARENT_SCOPE) +else() + set(COMMONAPI_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}/src-gen") +endif() if (COMMONAPI_TOOL_DIR) message(STATUS "COMMONAPI_TOOL_DIR ${COMMONAPI_TOOL_DIR}") diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl index 1346045..5b0595c 100755 --- a/api/franca/navigation/mapviewer/MapViewerControl.fidl +++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl @@ -1330,6 +1330,8 @@ interface MapViewerControl { @description : valueToReturn = enum(PAN_START,PAN_TO,PAN_END) **> PanAction valueToReturn + } + out { Pixel [] pixelCoordinates } diff --git a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl index 0658eab..437dfca 100644 --- a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl +++ b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl @@ -278,7 +278,7 @@ interface MapMatchedPosition { <**
@description : getAddress = This method returns the current address
**>
- method getAddress {
+ method getCurrentAddress {
in {
AddressItemKey[] valuesToReturn
}
diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl index 6e741a5..c05477a 100644 --- a/api/franca/navigation/navigationcore/Routing.fidl +++ b/api/franca/navigation/navigationcore/Routing.fidl @@ -161,7 +161,7 @@ interface Routing { //TODO: Incomplete
union RouteSegmentItem {
Double doubleValue // LATITUDE, LONGITUDE, ALTITUDE
- IntermediatePoint intermediatePoints
+ IntermediatePoint[] intermediatePoints
String stringValue // ROAD_NUMBER
ByteBuffer linkId
Int32 int32Value
diff --git a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml index e400238..5335bfb 100644 --- a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml +++ b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml @@ -1067,7 +1067,7 @@ cover with other windows or user interface elements</line> <line>valueToReturn = enum(PAN_START,PAN_TO,PAN_END)</line> </doc> </arg> - <arg name="pixelCoordinates" type="a(qq)" direction="in"> + <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> |