Skip to content

Commit 0dc3190

Browse files
authored
mergin maps cloud component (#654)
2 parents f6339bc + af02565 commit 0dc3190

File tree

16 files changed

+22
-22
lines changed

16 files changed

+22
-22
lines changed

src/dev/integration/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ client.create_user("jill@example.com", "T0p_secret", 1, "editor", notify_user=Tr
8686

8787
### Workspace members methods
8888

89-
These methods are available for Cloud and Enterprise edition servers.
89+
These methods are available for <ServerCloudNameLink /> and <EnterprisePlatformNameLink />.
9090

9191
::: warning API availability
9292
The following methods are available for Python API Client versions `0.10.0` or higher, using server versions `2025.2.0` or higher.

src/field/offline-use/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Here is a typical workflow of offline data collection.
1111

1212
We assume that the field surveyors have already [installed the <MobileAppNameShort />](../../setup/install-mobile-app/) and are signed in, as well as that the project used for field survey follows recommendations described in [How to set up an offline <MainPlatformName /> project](#how-to-set-up-an-offline-mergin-maps-project).
1313

14-
1. Make sure that your <MainPlatformName /> project is [synchronised](../../manage/synchronisation/#how-to-synchronise-changes-in-mergin-maps) to the <MainPlatformNameLink /> cloud
14+
1. Make sure that your project is [synchronised](../../manage/synchronisation/#how-to-synchronise-changes-in-mergin-maps) to the <ServerCloudNameLink />
1515
2. While being online, field surveyors [download the project](../../tutorials/mobile) to their mobile device using <MobileAppName />
1616
3. Now they can go to do the field survey and collect data and photos while being offline
1717
4. After finishing field survey and being back online in the office, all surveyors upload their changes back to the cloud

src/gis/settingup_background_map/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,5 +194,5 @@ Files from the folder can be loaded into multiple <MainPlatformName /> projects.
194194
:::
195195

196196
:::warning
197-
Files located in the another folder are not synchronised. This saves your storage on <MainPlatformNameLink /> cloud. However, if you want to update or modify these files, you have to connect the mobile device to your computer and do it manually.
197+
Files located in the another folder are not synchronised. This saves your storage on <ServerCloudNameLink />. However, if you want to update or modify these files, you have to connect the mobile device to your computer and do it manually.
198198
:::

src/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ home: false
1515
The ecosystem consist of various components:
1616
- [QGIS](https://qgis.org/) > Powerful GIS Desktop application
1717
- [<QGISPluginName />](https://plugins.qgis.org/plugins/Mergin/) > QGIS plugin
18-
- <AppDomainNameLink desc="Mergin Maps Server" /> > SaaS Cloud Service (available also as <MainPlatformName /> CE)
18+
- <ServerCloudNameLink /> > SaaS Cloud Service (available also as <EnterprisePlatformNameLink /> or <CommunityPlatformNameLink />)
1919
- <MainDomainNameLink desc="Mergin Maps mobile app" /> > iOS and Android mobile app
2020

2121
<AppDownload />

src/manage/delete-files/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# How to Delete Files
22

3-
Deleting files such as photos that are not needed anymore can help you free up storage on the <MainPlatformNameLink /> cloud and keep your project organised.
3+
Deleting files such as photos that are not needed anymore can help you free up storage on the <ServerCloudNameLink /> and keep your project organised.
44

55
Files can be deleted through <DashboardLink /> one by one. Deleting multiple files at once is possible on your computer using <QGISPluginName />.
66
[[toc]]

src/manage/permissions/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Subscriptions are based on the number of *contributors* on the workspace. *Contr
2020
Member roles and project permissions present similar options in terms of what a user can or cannot do. The difference is whether these options are defined on a workspace or on a project level. Compare the overview of [workspace member roles](#workspace-member-roles-overview) and of [project permissions](#project-permissions-overview) for more details.
2121

2222
- **Reader**: Users with **Read** permission are able to see projects, projects data and [history](../project-history/), but can not make any changes. *Readers* do not count as [contributors](../subscriptions/#contributors) in your subscription.
23-
- **Editor** (available on <MainPlatformNameLink /> Cloud and <EnterprisePlatformNameLink />): In addition to the **Read** access, users can [add/remove/update features](../../field/mobile-features/), but *cannot* make changes in the project properties, add/remove fields in GeoPackage layers or remove GeoPackage files from the project. We recommend using this role for surveyors - users who collect data in the field.
23+
- **Editor** (available on <ServerCloudNameLink /> and <EnterprisePlatformNameLink />): In addition to the **Read** access, users can [add/remove/update features](../../field/mobile-features/), but *cannot* make changes in the project properties, add/remove fields in GeoPackage layers or remove GeoPackage files from the project. We recommend using this role for surveyors - users who collect data in the field.
2424
Editors can:
2525
- *add* files such as photos, shapefiles, GeoPackage files - any file except for `*.qgs`, `*.qgz`, `mergin-config.json`
2626
- *edit* files except for `*.qgs`, `*.qgz`, `mergin-config.json` and non-diff based `*.gpkg` changes

src/manage/project/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ What is a <MainPlatformName /> project?
55

66
It is basically a folder that contains data (such as vector layers, tables, rasters or photos), a [QGIS project](../../gis/features/), and some extra <MainPlatformName /> files needed to ensure everything works.
77

8-
When <MainPlatformName /> project is created, it is saved to <MainPlatformNameLink /> cloud. From the cloud, it can be downloaded to various devices, used by different team members in both QGIS and the <MobileAppNameShort />. Changes they made are tracked and synchronised back to the cloud.
8+
When <MainPlatformName /> project is created, it is saved to <ServerCloudNameLink />. From the cloud, it can be downloaded to various devices, used by different team members in both QGIS and the <MobileAppNameShort />. Changes they made are tracked and synchronised back to the cloud.
99

1010
## Creating project
1111
:::tip

src/manage/synchronisation/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ Synchronisation is a key process that makes effective collaboration possible: yo
66

77
Let's look at a typical workflow in <MainPlatformNameLink />:
88
1. First, you [create](../create-project/#create-a-project-in-qgis) and [prepare](../../gis/features/) a <MainPlatformName /> project in QGIS. This includes loading background and survey layers, setting up the forms, styling layers, setting up map themes and defining the layers to be used in a survey. The <MainPlatformName /> project consists of the project file (*.qgz) and data referenced in the project, such as GeoPackage layers, shapefiles, rasters or attachments. At this point, they are all saved in a project folder in your computer.
9-
2. The <MainPlatformName /> project is uploaded to <MainPlatformNameLink /> Cloud using [<QGISPluginName />](../plugin/). The project and data are now stored in the cloud.
9+
2. The <MainPlatformName /> project is uploaded to <ServerCloudName /> using [<QGISPluginName />](../plugin/). The project and data are now stored in the cloud.
1010
3. Now you can work collaboratively! The project and data can be downloaded to a mobile device to do [the fieldwork using <MobileAppName /> ](../../tutorials/mobile/) or to another computer with QGIS. Every collaborator works with their own local version of the project.
11-
4. After finishing their work, the individual contributors synchronise their changes [to <MainPlatformName /> Cloud](../../tutorials/mobile/#saving-data-to-the-cloud), where they are put together.
11+
4. After finishing their work, the individual contributors synchronise their changes [to <ServerCloudName />](../../tutorials/mobile/#saving-data-to-the-cloud), where they are put together.
1212

13-
As you can see, <MainPlatformName /> Cloud acts as a link between individual contributors and also between PCs and mobile devices, synchronising the changes. When you make changes and upload them to the cloud, <MainPlatformNameLink /> will compare the content of GeoPackage layers and merge them, while copying attachments (such as photos), rasters and shapefiles as they are. That is why we recommend using GeoPackage format for your survey layer.
13+
As you can see, <ServerCloudName /> acts as a link between individual contributors and also between PCs and mobile devices, synchronising the changes. When you make changes and upload them to the cloud, <MainPlatformNameLink /> will compare the content of GeoPackage layers and merge them, while copying attachments (such as photos), rasters and shapefiles as they are. That is why we recommend using GeoPackage format for your survey layer.
1414

1515

1616
## How to synchronise changes in Mergin Maps

src/server/administer/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Administer
22

3-
Administration guide will help you to configure and maintain your <CommunityPlatformNameLink /> or <EnterprisePlatformNameLink />. The main Cloud <DashboardLink desc="Mergin Maps Server"/> is maintained for you by <MainPlatformName /> team. Read more about server platforms in the [overview article](../).
3+
Administration guide will help you to configure and maintain your <CommunityPlatformNameLink /> or <EnterprisePlatformNameLink />. <ServerCloudNameLink /> is maintained for you by <MainPlatformName /> team. Read more about server platforms in the [overview article](../).
44

55
[[toc]]
66

src/server/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Overview
22

3-
SaaS <MainPlatformName /> service is a web platform for storage and synchronisation of data between mobile devices, <MainPlatformNameLink /> service and QGIS Desktop.
3+
SaaS <MainPlatformName /> service called <ServerCloudNameLink /> is a web platform for storage and synchronisation of data between mobile devices, <MainPlatformNameLink /> service and QGIS Desktop.
44

55
There are also custom server deployments:
66
[[toc]]

0 commit comments

Comments
 (0)