From afe3b4385618bf6ca2ab730724283d21b1bfdce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= <ltinkl@luxoft.com>
Date: Thu, 7 Jun 2018 14:58:40 +0200
Subject: [maps] replace all "osm" plugin occurrences with "here"

Fixes the broken search+intent features, makes things faster and also
supports sharing a single Plugin instance between the different models.

Clean up some signal signatures to use "string" instead of "var" type

Task-number: AUTOSUITE-539
Change-Id: I100938555da73b2cba1b41d5d03ec52cc768d6b7
Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
---
 apps/com.pelagicore.map/panels/MapBoxPanel.qml     |  2 +-
 .../panels/SearchOverlayPanel.qml                  |  4 ++--
 apps/com.pelagicore.map/stores/MapStore.qml        | 26 ++++++++++------------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/apps/com.pelagicore.map/panels/MapBoxPanel.qml b/apps/com.pelagicore.map/panels/MapBoxPanel.qml
index 848b6775..9d10b9f9 100644
--- a/apps/com.pelagicore.map/panels/MapBoxPanel.qml
+++ b/apps/com.pelagicore.map/panels/MapBoxPanel.qml
@@ -76,7 +76,7 @@ Item {
     signal maximizeMap()
     signal startNavigationRequested()
     signal stopNavigationRequested()
-    signal showRouteRequested(var destCoord, var description)
+    signal showRouteRequested(var destCoord, string description)
 
     function zoomIn() {
         mainMap.zoomLevel += 1.0;
diff --git a/apps/com.pelagicore.map/panels/SearchOverlayPanel.qml b/apps/com.pelagicore.map/panels/SearchOverlayPanel.qml
index c210128a..6d74e4a5 100644
--- a/apps/com.pelagicore.map/panels/SearchOverlayPanel.qml
+++ b/apps/com.pelagicore.map/panels/SearchOverlayPanel.qml
@@ -51,8 +51,8 @@ ColumnLayout {
     signal backButtonClicked()
     signal searchFieldAccepted()
     signal escapePressed()
-    signal searchQueryChanged(var searchQuery)
-    signal itemClicked(var index, string addressText, var coordinate, var boundingBox)
+    signal searchQueryChanged(string searchQuery)
+    signal itemClicked(int index, string addressText, var coordinate, var boundingBox)
 
     ToolButton {
         anchors.left: parent.left
diff --git a/apps/com.pelagicore.map/stores/MapStore.qml b/apps/com.pelagicore.map/stores/MapStore.qml
index 4ce0e53f..cf1ed23c 100644
--- a/apps/com.pelagicore.map/stores/MapStore.qml
+++ b/apps/com.pelagicore.map/stores/MapStore.qml
@@ -38,7 +38,6 @@ import utils 1.0
 QtObject {
     id: root
 
-    readonly property bool calculating: routeModel.status === RouteModel.Loading
     readonly property alias model: routeModel
     property string routeDistance
     property string routeTime
@@ -78,11 +77,7 @@ QtObject {
     }
 
     property GeocodeModel intentGeoCodeModel: GeocodeModel {
-        plugin: Plugin {
-            name: "osm";
-            locales: Style.languageLocale
-            PluginParameter { name: "osm.useragent"; value: "Neptune UI" }
-        }
+        plugin: herePlugin
         limit: 20
         onCountChanged: {
             if (count > 0) {
@@ -91,6 +86,13 @@ QtObject {
         }
     }
 
+    readonly property Plugin herePlugin: Plugin {
+        name: "here";
+        locales: Style.languageLocale
+        PluginParameter { name: "here.app_id"; value: "jC7kvNx3H7lFMuExMDA7" }
+        PluginParameter { name: "here.token"; value: "0ehO2fWIAfkyOB5oxL6_cw" }
+    }
+
     signal intentNavigationRequested(string address, var coord, var boundingBox)
 
     function fetchCurrentLocation() { // PositionSource doesn't work on Linux
@@ -186,11 +188,7 @@ QtObject {
     }
 
     readonly property GeocodeModel geocodeModel: GeocodeModel {
-        plugin: Plugin {
-            name: "osm";
-            locales: Style.languageLocale
-            PluginParameter { name: "osm.useragent"; value: "Neptune UI" }
-        }
+        plugin: herePlugin
         onStatusChanged: {
             if (status === RouteModel.Null) {
                 console.info("Search model idle");
@@ -211,7 +209,7 @@ QtObject {
         query: RouteQuery {
             waypoints: [root.startCoord, root.destCoord]
         }
-        plugin: Plugin { name: "osm" }
+        plugin: herePlugin
 
         onStatusChanged: {
             if (status === RouteModel.Null) {
@@ -238,7 +236,7 @@ QtObject {
         query: RouteQuery {
             waypoints: [root.currentLocationCoord, root.homeCoord]
         }
-        plugin: Plugin { name: "osm" }
+        plugin: herePlugin
 
         onStatusChanged: {
             if (status === RouteModel.Ready) {
@@ -255,7 +253,7 @@ QtObject {
         query: RouteQuery {
             waypoints: [root.currentLocationCoord, root.workCoord]
         }
-        plugin: Plugin { name: "osm" }
+        plugin: herePlugin
         onStatusChanged: {
             if (status === RouteModel.Ready) {
                 if (count > 0) {
-- 
cgit v1.2.3