update to 64 bits poi ids and complete dbusif for uint64

5 files changed, 34 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index 771ec71..49c1adf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ bin/
 *.user*
 *.txt.user*
 /.project
+*.qmlc
+*.jsc
diff --git a/src/hmi/hmi-launcher/dbusif.cpp b/src/hmi/hmi-launcher/dbusif.cpp
index 85adec7..7cc83cf 100644
--- a/src/hmi/hmi-launcher/dbusif.cpp
+++ b/src/hmi/hmi-launcher/dbusif.cpp
@@ -85,7 +85,9 @@ dbus_from_qml(QVariant v)
 		return QVariant(l[1].toInt());
 	} else if (type == "uint32" || type == "byte") {
 		return QVariant(l[1].toUInt());
-	} else if (type == "string") {
+    } else if (type == "uint64") {
+        return QVariant(l[1].toULongLong());
+    } else if (type == "string") {
 		return QVariant(l[1].toString());
 	} else {
 		qDebug() << "Unknown type" << type;
@@ -119,7 +121,11 @@ qml_from_dbus(QVariant v)
 	QVariantList r;
 	const char *type=v.typeName();
 	switch (v.type()) {
-	case QVariant::UInt:
+    case QVariant::ULongLong:
+        r.append("uint64");
+        r.append(v.toULongLong());
+        break;
+    case QVariant::UInt:
 		r.append("uint32");
 		r.append(v.toUInt());
 		break;
@@ -313,10 +319,18 @@ qml_from_dbus_iter(DBusMessageIter *iter)
 			r.append(v);
 		}
 		break;
-	case DBUS_TYPE_UINT32:
+    case DBUS_TYPE_UINT32:
+        {
+            dbus_uint32_t v;
+            r.append("uint32");
+            dbus_message_iter_get_basic(iter, &v);
+            r.append(v);
+        }
+        break;
+    case DBUS_TYPE_UINT64:
 		{
-			dbus_uint32_t v;
-			r.append("uint32");
+            qulonglong v;
+            r.append("uint64");
 			dbus_message_iter_get_basic(iter, &v);
 			r.append(v);
 		}
@@ -385,7 +399,9 @@ signature_from_qml(QVariant t, QVariant v)
 		return QString(DBUS_TYPE_UINT16);
 	} else if (type == "uint32") {
 		return QString(DBUS_TYPE_UINT32);
-	} else if (type == "string") {
+    } else if (type == "uint64") {
+        return QString(DBUS_TYPE_UINT64);
+    } else if (type == "string") {
 		return QString(DBUS_TYPE_STRING);
 	} else if (type == "variant") {
 		return QString(DBUS_TYPE_VARIANT);
@@ -453,10 +469,14 @@ dbus_iter_append_from_qml(DBusMessageIter *iter, QVariant t, QVariant v)
 		if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &val))
 			return false;
 	} else if (type == "uint32") {
-		dbus_uint32_t val=v.toUInt();
+        dbus_uint32_t val=v.toUInt();
 		if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT32, &val))
 			return false;
-	} else if (type == "variant") {
+    } else if (type == "uint64") {
+        dbus_uint64_t val=v.toULongLong();
+        if (!dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT64, &val))
+            return false;
+    } else if (type == "variant") {
 		QVariantList va=v.value <QVariantList>();
 		if (va.size() != 2)  {
 			qDebug() << "variant must have 2 elements, not " << va.size();
diff --git a/src/hmi/qml/Core/genivi-capi.js b/src/hmi/qml/Core/genivi-capi.js
index 2debbd0..f8d8f30 100644
--- a/src/hmi/qml/Core/genivi-capi.js
+++ b/src/hmi/qml/Core/genivi-capi.js
@@ -1228,7 +1228,7 @@ function poisearch_GetPoiDetails(dbusInterface,dltInterface,ids)
     var value=[];
     for(var i=0;i<ids.length;i+=1)
     {
-        value=value.concat(["uint32",ids[i]]);
+        value=value.concat(["uint64",ids[i]]);
     }
     return poisearch_message_get(dbusInterface,dltInterface,"getPoiDetails",["array",value]);
 }
diff --git a/src/hmi/qml/Core/genivi-origin.js b/src/hmi/qml/Core/genivi-origin.js
index 59650f0..a5f8c9f 100644
--- a/src/hmi/qml/Core/genivi-origin.js
+++ b/src/hmi/qml/Core/genivi-origin.js
@@ -1226,7 +1226,7 @@ function poisearch_GetPoiDetails(dbusInterface,dltInterface,ids)
     var value=[];
     for(var i=0;i<ids.length;i+=1)
     {
-        value=value.concat(["uint32",ids[i]]);
+        value=value.concat(["uint64",ids[i]]);
     }
     return poisearch_message_get(dbusInterface,dltInterface,"GetPoiDetails",["array",value]);
 }
diff --git a/src/update_third_party.sh b/src/update_third_party.sh
index a6f4c5b..0e34bc4 100755
--- a/src/update_third_party.sh
+++ b/src/update_third_party.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-navigation_version='eb90438a1d4729751c0768e0b65fc8c940741d65'
+navigation_version='03a340b57c464301689f39e7d11e7833a9c4d87d'
 positioning_version='d4c46f13019aefb11aebd0fc1210a29a46f0b521'
-navit_version='3f26accd04c0f9733f2c8bf7bf58235e2d47a734'
+navit_version='77b0b67935ae90d4fcb8f2cf4a07cd6dc1bed9b7'
 
 echo "version of navigation is: $navigation_version"
 echo "version of positioning is: $positioning_version"