Merge pull request #1154 from MTES-MCT/feat-count-by-statut

Compte les friches par statut

Author: alexisig

airflow/include/sql/sparte/macros/cartofriches/count_friche_by_value.sql

@@ -35,7 +35,8 @@ friche_data AS (
     SELECT
         site_id,
         {{ row_name }},
-        surface
+        surface,
+        friche_statut as statut
     FROM {{ ref('friche') }}
 )
 
@@ -45,7 +46,13 @@ SELECT
     l.land_name,
     v.{{ row_name }},
     COUNT(f.surface) AS friche_count,
-    COALESCE(SUM(f.surface), 0) AS friche_surface
+    COUNT(f.surface) filter (where f.statut = 'friche sans projet') AS friche_sans_projet_count,
+    COUNT(f.surface) filter (where f.statut = 'friche avec projet') AS friche_avec_projet_count,
+    COUNT(f.surface) filter (where f.statut = 'friche reconvertie') AS friche_reconvertie_count,
+    COALESCE(SUM(f.surface), 0) AS friche_surface,
+    COALESCE(SUM(f.surface) filter (where f.statut = 'friche sans projet'), 0) AS friche_sans_projet_surface,
+    COALESCE(SUM(f.surface) filter (where f.statut = 'friche avec projet'), 0) AS friche_avec_projet_surface,
+    COALESCE(SUM(f.surface) filter (where f.statut = 'friche reconvertie'), 0) AS friche_reconvertie_surface
 FROM
     land_base l
 CROSS JOIN

airflow/include/sql/sparte/macros/cartofriches/standardize_friche_nature.sql

@@ -0,0 +1,7 @@
+{% macro standardize_friche_nature(friche_nature) %}
+    CASE
+        WHEN {{ friche_nature }} = 'MTE
+' THEN 'MTE'
+        ELSE {{ friche_nature }}
+    END
+{% endmacro %}

airflow/include/sql/sparte/models/cartofriches/friche.sql

@@ -68,7 +68,7 @@ SELECT
     producteur_fk,
     source_nom,
     source_producteur,
-    nature,
+    {{ standardize_friche_nature('nature') }} as nature,
     source_contact,
     source_url,
     site_reconv_annee,

airflow/include/sql/sparte/models/cartofriches/friche_land.sql

@@ -24,7 +24,9 @@ SELECT
     friche.friche_type_zone,
     friche.friche_type,
     friche.friche_surface_percentile_rank,
-    friche.surface
+    friche.surface,
+    friche.source_producteur,
+    friche.nature
 FROM
     {{ ref('friche') }}
 LEFT JOIN

airflow/include/sql/sparte/models/for_app/administration/for_app_land.sql

@@ -20,6 +20,8 @@ SELECT
     land_ocsge_status.has_ocsge as has_ocsge,
     land_zonages.zonage_count > 0 as has_zonage,
     land_friche.friche_count > 0 as has_friche,
+    land_friche.friche_source_producteurs as friche_source_producteurs,
+    land_friche.friche_natures as friche_natures,
     land_millesimes.millesimes as millesimes,
     land_millesimes_by_index.millesimes_by_index as millesimes_by_index,
     land.child_land_types,
@@ -89,7 +91,9 @@ LEFT JOIN LATERAL (
 ) land_ocsge_status ON true
 LEFT JOIN LATERAL (
     SELECT
-        count(*) as friche_count
+        count(*) as friche_count,
+        array_agg(distinct source_producteur) as friche_source_producteurs,
+        array_agg(distinct nature) as friche_natures
     FROM
         {{ ref('friche_land') }}
     WHERE

airflow/include/sql/sparte/models/for_app/friche/for_app_landfriche.sql

@@ -19,6 +19,8 @@ SELECT
     friche.friche_type,
     friche.friche_surface_percentile_rank,
     friche.surface,
+    friche.nature,
+    friche.source_producteur,
     st_transform(st_pointonsurface(friche.geom), 4326) AS point_on_surface
 
 FROM