Browse Source

Merge pull request #2625 from DonLakeFlyer/MapPosition

Initial map position incorrect
QGC4.4
Don Gagne 9 years ago
parent
commit
6a757481cc
  1. 2
      src/FlightDisplay/FlightDisplayViewMap.qml
  2. 2
      src/MissionEditor/MissionEditor.qml

2
src/FlightDisplay/FlightDisplayViewMap.qml

@ -45,7 +45,7 @@ FlightMap {
property var activeVehicleCoordinate: multiVehicleManager.activeVehicle ? multiVehicleManager.activeVehicle.coordinate : QtPositioning.coordinate() property var activeVehicleCoordinate: multiVehicleManager.activeVehicle ? multiVehicleManager.activeVehicle.coordinate : QtPositioning.coordinate()
onActiveVehicleCoordinateChanged: { onActiveVehicleCoordinateChanged: {
if (_followVehicle && activeVehicleCoordinate.isValid) { if (_followVehicle && _activeVehicleCoordinateValid && activeVehicleCoordinate.isValid) {
_initialMapPositionSet = true _initialMapPositionSet = true
flightMap.center = activeVehicleCoordinate flightMap.center = activeVehicleCoordinate
} }

2
src/MissionEditor/MissionEditor.qml

@ -85,7 +85,7 @@ QGCView {
} }
function updateMapToVehiclePosition() { function updateMapToVehiclePosition() {
if (_activeVehicle && _activeVehicle.coordinateValid && _firstVehiclePosition) { if (_activeVehicle && _activeVehicle.coordinateValid && _activeVehicle.coordinate.isValid && _firstVehiclePosition) {
_firstVehiclePosition = false _firstVehiclePosition = false
editorMap.center = _activeVehicle.coordinate editorMap.center = _activeVehicle.coordinate
} }

Loading…
Cancel
Save