Skip to content

Commit 1ab9597

Browse files
authored
Merge branch 'master' into docs_interlis
2 parents f183752 + 43a7535 commit 1ab9597

File tree

78 files changed

+440
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+440
-175
lines changed

en/installation-guide/database-initialization.rst

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ You can do this graphically or by simply opening a pgAdminIII :ref:`SQL-query` w
3232

3333
* Change to this database
3434

35-
* Create a new schema with the name `qgep`
36-
3735
* Open an :ref:`SQL-query` Window and create the extensions (if they're not created yet)
3836

3937
* ``CREATE EXTENSION hstore;``
@@ -48,9 +46,9 @@ Restore demo datamodel
4846
Restore the latest data model that also includes demo data:
4947

5048
* Download demo data
49+
* https://github.com/QGEP/datamodel/releases/latest
50+
* download `qgep_vx.y.z_structure_and_demo_data.backup`
5151

52-
* https://github.com/QGEP/data/archive/demodata.zip
53-
* Extract the files and look for qgep_demodata.backup
5452

5553
* Right click the `qgep` schema
5654

@@ -76,12 +74,13 @@ Restore the latest data model that also includes demo data:
7674

7775
.. figure:: images/pgadmin_qgep_refresh.jpg
7876

79-
* Update privileges for the database
77+
There are 4 schemas (qgep_od, qgep_sys, qgep_vl, qgep_import)
78+
79+
* Update privileges for the qgep_od, qgep_sys and qgep_vl schema
8080

81-
* Right click the `qgep` schema
81+
* Right click the `qgep_od` schema
8282

8383
* Properties -> Privileges Tab > Grant ``USAGE`` to group ``qgep``.
84-
You can also do this as a query: ``GRANT USAGE ON SCHEMA qgep TO GROUP qgep;``
8584

8685
* Click `Grant Wizard …`
8786

@@ -92,14 +91,27 @@ Restore the latest data model that also includes demo data:
9291
* Group `qgep`
9392

9493
* Choose `ALL`
94+
95+
* Right click the `qgep_sys` schema and the `qgep_vl` schema and repeat the steps described above for the qgep_od-schema
96+
97+
* You can update the privileges easier as a query:
98+
99+
::
100+
101+
GRANT USAGE ON SCHEMA qgep_od TO GROUP qgep;
102+
GRANT USAGE ON SCHEMA qgep_sys TO GROUP qgep;
103+
GRANT USAGE ON SCHEMA qgep_vl TO GROUP qgep;
104+
GRANT ALL ON schema qgep_od TO postgres;
105+
GRANT ALL ON schema qgep_sys TO postgres;
106+
GRANT ALL ON schema qgep_vl TO postgres;
95107

96108
Empty data model
97109
^^^^^^^^^^^^^^^^
98110

99111
You also have the option to restore the latest empty data model (no demo data).
100112

101-
* Download the data model by going to https://github.com/QGEP/datamodel/releases
102-
and by downloading the latest `template_db.dump`.
113+
* Download the data model by going to https://github.com/QGEP/datamodel/releases/latest
114+
and by downloading the latest `qgep_vx.y.z_structure_with_value_lists.sql`.
103115

104116
* In order to restore you can follow the steps from :ref:`restore-demomodel`,
105117
using the template data model instead of the demo data one.
@@ -131,3 +143,4 @@ For instance, run ``./scripts/db_setup.sh -s 2056`` for the **2056** SRID.
131143
If you already have a data model and you want to force the regeneration
132144
of the model you can also use the ``-f`` option: ``./scripts/db_setup.sh -f``.
133145

146+
You can use the ``-r`` option to add roles (``qgep_viewer``, ``qgep_user``, ``qgep_manager``, ``qgep_sysadmin``).

en/installation-guide/server.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ Required Software
1111
Server installation
1212
~~~~~~~~~~~~~~~~~~~
1313

14-
* Install PostgreSQL (>=9.3)
14+
* Install PostgreSQL (>=9.6)
1515

1616
* `Windows download page <http://www.postgresql.org/download/windows>`_
1717

18-
* Install PostGIS (>=2.3)
18+
* Install PostGIS (>=2.4)
1919

2020
.. note::
2121

en/installation-guide/workstation.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ To save the password as well on the system you may use the file `pgpass <http://
7474
Install QGIS
7575
------------
7676

77-
* Minimum requirement 2.14
77+
* Minimum requirement 3.4
7878

7979
* We recommend using the latest master build (called qgis-dev on Windows)
8080
which often offers a better experience in combination with QGEP.
@@ -86,8 +86,7 @@ Install QGEP plugin
8686

8787
Plugin requirements:
8888

89-
- networkx
90-
- Qt 4 PostgreSQL database driver
89+
- networkx >= 2.1
9190

9291
You can install them on debian based systems with::
9392

@@ -107,8 +106,8 @@ You can install them on debian based systems with::
107106
* Name: QGEP
108107

109108
* URL:
110-
``https://raw.githubusercontent.com/QGEP/repository/master/plugins.xml``
111-
109+
``https://raw.githubusercontent.com/QGEP/qgepplugin/master/plugins.xml?qgis=3.3``
110+
112111
* Enable `Show also experimental plugins`
113112

114113
* Activate the plugin (see image below):
@@ -126,11 +125,12 @@ You can install them on debian based systems with::
126125
Install the demo project
127126
------------------------
128127

129-
* Download https://github.com/QGEP/data/archive/demodata.zip
128+
* Download from https://github.com/QGEP/datamodel/releases/latest
129+
New Restore file: qgep_vx.x.x_structure_and_demo_data.backup (with data), other versions with schema only available
130130

131131
* Extract the file
132132

133-
* Restore the file `qgep_demodata.backup` with pgAdminIII
133+
* Restore the file `qgep_vx.x.x_structure_and_demo_data.backup` with pgAdmin
134134

135135
* Open `project/qgep_en.qgs` with QGIS
136136

@@ -162,7 +162,7 @@ and set the OID you want to use in your project to TRUE.
162162
Working with more than one database
163163
-----------------------------------
164164

165-
* Create a new database in pgAdmin III with a new name, e.g. communityA
165+
* Create a new database in pgAdmin with a new name, e.g. communityA
166166

167167
* Create a new schema qgep in this database (do not choose an other name, because all scripts works with the schema-name qgep)
168168

en/user-guide/digitizing/dataentry.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ Data entry in QGEP needs some understanding of the underlaying data model `VSA-D
1616

1717
General
1818
-------
19-
When digitzing you start with the point elements (wastewater structures such as manholes, special structures). Then you can connect those with line elements (channels with reaches).
19+
20+
Enable the **Reuse last entered attribute values** option (Settings -> Options -> Digitizing) in QGIS 3.
21+
22+
.. note:: When digitizing, you start with the point elements (wastewater structures such as manholes, special structures). Afterwards its easy to connect those points with line elements (channels with reaches).
2023

2124
To start with data entry select the QGEP button **Wizard**.
2225

2326
.. figure:: images/button_data_entry_wizard_selected.jpg
2427

25-
On the left side bottom the **QGEP Digitizing** window appears:
28+
On the left side bottom, **QGEP Data Entry** window appears:
2629

2730
.. figure:: images/wizard_data_entry.jpg
2831

en/user-guide/digitizing/deletingobjects.rst

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ You can also pick and delete only a specific object (e.g. cover).
66

77
Delete Reaches
88
--------------
9+
.. attention:: Deleting a reach does not delete the associated objects (channel, reach point, networkelement). See QGEP issue #436
10+
911
* Select **vw_qgep_reach** and change to edit mode.
1012
* Select the reach(es) you want to delete. You can click on an object or draw an area.
1113

1214
.. figure:: images/select_tool.jpg
1315

14-
* Use the top meu **Edit** --> **Delete Selected** to delete.
16+
* Use the top menu **Edit** --> **Delete Selected** to delete.
1517

1618
.. figure:: images/delete_reach.jpg
1719

@@ -28,19 +30,22 @@ Delete Reaches
2830
.. figure:: images/delete_reach_confirm.jpg
2931

3032

31-
Delete Manholes and other Waste water Structures
33+
Delete Manholes and other Wastewater Structures
3234
------------------------------------------------
3335

3436
* Select **vw_qgep_wastewater_structure** and change to edit mode
3537
* Select the objects (**manholes**, **special structures** etc.) you want to delete
3638
* Use **Edit** --> **Delete Selected** to delete.
3739
* Stop the editing mode and confirm changes to layer. All changes will be saved to database.
3840

41+
.. note:: Delete wastewater structures deletes also all connected structure parts and all connected wastewater nodes.
42+
3943
Delete Covers
4044
-------------
45+
.. attention:: Deleting a cover does not delete the associated structure part object. See QGEP issue #436
4146

4247
* Select **vw_qgep_wastewater_structure** and change to edit mode
43-
* Select the object (**manholes**, **special structures** etc.) to which you want the cover deleted
48+
* Select the object (**manholes**, **special structures** etc.) from which you want the cover deleted
4449
* Use the **Identify Features** tool to open the form
4550
* Switch to the covers tab
4651
* Select the cover(s) you want to delete
@@ -51,14 +56,17 @@ Delete Covers
5156
* Click save on the form
5257
* Deselect the edit mode and confirm changes to layer. All changes will be saved to database.
5358

59+
* Second way to delete a cover: select the **vw_cover** layer and change to edit mode, select the cover, use **Edit** --> **Delete Selected**, stop the editing mode
60+
5461
Delete Structure parts
5562
----------------------
63+
.. attention:: Deleting a structure part does not delete the associated structure part object. See QGEP issue #436
5664

5765
* Select **vw_qgep_wastewater_structure** and change to edit mode
58-
* Select the object (**manholes**, **special structures** etc.) you want to delete the cover
66+
* Select the object (**manholes**, **special structures** etc.) from which you want to delete a structure part
5967
* Use the **Identify Features** tool to open the form
6068
* Switch to the structure parts tab
6169
* Select the structure part you want to delete
62-
* Click the read x to delete the covers
70+
* Click the red x button to delete the structure parts
6371
* Click save on the form
6472
* Stop the editing mode and confirm changes to layer. All changes will be saved to database.

en/user-guide/digitizing/digitizingcatchments.rst

Lines changed: 89 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,113 @@ Digitizing Catchment Areas
44
General
55
-------
66

7-
Catchments can be digitzed with QGIS standard tools.
7+
Catchments can be digitized with QGIS standard tools.
88

99
.. figure:: images/qgis_standard_tools.jpg
1010

11-
They should not overlap. So enable the **Advanced digitizing toolbar** in the **View** --> **Toolbars Menu**
12-
13-
.. figure:: images/advanced_digitzing_toolbar.jpg
11+
Catchment areas should not overlap and can have 4 connections to wastewater nodes.
1412

1513
Digitizing
1614
----------
15+
* Select the **Enable Snapping** button
16+
17+
.. figure:: images/enable_snapping_button.jpg
18+
19+
* Open the **Project Snapping Option Settings**, check the **od_catchment_area** layer and check the **avoid intersection** checkbox for the od_catchment_area layer
20+
21+
.. figure:: images/catchment_avoid_intersection2.jpg
22+
23+
.. note:: New digitized catchement areas will not overlap with existing areas with this settings.
1724

1825
* Set the layer ``od_catchment_area`` into the edit mode.
1926
* Use the **Add Feature** tool to digitize a new area.
2027

2128
.. figure:: images/add_feature_tool.jpg
2229

23-
* Select the **Enable Tracing** button before starting to digitize
30+
* Start digitizing with left click and continue with left click for every vertex of the polygon
31+
32+
.. figure:: images/catchment_area_digitizing1.jpg
33+
34+
* Stop digitizing with right click
35+
36+
.. note:: Keep in mind, that the finishing point of the polygon is the last point where you **left** clicked.
37+
38+
* The **od_catchment_area** form appears
39+
40+
.. figure:: images/catchment_area_digitizing2.jpg
2441

25-
.. figure:: images/magnet_enable_tracing_button.jpg
42+
* When finished editing attributes, click the **OK** button
2643

27-
* TO DO - add next points
44+
.. note:: The new area does not overlap the old areas.
45+
46+
.. figure:: images/catchment_area_digitizing3.jpg
47+
48+
.. note:: To control the exact area of a selected polygon, see in the **Identify Results** window under **(Derived)**.
49+
50+
.. note:: To connect the area with wastewater nodes, see chapter :ref:`connect-wastewater-network-elements`.
2851

2952
Editing
3053
-------
3154

3255
* You can edit existing areas with the **Identify features** tool.
3356

3457
.. figure:: images/identify_feature_tool.jpg
58+
59+
.. note:: There are ideas to have a menu in the feature attribut window, that allows you to copy all current-values to the planned-fields. Not realized yet.
60+
61+
Split Areas
62+
-----------
63+
64+
* You can split existing areas with the **Split** tool.
65+
66+
.. figure:: images/split_tool.jpg
67+
68+
* There is no need to select the area first. Left clicks to define the spliting line. Right click after having defined the last point of the spliting line.
69+
70+
Merge Areas
71+
-----------
72+
73+
You can merge existing areas with the **Merge selected Feature** tool.
74+
75+
.. figure:: images/merge_selected_feature_tool.jpg
76+
77+
* Selected the **od_catchment_area** layer an set it into the edit mode
78+
* Select at least two areas you want to merge
79+
* Click the "Merge selected Feature" tool. -> The **Merge Feature Attributes** windows appears.
80+
81+
.. figure:: images/merge_feature_attributes.jpg
82+
83+
* Choose which values will be taken from wich old record and click **OK**.
84+
85+
.. attention:: If you select one of the records and click on the **Take attributes from the selected feature** button, then the **obj_id** field will be skipped by default and the database will not accept the changes. After using this button, you have to choose one of the values in the **obj_id** field manually.
86+
87+
Connect Catchment area to Wastewater Network Nodes
88+
--------------------------------------------------
89+
90+
You connect catchment areas with the tool **Connect wastewater networkelements** (it's the same tool to connect reaches and nodes described in the chapter Editing in QGEP).
91+
92+
.. figure:: images/connect_wastewater_network_elements_button.jpg
93+
94+
* It does not matter, which layer is selected
95+
* The **catchment_area** layer has to be in edit mode
96+
* Click the **Connect wastewater networkelements** button
97+
* If you move the mouse over an catchment area near the border of the catchment area, it is marked: you can click to choose this record
98+
* Move the mouse to the networkelement, to which the catchment area will by connected (again: selectable objects get marked) and click again
99+
100+
.. figure:: images/catchment_area_connect1.jpg
101+
102+
* A window appears, where you can choose, which connection(s) will be defined.
103+
104+
.. figure:: images/catchment_area_connect2.jpg
105+
106+
* If everything is ok, you will see a message in a blue bar on top of the map-window
107+
108+
.. figure:: images/catchment_area_connect3.jpg
109+
110+
.. note:: In the VSA-DSS-Datamodel, it is possible to connect catchment_areas to wastewater nodes or to reaches. Because a lot of hydraulic calculation do not support connections to reaches, this tool in qgep connects only to wastewater nodes and not to reaches.
111+
112+
.. note:: The tool does not check, if your choosen wastewater node is a part of the pwwf-network (primary network). It's only the user who deciedes, if a node is ok or not. If you are not sure, please check the **VSA Wegleitung GEP-Daten**, part **Erfassungsgrundsätze**
113+
114+
You can not connect multiple areas with the tool to a wastewater node at once. If you want to do so, you have to select the catchment areas, open the attribute table and then start the multi edit mode. There you can choose the wastewater node from the list of all nodes
115+
116+
Do delete a connection to a wastewater node, you can edit the area with the **Identify features** tool.

0 commit comments

Comments
 (0)