diff --git a/src/manage/dashboard-maps/basemap-addition.webp b/src/manage/dashboard-maps/basemap-addition.webp index 7caf8a24..e8f78f9e 100644 Binary files a/src/manage/dashboard-maps/basemap-addition.webp and b/src/manage/dashboard-maps/basemap-addition.webp differ diff --git a/src/manage/dashboard-maps/basemap-addition.xcf b/src/manage/dashboard-maps/basemap-addition.xcf new file mode 100644 index 00000000..19431ed7 Binary files /dev/null and b/src/manage/dashboard-maps/basemap-addition.xcf differ diff --git a/src/manage/dashboard-maps/basemap-selection.webp b/src/manage/dashboard-maps/basemap-selection.webp index 4adb47c8..d9cd8f32 100644 Binary files a/src/manage/dashboard-maps/basemap-selection.webp and b/src/manage/dashboard-maps/basemap-selection.webp differ diff --git a/src/manage/dashboard-maps/basemap-selection.xcf b/src/manage/dashboard-maps/basemap-selection.xcf new file mode 100644 index 00000000..1d45a17b Binary files /dev/null and b/src/manage/dashboard-maps/basemap-selection.xcf differ diff --git a/src/manage/dashboard-maps/dashboard-map-properties.webp b/src/manage/dashboard-maps/dashboard-map-properties.webp index c71594cf..7f4c4cc9 100644 Binary files a/src/manage/dashboard-maps/dashboard-map-properties.webp and b/src/manage/dashboard-maps/dashboard-map-properties.webp differ diff --git a/src/manage/dashboard-maps/dashboard-map-properties.xcf b/src/manage/dashboard-maps/dashboard-map-properties.xcf index 7db8aa36..bc0919e5 100644 Binary files a/src/manage/dashboard-maps/dashboard-map-properties.xcf and b/src/manage/dashboard-maps/dashboard-map-properties.xcf differ diff --git a/src/manage/dashboard-maps/dashboard-open-map.webp b/src/manage/dashboard-maps/dashboard-open-map.webp new file mode 100644 index 00000000..ded71894 Binary files /dev/null and b/src/manage/dashboard-maps/dashboard-open-map.webp differ diff --git a/src/manage/dashboard-maps/dashboard-open-map.xcf b/src/manage/dashboard-maps/dashboard-open-map.xcf new file mode 100644 index 00000000..b4743720 Binary files /dev/null and b/src/manage/dashboard-maps/dashboard-open-map.xcf differ diff --git a/src/manage/dashboard-maps/dashboard-webmap.gif b/src/manage/dashboard-maps/dashboard-webmap.gif deleted file mode 100644 index 7b289aec..00000000 Binary files a/src/manage/dashboard-maps/dashboard-webmap.gif and /dev/null differ diff --git a/src/manage/dashboard-maps/dashboard-webmap.webp b/src/manage/dashboard-maps/dashboard-webmap.webp new file mode 100644 index 00000000..993e68de Binary files /dev/null and b/src/manage/dashboard-maps/dashboard-webmap.webp differ diff --git a/src/manage/dashboard-maps/dashboard-webmap.xcf b/src/manage/dashboard-maps/dashboard-webmap.xcf new file mode 100644 index 00000000..219bfc1f Binary files /dev/null and b/src/manage/dashboard-maps/dashboard-webmap.xcf differ diff --git a/src/manage/dashboard-maps/index.md b/src/manage/dashboard-maps/index.md index 7c5ad653..05cff47e 100644 --- a/src/manage/dashboard-maps/index.md +++ b/src/manage/dashboard-maps/index.md @@ -5,52 +5,74 @@ outline: deep # Webmaps Overview -The spatial data of your project can be displayed and explored in the **Map** tab of the project on the . As an early access feature, they can also be [shared via URL](#sharing-maps-via-url). +[[toc]] -![Mergin Maps dashboard map](./dashboard-webmap.gif "Mergin Maps dashboard map") +The spatial data of your project can be displayed and explored on the . As an early access feature, webmaps can also be [shared via URL](#sharing-maps-via-url). -:::tip Usage details +To open the webmap, navigate to your project and click the **Open map** button. + +![Mergin Maps dashboard Open webmap](./dashboard-open-map.webp "Mergin Maps dashboard Open webmap") + +On the webmap, you can see your survey layers or raster layers that are [packaged](#project-layers) with the project. + +![Mergin Maps webmaps](./dashboard-webmap.webp "Mergin Maps webmaps") + +In the **Layers** panel, you can control the visibility of the [layers](#project-layers), switch [map themes](#map-themes) and [basemaps](#background-maps). The default extent of maps is defined by the [extent set in the QGIS project](#extent). + +The webmap is refreshed automatically, so you always see the latest version of your project without needing to reload the page. + +Features can be explored on the map: click on a feature to display its attributes form. + +![Mergin Maps dashboard maps](./dashboard-map-properties.webp "Mergin Maps dashboard maps") + + +:::tip Usage requirements Webmaps are available for cloud and users. -Webmaps are **not** available for at this point. +Webmaps are **not** available for . ::: -## Project layers -On the webmaps, you will see your survey layers or raster layers that are [packaged](../project/#packaging-qgis-project) with the project. The default extent of maps is defined by the [extent set in the QGIS project](../../gis/features/#project-extent). +## Layers {#project-layers} +Webmaps show layers that are packaged with the project (loaded from project files) by default. These are usually GeoPackage or Shapefile layers, as well as background maps made available for [offline use](../../gis/settingup_background_map/#generating-xyz-mbtiles-raster-tiles-for-offline-use) (e.g. mbtiles, GeoTIFF). -All maps on the by default offer [ vector tile service](../../gis/settingup_background_map/#online-services-1) as a background map, with three styles: default, light and dark. +Layers requiring a network connection (e.g. PostgreSQL layers or online background maps) are excluded from the webmap by default due to potential performance and connectivity problems. However, certain network layers (such as satellite background map) can be added manually, read more in the [custom background maps](#add-custom-background-maps) section. -The webmap is refreshed automatically, you will see the latest version of your project all the time, even without refreshing the web page. +The **Layers** panel lists all available layers displayed on the map, together with their legend as defined in QGIS. -The **Layers** panel lists all available layers displayed on the map, together with their legend as defined in QGIS. The eye button next to the layer name controls the visibility of layers. If you have defined map themes in your project, these are visible on top of the layers panel. +The eye icon next to a layer toggles its visibility. ![Mergin Maps webmaps toggle layer visibility](./webmaps-toggle-layer-visibility.webp "Mergin Maps webmaps toggle layer visibility") -You can also switch [Map themes](../../gis/setup_themes/) defined in the project: +## Map themes +If you have defined [map themes](../../gis/setup_themes/) for your project, you can switch between them in the **Layers** panel. + ![Mergin Maps webmaps toggle layer visibility](./webmaps-map-themes.webp "Mergin Maps webmaps toggle layer visibility") -Click on a feature on the map to display its attributes. -![Mergin Maps dashboard maps](./dashboard-map-properties.webp "Mergin Maps dashboard maps") +## Background maps + +By default, all webmaps include the [ vector tile service](../../gis/settingup_background_map/#online-services-1) as a background map. -## Available layers -Webmaps by default show layers that are packaged with the project (loaded from project files). These are usually GeoPackage layers, shapefile layers and background maps that are made available for offline use (e.g. mbtiles, GeoTIFF, ...). +![Mergin Maps Webmaps background maps](./webmaps-background-maps.webp "Mergin Maps Webmaps background maps") + +You can switch between three styles: default, light, and dark. +![Mergin Maps Webmaps background maps](./webmaps-background-maps-theme.webp "Mergin Maps Webmaps background maps") -Layers requiring network connection (e.g. PostgreSQL layers or online background maps) are by default not included on the webmap due to potential performance and connectivity problems. However, certain network layers (such as satellite background map) can be added manually, read more in the [following section](#add-custom-background-maps). ### Add custom background maps -If you prefer a different background map than the official ones provided by default, you can add a custom one in the basemap selection. +If you prefer a different background map than the default options, you can add a custom one in the **basemap** selection. -1. In the layers section, click on the top-left basemap selection item +1. In the **Layers** section, click on the top-left basemap selection item, then select **+ Add new**. ![Mergin Maps webmaps background map selection](./basemap-selection.webp "Mergin Maps webmaps background map selection") -2. Click the `+ Add new` button +2. Enter the connection details for your background map and click **Add basemap** to confirm. + + Please note that **raster tiles** and **vector tiles** are supported. ![Mergin Maps webmaps adding background map](./basemap-addition.webp "Mergin Maps webmaps adding background map") -3. Fill in the connection details of your background map. Please note that `vector tiles` and `raster tiles` are supported -4. Hit `Add basemap` and your background map, if available, will be enabled automatically +4. If available, your basemap will be enabled automatically. ![Mergin Maps webmaps satellite background map](./basemap-satellite.webp "Mergin Maps webmaps satellite background map") @@ -58,18 +80,15 @@ If you prefer a different background map than the official ones provided by defa Keep in mind that background maps services and data sources come with their own terms of use, especially if they are to be publicly shared. You should comply with any terms and conditions of the services of your choice. ::: -## Custom webmap applications -Webmaps can be further programmatically customised via `map-script` to build a custom webmap application. This feature can be used to add layers, alter visual and functional elements, and more. Read more [here](../webmaps-applications/). - ## Extent -The extent of webmaps is defined in QGIS in the **Project Properties**. +Webmap extent is defined in QGIS in the **Project Properties**. -When displaying maps on the , uses primarily the [project full extent](../../gis/features/#project-extent) defined in the **View Settings** tab. +When displaying webmaps, primarily uses the [project full extent](../../gis/features/#project-extent) defined in the **View Settings** tab. ![QGIS set project extent](../../gis/features/qgis-project-extent.jpg "QGIS set project extent") -If this parameter is not defined, the map extent will be set as the *Advertised extent* from the **QGIS Server** tab. +If this is not defined, the map extent defaults to the *Advertised extent* from the **QGIS Server** tab. ![Maps in dashboard extent set in QGIS project](./qgis-project-properties-qgis-server-extent.jpg "Maps in dashboard extent set in QGIS project") @@ -77,7 +96,10 @@ If there are no extent settings in the QGIS project, will c ## Sharing maps via URL -Webmaps can be shared via URL or embedded on a website. You can find more details about this early access feature in [Sharing and Embedding Webmaps](../webmaps-sharing/). +You can share webmaps via URL or embed them on a website. More details about this early access feature can be found in [Sharing and Embedding Webmaps](../webmaps-sharing/). + +## Custom webmap applications +You can further customise webmaps programmatically using `map-script` to build custom webmap applications. This feature can be used to add layers, alter visual and functional elements, and more. Read more [here](../webmaps-applications/). ## Troubleshooting -Troubleshooting tips for webmaps can be found [here](../webmaps-troubleshooting/). +Troubleshooting tips for webmaps are available [here](../webmaps-troubleshooting/). diff --git a/src/manage/dashboard-maps/webmaps-background-maps-theme.webp b/src/manage/dashboard-maps/webmaps-background-maps-theme.webp new file mode 100644 index 00000000..cca209e2 Binary files /dev/null and b/src/manage/dashboard-maps/webmaps-background-maps-theme.webp differ diff --git a/src/manage/dashboard-maps/webmaps-background-maps-theme.xcf b/src/manage/dashboard-maps/webmaps-background-maps-theme.xcf new file mode 100644 index 00000000..dd8090fa Binary files /dev/null and b/src/manage/dashboard-maps/webmaps-background-maps-theme.xcf differ diff --git a/src/manage/dashboard-maps/webmaps-background-maps.webp b/src/manage/dashboard-maps/webmaps-background-maps.webp new file mode 100644 index 00000000..13220a56 Binary files /dev/null and b/src/manage/dashboard-maps/webmaps-background-maps.webp differ diff --git a/src/manage/dashboard-maps/webmaps-background-maps.xcf b/src/manage/dashboard-maps/webmaps-background-maps.xcf new file mode 100644 index 00000000..c1bd98b7 Binary files /dev/null and b/src/manage/dashboard-maps/webmaps-background-maps.xcf differ diff --git a/src/manage/dashboard-maps/webmaps-map-themes.webp b/src/manage/dashboard-maps/webmaps-map-themes.webp index 62092b46..128af7c4 100644 Binary files a/src/manage/dashboard-maps/webmaps-map-themes.webp and b/src/manage/dashboard-maps/webmaps-map-themes.webp differ diff --git a/src/manage/dashboard-maps/webmaps-map-themes.xcf b/src/manage/dashboard-maps/webmaps-map-themes.xcf index aff04277..41f12bc2 100644 Binary files a/src/manage/dashboard-maps/webmaps-map-themes.xcf and b/src/manage/dashboard-maps/webmaps-map-themes.xcf differ diff --git a/src/manage/dashboard-maps/webmaps-toggle-layer-visibility.webp b/src/manage/dashboard-maps/webmaps-toggle-layer-visibility.webp index d70a1050..34f1d067 100644 Binary files a/src/manage/dashboard-maps/webmaps-toggle-layer-visibility.webp and b/src/manage/dashboard-maps/webmaps-toggle-layer-visibility.webp differ diff --git a/src/manage/dashboard-maps/webmaps-toggle-layer-visibility.xcf b/src/manage/dashboard-maps/webmaps-toggle-layer-visibility.xcf index 7ed20b2e..ecae5cd6 100644 Binary files a/src/manage/dashboard-maps/webmaps-toggle-layer-visibility.xcf and b/src/manage/dashboard-maps/webmaps-toggle-layer-visibility.xcf differ diff --git a/src/manage/dashboard/index.md b/src/manage/dashboard/index.md index 51c9611a..941f88d1 100644 --- a/src/manage/dashboard/index.md +++ b/src/manage/dashboard/index.md @@ -1,5 +1,7 @@ --- description: Mergin Maps dashboard is where you manage your projects, workspace members, subscriptions and profiles. Explore files, history, webmaps of your projects. + +outline: deep --- # Mergin Maps Dashboard @@ -26,7 +28,7 @@ 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. +In the right upper corner, there are buttons to [**open map**](../dashboard-maps/), **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") @@ -42,7 +44,7 @@ On the **Map** tab, your project is displayed directly on the ::: warning Early access feature -Map sharing is in early access. If you would like to try it out, ask your workspace admin or owner to enable map sharing early access program in your [workspace settings](https://app.merginmaps.com/settings). The availability of the feature might change in the future. +Map sharing is currently available as an early access feature. If you would like to try it out, ask your workspace admin or owner to enable map sharing early access program in your [workspace settings](https://app.merginmaps.com/settings). The availability of the feature might change in the future. ::: ## Sharing maps via URL -Webmaps can be shared via URL. [Admins or owners](../permissions/) can enable map sharing for a project, so that anyone with the link can display and explore your project in a web browser, without the need to log in to or make the project [public](../project-advanced/#make-your-project-public-private). +You can share webmaps via a direct URL. [Admins or owners](../permissions/) can enable map sharing for a project, allowing anyone with the link can display and explore it in a web browser, without the need to log in to or make the project [public](../project-advanced/#make-your-project-public-private). -1. Navigate to your project on the . -2. In the **Map** tab, click on the **Share map** button to generate a shareable link -3. Send the link to anyone to share your project - -To see how this works, you can try a link to our [sample webmap](https://app.merginmaps.com/maps/grDTleg8yCdSracIxs-hmFIGdDs). - -To disable the map sharing, click on the **Revoke sharing** button. +1. Navigate to your project on the +2. Click the **Open map** button to open the [webmap](../dashboard-maps/) +3. Click the **Share map** button to display the public map link +4. Copy and share the link to provide access to your webmap ![Sharing maps via URL](./map-sharing-url.webp "Sharing maps via URL") +To see this feature in action, you can try a link to our [sample webmap](https://app.merginmaps.com/maps/grDTleg8yCdSracIxs-hmFIGdDs). + +To disable the map sharing, click the **Stop sharing** button. ## Embedding webmaps using HTML diff --git a/src/manage/webmaps-sharing/map-sharing-url.webp b/src/manage/webmaps-sharing/map-sharing-url.webp index d932f096..f89bb7f7 100644 Binary files a/src/manage/webmaps-sharing/map-sharing-url.webp and b/src/manage/webmaps-sharing/map-sharing-url.webp differ diff --git a/src/manage/webmaps-sharing/map-sharing-url.xcf b/src/manage/webmaps-sharing/map-sharing-url.xcf index 434cb3b6..a3d3300c 100644 Binary files a/src/manage/webmaps-sharing/map-sharing-url.xcf and b/src/manage/webmaps-sharing/map-sharing-url.xcf differ