Skip to content

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

Merge pull request #2885 from DonLakeFlyer/Zoom20 

Allow map zoom to go to 20
parents 03ff59ec a1f35b6b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
src/QtLocationPlugin/QGCMapUrlEngine.h
View file @ 0dea128d
...@@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project ...@@ -36,7 +36,7 @@ This file is part of the QGROUNDCONTROL project
#include <QNetworkReply> #include <QNetworkReply>
#include <QMutex> #include <QMutex>
#define MAX_MAP_ZOOM (18.0) #define MAX_MAP_ZOOM (20.0)
class UrlFactory : public QObject { class UrlFactory : public QObject {
Q_OBJECT Q_OBJECT
......
src/QtLocationPlugin/QMLControl/OfflineMap.qml
View file @ 0dea128d
...@@ -56,6 +56,9 @@ Rectangle { ...@@ -56,6 +56,9 @@ Rectangle {
property int oldz0: 0 property int oldz0: 0
property int oldz1: 0 property int oldz1: 0
readonly property real minZoomLevel: 3
readonly property real maxZoomLevel: 20
Component.onCompleted: { Component.onCompleted: {
QGroundControl.mapEngineManager.loadTileSets() QGroundControl.mapEngineManager.loadTileSets()
updateMap() updateMap()
...@@ -357,8 +360,8 @@ Rectangle { ...@@ -357,8 +360,8 @@ Rectangle {
} }
Slider { Slider {
id: _slider0 id: _slider0
minimumValue: 3 minimumValue: minZoomLevel
maximumValue: 18 maximumValue: maxZoomLevel
stepSize: 1 stepSize: 1
tickmarksEnabled: false tickmarksEnabled: false
orientation: Qt.Horizontal orientation: Qt.Horizontal
...@@ -421,8 +424,8 @@ Rectangle { ...@@ -421,8 +424,8 @@ Rectangle {
} }
Slider { Slider {
id: _slider1 id: _slider1
minimumValue: 3 minimumValue: minZoomLevel
maximumValue: 18 maximumValue: maxZoomLevel
stepSize: 1 stepSize: 1
tickmarksEnabled: false tickmarksEnabled: false
orientation: Qt.Horizontal orientation: Qt.Horizontal
......
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