diff options
18 files changed, 310 insertions, 75 deletions
diff --git a/api/franca/navigation/NavigationSettings.fidl b/api/franca/navigation/NavigationSettings.fidl new file mode 100644 index 0000000..287a9e0 --- /dev/null +++ b/api/franca/navigation/NavigationSettings.fidl @@ -0,0 +1,110 @@ +/* +SPDX-License-Identifier: MPL-2.0 +Copyright (C) 2015-2016, PCA Peugeot Citroën, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH, Harman-Becker Automotive GmbH +This Source Code Form is subject to the terms of the +Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with +this file, you can obtain one at http://mozilla.org/MPL/2.0/. +*/ + +package org.genivi.navigation + +import org.genivi.navigation.NavigationTypes.* from "NavigationTypes.fidl" + + +<** @description : This interface offers methods that implement the configuration of the navigation core.**> +interface NavigationSettings { + version { + major 0 + minor 1 + } + + <** @description : This method returns the API version .**> + method getVersion { + out { + <** @description: .**> + Version ^version + } + } + + <** @description : Set the current language set. If the language is not supported, the default details will be returned in the native language.**> + method setLocale { + in { + <** @description : the language to be used. ISO 639‐3 language code (lower case)**> + String languageCode + <** @description : the country specific variant for the language to be used. ISO 3166‐1 alpha 3 country code (upper case)**> + String countryCode + <** @description : the script specific variant for the language to be used. ISO 15924 alpha 4 script code (upper case)**> + String scriptCode + } + } + + <** @description : Get the current language set .**> + method getLocale { + out { + <** @description : the language used. ISO 639‐3 language code (lower case)**> + String languageCode + <** @description : the country specific variant for the language used. ISO 3166‐1 alpha 3 country code (upper case)**> + String countryCode + <** @description : the script specific variant for the language used. ISO 15924 alpha 4 script code (upper case)**> + String scriptCode + } + } + + <** @description : Get the supported set of locales .**> + method getSupportedLocales { + out { + <** @description : array[struct(languageCode,countryCode,scriptCode)]**> + Locales[] localeList + } + } + + <** @description : Set the time format.**> + method SetTimeFormat { + in { + <** @description : timeFormat = enum(INVALID,12H,24H, ... ). **> + TimeFormat format + } + } + + <** @description : Get the current time format .**> + method GetTimeFormat { + out { + <** @description : timeFormat = enum(INVALID,12H,24H, ... ). **> + TimeFormat format + } + } + + <** @description : Get the supported set of time format .**> + method GetSupportedTimeFormats { + out { + <** @description : timeFormatList = array[timeFormat] .**> + TimeFormat[] timeFormatList + } + } + + <** @description : Set the coordinates format.**> + method SetCoordinatesFormat { + in { + <** @description : coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )**> + CoordinatesFormat coordinatesFormat + } + } + + <** @description : Get the coordinates format .**> + method GetCoordinatesFormat { + out { + <** @description : coordinatesFormat = enum(INVALID,DEGREES,MINUTES,SECONDS, ... )**> + CoordinatesFormat coordinatesFormat + } + } + + <** @description : Get the supported set of coordinates format .**> + method getSupportedCoordinatesFormat { + out { + <** @description : array[struct(languageCode,countryCode,scriptCode)]**> + CoordinatesFormat[] coordinatesFormatList + } + } + +/* to do: add units of measurements */ +}
\ No newline at end of file diff --git a/api/franca/navigation/NavigationTypes.fidl b/api/franca/navigation/NavigationTypes.fidl index 0b3e176..7332a93 100755..100644 --- a/api/franca/navigation/NavigationTypes.fidl +++ b/api/franca/navigation/NavigationTypes.fidl @@ -22,6 +22,18 @@ typeCollection NavigationTypes { typedef Handle is UInt32
+ typedef Timestamp is UInt64
+
+ typedef LinkId is ByteBuffer
+
+ <** @description: Handle to a location.
+ Range[0:0x7fffffff]
+ **>
+ typedef LocationHandle is Handle
+
+
+/* geometric types */
+
struct Coordinate2D {
Double latitude
Double longitude
@@ -31,16 +43,40 @@ typeCollection NavigationTypes { Int32 altitude
}
+ struct Rectangle {
+ Coordinate2D topLeft
+ Coordinate2D bottomRight
+ }
+
array Polygon of Coordinate2D
typedef Area is Polygon
- struct Rectangle {
- Coordinate2D topLeft
- Coordinate2D bottomRight
+ <** @description: Kind of shapes. **>
+ enumeration ShapeType {
+ CIRCLE
+ RECTANGLE
+ POLYGON
+ }
+
+ <** @description: A radius in meters.
+ Range[0x0:0xffffffff]
+ **>
+ typedef Radius is UInt32
+
+ <** @description: A circle given as center and radius. **>
+ struct Circle {
+ <** @description : The center of the circle.**>
+ Coordinate2D center
+ <** @description : The radius of the circle.**>
+ Radius radius
}
-// for the time being, no use of extends for the enum, to be implemented later
+ typedef Distance is Double
+
+/* enumerations */
+
+// for the time being, no use of inheritance (extends) for the enumerations, to be implemented later
enumeration BasicEnum {
INVALID = 0
}
@@ -75,11 +111,29 @@ typeCollection NavigationTypes { FOOT = 54
}
- typedef Timestamp is UInt64
-
- typedef Distance is Double
-
- typedef LinkId is ByteBuffer
-
- typedef Radius is UInt32
+ enumeration TimeFormat {
+ INVALID = 0
+ TWELVEH = 1
+ TWENTYFOURH = 2
+ }
+
+ enumeration CoordinatesFormat {
+ INVALID = 0
+ <** @description:DEGREES format = d.dº**>
+ DEGREES = 1
+ <** @description:MINUTES format = dºm.m'**>
+ MINUTES = 2
+ <** @description:SECONDS format = dºm's"**>
+ SECONDS = 3
+ }
+
+ struct Locales
+ {
+ <** @description : the language used. ISO 639‐3 language code (lower case)**>
+ String languageCode
+ <** @description : the country specific variant for the language used. ISO 3166‐1 alpha 3 country code (upper case)**>
+ String countryCode
+ <** @description : the script specific variant for the language used. ISO 15924 alpha 4 script code (upper case)**>
+ String scriptCode
+ }
}
\ No newline at end of file diff --git a/api/franca/navigation/navigationcore/LocationInput.fidl b/api/franca/navigation/navigationcore/LocationInput.fidl index 6cd9402..926f98e 100755..100644 --- a/api/franca/navigation/navigationcore/LocationInput.fidl +++ b/api/franca/navigation/navigationcore/LocationInput.fidl @@ -1,6 +1,6 @@ /*
SPDX-License-Identifier: MPL-2.0
-Copyright (C) 2014, PCA Peugeot Citron, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
+Copyright (C) 2014, PCA Peugeot Citro�n, XS Embedded GmbH, TomTom International B.V., Continental Automotive GmbH, BMW Car IT GmbH, Alpine Electronics R&D Europe GmbH, AISIN AW CO., LTD., Neusoft Technology Solutions GmbH, Jaguar Land Rover Limited, Visteon Corporation, Elektrobit Automotive GmbH
This Source Code Form is subject to the terms of the
Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
this file, you can obtain one at http://mozilla.org/MPL/2.0/.
@@ -46,10 +46,10 @@ interface LocationInput { <**
@description : Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
}
error {
- NoMoreLocationInpuHandles
+ NoMoreLocationInputHandles
}
}
@@ -67,7 +67,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
}
}
@@ -94,7 +94,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
Address address
}
@@ -114,7 +114,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
<**
@description : selectionCriterion = enum(INVALID,LATITUDE,LONGITUDE,ALTITUDE,FULL_ADDRESS,COUNTRY,COUNTRYCODE,STATE,CITY,ZIPCODE,STREET,ROAD_NUMBER,HOUSENUMBER,HOUSENAME,CROSSING,DISTRICT,PHONENUMBER,POINAME,TOWNCENTER, ... )
@@ -137,7 +137,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
<**
@description : inputString = last input character (UTF-8) (0x08(Backspace) for delete last character, 0x0D(Carriage Return) for delete entire input)
@@ -165,7 +165,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
<**
@description : inputString = contains the String, that is searched
@@ -193,7 +193,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
<**
@description : offset = starting offset of the newly requested list elements
@@ -221,7 +221,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
<**
@description : index = absolute list index of the entry to be selected
@@ -239,7 +239,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
<**
@description : index = list index of the entry to be returned
@@ -265,7 +265,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
Address inputAddress
}
@@ -285,7 +285,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
Coordinate2D coordinate
}
@@ -300,7 +300,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
<**
@description : selectionCriterion = enum(INVALID,LATITUDE,LONGITUDE,ALTITUDE,FULL_ADDRESS,COUNTRY,COUNTRYCODE,STATE,CITY,ZIPCODE,STREET,ROAD_NUMBER,HOUSENUMBER,HOUSENAME,CROSSING,DISTRICT,PHONENUMBER,POINAME,TOWNCENTER, ... )
@@ -318,7 +318,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
<**
@description : statusValue = enum(INVALID,NOT_STARTED,SEARCHING,FINISHED, ... )
@@ -336,7 +336,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
<**
@description : uniqueString = unique string derived from spell input (i.e. including auto-completion if applicable)
@@ -364,7 +364,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
<**
@description : totalSize = total size of the result list
@@ -394,7 +394,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
<**
@description : totalSize = total size of the result list
@@ -412,7 +412,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
<**
@description : guidable = flag indicating whether the current address is guidable
@@ -434,7 +434,7 @@ interface LocationInput { <**
@description : locationInpuHandle = Location input handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
- Handle locationInpuHandle
+ LocationHandle locationInputHandle
Address [] validatedAddressList
@@ -442,7 +442,4 @@ interface LocationInput { }
}
-
-
-
}
\ No newline at end of file diff --git a/api/franca/navigation/poiservice/POISearch.fidl b/api/franca/navigation/poiservice/POISearch.fidl index a3fc54f..5566862 100755..100644 --- a/api/franca/navigation/poiservice/POISearch.fidl +++ b/api/franca/navigation/poiservice/POISearch.fidl @@ -101,7 +101,7 @@ interface POISearch { }
}
- <** @description : GetCategoriesDetails = This method retrieves the details associated to one or more POI categories.
+ <** @description : This method retrieves the details associated to one or more POI categories.
It contains the name, the parent categories, the top level attribute, the list of attributes, the icons, ... .**>
method getCategoriesDetails {
in {
diff --git a/api/franca/navigation/poiservice/POIServiceTypes.fidl b/api/franca/navigation/poiservice/POIServiceTypes.fidl index 01003c1..7968b58 100755..100644 --- a/api/franca/navigation/poiservice/POIServiceTypes.fidl +++ b/api/franca/navigation/poiservice/POIServiceTypes.fidl @@ -25,6 +25,7 @@ typeCollection POIServiceTypes { <** @description:Unique ID for a POI Icon Resource**>
typedef ResourceID is UInt32
+ <** @description:Unique ID for an attribute**>
typedef AttributeID is UInt32
typedef ContentAccessModuleID is UInt8
@@ -373,14 +374,4 @@ typeCollection POIServiceTypes { <** @description: array[struct(id,type,value)].**>
PoiAttribute[] attributes
}
-
- struct Locales
- {
- <** @description : the language used. ISO 639‐3 language code (lower case)**>
- String languageCode
- <** @description : the country specific variant for the language used. ISO 3166‐1 alpha 3 country code (upper case)**>
- String countryCode
- <** @description : the script specific variant for the language used. ISO 15924 alpha 4 script code (upper case)**>
- String scriptCode
- }
}
diff --git a/src/navigation/rebuild_all.sh b/src/navigation/rebuild_all.sh new file mode 100755 index 0000000..3863e19 --- /dev/null +++ b/src/navigation/rebuild_all.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +echo 'delete the build folder' +rm -rf build + +mkdir build +cd build +mkdir navit +cd navit +mkdir navit +cd navit +echo 'build navit' +cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../../navit/navit/ +make +cd ../../ +echo 'build navigation' +cmake ../ +make +cd .. + + diff --git a/src/poi-service/CMakeLists.txt b/src/poi-service/CMakeLists.txt index 5e2a8ec..d36eca8 100644 --- a/src/poi-service/CMakeLists.txt +++ b/src/poi-service/CMakeLists.txt @@ -2,7 +2,7 @@ # @licence app begin@ # SPDX-License-Identifier: MPL-2.0 # -# Component Name: poi-server +# Component Name: poi-service-server # # Author: Philippe Colliot # @@ -15,11 +15,10 @@ # # @licence end@ ########################################################################### -project(poi-server) +project(poi-service-server) cmake_minimum_required(VERSION 2.8) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") -message(STATUS "poi-service-server") +message(STATUS ${PROJECT_NAME}) option(WITH_FRANCA_INTERFACE "Build using the Franca interfaces" OFF) diff --git a/src/poi-service/README b/src/poi-service/README index ee184e3..cf1b54b 100644 --- a/src/poi-service/README +++ b/src/poi-service/README @@ -1,4 +1,4 @@ -Release date of the file: 03-08-2015 +Release date of the file: 18-11-2015 Status: OK Project: @@ -25,7 +25,8 @@ License: See headers and LICENSE file Test target: -Ubuntu 14.04 LTS +Ubuntu 14.04 LTS 32bits +Ubuntu 15.10 64bits To get the code: Code is part of the navigation-service repository, so you need to clone the whole content: @@ -54,14 +55,57 @@ How To Run poi-server How To Build poi-manager-server =============================== NB: You need CommonAPI 3.1.2 and Franca 0.9.1 installed + +============= If the CommonAPI stuff has been generated into /usr/local/ -Check if the links are well set into ./lib +Check if the links are well set into /usr/local/lib +if not do it yourself + +cd /usr/local/lib +rm libCommonAPI-DBus.so.3 +rm libCommonAPI.so.3 ln -s libCommonAPI-DBus.so.3.1.2 libCommonAPI-DBus.so.3 ln -s libCommonAPI.so.3.1.2 libCommonAPI.so.3 -The folder ./include/CommonAPI-3.1/CommonAPI must contain 3.1.2 includes + +The folder /usr/local/include/CommonAPI-3.1/CommonAPI must contain 3.1.2 include files + +============= +In case the .pc are not well generated, please add these files to /usr/local/lib/pkgconfig + +CommonAPI.pc + +prefix=/usr/local +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Common API C++ +Description: GENIVI Common API C++ Library +Version: 3.1.2 +Libs: -L${libdir} -lCommonAPI +Cflags: -I${includedir}/CommonAPI-3.1 + +CommonAPI-DBus.pc + +prefix=/usr/local +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Common API C++ D-Bus Middleware +Description: GENIVI Common API C++ D-Bus Middleware +Version: 3.1.2 +Requires: CommonAPI dbus-1 +Libs: -L${libdir} -Wl,--no-as-needed -lCommonAPI-DBus -Wl,--as-needed +Cflags: -I${includedir}/CommonAPI-3.1 + +============= +You need to pass as parameter to the cmake the link to your patched dbus library (required by CommonAPI) + +NB: For the 64 bits version, replace 'x86' with 'x86_64' in the command below: cd build -cmake -DWITH_FRANCA_INTERFACE=ON -DCOMMONAPI_DBUS_TOOL_GENERATOR=<common-api-dbus-tools folder>/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=<common-api-tools folder>/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 -DWITH_DEBUG=ON . ../ +cmake -DWITH_FRANCA_INTERFACE=ON -DDBUS_LIB_PATH=yourPath -DCOMMONAPI_DBUS_TOOL_GENERATOR=<common-api-dbus-tools folder>/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=<common-api-tools folder>/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 -DWITH_DEBUG=ON ../ make cd .. @@ -69,9 +113,9 @@ cd .. How To Run poi-manager-server =============================== -Copy the configuration file commonapi-dbus.ini in a directory of your choice +Copy the configuration file ./resource/commonapi-dbus.ini in a directory of your choice -Set the environment variable COMMONAPI_DBUS_DEFAULT_CONFIG before starting the EnhancedPositionService. +Set the environment variable COMMONAPI_DBUS_DEFAULT_CONFIG before starting the poi-manager-server. Example: export COMMONAPI_DBUS_DEFAULT_CONFIG=<your path>/commonapi-dbus.ini diff --git a/src/poi-service/poi-manager-server/CMakeLists.txt b/src/poi-service/poi-manager-server/CMakeLists.txt index 897565d..bb4faac 100644 --- a/src/poi-service/poi-manager-server/CMakeLists.txt +++ b/src/poi-service/poi-manager-server/CMakeLists.txt @@ -16,6 +16,10 @@ # @licence end@ ########################################################################### project(poi-manager-server) +message(STATUS ${PROJECT_NAME}) + +add_definitions("-std=gnu++11") + set(PARENT_API poiservice) set(ROOT_API navigation) set(API_VERSION_MAJOR 0) diff --git a/src/poi-service/poi-manager-server/poi-manager-server-stub.cpp b/src/poi-service/poi-manager-server/poi-manager-server-stub.cpp index bc33b9a..2832278 100644 --- a/src/poi-service/poi-manager-server/poi-manager-server-stub.cpp +++ b/src/poi-service/poi-manager-server/poi-manager-server-stub.cpp @@ -1259,9 +1259,9 @@ void PoiManagerServerStub::getLocale(const std::shared_ptr<CommonAPI::ClientId> void PoiManagerServerStub::getSupportedLocales(const std::shared_ptr<CommonAPI::ClientId> _client, getSupportedLocalesReply_t _reply) { - std::vector< POIServiceTypes::Locales> localeList; - POIServiceTypes::Locales en_US { "eng","USA", "Latn" }; - POIServiceTypes::Locales fr_FR { "fra","FRA", "Latn" }; + std::vector< NavigationTypes::Locales> localeList; + NavigationTypes::Locales en_US { "eng","USA", "Latn" }; + NavigationTypes::Locales fr_FR { "fra","FRA", "Latn" }; localeList.push_back(en_US); localeList.push_back(fr_FR); diff --git a/src/poi-service/poi-server/CMakeLists.txt b/src/poi-service/poi-server/CMakeLists.txt index d299c54..0243461 100644 --- a/src/poi-service/poi-server/CMakeLists.txt +++ b/src/poi-service/poi-server/CMakeLists.txt @@ -16,9 +16,9 @@ # @licence end@ ########################################################################### project(poi-server) -cmake_minimum_required(VERSION 2.8) +message(STATUS ${PROJECT_NAME}) -message(STATUS "poi-server") +add_definitions("-std=gnu++11") find_package(PkgConfig REQUIRED) diff --git a/test/poi-service/CMakeLists.txt b/test/poi-service/CMakeLists.txt index e45a8e4..a664a34 100644 --- a/test/poi-service/CMakeLists.txt +++ b/test/poi-service/CMakeLists.txt @@ -2,7 +2,7 @@ # @licence app begin@ # SPDX-License-Identifier: MPL-2.0 # -# Component Name: poi-service +# Component Name: poi-service-client # # Author: Philippe Colliot # @@ -15,12 +15,10 @@ # # @licence end@ ########################################################################### -project(poi-service) +project(poi-service-client) cmake_minimum_required(VERSION 2.8) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") - -message(STATUS "poi-service-client") +message(STATUS ${PROJECT_NAME}) option(WITH_FRANCA_INTERFACE "Build using the Franca interfaces" OFF) diff --git a/test/poi-service/README b/test/poi-service/README index 92c2b78..184b05c 100644 --- a/test/poi-service/README +++ b/test/poi-service/README @@ -1,4 +1,4 @@ -Release date of the file: 03-08-2015 +Release date of the file: 18-11-2015 Status: OK Project: @@ -24,7 +24,8 @@ License: See headers and LICENSE file (mainly MPL V2) Test target: -Ubuntu 14.04 LTS +Ubuntu 14.04 LTS 32bits +Ubuntu 15.10 64bits Qt version: Qt5 (to get the version -> qtchooser -print-env, to set the version -> export QT-SELECT=<version>) @@ -117,7 +118,11 @@ How To Build poi-common-manager-client (experimental) First you need to build the poi-manager-server, see the README in ../../src/poi-service cd build + +NB: For the 64 bits version, replace 'x86' with 'x86_64' in the command below: + cmake -DWITH_FRANCA_INTERFACE=ON -DCOMMONAPI_DBUS_TOOL_GENERATOR=<common-api-dbus-tools folder>/org.genivi.commonapi.dbus.cli.product/target/products/org.genivi.commonapi.dbus.cli.product/linux/gtk/x86/commonapi-dbus-generator-linux-x86 -DCOMMONAPI_TOOL_GENERATOR=<common-api-tools folder>/org.genivi.commonapi.core.cli.product/target/products/org.genivi.commonapi.core.cli.product/linux/gtk/x86/commonapi-generator-linux-x86 -DWITH_DEBUG=ON . ../ + make =============================== @@ -125,6 +130,11 @@ How To Run =============================== Launch the server (into ../../src/poi-service) + +Copy the configuration file ./resource/commonapi-dbus.ini in a directory of your choice +Set the environment variable COMMONAPI_DBUS_DEFAULT_CONFIG before starting the poi-manager-server. +Example: +export COMMONAPI_DBUS_DEFAULT_CONFIG=<your path>/commonapi-dbus.ini cp ./resource/poi-database-managed.db ./bin ./bin/poi-manager-server -f ./bin/poi-database-managed.db poi manager server started diff --git a/test/poi-service/poi-client/CMakeLists.txt b/test/poi-service/poi-client/CMakeLists.txt index ff73602..5cfe131 100644 --- a/test/poi-service/poi-client/CMakeLists.txt +++ b/test/poi-service/poi-client/CMakeLists.txt @@ -16,9 +16,10 @@ # @licence end@ ########################################################################### project(poi-client) -cmake_minimum_required(VERSION 2.8) +message(STATUS ${PROJECT_NAME}) -message(STATUS "poi-client") +add_definitions("-std=gnu++11") +add_definitions("-fPIC") find_package(PkgConfig REQUIRED) find_program(QTUIC uic REQUIRED) diff --git a/test/poi-service/poi-contentaccess-module/CMakeLists.txt b/test/poi-service/poi-contentaccess-module/CMakeLists.txt index ccce535..e0400b4 100644 --- a/test/poi-service/poi-contentaccess-module/CMakeLists.txt +++ b/test/poi-service/poi-contentaccess-module/CMakeLists.txt @@ -16,9 +16,10 @@ # @licence end@ ########################################################################### project(poi-contentaccess-module) -cmake_minimum_required(VERSION 2.8) +message(STATUS ${PROJECT_NAME}) -message(STATUS "poi-contentaccess-module") +add_definitions("-std=gnu++11") +add_definitions("-fPIC") find_package(PkgConfig REQUIRED) find_program(QTUIC uic REQUIRED) diff --git a/test/poi-service/poi-manager-client/CMakeLists.txt b/test/poi-service/poi-manager-client/CMakeLists.txt index e85f635..ef1ee9d 100644 --- a/test/poi-service/poi-manager-client/CMakeLists.txt +++ b/test/poi-service/poi-manager-client/CMakeLists.txt @@ -16,6 +16,10 @@ # @licence end@ ########################################################################### project(poi-manager-client) +message(STATUS ${PROJECT_NAME}) + +add_definitions("-std=gnu++11") + set(PARENT_API poiservice) set(ROOT_API navigation) set(API_VERSION_MAJOR 0) diff --git a/test/poi-service/poi-manager-client/main.cpp b/test/poi-service/poi-manager-client/main.cpp index 7d33680..9072ad5 100644 --- a/test/poi-service/poi-manager-client/main.cpp +++ b/test/poi-service/poi-manager-client/main.cpp @@ -99,7 +99,7 @@ private: std::vector<POIServiceTypes::CategoryID> m_category_ids; std::vector<POIServiceTypes::POI_ID> m_poi_ids; POIServiceTypes::PoiAddedDetails m_poi; - POIServiceTypes::Locales m_locales; + NavigationTypes::Locales m_locales; std::string m_strTest; }; @@ -585,6 +585,7 @@ int main(int argc , char** argv ) while (!myProxy->isAvailable()) { usleep(10); } + cout << "poi manager client started" << endl; //index used for argument analysis int next_option; diff --git a/test/poi-service/poi-supplier/CMakeLists.txt b/test/poi-service/poi-supplier/CMakeLists.txt index 4a0cbc0..18bb55f 100644 --- a/test/poi-service/poi-supplier/CMakeLists.txt +++ b/test/poi-service/poi-supplier/CMakeLists.txt @@ -16,9 +16,9 @@ # @licence end@ ########################################################################### project(poi-supplier) -cmake_minimum_required(VERSION 2.8) +message(STATUS ${PROJECT_NAME}) -message(STATUS "poi-supplier") +add_definitions("-std=gnu++11") find_package(PkgConfig REQUIRED) |