Skip to content

Q
qgroundcontrol
Commit 75203177 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Fix isSatelliteMap determination

parent 78d203be
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
src/FlightMap/FlightMap.qml
View file @ 75203177
...@@ -32,7 +32,7 @@ Map { ...@@ -32,7 +32,7 @@ Map {
id: _map id: _map
property string mapName: 'defaultMap' property string mapName: 'defaultMap'
property bool isSatelliteMap: QGroundControl.flightMapSettings.mapType == "Satellite" || QGroundControl.flightMapSettings.mapType == "Hybrid" property bool isSatelliteMap: activeMapType.name.indexOf("Satellite") > -1 || activeMapType.name.indexOf("Hybrid") > -1
readonly property real maxZoomLevel: 20 readonly property real maxZoomLevel: 20
property variant scaleLengths: [5, 10, 25, 50, 100, 150, 250, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000] property variant scaleLengths: [5, 10, 25, 50, 100, 150, 250, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000]
......
src/FlightMap/MapScale.qml
View file @ 75203177
...@@ -24,8 +24,7 @@ Item { ...@@ -24,8 +24,7 @@ Item {
property variant _scaleLengths: [5, 10, 25, 50, 100, 150, 250, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000] property variant _scaleLengths: [5, 10, 25, 50, 100, 150, 250, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000]
property bool _isSatelliteMap: mapControl.activeMapType.name.indexOf("Satellite") > -1 || mapControl.activeMapType.name.indexOf("Hybrid") > -1 property var _color: mapControl.isSatelliteMap ? "white" : "black"
property var _color: _isSatelliteMap ? "white" : "black"
function formatDistance(meters) function formatDistance(meters)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment