diff --git a/src/.vitepress/sidebar/en.js b/src/.vitepress/sidebar/en.js index bbbdf696..0371b4c6 100644 --- a/src/.vitepress/sidebar/en.js +++ b/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/' }, diff --git a/src/field/layers/index.md b/src/field/layers/index.md index 148855b7..aae0cdd0 100644 --- a/src/field/layers/index.md +++ b/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 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 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 . + + 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. diff --git a/src/field/layers/mobile-app-layer-order.jpg b/src/field/layers/mobile-app-layer-order.jpg new file mode 100644 index 00000000..b0666ae2 Binary files /dev/null and b/src/field/layers/mobile-app-layer-order.jpg differ diff --git a/src/field/layers/mobile-app-layer-order.xcf b/src/field/layers/mobile-app-layer-order.xcf new file mode 100644 index 00000000..8f5b5fa3 Binary files /dev/null and b/src/field/layers/mobile-app-layer-order.xcf differ diff --git a/src/field/layers/qgis-layer-order.jpg b/src/field/layers/qgis-layer-order.jpg new file mode 100644 index 00000000..96b708b6 Binary files /dev/null and b/src/field/layers/qgis-layer-order.jpg differ diff --git a/src/field/layers/qgis-layer-order.xcf b/src/field/layers/qgis-layer-order.xcf new file mode 100644 index 00000000..01e6c69d Binary files /dev/null and b/src/field/layers/qgis-layer-order.xcf differ diff --git a/src/field/layers/qgis-mergin-maps-project-properties-2.xcf b/src/field/layers/qgis-mergin-maps-project-properties-2.xcf new file mode 100644 index 00000000..32adc1bd Binary files /dev/null and b/src/field/layers/qgis-mergin-maps-project-properties-2.xcf differ diff --git a/src/field/photo-sketching/index.md b/src/field/photo-sketching/index.md new file mode 100644 index 00000000..befe3116 --- /dev/null +++ b/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 + + + +Photo sketching is disabled by default. To use it, it needs to be enabled in QGIS when [preparing your project](../../gis/features/#photo-sketching). + +1. Open your project in QGIS +2. Navigate to **Project** > **Properties** + ![QGIS Project Properties](../../gis/qgis-project-properties.jpg "QGIS Project Properties") + +3. In the 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 , 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 . + diff --git a/src/field/photo-sketching/mobile-photo-sketching.jpg b/src/field/photo-sketching/mobile-photo-sketching.jpg new file mode 100644 index 00000000..d0f17e4c Binary files /dev/null and b/src/field/photo-sketching/mobile-photo-sketching.jpg differ diff --git a/src/field/photo-sketching/mobile-photo-sketching.xcf b/src/field/photo-sketching/mobile-photo-sketching.xcf new file mode 100644 index 00000000..220d9121 Binary files /dev/null and b/src/field/photo-sketching/mobile-photo-sketching.xcf differ diff --git a/src/gis/features/index.md b/src/gis/features/index.md index 6400701b..3b9220e0 100644 --- a/src/gis/features/index.md +++ b/src/gis/features/index.md @@ -105,6 +105,18 @@ Map sketching for the can be enabled in the ** can be enabled in the **** 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 : *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 (e.g. cartography maps and aerial imagery) diff --git a/src/gis/features/project-layer-order.jpg b/src/gis/features/project-layer-order.jpg new file mode 100644 index 00000000..469b3a40 Binary files /dev/null and b/src/gis/features/project-layer-order.jpg differ diff --git a/src/gis/features/project-layer-order.xcf b/src/gis/features/project-layer-order.xcf new file mode 100644 index 00000000..7642aef9 Binary files /dev/null and b/src/gis/features/project-layer-order.xcf differ diff --git a/src/gis/features/project-photo-sketching.jpg b/src/gis/features/project-photo-sketching.jpg new file mode 100644 index 00000000..c7dfd754 Binary files /dev/null and b/src/gis/features/project-photo-sketching.jpg differ diff --git a/src/gis/features/project-photo-sketching.xcf b/src/gis/features/project-photo-sketching.xcf new file mode 100644 index 00000000..9948dc9a Binary files /dev/null and b/src/gis/features/project-photo-sketching.xcf differ diff --git a/src/index.md b/src/index.md index 92e1848c..0c5437eb 100644 --- a/src/index.md +++ b/src/index.md @@ -92,6 +92,7 @@ The ecosystem consist of various components: - [Measurement Tools](./field/measure/) - [Layers in ](./field/layers/) - [Map Sketching in ](./field/map-sketching/) +- [Photo Sketching in ](./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/) diff --git a/src/layer/photos/index.md b/src/layer/photos/index.md index bcf8edca..0f93009d 100644 --- a/src/layer/photos/index.md +++ b/src/layer/photos/index.md @@ -11,7 +11,9 @@ In the , 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. ::: diff --git a/src/manage/dashboard-maps/index.md b/src/manage/dashboard-maps/index.md index 40c94a51..39010118 100644 --- a/src/manage/dashboard-maps/index.md +++ b/src/manage/dashboard-maps/index.md @@ -15,7 +15,7 @@ Webmaps are **not** available for . 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 use [ vector tile service](../../gis/settingup_background_map/#mergin-maps-vector-tile-service) as a background map. +All maps on the use [ 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. diff --git a/src/manage/plugin/index.md b/src/manage/plugin/index.md index 1b3fcfe9..54156a47 100644 --- a/src/manage/plugin/index.md +++ b/src/manage/plugin/index.md @@ -88,12 +88,18 @@ You can package this downloaded project using as described in Some settings of your [ project](../project/) can be done through , 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 +- Enable [**snapping**](../../field/mobile-features/#snapping-features) in the - [**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 +- Enable [**Photo sketching**](../../field/photo-sketching/) to annotate pictures in the ![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 , tools are added to the . diff --git a/src/manage/plugin/qgis-mergin-maps-project-properties-2.jpg b/src/manage/plugin/qgis-mergin-maps-project-properties-2.jpg new file mode 100644 index 00000000..601ee9aa Binary files /dev/null and b/src/manage/plugin/qgis-mergin-maps-project-properties-2.jpg differ