From 5baf475a1acbfee437ab60cbaeaf68fefcaddd35 Mon Sep 17 00:00:00 2001
From: Matt Ranostay <matt.ranostay@konsulko.com>
Date: Sun, 22 Sep 2019 20:32:53 -0700
Subject: Revert "qml: add OpenStreetMaps map engine option"

This reverts commit 462f009d423e6b158c6a442ffe1a66f7ed2ca847.

Bug-AGL: SPEC-2667
Change-Id: I2e962fb3b5508863d9212d49d423ad0ce7fbd332
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
---
 README.md                             |  3 ---
 app/app.pro                           | 12 ++----------
 app/file_operation.cpp                |  2 --
 app/openstreetmaps/MapPlugin.qml      | 30 ------------------------------
 app/openstreetmaps/openstreetmaps.qrc |  5 -----
 5 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 app/openstreetmaps/MapPlugin.qml
 delete mode 100644 app/openstreetmaps/openstreetmaps.qrc

diff --git a/README.md b/README.md
index 7dbe21f..fb77f41 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,6 @@ https://doc-snapshots.qt.io/qt5-5.9/qtlocation-mapviewer-example.html
 
 #build step
 
-NOTE: To use OpenStreetMaps instead of MapBox you should replace
-the qmake step below with 'qmake ../ ENABLE_OSM=1'
-
 source /SDK_PATH/environment-setup-aarch64-agl-linux
 
 mkdir build
diff --git a/app/app.pro b/app/app.pro
index da5d28b..9965675 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -26,16 +26,8 @@ SOURCES += main.cpp \
 
 RESOURCES += \
     navigation.qrc \
-    images/images.qrc
-
-ENABLE_OSM = $$ENABLE_OSM
-
-equals(ENABLE_OSM, 1) {
-    DEFINES += ENABLE_OSM
-    RESOURCES += openstreetmaps/openstreetmaps.qrc
-} else {
-    RESOURCES += mapbox/mapbox.qrc
-}
+    images/images.qrc \
+    mapbox/mapbox.qrc
 
 LIBS += $$OUT_PWD/../dbus_interface/libdbus_interface.a
 INCLUDEPATH += $$OUT_PWD/../dbus_interface
diff --git a/app/file_operation.cpp b/app/file_operation.cpp
index f3814d8..09bd4d0 100644
--- a/app/file_operation.cpp
+++ b/app/file_operation.cpp
@@ -27,14 +27,12 @@ void File_Operation::initFileOperation(){
     QJsonDocument jsonDoc(QJsonDocument::fromJson(data));
     QJsonObject jsonObj(jsonDoc.object());
 
-#ifndef ENABLE_OSM
     if(jsonObj.contains("mapAccessToken")){
         m_mapAccessToken = jsonObj["mapAccessToken"].toString();
     }else{
         fprintf(stderr,"Failed to find mapAccessToken data \"%s\": %m", qPrintable(NAVI_CONFIG_FILEPATH));
         return;
     }
-#endif
 
     if(jsonObj.contains("speed")){
         m_car_speed = jsonObj["speed"].toDouble();
diff --git a/app/openstreetmaps/MapPlugin.qml b/app/openstreetmaps/MapPlugin.qml
deleted file mode 100644
index 785fc80..0000000
--- a/app/openstreetmaps/MapPlugin.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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: "osm"
-    PluginParameter {
-        name: "osm.mapping.host";
-        value: "https://a.tile.openstreetmap.org/"
-    }
-}
-
diff --git a/app/openstreetmaps/openstreetmaps.qrc b/app/openstreetmaps/openstreetmaps.qrc
deleted file mode 100644
index 9052f66..0000000
--- a/app/openstreetmaps/openstreetmaps.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>MapPlugin.qml</file>
-    </qresource>
-</RCC>
-- 
cgit 1.2.3-korg