[Requires Testing] Add label to reach point

05_data_model_extensions.sql

@@ -8,31 +8,15 @@
 
 ALTER TABLE qgep_od.wastewater_structure ADD COLUMN _usage_current integer;
 COMMENT ON COLUMN qgep_od.wastewater_structure._usage_current IS 'not part of the VSA-DSS data model
-added solely for QGEP
+added solely for TEKSI wastewater
 has to be updated by triggers';
 ALTER TABLE qgep_od.wastewater_structure ADD COLUMN _function_hierarchic integer;
 COMMENT ON COLUMN qgep_od.wastewater_structure._function_hierarchic IS 'not part of the VSA-DSS data model
-added solely for QGEP
+added solely for TEKSI wastewater
 has to be updated by triggers';
 ALTER TABLE qgep_od.manhole ADD COLUMN _orientation numeric;
 COMMENT ON COLUMN qgep_od.manhole._orientation IS 'not part of the VSA-DSS data model
-added solely for QGEP';
-ALTER TABLE qgep_od.wastewater_structure ADD COLUMN _label text;
-COMMENT ON COLUMN qgep_od.wastewater_structure._label IS 'not part of the VSA-DSS data model
-added solely for QGEP';
-ALTER TABLE qgep_od.wastewater_structure ADD COLUMN _cover_label text;
-COMMENT ON COLUMN qgep_od.wastewater_structure._cover_label IS 'stores the cover altitude to be used for labelling, not part of the VSA-DSS data model
-added solely for QGEP';
-ALTER TABLE qgep_od.wastewater_structure ADD COLUMN _input_label text;
-COMMENT ON COLUMN qgep_od.wastewater_structure._input_label IS 'stores the list of input altitudes to be used for labelling, not part of the VSA-DSS data model
-added solely for QGEP';
-ALTER TABLE qgep_od.wastewater_structure ADD COLUMN _output_label text;
-COMMENT ON COLUMN qgep_od.wastewater_structure._output_label IS 'stores the list of output altitudes to be used for labelling, not part of the VSA-DSS data model
-added solely for QGEP';
-ALTER TABLE qgep_od.wastewater_structure ADD COLUMN _bottom_label text;
-COMMENT ON COLUMN qgep_od.wastewater_structure._bottom_label IS 'stores the bottom altitude to be used for labelling, not part of the VSA-DSS data model
-added solely for QGEP';
-
+added solely for TEKSI wastewater';
 
 -- this column is an extension to the VSA data model and puts the _function_hierarchic in order
 ALTER TABLE qgep_vl.channel_function_hierarchic ADD COLUMN order_fct_hierarchic smallint;
@@ -51,6 +35,15 @@ UPDATE qgep_vl.channel_function_hierarchic SET order_fct_hierarchic=12 WHERE cod
 UPDATE qgep_vl.channel_function_hierarchic SET order_fct_hierarchic=11 WHERE code=5074;
 UPDATE qgep_vl.channel_function_hierarchic SET order_fct_hierarchic=14 WHERE code=5075;
 
+-- this column is an extension to the VSA data model and defines whether connected channels are included in inflow/outflow labeling based on function_hierarchic
+ALTER TABLE qgep_vl.channel_function_hierarchic ADD COLUMN cfg_include_in_ws_labels boolean DEFAULT FALSE;
+UPDATE qgep_vl.channel_function_hierarchic SET cfg_include_in_ws_labels=TRUE WHERE code=ANY('{5062,5064,5066,5068,5069,5070,5071,5072,5074}');
+
+
+-- this column is an extension to the VSA data model and defines whether connected channels are included in inflow/outflow labeling based on function_hierarchic
+ALTER TABLE qgep_vl.wastewater_structure_status ADD COLUMN cfg_include_in_ws_labels boolean DEFAULT FALSE;
+UPDATE qgep_vl.wastewater_structure_status SET cfg_include_in_ws_labels=TRUE WHERE code=ANY('{8493,6530,6533}');
+
 -- this column is an extension to the VSA data model and puts the _usage_current in order
 ALTER TABLE qgep_vl.channel_usage_current ADD COLUMN order_usage_current smallint;
 UPDATE qgep_vl.channel_usage_current SET order_usage_current=5 WHERE code = 4514;
@@ -72,17 +65,32 @@ UPDATE qgep_vl.channel_usage_current SET order_usage_current=9 WHERE code = 5322
 -- TABLE wastewater_node
 ALTER TABLE qgep_od.wastewater_node ADD COLUMN _usage_current integer;
 COMMENT ON COLUMN qgep_od.wastewater_node._usage_current IS 'not part of the VSA-DSS data model
-added solely for QGEP
+added solely for TEKSI wastewater
 has to be updated by triggers';
 ALTER TABLE qgep_od.wastewater_node ADD COLUMN _function_hierarchic integer;
 COMMENT ON COLUMN qgep_od.wastewater_node._function_hierarchic IS 'not part of the VSA-DSS data model
-added solely for QGEP
+added solely for TEKSI wastewater
 has to be updated by triggers';
 ALTER TABLE qgep_od.wastewater_node ADD COLUMN _status integer;
 COMMENT ON COLUMN qgep_od.wastewater_node._status IS 'not part of the VSA-DSS data model
-added solely for QGEP
+added solely for TEKSI wastewater
 has to be updated by triggers';
 
+-- label extensions
+CREATE TABLE IF NOT EXISTS qgep_od.x_labels
+(
+obj_id character varying(16) COLLATE pg_catalog."default" NOT NULL,
+    x_label text COLLATE pg_catalog."default",
+    x_cover_label text COLLATE pg_catalog."default",
+    x_input_label text COLLATE pg_catalog."default",
+    x_output_label text COLLATE pg_catalog."default",
+    x_bottom_label text COLLATE pg_catalog."default",
+	CONSTRAINT pkey_qgep_od_labels_obj_id PRIMARY KEY (obj_id)
+);
+
+COMMENT ON TABLE qgep_od.x_labels IS 'stores all labels. not part of the VSA-DSS data model
+added solely for TEKSI wastewater
+has to be updated by triggers';
 
 -- Modifications applied for link with SWMM
 -------------------------------------------

system/CURRENT_VERSION.txt

@@ -1 +1 @@
-1.6.0
+1.6.1

test/test_label.py

@@ -58,6 +58,7 @@ def insert_reaches(self, reaches, manholes):
                     'coefficient_of_friction': 10,
                     'ws_identifier': reach['mh_id'],
                     'ch_function_hierarchic': 5062,
+                    'ws_status': 8493,
                     'rp_from_level': reach.get('rp_from_level', 1020.0),
                     'rp_to_level': reach.get('rp_to_level', 1000.0),
                     'ch_usage_current': 4514,

test/test_triggers.py

@@ -100,7 +100,7 @@ def check_values(expected_values_for_field):
         expected = {
             '_label': 'A',
             '_cover_label': '\nC=100.00',
-            '_bottom_label': '',
+            '_bottom_label': '\nB=?',
             '_input_label': '',
             '_output_label': '',
         }
@@ -129,6 +129,7 @@ def check_values(expected_values_for_field):
             'identifier': 'R1',
             'progression_geometry': self.execute('ST_ForceCurve(ST_SetSrid(ST_MakeLine(ST_MakePoint(3000001, 1500001, 100), ST_MakePoint(3000000, 1500000, 100)), 2056))'),
             'ch_function_hierarchic': 5062,
+            'ws_status': 8493,
             'rp_to_fk_wastewater_networkelement': strct_row['wn_obj_id'],
             'rp_to_level': 95
         }
@@ -143,6 +144,7 @@ def check_values(expected_values_for_field):
             'identifier': 'R2',
             'progression_geometry': self.execute('ST_ForceCurve(ST_SetSrid(ST_MakeLine(ST_MakePoint(3000000, 1500000, 92), ST_MakePoint(3000000, 1500001, 90)), 2056))'),
             'ch_function_hierarchic': 5062,
+            'ws_status': 8493,
             'rp_from_fk_wastewater_networkelement': strct_row['wn_obj_id'],
             'rp_from_level': 92
         }
@@ -157,6 +159,7 @@ def check_values(expected_values_for_field):
             'identifier': 'R3',
             'progression_geometry': self.execute('ST_ForceCurve(ST_SetSrid(ST_MakeLine(ST_MakePoint(3000000, 1500000, 93), ST_MakePoint(3000001, 1500000, 90)), 2056))'),
             'ch_function_hierarchic': 5062,
+            'ws_status': 8493,
             'rp_from_fk_wastewater_networkelement': strct_row['wn_obj_id'],
             'rp_from_level': 93
         }

view/vw_qgep_reach.py

