enhance blurred views to get sensitive config from ref_geo tables

Author: submarcos

data/atlas/11.vm_cor_area_synthese.sql

@@ -2,44 +2,63 @@ IMPORT FOREIGN SCHEMA gn_synthese
     LIMIT TO (gn_synthese.cor_area_synthese)
 FROM SERVER geonaturedbserver INTO synthese;
 
+IMPORT FOREIGN SCHEMA gn_sensitivity
+LIMIT TO (cor_sensitivity_area_type)  FROM SERVER geonaturedbserver INTO synthese;
+
 CREATE MATERIALIZED VIEW atlas.vm_cor_area_synthese
 TABLESPACE pg_default
 AS
-WITH info_tmp AS (
-SELECT
-    sa.id_synthese,
-    sa.id_area,
-    a.centroid,
-    a.id_type,
-    s.id_nomenclature_sensitivity,
-    st_transform(a.geom, 4326) AS geom
-FROM synthese.synthese s
-         JOIN synthese.cor_area_synthese sa ON sa.id_synthese = s.id_synthese
-         JOIN ref_geo.l_areas a ON sa.id_area = a.id_area
-         JOIN atlas.t_layer_territoire ON st_intersects(a.geom_4326, t_layer_territoire.geom)-- AND NOT ST_Touches(t_layer_territoire.geom, a.geom_4326)
-       )
-SELECT info.id_synthese,
-       info.id_area,
-       info.centroid,
-       info.geom AS geom,
-       st_asgeojson(info.geom) AS geojson_4326,
-       st_transform(info.centroid, 4326) AS centroid_4326,
-       t.type_code,
-       sensi.cd_nomenclature,
-       CASE
-           WHEN sensi.cd_nomenclature = '1' AND t.type_code = :'sensibility1' THEN true
-           WHEN sensi.cd_nomenclature = '2' AND t.type_code = :'sensibility2' THEN true
-           WHEN sensi.cd_nomenclature = '3' AND t.type_code = :'sensibility3' THEN true
-           WHEN (sensi.cd_nomenclature = '0' OR sensi.cd_nomenclature IS NULL) AND t.type_code::text = :'sensibility0' THEN true
-           ELSE false
-           END AS is_blurred_geom
-FROM info_tmp info
-         JOIN ref_geo.bib_areas_types t ON info.id_type = t.id_type
-         LEFT JOIN synthese.t_nomenclatures sensi ON info.id_nomenclature_sensitivity = sensi.id_nomenclature
-WHERE (t.type_code IN (:'sensibility0', :'sensibility1', :'sensibility2', :'sensibility3'))
-  AND (NOT sensi.cd_nomenclature = '4'::TEXT OR sensi.cd_nomenclature IS NULL )
+WITH sensitive_area_type AS (
+    SELECT distinct(synthese.cor_sensitivity_area_type.id_area_type)
+    FROM
+        synthese.cor_sensitivity_area_type
+), info_tmp AS (
+    SELECT
+        sa.id_synthese,
+        sa.id_area,
+        a.centroid,
+        a.id_type,
+        s.id_nomenclature_sensitivity,
+        a.geom_4326,
+        a.geom
+    FROM
+        synthese.synthese s
+    JOIN
+        synthese.cor_area_synthese sa
+            ON sa.id_synthese = s.id_synthese
+    JOIN
+        ref_geo.l_areas a
+            ON sa.id_area = a.id_area
+    JOIN
+            ref_geo.bib_areas_types t
+                ON a.id_type = t.id_type
+    JOIN sensitive_area_type sat ON t.id_type = sat.id_area_type  -- should be an area_type
+    WHERE a.enable = TRUE
+)
+   SELECT
+        info.id_synthese,
+        info.id_area,
+        info.centroid,
+        info.geom,
+        st_asgeojson(info.geom_4326) AS geojson_4326,
+        st_transform(info.centroid,
+        4326) AS centroid_4326,
+        t.type_code,
+        n.cd_nomenclature
+        FROM
+            info_tmp info
+        JOIN
+            ref_geo.bib_areas_types t
+                ON info.id_type = t.id_type
+        JOIN synthese.cor_sensitivity_area_type csat ON t.id_type = csat.id_area_type
+
+        LEFT JOIN
+            synthese.t_nomenclatures n
+                ON info.id_nomenclature_sensitivity = n.id_nomenclature
 
 WITH DATA;
+
 CREATE UNIQUE INDEX i_vm_cor_area_synthese ON atlas.vm_cor_area_synthese USING btree (id_synthese, id_area );
 
-REFRESH MATERIALIZED VIEW CONCURRENTLY atlas.vm_cor_area_synthese;
+
+SELECT count(*) FROM atlas.vm_cor_area_synthese;

data/atlas/13.atlas.vm_observations_mailles.sql

@@ -7,7 +7,7 @@
             ARRAY_AGG(o.id_observation) AS id_observations,
 			cor.type_code
         FROM atlas.vm_observations AS o
-			JOIN atlas.vm_cor_area_synthese cor ON cor.id_synthese = o.id_observation AND cor.is_blurred_geom IS TRUE
+			JOIN atlas.vm_cor_area_synthese cor ON cor.id_synthese = o.id_observation
         GROUP BY o.cd_ref, cor.id_area, cor.type_code, annee
         ORDER BY o.cd_ref
     WITH DATA;