Merge branch 'master' into fix/bindingLoopListDelegate

.github/workflows/android.yml

@@ -246,7 +246,7 @@ jobs:
               -S ../ \
               -B ./
       
-      - name: build APK
+      - name: Build APK
         env:
           ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
           ANDROID_NDK_HOST: darwin-x86_64
@@ -271,7 +271,7 @@ jobs:
           path: ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.apk
           name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} APK [v7 + v8a]
 
-      - name: build AAB
+      - name: Build AAB
         if: ${{ github.ref_name == 'master' || github.ref_type == 'tag' }}
         env:
           ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
@@ -298,4 +298,3 @@ jobs:
         with:
           path: ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab
           name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} AAB
-

.zenodo.json

@@ -2,7 +2,7 @@
     "description": "<p>Mergin Maps mobile app is a QGIS powered app for Android and iOS devices.</p>", 
     "license": "GPLv3", 
     "title": "Mergin Maps mobile app", 
-    "version": "2024.5.0",
+    "version": "2024.5.1",
     "upload_type": "software", 
     "publication_date": "2022-02-24", 
     "creators": [
@@ -39,7 +39,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/MerginMaps/mobile/tree/2024.5.0", 
+            "identifier": "https://github.com/MerginMaps/mobile/tree/2024.5.1", 
             "relation": "isSupplementTo"
         }, 
         {

CITATION.cff

@@ -1,4 +1,4 @@
-cff-version: 2024.5.0
+cff-version: 2024.5.1
 message: "If you use this software, please cite it as below."
 authors:
 - family-names: "Martin"

CMakeLists.txt

@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.22)
 # TODO automatically change with the scripts/update version script
 set(MM_VERSION_MAJOR "2024")
 set(MM_VERSION_MINOR "5")
-set(MM_VERSION_PATCH "0")
+set(MM_VERSION_PATCH "1")
 set(QT_VERSION_DEFAULT "6.6.3")
 
 # Note: we cannot set this for non-android build, since CMake will start looking for

app/CMakeLists.txt

@@ -27,6 +27,7 @@ set(MM_SRCS
     maptools/abstractmaptool.cpp
     maptools/recordingmaptool.cpp
     maptools/splittingmaptool.cpp
+    maptools/measurementmaptool.cpp
     ios/iosimagepicker.cpp
     ios/iosutils.cpp
     position/providers/abstractpositionprovider.cpp
@@ -109,6 +110,7 @@ set(MM_HDRS
     maptools/abstractmaptool.h
     maptools/recordingmaptool.h
     maptools/splittingmaptool.h
+    maptools/measurementmaptool.h
     ios/iosimagepicker.h
     ios/iosutils.h
     position/providers/abstractpositionprovider.h