mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
mapwidget.qml: whitespace and ';' cleanup
The rest of the QML code in subsurface doesn't use the ';' to end a line of code or a declaration. Remove all the redundant ';'. Also clean extra blank lines. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
parent
2d101b7252
commit
6299a3c93b
1 changed files with 14 additions and 17 deletions
|
@ -5,8 +5,7 @@ import QtPositioning 5.3
|
|||
import org.subsurfacedivelog.mobile 1.0
|
||||
|
||||
Item {
|
||||
|
||||
readonly property var esriMapTypeIndexes: { "STREET": 0, "SATELLITE": 1 };
|
||||
readonly property var esriMapTypeIndexes: { "STREET": 0, "SATELLITE": 1 }
|
||||
|
||||
Plugin {
|
||||
id: mapPlugin
|
||||
|
@ -24,18 +23,17 @@ Item {
|
|||
plugin: mapPlugin
|
||||
zoomLevel: 1
|
||||
|
||||
readonly property var defaultCenter: QtPositioning.coordinate(0, 0);
|
||||
readonly property var defaultZoomIn: 17.0;
|
||||
property var newCenter: defaultCenter;
|
||||
property var newZoom: 1.0;
|
||||
readonly property var defaultCenter: QtPositioning.coordinate(0, 0)
|
||||
readonly property var defaultZoomIn: 17.0
|
||||
property var newCenter: defaultCenter
|
||||
property var newZoom: 1.0
|
||||
|
||||
Component.onCompleted: {
|
||||
map.activeMapType = map.supportedMapTypes[esriMapTypeIndexes.SATELLITE];
|
||||
map.activeMapType = map.supportedMapTypes[esriMapTypeIndexes.SATELLITE]
|
||||
}
|
||||
|
||||
MapItemView {
|
||||
id: mapItemView
|
||||
|
||||
model: mapHelper.model
|
||||
delegate: MapQuickItem {
|
||||
anchorPoint.x: 0
|
||||
|
@ -43,11 +41,11 @@ Item {
|
|||
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" : "");
|
||||
id: mapItemImage
|
||||
source: "qrc:///mapwidget-marker" + (mapHelper.model.selectedUuid === model.uuid ? "-selected" : "")
|
||||
|
||||
SequentialAnimation {
|
||||
id: mapItemImageAnimation;
|
||||
id: mapItemImageAnimation
|
||||
PropertyAnimation {
|
||||
target: mapItemImage; property: "scale"; from: 1.0; to: 0.7; duration: 120;
|
||||
}
|
||||
|
@ -58,7 +56,7 @@ Item {
|
|||
|
||||
onSourceChanged: {
|
||||
if (mapHelper.model.selectedUuid === model.uuid)
|
||||
mapItemImageAnimation.restart();
|
||||
mapItemImageAnimation.restart()
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -73,7 +71,6 @@ Item {
|
|||
|
||||
ParallelAnimation {
|
||||
id: mapAnimation
|
||||
|
||||
CoordinateAnimation {
|
||||
target: map
|
||||
property: "center"
|
||||
|
@ -90,10 +87,10 @@ Item {
|
|||
}
|
||||
|
||||
function centerOnMapLocation(mapLocation) {
|
||||
map.newCenter = mapLocation.coordinate;
|
||||
map.zoomLevel = 2;
|
||||
mapAnimation.restart();
|
||||
mapHelper.model.selectedUuid = mapLocation.uuid;
|
||||
map.newCenter = mapLocation.coordinate
|
||||
map.zoomLevel = 2
|
||||
mapAnimation.restart()
|
||||
mapHelper.model.selectedUuid = mapLocation.uuid
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue