Refactor of folder dev and clean code

Author: xtorret

dev/version3/admin/gw_fct_admin_drop_all.sql dev/v3/admin/gw_fct_admin_drop_all.sql

@@ -6,14 +6,14 @@ This version of Giswater is provided by Giswater Association
 
 --FUNCTION CODE:
 
-CREATE OR REPLACE FUNCTION ws1_2802.gw_fct_admin_multiplicate_network(p_x integer, p_y integer, p_dx integer, p_dy integer)
+CREATE OR REPLACE FUNCTION ws36010.gw_fct_admin_multiplicate_network(p_x integer, p_y integer, p_dx integer, p_dy integer)
 RETURNS json AS 
 $BODY$
 
 /* example
 
 -- execute
-SELECT ws1_2802.gw_fct_admin_multiplicate_network(2,1,11000,15000);
+SELECT ws36010.gw_fct_admin_multiplicate_network(2,1,1700,2300);
 
 */
 
@@ -26,10 +26,10 @@ BEGIN
 
 
 	-- Set search path to local schema
-	SET search_path = "ws1_2802", public;
+	SET search_path = "ws36010", public;
 
 	-- set previous
-	ALTER TABLE ext_plot ALTER COLUMN id SET DEFAULT nextval('ws1_2802.urn_id_seq'::regclass);
+	ALTER TABLE ext_plot ALTER COLUMN id SET DEFAULT nextval('ws36010.urn_id_seq'::regclass);
 
 	ALTER TABLE node DISABLE TRIGGER gw_trg_edit_foreignkey;
 	ALTER TABLE node DISABLE TRIGGER gw_trg_node_arc_divide;
@@ -40,7 +40,6 @@ BEGIN
 	ALTER TABLE node DISABLE RULE insert_plan_psector_x_node;
 
 	ALTER TABLE arc DISABLE TRIGGER gw_trg_arc_noderotation_update;
-	ALTER TABLE arc DISABLE TRIGGER gw_trg_arc_vnodelink_update;
 	ALTER TABLE arc DISABLE TRIGGER gw_trg_edit_foreignkey;
 	ALTER TABLE arc DISABLE TRIGGER gw_trg_topocontrol_arc;
 	ALTER TABLE arc DISABLE TRIGGER gw_trg_typevalue_fk;
@@ -64,7 +63,7 @@ BEGIN
 		FOR x IN 1..p_x
 		LOOP
 
-			RAISE NOTICE 'X LOOP % , %',y,x;
+			RAISE NOTICE 'X LOOP % , %', y,x;
 
 			RAISE NOTICE 'nodes';
 			INSERT INTO node (code, elevation, depth, nodecat_id, epa_type, sector_id, arc_id, parent_id, state, state_type, annotation, observ,comment, dma_id, presszone_id, 
@@ -85,6 +84,7 @@ BEGIN
 			INSERT INTO inp_pump SELECT node_id FROM node WHERE state >0 and epa_type = 'PUMP' ON CONFLICT (node_id) DO NOTHING;
 			INSERT INTO inp_shortpipe SELECT node_id FROM node WHERE state >0 and epa_type = 'SHORTPIPE' ON CONFLICT (node_id) DO NOTHING;
 
+
 			-- TODO: insert man_junctio & others nodes.....	
 
 			RAISE NOTICE 'arcs';
@@ -99,6 +99,7 @@ BEGIN
 
 			INSERT INTO inp_pipe SELECT arc_id FROM arc WHERE state >0 and epa_type = 'PIPE' ON CONFLICT (arc_id) DO NOTHING;
 			INSERT INTO inp_virtualvalve SELECT arc_id FROM arc WHERE state >0 and epa_type = 'VIRTUALVALVE' ON CONFLICT (arc_id) DO NOTHING;
+			INSERT INTO inp_virtualpump SELECT arc_id FROM arc WHERE state >0 and epa_type = 'VIRTUALPUMP' ON CONFLICT (arc_id) DO NOTHING;
 
 			-- TODO: insert man_pipe
 
@@ -107,22 +108,23 @@ BEGIN
 				function_type, category_type, fluid_type, location_type, workcat_id, workcat_id_end, workcat_id_plan, buildercat_id, builtdate, enddate, ownercat_id, streetaxis2_id, postnumber, postnumber2, 
 				muni_id, streetaxis_id,  postcode, district_id, postcomplement, postcomplement2, descript, link, verified, rotation,  the_geom, undelete, label_x,label_y,label_rotation, expl_id,
 				publish, inventory,num_value, connec_length, arc_id, minsector_id, dqa_id, staticpressure, pjoint_id, pjoint_type,
-				adate, adescript, accessibility, lastupdate, lastupdate_user, asset_id, epa_type)
+				adate, adescript, accessibility, lastupdate, lastupdate_user, asset_id, epa_type,
+				om_state, conserv_state, priority, valve_location, valve_type, shutoff_valve, access_type, placement_type, crmzone_id, expl_id2, plot_code)
 			SELECT 	code, elevation, depth,connecat_id,  sector_id, customer_code,  state, state_type, annotation, observ, comment,dma_id, presszone_id, soilcat_id,
 				function_type, category_type, fluid_type, location_type, workcat_id, workcat_id_end, workcat_id_plan, buildercat_id, builtdate, enddate, ownercat_id, streetaxis2_id, postnumber, postnumber2, 
 				muni_id, streetaxis_id,  postcode, district_id, postcomplement, postcomplement2, descript, link, verified, rotation, st_translate(the_geom,x*p_dx,y*p_dy), undelete, label_x,label_y,label_rotation, expl_id,
 				publish, inventory,num_value, connec_length, arc_id, minsector_id, dqa_id, staticpressure, pjoint_id, pjoint_type,
