diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml index ef5fa6e60dc9cc49205b03ac169d685c7b3f2d94..aaf840381fcb9666b4885d7947edf00f234a251f 100644 --- a/src/FlightDisplay/FlightDisplayViewMap.qml +++ b/src/FlightDisplay/FlightDisplayViewMap.qml @@ -303,7 +303,7 @@ FlightMap { flightWidgets.guidedModeBar.state = "Shown" } else { if (flightWidgets.gotoEnabled) { - _gotoHereCoordinate = flightMap.toCoordinate(Qt.point(mouse.x, mouse.y)) + _gotoHereCoordinate = flightMap.toCoordinate(Qt.point(mouse.x, mouse.y), false /* clipToViewPort */) flightWidgets.guidedModeBar.confirmAction(flightWidgets.guidedModeBar.confirmGoTo) } } diff --git a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml index 720ad594764e2d1619765637c08619d7705ef392..094672fd05a26aa0ead0d25adc91d563e418172e 100644 --- a/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml +++ b/src/FlightMap/MapItems/MissionItemIndicatorDrag.qml @@ -44,7 +44,7 @@ Rectangle { function liveDrag() { if (!itemDragger._preventCoordinateBindingLoop && itemDrag.drag.active) { var point = Qt.point(itemDragger.x + _touchMarginHorizontal + itemIndicator.anchorPoint.x, itemDragger.y + _touchMarginVertical + itemIndicator.anchorPoint.y) - var coordinate = map.toCoordinate(point) + var coordinate = map.toCoordinate(point, false /* clipToViewPort */) itemDragger._preventCoordinateBindingLoop = true coordinate.altitude = itemCoordinate.altitude itemCoordinate = coordinate diff --git a/src/FlightMap/MapItems/PolygonEditor.qml b/src/FlightMap/MapItems/PolygonEditor.qml index 107d1b88cf2a4e69614d115fe43e1809a0772af4..6f3631c484a166024cb5fc59b023da21358ea4de 100644 --- a/src/FlightMap/MapItems/PolygonEditor.qml +++ b/src/FlightMap/MapItems/PolygonEditor.qml @@ -231,7 +231,7 @@ Item { } } - var clickCoordinate = map.toCoordinate(Qt.point(mouse.x, mouse.y)) + var clickCoordinate = map.toCoordinate(Qt.point(mouse.x, mouse.y), false /* clipToViewPort */) var polygonPath = _newPolygon.path if (polygonPath.length == 0) { // Add first coordinate @@ -275,7 +275,7 @@ Item { return } if (_newPolygon.path.length) { - var dragCoordinate = map.toCoordinate(Qt.point(mouse.x, mouse.y)) + var dragCoordinate = map.toCoordinate(Qt.point(mouse.x, mouse.y), false /* clipToViewPort */) var polygonPath = _newPolygon.path if (justClicked){ // Add new drag coordinate diff --git a/src/FlightMap/MapScale.qml b/src/FlightMap/MapScale.qml index 9934a2b7355f984d826f13039d03c234781f426e..515d83dc6f8143cc01e045dae578d78b2d7b73da 100644 --- a/src/FlightMap/MapScale.qml +++ b/src/FlightMap/MapScale.qml @@ -111,8 +111,8 @@ Item { function calculateScale() { var scaleLinePixelLength = 100 - var leftCoord = mapControl.toCoordinate(Qt.point(0, scale.y)) - var rightCoord = mapControl.toCoordinate(Qt.point(scaleLinePixelLength, scale.y)) + var leftCoord = mapControl.toCoordinate(Qt.point(0, scale.y), false /* clipToViewPort */) + var rightCoord = mapControl.toCoordinate(Qt.point(scaleLinePixelLength, scale.y), false /* clipToViewPort */) var scaleLineMeters = Math.round(leftCoord.distanceTo(rightCoord)) if (QGroundControl.settingsManager.unitsSettings.distanceUnits.value == UnitsSettings.DistanceUnitsFeet) { diff --git a/src/MissionEditor/FWLandingPatternMapVisual.qml b/src/MissionEditor/FWLandingPatternMapVisual.qml index 2002e8c9a3f643a133f40c5f3f661af4e82ce35f..1434a9150466c53276527dfcca07be7d86e69f53 100644 --- a/src/MissionEditor/FWLandingPatternMapVisual.qml +++ b/src/MissionEditor/FWLandingPatternMapVisual.qml @@ -147,7 +147,7 @@ Item { anchors.fill: map onClicked: { - var coordinate = map.toCoordinate(Qt.point(mouse.x, mouse.y)) + var coordinate = map.toCoordinate(Qt.point(mouse.x, mouse.y), false /* clipToViewPort */) coordinate.latitude = coordinate.latitude.toFixed(_decimalPlaces) coordinate.longitude = coordinate.longitude.toFixed(_decimalPlaces) coordinate.altitude = coordinate.altitude.toFixed(_decimalPlaces) diff --git a/src/MissionEditor/MissionEditor.qml b/src/MissionEditor/MissionEditor.qml index c1bd59d1ddcb2a8a86332dd688e4392abf6c4ede..77e218b1a2b5e600878e76e985ae340c73a57b65 100644 --- a/src/MissionEditor/MissionEditor.qml +++ b/src/MissionEditor/MissionEditor.qml @@ -382,7 +382,7 @@ QGCView { return } - var coordinate = editorMap.toCoordinate(Qt.point(mouse.x, mouse.y)) + var coordinate = editorMap.toCoordinate(Qt.point(mouse.x, mouse.y), false /* clipToViewPort */) coordinate.latitude = coordinate.latitude.toFixed(_decimalPlaces) coordinate.longitude = coordinate.longitude.toFixed(_decimalPlaces) coordinate.altitude = coordinate.altitude.toFixed(_decimalPlaces) @@ -429,7 +429,7 @@ QGCView { function liveDrag() { if (!itemDragger.preventCoordinateBindingLoop && Drag.active) { var point = Qt.point(itemDragger.x + (itemDragger.width / 2), itemDragger.y + (itemDragger.height / 2)) - var coordinate = editorMap.toCoordinate(point) + var coordinate = editorMap.toCoordinate(point, false /* clipToViewPort */) coordinate.altitude = itemDragger.coordinateItem.coordinate.altitude itemDragger.preventCoordinateBindingLoop = true itemDragger.coordinateItem.coordinate = coordinate diff --git a/src/MissionEditor/SurveyMapVisual.qml b/src/MissionEditor/SurveyMapVisual.qml index 5f0dcdb07357401639db281d86328a524fa1aea6..593a9dafb2b594dfa9f9f021284642dc1204cde1 100644 --- a/src/MissionEditor/SurveyMapVisual.qml +++ b/src/MissionEditor/SurveyMapVisual.qml @@ -81,10 +81,10 @@ Item { var topRight = Qt.point(rect.x + rect.width, rect.y) var bottomLeft = Qt.point(rect.x, rect.y + rect.height) var bottomRight = Qt.point(rect.x + rect.width, rect.y + rect.height) - _missionItem.addPolygonCoordinate(map.toCoordinate(topLeft)) - _missionItem.addPolygonCoordinate(map.toCoordinate(topRight)) - _missionItem.addPolygonCoordinate(map.toCoordinate(bottomRight)) - _missionItem.addPolygonCoordinate(map.toCoordinate(bottomLeft)) + _missionItem.addPolygonCoordinate(map.toCoordinate(topLeft, false /* clipToViewPort */)) + _missionItem.addPolygonCoordinate(map.toCoordinate(topRight, false /* clipToViewPort */)) + _missionItem.addPolygonCoordinate(map.toCoordinate(bottomRight, false /* clipToViewPort */)) + _missionItem.addPolygonCoordinate(map.toCoordinate(bottomLeft, false /* clipToViewPort */)) } } diff --git a/src/QtLocationPlugin/QMLControl/OfflineMap.qml b/src/QtLocationPlugin/QMLControl/OfflineMap.qml index 8d1e591e2986fa4ca304e0f673f3ab1364f2bc2a..e0512dd9775e0855c7693754fca1426cb0e51a75 100644 --- a/src/QtLocationPlugin/QMLControl/OfflineMap.qml +++ b/src/QtLocationPlugin/QMLControl/OfflineMap.qml @@ -55,7 +55,7 @@ QGCView { Component.onCompleted: { QGroundControl.mapEngineManager.loadTileSets() updateMap() - savedCenter = _map.toCoordinate(Qt.point(_map.width / 2, _map.height / 2)) + savedCenter = _map.toCoordinate(Qt.point(_map.width / 2, _map.height / 2), false /* clipToViewPort */) } Connections { @@ -76,8 +76,8 @@ QGCView { var yl = 0 var xr = _map.width.toFixed(0) - 1 // Must be within boundaries of visible map var yr = _map.height.toFixed(0) - 1 // Must be within boundaries of visible map - var c0 = _map.toCoordinate(Qt.point(xl, yl)) - var c1 = _map.toCoordinate(Qt.point(xr, yr)) + var c0 = _map.toCoordinate(Qt.point(xl, yl), false /* clipToViewPort */) + var c1 = _map.toCoordinate(Qt.point(xr, yr), false /* clipToViewPort */) QGroundControl.mapEngineManager.updateForCurrentView(c0.longitude, c0.latitude, c1.longitude, c1.latitude, sliderMinZoom.value, sliderMaxZoom.value, mapType) } } @@ -142,7 +142,7 @@ QGCView { function enterInfoView() { _map.visible = true isMapInteractive = false - savedCenter = _map.toCoordinate(Qt.point(_map.width / 2, _map.height / 2)) + savedCenter = _map.toCoordinate(Qt.point(_map.width / 2, _map.height / 2), false /* clipToViewPort */) savedZoom = _map.zoomLevel savedMapType = mapType if(!offlineMapView._currentSelection.defaultSet) {