aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/app.pro4
-rw-r--r--app/mapbox/MapPlugin.qml30
-rw-r--r--app/mapbox/mapbox.qrc5
-rwxr-xr-xapp/navigation.qml13
4 files changed, 39 insertions, 13 deletions
diff --git a/app/app.pro b/app/app.pro
index 8783f53..9965675 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -26,7 +26,8 @@ SOURCES += main.cpp \
RESOURCES += \
navigation.qrc \
- images/images.qrc
+ images/images.qrc \
+ mapbox/mapbox.qrc
LIBS += $$OUT_PWD/../dbus_interface/libdbus_interface.a
INCLUDEPATH += $$OUT_PWD/../dbus_interface
@@ -35,4 +36,3 @@ include(app.pri)
DISTFILES +=
-
diff --git a/app/mapbox/MapPlugin.qml b/app/mapbox/MapPlugin.qml
new file mode 100644
index 0000000..d0d3938
--- /dev/null
+++ b/app/mapbox/MapPlugin.qml
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2016 The Qt Company Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import QtQuick 2.6
+import QtQuick.Layouts 1.1
+import QtQuick.Controls 2.0
+import QtLocation 5.9
+import QtPositioning 5.6
+
+Plugin {
+ name: "mapbox"
+ PluginParameter {
+ name: "mapbox.access_token";
+ value: fileOperation.getMapAccessToken()
+ }
+}
+
diff --git a/app/mapbox/mapbox.qrc b/app/mapbox/mapbox.qrc
new file mode 100644
index 0000000..9052f66
--- /dev/null
+++ b/app/mapbox/mapbox.qrc
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/">
+ <file>MapPlugin.qml</file>
+ </qresource>
+</RCC>
diff --git a/app/navigation.qml b/app/navigation.qml
index c4eba78..2ce1cb6 100755
--- a/app/navigation.qml
+++ b/app/navigation.qml
@@ -60,11 +60,7 @@ ApplicationWindow {
width: parent.width
height: parent.height
- plugin: Plugin {
- name: "mapbox"
- PluginParameter { name: "mapbox.access_token";
- value: fileOperation.getMapAccessToken() }
- }
+ plugin: MapPlugin { }
center: QtPositioning.coordinate(car_position_lat, car_position_lon)
zoomLevel: default_zoom_level
bearing: 0
@@ -214,12 +210,7 @@ ApplicationWindow {
RouteModel {
id: routeModel
objectName: "routeModel"
- plugin : Plugin {
- name: "mapbox"
- PluginParameter { name: "mapbox.access_token";
- value: fileOperation.getMapAccessToken()
- }
- }
+ plugin: MapPlugin { }
query: RouteQuery {
id: routeQuery
}