removed MapBaseComponent.qml

Change-Id: I2153e59af72eb1d03f3b90d29b16496d364d48b8
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

2 files changed, 0 insertions, 822 deletions

diff --git a/examples/declarative/mapviewer/mapviewer/content/map/MapBaseComponent.qml b/examples/declarative/mapviewer/mapviewer/content/map/MapBaseComponent.qml
deleted file mode 100644
index b615acdb..00000000
--- a/examples/declarative/mapviewer/mapviewer/content/map/MapBaseComponent.qml
+++ /dev/null
@@ -1,821 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** 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 Nokia Corporation and its Subsidiary(-ies) 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.0
-import QtLocation 5.0
-import "../components"
-
-Map {
-    id: map
-    anchors.fill: parent
-    zoomLevel: (maximumZoomLevel - minimumZoomLevel)/2
-    center: brisbaneCoordinate
-
-    pinch.activeGestures: MapPinch.ZoomGesture
-    pinch.enabled: true
-
-    // Flicking
-    flick.enabled: true
-    flick.deceleration: 3000
-//    property list<Marker> markers
-//    property list<MapItem> mapItems
-    property int counter: 0 // counter for total amount of markers. Resets to 0 when number of markers = 0
-    property int mapItemsCounter: 0 // counter for total amount of mapItems. Resets to 0 when number of markers = 0
-//    property Marker currentMarker
-    signal mapPressed() // replace with
-                        // signal mousePressed(MouseEvent mouse) when QTBUG-14550 is fixed
-
-    property int lastX : -1
-    property int lastY : -1
-
-    Coordinate {
-        id: brisbaneCoordinate
-        latitude: -27.5
-        longitude: 153
-    }
-    Slider {
-        id: zoomSlider;
-        minimum: map.minimumZoomLevel;
-        maximum: map.maximumZoomLevel;
-        opacity: 1
-        visible: parent.visible
-        z: map.z+1
-        anchors {
-            bottom: parent.bottom;
-            bottomMargin: 56; rightMargin: 5; leftMargin: 5
-            left: parent.left
-        }
-        width: parent.width - anchors.rightMargin - anchors.leftMargin
-        value: map.zoomLevel
-        onValueChanged: {
-            map.zoomLevel = value
-        }
-    }
-
-/*
-    property RouteQuery routeQuery: RouteQuery {}
-    property RouteModel routeModel: RouteModel {
-                                        plugin : map.plugin
-                                        query: routeQuery
-                                        onStatusChanged:{
-                                            if (status == RouteModel.Ready){
-                                                if (count == 1) { routeInfoModel.update()}
-                                            }
-                                            else if (status == RouteModel.Error){
-                                                clearAll()
-                                                map.routeError()
-                                            }
-                                        }
-                                        function clearAll(){
-                                            clear()
-                                            routeInfoModel.update()
-                                        }
-                                    }
-    property GeocodeModel geocodeModel: GeocodeModel {
-                                            plugin : map.plugin;
-                                            onStatusChanged:{
-                                                if ((status == GeocodeModel.Ready) || (status == GeocodeModel.Error)) map.geocodeFinished()
-                                            }
-                                            onLocationsChanged:
-                                            {
-                                                if (count == 1) map.center = get(0).coordinate
-                                            }
-                                        }
-
-    signal coordinatesCaptured(double latitude, double longitude)
-    signal geocodeFinished()
-    signal showGeocodeInfo()
-    signal moveMarker()
-    signal routeError()
-
-    Component.onCompleted: {
-        markers = []
-    }
-
-    Component {
-        id: routeDelegate
-        MapGroup {
-            MapRoute {
-                route: path
-            border.color: routeMouseArea.containsMouse ? "lime" :"red"
-            border.width: 5
-                MapMouseArea {
-                    id: routeMouseArea
-
-                    hoverEnabled: true
-                    onPressed : {
-                        routeTimer.start()markers;
-                        map.state = ""
-                        map.lastX = mouse.x
-                        map.lastY = mouse.y
-                    }
-                    onReleased : {
-                        if (routeTimer.running){ //SHORT PRESS
-                            routeTimer.stop()
-                            map.lastX = -1
-                            map.lastY = -1
-                        }
-                    }
-                    onPositionChanged: {
-                        if (routeTimer.running) routeTimer.stop()
-                        if (map.state == "") {
-                            map.lastX = mouse.x
-                            map.lastY = mouse.y
-                        }
-                    }
-                    Timer {
-                        id: routeTimer
-                        interval: longPressDuration; running: false; repeat: false
-                        onTriggered: { //LONG PRESS
-                        map.state = "RoutePopupMenu"
-                        }
-                    }
-                }
-            }
-            MapImage {
-                source: routeMouseArea.containsMouse ? "resources/node_selected.png" : "resources/node.png"
-                coordinate:path.path[0]
-                offset.x: -5
-                offset.y: -5
-            }
-            MapImage {
-                source: routeMouseArea.containsMouse ? "resources/node_selected.png" : "resources/node.png"
-                coordinate:path.path[path.path.length-1]
-                offset.x: -5
-                offset.y: -5
-            }
-        }
-    }
-
-    Component {
-        id: pointDelegate
-        MapCircle {
-            radius: 1000
-            color: circleMouseArea.containsMouse ? "#8000FF00" : "#80FF0000"
-            center: location.coordinate
-            MapMouseArea {
-                id: circleMouseArea
-                hoverEnabled: true
-                onPressed : {
-                    circleTimer.start()
-                    map.state = ""
-                    map.lastX = mouse.x
-                    map.lastY = mouse.y
-                }
-                onReleased : {
-                    if (circleTimer.running) {//SHORT PRESS
-                        circleTimer.stop();
-                        map.lastX = -1
-                        map.lastY = -1
-                    }
-                }
-                onPositionChanged: {
-                    if (circleTimer.running) circleTimer.stop()
-                    if ((mouse.button == Qt.LeftButton) && (map.state == "")) radius = center.distanceTo(mouse.coordinate)
-                    if (map.state == "") {
-                        map.lastX = mouse.x
-                        map.lastY = mouse.y
-                    }
-                }
-                Timer {
-                    id: circleTimer
-                    interval: longPressDuration; running: false; repeat: false
-                    onTriggered: { //LONG PRESS
-                        map.state = "PointPopupMenu"
-                    }
-                }
-            }
-        }
-    }
-
-    Component {
-        id: routeInfoDelegate
-        Row {
-            spacing: 10
-            Text {
-                id: indexText
-                text: index + 1
-                color: "white"
-                font.bold: true
-                font.pixelSize: 14
-            }
-            Text {
-                text: instruction
-                color: "white"
-                height: indexText.height*3
-                wrapMode: Text.Wrap
-                width: textArea.width - indexText.width - distanceText.width - spacing*4
-            }
-            Text {
-                id: distanceText
-                text: distance
-                color: "white"
-                font.bold: true
-                font.pixelSize: 14
-            }
-        }
-    }
-
-    Component{
-        id: routeInfoHeader
-        Item {
-            width: textArea.width
-            height: travelTime.height + line.anchors.topMargin + line.height
-            Text {
-                id: travelTime
-                text: routeInfoModel.travelTime
-                color: "white"
-                font.bold: true
-                font.pixelSize: 14
-                anchors.left: parent.left
-            }
-            Text {
-                id: distance
-                text: routeInfoModel.distance
-                color: "white"
-                font.bold: true
-                font.pixelSize: 14
-                anchors.right: parent.right
-            }
-            Rectangle {
-                id: line
-                color: "white"
-                width: parent.width
-                height: 2
-                anchors.left: parent.left
-                anchors.topMargin: 1
-                anchors.top: distance.bottom
-            }
-        }
-    }
-
-
-    ListModel{
-        id: routeInfoModel
-        property string travelTime
-        property string distance
-
-        function update() {
-            clear()
-            if (routeModel.count > 0){
-                for (var i=0; i< routeModel.get(0).segments.length; i++){
-                    append({"instruction": routeModel.get(0).segments[i].maneuver.instructionText, "distance": formatDistance(routeModel.get(0).segments[i].maneuver.distanceToNextInstruction)})
-                }
-            }
-            travelTime = routeModel.count == 0 ? "" : formatTime(routeModel.get(0).travelTime)
-            distance = routeModel.count == 0 ? "" : formatDistance(routeModel.get(0).distance)
-        }
-    }
-
-    MapObjectView {
-        model: routeModel
-        delegate: routeDelegate
-    }
-
-    MapObjectView {
-        model: geocodeModel
-        delegate: pointDelegate
-    }
-
-    Plugin {
-        id: defaultPlugin
-        name : "nokia"
-    }
-
-    Coordinate {
-        id: defaultCoordinates
-        latitude : -27.53
-        longitude : 153.088
-    }
-
-    Item {
-        id: infoTab
-        parent: scale.parent
-        z: map.z
-        height: parent.height - 180
-        width: parent.width
-        x: -5 - infoRect.width
-        y: 60
-        visible: (routeInfoModel.count > 0)
-        Image {
-            id: catchImage
-            source: "../resources/catch.png"
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.right: parent.right
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    if (infoTab.x == -5) infoTab.x -= infoRect.width
-                    else infoTab.x = -5
-                    map.state = ""
-                }
-            }
-        }
-
-        Behavior on x {
-            PropertyAnimation { properties: "x"; duration: 300; easing.type: Easing.InOutQuad }
-        }
-
-        Rectangle {
-            id: infoRect
-            width: parent.width - catchImage.sourceSize.width
-            height: parent.height
-            color: "#3F95FF"
-            opacity: 0.75
-            radius: 5
-            MouseArea {
-                anchors.fill: parent
-                hoverEnabled: true
-            }
-            Item {
-                id: textArea
-                anchors.left: parent.left
-                anchors.leftMargin: 10
-                anchors.top: parent.top
-                anchors.topMargin: 10
-                width: parent.width -15
-                height: parent.height - 20
-                ListView {
-                    id: routeInfoView
-                    model: routeInfoModel
-                    delegate: routeInfoDelegate
-                    header: routeInfoHeader
-                    anchors.fill: parent
-                    clip: true
-                }
-            }
-        }
-    }
-*/
-
-    Item {//scale
-        id: scale
-        parent: zoomSlider.parent
-        visible: scaleText.text != "0 m"
-        z: map.z
-        opacity: 0.6
-        anchors {
-            bottom: zoomSlider.top;
-            bottomMargin: 8;
-            leftMargin: 20
-            left: zoomSlider.left
-        }
-        Image {
-            id: scaleImage
-            source: "../resources/scale.png"
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-        }
-        Text {
-            id: scaleText
-            color: "#004EAE"
-            horizontalAlignment: Text.AlignHCenter
-            width: scaleImage.sourceSize.width
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            anchors.bottomMargin: 3
-            text:calculateScale()
-            font.pixelSize: 14
-        }
-    }
-
-    onCenterChanged:{
-        scaleText.text = calculateScale()
-    }
-
-    onZoomLevelChanged:{
-        scaleText.text = map.calculateScale()
-    }
-
-    onWidthChanged:{
-        scaleText.text = map.calculateScale()
-    }
-
-    onHeightChanged:{
-        scaleText.text = map.calculateScale()
-    }
-
-    Menu {
-        id: markerMenu
-        horizontalOrientation: false
-        z: map.z + 2
-        opacity: 0
-
-        width: 150
-        x: 0
-        y: 0
-        onClicked: {
-            map.state = ""
-/*            switch (button) {
-                case "Delete": {//remove marker
-                    map.removeMarker(currentMarker)
-                    break;
-                }
-                case "Move to": {//move marker
-                    map.moveMarker()
-                    break;
-                }
-                case "Coordinates": {//show marker's coordinates
-                    map.coordinatesCaptured(currentMarker.coordinate.latitude, currentMarker.coordinate.longitude)
-                    break;
-                }
-                case "Route to next points"://calculate route
-                case "Route to next point": {
-                    map.calculateRoute(currentMarker)
-                    break;
-                }
-            }*/
-        }
-    }
-
-    Menu {
-        id: popupMenu
-        horizontalOrientation: false
-        z: map.z + 2
-        opacity: 0
-
-        width: 150
-        x: 0
-        y: 0
-
-        onClicked: {
-/*            switch (button) {
-                case "Set Marker": {
-                    addMarker()
-                    break;
-                }
-                case "Coordinates": {
-                    map.coordinatesCaptured(mouseArea.lastCoordinate.latitude, mouseArea.lastCoordinate.longitude)
-                    break;
-                }
-                case "Delete all objects": {
-                    map.deleteAllObjects()
-                    break;
-                }
-            }*/
-            map.state = ""
-        }
-    }
-
-    Menu {
-        id: routeMenu
-        horizontalOrientation: false
-        z: map.z +2
-        opacity: 0
-
-        width: 150
-        x: 0
-        y: 0
-
-        onClicked: {
-/*            switch (button) {
-                case "Delete": {//delete route
-                    routeModel.clear()
-                    routeInfoModel.update()
-                    break;
-                }
-            }*/
-            map.state = ""
-        }
-        Component.onCompleted: {
-            addItem("Delete")
-        }
-    }
-
-    Menu {
-        id: pointMenu
-        horizontalOrientation: false
-        z: map.z +2
-        opacity: 0
-
-        width: 150
-        x: 0
-        y: 0
-
-        onClicked: {
-/*            switch (button) {
-                case "Info": {
-                    map.showGeocodeInfo()
-                    break;
-                }
-                case "Delete": {
-                    geocodeModel.clear()
-                    break;
-                }
-            }*/
-            map.state = ""
-        }
-        Component.onCompleted: {
-            addItem("Info")
-            addItem("Delete")
-        }
-    }
-
-    Rectangle {
-        id: infoLabel
-        width: backgroundRect.width + 10
-        height: infoText.height + 5
-        y: 440
-        anchors.left: map.left
-        z: map.z + 1
-        color: "dimgrey"
-        opacity: (infoText.text !="") ? 0.8 : 0
-
-        Behavior on opacity {
-            NumberAnimation { duration: 200 }
-        }
-        Text {
-            id: infoText
-            width: parent.width
-            elide: Text.ElideLeft
-            maximumLineCount: 4
-            wrapMode: Text.Wrap
-            font.bold: true
-            font.pixelSize: 14
-            style: Text.Raised;
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.leftMargin: 5
-            anchors.rightMargin: 5
-            color: "white"
-        }
-    }
-
-    MapMouseArea {
-        id: mouseArea
-        property Coordinate lastCoordinate: Coordinate { latitude : 0; longitude : 0}
-        anchors.fill: parent
-
-/*        onPressed : {
-            mapPressed();
-            map.state = ""
-            map.lastX = mouse.x
-            map.lastY = mouse.y
-            lastCoordinate = mouse.coordinate
-//            if (mouse.button == Qt.MiddleButton)
-//                addMarker()
-        }
-
-        onPositionChanged: {
-            map.state = ""
-            if ((mouse.button == Qt.LeftButton) & (map.state == "")) {
-//                if ((map.lastX != -1) && (map.lastY != -1)) {
-//                    var dx = mouse.x - map.lastX
-//                    var dy = mouse.y - map.lastY
-//                    map.pan(-dx, -dy)
-//                }
-                map.lastX = mouse.x
-                map.lastY = mouse.y
-            }
-        }
-
-        onDoubleClicked: {
-            map.center = mouse.coordinate
-            if (mouse.button == Qt.LeftButton){
-                map.zoomLevel += 1
-            } else if (mouse.button == Qt.RightButton) map.zoomLevel -= 1
-            lastX = -1
-            lastY = -1
-        }
-
-        onPressAndHold:{
-            popupMenu.clear()
-            popupMenu.addItem("Coordinates")
-            popupMenu.addItem("Marker")
-            popupMenu.addItem("Rectangle")
-            popupMenu.addItem("Circle")
-            popupMenu.addItem("Polyline")
-            popupMenu.addItem("Polygon")
-//            if ((map.markers.length != 0) || (map.mapItems.length != 0)) popupMenu.addItem("Delete all objects")
-//                map.state = "PopupMenu"
-        }*/
-    }
-
-
-    Keys.onPressed: {
-        if ((event.key == Qt.Key_Plus) || (event.key == Qt.Key_VolumeUp)) {
-            map.zoomLevel += 1
-        } else if ((event.key == Qt.Key_Minus) || (event.key == Qt.Key_VolumeDown)){
-            map.zoomLevel -= 1
-        }
-    }
-
-    function calculateScale(){
-        var coord1, coord2, dist, text
-        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))
-        text = formatDistance(dist)
-        return text
-    }
-
-/*
-    function addMapItem(type){
-        var item, myArray
-        if (map.itemMarkers.length < 2){
-            console.log("less than 2 points marked")
-        } else {
-            console.log("adding " + type)
-            item = Qt.createQmlObject (type + ' {}', map)
-            map.addMapObject(item)
-            //update list of markers
-            var count = map.objects.length
-            mapItemsCounter++
-            myArray = new Array()
-            for (var i = 0; i<count; i++){
-                myArray.push(mapItems[i])
-            }
-            myArray.push(item)
-            mapItems = myArray
-        }
-    }
-
-    function deleteAllObjects(){
-        var count = map.markers.length
-        for (var i = 0; i<count; i++){
-            map.removeMapObject(map.markers[i])
-            map.markers[i].destroy()
-        }
-        map.markers = []
-        var count = map.mapItems.length
-        for (var i = 0; i<count; i++){
-            map.removeMapObject(map.mapItems[i])
-            map.mapItems[i].destroy()
-        }
-        map.mapItems = []
-        mapItemsCounter = 0
-    }
-
-    function addMarker(){
-
-        var marker, myArray
-        var count = map.markers.length
-        counter++
-        marker = Qt.createQmlObject ('Marker {}', map)
-        map.addMapObject(marker)
-
-        //update list of markers
-        myArray = new Array()
-        for (var i = 0; i<count; i++){
-            myArray.push(markers[i])
-        }
-        myArray.push(marker)
-        markers = myArray
-    }
-
-    function removeMarker(marker){
-        //update list of markers
-        var myArray = new Array()
-        var count = map.markers.length
-        for (var i = 0; i<count; i++){
-            if (marker != map.markers[i]) myArray.push(map.markers[i])
-        }
-
-        map.removeMapObject(marker)
-        marker.destroy()
-        map.markers = myArray
-        if (markers.length == 0) counter = 0
-    }
-
-    function markerLongPress(){
-        var array
-        var count = map.markers.length
-
-        markerMenu.clear()
-        markerMenu.addItem("Delete")
-        markerMenu.addItem("Move to")
-        markerMenu.addItem("Coordinates")
-        if ((currentMarker != markers[count-1]) && (count > 2))
-            if (currentMarker == markers[count-2]) markerMenu.addItem("Route to next point")
-            else  markerMenu.addItem("Route to next points")
-        }
-        else  markerMenu.addItem("Route to next point")
-
-        map.state = "MarkerPopupMenu"
-    }
-
-    function calculateRoute(marker){
-        routeQuery.clearWaypoints();
-        var startPointFound = false
-        var count = map.markers.length
-        for (var i = 0; i< count; i++){
-            if (startPointFound != true){
-                if (markers[i] == marker){
-                    startPointFound = true
-                    routeQuery.addWaypoint(marker.coordinate)
-                }
-            }
-            else routeQuery.addWaypoint(markers[i].coordinate)
-        }
-        routeQuery.travelModes = RouteQuery.CarTravel
-        routeQuery.routeOptimizations = RouteQuery.ShortestRoute
-        for (i=0; i<9; i++) {
-            routeQuery.setFeatureWeight(i, 0)
-        }
-        routeModel.update();
-    }
-*/
-    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
-    }
-
-    // states of map
-    states: [
-        State {
-            name: "PopupMenu"
-            PropertyChanges { target: popupMenu; opacity: 1}
-            PropertyChanges { target: popupMenu; x: ((map.lastX + popupMenu.width > map.width) ? map.width - popupMenu.width : map.lastX)}
-            PropertyChanges { target: popupMenu; y: ((map.lastY + popupMenu.height > map.height) ? map.height - popupMenu.height : map.lastY)}
-        },
-        State {
-            name: "MarkerPopupMenu"
-            PropertyChanges { target: markerMenu; opacity: 1}
-            PropertyChanges { target: markerMenu; x: ((currentMarker.lastMouseX + markerMenu.width > map.width) ? map.width - markerMenu.width : currentMarker.lastMouseX )}
-            PropertyChanges { target: markerMenu; y: ((currentMarker.lastMouseY + markerMenu.height > map.height) ? map.height - markerMenu.height : currentMarker.lastMouseY)}
-        },
-        State {
-            name: "RoutePopupMenu"
-            PropertyChanges { target: routeMenu; opacity: 1}
-            PropertyChanges { target: routeMenu; x: ((map.lastX + routeMenu.width > map.width) ? map.width - routeMenu.width : map.lastX)}
-            PropertyChanges { target: routeMenu; y: ((map.lastY + routeMenu.height > map.height) ? map.height - routeMenu.height : map.lastY)}
-        },
-        State {
-            name: "PointPopupMenu"
-            PropertyChanges { target: pointMenu; opacity: 1}
-            PropertyChanges { target: pointMenu; x: ((map.lastX + pointMenu.width > map.width) ? map.width - pointMenu.width : map.lastX)}
-            PropertyChanges { target: pointMenu; y: ((map.lastY + pointMenu.height > map.height) ? map.height - pointMenu.height : map.lastY)}
-        }
-    ]
-
-}
diff --git a/examples/declarative/mapviewer/mapviewer/qml.pro b/examples/declarative/mapviewer/mapviewer/qml.pro
index a516f084..3127dd7c 100644
--- a/examples/declarative/mapviewer/mapviewer/qml.pro
+++ b/examples/declarative/mapviewer/mapviewer/qml.pro
@@ -29,7 +29,6 @@ dialogs.files = \
 
 map.path = $${files.path}/content/map
 map.files = \
-    content/map/MapBaseComponent.qml \
     content/map/MapComponent.qml \
     content/map/Marker.qml