Skip to content

Q
qgroundcontrol
Commit 781c7e37 authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Increase map real estate when defining offline maps.

parent 6ab27c17
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 74 deletions
src/QtLocationPlugin/QGCMapEngine.cpp
View file @ 781c7e37
...@@ -266,7 +266,7 @@ QGCTileSet ...@@ -266,7 +266,7 @@ QGCTileSet
QGCMapEngine::getTileCount(int zoom, double topleftLon, double topleftLat, double bottomRightLon, double bottomRightLat, UrlFactory::MapType mapType) QGCMapEngine::getTileCount(int zoom, double topleftLon, double topleftLat, double bottomRightLon, double bottomRightLat, UrlFactory::MapType mapType)
{ {
if(zoom < 1) zoom = 1; if(zoom < 1) zoom = 1;
if(zoom > 18) zoom = 18; if(zoom > MAX_MAP_ZOOM) zoom = MAX_MAP_ZOOM;
QGCTileSet set; QGCTileSet set;
set.tileX0 = long2tileX(topleftLon, zoom); set.tileX0 = long2tileX(topleftLon, zoom);
set.tileY0 = lat2tileY(topleftLat, zoom); set.tileY0 = lat2tileY(topleftLat, zoom);
......
src/QtLocationPlugin/QMLControl/OfflineMap.qml
View file @ 781c7e37
...@@ -44,10 +44,14 @@ Rectangle { ...@@ -44,10 +44,14 @@ Rectangle {
property string mapKey: "lastMapType" property string mapKey: "lastMapType"
property string mapType: QGroundControl.mapEngineManager.loadSetting(mapKey, "Google Street Map") property string mapType: QGroundControl.mapEngineManager.loadSetting(mapKey, "Google Street Map")
property int mapMargin: (ScreenTools.defaultFontPixelHeight * 0.2).toFixed(0) property int mapMargin: (ScreenTools.defaultFontPixelHeight * 0.2).toFixed(0)
property real infoWidth: Math.max(Math.max(nameLabel.width, descLabel.width), (ScreenTools.defaultFontPixelWidth * 40)) property real infoWidth: Math.max(infoCol.width, (ScreenTools.defaultFontPixelWidth * 40))
property bool isDefaultSet: _offlineMapRoot._currentSelection && _offlineMapRoot._currentSelection.defaultSet property bool isDefaultSet: _offlineMapRoot._currentSelection && _offlineMapRoot._currentSelection.defaultSet
property bool isMapInteractive: true
property var savedCenter: undefined
property real savedZoom: 3
property string savedMapType: ""
property real oldlon0: 0 property real oldlon0: 0
property real oldlon1: 0 property real oldlon1: 0
...@@ -64,6 +68,7 @@ Rectangle { ...@@ -64,6 +68,7 @@ Rectangle {
Component.onCompleted: { Component.onCompleted: {
QGroundControl.mapEngineManager.loadTileSets() QGroundControl.mapEngineManager.loadTileSets()
updateMap() updateMap()
savedCenter = _map.toCoordinate(Qt.point(_map.width / 2, _map.height / 2))
} }
Connections { Connections {
...@@ -79,19 +84,21 @@ Rectangle { ...@@ -79,19 +84,21 @@ Rectangle {
ExclusiveGroup { id: setGroup } ExclusiveGroup { id: setGroup }
function handleChanges() { function handleChanges() {
var xl = mapMargin if(isMapInteractive) {
var yl = mapMargin var xl = mapMargin
var xr = _map.width.toFixed(0) - mapMargin var yl = mapMargin
var yr = _map.height.toFixed(0) - mapMargin var xr = _map.width.toFixed(0) - mapMargin
var c0 = _map.toCoordinate(Qt.point(xl, yl)) var yr = _map.height.toFixed(0) - mapMargin
var c1 = _map.toCoordinate(Qt.point(xr, yr)) var c0 = _map.toCoordinate(Qt.point(xl, yl))
if(oldlon0 !== c0.longitude || oldlat0 !== c0.latitude || oldlon1 !== c1.longitude || oldlat1 !== c1.latitude || oldz0 !== _slider0.value || oldz1 !== _slider1.value) { var c1 = _map.toCoordinate(Qt.point(xr, yr))
QGroundControl.mapEngineManager.updateForCurrentView(c0.longitude, c0.latitude, c1.longitude, c1.latitude, _slider0.value, _slider1.value, mapType) if(oldlon0 !== c0.longitude || oldlat0 !== c0.latitude || oldlon1 !== c1.longitude || oldlat1 !== c1.latitude || oldz0 !== _slider0.value || oldz1 !== _slider1.value) {
QGroundControl.mapEngineManager.updateForCurrentView(c0.longitude, c0.latitude, c1.longitude, c1.latitude, _slider0.value, _slider1.value, mapType)
}
} }
} }
function checkSanity() { function checkSanity() {
if(QGroundControl.mapEngineManager.crazySize) { if(isMapInteractive && QGroundControl.mapEngineManager.crazySize) {
_slider1.value = _slider1.value - 1 _slider1.value = _slider1.value - 1
handleChanges() handleChanges()
} }
...@@ -108,6 +115,7 @@ Rectangle { ...@@ -108,6 +115,7 @@ Rectangle {
} }
function showOptions() { function showOptions() {
_map.visible = false
_tileSetList.visible = false _tileSetList.visible = false
_infoView.visible = false _infoView.visible = false
_mapView.visible = false _mapView.visible = false
...@@ -115,6 +123,7 @@ Rectangle { ...@@ -115,6 +123,7 @@ Rectangle {
} }
function showMap() { function showMap() {
_map.visible = true
_tileSetList.visible = false _tileSetList.visible = false
_infoView.visible = false _infoView.visible = false
_mapView.visible = true _mapView.visible = true
...@@ -122,6 +131,7 @@ Rectangle { ...@@ -122,6 +131,7 @@ Rectangle {
} }
function showList() { function showList() {
_map.visible = false
_tileSetList.visible = true _tileSetList.visible = true
_infoView.visible = false _infoView.visible = false
_mapView.visible = false _mapView.visible = false
...@@ -130,21 +140,80 @@ Rectangle { ...@@ -130,21 +140,80 @@ Rectangle {
function showInfo() { function showInfo() {
if(_currentSelection && !_offlineMapRoot._currentSelection.deleting) { if(_currentSelection && !_offlineMapRoot._currentSelection.deleting) {
_tileSetList.visible = false enterInfoView()
_mapView.visible = false
_infoView.visible = true
_optionsView.visible = false
} else } else
showList() showList()
} }
function toRadian(deg) {
return deg * Math.PI / 180
}
function toDegree(rad) {
return rad * 180 / Math.PI
}
function midPoint(lat1, lat2, lon1, lon2) {
var dLon = toRadian(lon2 - lon1);
lat1 = toRadian(lat1);
lat2 = toRadian(lat2);
lon1 = toRadian(lon1);
var Bx = Math.cos(lat2) * Math.cos(dLon);
var By = Math.cos(lat2) * Math.sin(dLon);
var lat3 = Math.atan2(Math.sin(lat1) + Math.sin(lat2), Math.sqrt((Math.cos(lat1) + Bx) * (Math.cos(lat1) + Bx) + By * By));
var lon3 = lon1 + Math.atan2(By, Math.cos(lat1) + Bx);
return QtPositioning.coordinate(toDegree(lat3), toDegree(lon3))
}
function enterInfoView() {
if(!isDefaultSet) {
isMapInteractive = false
savedCenter = _map.toCoordinate(Qt.point(_map.width / 2, _map.height / 2))
savedZoom = _map.zoomLevel
savedMapType = mapType
_map.visible = true
mapType = _offlineMapRoot._currentSelection.mapTypeStr
_map.center = midPoint(_offlineMapRoot._currentSelection.topleftLat, _offlineMapRoot._currentSelection.bottomRightLat, _offlineMapRoot._currentSelection.topleftLon, _offlineMapRoot._currentSelection.bottomRightLon)
_map.zoomLevel = _offlineMapRoot._currentSelection.minZoom
var p = _map.fromCoordinate(QtPositioning.coordinate(_offlineMapRoot._currentSelection.topleftLat, _offlineMapRoot._currentSelection.topleftLon), false)
console.log(_map.zoomLevel + " " + p)
while ((isNaN(p.x) || isNaN(p.y) || (p.x > 25 && p.y > 25)) && _map.zoomLevel < _offlineMapRoot._currentSelection.maxZoom) {
_map.zoomLevel = _map.zoomLevel + 1
p = _map.fromCoordinate(QtPositioning.coordinate(_offlineMapRoot._currentSelection.topleftLat, _offlineMapRoot._currentSelection.topleftLon), false)
console.log(_map.zoomLevel + " " + p)
}
}
_tileSetList.visible = false
_mapView.visible = false
_infoView.visible = true
_optionsView.visible = false
if(isDefaultSet) {
_infoView.color = qgcPal.windowShade
_infoNameRect.color = qgcPal.window
_infoRect.color = qgcPal.window
} else {
_infoView.color = Qt.rgba(0,0,0,0)
_infoNameRect.color = Qt.rgba(_infoNameRect.color.r, _infoNameRect.color.g, _infoNameRect.color.b, 0.85)
_infoRect.color = Qt.rgba(_infoRect.color.r, _infoRect.color.g, _infoRect.color.b, 0.85)
}
}
function leaveInfoView() {
_map.center = savedCenter
_map.zoomLevel = savedZoom
mapType = savedMapType
isMapInteractive = true
}
ExclusiveGroup { ExclusiveGroup {
id: _dropButtonsExclusiveGroup id: _dropButtonsExclusiveGroup
} }
onMapTypeChanged: { onMapTypeChanged: {
updateMap() updateMap()
QGroundControl.mapEngineManager.saveSetting(mapKey, mapType) if(isMapInteractive) {
QGroundControl.mapEngineManager.saveSetting(mapKey, mapType)
}
} }
MessageDialog { MessageDialog {
...@@ -184,6 +253,53 @@ Rectangle { ...@@ -184,6 +253,53 @@ Rectangle {
} }
} }
Map {
id: _map
anchors.top: _offlineMapTopRect.bottom
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.margins: mapMargin
width: parent.width - ScreenTools.defaultFontPixelWidth
center: QGroundControl.defaultMapPosition
visible: false
gesture.flickDeceleration: 3000
gesture.activeGestures: MapGestureArea.ZoomGesture | MapGestureArea.PanGesture | MapGestureArea.FlickGesture
plugin: Plugin { name: "QGroundControl" }
Rectangle {
color: Qt.rgba(0,0,0,0)
border.color: "black"
border.width: 1
anchors.fill: parent
}
Component.onCompleted: {
center = QGroundControl.flightMapPosition
zoomLevel = QGroundControl.flightMapZoom
}
onCenterChanged: {
handleChanges()
checkSanity()
}
onZoomLevelChanged: {
handleChanges()
checkSanity()
}
onWidthChanged: {
handleChanges()
checkSanity()
}
onHeightChanged: {
handleChanges()
checkSanity()
}
// Used to make pinch zoom work
MouseArea {
anchors.fill: parent
}
}
QGCFlickable { QGCFlickable {
id: _tileSetList id: _tileSetList
clip: true clip: true
...@@ -240,57 +356,18 @@ Rectangle { ...@@ -240,57 +356,18 @@ Rectangle {
} }
//-- Offline Map Definition //-- Offline Map Definition
Rectangle { Item {
id: _mapView id: _mapView
color: qgcPal.window
width: parent.width width: parent.width
anchors.top: _offlineMapTopRect.bottom anchors.top: _offlineMapTopRect.bottom
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.margins: ScreenTools.defaultFontPixelWidth anchors.margins: ScreenTools.defaultFontPixelWidth
visible: false visible: false
Rectangle { //-- Zoom Preview Maps
Item {
width: parent.width width: parent.width
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: bottomRect.top
color: (qgcPal.globalTheme === QGCPalette.Light) ? "black" : "#98aca4"
Map {
id: _map
anchors.fill: parent
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.15
center: QGroundControl.defaultMapPosition
gesture.flickDeceleration: 3000
gesture.activeGestures: MapGestureArea.ZoomGesture | MapGestureArea.PanGesture | MapGestureArea.FlickGesture
plugin: Plugin { name: "QGroundControl" }
Component.onCompleted: {
center = QGroundControl.flightMapPosition
zoomLevel = QGroundControl.flightMapZoom
}
onCenterChanged: {
handleChanges()
checkSanity()
}
onZoomLevelChanged: {
handleChanges()
checkSanity()
}
onWidthChanged: {
handleChanges()
checkSanity()
}
onHeightChanged: {
handleChanges()
checkSanity()
}
// Used to make pinch zoom work
MouseArea {
anchors.fill: parent
}
}
Rectangle { Rectangle {
width: ScreenTools.defaultFontPixelHeight * 16 width: ScreenTools.defaultFontPixelHeight * 16
height: ScreenTools.defaultFontPixelHeight * 9 height: ScreenTools.defaultFontPixelHeight * 9
...@@ -330,11 +407,17 @@ Rectangle { ...@@ -330,11 +407,17 @@ Rectangle {
} }
} }
} }
//-- Tile set settings
Rectangle { Rectangle {
id: bottomRect id: bottomRect
width: parent.width width: _controlRow.width + (ScreenTools.defaultFontPixelWidth * 2)
height: _controlRow.height + (ScreenTools.defaultFontPixelHeight * 2) height: _controlRow.height + (ScreenTools.defaultFontPixelHeight * 2)
color: qgcPal.window color: qgcPal.window
radius: ScreenTools.defaultFontPixelWidth * 0.5
anchors.horizontalCenter: parent.horizontalCenter
Component.onCompleted: {
color = Qt.rgba(color.r, color.g, color.b, 0.85)
}
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
Row { Row {
id: _controlRow id: _controlRow
...@@ -621,6 +704,7 @@ Rectangle { ...@@ -621,6 +704,7 @@ Rectangle {
} }
} }
} }
//-- Show info on current selected map tile set
Rectangle { Rectangle {
id: _infoView id: _infoView
color: qgcPal.windowShade color: qgcPal.windowShade
...@@ -644,25 +728,31 @@ Rectangle { ...@@ -644,25 +728,31 @@ Rectangle {
width: 1 width: 1
} }
Rectangle { Rectangle {
id: _infoNameRect
width: infoWidth width: infoWidth
height: nameLabel.height + (ScreenTools.defaultFontPixelHeight * 2) height: infoCol.height + (ScreenTools.defaultFontPixelHeight * 2)
color: qgcPal.window color: qgcPal.window
radius: ScreenTools.defaultFontPixelHeight * 0.5 radius: ScreenTools.defaultFontPixelHeight * 0.5
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
QGCLabel { Column {
id: nameLabel id: infoCol
text: _offlineMapRoot._currentSelection ? _offlineMapRoot._currentSelection.name : "" spacing: ScreenTools.defaultFontPixelHeight
font.pixelSize: ScreenTools.isAndroid ? ScreenTools.mediumFontPixelSize : ScreenTools.largeFontPixelSize
anchors.centerIn: parent anchors.centerIn: parent
QGCLabel {
id: nameLabel
text: _offlineMapRoot._currentSelection ? _offlineMapRoot._currentSelection.name : ""
font.pixelSize: ScreenTools.isAndroid ? ScreenTools.mediumFontPixelSize : ScreenTools.largeFontPixelSize
anchors.horizontalCenter: parent.horizontalCenter
}
QGCLabel {
id: descLabel
text: _offlineMapRoot._currentSelection ? _offlineMapRoot._currentSelection.description : ""
anchors.horizontalCenter: parent.horizontalCenter
}
} }
} }
QGCLabel {
id: descLabel
text: _offlineMapRoot._currentSelection ? _offlineMapRoot._currentSelection.description : ""
anchors.horizontalCenter: parent.horizontalCenter
}
Rectangle { Rectangle {
id: infoRect id: _infoRect
width: infoWidth width: infoWidth
height: infoGrid.height + (ScreenTools.defaultFontPixelHeight * 4) height: infoGrid.height + (ScreenTools.defaultFontPixelHeight * 4)
color: qgcPal.window color: qgcPal.window
...@@ -765,6 +855,7 @@ Rectangle { ...@@ -765,6 +855,7 @@ Rectangle {
return "" return ""
} }
onYes: { onYes: {
leaveInfoView()
if(_offlineMapRoot._currentSelection) if(_offlineMapRoot._currentSelection)
QGroundControl.mapEngineManager.deleteTileSet(_offlineMapRoot._currentSelection) QGroundControl.mapEngineManager.deleteTileSet(_offlineMapRoot._currentSelection)
deleteDialog.visible = false deleteDialog.visible = false
...@@ -798,7 +889,10 @@ Rectangle { ...@@ -798,7 +889,10 @@ Rectangle {
QGCButton { QGCButton {
text: qsTr("Back") text: qsTr("Back")
width: ScreenTools.defaultFontPixelWidth * 18 width: ScreenTools.defaultFontPixelWidth * 18
onClicked: showList() onClicked: {
leaveInfoView()
showList()
}
} }
} }
} }
......
src/ui/MainWindowLeftPanel.qml
View file @ 781c7e37
...@@ -282,6 +282,7 @@ Item { ...@@ -282,6 +282,7 @@ Item {
//-- Main Setting Display Area //-- Main Setting Display Area
Rectangle { Rectangle {
id: settingDisplayArea
anchors.left: __verticalSeparator.right anchors.left: __verticalSeparator.right
width: mainWindow.width - __leftMenu.width - __verticalSeparator.width width: mainWindow.width - __leftMenu.width - __verticalSeparator.width
height: parent.height - toolBar.height - __topSeparator.height height: parent.height - toolBar.height - __topSeparator.height
......
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