diff options
| author | <philippe colliot> | 2014-07-25 14:09:21 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2014-07-25 14:09:21 +0200 |
| commit | 87c269df36622bcc00f9c87578c30385b4f64a37 (patch) | |
| tree | ed7877e3e3f6ab90b5bde4151eb7feb42dd53682 | |
| parent | 17525d7011403ec339dd90ef8a4184b04440f678 (diff) | |
| download | poi-service-87c269df36622bcc00f9c87578c30385b4f64a37.tar.gz | |
align the positioning version used by the poi poc to the one used by
navigation
| -rw-r--r-- | src/poi-service/poi-common/common-data-model.h | 4 | ||||
| -rw-r--r-- | src/poi-service/poi-server/main.cpp | 2 | ||||
| -rw-r--r-- | src/poi-service/script/get-positioning.mk | 2 | ||||
| -rw-r--r-- | test/poi-service/script/get-positioning.mk | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/poi-service/poi-common/common-data-model.h b/src/poi-service/poi-common/common-data-model.h index 7572160..7239505 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; - int altitude; + double altitude; }; - typedef ::DBus::Struct< double, double, int32_t > DBus_geoCoordinate3D_t; + typedef ::DBus::Struct< double, double, double > 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 0d6fce0..394bd2f 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<int>(poi.coordinate.altitude,sqlQueryLine[4], std::dec); + fromString<double>(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/src/poi-service/script/get-positioning.mk b/src/poi-service/script/get-positioning.mk index 53f6a7a..963b35c 100644 --- a/src/poi-service/script/get-positioning.mk +++ b/src/poi-service/script/get-positioning.mk @@ -28,7 +28,7 @@ positioning_SRC=$(ROOT_DIR)/positioning positioning_API=$(positioning_SRC)/enhanced-position-service/api positioning_URL=http://git.projects.genivi.org/lbs/positioning.git -positioning_VERSION=c97c3e10cb0f38dfed5e17b995e33173567d2dbf +positioning_VERSION=09698f63ea27a24c533b4c015155ee9ebd7a3026 ALL+=positioning SRC_CLEAN+=clean-positioning_SRC diff --git a/test/poi-service/script/get-positioning.mk b/test/poi-service/script/get-positioning.mk index 141768c..6b56e04 100644 --- a/test/poi-service/script/get-positioning.mk +++ b/test/poi-service/script/get-positioning.mk @@ -29,7 +29,7 @@ positioning_SRC=$(ROOT_DIR)/positioning positioning_API=$(positioning_SRC)/enhanced-position-service/api positioning_URL=http://git.projects.genivi.org/lbs/positioning.git -positioning_VERSION=963d70c3d3a1f534146372e24c4d53a57d14ade2 +positioning_VERSION=09698f63ea27a24c533b4c015155ee9ebd7a3026 ALL+=positioning SRC_CLEAN+=clean-positioning_SRC |