Iss 659 photo sketching, Iss 660 layer order

src/.vitepress/sidebar/en.js

@@ -92,6 +92,7 @@ export default {
         { text: 'Measurement Tools', link: '/field/measure/' },
         { text: 'Layers in Mergin Maps Mobile App', link: '/field/layers/' },
         { text: 'Map Sketching', link: '/field/map-sketching/' },
+        { text: 'Photo Sketching', link: '/field/photo-sketching/' },
         { text: 'How to Add, Edit, Delete Features', link: '/field/mobile-features/' },
         { text: 'How to Reuse Last Entered Values', link: '/field/reuse-last-values/' },
         { text: 'How to Stake Out Points', link: '/field/stake-out/' },

src/field/layers/index.md

@@ -15,6 +15,27 @@ The visibility of layers on the map can be easily turned on and off by toggling
 
 ![Mergin Maps mobile app Layers visibility](./mobile-app-layers-off.jpg "Mergin Maps mobile app Layers visibility")
 
+## Layer order
+By default, layers are listed in alphabetical order. If you want to follow the layer order of the QGIS project, you can do so in the [Project properties](../../gis/features/#layer-order):
+
+1. Open your <MainPlatformName /> project in QGIS
+   ![Layer order setup in QGIS Mergin Maps project](./qgis-layer-order.jpg "Layer order setup in QGIS Mergin Maps project")
+
+2. Navigate to **Project** > **Properties** 
+   ![QGIS Project Properties](../../gis/qgis-project-properties.jpg "QGIS Project Properties")
+
+3. In the <MainPlatformName /> tab, choose the sort method: *Alphabetical* or *QGIS layer order*.
+   ![Layer order setup in QGIS Mergin Maps project](../../gis/features/project-layer-order.jpg "Layer order setup in QGIS Mergin Maps project")
+
+4. **Apply** the changes, save and synchronise your project.
+
+5. Open the project in the <MobileAppNameShort />.
+
+   Depending on the setup, layers will be either listed alphabetically or based on the QGIS layer order:
+
+   ![Layer order setup in Mergin Maps mobile app](./mobile-app-layer-order.jpg "Layer order setup in Mergin Maps mobile app")
+
+
 ## Layers legend and features
 Select a layer in the **Layers** panel to browse features and [search for attributes values](#browsing-features). Tap on the record to zoom to the feature on the map and display its form.
 

src/field/photo-sketching/index.md

@@ -0,0 +1,42 @@
+# Photo Sketching
+
+[[toc]]
+
+Photo sketches can be used to annotate photos or pictures added to a feature, in addition to the regular field collection of [features](../mobile-features/) or [photos](../../layer/photos/).
+
+:::warning Preview feature
+Photo sketching is a feature in preview. While it works for most devices and setups, you may encounter some issues.
+:::
+
+## Enable photo sketching
+
+<SinceBadge type="Plugin" version="2025.3.4" />
+
+Photo sketching is disabled by default. To use it, it needs to be enabled in QGIS when [preparing your <MainPlatformName /> project](../../gis/features/#photo-sketching).
+
+1. Open your <MainPlatformName /> project in QGIS
+2. Navigate to **Project** > **Properties** 
+   ![QGIS Project Properties](../../gis/qgis-project-properties.jpg "QGIS Project Properties")
+
+3. In the <MainPlatformName /> tab, check the **Enable photo sketching** option and **Apply** the changes.
+   ![Enable photo sketching in QGIS Mergin Maps project](../../gis/features/project-photo-sketching.jpg "Enable photo sketching in QGIS Mergin Maps project")
+
+5. Save and synchronise your project!
+
+::: tip 
+If you do not see this option in the **Project properties**, check for [plugin upgrades](../../setup/install-mergin-maps-plugin-for-qgis/#plugin-upgrade).
+:::
+
+## Photo sketching in the mobile app
+To use photo sketching in the <MobileAppNameShort />, make sure it is [enabled in the project](#enable-photo-sketching).
+
+1. Open a form with a [photo widget](../../layer/photos/) for editing and tap the **Photo sketching** button.
+   - Draw your sketches on the photo by freehand or using a stylus. You choose from 7 annotation colours.
+   - Use the **Undo** button to revert the last changes.
+
+   ![Photo sketching button in Mergin Maps mobile app](mobile-photo-sketching.jpg "Photo sketching button in Mergin Maps mobile app")
+
+2. Use the **Done** button to finish sketching. The picture with sketches will be displayed in the form.
+
+3. Save and synchronise the changes. A copy of the original picture with the sketches will be saved to <MainPlatformName />. 
+

src/gis/features/index.md

@@ -105,6 +105,18 @@ Map sketching for the <MobileAppNameShort /> can be enabled in the **<MainPlatfo
 
 You can read more about this functionality in [Map Sketching](../../field/map-sketching/).
 
+### Photo sketching
+Photo sketching for the <MobileAppNameShort /> can be enabled in the **<MainPlatformName />** tab in **Project properties**.
+
+![Enable photo sketching in QGIS Mergin Maps project](./project-photo-sketching.jpg "Enable photo sketching in QGIS Mergin Maps project")
+
+You can find out more about this functionality in [Photo Sketching](../../field/photo-sketching/).
+
+### Layer order
+There is an option to define the order in which layers are displayed in the <MobileAppNameShort />: *alphabetical* or *QGIS layer order*. Detailed steps can be found [here](../../field/layers/#layer-order).
+
+![Layer order in QGIS Mergin Maps project](./project-layer-order.jpg "Layer order in QGIS Mergin Maps project")
+
 ### Map themes
 [Map Themes](../setup_themes/) make possible to switch between different background maps in <MobileAppName /> (e.g. cartography maps and aerial imagery)
 

src/index.md

@@ -92,6 +92,7 @@ The ecosystem consist of various components:
 - [Measurement Tools](./field/measure/)
 - [Layers in <MobileAppName />](./field/layers/)
 - [Map Sketching in <MobileAppName />](./field/map-sketching/)
+- [Photo Sketching in <MobileAppName />](./field/photo-sketching/)
 - [How to Add, Edit, Delete Features](./field/mobile-features/)
 - [How to Reuse Last Entered Values](./field/reuse-last-values/)
 - [How to Stake Out Points](./field/stake-out/)

src/layer/photos/index.md

@@ -11,7 +11,9 @@ In the <MobileAppNameShort />, this field will provide two options:
 
 ![Mergin Maps mobile app photo widget](../form-widgets/mobile-form-attachment-photo.jpg "Mergin Maps mobile app photo widget")
 
-:::tip
+You can use [Photo sketching](../../field/photo-sketching/) to annotate the pictures attached to features.
+
+:::tip Multiple pictures of one feature
 Do you need to attach multiple pictures to one feature? [How to attach multiple photos to features](../attach-multiple-photos-to-features/) will guide you through the setup.
 :::
 

src/manage/dashboard-maps/index.md

@@ -15,7 +15,7 @@ Webmaps are **not** available for <CommunityPlatformNameLink />.
 
 On the webmaps, you will see your survey layers or raster layers that are [packaged](../project/#packaging-qgis-project) with the project. Other layers, such as online [background maps](../../gis/settingup_background_map/#background-maps) or PostgreSQL layers are not displayed. The extent of maps is defined by the [extent set in the QGIS project](../../gis/features/#project-extent).
 
-All maps on the <DashboardShortLink /> use [<MainPlatformName /> vector tile service](../../gis/settingup_background_map/#mergin-maps-vector-tile-service) as a background map.
+All maps on the <DashboardShortLink /> use [<MainPlatformName /> vector tile service](../../gis/settingup_background_map/#online-services-1) as a background map.
 
 The content of the maps and of the **Layers** panel is refreshed after every synchronisation of the project. This means you should always see your current spatial data here.
 

src/manage/plugin/index.md

@@ -88,12 +88,18 @@ You can package this downloaded project using <QGISPluginName /> as described in
 Some settings of your [<MainPlatformName /> project](../project/) can be done through <QGISHelp ver="latest" link="user_manual/introduction/qgis_configuration.html#project-properties" text="Project Properties" />, such as:
 - [**Selective sync**](../selective_sync/) to avoid synchronisation of unnecessary or large files
 - [**Photo quality**](../../gis/features/#photo-quality) of pictures added to the project
-- enable [**snapping**](../../field/mobile-features/#snapping-features) in the <MobileAppNameShort />
+- Enable [**snapping**](../../field/mobile-features/#snapping-features) in the <MobileAppNameShort />
 - [**Photo name format**](../../gis/photo-names/) for photo attachments fields
-- enable [**position tracking**](../../field/tracking/) and choose its precision level
+- Enable [**position tracking**](../../field/tracking/) and choose its precision level
+- Enable [**Map sketching**](../../field/map-sketching/)
+- Set [**Layer order**](../../field/layers/#layer-order) for the <MobileAppNameShort />
+- Enable [**Photo sketching**](../../field/photo-sketching/) to annotate pictures in the <MobileAppNameShort />
 
 ![Mergin Maps Project Properties in QGIS](./qgis-mergin-maps-project-properties.jpg "Mergin Maps Project Properties in QGIS")
 
+![Mergin Maps Project Properties in QGIS](./qgis-mergin-maps-project-properties-2.jpg "Mergin Maps Project Properties in QGIS")
+
+
 ## Mergin Maps Tools in QGIS Processing Toolbox
 Processing is a core plugin of QGIS. By installing <QGISPluginName />, <MainPlatformName /> tools are added to the  <QGISHelp ver="latest" link="user_manual//processing/intro.html" text="Processing Toolbox" />.