Skip to content

Commit

Permalink
Merge pull request #11 from g3w-suite/dev
Browse files Browse the repository at this point in the history
Update v3.5
  • Loading branch information
wlorenzetti committed Jan 18, 2023
2 parents 1d29c28 + ce0d8c4 commit c1bec3a
Show file tree
Hide file tree
Showing 12 changed files with 167 additions and 97 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Edit and translate G3W-SUITE end-user documentation
Start editing one of the following branches to make a change:

- [dev](https://github.com/g3w-suite/g3w-suite-documentation/tree/dev)
- [v3.5.x](https://github.com/g3w-suite/g3w-suite-documentation/tree/v3.5.x)
- [v3.4.x](https://github.com/g3w-suite/g3w-suite-documentation/tree/v3.4.x)
- [v3.3.x](https://github.com/g3w-suite/g3w-suite-documentation/tree/v3.3.x)
- [v3.2.x](https://github.com/g3w-suite/g3w-suite-documentation/tree/v3.2.x)
Expand Down
4 changes: 2 additions & 2 deletions datamanagement.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Data on physical files and / or on GeoDB SpatiaLite and QGIS cartographic projec
![](images/manual/datamanagement.png)

**NB:** The name of the local directory dedicated to geographic data must correspond to the name defined for the **`DATASOURCE_PATH`** variable set during installation.
[See dedicated paragraph.](https://g3w-suite.readthedocs.io/en/v.3.4.x/settings.html#base-settings)
[See dedicated paragraph.](https://g3w-suite.readthedocs.io/en/v.3.5.x/settings.html#base-settings)

That directory is also used to contain **images used in the print layouts** associated with the QGIS cartographic projects.

Expand Down Expand Up @@ -73,7 +73,7 @@ Two specific directories can also be created within the root directory of the Fi
All the directories can be organized in subdirectories with no nesting limits.

**NB:** The names of these directories are defined by the basic settings set during the installation of the suite.
[See dedicated paragraph.](https://g3w-suite.readthedocs.io/en/v.3.4.x/settings.html#base-settings)
[See dedicated paragraph.](https://g3w-suite.readthedocs.io/en/v.3.5.x/settings.html#base-settings)

![](images/manual/g3wsuite_administration_file_manager.png)

Expand Down
8 changes: 4 additions & 4 deletions demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Through the tutorials it will be possible to:

# Download demo data

The tutorial is based on predefined data and QGIS 3.22.x LTR project **downloadable from <a href="https://drive.google.com/file/d/14s9FHuME0sI69VV7kxJb-P6n7aGqfbzi/view?usp=sharing" target="_blank">this link</a>**.
The tutorial is based on predefined data and QGIS 3.22.x LTR project **downloadable from <a href="https://drive.google.com/file/d/1x66-47m4QHt2fzkAuphVZp9B_QmVSFIY/view?usp=share_link" target="_blank">this link</a>**.

The .zip file contains the **`G3W-SUITE`** directory with three sub directories:
* **`projects`:** containing a QGIS project (**`buildings_management.qgs`**) already optimized for the tutorial
Expand Down Expand Up @@ -57,7 +57,7 @@ The publication system provides for the use of the **title of the project** as t

# Access the online service

To publish the project, you can **access the G3W-SUITE test application** via the following URL: [**`https://v33.g3wsuite.it`**](https://v33.g3wsuite.it)
To publish the project, you can **access the G3W-SUITE test application** via the following URL: [**`https://v35.g3wsuite.it`**](https://v35.g3wsuite.it)

To access the **Administration Panel** it is necessary to log in using the following credentials:
* user: **`demo`**
Expand Down Expand Up @@ -346,14 +346,14 @@ Once the editing function is activated, updating the service, the **`Tools menu`

![](images/manual/editing_form2.png)

For **further information** on the web editing function, read the [**dedicated chapter on the manual**](https://g3w-suite.readthedocs.io/en/v.3.4.x/g3wsuite_editing.html#online-editing-tools-at-cartographic-client-level)
For **further information** on the web editing function, read the [**dedicated chapter on the manual**](https://g3w-suite.readthedocs.io/en/v.3.5.x/g3wsuite_editing.html#online-editing-tools-at-cartographic-client-level)

# Personalize your demo

**Do you want to test the online editing function more deeply?**

Redefine attribute forms, aliases and editing widgets associated with the individual fields and reload the project to check the new settings.

**It is advisable to consult the** [paragraph dedicated](https://g3w-suite.readthedocs.io/en/v.3.4.x/g3wsuite_editing.html#activation-and-configuration) **to the list and limitations of the individual editing widgets inheritable from the QGIS project.**
**It is advisable to consult the** [paragraph dedicated](https://g3w-suite.readthedocs.io/en/v.3.5.x/g3wsuite_editing.html#activation-and-configuration) **to the list and limitations of the individual editing widgets inheritable from the QGIS project.**


77 changes: 50 additions & 27 deletions g3wsuite_administration.md

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions g3wsuite_client.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ The choice of a Theme will determine the **automatic activation of the layers an

At the base of the map area there is an information bar showing:
* **display scale**
* **mouse coordinates**
* **mouse coordinates**: coordinates can be shown in project projection system and in WGS84 LatLong (ESPG: 4326)
* **project projection system**
* **icon to copy the URL with the references to the extension currently displayed**

Expand All @@ -65,6 +65,8 @@ At the base of the map area there is an information bar showing:
* ![ ](images/manual/icon_navigation_geolocation.png) **`geolocation`:** geolocation tool (useful for consultation from tablet)
* ![ ](images/manual/icon_navigation_nominatim.png) **`nominatin`:** search tools for addresses and toponyms based on OSM
* ![ ](images/manual/icon_navigation_streetview.png) **`streetview`:** Google StreetView on your map
* in the presence of GoogleMaps API Key, StreetView it is integrated on the client and synchronized with the position and direction of the icon on the map
* in the absence of GoogleMaps API Key, StreetView it will open on a new browse tab without the aspects of synchronization with the map
* ![ ](images/manual/icon_navigation_lunghezza.png) **`length`:** linear measuring instrument
* ![ ](images/manual/icon_navigation_area.png) **`area`:** tool for measuring surfaces
* ![ ](images/manual/icon_navigation_addlayer.png) **`addlayers`:** tool for temporarily uploading GML, GeoJson, KML, GPX, SHP (zipped) and CSV with coordinate to WebGis. These layers will remain until the end of the work session
Expand All @@ -91,7 +93,7 @@ Upon querying a geometry, the form structure will be replicated at the client le

Any links to photos will determine the display of a clickable preview, any links to links or other multimedia content will determine the display of the Open button that will allow consultation of the link.

For further information on this point, see the [**dedicated paragraph**](https://g3w-suite.readthedocs.io/en/v.3.4.x/projectsettings.html#viewing-multimedia-content).
For further information on this point, see the [**dedicated paragraph**](https://g3w-suite.readthedocs.io/en/v.3.5.x/projectsettings.html#viewing-multimedia-content).

#### Single result

Expand Down Expand Up @@ -159,11 +161,14 @@ single/list features by value of a field

Here the URL paramters available:
* **map_extent (Zoom to map extent)**
* Ex: <url_project>?map_extent=Xmin, Ymin,Xmax,Ymax
* Ex: `<url_project>?map_extent=Xmin, Ymin,Xmax,Ymax`
* **zoom_to_fid (Zoom to a specific feature by FID)**
* Ex: <url_project>?zoom_to_fid=<layer_id>|<fid value>
* Ex: `<url_project>?zoom_to_fid=<layer_id>|<fid value>`
* **ztf (Zoom to features defined on the basis of attribute values)**
* Ex: <url_project>?ztf=<layer_id or layer name>:<field name>=<field value>
* Ex: `<url_project>?ztf=<layer_id or layer name>:<field name>=<field value>`

If **Views (Themes)** are set up in the QGIS project, it will also be possible to parameterize them in the webgis URL:
* Ex: `<url>?map_theme=<theme_name>`

## Tools panel
### Metadata
Expand Down Expand Up @@ -230,7 +235,7 @@ The cards to be printed are defined by referring to the atlas identifier defined
### WMS
**Through this tool the user can add custom WMS layers to the WebGis service.**

The user can add one or more WMS URL and, for each of them, define:
The user can add one or more WMS URLs (associated with a customizable name) and, for each of them, define:
* the position (top or buttom) with respect to the other layers of the project
* the layer to load
* the projection system to be associated
Expand Down Expand Up @@ -259,6 +264,8 @@ Through this tool it is possible to:

The saved query will be available until the browser cache is cleared

**NB:** fields not exposed as QGIS project-level WMS are not available for query building.

![](images/manual/g3wclient_querybuilder.png)

**The Search menu contains the list of search tools defined through the Administration panel and custom searches created with the Query Builder.**
Expand Down Expand Up @@ -287,6 +294,7 @@ This session has three tabs:

In the list of layers, right click on the name of the single layer shows the following items:
* **Name and kind of geometry** of the layer
* **Metadata:** descriptive information inherited from what has been defined, at QGIS project level, in the 'Abstract' form of the 'QGIS Server' session of the 'Layer Properties'
* **Styles:** to choose the style to be applied to the layer, in the case of multi-style layers
* **Abstract:** a text (also html) defined in the **Layer Properties**, **Metadata** session, **Identification** tab, **Abstract** form.
* **Zoom to layer:** to zoom in on the extension of the layer
Expand All @@ -296,7 +304,7 @@ In the list of layers, right click on the name of the single layer shows the fol
* **Download GeoPackage:** to download the layer as a GeoPackage; function activatable from the administration panel
* **Download CSV:** to download the layer as a CSV; function activatable from the administration panel
* **Download XLS:** to download the layer as a XLS; function activatable from the administration panel
* **WMS URL:** URL of the WMS service relative to the project or URL of the external WMS
* **WMS/WFS URL:** URL of the WMS/WFS service relative to the project or URL of the external WMS

![](images/manual/g3wclient_layer_function.png)

Expand Down Expand Up @@ -370,9 +378,12 @@ If the option is activated on the QGIS project, the **legend is filtered on the

## Time series

**NB: the Time Series function is only available with a QGIS Server version >= 3.26**

This version of G3W-SUITE manages the temporal aspects for both vector and raster layers but with limitations:
* **vector layers:** limited to the **Single field with Date/Time** configuration
* **raster layers:** only for **NetCDF** file upload as raster (no Mesh)
* **WMS-T**

If in the QGIS project a temporal vector/raster layer on which the **Dynamic temporal control** property has been activated is present, the client will show an additional panel called **Time series**.

Expand All @@ -388,14 +399,3 @@ The modification of the start date of the series will determine the updating of
**Pay attention: to use the Time series function for raster data, it must also be activated at the level of the G3W-ADMIN layer properties.**

![](images/manual/g3wclient_timeseries_admin.png)


## Temporal raster charts

If in the QGIS project a temporal raster layer on which the **Dynamic temporal control** property has been activated is present, the **Time series** panel .

The panel will show an additional button called **Show Charts**.

By clicking on it it will be possible to click on the map in different points obtaining, for each of them, a time chart that will show the variation of the values of the individual cells over time.

![](images/manual/g3wclient_timecharts_tool.png)

0 comments on commit c1bec3a

Please sign in to comment.