mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-29 05:30:41 +00:00
ce309c15a7
The animation sequence when deselecting a zoomed in map location, should be: - zoom out completely - pan to center To achieve that a new animation object is created - "mapAnimationZoomOut" The previous zoom in animation is renamed to "mapAnimationZoomIn". The map functions centerOnMapLocation() and deselectMapLocation() now call the helper functions animateMapZoomIn() and animateMapZoomOut(). Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
117 lines
2.8 KiB
QML
117 lines
2.8 KiB
QML
// SPDX-License-Identifier: GPL-2.0
|
|
import QtQuick 2.0
|
|
import QtLocation 5.3
|
|
import QtPositioning 5.3
|
|
import org.subsurfacedivelog.mobile 1.0
|
|
|
|
Item {
|
|
readonly property var esriMapTypeIndexes: { "STREET": 0, "SATELLITE": 1 }
|
|
|
|
Plugin {
|
|
id: mapPlugin
|
|
name: "esri"
|
|
}
|
|
|
|
MapWidgetHelper {
|
|
id: mapHelper
|
|
map: map
|
|
}
|
|
|
|
Map {
|
|
id: map
|
|
anchors.fill: parent
|
|
plugin: mapPlugin
|
|
zoomLevel: 1
|
|
|
|
readonly property var defaultCenter: QtPositioning.coordinate(0, 0)
|
|
readonly property var defaultZoomIn: 17.0
|
|
readonly property var defaultZoomOut: 1.0
|
|
property var newCenter: defaultCenter
|
|
property var newZoom: 1.0
|
|
|
|
Component.onCompleted: {
|
|
activeMapType = supportedMapTypes[esriMapTypeIndexes.SATELLITE]
|
|
}
|
|
|
|
MapItemView {
|
|
id: mapItemView
|
|
model: mapHelper.model
|
|
delegate: MapQuickItem {
|
|
anchorPoint.x: 0
|
|
anchorPoint.y: mapItemImage.height
|
|
coordinate: model.coordinate
|
|
z: mapHelper.model.selectedUuid === model.uuid ? mapHelper.model.count - 1 : 0
|
|
sourceItem: Image {
|
|
id: mapItemImage
|
|
source: "qrc:///mapwidget-marker" + (mapHelper.model.selectedUuid === model.uuid ? "-selected" : "")
|
|
|
|
SequentialAnimation {
|
|
id: mapItemImageAnimation
|
|
PropertyAnimation {
|
|
target: mapItemImage; property: "scale"; from: 1.0; to: 0.7; duration: 120;
|
|
}
|
|
PropertyAnimation {
|
|
target: mapItemImage; property: "scale"; from: 0.7; to: 1.0; duration: 80;
|
|
}
|
|
}
|
|
}
|
|
|
|
MouseArea {
|
|
anchors.fill: parent
|
|
onClicked: {
|
|
mapHelper.model.selectedUuid = model.uuid
|
|
mapItemImageAnimation.restart()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
ParallelAnimation {
|
|
id: mapAnimationZoomIn
|
|
CoordinateAnimation {
|
|
target: map; property: "center"; to: map.newCenter; duration: 2000;
|
|
}
|
|
NumberAnimation {
|
|
target: map; property: "zoomLevel"; to: map.newZoom ; duration: 3000; easing.type: Easing.InCubic;
|
|
}
|
|
}
|
|
|
|
ParallelAnimation {
|
|
id: mapAnimationZoomOut
|
|
NumberAnimation {
|
|
target: map; property: "zoomLevel"; from: map.zoomLevel; to: map.newZoom; duration: 3000;
|
|
}
|
|
SequentialAnimation {
|
|
PauseAnimation { duration: 2000 }
|
|
CoordinateAnimation {
|
|
target: map; property: "center"; to: map.newCenter; duration: 2000;
|
|
}
|
|
}
|
|
}
|
|
|
|
function animateMapZoomIn(coord) {
|
|
zoomLevel = defaultZoomOut
|
|
newCenter = coord
|
|
newZoom = map.defaultZoomIn
|
|
mapAnimationZoomIn.restart()
|
|
mapAnimationZoomOut.stop()
|
|
}
|
|
|
|
function animateMapZoomOut() {
|
|
newCenter = map.defaultCenter
|
|
newZoom = map.defaultZoomOut
|
|
mapAnimationZoomIn.stop()
|
|
mapAnimationZoomOut.restart()
|
|
}
|
|
|
|
function centerOnMapLocation(mapLocation) {
|
|
mapHelper.model.selectedUuid = mapLocation.uuid
|
|
animateMapZoomIn(mapLocation.coordinate)
|
|
}
|
|
|
|
function deselectMapLocation() {
|
|
mapHelper.model.selectedUuid = 0
|
|
animateMapZoomOut()
|
|
}
|
|
}
|
|
}
|