From 75203177bb34f7d253d1c43c5468fea3bcd0633f Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 12 Jun 2016 14:07:04 -0700 Subject: [PATCH] Fix isSatelliteMap determination --- src/FlightMap/FlightMap.qml | 2 +- src/FlightMap/MapScale.qml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/FlightMap/FlightMap.qml b/src/FlightMap/FlightMap.qml index cb81bdfec..3cccb5705 100644 --- a/src/FlightMap/FlightMap.qml +++ b/src/FlightMap/FlightMap.qml @@ -32,7 +32,7 @@ Map { id: _map 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 property variant scaleLengths: [5, 10, 25, 50, 100, 150, 250, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000] diff --git a/src/FlightMap/MapScale.qml b/src/FlightMap/MapScale.qml index fff88575c..b64efd27f 100644 --- a/src/FlightMap/MapScale.qml +++ b/src/FlightMap/MapScale.qml @@ -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 bool _isSatelliteMap: mapControl.activeMapType.name.indexOf("Satellite") > -1 || mapControl.activeMapType.name.indexOf("Hybrid") > -1 - property var _color: _isSatelliteMap ? "white" : "black" + property var _color: mapControl.isSatelliteMap ? "white" : "black" function formatDistance(meters) { -- 2.22.0