bug fix

5 files changed, 30 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index c322685..319dca2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ positioning/
 *.pro.user
 
 /.project
+
+positioning_*/
+
diff --git a/src/navigation/plugins.pro b/src/navigation/plugins.pro
new file mode 100644
index 0000000..351f137
--- /dev/null
+++ b/src/navigation/plugins.pro
@@ -0,0 +1,23 @@
+TEMPLATE = app
+CONFIG += console
+CONFIG -= app_bundle
+CONFIG -= qt
+
+SOURCES += \
+    map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx \
+    map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx \
+    map-viewer/session-plugin/genivi_mapviewer_session.cxx \
+    navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx \
+    navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx \
+    navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx \
+    navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx \
+    navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx \
+    navigation-core/routing-plugin/genivi_navigationcore_routing.cxx \
+    navigation-core/session-plugin/genivi_navigationcore_session.cxx
+
+INCLUDEPATH += ./bin/mapviewer-configuration \
+                ./bin/mapviewer-mapviewercontrol \
+                ./bin/mapviewer-session \
+                ./bin/navigationcore-configuration \
+                ./bin/navigationcore-guidance \
+                ./bin
diff --git a/src/poi-service/poi-common/common-data-model.h b/src/poi-service/poi-common/common-data-model.h
index 7239505..f0091f3 100644
--- a/src/poi-service/poi-common/common-data-model.h
+++ b/src/poi-service/poi-common/common-data-model.h
@@ -1093,9 +1093,9 @@ public:
     {
         double latitude;
         double longitude;
-        double altitude;
+        int32_t altitude;
     };
-    typedef ::DBus::Struct< double, double, double > DBus_geoCoordinate3D_t;
+    typedef ::DBus::Struct< double, double, int32_t > DBus_geoCoordinate3D_t;
 
     DBus_geoCoordinate3D(){
         m_geoCoordinate3D.latitude = 48.85792; //by default center of Paris
diff --git a/src/poi-service/poi-server/main.cpp b/src/poi-service/poi-server/main.cpp
index 394bd2f..9717615 100644
--- a/src/poi-service/poi-server/main.cpp
+++ b/src/poi-service/poi-server/main.cpp
@@ -1788,7 +1788,7 @@ uint16_t poiSearchServer::searchPOIRequest(uint16_t categoryIndex, std::string s
         fromString<uint64_t>(poi.segment,sqlQueryLine[1], std::dec);
         fromString<double>(poi.coordinate.latitude,sqlQueryLine[2], std::dec);
         fromString<double>(poi.coordinate.longitude,sqlQueryLine[3], std::dec);
-        fromString<double>(poi.coordinate.altitude,sqlQueryLine[4], std::dec);
+        fromString<int32_t>(poi.coordinate.altitude,sqlQueryLine[4], std::dec);
         sub_index = 5;
 
         for (attribute_index=0;attribute_index<m_availableCategoryTable[categoryIndex].attributeList.size();attribute_index++)
diff --git a/test/poi-service/.gitignore b/test/poi-service/.gitignore
index 6e9d54c..4a4824a 100644
--- a/test/poi-service/.gitignore
+++ b/test/poi-service/.gitignore
@@ -11,3 +11,4 @@ genivi-*.h
 
 
 
+