-				adate, adescript, accessibility, lastupdate, lastupdate_user, asset_id, epa_type FROM connec;
+				adate, adescript, accessibility, lastupdate, lastupdate_user, asset_id, epa_type, om_state, conserv_state, priority, valve_location, valve_type, shutoff_valve, access_type, 
+				placement_type, crmzone_id, expl_id2, plot_code FROM connec;
 
 			INSERT INTO inp_connec SELECT connec_id FROM connec WHERE epa_type = 'JUNCTION' ON CONFLICT (connec_id) DO NOTHING;
 
 			RAISE NOTICE 'links';
-			INSERT INTO link (feature_type, feature_id, expl_id, exit_id, exit_type, userdefined_geom, state, the_geom, vnode_topelev)
-			SELECT feature_type, feature_id, expl_id, exit_id, exit_type, userdefined_geom, state,  st_translate(the_geom,x*p_dx,y*p_dy), vnode_topelev FROM link;
-
-			RAISE NOTICE 'Vnode';
-			INSERT INTO vnode (state, the_geom)
-			SELECT state, st_translate(the_geom,x*p_dx,y*p_dy) FROM vnode;
+			INSERT INTO link (feature_type, feature_id, expl_id, exit_id, exit_type, userdefined_geom, state, the_geom, exit_topelev, 
+			exit_elev, sector_id, dma_id, fluid_type, presszone_id, dqa_id, minsector_id,expl_id2, epa_type, is_operative, insert_user, lastupdate, lastupdate_user, connecat_id, workcat_id, workcat_id_end, builtdate, enddate)
+			SELECT feature_type, feature_id, expl_id, exit_id, exit_type, userdefined_geom, state,  st_translate(the_geom,x*p_dx,y*p_dy), exit_topelev,
+			exit_elev, sector_id, dma_id, fluid_type, presszone_id, dqa_id, minsector_id,expl_id2, epa_type, is_operative, insert_user, lastupdate, lastupdate_user, connecat_id, workcat_id, workcat_id_end, builtdate, enddate
+			FROM link;
 
 			RAISE NOTICE 'Plot';
 			INSERT INTO ext_plot (plot_code, muni_id,  postcode, streetaxis_id, postnumber, complement, placement, square, observ, text, the_geom, expl_id) 
@@ -142,7 +144,6 @@ BEGIN
 	ALTER TABLE node ENABLE RULE insert_plan_psector_x_node;
 
 	ALTER TABLE arc ENABLE TRIGGER gw_trg_arc_noderotation_update;
-	ALTER TABLE arc ENABLE TRIGGER gw_trg_arc_vnodelink_update;
 	ALTER TABLE arc ENABLE TRIGGER gw_trg_edit_foreignkey;
 	ALTER TABLE arc ENABLE TRIGGER gw_trg_topocontrol_arc;
 	ALTER TABLE arc ENABLE TRIGGER gw_trg_typevalue_fk;

dev/version3/admin/gw_fct_admin_multiplicate_network.sql dev/v3/admin/gw_fct_admin_multiplicate_network.sql

@@ -12,6 +12,7 @@ CREATE OR REPLACE FUNCTION SCHEMA_NAME.gw_fct_linktonetwork(p_data json)
 RETURNS json AS
 $BODY$
 
