use mapbox as navigation

96 files changed, 3132 insertions, 4342 deletions

diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index aa13093..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,39 +0,0 @@
-****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************
diff --git a/LICENSE.for_car_png b/LICENSE.for_car_png
deleted file mode 100644
index 0e259d4..0000000
--- a/LICENSE.for_car_png
+++ /dev/null
@@ -1,121 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.
diff --git a/app/api/GPS.qml b/app/api/GPS.qml
deleted file mode 100644
index 679c66e..0000000
--- a/app/api/GPS.qml
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2017 Konsulko Group
- *
- * 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 QtPositioning 5.5
-import QtWebSockets 1.0
-
-WebSocket {
-    id: root
-    active: true
-    url: bindingAddress
-
-    property string statusString: "waiting..."
-    property string apiString: "gps"
-    property string payloadLength: "9999"
-
-    property bool loop_state: false
-    property bool running: false
-
-    readonly property var msgid: {
-        "call": 2,
-        "retok": 3,
-        "reterr": 4,
-        "event": 5
-    }
-
-    onTextMessageReceived: {
-        var json = JSON.parse(message)
-        //console.debug("Raw response: " + message)
-        var request = json[2].request
-        var response = json[2].response
-        //console.debug("response: " + JSON.stringify(response))
-        switch (json[0]) {
-            case msgid.call:
-                break
-            case msgid.retok:
-                break
-            case msgid.reterr:
-                root.statusString = "Bad return value, binding probably not installed"
-                break
-            case msgid.event:
-                var payload = JSON.parse(JSON.stringify(json[2]))
-                var event = payload.event
-                if (event == "gps/location") {
-                    var data = json[2].data
-                    var latitude = data.latitude
-                    var longitude = data.longitude
-                    var location = QtPositioning.coordinate(latitude, longitude)
-                    if (map.followme || !map.location) {
-                        map.center = location
-                    }
-                    map.location = location
-                    if (data.speed > 1) {
-                        map.updateCompass(data.track)
-                    }
-                }
-                break
-        }
-    }
-
-    onStatusChanged: {
-        switch (status) {
-            case WebSocket.Open:
-            console.debug("onStatusChanged: Open")
-            sendSocketMessage("subscribe", { value: "location" })
-            break
-            case WebSocket.Error:
-            root.statusString = "WebSocket error: " + root.errorString
-            break
-        }
-    }
-
-    function sendSocketMessage(verb, parameter) {
-        var requestJson = [ msgid.call, payloadLength, apiString + '/'
-        + verb, parameter ]
-        console.debug("sendSocketMessage: " + JSON.stringify(requestJson))
-        sendTextMessage(JSON.stringify(requestJson))
-    }
-}
diff --git a/app/api/GeoClue.qml b/app/api/GeoClue.qml
deleted file mode 100644
index 6c8b2f1..0000000
--- a/app/api/GeoClue.qml
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2017 Konsulko Group
- *
- * 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 QtPositioning 5.5
-import QtWebSockets 1.0
-
-WebSocket {
-    id: root
-    active: true
-    url: bindingAddress
-
-    property string statusString: "waiting..."
-    property string apiString: "geoclue"
-    property string payloadLength: "9999"
-
-    property bool loop_state: false
-    property bool running: false
-
-    readonly property var msgid: {
-        "call": 2,
-        "retok": 3,
-        "reterr": 4,
-        "event": 5
-    }
-
-    onTextMessageReceived: {
-        var json = JSON.parse(message)
-        console.debug("Raw response: " + message)
-        var request = json[2].request
-        var response = json[2].response
-        console.debug("response: " + JSON.stringify(response))
-        switch (json[0]) {
-            case msgid.call:
-                break
-            case msgid.retok:
-                var latitude = response.latitude
-                var longitude = response.longitude
-                map.location = QtPositioning.coordinate(latitude, longitude)
-                map.center = map.location
-                break
-            case msgid.reterr:
-                root.statusString = "Bad return value, binding probably not installed"
-                break
-            case msgid.event:
-                break
-        }
-    }
-
-    onStatusChanged: {
-        switch (status) {
-            case WebSocket.Open:
-            console.debug("onStatusChanged: Open")
-            sendSocketMessage("location", 'None')
-            break
-            case WebSocket.Error:
-            root.statusString = "WebSocket error: " + root.errorString
-            break
-        }
-    }
-
-    function sendSocketMessage(verb, parameter) {
-        var requestJson = [ msgid.call, payloadLength, apiString + '/'
-        + verb, parameter ]
-        console.debug("sendSocketMessage: " + JSON.stringify(requestJson))
-        sendTextMessage(JSON.stringify(requestJson))
-    }
-}
diff --git a/app/api/GeoFence.qml b/app/api/GeoFence.qml
deleted file mode 100644
index 7061984..0000000
--- a/app/api/GeoFence.qml
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2017 Konsulko Group
- *
- * 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 QtPositioning 5.5
-import QtWebSockets 1.0
-
-WebSocket {
-    id: root
-    active: true
-    url: bindingAddress
-
-    property string statusString: "waiting..."
-    property string apiString: "geofence"
-    property string payloadLength: "9999"
-
-    property bool loop_state: false
-    property bool running: false
-
-    readonly property var msgid: {
-        "call": 2,
-        "retok": 3,
-        "reterr": 4,
-        "event": 5
-    }
-
-    onTextMessageReceived: {
-        var json = JSON.parse(message)
-        console.debug("Raw response: " + message)
-        var request = json[2].request
-        var response = json[2].response
-        console.debug("response: " + JSON.stringify(response))
-        switch (json[0]) {
-            case msgid.call:
-                break
-            case msgid.retok:
-                break
-            case msgid.reterr:
-                root.statusString = "Bad return value, binding probably not installed"
-                break
-            case msgid.event:
-                var payload = JSON.parse(JSON.stringify(json[2]))
-                var event = payload.event
-                if (event == "geofence/fence") {
-                    var data = json[2].data
-                    console.log("geofence event - name: " + data.name + " state: " + data.state)
-                }
-                break
-        }
-    }
-
-    onStatusChanged: {
-        switch (status) {
-            case WebSocket.Open:
-            console.debug("onStatusChanged: Open")
-            //sendSocketMessage("add_fence", { name: "Stop Sign",
-            //            bbox: { min_longitude: -122.499217, max_longitude: -122.498732,
-            //                    min_latitude: 45.600136, max_latitude: 45.600384 }
-            //            })
-            sendSocketMessage("subscribe", { value: "fence" })
-            break
-            case WebSocket.Error:
-            root.statusString = "WebSocket error: " + root.errorString
-            break
-        }
-    }
-
-    function sendSocketMessage(verb, parameter) {
-        var requestJson = [ msgid.call, payloadLength, apiString + '/'
-        + verb, parameter ]
-        console.debug("sendSocketMessage: " + JSON.stringify(requestJson))
-        sendTextMessage(JSON.stringify(requestJson))
-    }
-}
diff --git a/app/app.pri b/app/app.pri
index c3b1fd1..a1f6562 100644
--- a/app/app.pri
+++ b/app/app.pri
@@ -1,13 +1,18 @@
-TEMPLATE = app
-QMAKE_LFLAGS += "-Wl,--hash-style=gnu -Wl,--as-needed"
-
 load(configure)
+
 qtCompileTest(libhomescreen)
+qtCompileTest(qlibwindowmanager)
 
 config_libhomescreen {
     CONFIG += link_pkgconfig
-    PKGCONFIG += homescreen
+    PKGCONFIG += libhomescreen
     DEFINES += HAVE_LIBHOMESCREEN
 }
 
+config_qlibwindowmanager {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += qlibwindowmanager
+    DEFINES += HAVE_QLIBWINDOWMANAGER
+}
+
 DESTDIR = $${OUT_PWD}/../package/root/bin
diff --git a/app/app.pro b/app/app.pro
index 4eef717..bedd56a 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -1,47 +1,30 @@
-TARGET = navigation
+TARGET = tbtnavi
+TEMPLATE = app
 
-CONFIG += link_pkgconfig
-PKGCONFIG += libhomescreen qlibwindowmanager
+QT += qml network quick positioning location sql widgets
 
-QT = qml network quick positioning location quickcontrols2
+CONFIG += c++14
 