@@ -52,15 +52,19 @@ def vw_qgep_reach(pg_service: str = None,
         , {ch_cols}
         , {ws_cols}
         , {rp_from_cols}
+        , rp_from_label.x_label as rp_from_label 
         , {rp_to_cols}
+        , rp_to_label.x_label as rp_to_label
       FROM qgep_od.reach re
          LEFT JOIN qgep_od.wastewater_networkelement ne ON ne.obj_id = re.obj_id
          LEFT JOIN qgep_od.reach_point rp_from ON rp_from.obj_id = re.fk_reach_point_from
          LEFT JOIN qgep_od.reach_point rp_to ON rp_to.obj_id = re.fk_reach_point_to
          LEFT JOIN qgep_od.wastewater_structure ws ON ne.fk_wastewater_structure = ws.obj_id
          LEFT JOIN qgep_od.channel ch ON ch.obj_id = ws.obj_id
          LEFT JOIN qgep_od.pipe_profile pp ON re.fk_pipe_profile = pp.obj_id
-         {extra_joins};
+         {extra_joins}
+         LEFT JOIN qgep_od.x_labels rp_from_label ON rp_from_label.obj_id = rp_from.obj_id
+         LEFT JOIN qgep_od.x_labels rp_to_label ON rp_to_label.obj_id = rp_to.obj_id;
     """.format(extra_cols='\n    , '.join([select_columns(pg_cur=cursor,
                                                           table_schema=table_parts(table_def['table'])[0],
                                                           table_name=table_parts(table_def['table'])[1],
@@ -102,7 +106,7 @@ def vw_qgep_reach(pg_service: str = None,
                                       indent=4,
                                       skip_columns=['detail_geometry_geometry', 'status', 'fk_owner',
                                                     'fk_dataowner', 'fk_provider', '_usage_current',
-                                                    '_function_hierarchic', '_label', '_depth', 'fk_main_cover']),
+                                                    '_function_hierarchic','_depth', 'fk_main_cover']),
                rp_from_cols=select_columns(pg_cur=cursor,
                                            table_schema='qgep_od',
                                            table_name='reach_point',
@@ -184,7 +188,7 @@ def vw_qgep_reach(pg_service: str = None,
                                  remove_pkey=False,
                                  indent=2,
                                  skip_columns=['detail_geometry_geometry', 'fk_dataowner', 'fk_provider',
-                                               '_usage_current', '_function_hierarchic', '_label', '_depth', 'fk_main_cover']),
+                                               '_usage_current', '_function_hierarchic', '_depth', 'fk_main_cover']),
                ch=insert_command(pg_cur=cursor,
                                  table_schema='qgep_od',
                                  table_name='channel',
@@ -283,7 +287,7 @@ def vw_qgep_reach(pg_service: str = None,
                                                 'fk_provider': 'fk_provider',
                                                 'last_modification': 'last_modification'},
                                  skip_columns=['detail_geometry_geometry', '_usage_current', '_function_hierarchic',
-                                               '_label', '_depth', 'fk_main_cover']),
+                                               '_depth', 'fk_main_cover']),
                ne=update_command(pg_cur=cursor,
                                  table_schema='qgep_od',
                                  table_name='wastewater_networkelement',

view/vw_qgep_wastewater_structure.py

@@ -70,11 +70,11 @@ def vw_qgep_wastewater_structure(srid: int,
         , {wn_cols}
         , {ne_cols}
 
-        , ws._label
-        , ws._cover_label
-        , ws._bottom_label
-        , ws._input_label
-        , ws._output_label
+        , labl.x_label as _label
+        , labl.x_cover_label as _cover_label
+        , labl.x_bottom_label as _bottom_label
+        , labl.x_input_label as _input_label
+        , labl.x_output_label as _output_label
         , ws._usage_current AS _channel_usage_current
         , ws._function_hierarchic AS _channel_function_hierarchic
 
@@ -88,6 +88,7 @@ def vw_qgep_wastewater_structure(srid: int,
         LEFT JOIN qgep_od.wastewater_networkelement ne ON ne.obj_id = ws.fk_main_wastewater_node
         LEFT JOIN qgep_od.wastewater_node wn ON wn.obj_id = ws.fk_main_wastewater_node
         LEFT JOIN qgep_od.channel ch ON ch.obj_id = ws.obj_id
+        LEFT JOIN qgep_od.x_labels labl ON labl.obj_id = ws.obj_id
         {extra_joins}
         WHERE ch.obj_id IS NULL;
 
@@ -109,7 +110,7 @@ def vw_qgep_wastewater_structure(srid: int,
                                       table_alias='ws',
                                       remove_pkey=False,
                                       indent=4,
-                                      skip_columns=['identifier', 'fk_owner', 'status', '_label', '_cover_label', '_bottom_label', '_input_label', '_output_label', '_usage_current',
+                                      skip_columns=['identifier', 'fk_owner', 'status', '_usage_current',
                                                     '_function_hierarchic', 'fk_main_cover', 'fk_main_wastewater_node', 'detail_geometry_geometry']),
                main_co_cols=select_columns(pg_cur=cursor,
                                            table_schema='qgep_od',
@@ -240,7 +241,7 @@ def vw_qgep_wastewater_structure(srid: int,
                                         table_alias='ws',
                                         remove_pkey=False,
                                         indent=2,
-                                        skip_columns=['_label', '_cover_label', '_bottom_label', '_input_label', '_output_label', '_usage_current', '_function_hierarchic',
+                                        skip_columns=['_usage_current', '_function_hierarchic',
                                                       'fk_main_cover', 'fk_main_wastewater_node', 'detail_geometry_geometry']),
                insert_ma=insert_command(pg_cur=cursor,
                                         table_schema='qgep_od',
@@ -460,7 +461,7 @@ def vw_qgep_wastewater_structure(srid: int,
                                         remove_pkey=False,
                                         indent=6,
                                         skip_columns=['detail_geometry_geometry', 'last_modification',
-                                                      '_usage_current', '_function_hierarchic', '_label', '_cover_label', '_bottom_label', '_input_label', '_output_label',
+                                                      '_usage_current', '_function_hierarchic', 
                                                       'fk_main_cover', 'fk_main_wastewater_node', '_depth'],
                                         update_values={}),
                update_ma=update_command(pg_cur=cursor,