+
 /*
 GOAL
 ----
@@ -32,7 +33,7 @@ EXAMPLES
 --------
 SELECT SCHEMA_NAME.gw_fct_setlinktonetwork($${"client":{"device":4, "infoType":1, "lang":"ES"},"feature":{"id":["3201","3200"]},"data":{"feature_type":"CONNEC", "forcedArcs":["2001","2002"]}}$$);
 
-SELECT SCHEMA_NAME.gw_fct_setlinktonetwork($${"client":{"device":4, "infoType":1, "lang":"ES"},"feature":{"id":["3136"]},"data":{"feature_type":"CONNEC"}}$$);
+SELECT SCHEMA_NAME.gw_fct_setlinktonetwork($${"client":{"device":4, "infoType":1, "lang":"ES"},"feature":{"id":["3209"]},"data":{"feature_type":"CONNEC"}}$$);
 
 
 SELECT SCHEMA_NAME.gw_fct_setlinktonetwork($${"client":{"device":4, "infoType":1, "lang":"ES"},"feature":{"id":["100013"]},"data":{"feature_type":"CONNEC", "forcedArcs":["221"]}}$$);
@@ -193,9 +194,9 @@ BEGIN
 
 		RAISE NOTICE '% - %', v_i, v_connect_id;
 
-	    IF v_isforcedarcs IS FALSE THEN
-	    	v_forcedarcs= '';
-	    END IF; 
+		IF v_isforcedarcs IS FALSE THEN
+			v_forcedarcs= '';
+		END IF; 
 
 		INSERT INTO audit_check_data (fid, result_id, criticity, error_message)
 		VALUES (217, null, 4, concat('Trying to connect ', lower(v_feature_type),' with id ',v_connect_id,'.'));
@@ -242,13 +243,14 @@ BEGIN
 		-- Use connect.arc_id as forced arcs in case of exists
 		IF v_connect.arc_id IS NOT NULL AND v_isforcedarcs is False THEN
 			v_forcedarcs = concat (' AND arc_id::integer = ',v_connect.arc_id,' ');
+			
 			-- check if forced arc diameter is smaller than configured
-            IF v_projecttype  ='WS' THEN
-                IF (SELECT cat_dnom::integer FROM vu_arc WHERE arc_id=v_connect.arc_id) >= v_check_arcdnom AND v_check_arcdnom_status IS TRUE THEN
-                    EXECUTE 'SELECT gw_fct_getmessage($${"client":{"device":4, "infoType":1, "lang":"ES"},"feature":{},
-                    "data":{"message":"3232", "function":"3188","debug_msg":'||v_check_arcdnom||', "is_process":true}}$$);';
-                END IF;
-            END IF;
+			IF v_projecttype  ='WS' THEN
+				IF (SELECT cat_dnom::integer FROM vu_arc WHERE arc_id=v_connect.arc_id) >= v_check_arcdnom AND v_check_arcdnom_status IS TRUE THEN
+					EXECUTE 'SELECT gw_fct_getmessage($${"client":{"device":4, "infoType":1, "lang":"ES"},"feature":{},
+					"data":{"message":"3232", "function":"3188","debug_msg":'||v_check_arcdnom||', "is_process":true}}$$);';
+				END IF;
+			END IF;
 		END IF;	
 
 		IF v_arc.arc_id IS NOT NULL THEN
@@ -258,7 +260,7 @@ BEGIN
 
 			-- Use check arc diameter variable 
 			IF v_projecttype = 'WS' AND v_check_arcdnom_status IS TRUE THEN	
-				v_checkeddiam = concat(' AND cat_dnom::integer<',v_check_arcdnom,' ');
+				v_checkeddiam = concat(' AND cat_dnom::integer <',v_check_arcdnom,' ');
 			ELSE v_checkeddiam = '';
 			END IF;
 
@@ -276,13 +278,13 @@ BEGIN
 				SELECT arc_id FROM index_query ORDER BY distance limit 1'
 				INTO v_connect.arc_id;
 
-			IF v_connect.arc_id IS NULL and v_forcedarcs is not null THEN -- looking for closest arc from connect
-				EXECUTE 'WITH index_query AS(
-				SELECT ST_Distance(the_geom, '||quote_literal(v_connect.the_geom::text)||') as distance, arc_id FROM arc WHERE state > 0 '||v_forcedarcs||')
-				SELECT arc_id FROM index_query ORDER BY distance limit 1'
-				INTO v_connect.arc_id;
-			end if;
-
+				IF v_connect.arc_id IS NULL and v_forcedarcs is not null THEN -- looking for closest arc from connect
+					EXECUTE 'WITH index_query AS(
+					SELECT ST_Distance(the_geom, '||quote_literal(v_connect.the_geom::text)||') as distance, arc_id FROM arc WHERE state > 0 '||v_forcedarcs||')
+					SELECT arc_id FROM index_query ORDER BY distance limit 1'
+					INTO v_connect.arc_id;
+				END IF;
+			
 			END IF;
 
 			-- get v_edit_arc information