-static {
-    QTPLUGIN += qtvirtualkeyboardplugin
-    QT += svg
+include(app.pri)
+
+ios|android {
+    QT -= widgets
 }
 
-SOURCES += main.cpp
+SOURCES += \
+    main.cpp \
+    qcheapruler.cpp
+
+HEADERS += \
+    qcheapruler.hpp
+
+INCLUDEPATH += \
+    ../include
+
+OTHER_FILES += \
+    qmapboxlgapp.qml
 
 RESOURCES += \
-    mapviewer.qrc
-
-OTHER_FILES +=mapviewer.qml \
-    helper.js \
-    map/MapComponent.qml \
-    map/Marker.qml \
-    map/CircleItem.qml \
-    map/RectangleItem.qml \
-    map/PolylineItem.qml \
-    map/PolygonItem.qml \
-    map/ImageItem.qml \
-    menus/ItemPopupMenu.qml \
-    menus/MainMenu.qml \
-    menus/MapPopupMenu.qml \
-    menus/MarkerPopupMenu \
-    forms/Geocode.qml \
-    forms/GeocodeForm.ui.qml\
-    forms/Message.qml \
-    forms/MessageForm.ui.qml \
-    forms/ReverseGeocode.qml \
-    forms/ReverseGeocodeForm.ui.qml \
-    forms/RouteCoordinate.qml \
-    forms/Locale.qml \
-    forms/LocaleForm.ui.qml \
-    forms/RouteAddress.qml \
-    forms/RouteAddressForm.ui.qml \
-    forms/RouteCoordinateForm.ui.qml \
-    forms/RouteList.qml \
-    forms/RouteListDelegate.qml \
-    forms/RouteListHeader.qml
+    images/images.qrc \
+    app.qrc
 
-include(app.pri)
diff --git a/app/app.qrc b/app/app.qrc
new file mode 100644
index 0000000..f91201a
--- /dev/null
+++ b/app/app.qrc
@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/qmldir</file>
+        <file>qml/CustomLabel.qml</file>
+        <file>qml/DateAndTime.qml</file>
+        <file>qml/Main.qml</file>
+        <file>qml/MapWindow.qml</file>
+    </qresource>
+</RCC>
diff --git a/app/config.tests/libhomescreen/.qmake.stash b/app/config.tests/libhomescreen/.qmake.stash
new file mode 100644
index 0000000..d0807e7
--- /dev/null
+++ b/app/config.tests/libhomescreen/.qmake.stash
@@ -0,0 +1,24 @@
+QMAKE_CXX.INCDIRS = \
+    /usr/include/c++/5 \
+    /usr/include/x86_64-linux-gnu/c++/5 \
+    /usr/include/c++/5/backward \
+    /usr/lib/gcc/x86_64-linux-gnu/5/include \
+    /usr/local/include \
+    /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed \
+    /usr/include/x86_64-linux-gnu \
+    /usr/include
+QMAKE_CXX.LIBDIRS = \
+    /usr/lib/gcc/x86_64-linux-gnu/5 \
+    /usr/lib/x86_64-linux-gnu \
+    /usr/lib \
+    /lib/x86_64-linux-gnu \
+    /lib
+QMAKE_CXX.QT_COMPILER_STDCXX = 199711L
+QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 5
+QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 4
+QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
+QMAKE_CXX.COMPILER_MACROS = \
+    QT_COMPILER_STDCXX \
+    QMAKE_GCC_MAJOR_VERSION \
+    QMAKE_GCC_MINOR_VERSION \
+    QMAKE_GCC_PATCH_VERSION
diff --git a/app/config.tests/libhomescreen/libhomescreen.cpp b/app/config.tests/libhomescreen/libhomescreen.cpp
new file mode 100644
index 0000000..d698b05
--- /dev/null
+++ b/app/config.tests/libhomescreen/libhomescreen.cpp
@@ -0,0 +1,8 @@
+#include <libhomescreen.hpp>
+
+int main(int argc,char **argv)
+{
+    LibHomeScreen libHomeScreen;
+    return 0;
+}
+
diff --git a/app/config.tests/libhomescreen/libhomescreen.pro b/app/config.tests/libhomescreen/libhomescreen.pro
new file mode 100644
index 0000000..7d43112
--- /dev/null
+++ b/app/config.tests/libhomescreen/libhomescreen.pro
@@ -0,0 +1,5 @@
+SOURCES = libhomescreen.cpp
+
+CONFIG -= qt
+CONFIG += link_pkgconfig
+PKGCONFIG += libhomescreen
diff --git a/app/config.tests/qlibwindowmanager/.qmake.stash b/app/config.tests/qlibwindowmanager/.qmake.stash
new file mode 100644
index 0000000..d0807e7
--- /dev/null
+++ b/app/config.tests/qlibwindowmanager/.qmake.stash
@@ -0,0 +1,24 @@
+QMAKE_CXX.INCDIRS = \
+    /usr/include/c++/5 \
+    /usr/include/x86_64-linux-gnu/c++/5 \
+    /usr/include/c++/5/backward \
+    /usr/lib/gcc/x86_64-linux-gnu/5/include \
+    /usr/local/include \
+    /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed \
+    /usr/include/x86_64-linux-gnu \
+    /usr/include
+QMAKE_CXX.LIBDIRS = \
+    /usr/lib/gcc/x86_64-linux-gnu/5 \
+    /usr/lib/x86_64-linux-gnu \
+    /usr/lib \
+    /lib/x86_64-linux-gnu \
+    /lib
+QMAKE_CXX.QT_COMPILER_STDCXX = 199711L
+QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 5
+QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 4
+QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
+QMAKE_CXX.COMPILER_MACROS = \
+    QT_COMPILER_STDCXX \
+    QMAKE_GCC_MAJOR_VERSION \
+    QMAKE_GCC_MINOR_VERSION \
+    QMAKE_GCC_PATCH_VERSION
diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp b/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp
new file mode 100644
index 0000000..bb95c93
--- /dev/null
+++ b/app/config.tests/qlibwindowmanager/qlibwindowmanager.cpp
@@ -0,0 +1,8 @@
+#include <qlibwindowmanager.h>
+
+int main(int argc,char **argv)
+{
+    QLibWindowmanager qwm;
+    return 0;
+}
+
diff --git a/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro b/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro
new file mode 100644
index 0000000..cb51d98
--- /dev/null
+++ b/app/config.tests/qlibwindowmanager/qlibwindowmanager.pro
@@ -0,0 +1,5 @@
+SOURCES = qlibwindowmanager.cpp
+
+CONFIG += qt
+CONFIG += link_pkgconfig
+PKGCONFIG += qlibwindowmanager
diff --git a/app/forms/Geocode.qml b/app/forms/Geocode.qml
deleted file mode 100644
index 9e27325..0000000
--- a/app/forms/Geocode.qml
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtPositioning 5.5
-
-GeocodeForm {
-
-    property variant address
-    signal showPlace(variant address)
-    signal closeForm()
-
-    goButton.onClicked: {
-        // fill out the Address element
-        address.street = street.text
-        address.city = city.text
-        address.state = state.text
-        address.country = country.text
-        address.postalCode = postalCode.text
-        showPlace(address)
-    }
-
-    clearButton.onClicked: {
-        street.text = ""
-        city.text = ""
-        state.text = ""
-        country.text = ""
-        postalCode.text = ""
-    }
-
-    cancelButton.onClicked: {
-        closeForm()
-    }
-
-    Component.onCompleted: {
-        street.text = address.street
-        city.text = address.city
-        state.text = address.state
-        country.text = address.country
-        postalCode.text = address.postalCode
-    }
-}
-
-
diff --git a/app/forms/GeocodeForm.ui.qml b/app/forms/GeocodeForm.ui.qml
deleted file mode 100644
index 3ed715a..0000000
--- a/app/forms/GeocodeForm.ui.qml
+++ /dev/null
@@ -1,173 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.2
-
-Item {
-    property alias goButton: goButton
-    property alias clearButton: clearButton
-    property alias postalCode: postalCode
-    property alias street: street
-    property alias city: city
-    property alias state: state
-    property alias country: country
-    property alias cancelButton: cancelButton
-    Rectangle {
-        id: tabRectangle
-        y: 20
-        height: tabTitle.height * 2
-        color: "#46a2da"
-        anchors.rightMargin: 0
-        anchors.leftMargin: 0
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        Label {
-            id: tabTitle
-            color: "#ffffff"
-            text: qsTr("Geocode")
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Item {
-        id: item2
-        anchors.rightMargin: 20
-        anchors.leftMargin: 20
-        anchors.bottomMargin: 20
-        anchors.topMargin: 20
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: tabRectangle.bottom
-
-
-        GridLayout {
-            id: gridLayout3
-            anchors.rightMargin: 0
-            anchors.bottomMargin: 0
-            anchors.leftMargin: 0
-            anchors.topMargin: 0
-            rowSpacing: 10
-            rows: 1
-            columns: 2
-            anchors.fill: parent
-
-            Label {
-                id: label2
-                text: qsTr("Street")
-            }
-
-            TextField {
-                id: street
-                Layout.fillWidth: true
-            }
-
-            Label {
-                id: label3
-                text: qsTr("City")
-            }
-
-            TextField {
-                id: city
-                Layout.fillWidth: true
-            }
-
-            Label {
-                id: label4
-                text: qsTr("State")
-            }
-
-            TextField {
-                id: state
-                Layout.fillWidth: true
-            }
-
-            Label {
-                id: label5
-                text: qsTr("Country")
-            }
-
-            TextField {
-                id: country
-                Layout.fillWidth: true
-            }
-
-            Label {
-                id: label6
-                text: qsTr("Postal Code")
-            }
-
-            TextField {
-                id: postalCode
-                Layout.fillWidth: true
-            }
-
-            RowLayout {
-                id: rowLayout1
-                Layout.columnSpan: 2
-                Layout.alignment: Qt.AlignRight
-
-                Button {
-                    id: goButton
-                    text: qsTr("Proceed")
-                }
-
-                Button {
-                    id: clearButton
-                    text: qsTr("Clear")
-                }
-
-                Button {
-                    id: cancelButton
-                    text: qsTr("Cancel")
-                }
-            }
-
-            Item {
-                Layout.fillHeight: true
-                Layout.columnSpan: 2
-            }
-        }
-    }
-}
diff --git a/app/forms/Locale.qml b/app/forms/Locale.qml
deleted file mode 100644
index 6e76c98..0000000
--- a/app/forms/Locale.qml
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtPositioning 5.5
-
-LocaleForm {
-    property string locale
-    signal selectLanguage(string language)
-    signal closeForm()
-
-    goButton.onClicked: {
-
-       if (!languageGroup.current) return
-
-       if (otherRadioButton.checked) {
-           selectLanguage(language.text)
-       } else {
-           selectLanguage(languageGroup.current.text)
-       }
-    }
-
-    clearButton.onClicked: {
-        language.text = ""
-    }
-
-    cancelButton.onClicked: {
-        closeForm()
-    }
-
-    Component.onCompleted: {
-        switch (locale) {
-            case "en":
-                enRadioButton.checked = true;
-                break
-            case "fr":
-                frRadioButton.checked = true;
-                break
-            default:
-                otherRadioButton.checked = true;
-                language.text = locale
-                break
-        }
-    }
-}
diff --git a/app/forms/LocaleForm.ui.qml b/app/forms/LocaleForm.ui.qml
deleted file mode 100644
index 91a0847..0000000
--- a/app/forms/LocaleForm.ui.qml
+++ /dev/null
@@ -1,153 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.2
-
-Item {
-    property alias clearButton: clearButton
-    property alias goButton: goButton
-    property alias cancelButton: cancelButton
-    property alias tabTitle: tabTitle
-    property alias languageGroup: languageGroup
-    property alias enRadioButton: enRadioButton
-    property alias frRadioButton: frRadioButton
-    property alias otherRadioButton: otherRadioButton
-    property alias language: language
-
-    Rectangle {
-        id: tabRectangle
-        y: 20
-        height: tabTitle.height * 2
-        color: "#46a2da"
-        anchors.rightMargin: 0
-        anchors.leftMargin: 0
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        Label {
-            id: tabTitle
-            color: "#ffffff"
-            text: "Locale"
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Item {
-        id: item2
-        anchors.rightMargin: 20
-        anchors.leftMargin: 20
-        anchors.bottomMargin: 20
-        anchors.topMargin: 20
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: tabRectangle.bottom
-
-        GridLayout {
-            id: gridLayout3
-            anchors.rightMargin: 0
-            anchors.bottomMargin: 0
-            anchors.leftMargin: 0
-            anchors.topMargin: 0
-            rowSpacing: 10
-            rows: 1
-            columns: 2
-            anchors.fill: parent
-
-            ExclusiveGroup { id: languageGroup }
-            RadioButton {
-                id: enRadioButton
-                text: qsTr("en")
-                exclusiveGroup: languageGroup
-                Layout.columnSpan: 2
-            }
-
-            RadioButton {
-                id: frRadioButton
-                text: qsTr("fr")
-                exclusiveGroup: languageGroup
-                Layout.columnSpan: 2
-            }
-
-            RadioButton {
-                id: otherRadioButton
-                text: qsTr("Other")
-                exclusiveGroup: languageGroup
-            }
-
-            TextField {
-                id: language
-                Layout.fillWidth: true
-                placeholderText: qsTr("")
-            }
-
-            RowLayout {
-                id: rowLayout1
-                Layout.columnSpan: 2
-                Layout.alignment: Qt.AlignRight
-
-                Button {
-                    id: goButton
-                    text: qsTr("Proceed")
-                }
-
-                Button {
-                    id: clearButton
-                    text: qsTr("Clear")
-                }
-
-                Button {
-                    id: cancelButton
-                    text: qsTr("Cancel")
-                }
-            }
-
-            Item {
-                Layout.fillHeight: true
-                Layout.columnSpan: 2
-            }
-
-
-        }
-    }
-}
diff --git a/app/forms/Message.qml b/app/forms/Message.qml
deleted file mode 100644
index 5d12c1f..0000000
--- a/app/forms/Message.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-
-MessageForm {
-    property string title
-    property string message
-    property variant backPage
-
-    signal closeForm(variant backPage)
-
-    button.onClicked: {
-        closeForm(backPage)
-    }
-
-    Component.onCompleted: {
-        messageText.text = message
-        messageTitle.text = title
-    }
-}
diff --git a/app/forms/MessageForm.ui.qml b/app/forms/MessageForm.ui.qml
deleted file mode 100644
index a300841..0000000
--- a/app/forms/MessageForm.ui.qml
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.2
-
-Item {
-    id: root
-    property alias messageText: messageText
-    property alias messageTitle: messageTitle
-    property alias button: button
-
-    Rectangle {
-        id: tabRectangle
-        y: 20
-        height: messageTitle.height * 2
-        color: "#46a2da"
-        anchors.rightMargin: 0
-        anchors.leftMargin: 0
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        Label {
-            id: messageTitle
-            color: "#ffffff"
-            text: qsTr("type")
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Item {
-        anchors.rightMargin: 20
-        anchors.leftMargin: 20
-        anchors.bottomMargin: 20
-        anchors.topMargin: 20
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: tabRectangle.bottom
-
-        ColumnLayout {
-            id: columnLayout1
-            spacing: 20
-            anchors.fill: parent
-
-            Label {
-                id: messageText
-                text: qsTr("message")
-                Layout.fillWidth: true
-                horizontalAlignment: Text.AlignHCenter
-                wrapMode: Text.WordWrap
-                textFormat: Text.RichText
-            }
-
-            Button {
-                id: button
-                text: qsTr("OK")
-                Layout.alignment: Qt.AlignHCenter
-            }
-
-            Item {
-                Layout.fillHeight: true
-            }
-        }
-    }
-}
-
diff --git a/app/forms/ReverseGeocode.qml b/app/forms/ReverseGeocode.qml
deleted file mode 100644
index 9e3cd65..0000000
--- a/app/forms/ReverseGeocode.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtPositioning 5.5
-
-//Reverse Geocode Dialog
-ReverseGeocodeForm {
-    property string title;
-    property variant coordinate
-    signal showPlace(variant coordinate)
-    signal closeForm()
-
-    goButton.onClicked: {
-        var coordinate = QtPositioning.coordinate(parseFloat(latitude.text),
-                                                          parseFloat(longitude.text));
-        if (coordinate.isValid) {
-            showPlace(coordinate)
-        }
-    }
-
-    clearButton.onClicked: {
-        latitude.text = ""
-        longitude.text = ""
-    }
-
-    cancelButton.onClicked: {
-        closeForm()
-    }
-
-    Component.onCompleted: {
-        latitude.text = "" + coordinate.latitude
-        longitude.text = "" + coordinate.longitude
-        if (title.length != 0) {
-            tabTitle.text = title;
-        }
-    }
-}
diff --git a/app/forms/ReverseGeocodeForm.ui.qml b/app/forms/ReverseGeocodeForm.ui.qml
deleted file mode 100644
index 29eaec9..0000000
--- a/app/forms/ReverseGeocodeForm.ui.qml
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.2
-
-Item {
-    property alias clearButton: clearButton
-    property alias goButton: goButton
-    property alias longitude: longitude
-    property alias latitude: latitude
-    property alias cancelButton: cancelButton
-    property alias tabTitle: tabTitle
-    Rectangle {
-        id: tabRectangle
-        y: 20
-        height: tabTitle.height * 2
-        color: "#46a2da"
-        anchors.rightMargin: 0
-        anchors.leftMargin: 0
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        Label {
-            id: tabTitle
-            color: "#ffffff"
-            text: qsTr("Reverse Geocode")
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Item {
-        id: item2
-        anchors.rightMargin: 20
-        anchors.leftMargin: 20
-        anchors.bottomMargin: 20
-        anchors.topMargin: 20
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: tabRectangle.bottom
-
-        GridLayout {
-            id: gridLayout3
-            anchors.rightMargin: 0
-            anchors.bottomMargin: 0
-            anchors.leftMargin: 0
-            anchors.topMargin: 0
-            rowSpacing: 10
-            rows: 1
-            columns: 2
-            anchors.fill: parent
-
-            Label {
-                id: label2
-                text: qsTr("Latitude")
-            }
-
-            TextField {
-                id: latitude
-                Layout.fillWidth: true
-            }
-
-            Label {
-                id: label3
-                text: qsTr("Longitude")
-            }
-
-            TextField {
-                id: longitude
-                Layout.fillWidth: true
-                placeholderText: qsTr("")
-            }
-
-            RowLayout {
-                id: rowLayout1
-                Layout.columnSpan: 2
-                Layout.alignment: Qt.AlignRight
-
-                Button {
-                    id: goButton
-                    text: qsTr("Proceed")
-                }
-
-                Button {
-                    id: clearButton
-                    text: qsTr("Clear")
-                }
-
-                Button {
-                    id: cancelButton
-                    text: qsTr("Cancel")
-                }
-            }
-            Item {
-                Layout.fillHeight: true
-                Layout.columnSpan: 2
-            }
-        }
-    }
-}
diff --git a/app/forms/RouteAddress.qml b/app/forms/RouteAddress.qml
deleted file mode 100644
index b8b8897..0000000
--- a/app/forms/RouteAddress.qml
+++ /dev/null
@@ -1,136 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtLocation 5.6
-import QtPositioning 5.5
-
-RouteAddressForm {
-    property alias plugin : tempGeocodeModel.plugin;
-    property variant toAddress;
-    property variant fromCoordinate;
-    signal showMessage(string topic, string message)
-    signal showRoute(variant startCoordinate,variant endCoordinate)
-    signal closeForm()
-
-    goButton.onClicked: {
-        tempGeocodeModel.reset()
-        toAddress.country = toCountry.text
-        toAddress.street = toStreet.text
-        toAddress.city = toCity.text
-        toAddress.state = toState.text
-        tempGeocodeModel.startCoordinate = fromCoordinate
-        tempGeocodeModel.endCoordinate = QtPositioning.coordinate()
-        tempGeocodeModel.query = fromCoordinate
-        tempGeocodeModel.update();
-        goButton.enabled = false;
-    }
-
-    clearButton.onClicked: {
-        toStreet.text = ""
-        toCity.text = ""
-        toState.text = ""
-        toCountry.text = ""
-    }
-
-    cancelButton.onClicked: {
-        closeForm()
-    }
-
-    Component.onCompleted: {
-        toStreet.text = toAddress.street
-        toCity.text = toAddress.city
-        toState.text = toAddress.state
-        toCountry.text = toAddress.country
-    }
-
-    GeocodeModel {
-        id: tempGeocodeModel
-
-        property int success: 0
-        property variant startCoordinate
-        property variant endCoordinate
-
-        onCountChanged: {
-            if (success == 1 && count == 1) {
-                query = toAddress
-                update();
-            }
-        }
-
-        onStatusChanged: {
-            if ((status == GeocodeModel.Ready) && count >= 1) {
-                success++
-                if (success == 1) {
-                    startCoordinate.latitude = get(0).coordinate.latitude
-                    startCoordinate.longitude = get(0).coordinate.longitude
-                }
-                if (success == 2) {
-                    endCoordinate.latitude = get(0).coordinate.latitude
-                    endCoordinate.longitude = get(0).coordinate.longitude
-                    success = 0
-                    if (startCoordinate.isValid && endCoordinate.isValid)
-                        showRoute(startCoordinate,endCoordinate)
-                    else
-                        goButton.enabled = true
-                }
-            } else if ((status == GeocodeModel.Ready) || (status == GeocodeModel.Error)) {
-                var st = (success == 0 ) ? "start" : "end"
-                success = 0
-                if ((status == GeocodeModel.Ready) && (count == 0 )) {
-                    showMessage(qsTr("Geocode Error"),qsTr("Unsuccessful geocode"));
-                    goButton.enabled = true;
-                }
-                else if (status == GeocodeModel.Error) {
-                    showMessage(qsTr("Geocode Error"),
-                                qsTr("Unable to find location for the") + " " +
-                                st + " " +qsTr("point"))
-                    goButton.enabled = true;
-                }
-                else if ((status == GeocodeModel.Ready) && (count > 1 )) {
-                    showMessage(qsTr("Ambiguous geocode"),
-                                count + " " + qsTr("results found for the") +
-                                " " + st + " " +qsTr("point, please specify location"))
-                    goButton.enabled = true;
-                }
-            }
-        }
-    }
-}
diff --git a/app/forms/RouteAddressForm.ui.qml b/app/forms/RouteAddressForm.ui.qml
deleted file mode 100644
index a0ace76..0000000
--- a/app/forms/RouteAddressForm.ui.qml
+++ /dev/null
@@ -1,167 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.2
-
-Item {
-    property alias toStreet: toStreet
-    property alias toCity: toCity
-    property alias toState: toState
-    property alias toCountry: toCountry
-    property alias goButton: goButton
-    property alias clearButton: clearButton
-    property alias cancelButton: cancelButton
-
-    Rectangle {
-        id: tabRectangle
-        y: 20
-        height: tabTitle.height * 2
-        color: "#46a2da"
-        anchors.rightMargin: 0
-        anchors.leftMargin: 0
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        Label {
-            id: tabTitle
-            color: "#ffffff"
-            text: qsTr("Route Address")
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Item {
-        id: item2
-        anchors.rightMargin: 20
-        anchors.leftMargin: 20
-        anchors.bottomMargin: 20
-        anchors.topMargin: 20
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: tabRectangle.bottom
-
-        GridLayout {
-            id: gridLayout3
-            rowSpacing: 10
-            rows: 1
-            columns: 2
-            anchors.fill: parent
-
-            Label {
-                id: label6
-                text: qsTr("To")
-                font.bold: true
-                anchors.horizontalCenter: parent.horizontalCenter
-                Layout.columnSpan: 2
-            }
-
-            Label {
-                id: label4
-                text: qsTr("Street")
-            }
-
-            TextField {
-                id: toStreet
-                Layout.fillWidth: true
-            }
-
-            Label {
-                id: label5
-                text: qsTr("City")
-            }
-
-            TextField {
-                id: toCity
-                Layout.fillWidth: true
-            }
-
-            Label {
-                id: label9
-                text: qsTr("State")
-            }
-
-            TextField {
-                id: toState
-                Layout.fillWidth: true
-            }
-
-            Label {
-                id: label8
-                text: qsTr("Country")
-            }
-
-            TextField {
-                id: toCountry
-                Layout.fillWidth: true
-            }
-
-            RowLayout {
-                id: rowLayout1
-                Layout.columnSpan: 2
-                Layout.alignment: Qt.AlignRight
-
-                Button {
-                    id: goButton
-                    text: qsTr("Proceed")
-                }
-
-                Button {
-                    id: clearButton
-                    text: qsTr("Clear")
-                }
-
-                Button {
-                    id: cancelButton
-                    text: qsTr("Cancel")
-                }
-            }
-
-            Item {
-                    Layout.fillHeight: true
-                    Layout.columnSpan: 2
-            }
-        }
-    }
-}
diff --git a/app/forms/RouteCoordinate.qml b/app/forms/RouteCoordinate.qml
deleted file mode 100644
index f195ac7..0000000
--- a/app/forms/RouteCoordinate.qml
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtPositioning 5.5
-
-RouteCoordinateForm {
-    property variant toCoordinate
-    property variant fromCoordinate
-    signal showRoute(variant startCoordinate,variant endCoordinate)
-    signal closeForm()
-
-    goButton.onClicked: {
-        var startCoordinate = QtPositioning.coordinate(parseFloat(fromLatitude.text),
-                                                       parseFloat(fromLongitude.text));
-        var endCoordinate = QtPositioning.coordinate(parseFloat(toLatitude.text),
-                                                     parseFloat(toLongitude.text));
-        if (startCoordinate.isValid && endCoordinate.isValid) {
-           goButton.enabled = false;
-           showRoute(startCoordinate,endCoordinate)
-        }
-    }
-
-    clearButton.onClicked: {
-        fromLatitude.text = ""
-        fromLongitude.text = ""
-        toLatitude.text = ""
-        toLongitude.text  = ""
-    }
-
-    cancelButton.onClicked: {
-        closeForm()
-    }
-
-    Component.onCompleted: {
-        fromLatitude.text = "" + fromCoordinate.latitude
-        fromLongitude.text = "" + fromCoordinate.longitude
-        toLatitude.text = "" + toCoordinate.latitude
-        toLongitude.text = "" + toCoordinate.longitude
-    }
-}
-
diff --git a/app/forms/RouteCoordinateForm.ui.qml b/app/forms/RouteCoordinateForm.ui.qml
deleted file mode 100644
index bd492d3..0000000
--- a/app/forms/RouteCoordinateForm.ui.qml
+++ /dev/null
@@ -1,173 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.2
-
-Item {
-    property alias fromLatitude: fromLatitude
-    property alias fromLongitude: fromLongitude
-    property alias toLatitude: toLatitude
-    property alias toLongitude: toLongitude
-    property alias clearButton: clearButton
-    property alias goButton: goButton
-    property alias cancelButton: cancelButton
-
-    Rectangle {
-        id: tabRectangle
-        y: 20
-        height: tabTitle.height * 2
-        color: "#46a2da"
-        anchors.rightMargin: 0
-        anchors.leftMargin: 0
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        Label {
-            id: tabTitle
-            color: "#ffffff"
-            text: qsTr("Route Coordinates")
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    Item {
-        id: item2
-        anchors.rightMargin: 20
-        anchors.leftMargin: 20
-        anchors.bottomMargin: 20
-        anchors.topMargin: 20
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: tabRectangle.bottom
-
-        GridLayout {
-            id: gridLayout3
-            rowSpacing: 10
-            rows: 1
-            columns: 2
-            anchors.fill: parent
-
-            Label {
-                id: label1
-                text: qsTr("From")
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.bold: true
-                Layout.columnSpan : 2
-            }
-
-            Label {
-                id: label2
-                text: qsTr("Latitude")
-            }
-
-            TextField {
-                id: fromLatitude
-                Layout.fillWidth: true
-            }
-
-            Label {
-                id: label3
-                text: qsTr("Longitude")
-            }
-
-            TextField {
-                id: fromLongitude
-                Layout.fillWidth: true
-            }
-
-            Label {
-                id: label6
-                text: qsTr("To")
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.bold: true
-                Layout.columnSpan: 2
-            }
-
-            Label {
-                id: label4
-                text: qsTr("Latitude")
-            }
-
-            TextField {
-                id: toLatitude
-                Layout.fillWidth: true
-            }
-
-            Label {
-                id: label5
-                text: qsTr("Longitude")
-            }
-
-            TextField {
-                id: toLongitude
-                Layout.fillWidth: true
-            }
-
-            RowLayout {
-                id: rowLayout1
-                Layout.columnSpan: 2
-                Layout.alignment: Qt.AlignRight
-                Button {
-                    id: goButton
-                    text: qsTr("Proceed")
-                }
-
-                Button {
-                    id: clearButton
-                    text: qsTr("Clear")
-                }
-
-                Button {
-                    id: cancelButton
-                    text: qsTr("Cancel")
-                }
-            }
-            Item {
-                Layout.fillHeight: true
-                Layout.columnSpan: 2
-            }
-        }
-    }
-}
diff --git a/app/forms/RouteList.qml b/app/forms/RouteList.qml
deleted file mode 100644
index 27fa572..0000000
--- a/app/forms/RouteList.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import "../helper.js" as Helper
-
-//! [routeinfomodel0]
-ListView {
-//! [routeinfomodel0]
-    property variant routeModel
-    property string totalTravelTime
-    property string totalDistance
-    signal closeForm()
-//! [routeinfomodel1]
-    interactive: true
-    model: ListModel { id: routeInfoModel }
-    header: RouteListHeader {}
-    delegate:  RouteListDelegate{
-        routeIndex.text: index + 1
-        routeInstruction.text: instruction
-        routeDistance.text: distance
-    }
-//! [routeinfomodel1]
-    footer: Button {
-        anchors.horizontalCenter: parent.horizontalCenter
-        text: qsTr("Close")
-        onClicked: {
-            closeForm()
-        }
-    }
-
-    Component.onCompleted: {
-        //! [routeinfomodel2]
-        routeInfoModel.clear()
-        if (routeModel.count > 0) {
-            for (var i = 0; i < routeModel.get(0).segments.length; i++) {
-                routeInfoModel.append({
-                    "instruction": routeModel.get(0).segments[i].maneuver.instructionText,
-                     "distance": Helper.formatDistance(routeModel.get(0).segments[i].maneuver.distanceToNextInstruction)
-                });
-            }
-        }
-        //! [routeinfomodel2]
-        totalTravelTime = routeModel.count == 0 ? "" : Helper.formatTime(routeModel.get(0).travelTime)
-        totalDistance = routeModel.count == 0 ? "" : Helper.formatDistance(routeModel.get(0).distance)
-    }
-//! [routeinfomodel3]
-}
-//! [routeinfomodel3]
diff --git a/app/forms/RouteListDelegate.qml b/app/forms/RouteListDelegate.qml
deleted file mode 100644
index 2dc9981..0000000
--- a/app/forms/RouteListDelegate.qml
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Layouts 1.2
-
-Item {
-    id: root
-    property bool checked: false
-    property alias routeInstruction: instructionLabel
-    property alias routeDistance: distanceLabel
-    property alias routeIndex: indexLabel
-
-    width: parent.width
-    height: indexLabel.height * 2
-
-    RowLayout {
-        spacing: 10
-        anchors.left: parent.left
-        anchors.leftMargin: 30
-        anchors.verticalCenter: parent.verticalCenter
-        Label {
-            id: indexLabel
-        }
-        Label {
-            id: instructionLabel
-            wrapMode: Text.Wrap
-        }
-        Label {
-            id: distanceLabel
-        }
-    }
-
-    Rectangle {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.margins: 15
-        height: 1
-        color: "#46a2da"
-    }
-}
-
-
-
diff --git a/app/forms/RouteListHeader.qml b/app/forms/RouteListHeader.qml
deleted file mode 100644
index 383f892..0000000
--- a/app/forms/RouteListHeader.qml
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-
-Item {
-    property alias travelTime: travelTimeLabel
-    property alias distance: distanceLabel
-    width: parent.width
-    height: tabTitle.height * 3.0
-
-    Rectangle {
-        id: tabRectangle
-        y:  tabTitle.height
-        height: tabTitle.height * 2 - 1
-        color: "#46a2da"
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        Label {
-            id: tabTitle
-            color: "#ffffff"
-            text: qsTr("Route Information")
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-
-        Label {
-            id: travelTimeLabel
-            text: totalTravelTime
-            color: "#ffffff"
-            font.bold: true
-            anchors.left: parent.left
-            anchors.verticalCenter: parent.verticalCenter
-        }
-
-        Label {
-            id: distanceLabel
-            text: totalDistance
-            color: "#ffffff"
-            font.bold: true
-            anchors.right: parent.right
-            anchors.verticalCenter: parent.verticalCenter
-        }
-    }
-}
diff --git a/app/helper.js b/app/helper.js
deleted file mode 100644
index 19201d0..0000000
--- a/app/helper.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-.pragma library
-
-function roundNumber(number, digits)
-{
-    var multiple = Math.pow(10, digits);
-    return Math.round(number * multiple) / multiple;
-}
-
-function formatTime(sec)
-{
-    var value = sec
-    var seconds = value % 60
-    value /= 60
-    value = (value > 1) ? Math.round(value) : 0
-    var minutes = value % 60
-    value /= 60
-    value = (value > 1) ? Math.round(value) : 0
-    var hours = value
-    if (hours > 0) value = hours + "h:"+ minutes + "m"
-    else value = minutes + "min"
-    return value
-}
-
-function formatDistance(meters)
-{
-    var dist = Math.round(meters)
-    if (dist > 1000 ){
-        if (dist > 100000){
-            dist = Math.round(dist / 1000)
-        }
-        else{
-            dist = Math.round(dist / 100)
-            dist = dist / 10
-        }
-        dist = dist + " km"
-    }
-    else{
-        dist = dist + " m"
-    }
-    return dist
-}
diff --git a/app/images/Thumbs.db b/app/images/Thumbs.db
new file mode 100644
index 0000000..3ac30c1
--- /dev/null
+++ b/app/images/Thumbs.db
diff --git a/app/images/arrow-0.png b/app/images/arrow-0.png
new file mode 100644
index 0000000..50b07ad
--- /dev/null
+++ b/app/images/arrow-0.png
diff --git a/app/images/arrow-l-180.png b/app/images/arrow-l-180.png
new file mode 100644
index 0000000..5c9223d
--- /dev/null
+++ b/app/images/arrow-l-180.png
diff --git a/app/images/arrow-l-30.png b/app/images/arrow-l-30.png
new file mode 100644
index 0000000..3503b07
--- /dev/null
+++ b/app/images/arrow-l-30.png
diff --git a/app/images/arrow-l-45.png b/app/images/arrow-l-45.png
new file mode 100644
index 0000000..a033731
--- /dev/null
+++ b/app/images/arrow-l-45.png
diff --git a/app/images/arrow-l-75.png b/app/images/arrow-l-75.png
new file mode 100644
index 0000000..cdaffec
--- /dev/null
+++ b/app/images/arrow-l-75.png
diff --git a/app/images/arrow-r-180.png b/app/images/arrow-r-180.png
new file mode 100644
index 0000000..823046e
--- /dev/null
+++ b/app/images/arrow-r-180.png
diff --git a/app/images/arrow-r-30.png b/app/images/arrow-r-30.png
new file mode 100644
index 0000000..3abf7f0
--- /dev/null
+++ b/app/images/arrow-r-30.png
diff --git a/app/images/arrow-r-45.png b/app/images/arrow-r-45.png
new file mode 100644
index 0000000..ae27ad4
--- /dev/null
+++ b/app/images/arrow-r-45.png
diff --git a/app/images/arrow-r-75.png b/app/images/arrow-r-75.png
new file mode 100644
index 0000000..24b296b
--- /dev/null
+++ b/app/images/arrow-r-75.png
diff --git a/app/images/car-focus.png b/app/images/car-focus.png
new file mode 100644
index 0000000..0b2a167
--- /dev/null
+++ b/app/images/car-focus.png
diff --git a/app/images/car-marker.png b/app/images/car-marker.png
new file mode 100755
index 0000000..9ca4d50
--- /dev/null
+++ b/app/images/car-marker.png
diff --git a/app/images/car-marker2.png b/app/images/car-marker2.png
new file mode 100755
index 0000000..34bab94
--- /dev/null
+++ b/app/images/car-marker2.png
diff --git a/app/images/images.qrc b/app/images/images.qrc
new file mode 100644
index 0000000..6e57d04
--- /dev/null
+++ b/app/images/images.qrc
@@ -0,0 +1,20 @@
+<RCC>
+    <qresource prefix="/">
+        <file>car-focus.png</file>
+        <file>car-marker.png</file>
+		<file>car-marker2.png</file>
+        <file>marker-green.png</file>
+        <file>marker-red.png</file>
+		<file>marker-end.png</file>
+        <file>simple-bottom-background-white.png</file>
+        <file>arrow-0.png</file>
+        <file>arrow-l-30.png</file>
+        <file>arrow-l-45.png</file>
+        <file>arrow-l-75.png</file>
+        <file>arrow-l-180.png</file>
+        <file>arrow-r-30.png</file>
+        <file>arrow-r-45.png</file>
+        <file>arrow-r-75.png</file>
+        <file>arrow-r-180.png</file>
+    </qresource>
+</RCC>
diff --git a/app/images/marker-end.png b/app/images/marker-end.png
new file mode 100755
index 0000000..2763c39
--- /dev/null
+++ b/app/images/marker-end.png
diff --git a/app/images/marker-green.png b/app/images/marker-green.png
new file mode 100644
index 0000000..e2f2078
--- /dev/null
+++ b/app/images/marker-green.png
diff --git a/app/images/marker-red.png b/app/images/marker-red.png
new file mode 100644
index 0000000..e2f2078
--- /dev/null
+++ b/app/images/marker-red.png
diff --git a/app/images/simple-bottom-background-white.png b/app/images/simple-bottom-background-white.png
new file mode 100644
index 0000000..df9c2a0
--- /dev/null
+++ b/app/images/simple-bottom-background-white.png
diff --git a/app/main.cpp b/app/main.cpp
index fb7dbed..202b25c 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -1,67 +1,45 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/*
+ * Copyright (c) 2018 TOYOTA MOTOR CORPORATION
+ *
+ * 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.
+ */
+#include <QQmlApplicationEngine>
 
+#include <QtCore/QDebug>
 #include <QtCore/QCommandLineParser>
-#include <QtCore/QTextStream>
-#include <QtGui/QGuiApplication>
-#include <QtQml/QQmlApplicationEngine>
-#include <QtQuick/QQuickItem>
 #include <QtCore/QUrlQuery>
+#include <QtGui/QGuiApplication>
 #include <QtQml/QQmlContext>
-#include <QtQml/qqml.h>
-#include <QtQuickControls2/QQuickStyle>
-#include <QQuickWindow>
+#include <QtQuick/QQuickWindow>
+
+#include "qcheapruler.hpp"
+
+#ifdef HAVE_LIBHOMESCREEN
 #include <libhomescreen.hpp>
+#endif
+#ifdef HAVE_QLIBWINDOWMANAGER
 #include <qlibwindowmanager.h>
+#endif
 
 int main(int argc, char *argv[])
 {
+    QString myname = QString("navigation");
 
-    QString myname = QString("Navigation");
-
-    qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard"));
     QGuiApplication app(argc, argv);
-
-    QQuickStyle::setStyle("AGL");
-    QQmlApplicationEngine engine;
-    QQmlContext *context = engine.rootContext();
+    app.setApplicationName(myname);
+    app.setApplicationVersion(QStringLiteral("0.1.0"));
+    app.setOrganizationDomain(QStringLiteral("automotivelinux.org"));
+    app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux"));
 
     QCommandLineParser parser;
     parser.addPositionalArgument("port", app.translate("main", "port for binding"));
@@ -71,10 +49,14 @@ int main(int argc, char *argv[])
     parser.process(app);
     QStringList positionalArguments = parser.positionalArguments();
 
+    QQmlApplicationEngine engine;
+    QQmlContext *context = engine.rootContext();
+    QUrl bindingAddress;
+    int port = 0;
+    QString secret;
     if (positionalArguments.length() == 2) {
-        int port = positionalArguments.takeFirst().toInt();
-        QString secret = positionalArguments.takeFirst();
-        QUrl bindingAddress;
+        port = positionalArguments.takeFirst().toInt();
+        secret = positionalArguments.takeFirst();
         bindingAddress.setScheme(QStringLiteral("ws"));
         bindingAddress.setHost(QStringLiteral("localhost"));
         bindingAddress.setPort(port);
@@ -83,54 +65,64 @@ int main(int argc, char *argv[])
         query.addQueryItem(QStringLiteral("token"), secret);
         bindingAddress.setQuery(query);
         context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
-        std::string token = secret.toStdString();
-        LibHomeScreen* hs = new LibHomeScreen();
-        QLibWindowmanager* qwm = new QLibWindowmanager();
+    } else {
+        context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
+    }
 
-        // WindowManager
-        if(qwm->init(port,secret) != 0){
-            exit(EXIT_FAILURE);
-        }
-        // Request a surface as described in layers.json windowmanager’s file
-        if (qwm->requestSurface(myname) != 0) {
-            exit(EXIT_FAILURE);
-        }
-        // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
-        qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) {
-            fprintf(stderr, "Surface got syncDraw!\n");
-            qwm->endDraw(myname);
-        });
+#ifdef HAVE_QLIBWINDOWMANAGER
+    // WindowManager
+    QLibWindowmanager* qwm = new QLibWindowmanager();
+    if(qwm->init(port,secret) != 0){
+        exit(EXIT_FAILURE);
+    }
+    // Request a surface as described in layers.json windowmanager’s file
+    if(qwm->requestSurface(myname) != 0){
+        exit(EXIT_FAILURE);
+    }
+    // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
+    qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) {
+        fprintf(stderr, "Surface got syncDraw!\n");
+        qwm->endDraw(myname);
+    });
+#endif
 
-        // HomeScreen
-        hs->init(port, token.c_str());
-        // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
-        hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
-            json_object *appnameJ = nullptr;
-            if(json_object_object_get_ex(object, "application_name", &appnameJ))
+#ifdef HAVE_LIBHOMESCREEN
+    // HomeScreen
+    LibHomeScreen* hs = new LibHomeScreen();
+    std::string token = secret.toStdString();
+    hs->init(port, token.c_str());
+    // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
+    hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
+
+        json_object *appnameJ = nullptr;
+        if(json_object_object_get_ex(object, "application_name", &appnameJ))
+        {
+            const char *appname = json_object_get_string(appnameJ);
+            if(QString::compare(myname, appname, Qt::CaseInsensitive) == 0)
             {
-                const char *appname = json_object_get_string(appnameJ);
-                if(myname == appname)
-                {
-                    qDebug("Surface %s got tapShortcut\n", appname);
-                    qwm->activateSurface(myname);
-                }
+                qDebug("Surface %s got tapShortcut\n", appname);
+                json_object *para, *area;
+                json_object_object_get_ex(object, "parameter", &para);
+                json_object_object_get_ex(para, "area", &area);
+                const char *displayArea = json_object_get_string(area);
+                qDebug("Surface %s got tapShortcut area\n", displayArea);
+                qwm->activateWindow(myname, QString(QLatin1String(displayArea)));
             }
-        });
-
-        QVariantMap parameters;
-        parameters[QStringLiteral("osm.useragent")] = QStringLiteral("Automotive Grade Linux Navigation");
-
-        engine.addImportPath(QStringLiteral(":/imports"));
-        engine.load(QUrl(QStringLiteral("qrc:/mapviewer.qml")));
-        QObject::connect(&engine, SIGNAL(quit()), qApp, SLOT(quit()));
+        }
+    });
+#endif
+    qmlRegisterType<QCheapRuler>("com.mapbox.cheap_ruler", 1, 0, "CheapRuler");
 
-        QObject *root = engine.rootObjects().first();
-        QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-        QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
+    engine.load(QUrl(QStringLiteral("qrc:qml/Main.qml")));
 
-        QMetaObject::invokeMethod(root, "initializeProviders",
-                                  Q_ARG(QVariant, QVariant::fromValue(parameters)));
-    }
+    QObject *root = engine.rootObjects().first();
+    QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
+#ifdef HAVE_QLIBWINDOWMANAGER
+    QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
+#else
+    window->resize(1024, 768);
+    window->setVisible(true);
+#endif
 
     return app.exec();
 }
diff --git a/app/map/CircleItem.qml b/app/map/CircleItem.qml
deleted file mode 100644
index 3b32ba5..0000000
--- a/app/map/CircleItem.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.5
-import QtLocation 5.6
-
-//TODO: remove/refactor me when items are integrated
-
-MapCircle {
-
-    color: "#46a2da"
-    border.color: "#190a33"
-    border.width: 2
-    smooth: true
-    opacity: 0.25
-
-    function setGeometry(markers, index){
-        center.latitude = markers[index].coordinate.latitude
-        center.longitude = markers[index].coordinate.longitude
-        radius= center.distanceTo(markers[index + 1].coordinate)
-    }
-}
diff --git a/app/map/ImageItem.qml b/app/map/ImageItem.qml
deleted file mode 100644
index 3bf4dfe..0000000
--- a/app/map/ImageItem.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.5;
-import QtLocation 5.6
-
-MapQuickItem {  //to be used inside MapComponent only
-    id: imageItem
-
-    MouseArea {
-        anchors.fill: parent
-        drag.target: parent
-    }
-
-    function setGeometry(markers, index) {
-        coordinate.latitude = markers[index].coordinate.latitude
-        coordinate.longitude = markers[index].coordinate.longitude
-    }
-
-    sourceItem: Image {
-        id: testImage
-        source: "../resources/icon.png"
-        opacity: 0.7
-    }
-}
diff --git a/app/map/MapComponent.qml b/app/map/MapComponent.qml
deleted file mode 100644
index 161038c..0000000
--- a/app/map/MapComponent.qml
+++ /dev/null
@@ -1,693 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.5
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 1.4
-import QtQuick.Extras 1.4
-import QtLocation 5.6
-import QtPositioning 5.5
-import "../helper.js" as Helper
-
-//! [top]
-Map {
-    id: map
-//! [top]
-    property variant markers
-    property variant mapItems
-    property variant location
-    property int markerCounter: 0 // counter for total amount of markers. Resets to 0 when number of markers = 0
-    property int currentMarker
-    property int lastX : -1
-    property int lastY : -1
-    property int pressX : -1
-    property int pressY : -1
-    property int jitterThreshold : 30
-    property bool followme: true
-    property variant scaleLengths: [5, 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000]
-    property alias routeQuery: routeQuery
-    property alias routeModel: routeModel
-    property alias geocodeModel: geocodeModel
-
-    signal showGeocodeInfo()
-    signal geocodeFinished()
-    signal routeError()
-    signal coordinatesCaptured(double latitude, double longitude)
-    signal showMainMenu(variant coordinate)
-    signal showMarkerMenu(variant coordinate)
-    signal showRouteMenu(variant coordinate)
-    signal showPointMenu(variant coordinate)
-    signal showRouteList()
-
-
-    center {
-        // null island
-        latitude: 0
-        longitude: 0
-    }
-
-    function geocodeMessage()
-    {
-        var street, district, city, county, state, countryCode, country, postalCode, latitude, longitude, text
-        latitude = Math.round(geocodeModel.get(0).coordinate.latitude * 10000) / 10000
-        longitude =Math.round(geocodeModel.get(0).coordinate.longitude * 10000) / 10000
-        street = geocodeModel.get(0).address.street
-        district = geocodeModel.get(0).address.district
-        city = geocodeModel.get(0).address.city
-        county = geocodeModel.get(0).address.county
-        state = geocodeModel.get(0).address.state
-        countryCode = geocodeModel.get(0).address.countryCode
-        country = geocodeModel.get(0).address.country
-        postalCode = geocodeModel.get(0).address.postalCode
-
-        text = "<b>Latitude:</b> " + latitude + "<br/>"
-        text +="<b>Longitude:</b> " + longitude + "<br/>" + "<br/>"
-        if (street) text +="<b>Street: </b>"+ street + " <br/>"
-        if (district) text +="<b>District: </b>"+ district +" <br/>"
-        if (city) text +="<b>City: </b>"+ city + " <br/>"
-        if (county) text +="<b>County: </b>"+ county + " <br/>"
-        if (state) text +="<b>State: </b>"+ state + " <br/>"
-        if (countryCode) text +="<b>Country code: </b>"+ countryCode + " <br/>"
-        if (country) text +="<b>Country: </b>"+ country + " <br/>"
-        if (postalCode) text +="<b>PostalCode: </b>"+ postalCode + " <br/>"
-        return text
-    }
-
-    function calculateScale()
-    {
-        var coord1, coord2, dist, text, f
-        f = 0
-        coord1 = map.toCoordinate(Qt.point(0,scale.y))
-        coord2 = map.toCoordinate(Qt.point(0+scaleImage.sourceSize.width,scale.y))
-        dist = Math.round(coord1.distanceTo(coord2))
-
-        if (dist === 0) {
-            // not visible
-        } else {
-            for (var i = 0; i < scaleLengths.length-1; i++) {
-                if (dist < (scaleLengths[i] + scaleLengths[i+1]) / 2 ) {
-                    f = scaleLengths[i] / dist
-                    dist = scaleLengths[i]
-                    break;
-                }
-            }
-            if (f === 0) {
-                f = dist / scaleLengths[i]
-                dist = scaleLengths[i]
-            }
-        }
-
-        text = Helper.formatDistance(dist)
-        scaleImage.width = (scaleImage.sourceSize.width * f) - 2 * scaleImageLeft.sourceSize.width
-        scaleText.text = text
-    }
-
-    function deleteMarkers()
-    {
-        var count = map.markers.length
-        for (var i = 0; i<count; i++){
-            map.removeMapItem(map.markers[i])
-            map.markers[i].destroy()
-        }
-        map.markers = []
-        markerCounter = 0
-    }
-
-    function deleteMapItems()
-    {
-        var count = map.mapItems.length
-        for (var i = 0; i<count; i++){
-            map.removeMapItem(map.mapItems[i])
-            map.mapItems[i].destroy()
-        }
-        map.mapItems = []
-    }
-
-    function addMarker()
-    {
-        var count = map.markers.length
-        markerCounter++
-        var marker = Qt.createQmlObject ('Marker {}', map)
-        map.addMapItem(marker)
-        marker.z = map.z+1
-        marker.coordinate = mouseArea.lastCoordinate
-
-        //update list of markers
-        var myArray = new Array()
-        for (var i = 0; i<count; i++){
-            myArray.push(markers[i])
-        }
-        myArray.push(marker)
-        markers = myArray
-    }
-
-    function addGeoItem(item)
-    {
-        var count = map.mapItems.length
-        var co = Qt.createComponent(item+'.qml')
-        if (co.status == Component.Ready) {
-            var o = co.createObject(map)
-            o.setGeometry(map.markers, currentMarker)
-            map.addMapItem(o)
-            //update list of items
-            var myArray = new Array()
-            for (var i = 0; i<count; i++){
-                myArray.push(mapItems[i])
-            }
-            myArray.push(o)
-            mapItems = myArray
-
-        } else {
-            console.log(item + " is not supported right now, please call us later.")
-        }
-    }
-
-    function deleteMarker(index)
-    {
-        //update list of markers
-        var myArray = new Array()
-        var count = map.markers.length
-        for (var i = 0; i<count; i++){
-            if (index != i) myArray.push(map.markers[i])
-        }
-
-        map.removeMapItem(map.markers[index])
-        map.markers[index].destroy()
-        map.markers = myArray
-        if (markers.length == 0) markerCounter = 0
-    }
-
-    function calculateMarkerRoute()
-    {
-        routeQuery.clearWaypoints();
-        for (var i = currentMarker; i< map.markers.length; i++){
-            routeQuery.addWaypoint(markers[i].coordinate)
-        }
-        routeQuery.travelModes = RouteQuery.CarTravel
-        routeQuery.routeOptimizations = RouteQuery.ShortestRoute
-        routeQuery.setFeatureWeight(0, 0)
-        routeModel.update();
-    }
-
-    function calculateCoordinateRoute(startCoordinate, endCoordinate)
-    {
-        //! [routerequest0]
-        // clear away any old data in the query
-        routeQuery.clearWaypoints();
-
-        // add the start and end coords as waypoints on the route
-        routeQuery.addWaypoint(startCoordinate)
-        routeQuery.addWaypoint(endCoordinate)
-        routeQuery.travelModes = RouteQuery.CarTravel
-        routeQuery.routeOptimizations = RouteQuery.FastestRoute
-
-        //! [routerequest0]
-
-        //! [routerequest0 feature weight]
-        for (var i=0; i<9; i++) {
-            routeQuery.setFeatureWeight(i, 0)
-        }
-        //for (var i=0; i<routeDialog.features.length; i++) {
-        //    map.routeQuery.setFeatureWeight(routeDialog.features[i], RouteQuery.AvoidFeatureWeight)
-        //}
-        //! [routerequest0 feature weight]
-
-        //! [routerequest1]
-        routeModel.update();
-
-        //! [routerequest1]
-        //! [routerequest2]
-        // center the map on the start coord
-        map.center = startCoordinate;
-        //! [routerequest2]
-    }
-
-    function geocode(fromAddress)
-    {
-        //! [geocode1]
-        // send the geocode request
-        geocodeModel.query = fromAddress
-        geocodeModel.update()
-        //! [geocode1]
-    }
-
-    function updateCompass(heading)
-    {
-        compass.rotation = heading - 90
-    }
-
-//! [coord]
-    zoomLevel: (maximumZoomLevel - minimumZoomLevel)/2
-//! [coord]
-
-//! [mapnavigation]
-    // Enable pan, flick, and pinch gestures to zoom in and out
-    gesture.acceptedGestures: MapGestureArea.PanGesture | MapGestureArea.FlickGesture | MapGestureArea.PinchGesture
-    gesture.flickDeceleration: 3000
-    gesture.enabled: !map.followme
-//! [mapnavigation]
-    focus: true
-    onCopyrightLinkActivated: Qt.openUrlExternally(link)
-
-    onCenterChanged:{
-        scaleTimer.restart()
-    }
-
-    onZoomLevelChanged:{
-        scaleTimer.restart()
-    }
-
-    onWidthChanged:{
-        scaleTimer.restart()
-    }
-
-    onHeightChanged:{
-        scaleTimer.restart()
-    }
-
-    Component.onCompleted: {
-        markers = new Array();
-        mapItems = new Array();
-    }
-
-    Keys.onPressed: {
-        if (event.key === Qt.Key_Plus) {
-            map.zoomLevel++;
-        } else if (event.key === Qt.Key_Minus) {
-            map.zoomLevel--;
-        } else if (event.key === Qt.Key_Left || event.key === Qt.Key_Right ||
-                   event.key === Qt.Key_Up   || event.key === Qt.Key_Down) {
-            var dx = 0;
-            var dy = 0;
-
-            switch (event.key) {
-
-            case Qt.Key_Left: dx = map.width / 4; break;
-            case Qt.Key_Right: dx = -map.width / 4; break;
-            case Qt.Key_Up: dy = map.height / 4; break;
-            case Qt.Key_Down: dy = -map.height / 4; break;
-
-            }
-
-            var mapCenterPoint = Qt.point(map.width / 2.0 - dx, map.height / 2.0 - dy);
-            map.center = map.toCoordinate(mapCenterPoint);
-        }
-    }
-
-    /* @todo
-    Binding {
-        target: map
-        property: 'center'
-        when: followme
-    }*/
-
-    MapQuickItem {
-        id: locationPoint
-        sourceItem: Image {
-                id: compass
-                width: 100 * (map.zoomLevel / map.maximumZoomLevel)
-                height: 50 * (map.zoomLevel / map.maximumZoomLevel)
-                source: "../resources/car.png"
-            }
-        coordinate: location
-        opacity: 1.0
-        anchorPoint: Qt.point(sourceItem.width/2, sourceItem.height/2)
-    }
-
-    Slider {
-        id: zoomSlider;
-        z: map.z + 3
-        minimumValue: map.minimumZoomLevel;
-        maximumValue: map.maximumZoomLevel;
-        anchors.margins: 10
-        anchors.bottom: scale.top
-        anchors.top: parent.top
-        anchors.right: parent.right
-        orientation : Qt.Vertical
-        value: map.zoomLevel
-        onValueChanged: {
-            if (value >= 0)
-                map.zoomLevel = value
-        }
-    }
-
-    GridLayout {
-        z: map.z + 3
-        columns: 1
-        width: 300
-        height: 300
-
-        ToggleButton {
-            id: followme
-            text: "GeoLocation Pan"
-            checked: map.followme
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            onClicked: {
-                map.followme = !map.followme
-            }
-        }
-
-        Button {
-            text: "Lookup Route"
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            onClicked: {
-                stackView.pop({item:page, immediate: true})
-                stackView.push(Qt.resolvedUrl("../forms/RouteAddress.qml"),
-                                     { "plugin": map.plugin,
-                                       "toAddress": toAddress,
-                                       "fromCoordinate": map.location})
-                stackView.currentItem.showRoute.connect(map.calculateCoordinateRoute)
-                stackView.currentItem.showMessage.connect(stackView.showMessage)
-                stackView.currentItem.closeForm.connect(stackView.closeForm)
-            }
-        }
-
-        Button {
-            text: "Reverse GeoCode"
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            onClicked: {
-                stackView.pop({item:page, immediate: true})
-                stackView.push(Qt.resolvedUrl("../forms/ReverseGeocode.qml"),
-                                      { "coordinate": map.location})
-                stackView.currentItem.showPlace.connect(map.geocode)
-                stackView.currentItem.closeForm.connect(stackView.closeForm)
-            }
-        }
-
-        Button {
-            text: "Show Route List"
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            onClicked: {
-                stackView.showRouteListPage()
-            }
-        }
-
-        Button {
-            text: "Clear Route"
-            Layout.fillWidth: true
-            Layout.fillHeight: true
-            enabled: map.routeModel.count
-            onClicked: {
-                map.routeModel.reset();
-                map.zoomLevel = map.maximumZoomLevel
-                map.center = map.location
-            }
-        }
-    }
-
-    Item {
-        id: scale
-        z: map.z + 3
-        visible: scaleText.text != "0 m"
-        anchors.bottom: parent.bottom;
-        anchors.right: parent.right
-        anchors.margins: 20
-        height: scaleText.height * 2
-        width: scaleImage.width
-
-        Image {
-            id: scaleImageLeft
-            source: "../resources/scale_end.png"
-            anchors.bottom: parent.bottom
-            anchors.right: scaleImage.left
-        }
-        Image {
-            id: scaleImage
-            source: "../resources/scale.png"
-            anchors.bottom: parent.bottom
-            anchors.right: scaleImageRight.left
-        }
-        Image {
-            id: scaleImageRight
-            source: "../resources/scale_end.png"
-            anchors.bottom: parent.bottom
-            anchors.right: parent.right
-        }
-        Label {
-            id: scaleText
-            color: "#004EAE"
-            anchors.centerIn: parent
-            text: "0 m"
-        }
-        Component.onCompleted: {
-            map.calculateScale();
-        }
-    }
-
-    //! [routemodel0]
-    RouteModel {
-        id: routeModel
-        plugin : map.plugin
-        query:  RouteQuery {
-            id: routeQuery
-        }
-        onStatusChanged: {
-            if (status == RouteModel.Ready) {
-                switch (count) {
-                case 0:
-                    // technically not an error
-                    map.routeError()
-                    break
-                case 1:
-                    map.showRouteList()
-                    break
-                }
-            } else if (status == RouteModel.Error) {
-                map.routeError()
-            }
-        }
-    }
-    //! [routemodel0]
-
-    //! [routedelegate0]
-    Component {
-        id: routeDelegate
-
-        MapRoute {
-            id: route
-            route: routeData
-            line.color: "#46a2da"
-            line.width: 5
-            smooth: true
-            opacity: 0.8
-     //! [routedelegate0]
-            MouseArea {
-                id: routeMouseArea
-                anchors.fill: parent
-                hoverEnabled: false
-                property variant lastCoordinate
-
-                onPressed : {
-                    map.lastX = mouse.x + parent.x
-                    map.lastY = mouse.y + parent.y
-                    map.pressX = mouse.x + parent.x
-                    map.pressY = mouse.y + parent.y
-                    lastCoordinate = map.toCoordinate(Qt.point(mouse.x, mouse.y))
-                }
-
-                onPositionChanged: {
-                    if (mouse.button == Qt.LeftButton) {
-                        map.lastX = mouse.x + parent.x
-                        map.lastY = mouse.y + parent.y
-                    }
-                }
-
-                onPressAndHold:{
-                    if (Math.abs(map.pressX - parent.x- mouse.x ) < map.jitterThreshold
-                            && Math.abs(map.pressY - parent.y - mouse.y ) < map.jitterThreshold) {
-                        showRouteMenu(lastCoordinate);
-                    }
-                }
-
-            }
-    //! [routedelegate1]
-        }
-    }
-    //! [routedelegate1]
-
-    //! [geocodemodel0]
-    GeocodeModel {
-        id: geocodeModel
-        plugin: map.plugin
-        onStatusChanged: {
-            if ((status == GeocodeModel.Ready) || (status == GeocodeModel.Error))
-                map.geocodeFinished()
-        }
-        onLocationsChanged:
-        {
-            if (count == 1) {
-                map.center.latitude = get(0).coordinate.latitude
-                map.center.longitude = get(0).coordinate.longitude
-            }
-        }
-    }
-    //! [geocodemodel0]
-
-    //! [pointdel0]
-    Component {
-        id: pointDelegate
-
-        MapCircle {
-            id: point
-            color: "#46a2da"
-            border.color: "#190a33"
-            border.width: 2
-            smooth: true
-            opacity: 0.25
-            center: locationData.coordinate
-            //! [pointdel0]
-            MouseArea {
-                anchors.fill:parent
-                id: circleMouseArea
-                hoverEnabled: false
-                property variant lastCoordinate
-
-                onPressed : {
-                    map.lastX = mouse.x + parent.x
-                    map.lastY = mouse.y + parent.y
-                    map.pressX = mouse.x + parent.x
-                    map.pressY = mouse.y + parent.y
-                    lastCoordinate = map.toCoordinate(Qt.point(mouse.x, mouse.y))
-                }
-
-                onPositionChanged: {
-                    if (Math.abs(map.pressX - parent.x- mouse.x ) > map.jitterThreshold ||
-                            Math.abs(map.pressY - parent.y -mouse.y ) > map.jitterThreshold) {
-                        if (pressed) parent.radius = parent.center.distanceTo(
-                                         map.toCoordinate(Qt.point(mouse.x, mouse.y)))
-                    }
-                    if (mouse.button == Qt.LeftButton) {
-                        map.lastX = mouse.x + parent.x
-                        map.lastY = mouse.y + parent.y
-                    }
-                }
-
-                onPressAndHold:{
-                    if (Math.abs(map.pressX - parent.x- mouse.x ) < map.jitterThreshold
-                            && Math.abs(map.pressY - parent.y - mouse.y ) < map.jitterThreshold) {
-                        showPointMenu(lastCoordinate);
-                    }
-                }
-            }
-    //! [pointdel1]
-        }
-    }
-    //! [pointdel1]
-
-    //! [routeview0]
-    MapItemView {
-        model: routeModel
-        delegate: routeDelegate
-    //! [routeview0]
-        autoFitViewport: true
-    //! [routeview1]
-    }
-    //! [routeview1]
-
-    //! [geocodeview]
-    MapItemView {
-        model: geocodeModel
-        delegate: pointDelegate
-    }
-    //! [geocodeview]
-
-    Timer {
-        id: scaleTimer
-        interval: 100
-        running: false
-        repeat: false
-        onTriggered: {
-            map.calculateScale()
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-        property variant lastCoordinate
-        anchors.fill: parent
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-
-        onPressed : {
-            map.lastX = mouse.x
-            map.lastY = mouse.y
-            map.pressX = mouse.x
-            map.pressY = mouse.y
-            lastCoordinate = map.toCoordinate(Qt.point(mouse.x, mouse.y))
-        }
-
-        onPositionChanged: {
-            if (mouse.button == Qt.LeftButton) {
-                map.lastX = mouse.x
-                map.lastY = mouse.y
-            }
-        }
-
-        onDoubleClicked: {
-            var mouseGeoPos = map.toCoordinate(Qt.point(mouse.x, mouse.y));
-            var preZoomPoint = map.fromCoordinate(mouseGeoPos, false);
-            if (mouse.button === Qt.LeftButton) {
-                map.zoomLevel++;
-            } else if (mouse.button === Qt.RightButton) {
-                map.zoomLevel--;
-            }
-            var postZoomPoint = map.fromCoordinate(mouseGeoPos, false);
-            var dx = postZoomPoint.x - preZoomPoint.x;
-            var dy = postZoomPoint.y - preZoomPoint.y;
-
-            var mapCenterPoint = Qt.point(map.width / 2.0 + dx, map.height / 2.0 + dy);
-            map.center = map.toCoordinate(mapCenterPoint);
-
-            lastX = -1;
-            lastY = -1;
-        }
-
-        onPressAndHold:{
-            if (Math.abs(map.pressX - mouse.x ) < map.jitterThreshold
-                    && Math.abs(map.pressY - mouse.y ) < map.jitterThreshold) {
-                showMainMenu(lastCoordinate);
-            }
-        }
-    }
-//! [end]
-}
-//! [end]
diff --git a/app/map/Marker.qml b/app/map/Marker.qml
deleted file mode 100644
index 3c0ed17..0000000
--- a/app/map/Marker.qml
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5;
-import QtLocation 5.6
-
-//! [mqi-top]
-MapQuickItem {
-    id: marker
-//! [mqi-top]
-    property alias lastMouseX: markerMouseArea.lastX
-    property alias lastMouseY: markerMouseArea.lastY
-
-//! [mqi-anchor]
-    anchorPoint.x: image.width/4
-    anchorPoint.y: image.height
-
-    sourceItem: Image {
-        id: image
-//! [mqi-anchor]
-        source: "../resources/marker.png"
-        opacity: markerMouseArea.pressed ? 0.6 : 1.0
-        MouseArea  {
-            id: markerMouseArea
-            property int pressX : -1
-            property int pressY : -1
-            property int jitterThreshold : 10
-            property int lastX: -1
-            property int lastY: -1
-            anchors.fill: parent
-            hoverEnabled : false
-            drag.target: marker
-            preventStealing: true
-
-            onPressed : {
-                map.pressX = mouse.x
-                map.pressY = mouse.y
-                map.currentMarker = -1
-                for (var i = 0; i< map.markers.length; i++){
-                    if (marker == map.markers[i]){
-                        map.currentMarker = i
-                        break
-                    }
-                }
-            }
-
-            onPressAndHold:{
-                if (Math.abs(map.pressX - mouse.x ) < map.jitterThreshold
-                        && Math.abs(map.pressY - mouse.y ) < map.jitterThreshold) {
-                    var p = map.fromCoordinate(marker.coordinate)
-                    lastX = p.x
-                    lastY = p.y
-                    map.showMarkerMenu(marker.coordinate)
-                }
-            }
-        }
-
-        Text{
-            id: number
-            y: image.height/10
-            width: image.width
-            color: "white"
-            font.bold: true
-            font.pixelSize: 14
-            horizontalAlignment: Text.AlignHCenter
-            Component.onCompleted: {
-                text = map.markerCounter
-            }
-        }
-
-//! [mqi-closeimage]
-    }
-//! [mqi-closeimage]
-
-    Component.onCompleted: coordinate = map.toCoordinate(Qt.point(markerMouseArea.mouseX,
-                                                                  markerMouseArea.mouseY));
-//! [mqi-close]
-}
-//! [mqi-close]
diff --git a/app/map/PolygonItem.qml b/app/map/PolygonItem.qml
deleted file mode 100644
index cab4e6c..0000000
--- a/app/map/PolygonItem.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.5
-import QtLocation 5.6
-
-//TODO: remove me when items are integrated
-
-MapPolygon {
-
-    color: "#46a2da"
-    border.color: "#190a33"
-    border.width: 2
-    smooth: true
-    opacity: 0.25
-
-    function setGeometry(markers, index){
-        for (var i = index; i<markers.length; i++){
-            addCoordinate(markers[i].coordinate)
-        }
-    }
-    MouseArea {
-        anchors.fill:parent
-        id: mousearea
-        drag.target: parent
-    }
-}
diff --git a/app/map/PolylineItem.qml b/app/map/PolylineItem.qml
deleted file mode 100644
index c27d8b7..0000000
--- a/app/map/PolylineItem.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.5
-import QtLocation 5.6
-
-//TODO: remove/refactor me when items are integrated
-
-MapPolyline {
-
-    line.color: "#46a2da"
-    line.width: 4
-    opacity: 0.25
-    smooth: true
-
-    function setGeometry(markers, index){
-        for (var i = index; i<markers.length; i++){
-            addCoordinate(markers[i].coordinate)
-        }
-    }
-}
diff --git a/app/map/RectangleItem.qml b/app/map/RectangleItem.qml
deleted file mode 100644
index 8369c90..0000000
--- a/app/map/RectangleItem.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.5
-import QtLocation 5.6
-
-MapRectangle {
-    id: mapRectangle
-
-    color: "#46a2da"
-    border.color: "#190a33"
-    border.width: 2
-    smooth: true
-    opacity: 0.25
-
-    function setGeometry(markers, index){
-        topLeft.latitude = Math.max(markers[index].coordinate.latitude, markers[index + 1].coordinate.latitude)
-        topLeft.longitude = Math.min(markers[index].coordinate.longitude, markers[index + 1].coordinate.longitude)
-        bottomRight.latitude = Math.min(markers[index].coordinate.latitude, markers[index + 1].coordinate.latitude)
-        bottomRight.longitude = Math.max(markers[index].coordinate.longitude, markers[index + 1].coordinate.longitude)
-    }
-
-}
diff --git a/app/mapviewer.qml b/app/mapviewer.qml
deleted file mode 100644
index 6240600..0000000
--- a/app/mapviewer.qml
+++ /dev/null
@@ -1,486 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 2.0
-import QtQuick.VirtualKeyboard 2.1
-import QtLocation 5.6
-import QtPositioning 5.5
-import AGL.Demo.Controls 1.0
-import "map"
-import "menus"
-import "helper.js" as Helper
-import "api" as API
-
-ApplicationWindow {
-    id: appWindow
-    property variant map
-    property variant parameters
-
-    //defaults
-    //! [routecoordinate]
-    property variant fromCoordinate: QtPositioning.coordinate(59.9483, 10.7695)
-    property variant toCoordinate: QtPositioning.coordinate(59.9645, 10.671)
-    //! [routecoordinate]
-
-    API.GPS {
-        id: gps
-        url: bindingAddress
-    }
-
-    API.GeoClue {
-        id: geoclue
-        url: bindingAddress
-    }
-
-     API.GeoFence {
-        id: geofence
-        url: bindingAddress
-    }
-
-    function createMap(provider)
-    {
-        var plugin
-
-        if (parameters && parameters.length>0)
-            plugin = Qt.createQmlObject ('import QtLocation 5.6; Plugin{ name:"' + provider + '"; parameters: appWindow.parameters}', appWindow)
-        else
-            plugin = Qt.createQmlObject ('import QtLocation 5.6; Plugin{ name:"' + provider + '"}', appWindow)
-
-        var zoomLevel = null
-        var center = null
-        if (map) {
-            zoomLevel = map.zoomLevel
-            center = map.center
-            map.destroy()
-        }
-
-        map = mapComponent.createObject(page);
-        map.plugin = plugin;
-
-        if (zoomLevel != null) {
-            map.zoomLevel = zoomLevel
-            map.center = center
-        } else {
-            map.zoomLevel = map.maximumZoomLevel
-        }
-
-        map.forceActiveFocus()
-    }
-
-    function getPlugins()
-    {
-        var plugin = Qt.createQmlObject ('import QtLocation 5.6; Plugin {}', appWindow)
-        var myArray = new Array()
-        for (var i = 0; i<plugin.availableServiceProviders.length; i++) {
-            var tempPlugin = Qt.createQmlObject ('import QtLocation 5.6; Plugin {name: "' + plugin.availableServiceProviders[i]+ '"}', appWindow)
-            if (tempPlugin.supportsMapping())
-                myArray.push(tempPlugin.name)
-        }
-        myArray.sort()
-        return myArray
-    }
-
-    function initializeProviders(pluginParameters)
-    {
-        var parameters = new Array()
-        for (var prop in pluginParameters){
-            var parameter = Qt.createQmlObject('import QtLocation 5.6; PluginParameter{ name: "'+ prop + '"; value: "' + pluginParameters[prop]+'"}',appWindow)
-            parameters.push(parameter)
-        }
-        appWindow.parameters = parameters
-        var plugins = getPlugins()
-        mainMenu.providerMenu.createMenu(plugins)
-        for (var i = 0; i<plugins.length; i++) {
-            if (plugins[i] === "osm")
-                mainMenu.selectProvider(plugins[i])
-        }
-    }
-
-    visible: true
-    //menuBar: mainMenu
-
-    //! [geocode0]
-    Address {
-        id :fromAddress
-    }
-    //! [geocode0]
-
-    Address {
-        id: toAddress
-        street: "Golden Gate Park"
-        city: "San Francisco"
-        state: "California"
-        country: "US"
-    }
-
-    InputPanel {
-            id: inputPanel
-            visible: Qt.inputMethod.visible
-            y: Qt.inputMethod.visible ? parent.height - inputPanel.height : parent.height
-            anchors.left: parent.left
-            anchors.right: parent.right
-    }
-
-    MainMenu {
-        id: mainMenu
-
-        function setLanguage(lang)
-        {
-            map.plugin.locales = lang;
-            stackView.pop(page)
-        }
-
-        onSelectProvider: {
-            stackView.pop()
-            for (var i = 0; i < providerMenu.items.length; i++) {
-                providerMenu.items[i].checked = providerMenu.items[i].text === providerName
-            }
-
-            createMap(providerName)
-            if (map.error === Map.NoError) {
-                selectMapType(map.activeMapType)
-                toolsMenu.createMenu(map);
-            } else {
-                mapTypeMenu.clear();
-                toolsMenu.clear();
-            }
-        }
-
-        onSelectMapType: {
-            stackView.pop(page)
-            for (var i = 0; i < mapTypeMenu.items.length; i++) {
-                mapTypeMenu.items[i].checked = mapTypeMenu.items[i].text === mapType.name
-            }
-            map.activeMapType = mapType
-        }
-
-
-        onSelectTool: {
-            switch (tool) {
-            case "AddressRoute":
-                stackView.pop({item:page, immediate: true})
-                stackView.push(Qt.resolvedUrl("forms/RouteAddress.qml"),
-                                     { "plugin": map.plugin,
-                                       "toAddress": toAddress,
-                                       "fromAddress": fromAddress})
-                stackView.currentItem.showRoute.connect(map.calculateCoordinateRoute)
-                stackView.currentItem.showMessage.connect(stackView.showMessage)
-                stackView.currentItem.closeForm.connect(stackView.closeForm)
-                break
-            case "CoordinateRoute":
-                stackView.pop({item:page, immediate: true})
-                stackView.push(Qt.resolvedUrl("forms/RouteCoordinate.qml"),
-                                     { "toCoordinate": toCoordinate,
-                                       "fromCoordinate": fromCoordinate})
-                stackView.currentItem.showRoute.connect(map.calculateCoordinateRoute)
-                stackView.currentItem.closeForm.connect(stackView.closeForm)
-                break
-            case "Geocode":
-                stackView.pop({item:page, immediate: true})
-                stackView.push(Qt.resolvedUrl("forms/Geocode.qml"),
-                                     { "address": fromAddress})
-                stackView.currentItem.showPlace.connect(map.geocode)
-                stackView.currentItem.closeForm.connect(stackView.closeForm)
-                break
-            case "RevGeocode":
-                stackView.pop({item:page, immediate: true})
-                stackView.push(Qt.resolvedUrl("forms/ReverseGeocode.qml"),
-                                      { "coordinate": fromCoordinate})
-                stackView.currentItem.showPlace.connect(map.geocode)
-                stackView.currentItem.closeForm.connect(stackView.closeForm)
-                break
-            case "Language":
-                stackView.pop({item:page, immediate: true})
-                stackView.push(Qt.resolvedUrl("forms/Locale.qml"),
-                                      { "locale":  map.plugin.locales[0]})
-                stackView.currentItem.selectLanguage.connect(setLanguage)
-                stackView.currentItem.closeForm.connect(stackView.closeForm)
-                break
-            case "Clear":
-                map.clearData()
-                break
-            case "Prefetch":
-                map.prefetchData()
-                break
-            default:
-                console.log("Unsupported operation")
-            }
-        }
-
-        onToggleMapState: {
-            stackView.pop(page)
-            switch (state) {
-            case "FollowMe":
-                map.followme = !map.followme
-                break
-            default:
-                console.log("Unsupported operation")
-            }
-        }
-    }
-
-    MapPopupMenu {
-        id: mapPopupMenu
-
-        function show(coordinate)
-        {
-            stackView.pop(page)
-            mapPopupMenu.coordinate = coordinate
-            mapPopupMenu.markersCount = map.markers.length
-            mapPopupMenu.mapItemsCount = map.mapItems.length
-            mapPopupMenu.update()
-            mapPopupMenu.popup()
-        }
-
-        onItemClicked: {
-            stackView.pop(page)
-            switch (item) {
-            case "addMarker":
-                map.addMarker()
-                break
-            case "getCoordinate":
-                map.coordinatesCaptured(coordinate.latitude, coordinate.longitude)
-                break
-            case "fitViewport":
-                map.fitViewportToMapItems()
-                break
-            case "deleteMarkers":
-                map.deleteMarkers()
-                break
-            case "deleteItems":
-                map.deleteMapItems()
-                break
-            default:
-                console.log("Unsupported operation")
-            }
-        }
-    }
-
-    MarkerPopupMenu {
-        id: markerPopupMenu
-
-        function show(coordinate)
-        {
-            stackView.pop(page)
-            markerPopupMenu.markersCount = map.markers.length
-            markerPopupMenu.update()
-            markerPopupMenu.popup()
-        }
-
-        function askForCoordinate()
-        {
-            stackView.push(Qt.resolvedUrl("forms/ReverseGeocode.qml"),
-                                  { "title": qsTr("New Coordinate"),
-                                     "coordinate":   map.markers[map.currentMarker].coordinate})
-            stackView.currentItem.showPlace.connect(moveMarker)
-            stackView.currentItem.closeForm.connect(stackView.closeForm)
-        }
-
-        function moveMarker(coordinate)
-        {
-            map.markers[map.currentMarker].coordinate = coordinate;
-            map.center = coordinate;
-            stackView.pop(page)
-        }
-
-        onItemClicked: {
-            stackView.pop(page)
-            switch (item) {
-            case "deleteMarker":
-                map.deleteMarker(map.currentMarker)
-                break;
-            case "getMarkerCoordinate":
-                map.coordinatesCaptured(map.markers[map.currentMarker].coordinate.latitude, map.markers[map.currentMarker].coordinate.longitude)
-                break;
-            case "moveMarkerTo":
-                askForCoordinate()
-                break;
-            case "routeToNextPoint":
-            case "routeToNextPoints":
-                map.calculateMarkerRoute()
-                break
-            case "distanceToNextPoint":
-                var coordinate1 = map.markers[currentMarker].coordinate;
-                var coordinate2 = map.markers[currentMarker+1].coordinate;
-                var distance = Helper.formatDistance(coordinate1.distanceTo(coordinate2));
-                stackView.showMessage(qsTr("Distance"),"<b>" + qsTr("Distance:") + "</b> " + distance)
-                break
-            case "drawImage":
-                map.addGeoItem("ImageItem")
-                break
-            case "drawRectangle":
-                map.addGeoItem("RectangleItem")
-                break
-            case "drawCircle":
-                map.addGeoItem("CircleItem")
-                break;
-            case "drawPolyline":
-                map.addGeoItem("PolylineItem")
-                break;
-            case "drawPolygonMenu":
-                map.addGeoItem("PolygonItem")
-                break
-            default:
-                console.log("Unsupported operation")
-            }
-        }
-    }
-
-    ItemPopupMenu {
-        id: itemPopupMenu
-
-        function show(type,coordinate)
-        {
-            stackView.pop(page)
-            itemPopupMenu.type = type
-            itemPopupMenu.update()
-            itemPopupMenu.popup()
-        }
-
-        onItemClicked: {
-            stackView.pop(page)
-            switch (item) {
-            case "showRouteInfo":
-                stackView.showRouteListPage()
-                break;
-            case "deleteRoute":
-                map.routeModel.reset();
-                break;
-            case "showPointInfo":
-                map.showGeocodeInfo()
-                break;
-            case "deletePoint":
-                map.geocodeModel.reset()
-                break;
-            default:
-                console.log("Unsupported operation")
-            }
-        }
-    }
-
-    StackView {
-        id: stackView
-        anchors.fill: parent
-        focus: true
-        initialItem: Item {
-            id: page
-        }
-
-        function showMessage(title,message,backPage)
-        {
-            push(Qt.resolvedUrl("forms/Message.qml"),
-                               {
-                                   "title" : title,
-                                   "message" : message,
-                                   "backPage" : backPage
-                               })
-            currentItem.closeForm.connect(closeMessage)
-        }
-
-        function closeMessage(backPage)
-        {
-            pop(backPage)
-        }
-
-        function closeForm()
-        {
-            pop(page)
-        }
-
-        function showRouteListPage()
-        {
-            push(Qt.resolvedUrl("forms/RouteList.qml") ,
-                               {
-                                   "routeModel" : map.routeModel
-                               })
-            currentItem.closeForm.connect(closeForm)
-        }
-    }
-
-    Component {
-        id: mapComponent
-
-        MapComponent{
-            width: page.width
-            height: page.height
-            onFollowmeChanged: mainMenu.isFollowMe = map.followme
-            onSupportedMapTypesChanged: mainMenu.mapTypeMenu.createMenu(map)
-            onCoordinatesCaptured: {
-                var text = "<b>" + qsTr("Latitude:") + "</b> " + Helper.roundNumber(latitude,4) + "<br/><b>" + qsTr("Longitude:") + "</b> " + Helper.roundNumber(longitude,4)
-                stackView.showMessage(qsTr("Coordinates"),text);
-            }
-            onGeocodeFinished:{
-                if (map.geocodeModel.status == GeocodeModel.Ready) {
-                    if (map.geocodeModel.count == 0) {
-                        stackView.showMessage(qsTr("Geocode Error"),qsTr("Unsuccessful geocode"))
-                    } else if (map.geocodeModel.count > 1) {
-                        stackView.showMessage(qsTr("Ambiguous geocode"), map.geocodeModel.count + " " +
-                                              qsTr("results found for the given address, please specify location"))
-                    } else {
-                        stackView.showMessage(qsTr("Location"), geocodeMessage(),page)
-                    }
-                } else if (map.geocodeModel.status == GeocodeModel.Error) {
-                    stackView.showMessage(qsTr("Geocode Error"),qsTr("Unsuccessful geocode"))
-                }
-            }
-            onRouteError: stackView.showMessage(qsTr("Route Error"),qsTr("Unable to find a route for the given points"),page)
-
-            onShowGeocodeInfo: stackView.showMessage(qsTr("Location"),geocodeMessage(),page)
-
-            onErrorChanged: {
-                if (map.error != Map.NoError) {
-                    var title = qsTr("ProviderError")
-                    var message =  map.errorString + "<br/><br/><b>" + qsTr("Try to select other provider") + "</b>"
-                    if (map.error == Map.MissingRequiredParameterError)
-                        message += "<br/>" + qsTr("or see") + " \'mapviewer --help\' "
-                                + qsTr("how to pass plugin parameters.")
-                    stackView.showMessage(title,message);
-                }
-            }
-            //onShowMainMenu: mapPopupMenu.show(coordinate)
-            onShowMarkerMenu: markerPopupMenu.show(coordinate)
-            onShowRouteMenu: itemPopupMenu.show("Route",coordinate)
-            onShowPointMenu: itemPopupMenu.show("Point",coordinate)
-            onShowRouteList: stackView.showRouteListPage()
-        }
-    }
-}
diff --git a/app/mapviewer.qrc b/app/mapviewer.qrc
deleted file mode 100644
index c5dca44..0000000
--- a/app/mapviewer.qrc
+++ /dev/null
@@ -1,40 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>mapviewer.qml</file>
-	<file>api/GPS.qml</file>
-	<file>api/GeoClue.qml</file>
-	<file>api/GeoFence.qml</file>
-        <file>map/MapComponent.qml</file>
-        <file>map/Marker.qml</file>
-        <file>map/PolylineItem.qml</file>
-        <file>map/RectangleItem.qml</file>
-        <file>map/CircleItem.qml</file>
-        <file>map/PolygonItem.qml</file>
-        <file>map/ImageItem.qml</file>
-        <file>forms/Message.qml</file>
-        <file>forms/MessageForm.ui.qml</file>
-        <file>forms/Geocode.qml</file>
-        <file>forms/GeocodeForm.ui.qml</file>
-        <file>forms/ReverseGeocode.qml</file>
-        <file>forms/ReverseGeocodeForm.ui.qml</file>
-        <file>forms/RouteCoordinate.qml</file>
-        <file>forms/RouteCoordinateForm.ui.qml</file>
-        <file>forms/RouteAddress.qml</file>
-        <file>forms/RouteAddressForm.ui.qml</file>
-        <file>forms/Locale.qml</file>
-        <file>forms/LocaleForm.ui.qml</file>
-        <file>forms/RouteList.qml</file>
-        <file>forms/RouteListDelegate.qml</file>
-        <file>forms/RouteListHeader.qml</file>
-        <file>menus/MainMenu.qml</file>
-        <file>menus/MapPopupMenu.qml</file>
-        <file>menus/MarkerPopupMenu.qml</file>
-        <file>menus/ItemPopupMenu.qml</file>
-        <file>helper.js</file>
-	<file>resources/car.png</file>
-        <file>resources/scale_end.png</file>
-        <file>resources/scale.png</file>
-        <file>resources/marker.png</file>
-        <file>resources/icon.png</file>
-    </qresource>
-</RCC>
diff --git a/app/menus/ItemPopupMenu.qml b/app/menus/ItemPopupMenu.qml
deleted file mode 100644
index 8d7e2f7..0000000
--- a/app/menus/ItemPopupMenu.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-
-Menu {
-    property variant type
-    signal itemClicked(string item)
-
-    function update() {
-        clear()
-        addItem(qsTr("Info")).triggered.connect(function(){itemClicked("show" + type + "Info")})
-        addItem(qsTr("Delete")).triggered.connect(function(){itemClicked("delete" + type )})
-    }
-}
diff --git a/app/menus/MainMenu.qml b/app/menus/MainMenu.qml
deleted file mode 100644
index fe2bfa1..0000000
--- a/app/menus/MainMenu.qml
+++ /dev/null
@@ -1,126 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtLocation 5.6
-
-MenuBar {
-    property variant  providerMenu: providerMenu
-    property variant  mapTypeMenu: mapTypeMenu
-    property variant  toolsMenu: toolsMenu
-    property alias isFollowMe: toolsMenu.isFollowMe
-
-    signal selectProvider(string providerName)
-    signal selectMapType(variant mapType)
-    signal selectTool(string tool);
-    signal toggleMapState(string state)
-
-    Menu {
-        id: providerMenu
-        title: qsTr("Provider")
-
-        function createMenu(plugins)
-        {
-            clear()
-            for (var i = 0; i < plugins.length; i++) {
-                createProviderMenuItem(plugins[i]);
-            }
-        }
-
-        function createProviderMenuItem(provider)
-        {
-            var item = addItem(provider);
-            item.checkable = true;
-            item.triggered.connect(function(){selectProvider(provider)})
-        }
-    }
-
-    Menu {
-        id: mapTypeMenu
-        title: qsTr("MapType")
-
-        function createMenu(map)
-        {
-            clear()
-            for (var i = 0; i<map.supportedMapTypes.length; i++) {
-                createMapTypeMenuItem(map.supportedMapTypes[i]).checked =
-                        (map.activeMapType === map.supportedMapTypes[i]);
-            }
-        }
-
-        function createMapTypeMenuItem(mapType)
-        {
-            var item = addItem(mapType.name);
-            item.checkable = true;
-            item.triggered.connect(function(){selectMapType(mapType)})
-            return item;
-        }
-    }
-
-    Menu {
-        id: toolsMenu
-        property bool isFollowMe: false;
-        title: qsTr("Tools")
-
-        function createMenu(map)
-        {
-            clear()
-            if (map.plugin.supportsGeocoding(Plugin.ReverseGeocodingFeature)) {
-                addItem(qsTr("Reverse geocode")).triggered.connect(function(){selectTool("RevGeocode")})
-            }
-            if (map.plugin.supportsGeocoding()) {
-                addItem(qsTr("Geocode")).triggered.connect(function(){selectTool("Geocode")})
-            }
-            if (map.plugin.supportsRouting()) {
-                addItem(qsTr("Route with coordinates")).triggered.connect(function(){selectTool("CoordinateRoute")})
-                addItem(qsTr("Route with address")).triggered.connect(function(){selectTool("AddressRoute")})
-            }
-
-            var item = addItem("")
-            item.text = Qt.binding(function() { return isFollowMe ? qsTr("Stop following") : qsTr("Follow me")})
-            item.triggered.connect(function() {toggleMapState("FollowMe")})
-
-            addItem(qsTr("Language")).triggered.connect(function(){selectTool("Language")})
-            addItem(qsTr("Prefetch Map Data")).triggered.connect(function(){selectTool("Prefetch")})
-            addItem(qsTr("Clear Map Data")).triggered.connect(function(){selectTool("Clear")})
-        }
-    }
-}
diff --git a/app/menus/MapPopupMenu.qml b/app/menus/MapPopupMenu.qml
deleted file mode 100644
index b8cc841..0000000
--- a/app/menus/MapPopupMenu.qml
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-
-Menu {
-    property variant coordinate
-    property int markersCount
-    property int mapItemsCount
-    signal itemClicked(string item)
-
-    function update() {
-        clear()
-        addItem(qsTr("Add Marker")).triggered.connect(function(){itemClicked("addMarker")})
-        addItem(qsTr("Get coordinate")).triggered.connect(function(){itemClicked("getCoordinate")})
-        addItem(qsTr("Fit Viewport To Map Items")).triggered.connect(function(){itemClicked("fitViewport")})
-
-        if (markersCount > 0) {
-            addItem(qsTr("Delete all markers")).triggered.connect(function(){itemClicked("deleteMarkers")})
-        }
-
-        if (mapItemsCount > 0) {
-            addItem(qsTr("Delete all items")).triggered.connect(function(){itemClicked("deleteItems")})
-        }
-    }
-}
diff --git a/app/menus/MarkerPopupMenu.qml b/app/menus/MarkerPopupMenu.qml
deleted file mode 100644
index 61855ff..0000000
--- a/app/menus/MarkerPopupMenu.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of The Qt Company Ltd nor the names of its
-**     contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-
-Menu {
-    property int currentMarker
-    property int markersCount
-    signal itemClicked(string item)
-
-    function update() {
-        clear()
-        addItem(qsTr("Delete")).triggered.connect(function(){itemClicked("deleteMarker")})
-        addItem(qsTr("Coordinates")).triggered.connect(function(){itemClicked("getMarkerCoordinate")})
-        addItem(qsTr("Move to")).triggered.connect(function(){itemClicked("moveMarkerTo")})
-        if (currentMarker == markersCount-2){
-            addItem(qsTr("Route to next point")).triggered.connect(function(){itemClicked("routeToNextPoint")});
-            addItem(qsTr("Distance to next point")).triggered.connect(function(){itemClicked("distanceToNextPoint")});
-        }
-        if (currentMarker < markersCount-2){
-            addItem(qsTr("Route to next points")).triggered.connect(function(){itemClicked("routeToNextPoints")});
-            addItem(qsTr("Distance to next point")).triggered.connect(function(){itemClicked("distanceToNextPoint")});
-        }
-
-        var menu = addMenu(qsTr("Draw..."))
-        menu.addItem(qsTr("Image")).triggered.connect(function(){itemClicked("drawImage")})
-
-        if (currentMarker <= markersCount-2){
-            menu.addItem(qsTr("Rectangle")).triggered.connect(function(){itemClicked("drawRectangle")})
-            menu.addItem(qsTr("Circle")).triggered.connect(function(){itemClicked("drawCircle")})
-            menu.addItem(qsTr("Polyline")).triggered.connect(function(){itemClicked("drawPolyline")})
-        }
-
-        if (currentMarker < markersCount-2){
-            menu.addItem(qsTr("Polygon")).triggered.connect(function(){itemClicked("drawPolygonMenu")})
-        }
-    }
-}
diff --git a/app/qcheapruler.cpp b/app/qcheapruler.cpp
new file mode 100644
index 0000000..4e520d2
--- /dev/null
+++ b/app/qcheapruler.cpp
@@ -0,0 +1,99 @@
+#include "qcheapruler.hpp"
+
+#include <QString>
+
+double QCheapRuler::distance() const
+{
+    return m_distance;
+}
+
+double QCheapRuler::currentDistance() const
+{
+    return m_currentDistance;
+}
+
+void QCheapRuler::setCurrentDistance(double current)
+{
+    if (m_path.empty()) {
+        m_currentDistance = 0.;
+        m_currentPosition = QGeoCoordinate(0., 0.);
+        m_segmentIndex = 0;
+
+        return;
+    }
+
+    double currentDistance = qMin(qMax(0., current), distance());
+    if (m_currentDistance != currentDistance) {
+        m_currentDistance = currentDistance;
+        emit currentDistanceChanged();
+    }
+
+    cr::point c = ruler().along(m_path, m_currentDistance);
+    if (m_currentPosition != QGeoCoordinate(c.y, c.x)) {
+        m_currentPosition = QGeoCoordinate(c.y, c.x);
+        emit currentPositionChanged();
+    }
+
+    unsigned segmentIndex = ruler().pointOnLine(m_path, c).second;
+    if (m_segmentIndex != segmentIndex) {
+        m_segmentIndex = segmentIndex;
+        emit segmentIndexChanged();
+    }
+}
+
+QGeoCoordinate QCheapRuler::currentPosition() const
+{
+    return m_currentPosition;
+}
+
+unsigned QCheapRuler::segmentIndex() const
+{
+    return m_segmentIndex;
+}
+
+QJSValue QCheapRuler::path() const
+{
+    // Should neveer be called.
+    return QJSValue();
+}
+
+void QCheapRuler::setPath(const QJSValue &value)
+{
+    if (!value.isArray())
+        return;
+
+    m_path.clear();
+    quint32 length = value.property(QStringLiteral("length")).toUInt();
+
+    for (unsigned i = 0; i < length; ++i) {
+        auto property = value.property(i);
+        cr::point coordinate = { 0., 0. };
+
+        if (property.hasProperty(QStringLiteral("latitude")))
+            coordinate.y = property.property(QStringLiteral("latitude")).toNumber();
+
+        if (property.hasProperty(QStringLiteral("longitude")))
+            coordinate.x = property.property(QStringLiteral("longitude")).toNumber();
+
+        m_path.push_back(coordinate);
+    }
+
+    double distance = ruler().lineDistance(m_path);
+    if (m_distance != distance) {
+        m_distance = distance;
+        emit distanceChanged();
+    }
+
+    setCurrentDistance(0.);
+
+    emit pathChanged();
+}
+
+cr::CheapRuler QCheapRuler::ruler() const
+{
+    if (m_path.empty()) {
+        return cr::CheapRuler(0., cr::CheapRuler::Kilometers);
+    } else {
+        return cr::CheapRuler(m_currentPosition.latitude(), cr::CheapRuler::Kilometers);
+    }
+}
diff --git a/app/qcheapruler.hpp b/app/qcheapruler.hpp
new file mode 100644
index 0000000..4510315
--- /dev/null
+++ b/app/qcheapruler.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include <QGeoCoordinate>
+#include <QJSValue>
+#include <QObject>
+
+#include <mapbox/cheap_ruler.hpp>
+
+namespace cr = mapbox::cheap_ruler;
+
+class QCheapRuler : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(double distance READ distance NOTIFY distanceChanged)
+    Q_PROPERTY(double currentDistance READ currentDistance WRITE setCurrentDistance NOTIFY currentDistanceChanged)
+    Q_PROPERTY(unsigned segmentIndex READ segmentIndex NOTIFY segmentIndexChanged)
+    Q_PROPERTY(QGeoCoordinate currentPosition READ currentPosition NOTIFY currentPositionChanged)
+    Q_PROPERTY(QJSValue path READ path WRITE setPath NOTIFY pathChanged)
+
+public:
+    QCheapRuler() = default;
+
+    double distance() const;
+
+    double currentDistance() const;
+    void setCurrentDistance(double);
+
+    unsigned segmentIndex() const;
+
+    QGeoCoordinate currentPosition() const;
+
+    QJSValue path() const;
+    void setPath(const QJSValue &value);
+
+signals:
+    void distanceChanged();
+    void currentDistanceChanged();
+    void currentPositionChanged();
+    void segmentIndexChanged();
+    void pathChanged();
+
+private:
+    cr::CheapRuler ruler() const;
+
+    double m_distance = 0.;
+    double m_currentDistance = 0.;
+    QGeoCoordinate m_currentPosition = QGeoCoordinate(0., 0.);
+    unsigned m_segmentIndex = 0;
+
+    cr::line_string m_path;
+};
diff --git a/app/qml/CustomLabel.qml b/app/qml/CustomLabel.qml
new file mode 100644
index 0000000..12387a1
--- /dev/null
+++ b/app/qml/CustomLabel.qml
@@ -0,0 +1,9 @@
+import QtQuick 2.1
+
+Text {
+    verticalAlignment: Text.AlignVCenter
+    font.family: "Lato"
+    font.weight: Font.Light
+    color: "#000000"
+    font.pixelSize: 24
+}
diff --git a/app/qml/DateAndTime.qml b/app/qml/DateAndTime.qml
new file mode 100644
index 0000000..65afb0b
--- /dev/null
+++ b/app/qml/DateAndTime.qml
@@ -0,0 +1,37 @@
+import QtQuick 2.0
+import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.0
+
+Item {
+    id: dateAndTime
+
+    width: 53 * hspan
+    height: 33 * vspan
+
+    property int hspan: 4
+    property int vspan: 1
+    property var currentDate: new Date();
+
+    RowLayout {
+        anchors.top: parent.top
+        anchors.horizontalCenter: parent.horizontalCenter
+        spacing: 10
+
+        CustomLabel {
+            font.capitalization: Font.AllUppercase
+            text: Qt.formatDateTime(dateAndTime.currentDate, "HH:mm")
+
+            color: "#000000"
+        }
+    }
+
+    Timer {
+        interval: 60000
+        running: true
+        repeat: true
+
+        onTriggered: {
+            dateAndTime.currentDate = new Date();
+        }
+    }
+}
diff --git a/app/qml/Main.qml b/app/qml/Main.qml
new file mode 100644
index 0000000..a2861e5
--- /dev/null
+++ b/app/qml/Main.qml
@@ -0,0 +1,28 @@
+import QtGraphicalEffects 1.0
+import QtLocation 5.9
+import QtPositioning 5.0
+import QtQuick 2.0
+import QtQuick.Controls 2.2
+import QtQuick.Layouts 1.0
+
+import com.mapbox.cheap_ruler 1.0
+import "qrc:/qml"
+
+ApplicationWindow {
+    id: window
+
+    title: "QT MapboxGL Turn By Turn Navigation Demo"
+    height: 768
+    width: 1024
+    visible: true
+
+    Item {
+        anchors.centerIn: parent
+        width: parent.width
+        height: parent.height
+
+        MapWindow {
+            anchors.fill:  parent
+        }
+    }
+}
diff --git a/app/qml/MapWindow.qml b/app/qml/MapWindow.qml
new file mode 100644
index 0000000..3772c31
--- /dev/null
+++ b/app/qml/MapWindow.qml
@@ -0,0 +1,434 @@
+import QtLocation 5.9
+import QtPositioning 5.0
+import QtQuick 2.0
+
+import com.mapbox.cheap_ruler 1.0
+
+Item {
+    id: mapWindow
+
+    // Km/h
+    property int carSpeed: 180
+    property bool navigating: false
+
+    property real rotateAngle: 0
+    property var startPoint: QtPositioning.coordinate(36.12549, -115.173498)
+    property var endPoint: QtPositioning.coordinate(36.0659063, -115.1800443)
+
+    states: [
+        State {
+            name: ""
+            PropertyChanges { target: map; tilt: 0; bearing: 0; zoomLevel: map.zoomLevel }
+        },
+        State {
+            name: "navigating"
+            PropertyChanges { target: map; tilt: 60; zoomLevel: 20 }
+        }
+    ]
+
+    transitions: [
+        Transition {
+            to: "*"
+            RotationAnimation { target: map; property: "bearing"; duration: 100; direction: RotationAnimation.Shortest }
+            NumberAnimation { target: map; property: "zoomLevel"; duration: 100 }
+            NumberAnimation { target: map; property: "tilt"; duration: 100 }
+        }
+    ]
+
+    state: navigating ? "navigating" : ""
+
+    Image {
+        id: backgroud
+        anchors.left: parent.left
+        anchors.top: parent.top
+        width: parent.width
+        height: 100
+
+        source: "qrc:simple-bottom-background-white.png"
+        z: 1
+    }
+
+    Image {
+        id: carCurrent
+        anchors.left: parent.left
+        anchors.top: parent.top
+        z: 3
+
+        visible: !mapWindow.navigating
+        source: "qrc:car-focus.png"
+
+        MouseArea {
+            id: area
+
+            anchors.fill: parent
+
+            onClicked: {
+                mapWindow.navigating = true
+                currentDistanceAnimation.start();
+            }
+        }
+
+        scale: area.pressed ? 0.85 : 1.0
+
+        Behavior on scale {
+            NumberAnimation {}
+        }
+    }
+
+    Image {
+        id: turnDirection
+        anchors.left: carCurrent.right
+        anchors.top: parent.top
+        anchors.leftMargin: 20
+
+        z: 3
+    }
+
+    CustomLabel {
+        id: distance
+        anchors.left: carCurrent.right
+        anchors.bottom: backgroud.bottom
+        z: 3
+
+        font.pixelSize: 38
+    }
+
+    CustomLabel {
+        id: turnInstructions
+        anchors.left: turnDirection.right
+        anchors.top: parent.top
+        anchors.leftMargin: 30
+        anchors.topMargin: (backgroud.height-turnInstructions.height)/2
+        z: 3
+
+        font.pixelSize: 38
+    }
+
+    Map {
+        id: map
+        anchors.fill: parent
+
+        plugin: Plugin {
+            name: "mapboxgl"
+
+            PluginParameter {
+                name: "mapboxgl.mapping.items.insert_before"
+                value: "road-label-small"
+            }
+
+            PluginParameter {
+                name: "mapboxgl.mapping.additional_style_urls"
+                value: "mapbox://styles/mapbox/streets-v9"
+            }
+
+            PluginParameter {
+                name: "mapboxgl.access_token"
+                value: "pk.eyJ1IjoidG1wc2FudG9zIiwiYSI6ImNqMWVzZWthbDAwMGIyd3M3ZDR0aXl3cnkifQ.FNxMeWCZgmujeiHjl44G9Q"
+            }
+
+            PluginParameter {
+                name: "mapboxgl.mapping.cache.directory"
+                value: "/home/0/app-data/navigation/"
+            }
+        }
+
+        center: mapWindow.navigating ? ruler.currentPosition : startPoint
+        zoomLevel: 5
+        minimumZoomLevel: 0
+        maximumZoomLevel: 20
+        tilt: 0
+
+        copyrightsVisible: false
+
+        MouseArea {
+            anchors.fill: parent
+
+            onWheel: {
+                mapWindow.navigating = false
+                wheel.accepted = false
+            }
+        }
+        gesture.onPanStarted: {
+            mapWindow.navigating = false
+        }
+
+        gesture.onPinchStarted: {
+            mapWindow.navigating = false
+        }
+
+        RotationAnimation on bearing {
+            id: bearingAnimation
+
+            duration: 250
+            alwaysRunToEnd: false
+            direction: RotationAnimation.Shortest
+            running: mapWindow.navigating
+        }
+
+        Location {
+            id: previousLocation
+            coordinate: QtPositioning.coordinate(0, 0);
+        }
+
+        onCenterChanged: {
+            if (previousLocation.coordinate === center || !mapWindow.navigating)
+                return;
+
+            bearingAnimation.to = previousLocation.coordinate.azimuthTo(center);
+            bearingAnimation.start();
+
+            previousLocation.coordinate = center;
+        }
+
+        function updateRoute() {
+            routeQuery.clearWaypoints();
+            routeQuery.addWaypoint(startMarker.coordinate);
+            routeQuery.addWaypoint(endMarker.coordinate);
+        }
+
+        MapQuickItem {
+            id: startMarker
+
+            sourceItem: Image {
+                id: greenMarker
+                source: "qrc:///marker-green.png"
+            }
+
+            coordinate : startPoint
+            anchorPoint.x: greenMarker.width / 2
+            anchorPoint.y: greenMarker.height / 2
+
+            MouseArea  {
+                drag.target: parent
+                anchors.fill: parent
+
+                onReleased: {
+                    map.updateRoute();
+                }
+            }
+        }
+
+        MapQuickItem {
+            id: endMarker
+
+            sourceItem: Image {
+                id: redMarker
+                source: "qrc:///marker-end.png"
+            }
+
+            coordinate : endPoint
+            anchorPoint.x: redMarker.width / 2
+            anchorPoint.y: redMarker.height / 2
+
+            MouseArea  {
+                drag.target: parent
+                anchors.fill: parent
+
+                onReleased: {
+                    map.updateRoute();
+                }
+            }
+        }
+
+        MapItemView {
+            model: routeModel
+
+            delegate: MapRoute {
+                route: routeData
+                line.color: "#6b43a1"
+                line.width: map.zoomLevel - 5
+                opacity: (index == 0) ? 1.0 : 0.3
+
+                onRouteChanged: {
+                    ruler.path = routeData.path;
+                    ruler.currentDistance = 0;
+
+                    currentDistanceAnimation.stop();
+                    currentDistanceAnimation.to = ruler.distance;
+                }
+            }
+        }
+
+        MapQuickItem {
+            zoomLevel: map.zoomLevel
+
+            sourceItem: Image {
+                id: carMarker
+                source: "qrc:///car-marker2.png"
+                transform: Rotation {
+                                origin.x: carMarker.width / 2;
+                                origin.y: carMarker.height / 2;
+                                angle: rotateAngle
+                            }
+            }
+
+            coordinate: ruler.currentPosition
+            anchorPoint.x: carMarker.width / 2
+            anchorPoint.y: carMarker.height / 2
+
+            Location {
+                id: previousCarLocation
+                coordinate: QtPositioning.coordinate(0, 0);
+            }
+
+            onCoordinateChanged: {
+                if(coordinate === mapWindow.startPoint)
+                    return;
+                rotateAngle = previousCarLocation.coordinate.azimuthTo(coordinate);
+                previousCarLocation.coordinate = coordinate;
+            }
+        }
+
+        CheapRuler {
+            id: ruler
+
+            PropertyAnimation on currentDistance {
+                id: currentDistanceAnimation
+
+                duration: ruler.distance / mapWindow.carSpeed * 60 * 60 * 1000
+                alwaysRunToEnd: false
+            }
+
+            onCurrentDistanceChanged: {
+                var total = 0;
+                var total2 = 0;
+                var i = 0;
+                var j = 0;
+                var alltime = routeModel.get(0).travelTime;
+                var alldistance = routeModel.get(0).distance;
+
+                // XXX: Use car speed in meters to pre-warn the turn instruction
+                while (total - mapWindow.carSpeed < ruler.currentDistance * 1000 && i < routeModel.get(0).segments.length)
+                {
+                    total += routeModel.get(0).segments[i++].maneuver.distanceToNextInstruction;
+                }
+
+                while (total2 < ruler.currentDistance * 1000 && j < routeModel.get(0).segments.length)
+                {
+                    total2 += routeModel.get(0).segments[j++].maneuver.distanceToNextInstruction;
+                }
+
+                var dis = (total2 - ruler.currentDistance * 1000).toFixed(1);
+                if(dis > 1000)
+                {
+                    distance.text = (dis / 1000).toFixed(1) + " km";
+                }
+                else
+                {
+                    distance.text = dis + " m";
+                }
+
+                var travaltimesec=((1 - (ruler.currentDistance * 1000)/alldistance)*alltime).toFixed(0);
+
+                if((travaltimesec/3600)>=1)
+                {
+                    travaltime.text = (travaltimesec/3600).toFixed(0) + "h" + ((travaltimesec%3600)/60).toFixed(0) + "min";
+                }
+                else
+                {
+                    travaltime.text = (travaltimesec/60).toFixed(0) + "min";
+                }
+
+                turnInstructions.text = routeModel.get(0).segments[i - 1].maneuver.instructionText;
+
+                if(routeModel.get(0).segments[i - 1].maneuver.direction === RouteManeuver.DirectionForward)
+                {
+                    turnDirection.source = "qrc:arrow-0.png";
+                }
+                else if(routeModel.get(0).segments[i - 1].maneuver.direction === RouteManeuver.DirectionLightRight)
+                {
+                    turnDirection.source = "qrc:arrow-r-30.png";
+                }
+                else if(routeModel.get(0).segments[i - 1].maneuver.direction === RouteManeuver.DirectionRight)
+                {
+                    turnDirection.source = "qrc:arrow-r-45.png";
+                }
+                else if(routeModel.get(0).segments[i - 1].maneuver.direction === RouteManeuver.DirectionHardRight)
+                {
+                    turnDirection.source = "qrc:arrow-r-75.png";
+                }
+                else if(routeModel.get(0).segments[i - 1].maneuver.direction === RouteManeuver.DirectionUTurnRight)
+                {
+                    turnDirection.source = "qrc:arrow-r-180.png";
+                }
+                else if(routeModel.get(0).segments[i - 1].maneuver.direction === RouteManeuver.DirectionLightLeft)
+                {
+                    turnDirection.source = "qrc:arrow-l-30.png";
+                }
+                else if(routeModel.get(0).segments[i - 1].maneuver.direction === RouteManeuver.DirectionLeft)
+                {
+                    turnDirection.source = "qrc:arrow-l-45.png";
+                }
+                else if(routeModel.get(0).segments[i - 1].maneuver.direction === RouteManeuver.DirectionHardLeft)
+                {
+                    turnDirection.source = "qrc:arrow-l-75.png";
+                }
+                else if(routeModel.get(0).segments[i - 1].maneuver.direction === RouteManeuver.DirectionUTurnLeft)
+                {
+                    turnDirection.source = "qrc:arrow-l-180.png";
+                }
+                else
+                {
+                    turnDirection.source = "qrc:arrow-0.png";
+                }
+
+            }
+        }
+    }
+
+    RouteModel {
+        id: routeModel
+
+        autoUpdate: true
+        query: routeQuery
+
+        plugin: Plugin {
+            name: "mapbox"
+
+            // Development access token, do not use in production.
+            PluginParameter {
+                name: "mapbox.access_token"
+                value: "pk.eyJ1IjoicXRzZGsiLCJhIjoiY2l5azV5MHh5MDAwdTMybzBybjUzZnhxYSJ9.9rfbeqPjX2BusLRDXHCOBA"
+            }
+        }
+
+        Component.onCompleted: {
+            if (map) {
+                map.updateRoute();
+            }
+        }
+    }
+
+    RouteQuery {
+        id: routeQuery
+    }
+
+    Image {
+        id: bottombackgroud
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+        width: parent.width
+        height: 100
+
+        source: "qrc:simple-bottom-background-white.png"
+        z: 1
+    }
+
+    CustomLabel {
+        id: travaltime
+        anchors.left: bottombackgroud.left
+        anchors.verticalCenter: bottombackgroud.verticalCenter
+        visible: mapWindow.navigating
+        z: 3
+        font.pixelSize: 38
+    }
+
+    Row {
+        anchors.horizontalCenter: bottombackgroud.horizontalCenter
+        anchors.verticalCenter: bottombackgroud.verticalCenter
+        width: bottombackgroud.width / 4
+        spacing: 10
+        z:3
+        DateAndTime {}
+    }
+}
diff --git a/app/qml/qmldir b/app/qml/qmldir
new file mode 100644
index 0000000..c59f9cd
--- /dev/null
+++ b/app/qml/qmldir
@@ -0,0 +1,3 @@
+CustomLabel 1.0 CustomLabel.qml
+DateAndTime 1.0 DateAndTime.qml
+MapWindow 1.0 MapWindow.qml
diff --git a/app/resources/car.png b/app/resources/car.png
deleted file mode 100644
index 0a8195e..0000000
--- a/app/resources/car.png
+++ /dev/null
diff --git a/app/resources/icon.png b/app/resources/icon.png
deleted file mode 100644
index 973a500..0000000
--- a/app/resources/icon.png
+++ /dev/null
diff --git a/app/resources/marker.png b/app/resources/marker.png
deleted file mode 100644
index 2116dfd..0000000
--- a/app/resources/marker.png
+++ /dev/null
diff --git a/app/resources/scale.png b/app/resources/scale.png
deleted file mode 100644
index c4f0812..0000000
--- a/app/resources/scale.png
+++ /dev/null
diff --git a/app/resources/scale_end.png b/app/resources/scale_end.png
deleted file mode 100644
index 94510b1..0000000
--- a/app/resources/scale_end.png
+++ /dev/null
diff --git a/include/mapbox/cheap_ruler.hpp b/include/mapbox/cheap_ruler.hpp
new file mode 100644
index 0000000..ae82706
--- /dev/null
+++ b/include/mapbox/cheap_ruler.hpp
@@ -0,0 +1,358 @@
+#pragma once
+
+#include <mapbox/geometry.hpp>
+
+#include <cmath>
+#include <cstdint>
+#include <limits>
+#include <tuple>
+#include <utility>
+
+namespace mapbox {
+namespace cheap_ruler {
+
+using box               = geometry::box<double>;
+using line_string       = geometry::line_string<double>;
+using linear_ring       = geometry::linear_ring<double>;
+using multi_line_string = geometry::multi_line_string<double>;
+using point             = geometry::point<double>;
+using polygon           = geometry::polygon<double>;
+
+class CheapRuler {
+public:
+    enum Unit {
+        Kilometers,
+        Miles,
+        NauticalMiles,
+        Meters,
+        Metres = Meters,
+        Yards,
+        Feet,
+        Inches
+    };
+
+    //
+    // A collection of very fast approximations to common geodesic measurements. Useful
+    // for performance-sensitive code that measures things on a city scale. Point coordinates
+    // are in the [x = longitude, y = latitude] form.
+    //
+    explicit CheapRuler(double latitude, Unit unit = Kilometers) {
+        double m = 0.;
+
+        switch (unit) {
+        case Kilometers:
+            m = 1.;
+            break;
+        case Miles:
+            m = 1000. / 1609.344;
+            break;
+        case NauticalMiles:
+            m = 1000. / 1852.;
+            break;
+        case Meters:
+            m = 1000.;
+            break;
+        case Yards:
+            m = 1000. / 0.9144;
+            break;
+        case Feet:
+            m = 1000. / 0.3048;
+            break;
+        case Inches:
+            m = 1000. / 0.0254;
+            break;
+        }
+
+        auto cos = std::cos(latitude * M_PI / 180.);
+        auto cos2 = 2. * cos * cos - 1.;
+        auto cos3 = 2. * cos * cos2 - cos;
+        auto cos4 = 2. * cos * cos3 - cos2;
+        auto cos5 = 2. * cos * cos4 - cos3;
+
+        // multipliers for converting longitude and latitude
+        // degrees into distance (http://1.usa.gov/1Wb1bv7)
+        kx = m * (111.41513 * cos - 0.09455 * cos3 + 0.00012 * cos5);
+        ky = m * (111.13209 - 0.56605 * cos2 + 0.0012 * cos4);
+    }
+
+    static CheapRuler fromTile(uint32_t y, uint32_t z) {
+        double n = M_PI * (1. - 2. * (y + 0.5) / std::pow(2., z));
+        double latitude = std::atan(0.5 * (std::exp(n) - std::exp(-n))) * 180. / M_PI;
+
+        return CheapRuler(latitude);
+    }
+
+    //
+    // Given two points of the form [x = longitude, y = latitude], returns the distance.
+    //
+    double distance(point a, point b) {
+        auto dx = (a.x - b.x) * kx;
+        auto dy = (a.y - b.y) * ky;
+
+        return std::sqrt(dx * dx + dy * dy);
+    }
+
+    //
+    // Returns the bearing between two points in angles.
+    //
+    double bearing(point a, point b) {
+        auto dx = (b.x - a.x) * kx;
+        auto dy = (b.y - a.y) * ky;
+
+        if (!dx && !dy) {
+            return 0.;
+        }
+
+        auto bearing = std::atan2(-dy, dx) * 180. / M_PI + 90.;
+
+        if (bearing > 180.) {
+            bearing -= 360.;
+        }
+
+        return bearing;
+    }
+
+    //
+    // Returns a new point given distance and bearing from the starting point.
+    //
+    point destination(point origin, double dist, double bearing) {
+        auto a = (90. - bearing) * M_PI / 180.;
+
+        return offset(origin, std::cos(a) * dist, std::sin(a) * dist);
+    }
+
+    //
+    // Returns a new point given easting and northing offsets from the starting point.
+    //
+    point offset(point origin, double dx, double dy) {
+        return point(origin.x + dx / kx, origin.y + dy / ky);
+    }
+
+    //
+    // Given a line (an array of points), returns the total line distance.
+    //
+    double lineDistance(const line_string& points) {
+        double total = 0.;
+
+        for (unsigned i = 0; i < points.size() - 1; ++i) {
+            total += distance(points[i], points[i + 1]);
+        }
+
+        return total;
+    }
+
+    //
+    // Given a polygon (an array of rings, where each ring is an array of points),
+    // returns the area.
+    //
+    double area(polygon poly) {
+        double sum = 0.;
+
+        for (unsigned i = 0; i < poly.size(); ++i) {
+            auto& ring = poly[i];
+
+            for (unsigned j = 0, len = ring.size(), k = len - 1; j < len; k = j++) {
+                sum += (ring[j].x - ring[k].x) * (ring[j].y + ring[k].y) * (i ? -1. : 1.);
+            }
+        }
+
+        return (std::abs(sum) / 2.) * kx * ky;
+    }
+
+    //
+    // Returns the point at a specified distance along the line.
+    //
+    point along(const line_string& line, double dist) {
+        double sum = 0.;
+
+        if (dist <= 0.) {
+            return line[0];
+        }
+
+        for (unsigned i = 0; i < line.size() - 1; ++i) {
+            auto p0 = line[i];
+            auto p1 = line[i + 1];
+            auto d = distance(p0, p1);
+
+            sum += d;
+
+            if (sum > dist) {
+                return interpolate(p0, p1, (dist - (sum - d)) / d);
+            }
+        }
+
+        return line[line.size() - 1];
+    }
+
+    //
+    // Returns a pair of the form <point, index> where point is closest point on the line from
+    // the given point and index is the start index of the segment with the closest point.
+    //
+    std::pair<point, unsigned> pointOnLine(const line_string& line, point p) {
+        auto result = _pointOnLine(line, p);
+
+        return std::make_pair(std::get<0>(result), std::get<1>(result));
+    }
+
+    //
+    // Returns a part of the given line between the start and the stop points (or their closest
+    // points on the line).
+    //
+    line_string lineSlice(point start, point stop, const line_string& line) {
+        constexpr auto getPoint = [](auto tuple) { return std::get<0>(tuple); };
+        constexpr auto getIndex = [](auto tuple) { return std::get<1>(tuple); };
+        constexpr auto getT     = [](auto tuple) { return std::get<2>(tuple); };
+
+        auto p1 = _pointOnLine(line, start);
+        auto p2 = _pointOnLine(line, stop);
+
+        if (getIndex(p1) > getIndex(p2) || (getIndex(p1) == getIndex(p2) && getT(p1) > getT(p2))) {
+            auto tmp = p1;
+            p1 = p2;
+            p2 = tmp;
+        }
+
+        line_string slice = { getPoint(p1) };
+
+        auto l = getIndex(p1) + 1;
+        auto r = getIndex(p2);
+
+        if (line[l] != slice[0] && l <= r) {
+            slice.push_back(line[l]);
+        }
+
+        for (unsigned i = l + 1; i <= r; ++i) {
+            slice.push_back(line[i]);
+        }
+
+        if (line[r] != getPoint(p2)) {
+            slice.push_back(getPoint(p2));
+        }
+
+        return slice;
+    };
+
+    //
+    // Returns a part of the given line between the start and the stop points
+    // indicated by distance along the line.
+    //
+    line_string lineSliceAlong(double start, double stop, const line_string& line) {
+        double sum = 0.;
+        line_string slice;
+
+        for (unsigned i = 0; i < line.size() - 1; ++i) {
+            auto p0 = line[i];
+            auto p1 = line[i + 1];
+            auto d = distance(p0, p1);
+
+            sum += d;
+
+            if (sum > start && slice.size() == 0) {
+                slice.push_back(interpolate(p0, p1, (start - (sum - d)) / d));
+            }
+
+            if (sum >= stop) {
+                slice.push_back(interpolate(p0, p1, (stop - (sum - d)) / d));
+                return slice;
+            }
+
+            if (sum > start) {
+                slice.push_back(p1);
+            }
+        }
+
+        return slice;
+    };
+
+    //
+    // Given a point, returns a bounding box object ([w, s, e, n])
+    // created from the given point buffered by a given distance.
+    //
+    box bufferPoint(point p, double buffer) {
+        auto v = buffer / ky;
+        auto h = buffer / kx;
+
+        return box(
+            point(p.x - h, p.y - v),
+            point(p.x + h, p.y + v)
+        );
+    }
+
+    //
+    // Given a bounding box, returns the box buffered by a given distance.
+    //
+    box bufferBBox(box bbox, double buffer) {
+        auto v = buffer / ky;
+        auto h = buffer / kx;
+
+        return box(
+            point(bbox.min.x - h, bbox.min.y - v),
+            point(bbox.max.x + h, bbox.max.y + v)
+        );
+    }
+
+    //
+    // Returns true if the given point is inside in the given bounding box, otherwise false.
+    //
+    bool insideBBox(point p, box bbox) {
+        return p.x >= bbox.min.x &&
+               p.x <= bbox.max.x &&
+               p.y >= bbox.min.y &&
+               p.y <= bbox.max.y;
+    }
+
+    static point interpolate(point a, point b, double t) {
+        double dx = b.x - a.x;
+        double dy = b.y - a.y;
+
+        return point(a.x + dx * t, a.y + dy * t);
+    }
+
+private:
+    std::tuple<point, unsigned, double> _pointOnLine(const line_string& line, point p) {
+        double minDist = std::numeric_limits<double>::infinity();
+        double minX = 0., minY = 0., minI = 0., minT = 0.;
+
+        for (unsigned i = 0; i < line.size() - 1; ++i) {
+            auto t = 0.;
+            auto x = line[i].x;
+            auto y = line[i].y;
+            auto dx = (line[i + 1].x - x) * kx;
+            auto dy = (line[i + 1].y - y) * ky;
+
+            if (dx != 0. || dy != 0.) {
+                t = ((p.x - x) * kx * dx + (p.y - y) * ky * dy) / (dx * dx + dy * dy);
+
+                if (t > 1) {
+                    x = line[i + 1].x;
+                    y = line[i + 1].y;
+
+                } else if (t > 0) {
+                    x += (dx / kx) * t;
+                    y += (dy / ky) * t;
+                }
+            }
+
+            dx = (p.x - x) * kx;
+            dy = (p.y - y) * ky;
+
+            auto sqDist = dx * dx + dy * dy;
+
+            if (sqDist < minDist) {
+                minDist = sqDist;
+                minX = x;
+                minY = y;
+                minI = i;
+                minT = t;
+            }
+        }
+
+        return std::make_tuple(point(minX, minY), minI, minT);
+    }
+
+    double ky;
+    double kx;
+};
+
+} // namespace cheap_ruler
+} // namespace mapbox
diff --git a/include/mapbox/geometry.hpp b/include/mapbox/geometry.hpp
new file mode 100644
index 0000000..e232453
--- /dev/null
+++ b/include/mapbox/geometry.hpp
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <mapbox/geometry/point.hpp>
+#include <mapbox/geometry/line_string.hpp>
+#include <mapbox/geometry/polygon.hpp>
+#include <mapbox/geometry/multi_point.hpp>
+#include <mapbox/geometry/multi_line_string.hpp>
+#include <mapbox/geometry/multi_polygon.hpp>
+#include <mapbox/geometry/geometry.hpp>
+#include <mapbox/geometry/feature.hpp>
+#include <mapbox/geometry/point_arithmetic.hpp>
+#include <mapbox/geometry/for_each_point.hpp>
+#include <mapbox/geometry/envelope.hpp>
diff --git a/include/mapbox/geometry/box.hpp b/include/mapbox/geometry/box.hpp
new file mode 100644
index 0000000..bf81b70
--- /dev/null
+++ b/include/mapbox/geometry/box.hpp
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <mapbox/geometry/point.hpp>
+
+namespace mapbox {
+namespace geometry {
+
+template <typename T>
+struct box
+{
+    using point_type = point<T>;
+
+    constexpr box(point_type const& min_, point_type const& max_)
+        : min(min_), max(max_)
+    {}
+
+    point_type min;
+    point_type max;
+};
+
+template <typename T>
+constexpr bool operator==(box<T> const& lhs, box<T> const& rhs)
+{
+    return lhs.min == rhs.min && lhs.max == rhs.max;
+}
+
+template <typename T>
+constexpr bool operator!=(box<T> const& lhs, box<T> const& rhs)
+{
+    return lhs.min != rhs.min || lhs.max != rhs.max;
+}
+
+} // namespace geometry
+} // namespace mapbox
diff --git a/include/mapbox/geometry/envelope.hpp b/include/mapbox/geometry/envelope.hpp
new file mode 100644
index 0000000..8603583
--- /dev/null
+++ b/include/mapbox/geometry/envelope.hpp
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <mapbox/geometry/box.hpp>
+#include <mapbox/geometry/for_each_point.hpp>
+
+#include <limits>
+
+namespace mapbox {
+namespace geometry {
+
+template <typename G, typename T = typename G::coordinate_type>
+box<T> envelope(G const& geometry)
+{
+    using limits = std::numeric_limits<T>;
+
+    T min_t = limits::has_infinity ? -limits::infinity() : limits::min();
+    T max_t = limits::has_infinity ?  limits::infinity() : limits::max();
+
+    point<T> min(max_t, max_t);
+    point<T> max(min_t, min_t);
+
+    for_each_point(geometry, [&] (point<T> const& point) {
+        if (min.x > point.x) min.x = point.x;
+        if (min.y > point.y) min.y = point.y;
+        if (max.x < point.x) max.x = point.x;
+        if (max.y < point.y) max.y = point.y;
+    });
+
+    return box<T>(min, max);
+}
+
+} // namespace geometry
+} // namespace mapbox
diff --git a/include/mapbox/geometry/feature.hpp b/include/mapbox/geometry/feature.hpp
new file mode 100644
index 0000000..3bdd484
--- /dev/null
+++ b/include/mapbox/geometry/feature.hpp
@@ -0,0 +1,81 @@
+#pragma once
+
+#include <mapbox/geometry/geometry.hpp>
+
+#include <mapbox/variant.hpp>
+
+#include <cstdint>
+#include <string>
+#include <vector>
+#include <unordered_map>
+#include <experimental/optional>
+
+namespace mapbox {
+namespace geometry {
+
+struct value;
+
+struct null_value_t
+{
+    constexpr null_value_t() {}
+    constexpr null_value_t(std::nullptr_t) {}
+};
+
+constexpr bool operator==(const null_value_t&, const null_value_t&) { return true; }
+constexpr bool operator!=(const null_value_t&, const null_value_t&) { return false; }
+
+constexpr null_value_t null_value = null_value_t();
+
+// Multiple numeric types (uint64_t, int64_t, double) are present in order to support
+// the widest possible range of JSON numbers, which do not have a maximum range.
+// Implementations that produce `value`s should use that order for type preference,
+// using uint64_t for positive integers, int64_t for negative integers, and double
+// for non-integers and integers outside the range of 64 bits.
+using value_base = mapbox::util::variant<null_value_t, bool, uint64_t, int64_t, double, std::string,
+                                         mapbox::util::recursive_wrapper<std::vector<value>>,
+                                         mapbox::util::recursive_wrapper<std::unordered_map<std::string, value>>>;
+
+struct value : value_base
+{
+    using value_base::value_base;
+};
+
+using property_map = std::unordered_map<std::string, value>;
+
+// The same considerations and requirement for numeric types apply as for `value_base`.
+using identifier = mapbox::util::variant<uint64_t, int64_t, double, std::string>;
+
+template <class T>
+struct feature
+{
+    using coordinate_type = T;
+    using geometry_type = mapbox::geometry::geometry<T>; // Fully qualified to avoid GCC -fpermissive error.
+
+    geometry_type geometry;
+    property_map properties {};
+    std::experimental::optional<identifier> id {};
+};
+
+template <class T>
+constexpr bool operator==(feature<T> const& lhs, feature<T> const& rhs)
+{
+    return lhs.id == rhs.id && lhs.geometry == rhs.geometry && lhs.properties == rhs.properties;
+}
+
+template <class T>
+constexpr bool operator!=(feature<T> const& lhs, feature<T> const& rhs)
+{
+    return !(lhs == rhs);
+}
+
+template <class T, template <typename...> class Cont = std::vector>
+struct feature_collection : Cont<feature<T>>
+{
+    using coordinate_type = T;
+    using feature_type = feature<T>;
+    using container_type = Cont<feature_type>;
+    using container_type::container_type;
+};
+
+} // namespace geometry
+} // namespace mapbox
diff --git a/include/mapbox/geometry/for_each_point.hpp b/include/mapbox/geometry/for_each_point.hpp
new file mode 100644
index 0000000..44d6e77
--- /dev/null
+++ b/include/mapbox/geometry/for_each_point.hpp
@@ -0,0 +1,45 @@
+#pragma once
+
+#include <mapbox/geometry/geometry.hpp>
+
+namespace mapbox {
+namespace geometry {
+
+template <typename Point, typename F>
+auto for_each_point(Point&& point, F&& f)
+    -> decltype(point.x, point.y, void())
+{
+    f(std::forward<Point>(point));
+}
+
+template <typename Container, typename F>
+auto for_each_point(Container&& container, F&& f)
+    -> decltype(container.begin(), container.end(), void());
+
+template <typename...Types, typename F>
+void for_each_point(mapbox::util::variant<Types...> const& geom, F&& f)
+{
+    mapbox::util::variant<Types...>::visit(geom, [&] (auto const& g) {
+        for_each_point(g, f);
+    });
+}
+
+template <typename...Types, typename F>
+void for_each_point(mapbox::util::variant<Types...> & geom, F&& f)
+{
+    mapbox::util::variant<Types...>::visit(geom, [&] (auto & g) {
+        for_each_point(g, f);
+    });
+}
+
+template <typename Container, typename F>
+auto for_each_point(Container&& container, F&& f)
+    -> decltype(container.begin(), container.end(), void())
+{
+    for (auto& e: container) {
+        for_each_point(e, f);
+    }
+}
+
+} // namespace geometry
+} // namespace mapbox
diff --git a/include/mapbox/geometry/geometry.hpp b/include/mapbox/geometry/geometry.hpp
new file mode 100644
index 0000000..a3970bf
--- /dev/null
+++ b/include/mapbox/geometry/geometry.hpp
@@ -0,0 +1,53 @@
+#pragma once
+
+#include <mapbox/geometry/point.hpp>
+#include <mapbox/geometry/line_string.hpp>
+#include <mapbox/geometry/polygon.hpp>
+#include <mapbox/geometry/multi_point.hpp>
+#include <mapbox/geometry/multi_line_string.hpp>
+#include <mapbox/geometry/multi_polygon.hpp>
+
+#include <mapbox/variant.hpp>
+
+// stl
+#include <vector>
+
+namespace mapbox {
+namespace geometry {
+
+template <typename T, template <typename...> class Cont = std::vector>
+struct geometry_collection;
+
+template <typename T>
+using geometry_base = mapbox::util::variant<point<T>,
+                                            line_string<T>,
+                                            polygon<T>,
+                                            multi_point<T>,
+                                            multi_line_string<T>,
+                                            multi_polygon<T>,
+                                            geometry_collection<T>>;
+
+template <typename T>
+struct geometry : geometry_base<T>
+{
+    using coordinate_type = T;
+    using geometry_base<T>::geometry_base;
+
+    /*
+     * The default constructor would create a point geometry with default-constructed coordinates;
+     * i.e. (0, 0). Since this is not particularly useful, and could hide bugs, it is disabled.
+     */
+    geometry() = delete;
+};
+
+template <typename T, template <typename...> class Cont>
+struct geometry_collection : Cont<geometry<T>>
+{
+    using coordinate_type = T;
+    using geometry_type = geometry<T>;
+    using container_type = Cont<geometry_type>;
+    using container_type::container_type;
+};
+
+} // namespace geometry
+} // namespace mapbox
diff --git a/include/mapbox/geometry/line_string.hpp b/include/mapbox/geometry/line_string.hpp
new file mode 100644
index 0000000..6d811ce
--- /dev/null
+++ b/include/mapbox/geometry/line_string.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+// mapbox
+#include <mapbox/geometry/point.hpp>
+// stl
+#include <vector>
+
+namespace mapbox {
+namespace geometry {
+
+template <typename T, template <typename...> class Cont = std::vector>
+struct line_string : Cont<point<T> >
+{
+    using coordinate_type = T;
+    using point_type = point<T>;
+    using container_type = Cont<point_type>;
+    using container_type::container_type;
+};
+
+} // namespace geometry
+} // namespace mapbox
diff --git a/include/mapbox/geometry/multi_line_string.hpp b/include/mapbox/geometry/multi_line_string.hpp
new file mode 100644
index 0000000..07a7a1d
--- /dev/null
+++ b/include/mapbox/geometry/multi_line_string.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+// mapbox
+#include <mapbox/geometry/line_string.hpp>
+// stl
+#include <vector>
+
+namespace mapbox {
+namespace geometry {
+
+template <typename T, template <typename...> class Cont = std::vector>
+struct multi_line_string : Cont<line_string<T>>
+{
+    using coordinate_type = T;
+    using line_string_type = line_string<T>;
+    using container_type = Cont<line_string_type>;
+    using container_type::container_type;
+};
+
+} // namespace geometry
+} // namespace mapbox
diff --git a/include/mapbox/geometry/multi_point.hpp b/include/mapbox/geometry/multi_point.hpp
new file mode 100644
index 0000000..a3c73cf
--- /dev/null
+++ b/include/mapbox/geometry/multi_point.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+// mapbox
+#include <mapbox/geometry/point.hpp>
+// stl
+#include <vector>
+
+namespace mapbox {
+namespace geometry {
+
+template <typename T, template <typename...> class Cont = std::vector>
+struct multi_point : Cont<point<T>>
+{
+    using coordinate_type = T;
+    using point_type = point<T>;
+    using container_type = Cont<point_type>;
+    using container_type::container_type;
+};
+
+} // namespace geometry
+} // namespace mapbox
diff --git a/include/mapbox/geometry/multi_polygon.hpp b/include/mapbox/geometry/multi_polygon.hpp
new file mode 100644
index 0000000..ad230a0
--- /dev/null
+++ b/include/mapbox/geometry/multi_polygon.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+// mapbox
+#include <mapbox/geometry/polygon.hpp>
+// stl
+#include <vector>
+
+namespace mapbox {
+namespace geometry {
+
+template <typename T, template <typename...> class Cont = std::vector>
+struct multi_polygon : Cont<polygon<T>>
+{
+    using coordinate_type = T;
+    using polygon_type = polygon<T>;
+    using container_type = Cont<polygon_type>;
+    using container_type::container_type;
+};
+
+} // namespace geometry
+} // namespace mapbox
diff --git a/include/mapbox/geometry/point.hpp b/include/mapbox/geometry/point.hpp
new file mode 100644
index 0000000..0cba499
--- /dev/null
+++ b/include/mapbox/geometry/point.hpp
@@ -0,0 +1,35 @@
+#pragma once
+
+namespace mapbox {
+namespace geometry {
+
+template <typename T>
+struct point
+{
+    using coordinate_type = T;
+
+    constexpr point()
+        : x(), y()
+    {}
+    constexpr point(T x_, T y_)
+        : x(x_), y(y_)
+    {}
+
+    T x;
+    T y;
+};
+
+template <typename T>
+constexpr bool operator==(point<T> const& lhs, point<T> const& rhs)
+{
+    return lhs.x == rhs.x && lhs.y == rhs.y;
+}
+
+template <typename T>
+constexpr bool operator!=(point<T> const& lhs, point<T> const& rhs)
+{
+    return !(lhs == rhs);
+}
+
+} // namespace geometry
+} // namespace mapbox
diff --git a/include/mapbox/geometry/point_arithmetic.hpp b/include/mapbox/geometry/point_arithmetic.hpp
new file mode 100644
index 0000000..3940e5b
--- /dev/null
+++ b/include/mapbox/geometry/point_arithmetic.hpp
@@ -0,0 +1,119 @@
+#pragma once
+
+namespace mapbox {
+namespace geometry {
+
+template <typename T>
+constexpr point<T> operator+(point<T> const& lhs, point<T> const& rhs)
+{
+    return point<T>(lhs.x + rhs.x, lhs.y + rhs.y);
+}
+
+template <typename T>
+constexpr point<T> operator+(point<T> const& lhs, T const& rhs)
+{
+    return point<T>(lhs.x + rhs, lhs.y + rhs);
+}
+
+template <typename T>
+constexpr point<T> operator-(point<T> const& lhs, point<T> const& rhs)
+{
+    return point<T>(lhs.x - rhs.x, lhs.y - rhs.y);
+}
+
+template <typename T>
+constexpr point<T> operator-(point<T> const& lhs, T const& rhs)
+{
+    return point<T>(lhs.x - rhs, lhs.y - rhs);
+}
+
+template <typename T>
+constexpr point<T> operator*(point<T> const& lhs, point<T> const& rhs)
+{
+    return point<T>(lhs.x * rhs.x, lhs.y * rhs.y);
+}
+
+template <typename T>
+constexpr point<T> operator*(point<T> const& lhs, T const& rhs)
+{
+    return point<T>(lhs.x * rhs, lhs.y * rhs);
+}
+
+template <typename T>
+constexpr point<T> operator/(point<T> const& lhs, point<T> const& rhs)
+{
+    return point<T>(lhs.x / rhs.x, lhs.y / rhs.y);
+}
+
+template <typename T>
+constexpr point<T> operator/(point<T> const& lhs, T const& rhs)
+{
+    return point<T>(lhs.x / rhs, lhs.y / rhs);
+}
+
+template <typename T>
+constexpr point<T>& operator+=(point<T>& lhs, point<T> const& rhs)
+{
+    lhs.x += rhs.x;
+    lhs.y += rhs.y;
+    return lhs;
+}
+
+template <typename T>
+constexpr point<T>& operator+=(point<T>& lhs, T const& rhs)
+{
+    lhs.x += rhs;
+    lhs.y += rhs;
+    return lhs;
+}
+
+template <typename T>
+constexpr point<T>& operator-=(point<T>& lhs, point<T> const& rhs)
+{
+    lhs.x -= rhs.x;
+    lhs.y -= rhs.y;
+    return lhs;
+}
+
+template <typename T>
+constexpr point<T>& operator-=(point<T>& lhs, T const& rhs)
+{
+    lhs.x -= rhs;
+    lhs.y -= rhs;
+    return lhs;
+}
+
+template <typename T>
+constexpr point<T>& operator*=(point<T>& lhs, point<T> const& rhs)
+{
+    lhs.x *= rhs.x;
+    lhs.y *= rhs.y;
+    return lhs;
+}
+
+template <typename T>
+constexpr point<T>& operator*=(point<T>& lhs, T const& rhs)
+{
+    lhs.x *= rhs;
+    lhs.y *= rhs;
+    return lhs;
+}
+
+template <typename T>
+constexpr point<T>& operator/=(point<T>& lhs, point<T> const& rhs)
+{
+    lhs.x /= rhs.x;
+    lhs.y /= rhs.y;
+    return lhs;
+}
+
+template <typename T>
+constexpr point<T>& operator/=(point<T>& lhs, T const& rhs)
+{
+    lhs.x /= rhs;
+    lhs.y /= rhs;
+    return lhs;
+}
+
+} // namespace geometry
+} // namespace mapbox
diff --git a/include/mapbox/geometry/polygon.hpp b/include/mapbox/geometry/polygon.hpp
new file mode 100644
index 0000000..99a66aa
--- /dev/null
+++ b/include/mapbox/geometry/polygon.hpp
@@ -0,0 +1,31 @@
+#pragma once
+
+// mapbox
+#include <mapbox/geometry/point.hpp>
+
+// stl
+#include <vector>
+
+namespace mapbox {
+namespace geometry {
+
+template <typename T, template <typename...> class Cont = std::vector>
+struct linear_ring : Cont<point<T>>
+{
+    using coordinate_type = T;
+    using point_type = point<T>;
+    using container_type = Cont<point_type>;
+    using container_type::container_type;
+};
+
+template <typename T, template <typename...> class Cont = std::vector>
+struct polygon : Cont<linear_ring<T>>
+{
+    using coordinate_type = T;
+    using linear_ring_type = linear_ring<T>;
+    using container_type = Cont<linear_ring_type>;
+    using container_type::container_type;
+};
+
+} // namespace geometry
+} // namespace mapbox
diff --git a/include/mapbox/optional.hpp b/include/mapbox/optional.hpp
new file mode 100644
index 0000000..d84705c
--- /dev/null
+++ b/include/mapbox/optional.hpp
@@ -0,0 +1,74 @@
+#ifndef MAPBOX_UTIL_OPTIONAL_HPP
+#define MAPBOX_UTIL_OPTIONAL_HPP
+
+#pragma message("This implementation of optional is deprecated. See https://github.com/mapbox/variant/issues/64.")
+
+#include <type_traits>
+#include <utility>
+
+#include <mapbox/variant.hpp>
+
+namespace mapbox {
+namespace util {
+
+template <typename T>
+class optional
+{
+    static_assert(!std::is_reference<T>::value, "optional doesn't support references");
+
+    struct none_type
+    {
+    };
+
+    variant<none_type, T> variant_;
+
+public:
+    optional() = default;
+
+    optional(optional const& rhs)
+    {
+        if (this != &rhs)
+        { // protect against invalid self-assignment
+            variant_ = rhs.variant_;
+        }
+    }
+
+    optional(T const& v) { variant_ = v; }
+
+    explicit operator bool() const noexcept { return variant_.template is<T>(); }
+
+    T const& get() const { return variant_.template get<T>(); }
+    T& get() { return variant_.template get<T>(); }
+
+    T const& operator*() const { return this->get(); }
+    T operator*() { return this->get(); }
+
+    optional& operator=(T const& v)
+    {
+        variant_ = v;
+        return *this;
+    }
+
+    optional& operator=(optional const& rhs)
+    {
+        if (this != &rhs)
+        {
+            variant_ = rhs.variant_;
+        }
+        return *this;
+    }
+
+    template <typename... Args>
+    void emplace(Args&&... args)
+    {
+        variant_ = T{std::forward<Args>(args)...};
+    }
+
+    void reset() { variant_ = none_type{}; }
+
+}; // class optional
+
+} // namespace util
+} // namespace mapbox
+
+#endif // MAPBOX_UTIL_OPTIONAL_HPP
diff --git a/include/mapbox/recursive_wrapper.hpp b/include/mapbox/recursive_wrapper.hpp
new file mode 100644
index 0000000..4ffcbd7
--- /dev/null
+++ b/include/mapbox/recursive_wrapper.hpp
@@ -0,0 +1,122 @@
+#ifndef MAPBOX_UTIL_RECURSIVE_WRAPPER_HPP
+#define MAPBOX_UTIL_RECURSIVE_WRAPPER_HPP
+
+// Based on variant/recursive_wrapper.hpp from boost.
+//
+// Original license:
+//
+// Copyright (c) 2002-2003
+// Eric Friedman, Itay Maman
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <cassert>
+#include <utility>
+
+namespace mapbox {
+namespace util {
+
+template <typename T>
+class recursive_wrapper
+{
+
+    T* p_;
+
+    void assign(T const& rhs)
+    {
+        this->get() = rhs;
+    }
+
+public:
+    using type = T;
+
+    /**
+     * Default constructor default initializes the internally stored value.
+     * For POD types this means nothing is done and the storage is
+     * uninitialized.
+     *
+     * @throws std::bad_alloc if there is insufficient memory for an object
+     *         of type T.
+     * @throws any exception thrown by the default constructur of T.
+     */
+    recursive_wrapper()
+        : p_(new T){}
+
+    ~recursive_wrapper() noexcept { delete p_; }
+
+    recursive_wrapper(recursive_wrapper const& operand)
+        : p_(new T(operand.get())) {}
+
+    recursive_wrapper(T const& operand)
+        : p_(new T(operand)) {}
+
+    recursive_wrapper(recursive_wrapper&& operand)
+        : p_(new T(std::move(operand.get()))) {}
+
+    recursive_wrapper(T&& operand)
+        : p_(new T(std::move(operand))) {}
+
+    inline recursive_wrapper& operator=(recursive_wrapper const& rhs)
+    {
+        assign(rhs.get());
+        return *this;
+    }
+
+    inline recursive_wrapper& operator=(T const& rhs)
+    {
+        assign(rhs);
+        return *this;
+    }
+
+    inline void swap(recursive_wrapper& operand) noexcept
+    {
+        T* temp = operand.p_;
+        operand.p_ = p_;
+        p_ = temp;
+    }
+
+    recursive_wrapper& operator=(recursive_wrapper&& rhs) noexcept
+    {
+        swap(rhs);
+        return *this;
+    }
+
+    recursive_wrapper& operator=(T&& rhs)
+    {
+        get() = std::move(rhs);
+        return *this;
+    }
+
+    T& get()
+    {
+        assert(p_);
+        return *get_pointer();
+    }
+
+    T const& get() const
+    {
+        assert(p_);
+        return *get_pointer();
+    }
+
+    T* get_pointer() { return p_; }
+
+    const T* get_pointer() const { return p_; }
+
+    operator T const&() const { return this->get(); }
+
+    operator T&() { return this->get(); }
+
+}; // class recursive_wrapper
+
+template <typename T>
+inline void swap(recursive_wrapper<T>& lhs, recursive_wrapper<T>& rhs) noexcept
+{
+    lhs.swap(rhs);
+}
+} // namespace util
+} // namespace mapbox
+
+#endif // MAPBOX_UTIL_RECURSIVE_WRAPPER_HPP
diff --git a/include/mapbox/variant.hpp b/include/mapbox/variant.hpp
new file mode 100644
index 0000000..fb0f77e
--- /dev/null
+++ b/include/mapbox/variant.hpp
@@ -0,0 +1,1013 @@
+#ifndef MAPBOX_UTIL_VARIANT_HPP
+#define MAPBOX_UTIL_VARIANT_HPP
+
+#include <cassert>
+#include <cstddef>   // size_t
+#include <new>       // operator new
+#include <stdexcept> // runtime_error
+#include <string>
+#include <tuple>
+#include <type_traits>
+#include <typeinfo>
+#include <utility>
+#include <functional>
+
+#include <mapbox/recursive_wrapper.hpp>
+#include <mapbox/variant_visitor.hpp>
+
+// clang-format off
+// [[deprecated]] is only available in C++14, use this for the time being
+#if __cplusplus <= 201103L
+# ifdef __GNUC__
+#  define MAPBOX_VARIANT_DEPRECATED __attribute__((deprecated))
+# elif defined(_MSC_VER)
+#  define MAPBOX_VARIANT_DEPRECATED __declspec(deprecated)
+# else
+#  define MAPBOX_VARIANT_DEPRECATED
+# endif
+#else
+#  define MAPBOX_VARIANT_DEPRECATED [[deprecated]]
+#endif
+
+
+#ifdef _MSC_VER
+// https://msdn.microsoft.com/en-us/library/bw1hbe6y.aspx
+# ifdef NDEBUG
+#  define VARIANT_INLINE __forceinline
+# else
+#  define VARIANT_INLINE //__declspec(noinline)
+# endif
+#else
+# ifdef NDEBUG
+#  define VARIANT_INLINE //inline __attribute__((always_inline))
+# else
+#  define VARIANT_INLINE __attribute__((noinline))
+# endif
+#endif
+// clang-format on
+
+// Exceptions
+#if defined( __EXCEPTIONS) || defined( _MSC_VER)
+#define HAS_EXCEPTIONS
+#endif
+
+#define VARIANT_MAJOR_VERSION 1
+#define VARIANT_MINOR_VERSION 1
+#define VARIANT_PATCH_VERSION 0
+
+#define VARIANT_VERSION (VARIANT_MAJOR_VERSION * 100000) + (VARIANT_MINOR_VERSION * 100) + (VARIANT_PATCH_VERSION)
+
+namespace mapbox {
+namespace util {
+
+// XXX This should derive from std::logic_error instead of std::runtime_error.
+//     See https://github.com/mapbox/variant/issues/48 for details.
+class bad_variant_access : public std::runtime_error
+{
+
+public:
+    explicit bad_variant_access(const std::string& what_arg)
+        : runtime_error(what_arg) {}
+
+    explicit bad_variant_access(const char* what_arg)
+        : runtime_error(what_arg) {}
+
+}; // class bad_variant_access
+
+template <typename R = void>
+struct MAPBOX_VARIANT_DEPRECATED static_visitor
+{
+    using result_type = R;
+
+protected:
+    static_visitor() {}
+    ~static_visitor() {}
+};
+
+namespace detail {
+
+static constexpr std::size_t invalid_value = std::size_t(-1);
+
+template <typename T, typename... Types>
+struct direct_type;
+
+template <typename T, typename First, typename... Types>
+struct direct_type<T, First, Types...>
+{
+    static constexpr std::size_t index = std::is_same<T, First>::value
+        ? sizeof...(Types)
+        : direct_type<T, Types...>::index;
+};
+
+template <typename T>
+struct direct_type<T>
+{
+    static constexpr std::size_t index = invalid_value;
+};
+
+#if __cpp_lib_logical_traits >= 201510L
+
+using std::disjunction;
+
+#else
+
+template <typename...>
+struct disjunction : std::false_type {};
+
+template <typename B1>
+struct disjunction<B1> : B1 {};
+
+template <typename B1, typename B2>
+struct disjunction<B1, B2> : std::conditional<B1::value, B1, B2>::type {};
+
+template <typename B1, typename... Bs>
+struct disjunction<B1, Bs...> : std::conditional<B1::value, B1, disjunction<Bs...>>::type {};
+
+#endif
+
+template <typename T, typename... Types>
+struct convertible_type;
+
+template <typename T, typename First, typename... Types>
+struct convertible_type<T, First, Types...>
+{
+    static constexpr std::size_t index = std::is_convertible<T, First>::value
+        ? disjunction<std::is_convertible<T, Types>...>::value ? invalid_value : sizeof...(Types)
+        : convertible_type<T, Types...>::index;
+};
+
+template <typename T>
+struct convertible_type<T>
+{
+    static constexpr std::size_t index = invalid_value;
+};
+
+template <typename T, typename... Types>
+struct value_traits
+{
+    using value_type = typename std::remove_const<typename std::remove_reference<T>::type>::type;
+    static constexpr std::size_t direct_index = direct_type<value_type, Types...>::index;
+    static constexpr bool is_direct = direct_index != invalid_value;
+    static constexpr std::size_t index = is_direct ? direct_index : convertible_type<value_type, Types...>::index;
+    static constexpr bool is_valid = index != invalid_value;
+    static constexpr std::size_t tindex = is_valid ? sizeof...(Types)-index : 0;
+    using target_type = typename std::tuple_element<tindex, std::tuple<void, Types...>>::type;
+};
+
+template <typename T, typename R = void>
+struct enable_if_type
+{
+    using type = R;
+};
+
+template <typename F, typename V, typename Enable = void>
+struct result_of_unary_visit
+{
+    using type = typename std::result_of<F(V&)>::type;
+};
+
+template <typename F, typename V>
+struct result_of_unary_visit<F, V, typename enable_if_type<typename F::result_type>::type>
+{
+    using type = typename F::result_type;
+};
+
+template <typename F, typename V, typename Enable = void>
+struct result_of_binary_visit
+{
+    using type = typename std::result_of<F(V&, V&)>::type;
+};
+
+template <typename F, typename V>
+struct result_of_binary_visit<F, V, typename enable_if_type<typename F::result_type>::type>
+{
+    using type = typename F::result_type;
+};
+
+template <std::size_t arg1, std::size_t... others>
+struct static_max;
+
+template <std::size_t arg>
+struct static_max<arg>
+{
+    static const std::size_t value = arg;
+};
+
+template <std::size_t arg1, std::size_t arg2, std::size_t... others>
+struct static_max<arg1, arg2, others...>
+{
+    static const std::size_t value = arg1 >= arg2 ? static_max<arg1, others...>::value : static_max<arg2, others...>::value;
+};
+
+template <typename... Types>
+struct variant_helper;
+
+template <typename T, typename... Types>
+struct variant_helper<T, Types...>
+{
+    VARIANT_INLINE static void destroy(const std::size_t type_index, void* data)
+    {
+        if (type_index == sizeof...(Types))
+        {
+            reinterpret_cast<T*>(data)->~T();
+        }
+        else
+        {
+            variant_helper<Types...>::destroy(type_index, data);
+        }
+    }
+
+    VARIANT_INLINE static void move(const std::size_t old_type_index, void* old_value, void* new_value)
+    {
+        if (old_type_index == sizeof...(Types))
+        {
+            new (new_value) T(std::move(*reinterpret_cast<T*>(old_value)));
+        }
+        else
+        {
+            variant_helper<Types...>::move(old_type_index, old_value, new_value);
+        }
+    }
+
+    VARIANT_INLINE static void copy(const std::size_t old_type_index, const void* old_value, void* new_value)
+    {
+        if (old_type_index == sizeof...(Types))
+        {
+            new (new_value) T(*reinterpret_cast<const T*>(old_value));
+        }
+        else
+        {
+            variant_helper<Types...>::copy(old_type_index, old_value, new_value);
+        }
+    }
+};
+
+template <>
+struct variant_helper<>
+{
+    VARIANT_INLINE static void destroy(const std::size_t, void*) {}
+    VARIANT_INLINE static void move(const std::size_t, void*, void*) {}
+    VARIANT_INLINE static void copy(const std::size_t, const void*, void*) {}
+};
+
+template <typename T>
+struct unwrapper
+{
+    static T const& apply_const(T const& obj) { return obj; }
+    static T& apply(T& obj) { return obj; }
+};
+
+template <typename T>
+struct unwrapper<recursive_wrapper<T>>
+{
+    static auto apply_const(recursive_wrapper<T> const& obj)
+        -> typename recursive_wrapper<T>::type const&
+    {
+        return obj.get();
+    }
+    static auto apply(recursive_wrapper<T>& obj)
+        -> typename recursive_wrapper<T>::type&
+    {
+        return obj.get();
+    }
+};
+
+template <typename T>
+struct unwrapper<std::reference_wrapper<T>>
+{
+    static auto apply_const(std::reference_wrapper<T> const& obj)
+        -> typename std::reference_wrapper<T>::type const&
+    {
+        return obj.get();
+    }
+    static auto apply(std::reference_wrapper<T>& obj)
+        -> typename std::reference_wrapper<T>::type&
+    {
+        return obj.get();
+    }
+};
+
+template <typename F, typename V, typename R, typename... Types>
+struct dispatcher;
+
+template <typename F, typename V, typename R, typename T, typename... Types>
+struct dispatcher<F, V, R, T, Types...>
+{
+    VARIANT_INLINE static R apply_const(V const& v, F&& f)
+    {
+        if (v.template is<T>())
+        {
+            return f(unwrapper<T>::apply_const(v.template get_unchecked<T>()));
+        }
+        else
+        {
+            return dispatcher<F, V, R, Types...>::apply_const(v, std::forward<F>(f));
+        }
+    }
+
+    VARIANT_INLINE static R apply(V& v, F&& f)
+    {
+        if (v.template is<T>())
+        {
+            return f(unwrapper<T>::apply(v.template get_unchecked<T>()));
+        }
+        else
+        {
+            return dispatcher<F, V, R, Types...>::apply(v, std::forward<F>(f));
+        }
+    }
+};
+
+template <typename F, typename V, typename R, typename T>
+struct dispatcher<F, V, R, T>
+{
+    VARIANT_INLINE static R apply_const(V const& v, F&& f)
+    {
+        return f(unwrapper<T>::apply_const(v.template get_unchecked<T>()));
+    }
+
+    VARIANT_INLINE static R apply(V& v, F&& f)
+    {
+        return f(unwrapper<T>::apply(v.template get_unchecked<T>()));
+    }
+};
+
+template <typename F, typename V, typename R, typename T, typename... Types>
+struct binary_dispatcher_rhs;
+
+template <typename F, typename V, typename R, typename T0, typename T1, typename... Types>
+struct binary_dispatcher_rhs<F, V, R, T0, T1, Types...>
+{
+    VARIANT_INLINE static R apply_const(V const& lhs, V const& rhs, F&& f)
+    {
+        if (rhs.template is<T1>()) // call binary functor
+        {
+            return f(unwrapper<T0>::apply_const(lhs.template get_unchecked<T0>()),
+                     unwrapper<T1>::apply_const(rhs.template get_unchecked<T1>()));
+        }
+        else
+        {
+            return binary_dispatcher_rhs<F, V, R, T0, Types...>::apply_const(lhs, rhs, std::forward<F>(f));
+        }
+    }
+
+    VARIANT_INLINE static R apply(V& lhs, V& rhs, F&& f)
+    {
+        if (rhs.template is<T1>()) // call binary functor
+        {
+            return f(unwrapper<T0>::apply(lhs.template get_unchecked<T0>()),
+                     unwrapper<T1>::apply(rhs.template get_unchecked<T1>()));
+        }
+        else
+        {
+            return binary_dispatcher_rhs<F, V, R, T0, Types...>::apply(lhs, rhs, std::forward<F>(f));
+        }
+    }
+};
+
+template <typename F, typename V, typename R, typename T0, typename T1>
+struct binary_dispatcher_rhs<F, V, R, T0, T1>
+{
+    VARIANT_INLINE static R apply_const(V const& lhs, V const& rhs, F&& f)
+    {
+        return f(unwrapper<T0>::apply_const(lhs.template get_unchecked<T0>()),
+                 unwrapper<T1>::apply_const(rhs.template get_unchecked<T1>()));
+    }
+
+    VARIANT_INLINE static R apply(V& lhs, V& rhs, F&& f)
+    {
+        return f(unwrapper<T0>::apply(lhs.template get_unchecked<T0>()),
+                 unwrapper<T1>::apply(rhs.template get_unchecked<T1>()));
+    }
+};
+
+template <typename F, typename V, typename R, typename T, typename... Types>
+struct binary_dispatcher_lhs;
+
+template <typename F, typename V, typename R, typename T0, typename T1, typename... Types>
+struct binary_dispatcher_lhs<F, V, R, T0, T1, Types...>
+{
+    VARIANT_INLINE static R apply_const(V const& lhs, V const& rhs, F&& f)
+    {
+        if (lhs.template is<T1>()) // call binary functor
+        {
+            return f(unwrapper<T1>::apply_const(lhs.template get_unchecked<T1>()),
+                     unwrapper<T0>::apply_const(rhs.template get_unchecked<T0>()));
+        }
+        else
+        {
+            return binary_dispatcher_lhs<F, V, R, T0, Types...>::apply_const(lhs, rhs, std::forward<F>(f));
+        }
+    }
+
+    VARIANT_INLINE static R apply(V& lhs, V& rhs, F&& f)
+    {
+        if (lhs.template is<T1>()) // call binary functor
+        {
+            return f(unwrapper<T1>::apply(lhs.template get_unchecked<T1>()),
+                     unwrapper<T0>::apply(rhs.template get_unchecked<T0>()));
+        }
+        else
+        {
+            return binary_dispatcher_lhs<F, V, R, T0, Types...>::apply(lhs, rhs, std::forward<F>(f));
+        }
+    }
+};
+
+template <typename F, typename V, typename R, typename T0, typename T1>
+struct binary_dispatcher_lhs<F, V, R, T0, T1>
+{
+    VARIANT_INLINE static R apply_const(V const& lhs, V const& rhs, F&& f)
+    {
+        return f(unwrapper<T1>::apply_const(lhs.template get_unchecked<T1>()),
+                 unwrapper<T0>::apply_const(rhs.template get_unchecked<T0>()));
+    }
+
+    VARIANT_INLINE static R apply(V& lhs, V& rhs, F&& f)
+    {
+        return f(unwrapper<T1>::apply(lhs.template get_unchecked<T1>()),
+                 unwrapper<T0>::apply(rhs.template get_unchecked<T0>()));
+    }
+};
+
+template <typename F, typename V, typename R, typename... Types>
+struct binary_dispatcher;
+
+template <typename F, typename V, typename R, typename T, typename... Types>
+struct binary_dispatcher<F, V, R, T, Types...>
+{
+    VARIANT_INLINE static R apply_const(V const& v0, V const& v1, F&& f)
+    {
+        if (v0.template is<T>())
+        {
+            if (v1.template is<T>())
+            {
+                return f(unwrapper<T>::apply_const(v0.template get_unchecked<T>()),
+                         unwrapper<T>::apply_const(v1.template get_unchecked<T>())); // call binary functor
+            }
+            else
+            {
+                return binary_dispatcher_rhs<F, V, R, T, Types...>::apply_const(v0, v1, std::forward<F>(f));
+            }
+        }
+        else if (v1.template is<T>())
+        {
+            return binary_dispatcher_lhs<F, V, R, T, Types...>::apply_const(v0, v1, std::forward<F>(f));
+        }
+        return binary_dispatcher<F, V, R, Types...>::apply_const(v0, v1, std::forward<F>(f));
+    }
+
+    VARIANT_INLINE static R apply(V& v0, V& v1, F&& f)
+    {
+        if (v0.template is<T>())
+        {
+            if (v1.template is<T>())
+            {
+                return f(unwrapper<T>::apply(v0.template get_unchecked<T>()),
+                         unwrapper<T>::apply(v1.template get_unchecked<T>())); // call binary functor
+            }
+            else
+            {
+                return binary_dispatcher_rhs<F, V, R, T, Types...>::apply(v0, v1, std::forward<F>(f));
+            }
+        }
+        else if (v1.template is<T>())
+        {
+            return binary_dispatcher_lhs<F, V, R, T, Types...>::apply(v0, v1, std::forward<F>(f));
+        }
+        return binary_dispatcher<F, V, R, Types...>::apply(v0, v1, std::forward<F>(f));
+    }
+};
+
+template <typename F, typename V, typename R, typename T>
+struct binary_dispatcher<F, V, R, T>
+{
+    VARIANT_INLINE static R apply_const(V const& v0, V const& v1, F&& f)
+    {
+        return f(unwrapper<T>::apply_const(v0.template get_unchecked<T>()),
+                 unwrapper<T>::apply_const(v1.template get_unchecked<T>())); // call binary functor
+    }
+
+    VARIANT_INLINE static R apply(V& v0, V& v1, F&& f)
+    {
+        return f(unwrapper<T>::apply(v0.template get_unchecked<T>()),
+                 unwrapper<T>::apply(v1.template get_unchecked<T>())); // call binary functor
+    }
+};
+
+// comparator functors
+struct equal_comp
+{
+    template <typename T>
+    bool operator()(T const& lhs, T const& rhs) const
+    {
+        return lhs == rhs;
+    }
+};
+
+struct less_comp
+{
+    template <typename T>
+    bool operator()(T const& lhs, T const& rhs) const
+    {
+        return lhs < rhs;
+    }
+};
+
+template <typename Variant, typename Comp>
+class comparer
+{
+public:
+    explicit comparer(Variant const& lhs) noexcept
+        : lhs_(lhs) {}
+    comparer& operator=(comparer const&) = delete;
+    // visitor
+    template <typename T>
+    bool operator()(T const& rhs_content) const
+    {
+        T const& lhs_content = lhs_.template get_unchecked<T>();
+        return Comp()(lhs_content, rhs_content);
+    }
+
+private:
+    Variant const& lhs_;
+};
+
+// hashing visitor
+struct hasher
+{
+    template <typename T>
+    std::size_t operator()(const T& hashable) const
+    {
+        return std::hash<T>{}(hashable);
+    }
+};
+
+} // namespace detail
+
+struct no_init
+{
+};
+
+template <typename... Types>
+class variant
+{
+    static_assert(sizeof...(Types) > 0, "Template parameter type list of variant can not be empty");
+    static_assert(!detail::disjunction<std::is_reference<Types>...>::value, "Variant can not hold reference types. Maybe use std::reference_wrapper?");
+
+private:
+    static const std::size_t data_size = detail::static_max<sizeof(Types)...>::value;
+    static const std::size_t data_align = detail::static_max<alignof(Types)...>::value;
+public:
+    struct adapted_variant_tag;
+    using types = std::tuple<Types...>;
+private:
+    using first_type = typename std::tuple_element<0, types>::type;
+    using data_type = typename std::aligned_storage<data_size, data_align>::type;
+    using helper_type = detail::variant_helper<Types...>;
+
+    std::size_t type_index;
+    data_type data;
+
+public:
+    VARIANT_INLINE variant() noexcept(std::is_nothrow_default_constructible<first_type>::value)
+        : type_index(sizeof...(Types)-1)
+    {
+        static_assert(std::is_default_constructible<first_type>::value, "First type in variant must be default constructible to allow default construction of variant");
+        new (&data) first_type();
+    }
+
+    VARIANT_INLINE variant(no_init) noexcept
+        : type_index(detail::invalid_value) {}
+
+    // http://isocpp.org/blog/2012/11/universal-references-in-c11-scott-meyers
+    template <typename T, typename Traits = detail::value_traits<T, Types...>,
+              typename Enable = typename std::enable_if<Traits::is_valid && !std::is_same<variant<Types...>, typename Traits::value_type>::value>::type >
+    VARIANT_INLINE variant(T&& val) noexcept(std::is_nothrow_constructible<typename Traits::target_type, T&&>::value)
+        : type_index(Traits::index)
+    {
+        new (&data) typename Traits::target_type(std::forward<T>(val));
+    }
+
+    VARIANT_INLINE variant(variant<Types...> const& old)
+        : type_index(old.type_index)
+    {
+        helper_type::copy(old.type_index, &old.data, &data);
+    }
+
+    VARIANT_INLINE variant(variant<Types...>&& old) noexcept(std::is_nothrow_move_constructible<types>::value)
+        : type_index(old.type_index)
+    {
+        helper_type::move(old.type_index, &old.data, &data);
+    }
+
+private:
+    VARIANT_INLINE void copy_assign(variant<Types...> const& rhs)
+    {
+        helper_type::destroy(type_index, &data);
+        type_index = detail::invalid_value;
+        helper_type::copy(rhs.type_index, &rhs.data, &data);
+        type_index = rhs.type_index;
+    }
+
+    VARIANT_INLINE void move_assign(variant<Types...>&& rhs)
+    {
+        helper_type::destroy(type_index, &data);
+        type_index = detail::invalid_value;
+        helper_type::move(rhs.type_index, &rhs.data, &data);
+        type_index = rhs.type_index;
+    }
+
+public:
+    VARIANT_INLINE variant<Types...>& operator=(variant<Types...>&& other)
+    {
+        move_assign(std::move(other));
+        return *this;
+    }
+
+    VARIANT_INLINE variant<Types...>& operator=(variant<Types...> const& other)
+    {
+        copy_assign(other);
+        return *this;
+    }
+
+    // conversions
+    // move-assign
+    template <typename T>
+    VARIANT_INLINE variant<Types...>& operator=(T&& rhs) noexcept
+    {
+        variant<Types...> temp(std::forward<T>(rhs));
+        move_assign(std::move(temp));
+        return *this;
+    }
+
+    // copy-assign
+    template <typename T>
+    VARIANT_INLINE variant<Types...>& operator=(T const& rhs)
+    {
+        variant<Types...> temp(rhs);
+        copy_assign(temp);
+        return *this;
+    }
+
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<T, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE bool is() const
+    {
+        return type_index == detail::direct_type<T, Types...>::index;
+    }
+
+    template <typename T,typename std::enable_if<
+                         (detail::direct_type<recursive_wrapper<T>, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE bool is() const
+    {
+        return type_index == detail::direct_type<recursive_wrapper<T>, Types...>::index;
+    }
+
+    VARIANT_INLINE bool valid() const
+    {
+        return type_index != detail::invalid_value;
+    }
+
+    template <typename T, typename... Args>
+    VARIANT_INLINE void set(Args&&... args)
+    {
+        helper_type::destroy(type_index, &data);
+        type_index = detail::invalid_value;
+        new (&data) T(std::forward<Args>(args)...);
+        type_index = detail::direct_type<T, Types...>::index;
+    }
+
+    // get_unchecked<T>()
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<T, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE T& get_unchecked()
+    {
+        return *reinterpret_cast<T*>(&data);
+    }
+
+#ifdef HAS_EXCEPTIONS
+    // get<T>()
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<T, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE T& get()
+    {
+        if (type_index == detail::direct_type<T, Types...>::index)
+        {
+            return *reinterpret_cast<T*>(&data);
+        }
+        else
+        {
+            throw bad_variant_access("in get<T>()");
+        }
+    }
+#endif
+
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<T, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE T const& get_unchecked() const
+    {
+        return *reinterpret_cast<T const*>(&data);
+    }
+
+#ifdef HAS_EXCEPTIONS
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<T, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE T const& get() const
+    {
+        if (type_index == detail::direct_type<T, Types...>::index)
+        {
+            return *reinterpret_cast<T const*>(&data);
+        }
+        else
+        {
+            throw bad_variant_access("in get<T>()");
+        }
+    }
+#endif
+
+    // get_unchecked<T>() - T stored as recursive_wrapper<T>
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<recursive_wrapper<T>, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE T& get_unchecked()
+    {
+        return (*reinterpret_cast<recursive_wrapper<T>*>(&data)).get();
+    }
+
+#ifdef HAS_EXCEPTIONS
+    // get<T>() - T stored as recursive_wrapper<T>
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<recursive_wrapper<T>, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE T& get()
+    {
+        if (type_index == detail::direct_type<recursive_wrapper<T>, Types...>::index)
+        {
+            return (*reinterpret_cast<recursive_wrapper<T>*>(&data)).get();
+        }
+        else
+        {
+            throw bad_variant_access("in get<T>()");
+        }
+    }
+#endif
+
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<recursive_wrapper<T>, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE T const& get_unchecked() const
+    {
+        return (*reinterpret_cast<recursive_wrapper<T> const*>(&data)).get();
+    }
+
+#ifdef HAS_EXCEPTIONS
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<recursive_wrapper<T>, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE T const& get() const
+    {
+        if (type_index == detail::direct_type<recursive_wrapper<T>, Types...>::index)
+        {
+            return (*reinterpret_cast<recursive_wrapper<T> const*>(&data)).get();
+        }
+        else
+        {
+            throw bad_variant_access("in get<T>()");
+        }
+    }
+#endif
+
+    // get_unchecked<T>() - T stored as std::reference_wrapper<T>
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<std::reference_wrapper<T>, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE T& get_unchecked()
+    {
+        return (*reinterpret_cast<std::reference_wrapper<T>*>(&data)).get();
+    }
+
+#ifdef HAS_EXCEPTIONS
+    // get<T>() - T stored as std::reference_wrapper<T>
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<std::reference_wrapper<T>, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE T& get()
+    {
+        if (type_index == detail::direct_type<std::reference_wrapper<T>, Types...>::index)
+        {
+            return (*reinterpret_cast<std::reference_wrapper<T>*>(&data)).get();
+        }
+        else
+        {
+            throw bad_variant_access("in get<T>()");
+        }
+    }
+#endif
+
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<std::reference_wrapper<T const>, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE T const& get_unchecked() const
+    {
+        return (*reinterpret_cast<std::reference_wrapper<T const> const*>(&data)).get();
+    }
+
+#ifdef HAS_EXCEPTIONS
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<std::reference_wrapper<T const>, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE T const& get() const
+    {
+        if (type_index == detail::direct_type<std::reference_wrapper<T const>, Types...>::index)
+        {
+            return (*reinterpret_cast<std::reference_wrapper<T const> const*>(&data)).get();
+        }
+        else
+        {
+            throw bad_variant_access("in get<T>()");
+        }
+    }
+#endif
+
+    // This function is deprecated because it returns an internal index field.
+    // Use which() instead.
+    MAPBOX_VARIANT_DEPRECATED VARIANT_INLINE std::size_t get_type_index() const
+    {
+        return type_index;
+    }
+
+    VARIANT_INLINE int which() const noexcept
+    {
+        return static_cast<int>(sizeof...(Types)-type_index - 1);
+    }
+
+    template <typename T, typename std::enable_if<
+                          (detail::direct_type<T, Types...>::index != detail::invalid_value)>::type* = nullptr>
+    VARIANT_INLINE static constexpr int which() noexcept
+    {
+        return static_cast<int>(sizeof...(Types)-detail::direct_type<T, Types...>::index - 1);
+    }
+
+    // visitor
+    // unary
+    template <typename F, typename V, typename R = typename detail::result_of_unary_visit<F, first_type>::type>
+    auto VARIANT_INLINE static visit(V const& v, F&& f)
+        -> decltype(detail::dispatcher<F, V, R, Types...>::apply_const(v, std::forward<F>(f)))
+    {
+        return detail::dispatcher<F, V, R, Types...>::apply_const(v, std::forward<F>(f));
+    }
+    // non-const
+    template <typename F, typename V, typename R = typename detail::result_of_unary_visit<F, first_type>::type>
+    auto VARIANT_INLINE static visit(V& v, F&& f)
+        -> decltype(detail::dispatcher<F, V, R, Types...>::apply(v, std::forward<F>(f)))
+    {
+        return detail::dispatcher<F, V, R, Types...>::apply(v, std::forward<F>(f));
+    }
+
+    // binary
+    // const
+    template <typename F, typename V, typename R = typename detail::result_of_binary_visit<F, first_type>::type>
+    auto VARIANT_INLINE static binary_visit(V const& v0, V const& v1, F&& f)
+        -> decltype(detail::binary_dispatcher<F, V, R, Types...>::apply_const(v0, v1, std::forward<F>(f)))
+    {
+        return detail::binary_dispatcher<F, V, R, Types...>::apply_const(v0, v1, std::forward<F>(f));
+    }
+    // non-const
+    template <typename F, typename V, typename R = typename detail::result_of_binary_visit<F, first_type>::type>
+    auto VARIANT_INLINE static binary_visit(V& v0, V& v1, F&& f)
+        -> decltype(detail::binary_dispatcher<F, V, R, Types...>::apply(v0, v1, std::forward<F>(f)))
+    {
+        return detail::binary_dispatcher<F, V, R, Types...>::apply(v0, v1, std::forward<F>(f));
+    }
+
+    // match
+    // unary
+    template <typename... Fs>
+    auto VARIANT_INLINE match(Fs&&... fs) const
+        -> decltype(variant::visit(*this, ::mapbox::util::make_visitor(std::forward<Fs>(fs)...)))
+    {
+        return variant::visit(*this, ::mapbox::util::make_visitor(std::forward<Fs>(fs)...));
+    }
+    // non-const
+    template <typename... Fs>
+    auto VARIANT_INLINE match(Fs&&... fs)
+        -> decltype(variant::visit(*this, ::mapbox::util::make_visitor(std::forward<Fs>(fs)...)))
+    {
+        return variant::visit(*this, ::mapbox::util::make_visitor(std::forward<Fs>(fs)...));
+    }
+
+    ~variant() noexcept // no-throw destructor
+    {
+        helper_type::destroy(type_index, &data);
+    }
+
+    // comparison operators
+    // equality
+    VARIANT_INLINE bool operator==(variant const& rhs) const
+    {
+        assert(valid() && rhs.valid());
+        if (this->which() != rhs.which())
+        {
+            return false;
+        }
+        detail::comparer<variant, detail::equal_comp> visitor(*this);
+        return visit(rhs, visitor);
+    }
+
+    VARIANT_INLINE bool operator!=(variant const& rhs) const
+    {
+        return !(*this == rhs);
+    }
+
+    // less than
+    VARIANT_INLINE bool operator<(variant const& rhs) const
+    {
+        assert(valid() && rhs.valid());
+        if (this->which() != rhs.which())
+        {
+            return this->which() < rhs.which();
+        }
+        detail::comparer<variant, detail::less_comp> visitor(*this);
+        return visit(rhs, visitor);
+    }
+    VARIANT_INLINE bool operator>(variant const& rhs) const
+    {
+        return rhs < *this;
+    }
+    VARIANT_INLINE bool operator<=(variant const& rhs) const
+    {
+        return !(*this > rhs);
+    }
+    VARIANT_INLINE bool operator>=(variant const& rhs) const
+    {
+        return !(*this < rhs);
+    }
+};
+
+// unary visitor interface
+// const
+template <typename F, typename V>
+auto VARIANT_INLINE apply_visitor(F&& f, V const& v) -> decltype(V::visit(v, std::forward<F>(f)))
+{
+    return V::visit(v, std::forward<F>(f));
+}
+
+// non-const
+template <typename F, typename V>
+auto VARIANT_INLINE apply_visitor(F&& f, V& v) -> decltype(V::visit(v, std::forward<F>(f)))
+{
+    return V::visit(v, std::forward<F>(f));
+}
+
+// binary visitor interface
+// const
+template <typename F, typename V>
+auto VARIANT_INLINE apply_visitor(F&& f, V const& v0, V const& v1) -> decltype(V::binary_visit(v0, v1, std::forward<F>(f)))
+{
+    return V::binary_visit(v0, v1, std::forward<F>(f));
+}
+
+// non-const
+template <typename F, typename V>
+auto VARIANT_INLINE apply_visitor(F&& f, V& v0, V& v1) -> decltype(V::binary_visit(v0, v1, std::forward<F>(f)))
+{
+    return V::binary_visit(v0, v1, std::forward<F>(f));
+}
+
+// getter interface
+
+#ifdef HAS_EXCEPTIONS
+template <typename ResultType, typename T>
+auto get(T& var)->decltype(var.template get<ResultType>())
+{
+    return var.template get<ResultType>();
+}
+#endif
+
+template <typename ResultType, typename T>
+ResultType& get_unchecked(T& var)
+{
+    return var.template get_unchecked<ResultType>();
+}
+
+#ifdef HAS_EXCEPTIONS
+template <typename ResultType, typename T>
+auto get(T const& var)->decltype(var.template get<ResultType>())
+{
+    return var.template get<ResultType>();
+}
+#endif
+
+template <typename ResultType, typename T>
+ResultType const& get_unchecked(T const& var)
+{
+    return var.template get_unchecked<ResultType>();
+}
+} // namespace util
+} // namespace mapbox
+
+// hashable iff underlying types are hashable
+namespace std {
+template <typename... Types>
+struct hash< ::mapbox::util::variant<Types...>> {
+    std::size_t operator()(const ::mapbox::util::variant<Types...>& v) const noexcept
+    {
+        return ::mapbox::util::apply_visitor(::mapbox::util::detail::hasher{}, v);
+    }
+};
+}
+
+#endif // MAPBOX_UTIL_VARIANT_HPP
diff --git a/include/mapbox/variant_io.hpp b/include/mapbox/variant_io.hpp
new file mode 100644
index 0000000..1456cc5
--- /dev/null
+++ b/include/mapbox/variant_io.hpp
@@ -0,0 +1,45 @@
+#ifndef MAPBOX_UTIL_VARIANT_IO_HPP
+#define MAPBOX_UTIL_VARIANT_IO_HPP
+
+#include <iosfwd>
+
+#include <mapbox/variant.hpp>
+
+namespace mapbox {
+namespace util {
+
+namespace detail {
+// operator<< helper
+template <typename Out>
+class printer
+{
+public:
+    explicit printer(Out& out)
+        : out_(out) {}
+    printer& operator=(printer const&) = delete;
+
+    // visitor
+    template <typename T>
+    void operator()(T const& operand) const
+    {
+        out_ << operand;
+    }
+
+private:
+    Out& out_;
+};
+}
+
+// operator<<
+template <typename CharT, typename Traits, typename... Types>
+VARIANT_INLINE std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& out, variant<Types...> const& rhs)
+{
+    detail::printer<std::basic_ostream<CharT, Traits>> visitor(out);
+    apply_visitor(visitor, rhs);
+    return out;
+}
+} // namespace util
+} // namespace mapbox
+
+#endif // MAPBOX_UTIL_VARIANT_IO_HPP
diff --git a/include/mapbox/variant_visitor.hpp b/include/mapbox/variant_visitor.hpp
new file mode 100644
index 0000000..481eb65
--- /dev/null
+++ b/include/mapbox/variant_visitor.hpp
@@ -0,0 +1,38 @@
+#ifndef MAPBOX_UTIL_VARIANT_VISITOR_HPP
+#define MAPBOX_UTIL_VARIANT_VISITOR_HPP
+
+namespace mapbox {
+namespace util {
+
+template <typename... Fns>
+struct visitor;
+
+template <typename Fn>
+struct visitor<Fn> : Fn
+{
+    using type = Fn;
+    using Fn::operator();
+
+    visitor(Fn fn) : Fn(fn) {}
+};
+
+template <typename Fn, typename... Fns>
+struct visitor<Fn, Fns...> : Fn, visitor<Fns...>
+{
+    using type = visitor;
+    using Fn::operator();
+    using visitor<Fns...>::operator();
+
+    visitor(Fn fn, Fns... fns) : Fn(fn), visitor<Fns...>(fns...) {}
+};
+
+template <typename... Fns>
+visitor<Fns...> make_visitor(Fns... fns)
+{
+    return visitor<Fns...>(fns...);
+}
+
+} // namespace util
+} // namespace mapbox
+
+#endif // MAPBOX_UTIL_VARIANT_VISITOR_HPP
diff --git a/package/config.xml b/package/config.xml
index 5d53f04..f743c15 100644
--- a/package/config.xml
+++ b/package/config.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns="http://www.w3.org/ns/widgets" id="navigation" version="0.1">
-  <name>Navigation</name>
+  <name>navigation</name>
   <icon src="icon.svg"/>
-  <content src="bin/navigation" type="application/vnd.agl.native"/>
-  <description>This is a demo application for navigation</description>
-  <author>Matt Ranostay &lt;matt.ranostay@konsulko.com&gt;</author>
+  <content src="bin/tbtnavi" type="application/vnd.agl.native"/>
+  <description>This is the turn-by-turn navigation application. </description>
+  <author>TOYOTA</author>
   <license>APL 2.0</license>
   <feature name="urn:AGL:widget:required-api">
-    <param name="geoclue" value="ws" />
-    <param name="geofence" value="ws" />
-    <param name="gps" value="ws" />
-    <param name="windowmanager" value="ws" />
-    <param name="homescreen" value="ws" />
+    <param name="windowmanager" value="ws"/>
+    <param name="homescreen" value="ws"/>
   </feature>
   <feature name="urn:AGL:widget:required-permission">
     <param name="urn:AGL:permission::public:no-htdocs" value="required" />
diff --git a/package/icon.svg b/package/icon.svg
index 91661a7..6628784 100644
--- a/package/icon.svg
+++ b/package/icon.svg
@@ -21,7 +21,7 @@
    sodipodi:docname="icon.svg"><metadata
      id="metadata1292"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs1290" /><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -36,7 +36,7 @@
      id="namedview1288"
      showgrid="false"
      inkscape:zoom="0.7375"
-     inkscape:cx="-572.20339"
+     inkscape:cx="-697.62712"
      inkscape:cy="160"
      inkscape:window-x="0"
      inkscape:window-y="0"
@@ -143,8 +143,8 @@
 	.st96{fill:url(#SVGID_88_);}
 	.st97{fill:url(#SVGID_89_);}
 	.st98{fill:url(#SVGID_90_);}
-	.st99{fill:url(#SVGID_91_);}
-	.st100{fill:url(#SVGID_92_);}
+	.st99{display:inline;fill:url(#SVGID_91_);}
+	.st100{display:inline;fill:url(#SVGID_92_);}
 	.st101{fill:url(#SVGID_93_);}
 	.st102{fill:url(#SVGID_94_);}
 	.st103{opacity:0.4;fill:url(#SVGID_95_);}
@@ -171,21 +171,21 @@
 	.st124{fill:url(#SVGID_116_);}
 	.st125{fill:url(#SVGID_117_);}
 	.st126{fill:url(#SVGID_118_);}
-	.st127{display:inline;fill:url(#SVGID_119_);}
-	.st128{display:inline;fill:url(#SVGID_120_);}
+	.st127{fill:url(#SVGID_119_);}
+	.st128{fill:url(#SVGID_120_);}
 	.st129{fill:url(#SVGID_121_);}
 	.st130{fill:url(#SVGID_122_);}
 </style><switch
      id="switch6"><g
        i:extraneous="self"
        id="g8"><g
-         id="Multimedia_Inactive_copy"><circle
+         id="Settings_Active"><circle
            class="st24"
            cx="159.7"
            cy="133.4"
            r="101.9"
-           id="circle884" /><linearGradient
-           id="SVGID_91_"
+           id="circle1230" /><linearGradient
+           id="SVGID_119_"
            gradientUnits="userSpaceOnUse"
            x1="115.9317"
            y1="254.1836"
@@ -193,40 +193,40 @@
            y2="-133.5267"><stop
              offset="0"
              style="stop-color:#8BC53F"
-             id="stop887" /><stop
+             id="stop1233" /><stop
              offset="2.015080e-02"
              style="stop-color:#7CCB56;stop-opacity:0.9678"
-             id="stop889" /><stop
+             id="stop1235" /><stop
              offset="6.089833e-02"
              style="stop-color:#62D67D;stop-opacity:0.9028"
-             id="stop891" /><stop
+             id="stop1237" /><stop
              offset="0.1057"
              style="stop-color:#4BDFA0;stop-opacity:0.8312"
-             id="stop893" /><stop
+             id="stop1239" /><stop
              offset="0.1543"
              style="stop-color:#38E7BE;stop-opacity:0.7537"
-             id="stop895" /><stop
+             id="stop1241" /><stop
              offset="0.2077"
              style="stop-color:#28EED6;stop-opacity:0.6684"
-             id="stop897" /><stop
+             id="stop1243" /><stop
              offset="0.2681"
              style="stop-color:#1CF3E8;stop-opacity:0.572"
-             id="stop899" /><stop
+             id="stop1245" /><stop
              offset="0.3394"
              style="stop-color:#13F6F5;stop-opacity:0.4581"
-             id="stop901" /><stop
+             id="stop1247" /><stop
              offset="0.4323"
              style="stop-color:#0EF8FD;stop-opacity:0.3098"
-             id="stop903" /><stop
+             id="stop1249" /><stop
              offset="0.6264"
              style="stop-color:#0DF9FF;stop-opacity:0"
-             id="stop905" /></linearGradient><circle
-           class="st99"
+             id="stop1251" /></linearGradient><circle
+           class="st127"
            cx="159.7"
            cy="133.4"
            r="101.9"
-           id="circle907" /><linearGradient
-           id="SVGID_92_"
+           id="circle1253" /><linearGradient
+           id="SVGID_120_"
            gradientUnits="userSpaceOnUse"
            x1="4.0481"
            y1="287.9492"
@@ -235,45 +235,49 @@
            gradientTransform="matrix(1 5.464556e-03 -5.464556e-03 1 -2.0192 -3.0212)"><stop
              offset="0"
              style="stop-color:#59FF7F"
-             id="stop910" /><stop
+             id="stop1256" /><stop
              offset="1"
              style="stop-color:#6BFBFF"
-             id="stop912" /></linearGradient><path
-           class="st100"
+             id="stop1258" /></linearGradient><path
+           class="st128"
            d="M160,238.8c-0.2,0-0.4,0-0.6,0c-58-0.3-104.9-47.7-104.6-105.7C55.2,75.3,102.3,28.5,160,28.5     c0.2,0,0.4,0,0.6,0c58,0.3,104.9,47.7,104.6,105.7l0,0C264.8,192,217.7,238.8,160,238.8z M160,32.2     c-55.7,0-101.2,45.2-101.5,100.9c-0.3,55.9,45,101.7,100.9,102c0.2,0,0.4,0,0.6,0c55.7,0,101.2-45.2,101.5-100.9     c0.3-55.9-45-101.7-100.9-102C160.4,32.2,160.2,32.2,160,32.2z"
-           id="path914" /><g
-           id="g916"><text
-             transform="matrix(1 0 0 1 53.5841 284.7119)"
+           id="path1260" /><g
+           id="g1262"><text
+             transform="matrix(1 0 0 1 75.4379 284.7129)"
              class="st4 st5 st6 st7"
-             id="text918">MULTIMEDIA</text>
-<linearGradient
-             id="SVGID_93_"
-             gradientUnits="userSpaceOnUse"
-             x1="140.5445"
-             y1="202.2363"
-             x2="186.8444"
-             y2="68.7049"><stop
-               offset="0"
-               style="stop-color:#59FF7F"
-               id="stop921" /><stop
-               offset="1"
-               style="stop-color:#6BFBFF"
-               id="stop923" /></linearGradient><path
-             class="st101"
-             d="M114.5,190.9c-6.4,0-12-2.6-14.8-7.5c-2.9-4.9-5.4-14.5,9.6-23.2c4.8-2.8,17.1-3.9,20.8-4l0.1,3.6      c-4.6,0.1-15.5,1.4-19.1,3.5c-9.4,5.4-12.1,11.5-8.3,18.3c3.8,6.6,14.6,7.6,24,2.2c6.6-3.8,10.6-10.5,10.7-17.9l-0.1-0.7V95.4      l71.9-14.2l0.1,71.3c0,6.7-3.3,16.4-12.5,21.8c-11.1,6.4-24.1,4.8-28.9-3.5c-2.9-4.9-5.4-14.5,9.6-23.2      c4.4-2.5,14.4-3.8,18.8-3.9l0.1,3.6c-4.2,0.1-13.5,1.4-17.1,3.5c-6.4,3.7-13.1,9.9-8.3,18.3c3.8,6.6,14.6,7.6,24,2.2      c7.9-4.5,10.7-12.8,10.7-18.5l-0.1-0.8V85.6l-64.7,12.7v66.8l0.1,0.7c0,8.7-4.7,16.6-12.5,21.1      C123.9,189.6,119,190.9,114.5,190.9z"
-             id="path925" /><linearGradient
-             id="SVGID_94_"
-             gradientUnits="userSpaceOnUse"
-             x1="145.3286"
-             y1="203.8951"
-             x2="191.6285"
-             y2="70.3637"><stop
-               offset="0"
-               style="stop-color:#59FF7F"
-               id="stop928" /><stop
-               offset="1"
-               style="stop-color:#6BFBFF"
-               id="stop930" /></linearGradient><polygon
-             class="st102"
-             points="155.6,123.3 154.8,119.8 195.5,110.2 196.3,113.7     "
-             id="polygon932" /></g></g></g></switch></svg>
\ No newline at end of file
+             id="text1264">SETTINGS</text>
+<g
+             id="g1266"><g
+               id="g1268"><g
+                 id="g1270"><linearGradient
+                   id="SVGID_121_"
+                   gradientUnits="userSpaceOnUse"
+                   x1="79.1804"
+                   y1="226.0817"
+                   x2="282.752"
+                   y2="-4.8609"><stop
+                     offset="0"
+                     style="stop-color:#59FF7F"
+                     id="stop1273" /><stop
+                     offset="1"
+                     style="stop-color:#6BFBFF"
+                     id="stop1275" /></linearGradient><path
+                   class="st129"
+                   d="M159.9,163.9c-16.3,0-29.5-13.2-29.5-29.4s13.2-29.4,29.5-29.4v3.9c-14.1,0-25.5,11.4-25.5,25.5         c0,14,11.5,25.5,25.5,25.5c14.1,0,25.6-11.4,25.6-25.5h3.9C189.4,150.7,176.2,163.9,159.9,163.9z"
+                   id="path1277" /></g><g
+                 id="g1279"><linearGradient
+                   id="SVGID_122_"
+                   gradientUnits="userSpaceOnUse"
+                   x1="79.2457"
+                   y1="226.1393"
+                   x2="282.8174"
+                   y2="-4.8033"><stop
+                     offset="0"
+                     style="stop-color:#59FF7F"
+                     id="stop1282" /><stop
+                     offset="1"
+                     style="stop-color:#6BFBFF"
+                     id="stop1284" /></linearGradient><path
+                   class="st130"
+                   d="M171.7,197.4h-23.4c-2.2,0-4-1.8-4-3.9V181c-2-0.7-4-1.5-6-2.5l-8.8,8.8c-1.5,1.5-4,1.5-5.6-0.1         l-16.6-16.6c-1.6-1.6-1.6-4.1-0.1-5.6l8.7-8.7c-1-2-1.8-4-2.5-6.1h-12.3c-2.2,0-3.9-1.8-3.9-4v-23.4c0-2.2,1.8-4,3.9-4h12.3         c0.9-2.6,1.9-5.1,3.2-7.4l3.5,1.8c-1.4,2.6-2.5,5.3-3.4,8.1l-0.4,1.4h-15.2l0,23.5l15.2,0.1l0.4,1.4c0.9,2.8,2,5.5,3.4,8         l0.7,1.3L110,167.8l16.6,16.6l10.9-10.8l1.3,0.7c2.6,1.4,5.2,2.5,8,3.3l1.4,0.4v15.4l23.5,0l0.1-15.4l1.4-0.4         c2.7-0.8,5.4-1.9,7.9-3.3l1.3-0.7l10.9,10.9l16.6-16.6l-10.8-11l0.7-1.3c1.4-2.6,2.5-5.2,3.3-7.9l0.4-1.4h15.4l0-23.5         l-15.3-0.1l-0.4-1.4c-0.8-2.8-1.9-5.5-3.3-8l-0.7-1.3l10.8-10.8l-16.6-16.6l-10.8,10.7l-1.3-0.7c-2.6-1.4-5.3-2.5-8.1-3.4         l-1.4-0.4V75.6l-23.5,0l-0.1,15.1l-1.4,0.4c-2.8,0.9-5.6,2-8.1,3.4l-1.3,0.7l-10.7-10.7L107.2,104c-1.5-1.5-1.5-4,0.1-5.6         l16.5-16.5c0.8-0.8,1.8-1.3,2.9-1.2c1,0,2,0.4,2.7,1.1l8.7,8.6c2-1,4-1.8,6.2-2.5V75.6c0-2.2,1.8-3.9,4-3.9h23.4         c2.2,0,4,1.8,4,3.9v12.3c2.1,0.7,4.1,1.6,6.1,2.5l8.7-8.7c0.7-0.7,1.7-1.1,2.7-1.1h0c1.1,0,2.1,0.4,2.9,1.2l16.6,16.6         c0.8,0.8,1.2,1.8,1.2,2.9c0,1-0.4,2-1.1,2.7l-8.8,8.8c1,2,1.8,4,2.5,6h12.4c2.2,0,3.9,1.8,3.9,4v23.4c0,2.2-1.8,4-3.9,4         h-12.5c-0.7,2-1.5,4-2.5,6l8.9,8.9c1.5,1.5,1.5,4-0.1,5.6l-16.6,16.6c-0.8,0.8-1.8,1.2-2.9,1.2h0c-1,0-2-0.4-2.7-1.1         l-8.9-8.9c-1.9,1-3.9,1.8-5.9,2.5v12.5C175.7,195.6,173.9,197.4,171.7,197.4z"
+                   id="path1286" /></g></g></g></g></g></g></switch></svg>
\ No newline at end of file
diff --git a/navigation.pro b/tbtnavi.pro
index 579a952..579a952 100644
--- a/navigation.pro
+++ b/tbtnavi.pro