Skip to content

Commit

Permalink
Merge pull request #471 from MerginMaps/iss_437-mar-field-autosync
Browse files Browse the repository at this point in the history
mar-field synchronisation in mobile app
  • Loading branch information
tomasMizera authored May 16, 2024
2 parents fab98b9 + 353c39c commit 2378d8d
Show file tree
Hide file tree
Showing 18 changed files with 16 additions and 16 deletions.
Binary file removed src/field/autosync/autosync-fail.jpg
Binary file not shown.
Binary file removed src/field/autosync/autosync-fail.xcf
Binary file not shown.
Binary file removed src/field/autosync/autosync-settings.jpg
Binary file not shown.
Binary file removed src/field/autosync/autosync-settings.xcf
Binary file not shown.
30 changes: 15 additions & 15 deletions src/field/autosync/index.md
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
# Synchronisation in Mergin Maps Mobile App
[[toc]]

::: warning
Our mobile app was redesigned. We are in the process of updating this content to reflect these changes.
:::
Changes in your project can be synchronised by using **Synchronise project** option on the main page of the <MobileAppNameShort /> or during the survey:
- [manually](#manual-synchronisation) by clicking the **Sync** button
- [automatically](#automatic-synchronisation) by using the **Automatically sync changes** option

![Synchronisation in Mergin Maps mobile app](./mobile-app-sync-options.jpg "Synchronisation in Mergin Maps mobile app")

Changes in your project can be synchronised during the survey manually by using the sync button or automatically by allowing the automatic synchronisation in <MobileAppName />.

To be able to synchronise a project, you need to:
- be signed in to your <MainPlatformNameLink /> account
- be connected to the internet
- have write [permission](../../manage/permissions/) to the project

The sync button is displayed in the map window.

![Sync button in Mergin Maps mobile app](../mobile-app-ui/input-autosync.jpg "Sync button")
:::tip More about synchronisation
Want to learn more about synchronisation in <MainPlatformNameLink />? Go to [**Synchronisation**](../../manage/synchronisation/) for more details.

:::tip
Are you missing some data after synchronisation? [How to Recover Missing Data](../../manage/missing-data/) will show you how to deal with [conflict files](../../manage/missing-data/#there-are-conflict-files-in-the-folder) and how to [manually download](../../manage/missing-data/#there-are-no-conflict-files-in-the-folder) data from your mobile device.
:::

## Manual synchronisation
You can synchronise local changes by tapping the sync button in the map window. The sync button will stop rotating once the synchronisation process is finished and the **Successfully synchronised** message will appear at the top of the window.

![Successful synchronisation message](./sync-success.jpg "Successful synchronisation message")
![Successful synchronisation message](../mobile-app-ui/mobile-app-sync.jpg "Successful synchronisation message")

Pressing and holding the sync button opens the Project status, where you can see changes yet to be synchronised.
If you want to inspect what has changed before synchronising, tap on the **More** button and go to **Local changes**.

![Project status with pending changes](../mobile-app-ui/input-project-status.jpg "Project status with pending changes")
![Project status with pending changes](./mobile-app-more-local-changes.jpg "Project status with pending changes")

Changes can be also synchronised from the **Projects' Home** tab by pressing the **sync** button.
Here, you will see the overview of your local changes.

![Synchronise changes from Project's Home tab](../../tutorials/mobile/merginmaps-mobile-sync-project.jpg "Synchronise changes from Project's Home tab")
![Mergin maps mobile app Local changes](../mobile-app-ui/mobile-app-local-changes.jpg "Mergin maps mobile app Local changes")

## Automatic synchronisation
To allow automatic synchronisation in <MobileAppName />, navigate to **Settings** and toggle on **Automatically sync changes**.

As changes will be done during the survey, such as adding new features or changing field values, the synchronisation will start automatically. The sync button will indicate that synchronisation is in progress and once it is done, the **Successfully synchronised** message will appear.
![Automatically synchronise changes settings in Mergin Maps mobile app](./mobile-app-autosync-settings.jpg "Automatically synchronise changes settings in Mergin Maps mobile app")

![Automatically synchronise changes settings](./autosync-settings.jpg "Automatically synchronise changes settings")
As changes will be done during the survey, such as adding new features or changing field values, the synchronisation will start automatically. The sync button will indicate that synchronisation is in progress and once it is done, the **Successfully synchronised** message will appear.

If changes can not be synchronised automatically, e.g. when internet connection is lost during the survey, the changes need to be synchronised manually after reconnecting to the internet.

![Failed to synchronise changes message](./autosync-fail.jpg "Failed to synchronise changes message")
![Failed to synchronise changes error message](./mobile-app-sync-fail.jpg "Failed to synchronise changes error message")
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added src/field/autosync/mobile-app-sync-fail.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/field/autosync/mobile-app-sync-fail.xcf
Binary file not shown.
Binary file added src/field/autosync/mobile-app-sync-options.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/field/autosync/mobile-app-sync-options.xcf
Binary file not shown.
Binary file removed src/field/autosync/sync-success.jpg
Binary file not shown.
Binary file removed src/field/autosync/sync-success.xcf
Binary file not shown.
2 changes: 1 addition & 1 deletion src/field/mobile-app-ui/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ The **More** button opens a list of additional options
- [**Map themes**](../../gis/setup_themes/): a list of map themes set up in a <MainPlatformName /> project in QGIS
- [**Position tracking**](../tracking/): to start tracking of your tracks during the field survey
- **Local changes**: the overview of your local changes to be synchronised
![](./mobile-app-local-changes.jpg)
![Mergin maps mobile app Local changes](./mobile-app-local-changes.jpg "Mergin maps mobile app Local changes")
- **Settings**: [GPS settings](#gps-settings), [streaming mode and recording settings](#streaming-mode-and-recording-settings), and general references to information about the <MobileAppNameShort />, changelog, help, privacy policy, terms of service and [diagnostic log](../../misc/troubleshoot/#diagnostic-log-on-mergin-maps-mobile-app)
![Mergin Maps mobile app Settings](./mobile-app-settings.jpg "Mergin Maps mobile app Settings")

Expand Down
Binary file removed src/field/mobile-app-ui/input-project-status.jpg
Binary file not shown.
Binary file removed src/field/mobile-app-ui/input-project-status.xcf
Binary file not shown.

0 comments on commit 2378d8d

Please sign in to comment.