Suppression appel fonction fct_get_altitude_intersection et récupérat…

…ion de l'altitude du site
PnX-SI · Dec 30, 2024 · a712c57 · a712c57
1 parent ca836cd
commit a712c57
Show file tree

Hide file tree

Showing 36 changed files with 148 additions and 195 deletions.
diff --git a/POPAmphibien/exports/csv/export_csv.sql b/POPAmphibien/exports/csv/export_csv.sql
@@ -15,8 +15,8 @@ SELECT
     s.base_site_name AS nom_site,
     st_x(s.geom_local) AS x_lambert93,
     st_y(s.geom_local) AS y_lambert93,
-    alt.altitude_min AS altitude_min,
-    alt.altitude_max AS altitude_max,
+    s.altitude_min AS altitude_min,
+    s.altitude_max AS altitude_max,
     ref_nomenclatures.get_nomenclature_label(nullif(json_extract_path(sc.data::json,'milieu_aquatique')::text,'null')::integer, 'fr') AS milieu_aquatique,
     ref_nomenclatures.get_nomenclature_label(nullif(json_extract_path(sc.data::json,'variation_eau')::text,'null')::integer, 'fr') AS variation_eau,
     ref_nomenclatures.get_nomenclature_label(nullif(json_extract_path(sc.data::json,'courant')::text,'null')::integer, 'fr') AS courant,
@@ -85,11 +85,10 @@ LEFT JOIN LATERAL ( SELECT array_agg(r.id_role) AS ids_observers,
     JOIN utilisateurs.t_roles r ON r.id_role = cvo.id_role
     LEFT JOIN utilisateurs.bib_organismes org ON org.id_organisme =r.id_organisme
     WHERE cvo.id_base_visit = v.id_base_visit) obs ON true
-LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt(altitude_min, altitude_max) ON true
 LEFT JOIN LATERAL (SELECT ref_nomenclatures.get_nomenclature_label(json_array_elements(vc.data::json #> '{methode_de_prospection}')::text::integer,'fr') AS methodes ) meth ON TRUE
 WHERE m.module_code = 'popamphibien'
 GROUP BY o.uuid_observation, obs.organismes_rattaches, dep.area_name, dep.area_code, tsg.sites_group_name, o.cd_nom, t.lb_nom, t.nom_vern, o.comments, oc.data, v.visit_date_min, v.id_dataset, d.dataset_name, v.comments, v.uuid_base_visit,
-s.base_site_name, sc.data, vc.data, alt.altitude_min, alt.altitude_max, obs.observers, com.area_name, s.geom_local;
+s.base_site_name, sc.data, vc.data, s.altitude_min, s.altitude_max, obs.observers, com.area_name, s.geom_local;
 
 
 ---------------------------------------------------POPAmphibien analyses------------------------------------------
@@ -116,8 +115,8 @@ SELECT
     s.base_site_name AS nom_site,
     st_x(s.geom_local) AS x_lambert93,
     st_y(s.geom_local) AS y_lambert93,
-    alt.altitude_min AS altitude_min,
-    alt.altitude_max AS altitude_max,
+    s.altitude_min AS altitude_min,
+    s.altitude_max AS altitude_max,
     ref_nomenclatures.get_nomenclature_label(nullif(json_extract_path(sc.data::json,'milieu_aquatique')::text,'null')::integer, 'fr') AS milieu_aquatique,
     ref_nomenclatures.get_nomenclature_label(nullif(json_extract_path(sc.data::json,'variation_eau')::text,'null')::integer, 'fr') AS variation_eau,
     ref_nomenclatures.get_nomenclature_label(nullif(json_extract_path(sc.data::json,'courant')::text,'null')::integer, 'fr') AS courant,
@@ -182,9 +181,8 @@ LEFT JOIN LATERAL ( SELECT array_agg(r.id_role) AS ids_observers,
     FROM gn_monitoring.cor_visit_observer cvo
     JOIN utilisateurs.t_roles r ON r.id_role = cvo.id_role
     LEFT JOIN utilisateurs.bib_organismes org ON org.id_organisme =r.id_organisme
-    WHERE cvo.id_base_visit = v.id_base_visit) obs ON true
-LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt(altitude_min, altitude_max) ON true
+    WHERE cvo.id_base_visit = v.id_base_visit) obs ON true 
 LEFT JOIN lateral (SELECT ref_nomenclatures.get_nomenclature_label(json_array_elements(vc.data::json #> '{methode_de_prospection}')::text::integer,'fr') as methodes ) meth on true
 WHERE m.module_code = 'popamphibien'
-GROUP BY v.id_base_visit, v.id_dataset, d.dataset_name, tsg.sites_group_name, s.base_site_name, s.geom_local, alt.altitude_min, alt.altitude_max, sc.data, dep.area_name, dep.area_code, com.area_name, sp.area_name, 
+GROUP BY v.id_base_visit, v.id_dataset, d.dataset_name, tsg.sites_group_name, s.base_site_name, s.geom_local, s.altitude_min, s.altitude_max, sc.data, dep.area_name, dep.area_code, com.area_name, sp.area_name, 
 vc.data, obs.observers, obs.organismes_rattaches, observations.diversite, observations.taxons_latin, observations.taxons_fr, observations.count_min, observations.count_max ;
diff --git a/POPAmphibien/synthese.sql b/POPAmphibien/synthese.sql
@@ -48,8 +48,8 @@ AS WITH source AS (
     o.id_observation,
     o.cd_nom,
     t.nom_complet AS nom_cite,
-    alt.altitude_min,
-    alt.altitude_max,
+    s.altitude_min,
+    s.altitude_max,
     s.geom AS the_geom_4326,
     st_centroid(s.geom) AS the_geom_point,
     s.geom_local AS the_geom_local,
@@ -95,5 +95,4 @@ AS WITH source AS (
            FROM gn_monitoring.cor_visit_observer cvo
              JOIN utilisateurs.t_roles r ON r.id_role = cvo.id_role
           WHERE cvo.id_base_visit = v.id_base_visit) obs ON true
-     LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt(altitude_min, altitude_max) ON true
     WHERE m.module_code = :module_code;
diff --git a/POPReptile/exports/csv/export_csv.sql b/POPReptile/exports/csv/export_csv.sql
@@ -21,8 +21,8 @@ SELECT
    	st_astext(s.geom) AS wkt,
     st_x(st_centroid(s.geom_local)) AS x_centroid_L93,
     st_y(st_centroid(s.geom_local)) AS y_centroid_L93,
-    alt.altitude_min AS altitude_min,
-    alt.altitude_max AS altitude_max,
+    s.altitude_min AS altitude_min,
+    s.altitude_max AS altitude_max,
     dep.area_name AS departement,
     dep.area_code AS code_dep,
     com.area_name AS commune,
@@ -96,8 +96,7 @@ LEFT JOIN LATERAL ( SELECT array_agg(r.id_role) AS ids_observers,
     FROM gn_monitoring.cor_visit_observer cvo
     JOIN utilisateurs.t_roles r ON r.id_role = cvo.id_role
     LEFT JOIN utilisateurs.bib_organismes org ON org.id_organisme =r.id_organisme
-    WHERE cvo.id_base_visit = v.id_base_visit) obs ON true
-LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt(altitude_min, altitude_max) ON true
+    WHERE cvo.id_base_visit = v.id_base_visit) obs ON true 
 LEFT JOIN LATERAL (SELECT ref_nomenclatures.get_nomenclature_label(json_array_elements(vc.data::json #> '{methode_de_prospection}')::text::integer,'fr') AS methodes ) meth ON TRUE
 WHERE m.module_code = 'popreptile'
 GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52
@@ -142,8 +141,8 @@ SELECT
     st_astext(s.geom) AS wkt,
     st_x(st_centroid(s.geom_local)) AS x_centroid_L93,
     st_y(st_centroid(s.geom_local)) AS y_centroid_L93,
-    alt.altitude_min AS altitude_min,
-    alt.altitude_max AS altitude_max,
+    s.altitude_min AS altitude_min,
+    s.altitude_max AS altitude_max,
     dep.area_name AS departement,
     dep.area_code AS code_dep,
     com.area_name AS commune,
@@ -210,8 +209,7 @@ LEFT JOIN LATERAL ( SELECT array_agg(r.id_role) AS ids_observers,
     FROM gn_monitoring.cor_visit_observer cvo
     JOIN utilisateurs.t_roles r ON r.id_role = cvo.id_role
     LEFT JOIN utilisateurs.bib_organismes org ON org.id_organisme =r.id_organisme
-    WHERE cvo.id_base_visit = v.id_base_visit) obs ON true
-LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt(altitude_min, altitude_max) ON true
+    WHERE cvo.id_base_visit = v.id_base_visit) obs ON true 
 LEFT JOIN lateral (SELECT ref_nomenclatures.get_nomenclature_label(json_array_elements(vc.data::json #> '{methode_de_prospection}')::text::integer,'fr') as methodes ) meth on true
 WHERE m.module_code = 'popreptile'
 GROUP BY 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45

diff --git a/POPReptile/synthese.sql b/POPReptile/synthese.sql
@@ -61,8 +61,8 @@ AS WITH source AS (
     END AS count_max,
     o.cd_nom,
     t.nom_complet AS nom_cite,
-    alt.altitude_min,
-    alt.altitude_max,
+    s.altitude_min,
+    s.altitude_max,
     s.geom AS the_geom_4326,
     st_centroid(s.geom) AS the_geom_point,
     s.geom_local AS the_geom_local,
@@ -116,7 +116,6 @@ AS WITH source AS (
             string_agg(concat(r.nom_role, ' ', r.prenom_role), ' ; '::text) AS observers
            FROM gn_monitoring.cor_visit_observer cvo
              JOIN utilisateurs.t_roles r ON r.id_role = cvo.id_role
-          WHERE cvo.id_base_visit = v.id_base_visit) obs ON true
-     LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt(altitude_min, altitude_max) ON true
+          WHERE cvo.id_base_visit = v.id_base_visit) obs ON true 
     WHERE m.module_code = :module_code;
 
diff --git a/RHOMEOAmphibien/exports/csv/export_csv.sql b/RHOMEOAmphibien/exports/csv/export_csv.sql
@@ -177,9 +177,6 @@ SELECT
 	JOIN source 
         ON TRUE
 	JOIN observers obs ON obs.id_base_visit = v.id_base_visit
-
- 	LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt (altitude_min, altitude_max)
-        ON TRUE
     WHERE m.module_code = 'RHOMEOAmphibien'
     ;
 
@@ -380,8 +377,5 @@ SELECT
 	JOIN source 
         ON TRUE
 	--JOIN observers obs ON obs.id_base_visit = v.id_base_visit
-
- 	-- LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt (altitude_min, altitude_max)
-    --     ON TRUE
     WHERE m.module_code = 'RHOMEOAmphibien'
     ;
diff --git a/RHOMEOAmphibien/synthese.sql b/RHOMEOAmphibien/synthese.sql
@@ -58,7 +58,9 @@ WITH source AS (
 		(sc.data::json#>>'{esp_veget}')::text AS esp_veget,
 		(sc.data::json#>>'{esp_poisson}')::text AS esp_poisson,
 		(sc.data::json#>>'{esp_ecrevisse}')::text AS esp_ecrevisse,
-		base_site_description
+		base_site_description,
+		s.altitude_min,
+		s.altitude_max 
         FROM gn_monitoring.t_base_sites s
 		JOIN gn_monitoring.t_site_complements sc USING (id_base_site)
 		LEFT JOIN gn_monitoring.t_sites_groups sg USING (id_sites_group)
@@ -144,8 +146,8 @@ SELECT
 		--meta_v_taxref
 		--sample_number_proof
 		--digital_proofvue
-		alt.altitude_min,
-		alt.altitude_max,
+		s.altitude_min,
+		s.altitude_max,
 		s.the_geom_4326,
 		s.the_geom_point,
 		s.the_geom_local,
@@ -205,8 +207,6 @@ SELECT
 	JOIN source 
         ON TRUE
 	JOIN observers obs 
-		ON obs.id_base_visit = v.id_base_visit
- 	LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.the_geom_local) alt (altitude_min, altitude_max)
-        ON TRUE
+		ON obs.id_base_visit = v.id_base_visit 
     WHERE m.module_code = :module_code
     ;
diff --git a/RHOMEOFlore/exports/csv/export_csv.sql b/RHOMEOFlore/exports/csv/export_csv.sql
@@ -153,10 +153,7 @@ SELECT
         ON t.cd_nom = o.cd_nom
 	JOIN source 
         ON TRUE
-	JOIN observers obs ON obs.id_base_visit = v.id_base_visit
-
- 	LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt (altitude_min, altitude_max)
-        ON TRUE
+	JOIN observers obs ON obs.id_base_visit = v.id_base_visit 
     WHERE m.module_code = 'RHOMEOFlore'
     ;
 

diff --git a/RHOMEOFlore/synthese.sql b/RHOMEOFlore/synthese.sql
@@ -45,7 +45,9 @@ WITH source AS (
 		base_site_name, 
 		(sc.data::json#>>'{expo}')::text AS expo_terrain,
 		(sc.data::json#>>'{desc_pente}')::text AS profil_pente,
-		base_site_description
+		base_site_description,
+		s.altitude_min, 
+		s.altitude_max
         FROM gn_monitoring.t_base_sites s
 		JOIN gn_monitoring.t_site_complements sc USING (id_base_site)
 		LEFT JOIN gn_monitoring.t_sites_groups sg USING (id_sites_group)
@@ -155,8 +157,8 @@ SELECT
 		--meta_v_taxref
 		--sample_number_proof
 		--digital_proofvue
-		alt.altitude_min,
-		alt.altitude_max,
+		s.altitude_min,
+		s.altitude_max,
 		s.the_geom_4326,
 		s.the_geom_point,
 		s.the_geom_local,
@@ -193,9 +195,6 @@ SELECT
         ON t.cd_nom = o.cd_nom
 	JOIN source 
         ON TRUE
-	JOIN observers obs ON obs.id_base_visit = v.id_base_visit
-
- 	LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.the_geom_local) alt (altitude_min, altitude_max)
-        ON TRUE
+	JOIN observers obs ON obs.id_base_visit = v.id_base_visit 
     WHERE m.module_code = :module_code
     ;
diff --git a/RHOMEOOdonate/exports/csv/export_csv.sql b/RHOMEOOdonate/exports/csv/export_csv.sql
@@ -169,10 +169,7 @@ SELECT
         ON t.cd_nom = o.cd_nom
 	JOIN source 
         ON TRUE
-	JOIN observers obs ON obs.id_base_visit = v.id_base_visit
-
- 	LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt (altitude_min, altitude_max)
-        ON TRUE
+	JOIN observers obs ON obs.id_base_visit = v.id_base_visit 
     WHERE m.module_code = 'RHOMEOOdonate'
     ;
 

diff --git a/RHOMEOOdonate/synthese.sql b/RHOMEOOdonate/synthese.sql
@@ -39,7 +39,9 @@ WITH source AS (
         id_base_site,
         geom AS the_geom_4326,
 	    ST_CENTROID(geom) AS the_geom_point,
-	    geom_local as the_geom_local 
+	    geom_local as the_geom_local,
+		altitude_min, 
+		altitude_max
 
         FROM gn_monitoring.t_base_sites
 
@@ -155,8 +157,8 @@ SELECT
 	--meta_v_taxref
 	--sample_number_proof
 	--digital_proofvue
-	alt.altitude_min,
-	alt.altitude_max,
+	s.altitude_min,
+	s.altitude_max,
 	s.the_geom_4326,
 	s.the_geom_point,
 	s.the_geom_local,
@@ -194,8 +196,6 @@ JOIN taxonomie.taxref t
 JOIN source 
 	ON TRUE
 JOIN observers obs 
-	ON obs.id_base_visit = v.id_base_visit
-LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.the_geom_local) alt (altitude_min, altitude_max)
-	ON TRUE
+	ON obs.id_base_visit = v.id_base_visit 
 WHERE m.module_code = :module_code
     ;
diff --git a/RHOMEOOrthoptere/synthese.sql b/RHOMEOOrthoptere/synthese.sql
@@ -32,15 +32,14 @@ WITH source AS (
 	WHERE name_source = CONCAT('MONITORING_', UPPER(:module_code))
 	LIMIT 1
 
-), sites AS (
-
-    SELECT
-
+), sites AS ( 
+    SELECT 
         id_base_site,
         geom AS the_geom_4326,
 	    ST_CENTROID(geom) AS the_geom_point,
-	    geom_local as the_geom_local 
-
+	    geom_local as the_geom_local ,
+		altitude_min,
+		altitude_max 
         FROM gn_monitoring.t_base_sites
 
 ), visits AS (
@@ -143,8 +142,8 @@ SELECT
 	--meta_v_taxref
 	--sample_number_proof
 	--digital_proofvue
-	alt.altitude_min,
-	alt.altitude_max,
+	s.altitude_min,
+	s.altitude_max,
 	s.the_geom_4326,
 	s.the_geom_point,
 	s.the_geom_local,
@@ -181,8 +180,6 @@ JOIN taxonomie.taxref t
 JOIN source 
 	ON TRUE
 JOIN observers obs 
-	ON obs.id_base_visit = v.id_base_visit
-LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.the_geom_local) alt (altitude_min, altitude_max)
-	ON TRUE
+	ON obs.id_base_visit = v.id_base_visit 
 WHERE m.module_code = :module_code
     ;
diff --git a/apollons/synthese.sql b/apollons/synthese.sql
@@ -43,8 +43,8 @@ WITH source AS (
     COALESCE((vc.DATA->>'count_stade_l5')::int, 0)  AS count_max,
     t.cd_nom,
     t.nom_complet AS nom_cite,
-    alt.altitude_min,
-    alt.altitude_max,
+    s.altitude_min,
+    s.altitude_max,
     s.geom AS the_geom_4326,
     st_centroid(s.geom) AS the_geom_point,
     s.geom_local AS the_geom_local,
@@ -66,7 +66,6 @@ WITH source AS (
      JOIN taxonomie.taxref t ON t.cd_nom = ((vc.data ->> 'cd_nom'::text)::integer)
      LEFT JOIN observers obs ON obs.id_base_visit = v.id_base_visit
      JOIN source ON true
-     LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt(altitude_min, altitude_max) ON true
   WHERE m.module_code = :module_code
     AND COALESCE((vc.DATA->>'count_stade_l1')::int, 0) +
     COALESCE((vc.DATA->>'count_stade_l2')::int, 0) +

diff --git a/cheveches/synthese.sql b/cheveches/synthese.sql
@@ -52,8 +52,8 @@ SELECT
 		--meta_v_taxref
 		--sample_number_proof
 		--digital_proofvue
-		alt.altitude_min,
-		alt.altitude_max,
+		s.altitude_min,
+		s.altitude_max,
 		s.geom AS the_geom_4326,
 		ST_CENTROID(s.geom) AS the_geom_point,
 		s.geom_local AS the_geom_local,
@@ -89,8 +89,6 @@ SELECT
 	JOIN taxonomie.taxref t ON cd_nom = (vc.data->>'cd_nom')::int
 	LEFT OUTER JOIN observers obs ON obs.id_base_visit = v.id_base_visit
 	JOIN source 
-        ON TRUE
- 	LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt (altitude_min, altitude_max)
-        ON TRUE
+        ON TRUE 
     WHERE m.module_code =  :module_code
     ;
diff --git a/chiro/synthese.sql b/chiro/synthese.sql
@@ -34,8 +34,8 @@ SELECT
     ref_nomenclatures.get_id_nomenclature('TYP_GRP', 'REL') as id_nomenclature_grp_typ,
     t.cd_nom,
     t.nom_complet AS nom_cite,
-    alt.altitude_min,
-    alt.altitude_max,
+    s.altitude_min,
+    s.altitude_max,
     s.geom AS the_geom_4326,
     st_centroid(s.geom) AS the_geom_point,
     s.geom_local AS the_geom_local,
@@ -66,7 +66,6 @@ JOIN gn_monitoring.t_observations to2 ON to2.id_base_visit = vc.id_base_visit
 JOIN gn_monitoring.t_observation_complements toc ON toc.id_observation = to2.id_observation
 JOIN taxonomie.taxref t ON t.cd_nom = to2.cd_nom
 JOIN observers obs ON obs.id_base_visit = v.id_base_visit
-JOIN source ON true
-LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt(altitude_min, altitude_max) ON true
+JOIN source ON true 
 WHERE m.module_code = 'chiro'
 ORDER BY to2.uuid_observation;
diff --git a/chronocapture/synthese.sql b/chronocapture/synthese.sql
@@ -18,9 +18,10 @@ WITH source AS (
         uuid_base_site,
         geom AS the_geom_4326,
 	    ST_CENTROID(geom) AS the_geom_point,
-	    geom_local as geom_local
-
-        FROM gn_monitoring.t_base_sites
+	    geom_local as geom_local,
+		s.altitude_min,
+		s.altitude_max
+        FROM gn_monitoring.t_base_sites s
 
 ), visits AS (
 
@@ -85,8 +86,8 @@ SELECT
 		--meta_v_taxref
 		--sample_number_proof
 		--digital_proofvue
-		alt.altitude_min,
-		alt.altitude_max,
+		s.altitude_min,
+		s.altitude_max,
 		s.the_geom_4326,	-- v.
 		s.the_geom_point,	-- v.
 		s.geom_local as the_geom_local,	-- v.
@@ -120,5 +121,4 @@ SELECT
 	--JOIN gn_monitoring.t_observations o ON o.id_base_visit = v.id_base_visit 
 	JOIN gn_monitoring.t_observation_complements oc ON oc.id_observation=o.id_observation
 	JOIN taxonomie.taxref t ON t.cd_nom = o.cd_nom
- 	LEFT JOIN LATERAL ref_geo.fct_get_altitude_intersection(s.geom_local) alt (altitude_min, altitude_max) ON true
     WHERE m.module_code = 'chronocapture';