napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[localeq]Map.qml needed fixes

Browse Source 
esri has several bugs, not showing for all locations, zooming on Americas broken
use osm as default, set preferred, so esri can be fallback
remove Label section for mouse movement, showing coordinates not really useful,
issue with mouse grabbing is back with it
This commit is contained in:
demmm 2022-05-13 13:17:19 +02:00
parent bc98b9892c
commit 7937cd625d
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/localeq/Map.qml
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <https://calamares.io> === /* === This file is part of Calamares - <https://calamares.io> ===
* *
* SPDX-FileCopyrightText: 2020 Anke Boersma <demm@kaosx.us> * SPDX-FileCopyrightText: 2020 - 2022 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
* *
* Calamares is Free Software: see the License-Identifier above. * Calamares is Free Software: see the License-Identifier above.
@ -112,7 +112,7 @@ Column {
Plugin { Plugin {
id: mapPlugin id: mapPlugin
name: "esri" // "esri", "here", "itemsoverlay", "mapbox", "mapboxgl", "osm" preferred: ["osm", "esri"] // "esri", "here", "itemsoverlay", "mapbox", "mapboxgl", "osm"
} }
Map { Map {
@ -121,7 +121,7 @@ Column {
plugin: mapPlugin plugin: mapPlugin
activeMapType: supportedMapTypes[0] activeMapType: supportedMapTypes[0]
//might be desirable to set zoom level configurable? //might be desirable to set zoom level configurable?
zoomLevel: 5 zoomLevel: 7
bearing: 0 bearing: 0
tilt: 0 tilt: 0
copyrightsVisible : true copyrightsVisible : true
@ -167,12 +167,6 @@ Column {
anchors.fill: map anchors.fill: map
hoverEnabled: true hoverEnabled: true
property var coordinate: map.toCoordinate(Qt.point(mouseX, mouseY)) property var coordinate: map.toCoordinate(Qt.point(mouseX, mouseY))
Label {
x: parent.mouseX - width -5
y: parent.mouseY - height - 5
text: "%1, %2".arg(
parent.coordinate.latitude).arg(parent.coordinate.longitude)
}
onClicked: { onClicked: {
marker.coordinate = coordinate marker.coordinate = coordinate