POI ID format updated to uint64 to be compliant with OSM ID

8 files changed, 28 insertions, 28 deletions

diff --git a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
index 92b210c..2f64b02 100644
--- a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
+++ b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
@@ -82,7 +82,7 @@ variant_string(std::string s)
 }
 
 static bool
-do_sort_distance(::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > a, ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > b)
+do_sort_distance(::DBus::Struct< uint64_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > a, ::DBus::Struct< uint64_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > b)
 {
 	return a._5 < b._5;
 }
@@ -145,11 +145,11 @@ class ContentAccessModule
     item_type m_bottom_poi_type;
     std::vector< uint32_t > m_poiCategoriesId;
     std::vector<poiCategoryIdRadius> m_poiCategoriesIdRadius;
-    std::vector< ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > > m_resultList;
+    std::vector< ::DBus::Struct< uint64_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > > m_resultList;
     std::string m_inputString;
     int m_max_radius;
     uint16_t m_max_requested_size;
-    bool (*m_sort_func)(::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > a, ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > b);
+    bool (*m_sort_func)(::DBus::Struct< uint64_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > a, ::DBus::Struct< uint64_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > b);
     struct coord m_center;
     double m_scale;
     struct mapset *m_mapset;
@@ -242,7 +242,7 @@ class ContentAccessModule
     {
         struct attr label;
         struct coord c;
-        ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > >  result;
+        ::DBus::Struct< uint64_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > >  result;
         ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > attribute;
         bool stringMatched=false;
 
@@ -364,7 +364,7 @@ class ContentAccessModule
     }
 
     void
-    removePOIs(const std::vector< uint32_t >& ids)
+    removePOIs(const std::vector< uint64_t >& ids)
     {
         throw DBus::ErrorNotSupported("Not yet supported");
     }
@@ -470,7 +470,7 @@ class ContentAccessModule
     }
 
     void
-    ResultListRequested(const uint8_t& camId, const uint32_t& poiSearchHandle, const std::vector< uint32_t >& attributeList, int32_t& statusValue, uint16_t& resultListSize, std::vector< ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > >& resultList)
+    ResultListRequested(const uint8_t& camId, const uint32_t& poiSearchHandle, const std::vector< uint32_t >& attributeList, int32_t& statusValue, uint16_t& resultListSize, std::vector< ::DBus::Struct< uint64_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > >& resultList)
 	{
 		struct item *item;
         int count=0;
@@ -506,13 +506,13 @@ class ContentAccessModule
 		resultListSize=resultList.size();
 	}
 
