diff options
Diffstat (limited to 'api/franca')
-rw-r--r-- | api/franca/CMakeLists.txt | 8 | ||||
-rwxr-xr-x | api/franca/navigation/mapviewer/MapViewerControl.fidl | 2 | ||||
-rw-r--r-- | api/franca/navigation/navigationcore/MapMatchedPosition.fidl | 2 | ||||
-rw-r--r-- | api/franca/navigation/navigationcore/Routing.fidl | 2 |
4 files changed, 11 insertions, 3 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
|