From 17e02889a9921d9173db2d5e73390a8ed864f9df Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 2 May 2025 14:37:26 +0200 Subject: [PATCH] fix conflicts in supported formats update --- src/gis/supported_formats/index.md | 260 +++++++++++++++-------------- 1 file changed, 132 insertions(+), 128 deletions(-) diff --git a/src/gis/supported_formats/index.md b/src/gis/supported_formats/index.md index 5d87b5af..d2011a01 100644 --- a/src/gis/supported_formats/index.md +++ b/src/gis/supported_formats/index.md @@ -21,7 +21,7 @@ For survey layers used on the field, we strongly recommend GeoPackage, to be abl There are more formats supported, please see full list of supported [QGIS providers](#full-list-of-supported-qgis-providers) and [OGR drivers](#full-list-of-supported-ogr-drivers) ::: tip -Go to [Behind Data Synchronisation](../../manage/synchronisation/) to read more about how synchronisation works in . +Go to [Behind Data Synchronisation](../manage/synchronisation.md) to read more about how synchronisation works in . ::: ### PostgreSQL/PostGIS @@ -31,8 +31,8 @@ PostgreSQL connection (username, password, host, port, etc.) can be set up: To use a *Connection Service File*, you have to: - create a `pg_service.conf` file as described in and test it in QGIS Desktop -- [manually transfer](../../manage/missing-data/) the `pg_service.conf` file to data folder. The data folder is shown in the [Diagnostic Log](../../misc/troubleshoot/#diagnostic-log-on-mergin-maps-mobile-app) -- restart the . Check the [Diagnostic Log](../../misc/troubleshoot/#diagnostic-log-on-mergin-maps-mobile-app) to see if the file is found and used after restart. +- [manually transfer](../manage/missing-data/index.md) the `pg_service.conf` file to data folder. The data folder is shown in the [Diagnostic Log](../misc/troubleshoot/#diagnostic-log-on-mergin-maps-mobile-app) +- restart the . Check the [Diagnostic Log](../misc/troubleshoot/#diagnostic-log-on-mergin-maps-mobile-app) to see if the file is found and used after restart. ## Raster data on Mergin Maps mobile app @@ -53,7 +53,7 @@ To use a *Connection Service File*, you have to: There are plenty of other raster formats we support through GDAL/OGR, please see [the full list](#full-list-of-supported-gdal-drivers) ::: tip -See [our guide](../settingup_background_map/) for setting up background layers. +See [our guide](./settingup_background_map.md) for setting up background layers. ::: ## Vector tiles on Mergin Maps mobile app @@ -61,7 +61,7 @@ See [our guide](../settingup_background_map/) for setting up background layers. We support vector tiles just like QGIS does - in Mapbox Vector Tiles (MVT) format - and stored either in a MBTiles file (for offline use) or through a template URL (for online service) such as `http://example.com/{z}/{x}/{y}.pbf`. ::: tip -See [our guide](../settingup_background_map/) for setting up background layers. +See [our guide](./settingup_background_map.md) for setting up background layers. ::: ## Full list of supported QGIS providers @@ -94,137 +94,138 @@ The is based on the