-    std::vector< ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > >
-	PoiDetailsRequested(const std::vector< uint32_t >& source_id)
+    std::vector< ::DBus::Struct< ::DBus::Struct< uint64_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > >
+    PoiDetailsRequested(const std::vector< uint64_t >& source_id)
 	{
-        std::vector< ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > > ret;
+        std::vector< ::DBus::Struct< ::DBus::Struct< uint64_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > > ret;
 		for (int i = 0 ; i < source_id.size() ; i++) {
 			int sid=source_id[i];
-            ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > result;
+            ::DBus::Struct< ::DBus::Struct< uint64_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > result;
 			result._1._1=sid; /* source id */
 			result._1._2=m_resultList[sid]._2; /* name */
             result._1._3._1=m_resultList[sid]._4._1; /* lat */
diff --git a/src/navigation/update_third_party.sh b/src/navigation/update_third_party.sh
index 35204e8..57823fb 100755
--- a/src/navigation/update_third_party.sh
+++ b/src/navigation/update_third_party.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 positioning_version='d4c46f13019aefb11aebd0fc1210a29a46f0b521'
-navit_version='3f26accd04c0f9733f2c8bf7bf58235e2d47a734'
+navit_version='77b0b67935ae90d4fcb8f2cf4a07cd6dc1bed9b7'
 
 echo "version of positioning is: $positioning_version"
 echo "version of navit is: $navit_version"
diff --git a/src/poi-service/poi-common/poi-common-data-model.h b/src/poi-service/poi-common/poi-common-data-model.h
index e8b4cf9..187e60b 100644
--- a/src/poi-service/poi-common/poi-common-data-model.h
+++ b/src/poi-service/poi-common/poi-common-data-model.h
@@ -30,7 +30,7 @@
 
 // Content of this file is the result of several updates of code used by different projects and for this reason is still messy
 
-typedef uint32_t poiId_t;
+typedef uint64_t poiId_t;
 typedef uint32_t categoryId_t;
 typedef uint32_t resourceId_t;
 typedef uint32_t attributeId_t;
diff --git a/src/poi-service/poi-common/poi-common-dbus-data-model.h b/src/poi-service/poi-common/poi-common-dbus-data-model.h
index e8e3f76..be0b6b0 100644
--- a/src/poi-service/poi-common/poi-common-dbus-data-model.h
+++ b/src/poi-service/poi-common/poi-common-dbus-data-model.h
@@ -903,7 +903,7 @@ private:
     geoCoordinate3D_t m_geoCoordinate3D;
 };
 
-class DBus_poiDetails : DBus_dataFormatConverter //(us(ddd))
+class DBus_poiDetails : DBus_dataFormatConverter //(ts(ddd))
 {
 public:
     struct poiDetails_t
@@ -912,7 +912,7 @@ public:
         std::string name;
         DBus_geoCoordinate3D::geoCoordinate3D_t location;
     };
-    typedef ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, double > > DBus_poiDetails_t;
+    typedef ::DBus::Struct< uint64_t, std::string, ::DBus::Struct< double, double, double > > DBus_poiDetails_t;
 
     DBus_poiDetails(){
         DBus_geoCoordinate3D loc;
@@ -957,7 +957,7 @@ private:
     poiDetails_t m_poiDetails;
 };
 
-class DBus_searchResult : DBus_dataFormatConverter //(uuia(ui(yv))) -->in this implementation, the variant data depends on the value of 'type'
+class DBus_searchResult : DBus_dataFormatConverter //(tuia(ui(yv))) -->in this implementation, the variant data depends on the value of 'type'
 {
 public:
     struct searchResult_t
@@ -968,7 +968,7 @@ public:
         std::vector<DBus_poiAttribute::poiAttribute_t> attributes;
     };
 
-    typedef ::DBus::Struct< uint32_t, uint32_t, int32_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > DBus_searchResult_t;
+    typedef ::DBus::Struct< uint64_t, uint32_t, int32_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > DBus_searchResult_t;
 
     DBus_searchResult(){
         DBus_poiAttribute attrib;
@@ -1032,7 +1032,7 @@ private:
     searchResult_t m_searchResult;
 };
 
-class DBus_searchResultDetails : DBus_dataFormatConverter // ((us(ddd))aua(ui(yv))) -->in this implementation, the variant data depends on the value of 'type'
+class DBus_searchResultDetails : DBus_dataFormatConverter // ((ts(ddd))aua(ui(yv))) -->in this implementation, the variant data depends on the value of 'type'
 {
 public:
     struct searchResultDetails_t
@@ -1042,7 +1042,7 @@ public:
         std::vector<DBus_poiAttribute::poiAttribute_t> attributes;
     };
 
-    typedef ::DBus::Struct< ::DBus::Struct< uint32_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > DBus_searchResultDetails_t;
+    typedef ::DBus::Struct< ::DBus::Struct< uint64_t, std::string, ::DBus::Struct< double, double, double > >, std::vector< uint32_t >, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > DBus_searchResultDetails_t;
 
 
     DBus_searchResultDetails(){
@@ -1123,7 +1123,7 @@ private:
     searchResultDetails_t m_searchResultDetails;
 };
 
-class DBus_poiCAMDetails : DBus_dataFormatConverter // (usq(ddd)qa(ui(yv))) -->in this implementation, the variant data depends on the value of 'type'
+class DBus_poiCAMDetails : DBus_dataFormatConverter // (tsq(ddd)qa(ui(yv))) -->in this implementation, the variant data depends on the value of 'type'
 {
 public:
     struct poiCAMDetails_t //no class used into this public structure
@@ -1136,7 +1136,7 @@ public:
         std::vector<DBus_poiAttribute::poiAttribute_t> attributes;
     };
 
-    typedef ::DBus::Struct< uint32_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > DBus_poiCAMDetails_t;
+    typedef ::DBus::Struct< uint64_t, std::string, uint32_t, ::DBus::Struct< double, double, double >, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > DBus_poiCAMDetails_t;
 
     DBus_poiCAMDetails(){
         DBus_poiAttribute attrib;
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 07a917f..22f9d08 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
@@ -675,7 +675,7 @@ sqlRequest::SQL_REQUEST_ERRORS sqlRequest::getFreePoiId(POIServiceTypes::POI_ID
     else
     { // Id
         query_line = query_result.at(0);
-        fromString<categoryId_t>(unique_id,query_line[0], std::dec);
+        fromString<POIServiceTypes::POI_ID>(unique_id,query_line[0], std::dec);
         ret = OK;
     }
 
diff --git a/src/poi-service/poi-manager-server/poi-manager-server-stub.h b/src/poi-service/poi-manager-server/poi-manager-server-stub.h
index fc03c4b..62bee90 100644
--- a/src/poi-service/poi-manager-server/poi-manager-server-stub.h
+++ b/src/poi-service/poi-manager-server/poi-manager-server-stub.h
@@ -62,7 +62,7 @@ public:
         OK
     } SQL_REQUEST_ERRORS;
 
-    typedef uint32_t recordId_t;
+    typedef uint64_t recordId_t;
     typedef uint32_t iconId_t;
     typedef uint32_t poiproviderId_t;
 
diff --git a/src/poi-service/poi-server/main.cpp b/src/poi-service/poi-server/main.cpp
index 8ebf984..1b3e46b 100644
--- a/src/poi-service/poi-server/main.cpp
+++ b/src/poi-service/poi-server/main.cpp
@@ -140,17 +140,17 @@ void contentAccessModule::CategoriesRemoved(const std::vector< uint32_t >& categ
 
 }
 
-void contentAccessModule::POIAdded(const std::vector< uint32_t >& pois)
+void contentAccessModule::POIAdded(const std::vector<uint64_t> &pois)
 {
 
 }
 
-void contentAccessModule::POIRemoved(const std::vector< uint32_t >& pois)
+void contentAccessModule::POIRemoved(const std::vector< uint64_t >& pois)
 {
 
 }
 
-void contentAccessModule::SearchStatusChanged(const uint32_t& poiSearchHandle, const int32_t& statusValue, const std::vector< uint32_t >& pois)
+void contentAccessModule::SearchStatusChanged(const uint32_t& poiSearchHandle, const int32_t& statusValue, const std::vector< uint64_t >& pois)
 {
 
 }
diff --git a/src/poi-service/poi-server/poi-server-class.h b/src/poi-service/poi-server/poi-server-class.h
index 49e12f1..12906dc 100644
--- a/src/poi-service/poi-server/poi-server-class.h
+++ b/src/poi-service/poi-server/poi-server-class.h
@@ -100,9 +100,9 @@ public:
 
     void ConfigurationChanged(const std::vector< uint16_t >& changedSettings);
     void CategoriesRemoved(const std::vector< uint32_t >& categories);
-    void POIAdded(const std::vector< uint32_t >& pois);
-    void POIRemoved(const std::vector< uint32_t >& pois);
-    void SearchStatusChanged(const uint32_t& poiSearchHandle, const int32_t& statusValue, const std::vector< uint32_t >& pois);
+    void POIAdded(const std::vector< uint64_t >& pois);
+    void POIRemoved(const std::vector< uint64_t >& pois);
+    void SearchStatusChanged(const uint32_t& poiSearchHandle, const int32_t& statusValue, const std::vector<uint64_t> &pois);
 
 private: