Merge 5d38fd3fe8 into beb352d47c

map-widget/qml/MapWidget.qml

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.5
+import QtQuick 
-import QtLocation 5.3
+import QtLocation 
-import QtPositioning 5.3
+import QtPositioning 
 import org.subsurfacedivelog.mobile 1.0
 
 Item {
@@ -15,7 +15,7 @@ Item {
 		id: mapHelper
 		map: map
 		editMode: false
-		onSelectedDivesChanged: rootItem.selectedDivesChanged(list)
+		onSelectedDivesChanged: (list) => { rootItem.selectedDivesChanged(list) }
 		onEditModeChanged: editMessage.isVisible = editMode === true ? 1 : 0
 		onCoordinatesChanged: {}
 		Component.onCompleted: {
@@ -29,7 +29,6 @@ Item {
 		id: map
 		anchors.fill: parent
 		zoomLevel: defaultZoomIn
-
 		property var mapType
 		readonly property var defaultCenter: QtPositioning.coordinate(0, 0)
 		readonly property real defaultZoomIn: 12.0
@@ -41,12 +40,46 @@ Item {
 		property real newZoomOut: 1.0
 		property var clickCoord: QtPositioning.coordinate(0, 0)
 		property bool isReady: false
-
 		Component.onCompleted: isReady = true
 		onZoomLevelChanged: {
 			if (isReady)
 				mapHelper.calculateSmallCircleRadius(map.center)
 		}
+        property geoCoordinate startCentroid
+        startCentroid: newCenter
+
+        PinchHandler {
+            id: pinch
+            target: null
+            onActiveChanged: if (active) {
+                map.startCentroid = map.toCoordinate(pinch.centroid.position, false)
+            }
+            onScaleChanged: (delta) => {
+                map.zoomLevel += Math.log2(delta)
+                map.alignCoordinateToPoint(map.startCentroid, pinch.centroid.position)
+            }
+            onRotationChanged: (delta) => {
+                map.bearing -= delta
+                map.alignCoordinateToPoint(map.startCentroid, pinch.centroid.position)
+            }
+            grabPermissions: PointerHandler.TakeOverForbidden
+        }
+        WheelHandler {
+            id: wheel
+            // workaround for QTBUG-87646 / QTBUG-112394 / QTBUG-112432:
+            // Magic Mouse pretends to be a trackpad but doesn't work with PinchHandler
+            // and we don't yet distinguish mice and trackpads on Wayland either
+            acceptedDevices: Qt.platform.pluginName === "cocoa" || Qt.platform.pluginName === "wayland"
+                             ? PointerDevice.Mouse | PointerDevice.TouchPad
+                             : PointerDevice.Mouse
+            rotationScale: 1/120
+            property: "zoomLevel"
+        }
+        DragHandler {
+            id: drag
+            target: null
+            onTranslationChanged: (delta) => map.pan(-delta.x, -delta.y)
+        }
 
 		MapItemView {
 			id: mapItemView
@@ -68,6 +101,8 @@ Item {
 					MouseArea {
 						drag.target: (mapHelper.editMode && model.isSelected) ? mapItem : undefined
             anchors.fill: parent
+            hoverEnabled: true
+
 						onClicked: {
 							if (!mapHelper.editMode && model.divesite)
 								mapHelper.selectedLocationChanged(model.divesite)
@@ -122,8 +157,8 @@ Item {
 
 		MouseArea {
 			anchors.fill: parent
-			onPressed: { map.stopZoomAnimations(); mouse.accepted = false }
+			onPressed: (mouse) => { map.stopZoomAnimations(); mouse.accepted = false }
-			onWheel: { map.stopZoomAnimations(); wheel.accepted = false }
+			onWheel: (wheel) => { map.stopZoomAnimations(); wheel.accepted = false }
 			onDoubleClicked: map.doubleClickHandler(map.toCoordinate(Qt.point(mouseX, mouseY)))
 		}
 

map-widget/qmlmapwidgethelper.cpp

@@ -4,15 +4,15 @@
 #include <QDebug>
 #include <QVector>
 
-#include "qmlmapwidgethelper.h"
 #include "core/divefilter.h"
 #include "core/divelist.h"
 #include "core/divelog.h"
 #include "core/divesite.h"
 #include "core/qthelper.h"
 #include "core/range.h"
-#include "qt-models/maplocationmodel.h"
+#include "qmlmapwidgethelper.h"
 #include "qt-models/divelocationmodel.h"
+#include "qt-models/maplocationmodel.h"
 #ifndef SUBSURFACE_MOBILE
 #include "desktop-widgets/mapwidget.h"
 #endif
@@ -251,8 +251,8 @@ QString MapWidgetHelper::pluginObject()
 {
 	QString lang = getUiLanguage().replace('_', '-');
 	QString cacheFolder = QString::fromStdString(system_default_directory() + "/googlemaps").replace("\\", "/");
-	return QStringLiteral("import QtQuick 2.0;"
+	return QStringLiteral("import QtQuick;"
-			      "import QtLocation 5.3;"
+			      "import QtLocation;"
 			      "Plugin {"
 			      "    id: mapPlugin;"
 			      "    name: 'googlemaps';"
@@ -263,5 +263,6 @@ QString MapWidgetHelper::pluginObject()
 			      "            console.warn('MapWidget.qml: cannot find a plugin named: ' + name);"
 			      "        }"
 			      "    }"
-			      "}").arg(lang, cacheFolder);
+			      "}")
+		.arg(lang, cacheFolder);
 }

scripts/build.sh

@@ -571,7 +571,11 @@ if [ "$QUICK" != "1" ] && [ "$BUILD_DESKTOP$BUILD_MOBILE" != "" ] && ( [[ $QT_VE
 	# build the googlemaps map plugin
 
 	cd "$SRC"
+	if [ "$BUILD_WITH_QT6" = "1" ] ; then
+		./${SRC_DIR}/scripts/get-dep-lib.sh -qt6 single . googlemaps
+	else
 		./${SRC_DIR}/scripts/get-dep-lib.sh single . googlemaps
+	fi
 	pushd googlemaps
 	mkdir -p build
 	mkdir -p J10build

scripts/get-dep-lib.sh

@@ -79,13 +79,17 @@ curl_download_library() {
 	fi
 }
 
-
+QT6="0"
 # deal with all the command line arguments
+if [ "$1" == "-qt6" ] ; then
+	shift
+	QT6="1"
+fi
 if [ $# -ne 2 ] && [ $# -ne 3 ] ; then
 	echo "wrong number of parameters, format:"
-	echo "get-dep-lib.sh <platform> <install dir>"
+	echo "get-dep-lib.sh [ -qt6 ] <platform> <install dir>"
-	echo "get-dep-lib.sh single <install dir> <lib>"
+	echo "get-dep-lib.sh [ -qt6 ] single <install dir> <lib>"
-	echo "get-dep-lib.sh singleAndroid <install dir> <lib>"
+	echo "get-dep-lib.sh [ -qt6 ] singleAndroid <install dir> <lib>"
 	echo "where"
 	echo "<platform> is one of scripts, ios or android"
 	echo "(the name of the directory where build.sh resides)"
@@ -169,7 +173,11 @@ for package in "${PACKAGES[@]}" ; do
 			git_checkout_library breeze-icons $CURRENT_BREEZE_ICONS https://github.com/kde/breeze-icons.git
 			;;
 		googlemaps)
+			if [ "$QT6" = "1" ] ; then
+				git_checkout_library googlemaps master https://github.com/vladest/googlemaps.git
+			else
 				git_checkout_library googlemaps master https://github.com/Subsurface/googlemaps.git
+			fi
 			;;
 		hidapi)
 			git_checkout_library hidapi master https://github.com/libusb/hidapi.git