diff --git a/src/.vitepress/components/AppDownload.vue b/src/.vitepress/components/AppDownload.vue index 5cd72724..93226283 100644 --- a/src/.vitepress/components/AppDownload.vue +++ b/src/.vitepress/components/AppDownload.vue @@ -6,7 +6,7 @@ Get it on Google Play - + Available on Windows @@ -53,17 +53,17 @@ img { img.app_store { padding: 11px; - height: 48px; + height: 60px; } img.google_play { padding: 11px; - height: 48px; + height: 60px; } img.windows { padding: 11px; - height: 48px; + height: 60px; } diff --git a/src/.vitepress/sidebar/en.js b/src/.vitepress/sidebar/en.js index 7642982d..a315083d 100644 --- a/src/.vitepress/sidebar/en.js +++ b/src/.vitepress/sidebar/en.js @@ -2,7 +2,7 @@ export default { '/': [ { text: 'Get Started', // required - collapsed: false, + collapsed: true, items: [ { text: 'Capturing Your First Field Data', link: '/tutorials/capturing-first-data/' }, { text: 'Opening Surveyed Data on Your Computer', link: '/tutorials/opening-surveyed-data-on-your-computer/' }, @@ -14,7 +14,7 @@ export default { }, { text: 'Install & Sign Up', // required - collapsed: false, + collapsed: true, items: [ { text: 'How to Install Mergin Maps Mobile App', link: '/setup/install-mobile-app/' }, { text: 'How to Sign Up to Mergin Maps', link: '/setup/sign-up-to-mergin-maps/' }, @@ -24,7 +24,7 @@ export default { }, { text: 'Manage Account & Project', // required - collapsed: false, + collapsed: true, items: [ { text: 'User Account', link: '/manage/account/' }, { text: 'Workspaces', link: '/manage/workspaces/' }, @@ -46,7 +46,7 @@ export default { }, { text: 'Setup GIS Project', // required - collapsed: false, + collapsed: true, items: [ { text: 'QGIS Project Preparation', link: '/gis/features/' }, { text: 'Sorting and Search Setup', link: '/gis/search_data/' }, @@ -61,7 +61,7 @@ export default { }, { text: 'Configure Survey Layer', // required - collapsed: false, + collapsed: true, items: [ { text: 'Best Practice Tips for Layers and Forms', link: '/layer/best-practice/' }, { text: 'Setting Up Widgets in Attributes Form', link: '/layer/form-widgets/' }, @@ -79,7 +79,7 @@ export default { }, { text: 'Fieldwork Tips', // required - collapsed: false, + collapsed: true, items: [ { text: 'Mergin Maps Mobile App Interface', link: '/field/mobile-app-ui/' }, { text: 'Offline Use of Mergin Maps Mobile App', link: '/field/offline-use/' }, @@ -97,7 +97,7 @@ export default { }, { text: 'For Developers', // required - collapsed: false, + collapsed: true, items: [ { text: 'Custom Mobile App', link: '/dev/customapp/' }, { text: 'Integrate Mergin Maps', link: '/dev/integration/' }, @@ -109,7 +109,7 @@ export default { }, { text: 'Custom Server', // required - collapsed: false, + collapsed: true, items: [ { text: 'Overview', link: '/server/' }, { text: 'Install', link: '/server/install/' }, @@ -123,7 +123,7 @@ export default { }, { text: 'Migrate', // required - collapsed: false, + collapsed: true, items: [ { text: 'Migrate from QField', link: '/migrate/qfield/' }, { text: 'Migrate from ArcGIS', link: '/migrate/arcgis/' }, @@ -132,7 +132,7 @@ export default { }, { text: 'Support & Legal', // required - collapsed: false, + collapsed: true, items: [ { text: 'Licensing', link: '/misc/licensing/' }, { text: 'Troubleshoot', link: '/misc/troubleshoot/' }, diff --git a/src/manage/account/index.md b/src/manage/account/index.md index 004721db..3ea0b158 100644 --- a/src/manage/account/index.md +++ b/src/manage/account/index.md @@ -11,8 +11,7 @@ It is not possible to change the username. If you wish to use a different userna 1. Log in to . - In the upper right corner of the screen, click on your username and go to **Your profile**. - + In the upper right corner of the screen, click on your username and go to **Your profile**. ![Mergin Maps profile](../dashboard/mergin-maps-dashboard-profile.jpg "Mergin Maps profile") 2. Click on the **Edit account** button. @@ -25,8 +24,7 @@ It is not possible to change the username. If you wish to use a different userna 1. Log in to . - In the upper right corner of the screen, click on your username and go to **Your profile**. - + In the upper right corner of the screen, click on your username and go to **Your profile**. ![Mergin Maps profile](../dashboard/mergin-maps-dashboard-profile.jpg "Mergin Maps profile") 2. Click on the **Change password** button and set a new password. diff --git a/src/manage/create-project/index.md b/src/manage/create-project/index.md index 233b8ba7..42028c26 100644 --- a/src/manage/create-project/index.md +++ b/src/manage/create-project/index.md @@ -20,6 +20,7 @@ When creating a project, keep in mind that its name cannot be changed later. To work with projects in QGIS, you will need to [install the ](../../setup/install-mergin-maps-plugin-for-qgis/) first. 1. Open a blank or an existing project in QGIS. + 2. Click on **Create Mergin Maps Project** from the toolbar. ![Create project icon in Mergin Maps QGIS plugin](../../tutorials/creating-a-project-in-qgis/qgis-create-mergin-project.jpg "Create project icon in Mergin Maps QGIS plugin") @@ -36,7 +37,6 @@ To work with projects in QGIS, you will need to [install th 4. Change the workspace (if needed), name the project and select a path where your project folder and associated files will be generated. Keep in mind that the project name cannot be changed later. - ![New Mergin Maps project name and folder](./mergin_plugin_project_wizard_4.jpg "New Mergin Maps project name and folder") :::danger WARNING @@ -49,10 +49,10 @@ The new project will be created locally on your computer an Using , you can make a copy of projects you have access to. 1. Navigate to **Mergin Maps** in the **Browser panel**. + 2. Find the project you want to clone. Right-click on it and select **Clone**. You might need to [switch to another workspace](../workspaces/#switch-workspaces-in-qgis) to locate the project. - ![Clone Mergin Maps project in QGIS](./plugin-clone.jpg "Clone Mergin Maps project in QGIS") 3. Select the **workspace** from the drop-down menu and enter your new **Project Name**. Click **OK**. @@ -66,13 +66,13 @@ The project will be saved in the selected workspace. ::: 1. Open the on your mobile device + 2. Navigate to the **Home** tab and tap **Create project** ![Create project in Mergin Maps mobile app](./mobile-app-create-project.jpg "Create project in Mergin Maps mobile app") 3. Give the project a name. Keep in mind that the name cannot be changed later. Press **Create project**. - ![Mergin Maps mobile app new project name](./mobile-app-create-project-name-fields.jpg "Mergin Maps mobile app new project name") 4. Your new project will be created locally on your mobile device @@ -90,6 +90,7 @@ The preferred way of creating a project is to use the . T ::: 1. Navigate to and sign in. + 2. In the **Projects** tab, click on **Create project** ![Create Mergin Maps project through dashboard](./dashboard-create-project.jpg "Create Mergin Maps project through dashboard") @@ -110,7 +111,6 @@ Projects you have access to and [public projects](../permissions/#public-and-pri 1. In the **Projects** tab, find the project you want to clone, open it and click on **Clone**. If needed, [switch to another workspace](../workspaces/#switch-workspaces-in-qgis) to locate the project. - ![Mergin Maps dashboard Cloning project from your workspace](./dashboard-clone-project.jpg "Mergin Maps dashboard - Cloning project from your workspace") 2. Enter the name of the cloned project. If needed, change the target workspace. diff --git a/src/manage/dashboard/index.md b/src/manage/dashboard/index.md index 79f61a05..5e1321fa 100644 --- a/src/manage/dashboard/index.md +++ b/src/manage/dashboard/index.md @@ -11,6 +11,7 @@ Use **Dashboard** in the left panel to go back to the homepage ## Projects The **Projects** tab in the left panel displays the overview of the projects that are available to you in this workspace. + ![Mergin Maps dashboard projects tab](./mergin-maps-dashboard-projects.jpg "Mergin Maps dashboard projects tab") Here, you can: @@ -22,12 +23,14 @@ Here, you can: When you click on a project, you will see the overview of its content. Files can simply be **uploaded** to the project using drag and drop. In the right upper corner, you will find buttons to **download** and [**clone**](../create-project/#clone-an-existing-project-through-mergin-maps-dashboard) the project. + ![Mergin Maps dashboard project details](./mergin-maps-project-details.jpg "Mergin Maps dashboard project details") ### Project files In **Files**, you can see the list of all files associated with the project. Click on a file to see when it was modified, its size, to download or delete it. + ![Detail of a file in Mergin Maps project](./mergin-maps-dashboard-file-detail.jpg "Detail of a file in Mergin Maps project") ### Webmaps @@ -39,9 +42,11 @@ More details about this functionality can be found in the [Webmaps](../dashboard ### History The **History** tab contains an overview of available project versions that can be also downloaded to your computer. + ![Project history in Mergin Maps dashboard](./mergin-maps-dashboard-project-history.jpg "Project history in Mergin Maps dashboard") You can click on a specific version to see more details. + ![Project version details in Mergin Maps dashboard](./mergin-maps-dashboard-project-history-version.jpg "Project version details in Mergin Maps dashboard") You can learn more about project history and how to revert to an older version in [Project History and Versions](../project-history/). @@ -95,6 +100,7 @@ In the **Settings** tab, you will find information about the current workspace. ## User profile **Your profile** can be accessed by clicking on the user name in the upper right corner. + ![Mergin Maps dashboard user profile](./mergin-maps-dashboard-profile.jpg "Mergin Maps dashboard user profile") Here you can edit your account details (such as name or e-mail address), change password, manage notifications about workspace activity and close your account. @@ -103,9 +109,10 @@ Here you can edit your account details (such as name or e-mail address), change ## Manage workspaces Click on the user name in the upper right corner and click on **Manage workspaces** to see the overview of workspaces to which you have access as a guest, member or owner. + ![Mergin Maps dashboard manage workspaces](./mergin-maps-dashboard-manage-workspaces.jpg "Mergin Maps dashboard manage workspaces") Here you can [**create a new workspace**](../workspaces/#how-to-create-a-new-workspace), leave a workspace and accept/decline invitations to other users' workspaces. -![Mergin Maps web workspaces overview](./mergin-maps-dashboard-workspaces.jpg "Mergin Maps web workspaces overview") +![Mergin Maps web workspaces overview](./mergin-maps-dashboard-workspaces.jpg "Mergin Maps web workspaces overview") diff --git a/src/manage/delete-files/index.md b/src/manage/delete-files/index.md index 9ce95558..0235bf6d 100644 --- a/src/manage/delete-files/index.md +++ b/src/manage/delete-files/index.md @@ -13,6 +13,7 @@ Download and archive the data before deleting them if they may be needed in the Deleting files through is simple. However, you can only delete one file at a time. 1. Log in to and navigate to your project. + 2. In the **Files** tab you will see the list of files that are stored in the project's folder. Select the file you would like to delete. @@ -28,13 +29,14 @@ Deleting files through is simple. However, you can only delet If you want to delete multiple files, the best way to do this is on your computer. 1. [Download the project](../plugin/#downloading-a-project-in-qgis) to your computer using . + 2. Navigate to the [project's folder](../project/#mergin-maps-project-folder) in your file browser and review the files inside the folder. There may be a [custom folder for photos](../../layer/photos/#how-to-set-up-a-custom-folder-for-storing-photos) if it was set up before. Delete the files you do not want to keep anymore. ![Mergin Maps project files in PC folder](./folder-files.jpg "Mergin Maps project files folder") + 3. [Synchronise the changes](../synchronisation/#synchronising-changes-in-qgis) in QGIS using . **Local changes** in **Project status** will show the list of deleted files. After synchronisation, the files will be also deleted from the cloud. - ![QGIS Mergin Maps project status synchronisation](./project-status.jpg "QGIS Mergin Maps project status") diff --git a/src/manage/missing-data/index.md b/src/manage/missing-data/index.md index fb62a699..04c7a984 100644 --- a/src/manage/missing-data/index.md +++ b/src/manage/missing-data/index.md @@ -46,28 +46,42 @@ This folder is accessible only from a computer, so you might not see it in your The supports iTunes file sharing. Note that iTunes doesn't allow you to browse or edit data from the app data folder, only allows you to delete or copy the data folder to another location. You can access your data by following these steps: + 1. Plug iOS device to a computer + 2. Open `Finder` file browser + 3. Go to Locations and select your `` -![Plugged iOS device Locations iTunes](./itunes.jpg "iTunes iOS device plugged to a computer") + ![Plugged iOS device Locations iTunes](./itunes.jpg "iTunes iOS device plugged to a computer") + 4. Click on the tab named `files` + 5. Select `Input` app from a list to see a data folder -![Mergin Maps mobile app files accessed through iTunes](./itunes2.jpg "Mergin Maps mobile app files accessed through iTunes") -6 Drag-and-drop the `INPUT` folder to another location to see the content + ![Mergin Maps mobile app files accessed through iTunes](./itunes2.jpg "Mergin Maps mobile app files accessed through iTunes") + +6. Drag-and-drop the `INPUT` folder to another location to see the content ### Manual data transfer (between iOS and Windows) Here are the steps to transfer the data from iPhone/iPad to a Windows PC. 1. Make sure you have installed [iTunes](https://support.apple.com/en-us/HT210384) + 2. Sign into iTunes + 3. [Connect your iOS device to the PC](https://support.apple.com/en-gb/guide/iphone/iph42d9b3178/15.0/ios/15.0) and unlock the screen + 4. In iTunes, click on the phone icon in the toolbar -![iTunes phone icon](./ios_win_itunes.jpg "iTunes phone icon") + ![iTunes phone icon](./ios_win_itunes.jpg "iTunes phone icon") + 5. From the left panel, select **File Sharing** + 6. Select **Input** in Apps tab + 7. Under Input Documents, select **INPUT** folder + 8. Press **Save...** -![iTunes save Mergin Maps mobile app files](./ios_win_itunes_input.jpg "iTunes save Mergin Maps mobile app files") + ![iTunes save Mergin Maps mobile app files](./ios_win_itunes_input.jpg "iTunes save Mergin Maps mobile app files") + 9. Select a path to save the folder on your computer. ## Next steps diff --git a/src/manage/permissions/index.md b/src/manage/permissions/index.md index 2ff9dc82..dd71dada 100644 --- a/src/manage/permissions/index.md +++ b/src/manage/permissions/index.md @@ -27,7 +27,6 @@ Editors can: - **Admin**: This role is only available for workspace members. In addition to the **Write** access, admins can [delete the project](../project-advanced/#delete-a-project) or [transfer](../project-advanced/#transfer-a-project) it to another workspace. They can also create new projects and manage workspace members. - **Owner**: In addition to the **Admin** access, owners can also access [invoicing and subscription](../subscriptions/) settings. **Owner** has full access to the project or workspace. - :::tip Invoices can be made accessible also to a person that is not a workspace member, such as someone from your accounting department. They can [access the subscription management portal using a link](../subscriptions/#accessing-subscription-management-portal-directly-without-mergin-maps-account). ::: @@ -77,11 +76,13 @@ Although the roles of workspace members define the level of access to projects i Users can be [added to a workspace](../project-advanced/#add-users-to-a-workspace) as guests and members through the [Members](../dashboard/#members) tab on the . Here, you can also manage the member roles: + ![Mergin Maps dashboard members tab](../dashboard/mergin-maps-dashboard-members.jpg "Mergin Maps dashboard members tab") Project permissions can be reviewed in the details of a project in the **Collaborators** tab where you can find the list of users who can access the project and their project permissions. If needed, the project permissions can be changed here: + ![Changing project permissions in Mergin Maps dashboard](./dashboard-project-permissions-change.jpg "Changing project permissions in Mergin Maps dashboard") ## How to transfer ownership of a workspace @@ -98,7 +99,9 @@ When transferring ownership of a workspace, you might also need to [update billi To transfer the ownership of a workspace to a user that is not yet a member of your workspace, follow the steps in [How to add users to a workspace](../project-advanced/#add-users-to-a-workspace) and set the **member role** to **Owner**. The new owner has to accept the invitation. To transfer the ownership of a workspace to a user that is already a member of your workspace, you have to change their member role to **Owner**: + 1. Log in to + 2. Navigate to the **Members** tab. Here, you will see the list of current workspace members and their roles. ![Mergin Maps dashboard members tab](../dashboard/mergin-maps-dashboard-members.jpg "Mergin Maps dashboard members tab") diff --git a/src/manage/plugin/index.md b/src/manage/plugin/index.md index 254366ce..1b3fcfe9 100644 --- a/src/manage/plugin/index.md +++ b/src/manage/plugin/index.md @@ -13,9 +13,11 @@ To ensure you can use the latest improvements, don't forget to [upgrade the plug ## Mergin Maps toolbar in QGIS The toolbar is added to the QGIS toolbars panel after installation. + ![Mergin Maps Plugin Toolbar in QGIS](../../setup/install-mergin-maps-plugin-for-qgis/mergin-toolbar.jpg "Mergin Maps Plugin Toolbar in QGIS") If you don't see toolbar, make sure it is enabled in QGIS toolbars panel + ![Enabling Mergin Maps plugin in QGIS toolbars panel](./enable-plugin.gif "Enabling Mergin Maps plugin in QGIS toolbars panel") The toolbar contains following buttons: @@ -43,6 +45,7 @@ The toolbar contains following buttons: Once you have installed the and configured it with your credentials, you should be able to see it in your QGIS Browser panel. The name of the current [workspace](../workspaces/) is displayed in the square brackets (here: `sarah`) and available projects are listed underneath. + ![List of Mergin Maps projects in QGIS Browser](./plugin-browser-projects.jpg "List of Mergin Maps projects in QGIS Browser") Right-click on the workspace name to easily access options to [configure the plugin](../../setup/install-mergin-maps-plugin-for-qgis/#plugin-configuration), refresh, [create new project](../create-project/#create-a-project-in-qgis), find a project in your workspace, [switch workspace](../workspaces/#switch-workspaces-in-qgis) or [explore public projects](#exploring-public-projects). @@ -95,6 +98,7 @@ Some settings of your [ project](../project/) can be done th Processing is a core plugin of QGIS. By installing , tools are added to the . Use the **Toolbox** icon in the toolbar panel to display **Processing Toolbox** in QGIS. + ![Mergin Maps tools in QGIS processing toolbox](./plugin-processing.jpg "Mergin Maps tools in QGIS processing toolbox") ### Create diff (Processing toolbox) @@ -144,4 +148,5 @@ Local changes of a specific layer can also be extracted using the **Extract loca - **** is a shortcut to - **Configure plugin** can be used to [configure plugin](../../setup/install-mergin-maps-plugin-for-qgis/#plugin-configuration) to connect to or [a custom server](../../server/plugin-mobile-app/) - **Configure DB sync** can help you generate a initial configuration file for [DB sync](../../dev/dbsync/) + ![Mergin Maps in QGIS Plugins menu bar](./plugins-menu-bar.jpg "Mergin Maps in QGIS Plugins menu bar") diff --git a/src/manage/project-advanced/index.md b/src/manage/project-advanced/index.md index 545a87ca..1575d1b8 100644 --- a/src/manage/project-advanced/index.md +++ b/src/manage/project-advanced/index.md @@ -19,7 +19,9 @@ If you want to share all projects in your workspace with a group of users, you c You have to be the **admin** or **owner** of the workspace to manage access to the workspace. See [Member Roles and Permissions](../permissions/#workspace-member-roles-and-project-permissions) for more details. To add users to a workspace: + 1. Log into + 2. Go to the **Members** tab in the left panel and click on **Invite** ![Invite people to Mergin Maps workspace](./dashboard-workspace-invite.jpg "Invite people to Mergin Maps workspace") @@ -39,6 +41,7 @@ After accepting the invitation, the invited users will become members or guests Users can be invited to a specific project. Users with access to only some projects in the workspace are workspace **guests**. 1. Log into + 2. In the **Projects** tab, select the project you want to manage and navigate to **Collaborators**. Click on the **Share** button. @@ -55,15 +58,17 @@ After accepting the invitation, the invited users will become guests in your wor Another method that is suitable for sharing a project with a large number of users is to send them a link to your project, such as . 1. Log into + 2. Go to the project you want to share + 3. Copy the link from your web browser and share it with your colleagues -![Copy link to Mergin Maps project](../../tutorials/working-collaboratively/dashboard-copy-url.jpg "Copy link to Mergin Maps project") + ![Copy link to Mergin Maps project](../../tutorials/working-collaboratively/dashboard-copy-url.jpg "Copy link to Mergin Maps project") If you send a link to a [private](#make-your-project-public-private) project, users can **request access** after logging into the . - ![Request Access to a private project](../../tutorials/working-collaboratively/dashboard-request-access-to-private-project.jpg "Request Access to a private project") +![Request Access to a private project](../../tutorials/working-collaboratively/dashboard-request-access-to-private-project.jpg "Request Access to a private project") Once the user requests access, you (or another project owner) can grant them appropriate [permissions](../permissions/) and accept (or decline) their request. - ![Project access requests in Mergin Maps](../../tutorials/working-collaboratively/dashboard-project-access-requests.jpg "Project access requests in Mergin Maps") +![Project access requests in Mergin Maps](../../tutorials/working-collaboratively/dashboard-project-access-requests.jpg "Project access requests in Mergin Maps") ### Make your project public/private Your projects are private by default. If you make it [public](../permissions/#public-and-private-projects), everyone can see your data and project history. However, they cannot contribute to your public project unless you grant them the write permission. @@ -80,10 +85,14 @@ If you change your mind, you can make your project private by clicking **Make pr A project can be transferred to another workspace. This can be useful when there are personal changes in your team or if you have multiple workspaces and want to manage the storage between them. 1. Make sure to correctly synchronise all changes from your collaborators and devices. If you fail to do that, their local changes will be lost! + 2. After synchronisation, all collaborators have to **remove** the project from their devices + 3. Log in to and choose the project you want to transfer + 4. Go to **Settings** and click on **Transfer project** ![Mergin Maps project settings](./dashboard-project-transfer.jpg "Mergin Maps project settings") + 5. Enter the name of the workspace to which the project should be transferred and click on **Request transfer** ![Transfer project form](./dashboard-project-transfer-form.jpg "Transfer project form") @@ -119,6 +128,7 @@ To avoid synchronisation issues, everyone should delete the old project from all Using the , you can delete a project either locally on your PC or on the server. To be able to delete the project on the server, you need to first delete the files locally. 1. In QGIS, go to the **** in the Browser panel + 2. Right-click on the project name and select **Remove locally**. This will remove the project from your PC. The project will be still available on the server. You will be able to download the project again. ![QGIS Remove Mergin Maps project locally in QGIS](./plugin-project-delete.jpg "QGIS Remove Mergin Maps project locally") diff --git a/src/manage/project-history/index.md b/src/manage/project-history/index.md index 1d9800b1..1bcda4e7 100644 --- a/src/manage/project-history/index.md +++ b/src/manage/project-history/index.md @@ -5,7 +5,6 @@ Each time someone synchronises the project from a mobile device or from QGIS thr Using the or the , you can view what files have been added or removed. If you use GeoPackage for your survey, you can also see the list of the features which have been added, deleted or updated. - :::tip Project history in QGIS Great tools to inspect the project history and compare changes between project versions can be found in the : - use [Project history](#project-history-in-qgis) to explore changes in the **Changes Viewer** @@ -15,6 +14,7 @@ Great tools to inspect the project history and compare changes between project v ## Project history in QGIS Project history and version can be inspected using the by clicking the **Project history** button of the toolbar. + ![Project history button](../plugin/plugin-toolbar-project-history.jpg "Project history button") The button opens the **Changes Viewer** window. Here, all available project versions are listed in the left panel. By selecting a version you can inspect the *changes* between this and the previous project version (not the state of the project at that version). Note that older versions of your project can be [downloaded through the ](../dashboard/#history). @@ -36,17 +36,14 @@ To see the project history: 2. Navigate to the **History** tab. Here you can find all available versions of the project. These versions can be downloaded to your computer which can be helpful if you need to create a backup or [restore previous version](#how-to-revert-to-an-older-version) of the project. - ![Mergin Maps project history web](./dashboard-projects-history.jpg "Mergin Maps project history") 3. Click on a version to see more details about what was changed. You can inspect the list of **added**, **edited** and **removed** files. - ![Overview of changes made in a project in the dashboard](./dashboard-history-details.jpg "Overview of changes made in a project in the dashboard") 4. For GeoPackage layers, there is an option to see even more. Click on **Show advanced** - ![Show advanced changelog of a layer](./dashboard-history-show-advanced-changelog.jpg "Show advanced changelog of a layer") 5. Now you can see the overview of feature changes in a specific layer across all attributes. @@ -56,7 +53,7 @@ To see the project history: There are two modified features: - `fid: 2` was moved to a new position - For `fid: 8`, the value of attribute `species` was changed - + ![Dashboard advanced changelog](./dashboard-history-advanced-changelog.jpg "Dashboard advanced changelog") @@ -74,19 +71,16 @@ To revert to an older version of a project (already synchronised to the cloud), ::: Now you have multiple options: -- [Package the downloaded project version](../project/#packaging-qgis-project) as a new project. You can keep both projects if needed or [delete](../project-advanced/#delete-a-project) the one you don't need anymore. +- **[Package the downloaded project version](../project/#packaging-qgis-project)** as a new project. You can keep both projects if needed or [delete](../project-advanced/#delete-a-project) the one you don't need anymore. -- Replace the specific files in your project folder: +- or **Replace the specific files in your project folder**: 1. Close QGIS 2. Copy the QGIS project (`.qgz`), the data (`.gpkg`) or both from the downloaded older version and paste them to your current [ project folder](../project/#mergin-maps-project-folder). - :::warning Be careful when doing this! If you changed the data schema between your versions, this might be a bit tricky. By replacing the QGIS project file, you will revert the project settings, such as symbology, forms settings, relations, etc. By replacing the data files, you will get the content that was saved in the downloaded version of the project. ::: - 3. Open the project in QGIS and check if you restored your project successfully. If needed, modify the project settings so that everything works as intended. - + 3. Open the project in QGIS and check if you restored your project successfully. If needed, modify the project settings so that everything works as intended. 4. If you are happy with the result, synchronise the changes. The restored version is now the current version of your project. - diff --git a/src/manage/project/index.md b/src/manage/project/index.md index 7fb3331e..18bd43f8 100644 --- a/src/manage/project/index.md +++ b/src/manage/project/index.md @@ -28,6 +28,7 @@ If you need to make changes in the data schema of survey layers, please follow [ ## Packaging QGIS project When using the to [create a project](../create-project/#create-a-project-in-qgis), there is an option to **Package current project**. This is what you will choose if you want to transform your QGIS project into project. + ![Mergin Maps QGIS plugin package current project](./package-project.jpg "Mergin Maps QGIS plugin package current project") There are three options for handling layers: @@ -38,7 +39,8 @@ There are three options for handling layers: ![Package current project options](../create-project/mergin_plugin_project_wizard_3.jpg "Package current project options") After the layers for the new project are selected, you just need to enter the project's name and choose where to save it on your computer. It will also be saved on the server in the selected workspace. - ![New Mergin Maps project name and folder](../create-project/mergin_plugin_project_wizard_4.jpg "New Mergin Maps project name and folder") + +![New Mergin Maps project name and folder](../create-project/mergin_plugin_project_wizard_4.jpg "New Mergin Maps project name and folder") :::danger WARNING Your project should be saved on a local drive. Using shared network drives and cloud storage (such as OneDrive or Google Drive) is **not supported**. @@ -55,9 +57,11 @@ There are also some extra folders and files: - **`.mergin`** folder contains the `Geodiff` files that are used to keep the [project history and versions](../project-history/) and [diagnostic log](../../misc/troubleshoot/#diagnostic-logs) in a file named `client-log.txt` - **`proj`** folder contains, if needed, [custom projections](../../gis/proj/) files - [conflict files](../missing-data/#there-are-conflict-files-in-the-folder) may appear if changes could not be properly synchronised + ![Mergin Maps project folder history log projection conflict files](./folder-tech-files.jpg "Mergin Maps project folder content") And this is how the same project looks in + ![Mergin Maps project folder content web](./project-server.jpg "Mergin Maps project folder content web") ## Adding a layer to the project @@ -66,6 +70,7 @@ If you want to add an additional layer to your existing pro - an existing layer: copy the layer to the project's folder and **then** add it to the project Save and sync the project. When syncing, you will see in the **Project status** that a new layer was added. + ![Project status displaying added layer](./add-new-layer.jpg "Project status displaying added layer") If you used **keep as is** option when [packaging the project](#packaging-qgis-project) or add a layer that is not stored in the project's folder, the project will reference the relative path to its location. When opening the project on another computer, QGIS will try to load the file using the relative path. If this folder doesn't exist or is located elsewhere, the project will not be able to load the layer. The same applies for . diff --git a/src/manage/subscriptions/index.md b/src/manage/subscriptions/index.md index 1fa23acb..b253a18b 100644 --- a/src/manage/subscriptions/index.md +++ b/src/manage/subscriptions/index.md @@ -40,6 +40,7 @@ When logged into the portal, you can [update](#how-to-change-a-subscription) or If you are the owner of a workspace, you can access the subscription management portal from the . To access the portal, navigate to the **Subscription** tab and click on **Manage Subscription**. + ![Mergin Maps Dashboard manage subscription](./dashboard-manage-subscriptions.jpg "Mergin Maps Dashboard manage subscription") You will be redirected to the subscription management portal. @@ -51,6 +52,7 @@ Note that the owner of the workspace needs to set up the appropriate email in th To access the portal directly: 1. Navigate to the [**subscription management portal**](https://payments.merginmaps.com/p/login/14keYH711d32dz2144) + 2. Enter the **email** that is used in your [billing information](#billing-information-and-payment-method) and click on **Send** ![Logging in to stripe with an email](./stripe-sign-in.jpg "Logging in to stripe with an email") @@ -58,6 +60,7 @@ To access the portal directly: ## How to upgrade a subscription from the trial plan 1. Log into + 2. Navigate to the **Subscription** tab. Choose your *Premium* plan by using the slider. You can also specify if you want to be billed yearly or monthly. @@ -113,7 +116,6 @@ Click on the **Sign Up Now** button and fill out the form. We will review your a 1. Navigate to the [subscription management portal](#subscriptions-management-portal) 2. Here, you can see current billing information and payment method - ![Payment method and billing information](./stripe-billing-info-payment-method.jpg "Payment method and billing information") :::warning diff --git a/src/manage/synchronisation/index.md b/src/manage/synchronisation/index.md index 748d8739..6e6401fe 100644 --- a/src/manage/synchronisation/index.md +++ b/src/manage/synchronisation/index.md @@ -58,7 +58,6 @@ To see local changes: 2. **Changes Viewer** opens. The colour-coded changes are listed in the table and shown in the map. Inserts are green, edits orange and deletions red. If you want to zoom to specific changes, select them in the table and use **Zoom to Selection**. - ![Mergin Maps QGIS plugin changes viewer](./plugin-changes-viewer.jpg "Mergin Maps QGIS plugin changes viewer") 3. Changes can be added to the QGIS project as a new layer. Click **Add to project** and choose one of the options: diff --git a/src/manage/workspaces/index.md b/src/manage/workspaces/index.md index a72ff106..1f31a3fd 100644 --- a/src/manage/workspaces/index.md +++ b/src/manage/workspaces/index.md @@ -24,9 +24,11 @@ You may have access to multiple workspaces. For instance, you can have your pers ### Switch workspaces in Mergin Maps dashboard When logged in to the , you will see the current workspace under the account name in the right corner of the screen (here: `my-team`). + ![Mergin Maps web dashboard current workspace](./dashboard-current-workspace.jpg "Current workspace in Mergin Maps web dashboard") Click on the account to see the list of all workspaces that are available to you. The active workspace is highlighted. Switch to another workspace by simply clicking on its name in the list. + ![Mergin Maps web workspaces list](./dashboard-switch-workspace.jpg "Mergin Maps web workspaces list") ### Switch workspaces in Mergin Maps mobile app @@ -36,7 +38,6 @@ Click on the account to see the list of all workspaces that are available to you 2. Here you will see your current workspace and your [role](../permissions/) in this workspace. Tap on it to switch to another workspace. - ![Switch workspace button in Mergin Maps mobile app](./mobile-app-current-workspace.jpg "Switch workspace button in Mergin Maps mobile app") 3. Now you will see a list of workspaces that are available to you. @@ -70,7 +71,6 @@ Every workspace has its own [subscription](../subscriptions/). With your first w 4. Fill in the name and description of your new workspace. Note that **the name of a workspace cannot be changed later**. - ![Create workspace in Mergin Maps web dashboard details](./dashboard-new-workspace.jpg "Create workspace in Mergin Maps web dashboard details") 5. Now you have a new workspace! You can [create projects](../create-project/) in the workspace and [invite other users](../project-advanced/#add-users-to-a-workspace) to contribute. @@ -84,7 +84,6 @@ Every workspace has its own [subscription](../subscriptions/). With your first w 2. Fill in the name of your new workspace and tap **Create workspace**. Keep in mind that **the name of a workspace cannot be changed later**. - ![Naming a new workspace in Mergin Maps mobile app](./mobile-app-create-workspace.jpg "Naming a new workspace in Mergin Maps mobile app") 5. Now you have a new workspace! diff --git a/src/migrate/fulcrumapp/index.md b/src/migrate/fulcrumapp/index.md index b46b8ca0..6c53f56f 100644 --- a/src/migrate/fulcrumapp/index.md +++ b/src/migrate/fulcrumapp/index.md @@ -20,6 +20,7 @@ FulcrumApp features a drag-and-drop form builder. Users can start with a blank f Key differences between the platforms include: - **Layers, datasets, forms and widgets** + follows the logic of a QGIS project: you can have multiple layers with their own attributes form set up with QGIS [widgets](../../layer/form-widgets/) within a single project. All survey layers in a project can be edited in the in one session. Fulcrum usually works best at *one app per layer*: having separate apps for different datasets and switching between the apps during the field survey. diff --git a/src/misc/troubleshoot/index.md b/src/misc/troubleshoot/index.md index e1247267..2893c5af 100644 --- a/src/misc/troubleshoot/index.md +++ b/src/misc/troubleshoot/index.md @@ -68,22 +68,24 @@ The diagnostic log `client-log.txt` can be found in the `.mergin` folder located To send the diagnostic log to the developers: 1. Navigate to your local project in Browser panel under + 2. Right-click on the project and select **Diagnostic log** -![Diagnostic log in Mergin Maps QGIS plugin](./qgis-logs.jpg "Diagnostic log in Mergin Maps QGIS plugin") -3. Click **OK** to proceed + ![Diagnostic log in Mergin Maps QGIS plugin](./qgis-logs.jpg "Diagnostic log in Mergin Maps QGIS plugin") -![Submit diagnostic logs message](./plugin-logs.jpg "Submit diagnostic logs message") +3. Click **OK** to proceed + ![Submit diagnostic logs message](./plugin-logs.jpg "Submit diagnostic logs message") 4. Contact our support team () with your username/workspace and problem description so we can have a look into the issue. ### Diagnostic log on Mergin Maps mobile app In the : 1. Tap on the **More** button and go to **Settings** -![](./mobile-app-settings.jpg) + ![Settings in Mergin Maps mobile app](./mobile-app-settings.jpg "Settings in Mergin Maps mobile app") + 2. Scroll down to the **Diagnostic log** option and tap it to display the log -![Access diagnostic log in Mergin Maps mobile app](./mobile-app-settings-diagnostic-log.jpg "Diagnostic log in Mergin Maps mobile app") + ![Access diagnostic log in Mergin Maps mobile app](./mobile-app-settings-diagnostic-log.jpg "Diagnostic log in Mergin Maps mobile app") 3. Tap the **Send to developers** button to proceed -![Send diagnostic log to developers](./mobile-app-send-diagnostic-log.jpg "Diagnostic log content in Mergin Maps mobile app") + ![Send diagnostic log to developers](./mobile-app-send-diagnostic-log.jpg "Diagnostic log content in Mergin Maps mobile app") 4. Contact our support team () with your username/workspace and problem description so we can have a look into the issue. diff --git a/src/public/app_download_windows.png b/src/public/app_download_windows.png index 21df0de0..964918ef 100644 Binary files a/src/public/app_download_windows.png and b/src/public/app_download_windows.png differ diff --git a/src/public/app_download_windows.xcf b/src/public/app_download_windows.xcf new file mode 100644 index 00000000..dbe19a85 Binary files /dev/null and b/src/public/app_download_windows.xcf differ diff --git a/src/setup/install-mergin-maps-plugin-for-qgis/index.md b/src/setup/install-mergin-maps-plugin-for-qgis/index.md index 49736972..0ea3f9ea 100644 --- a/src/setup/install-mergin-maps-plugin-for-qgis/index.md +++ b/src/setup/install-mergin-maps-plugin-for-qgis/index.md @@ -5,8 +5,11 @@ Before the installation of , please ensure you have already: * [Signed up to ](../sign-up-to-mergin-maps/) * [Installed QGIS](../install-qgis/) + ## Plugin installation + 1. Open QGIS on your computer + 2. Select **Manage and Install Plugins...** in the **Plugins** tab: ![QGIS Manage and Install Plugins](./qgis-plugins-manage-and-install.jpg "QGIS Manage and Install Plugins") @@ -44,3 +47,4 @@ Upgrade the plugin periodically to ensure you can use the latest improvements. 2. Find the **** plugin. If there is a new version available, click **Upgrade Plugin**. ![Upgrade Mergin Maps QGIS plugin](./plugin-upgrade.jpg "Upgrade Mergin Maps QGIS plugin") + diff --git a/src/setup/install-qgis/index.md b/src/setup/install-qgis/index.md index 2fa7a130..f083841d 100644 --- a/src/setup/install-qgis/index.md +++ b/src/setup/install-qgis/index.md @@ -1,10 +1,10 @@ # How to Install QGIS 1. Navigate to the + 2. Find the appropriate installer for your operating system. For Windows users, we recommend downloading a standalone MSI installer for the long term release. - ![QGIS standalone installer download](./qgis-download.jpg "QGIS standalone installer download") :::tip Choosing QGIS installer and version @@ -14,7 +14,7 @@ ::: 3. Run the installer when it has finished downloading: - ![QGIS installer Setup Wizard](./qgis-installer.jpg "QGIS installer Setup Wizard") + ![QGIS installer Setup Wizard](./qgis-installer.jpg "QGIS installer Setup Wizard") 4. Continue the installation using the default installation options. diff --git a/src/setup/sign-up-to-mergin-maps/index.md b/src/setup/sign-up-to-mergin-maps/index.md index 2caefc6e..5a903188 100644 --- a/src/setup/sign-up-to-mergin-maps/index.md +++ b/src/setup/sign-up-to-mergin-maps/index.md @@ -13,8 +13,7 @@ Do you want to delete your account or change your details? Go to [**User Account 1. Navigate to -2. Fill in the registration form and click on **Sign Up**. - +2. Fill in the registration form and click on **Sign Up**. ![Mergin Maps sign up form](./mergin-web-sign-up.jpg "Mergin Maps sign up form") While signing up, you can choose to receive information about updates and new features. You can unsubscribe from the newsletter anytime by clicking the **Unsubscribe** link at the bottom of the email. @@ -61,8 +60,7 @@ You can also sign up from . 1. Download the to your Android device, iPhone or iPad. You can find it in the app store of your platform: -2. Open the . Tap the account icon in the upper right corner to go to the login page. - +2. Open the . Tap the account icon in the upper right corner to go to the login page. ![Mergin Maps mobile app account icon](./mobile-app-account-icon.jpg "Mergin Maps mobile app account icon") 3. Tap on **Sign up** @@ -72,8 +70,7 @@ You can also sign up from . You will receive a confirmation email with a link to verify your email. - Check your spam folder if the confirmation email does not appear in your inbox after 5 minutes. - + Check your spam folder if the confirmation email does not appear in your inbox after 5 minutes. ![Mergin Maps mobile app register](./mobile-app-sign-up-form.jpg "Mergin Maps mobile app register") 5. Every account needs to have a [workspace](../../manage/workspaces/) for storing projects. Choose an appropriate name for your workspace and tap on the **Create workspace** button. diff --git a/src/tutorials/creating-a-project-in-qgis/index.md b/src/tutorials/creating-a-project-in-qgis/index.md index 8e99102b..f99bf82d 100755 --- a/src/tutorials/creating-a-project-in-qgis/index.md +++ b/src/tutorials/creating-a-project-in-qgis/index.md @@ -14,6 +14,7 @@ Please ensure you have already: ## Create a minimal project 1. Open QGIS + 2. Locate the toolbar in the upper navigation panel in QGIS. Click on the **Create Project** button ![QGIS plugin Create Mergin Maps Project](./qgis-create-mergin-project.jpg "QGIS plugin Create Mergin Maps Project") @@ -26,13 +27,11 @@ Please ensure you have already: - The folder where the project should be created. Here, we use `Documents\MerginMaps Projects` Press **Finish** to create the project. - ![Create new Mergin Maps project in QGIS](./mergin-plugin-create-new-mergin-project.jpg "Create new Mergin Maps project in QGIS") 5. Your new project should now be created and uploaded to cloud. **Close** the dialog window to continue working with this project in QGIS. - ![Mergin Maps project created and uploaded successfully](./mergin-plugin-basic-project-opened.jpg "Mergin Maps project created and uploaded successfully") @@ -53,7 +52,6 @@ We will now add two more survey layers - a point layer for surveying trees and a Here: `Documents\MerginMaps Projects\trees-and-hedges\trees.gpkg` - **Table name** will be set as `trees` by default - **Geometry type**: ***Point*** - ![New GeoPackage point layer](./qgis-geopackage-filename.jpg "New GeoPackage point layer") 3. Add a **New Field** called `date` with the data type ***Date*** @@ -73,8 +71,7 @@ We will now add two more survey layers - a point layer for surveying trees and a - **Fields**: - `both_sides_surveyed`, data type ***Boolean*** - `num_access_gates`, data type ***Whole Number (integer)*** - - `photo`, data type ***Text Data*** - + - `photo`, data type ***Text Data*** ![Create GeoPackage line layer with defined attributes](./qgis-geopackage-filename2.jpg "Create GeoPackage line layer with defined attributes") Once you are finished, there should be two new layers on the **Layers** panel: `trees` and `hedges`. @@ -99,7 +96,6 @@ Now we will set up the drop-down list for the `trees` layer: - Enter the **Alias** that defines how the attribute's name is displayed in the form. - Change the **Widget Type** to ***Value Map*** - Enter **Values** and **Descriptions** similar to these (both are set the same in this example): - ![QGIS Attributes form Value Map](./qgis-tree-value-map.jpg "QGIS Attributes form Value Map") ::: tip diff --git a/src/tutorials/further-project-customisation/index.md b/src/tutorials/further-project-customisation/index.md index 8f92d561..26597121 100644 --- a/src/tutorials/further-project-customisation/index.md +++ b/src/tutorials/further-project-customisation/index.md @@ -65,10 +65,10 @@ Seeing how the changes look like in the is easy: ![Successful synchronisation message](./qgis-mergin-project-sync.jpg "Successful synchronisation message") 3. Open the on your mobile device + 4. On the **Home** tab, you should see that the `trees-and-hedges` project has *Pending changes to synchronise*. Tap on the button next to the name of the project and **Synchronise project**. - ![Updated project in Mergin Maps mobile app](./merginmaps-mobile-project-with-pending-changes.jpg "Updated project in Mergin Maps mobile app") ::: tip @@ -90,6 +90,7 @@ Labels can be useful for showing attribute data or other information directly on Its layer properties dialog should appear. 2. Select the **Labels tab** on the left hand side + 3. Set the labelling mode to **Single Labels**: ![QGIS Labels settings in Layer properties](./qgis-symbology-labels.jpg "QGIS Labels settings in Layer properties") @@ -114,6 +115,7 @@ The panel for the `trees` layer looks like the left-hand image below. We will co Its layer properties dialog should appear. 2. Select the **Display tab** on the left hand side + 3. Set the **Display Name** to `species`: ![Display name attribute in Layer properties](./qgis-display-name.jpg "Display name attribute") @@ -122,13 +124,14 @@ If you notice subtle differences in the name / spelling of the field when you se ::: 4. Set the HTML map tip to: -``` -# fields -condition -``` + ``` + # fields + condition + ``` ![HTML map tip in Layer properties](./qgis-html-map-tip.jpg "HTML map tip in Layer properties") 5. Click **OK** + 6. Test out these settings in the as described in the [Trialling changes](#trialling-changes-in-mergin-maps-mobile-app) section above. ## Controlling layer visibility @@ -179,6 +182,7 @@ Here we'll define the following map themes: ## Zoom to project extent If you experimented with the **Zoom to project** button in the you'll have seen that by default, it zooms to the extent of the somewhat large background map: + ![Mergin Maps mobile app default map extent](../capturing-first-data/merginmaps-mobile-location-shown-on-osm.jpg "Mergin Maps mobile app default map extent") This is not very useful so we will learn how to specify the extent that this button will zoom to. diff --git a/src/tutorials/mobile/index.md b/src/tutorials/mobile/index.md index 2c5a0a4e..51634f8a 100755 --- a/src/tutorials/mobile/index.md +++ b/src/tutorials/mobile/index.md @@ -3,9 +3,9 @@ [[toc]] In the last tutorial we created a new project in QGIS with layers for surveying trees and hedges. You'll now learn how to: -* Open the QGIS project in -* Switch between layers to capture new point and linear features -* Sync and save your data to cloud +- Open the QGIS project in +- Switch between layers to capture new point and linear features +- Sync and save your data to cloud :::tip Need help navigating the mobile app? [ interface](../../field/mobile-app-ui/) contains the overview of the features and functionality of the . @@ -13,12 +13,17 @@ In the last tutorial we created a new project in QGIS with ## Opening the project on your mobile device 1. Open on your mobile device + 2. Go to the **Projects** tab. Here, you can see a list of projects in your workspace. + 3. **Download** the ***trees-and-hedges*** project. ![Downloading project from Projects tab](./merginmaps-mobile-download-my-project.jpg "Downloading project from Projects tab") -4. Projects that are downloaded to your mobile device are listed in the **Home** tab. + +4. Projects that are downloaded to your mobile device are listed in the **Home** tab. + Tap the ***trees-and-hedges project*** to open it in the . ![Open downloaded project from Home tab](./merginmaps-mobile-open-project.jpg "Open downloaded project from Home tab") + 5. Pinch the screen to zoom in on your location. If you lose sight of your location, use the **GPS button** in the right corner of the map window to recentre the map on your position. ![Recentring position of the map](./merginmaps-mobile-centre-gps.jpg "Recentring position of the map") @@ -41,7 +46,6 @@ The uses colours to report whether the GPS accuracy falls ::: - ## The active layer In a moment we'll survey a tree. Surveyed features are added to the ***active layer***. The project contains three different layers so we'll now ensure the ***trees*** layer is set as the active layer. @@ -95,7 +99,8 @@ When creating the project in QGIS, we included a layer for linear features calle 3. Enter some **attributes** and a **photo** for the hedge: ![Feature form in Mergin Maps mobile app](./merginmaps-mobile-hedge-attributes-and-photo.jpg "Feature form in Mergin Maps mobile app") -It may happen that the surveyed hedge can be quite difficult to distinguish from the background map. For instance here, the line is too thin and does not have the best colour. +It may happen that the surveyed hedge can be quite difficult to distinguish from the background map. For instance here, the line is too thin and does not have the best colour. + ![Poor symbology of feature on the map](./merginmaps-mobile-poor-symbology.jpg "Poor symbology of feature on the map") We will learn how to change layer styles in the [next tutorial](../further-project-customisation/). @@ -104,6 +109,7 @@ We will learn how to change layer styles in the [next tutorial](../further-proje To conclude this tutorial we will save the data we just collected back to . Tap the **Sync** button in the bottom navigation panel and wait for notification about successful synchronisation. + ![Synchronising changes to Mergin Maps cloud](./merginmaps-mobile-sync-project.jpg "Synchronising changes to Mergin Maps cloud") When the sync process has completed your data has been stored safely in the cloud. diff --git a/src/tutorials/opening-surveyed-data-on-your-computer/index.md b/src/tutorials/opening-surveyed-data-on-your-computer/index.md index 63a3208c..1a57f24f 100644 --- a/src/tutorials/opening-surveyed-data-on-your-computer/index.md +++ b/src/tutorials/opening-surveyed-data-on-your-computer/index.md @@ -17,16 +17,12 @@ To open the project and field data on the computer, we will need to do some setu 1. Open and navigate to the **Home** tab. Tap the button next to the project's name and select the **Upload** option. If you are logged in, the project will be uploaded to cloud and you can continue to the next step: [opening your project in QGIS](#locating-and-opening-your-project). - - ![Mergin Maps mobile app upload project to cloud](./mergin-maps-mobile-upload-project.jpg "Mergin Maps mobile app upload project to cloud") - + ![Mergin Maps mobile app upload project to cloud](./mergin-maps-mobile-upload-project.jpg "Mergin Maps mobile app upload project to cloud") 2. If you are not logged in, you will be asked to. Enter your credentials and **Sign in**. - If you don't have an account yet, create one! Tap **Sign up** to [sign up to ](../../setup/sign-up-to-mergin-maps/#from-mergin-maps-mobile-app). - + If you don't have an account yet, create one! Tap **Sign up** to [sign up to ](../../setup/sign-up-to-mergin-maps/#from-mergin-maps-mobile-app). ![Mergin Maps mobile app Login page](./mergin-maps-mobile-log-in-to-mergin.jpg "Mergin Maps mobile app Login page") - 3. Once you are logged in, **Upload** your project to the cloud. @@ -47,7 +43,6 @@ Now that the project is stored in cloud, we can open it in 3. Find the entry in the QGIS **Browser** panel ![QGIS Browser Mergin Maps projects](./qgis-browser-panel.jpg "QGIS Browser Mergin Maps projects") - Notice that the name of the current workspace (here: `my-team`) is displayed next to and the projects in this workspace are listed below. ::: tip @@ -70,6 +65,7 @@ Now that the project is stored in cloud, we can open it in ![QGIS prompt Do you want to open project?](./qgis-open-project-file.jpg "QGIS prompt Do you want to open project?") Your survey project is now open in QGIS and you can see the data you captured in the field. + ![Mergin Maps project opened in QGIS](./qgis-project-opened.jpg "Mergin Maps project opened in QGIS") :::tip @@ -90,29 +86,31 @@ There are many ways how you can extract the data. Here we'll just cover the basi ![QGIS Export Save features as](./qgis-save-features-as.jpg "QGIS Export Save features as") 3. **Save Vector Layers as...** dialog opens. Here you can define the export parameters: - * Set **Format** to ***Comma Separated Value [CSV]*** - * Specify an output **File name** - * Uncheck **Add saved file to map** - - Click **OK** to export the file. The resulting CSV file can be opened in various applications such as MS Excel or even in a common text editor. + - Set **Format** to ***Comma Separated Value [CSV]*** + - Specify an output **File name** + - Uncheck **Add saved file to map** + Click **OK** to export the file. The resulting CSV file can be opened in various applications such as MS Excel or even in a common text editor. ![QGIS Export Save layer as CSV](./qgis-save-as-csv-options.jpg "QGIS Export Save layer as CSV") + ## Locating captured photos **Photos** that you took as a part of your field survey are located in the project folder. In this case, we saved our project in `Documents\MerginMaps Projects` so the photos can be found here. ![Photos located in Mergin Maps project folder](./qgis-finding-photos.jpg "Photos located in Mergin Maps project folder") - - + + ## Identify features tool You can also use QGIS to explore the data you surveyed in the field. + 1. Select the Survey layer in the **Layers** panel. The layer should be highlighted. + 2. Select the **Identify Features** tool: ![QGIS Identify features in selected layer](./qgis-identify-features-tool.jpg "QGIS Identify features in selected layer") 3. Click on a survey point. A form with feature's attribute should open: ![Attributes form in QGIS](./qgis-identify-results.jpg "Attributes form in QGIS") - + ## Summary In this tutorial you learnt how to view a survey project you created on your mobile device with on your desktop computer using QGIS. You also learnt how to export captured data for use in spreadsheets and how to access photos you captured in the field. diff --git a/src/tutorials/working-collaboratively/index.md b/src/tutorials/working-collaboratively/index.md index eb7c986e..ff5a03ea 100755 --- a/src/tutorials/working-collaboratively/index.md +++ b/src/tutorials/working-collaboratively/index.md @@ -1,6 +1,6 @@ # Working Collaboratively - makes working collaboratively safe and easy. +The platform makes working collaboratively safe and easy. In this tutorial you'll learn a few different ways of sharing your project with your colleagues: [[toc]]