fix(pg2epa_nodarc_export): Export as JUNCTION those valves and pumps with epa_type = 'JUNCTION'

Author: xtorret

ws/fct/ws_gw_fct_pg2epa_nod2arc.sql

@@ -62,22 +62,26 @@ BEGIN
 							UNION ALL SELECT node_2 FROM v_edit_arc) a using (node_id) group by n.node_id';
 
 	-- query text for mandatory node2arcs
-	v_querytext = 'SELECT a.*, man_valve.to_arc FROM temp_t_node a JOIN man_valve ON a.node_id=man_valve.node_id WHERE to_arc is not null
+	v_querytext = 'SELECT a.*, v.to_arc FROM temp_t_node a JOIN man_valve v ON a.node_id=v.node_id JOIN inp_valve i ON i.node_id = v.node_id WHERE to_arc is not null
 				UNION  
-				SELECT a.*, man_pump.to_arc FROM temp_t_node a JOIN man_pump ON a.node_id=man_pump.node_id WHERE to_arc is not null';
+				SELECT a.*, m.to_arc FROM temp_t_node a JOIN man_pump m ON a.node_id=m.node_id JOIN inp_pump i ON i.node_id=m.node_id WHERE to_arc is not null';
 
 
-	v_querytext = concat (' INSERT INTO temp_anl_node (num_arcs, arc_id, node_id, elevation, elev, nodecat_id, sector_id, state, state_type, descript, arc_distance, the_geom, fid, cur_user, dma_id, presszone_id, dqa_id, minsector_id)
-				SELECT c.numarcs, to_arc, b.node_id, elevation, elev, nodecat_id, sector_id, state, state_type, ''MANDATORY'', demand, the_geom, 124, current_user, dma_id, presszone_id, dqa_id, minsector_id
+	v_querytext = concat (' INSERT INTO temp_anl_node (num_arcs, arc_id, node_id, elevation, elev, nodecat_id, sector_id, state, state_type, descript, arc_distance, the_geom, fid, cur_user, 
+				dma_id, presszone_id, dqa_id, minsector_id)
+				SELECT c.numarcs, to_arc, b.node_id, elevation, elev, nodecat_id, sector_id, state, state_type, ''MANDATORY'', demand, the_geom, 124, current_user, dma_id, 
+				presszone_id, dqa_id, minsector_id
 				FROM ( ',v_querytext, ' ) b JOIN ( ',v_query_number,' ) c USING (node_id)');
 	EXECUTE v_querytext; 
 
 	-- query text for non-mandatory node2arcs
 	IF p_only_mandatory_nodarc IS FALSE THEN
-		v_querytext = 'SELECT a.*, s.to_arc FROM temp_t_node a JOIN man_valve s ON a.node_id=s.node_id WHERE s.to_arc IS NULL';
+		v_querytext = 'SELECT a.*, s.to_arc FROM temp_t_node a JOIN man_valve s ON a.node_id=s.node_id JOIN inp_shortpipe i ON i.node_id = s.node_id WHERE s.to_arc IS NULL';
 
-		v_querytext = concat (' INSERT INTO temp_anl_node (num_arcs, arc_id, node_id, elevation, elev, nodecat_id, sector_id, state, state_type, descript, arc_distance, the_geom, fid, cur_user, dma_id, presszone_id, dqa_id, minsector_id)
-				SELECT c.numarcs, to_arc, b.node_id, elevation, elev, nodecat_id, sector_id, state, state_type, ''NOT-MANDATORY'', demand, the_geom, 124, current_user, dma_id, presszone_id, dqa_id, minsector_id
+		v_querytext = concat (' INSERT INTO temp_anl_node (num_arcs, arc_id, node_id, elevation, elev, nodecat_id, sector_id, state, state_type, descript, arc_distance, 
+				the_geom, fid, cur_user, dma_id, presszone_id, dqa_id, minsector_id)
+				SELECT c.numarcs, to_arc, b.node_id, elevation, elev, nodecat_id, sector_id, state, state_type, ''NOT-MANDATORY'', demand, the_geom, 124, 
+				current_user, dma_id, presszone_id, dqa_id, minsector_id
 				FROM ( ',v_querytext, ' ) b JOIN ( ',v_query_number,' ) c USING (node_id)');
 		EXECUTE v_querytext; 
 	END IF;