diff options
| author | <philippe colliot> | 2015-04-16 16:44:40 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2015-04-16 16:44:40 +0200 |
| commit | 5e5ecad2a37e4c369fd181468b056819b3432a77 (patch) | |
| tree | 5b375f7a748116093afabcbfab1806db6a81841d | |
| parent | 3d618322fdc19988e350269825889d107e308f15 (diff) | |
| download | poi-service-5e5ecad2a37e4c369fd181468b056819b3432a77.tar.gz | |
Fix bug in enhanced plugin
| -rw-r--r-- | src/navigation/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt index b4c6fa5..d70295b 100644 --- a/src/navigation/CMakeLists.txt +++ b/src/navigation/CMakeLists.txt @@ -211,7 +211,7 @@ endif() # Check if navit stuff with the right version has been cloned and do it if necessary set(navit_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/navit) set(navit_URL http://svn.code.sf.net/p/navit/code/trunk) -set(navit_VERSION 6025) +set(navit_VERSION 6084) set(navit_PATCH_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/patches) set(navit_PATCH_DUMMY_FILE_SPELL ${navit_SRC_DIR}/.patched-spell) set(navit_PATCH_DUMMY_FILE_LM ${navit_SRC_DIR}/.patched-lm) diff --git a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx index fcc5845..8b24f6f 100644 --- a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx +++ b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx @@ -94,7 +94,7 @@ class EnhancedPosition dbg(lvl_debug,"enter\n"); int i; bool position_found=false; - if ((changedValues & (GENIVI_ENHANCEDPOSITIONSERVICE_LATITUDE || GENIVI_ENHANCEDPOSITIONSERVICE_LONGITUDE)) == (GENIVI_ENHANCEDPOSITIONSERVICE_LATITUDE || GENIVI_ENHANCEDPOSITIONSERVICE_LONGITUDE)) + if ((changedValues & (GENIVI_ENHANCEDPOSITIONSERVICE_LATITUDE | GENIVI_ENHANCEDPOSITIONSERVICE_LONGITUDE)) == (GENIVI_ENHANCEDPOSITIONSERVICE_LATITUDE | GENIVI_ENHANCEDPOSITIONSERVICE_LONGITUDE)) { position_found=true; } @@ -235,12 +235,12 @@ vehicle_process_map(struct vehicle_priv *priv, std::map< uint64_t, ::DBus::Varia static void vehicle_enhancedposition_callback(struct vehicle_priv *priv) { - dbg(lvl_debug,"enter\n"); - uint64_t valuesToReturn = (GENIVI_ENHANCEDPOSITIONSERVICE_LATITUDE || GENIVI_ENHANCEDPOSITIONSERVICE_LONGITUDE || GENIVI_ENHANCEDPOSITIONSERVICE_SPEED); + uint64_t valuesToReturn = (GENIVI_ENHANCEDPOSITIONSERVICE_LATITUDE | GENIVI_ENHANCEDPOSITIONSERVICE_LONGITUDE | GENIVI_ENHANCEDPOSITIONSERVICE_SPEED); std::map< uint64_t, ::DBus::Variant > position; uint64_t timestamp; priv->enhanced_position->GetPositionInfo(valuesToReturn,timestamp,position); - vehicle_process_map(priv, position); + dbg(lvl_debug,"enter GetPositionInfo\n"); + vehicle_process_map(priv, position); time(&priv->fix_time); /* FIXME: Use actual value */ priv->fix_type=2; /* 3d, FIXME: Use actual value */ callback_list_call_attr_0(priv->cbl, attr_position_coord_geo); |