Merge pull request #1023 from MTES-MCT/feat-simple-geom

Ajout d'un champ simple_geom respectant la topology sur tous les territoires

Author: alexisig

airflow/include/sql/sparte/macros/admin_express/commune.sql

@@ -1,7 +1,15 @@
 {% macro commune(source_table_name) %}
     {{ config(materialized="table") }}
-    with
-        epci_and_ept as (
+    with simplified as (
+        {{
+            simplify(
+                source=source('public', source_table_name),
+                geo_field='geom',
+                id_field='insee_com',
+                tolerance='50'
+            )
+        }}
+    ), epci_and_ept as (
             select
                 insee_com as commune_code,
                 case
@@ -29,8 +37,10 @@
         insee_reg as region,
         {{ get_ept_from_epci_array("epci_and_ept.epcis") }} as ept,
         {{ get_non_ept_from_epci_array("epci_and_ept.epcis") }} as epci,
-        st_area(geom) as surface,
-        geom
+        st_area(commune.geom) as surface,
+        commune.geom,
+        simplified.geom as simple_geom
     from {{ source("public", source_table_name) }} as commune
     left join epci_and_ept on commune.insee_com = epci_and_ept.commune_code
+    left join simplified on commune.insee_com = simplified.id_field
 {% endmacro %}

airflow/include/sql/sparte/macros/admin_express/departement.sql

@@ -1,14 +1,28 @@
 {% macro departement(source_table_name) %}
     {{ config(materialized='table') }}
-
+    with simplified as (
+        {{
+            simplify(
+                source=source('public', source_table_name),
+                geo_field='geom',
+                id_field='insee_dep',
+                tolerance='1500'
+            )
+        }}
+    )
     SELECT
         id,
         nom as name,
         nom_m as name_uppercase,
         insee_dep as code,
         insee_reg as region,
-        ST_Area(geom) as surface,
-        geom
+        ST_Area(departement.geom) as surface,
+        departement.geom,
+        simplified.geom as simple_geom
     FROM
         {{ source('public', source_table_name) }} as departement
+    LEFT JOIN
+        simplified
+    ON
+        departement.insee_dep = simplified.id_field
 {% endmacro %}

airflow/include/sql/sparte/macros/admin_express/epci.sql

@@ -1,14 +1,28 @@
 {% macro epci(source_table_name) %}
     {{ config(materialized='table') }}
-
+    with simplified as (
+        {{
+            simplify(
+                source=source('public', source_table_name),
+                geo_field='geom',
+                id_field='code_siren',
+                tolerance='250'
+            )
+        }}
+    )
     SELECT
         id,
         nom as name,
         code_siren as code,
         nature,
-        ST_Area(geom) as surface,
-        geom,
-        {{ is_ept('code_siren') }} as is_ept
+        ST_Area(epci.geom) as surface,
+        epci.geom,
+        {{ is_ept('code_siren') }} as is_ept,
+        simplified.geom as simple_geom
     FROM
-        {{ source('public', source_table_name) }}
+        {{ source('public', source_table_name) }} as epci
+    LEFT JOIN
+        simplified
+    ON
+        epci.code_siren = simplified.id_field
 {% endmacro %}

airflow/include/sql/sparte/macros/admin_express/region.sql

@@ -1,12 +1,28 @@
 {% macro region(source_table_name) %}
     {{ config(materialized='table') }}
 
+    with simplified as (
+        {{
+            simplify(
+                source=source('public', source_table_name),
+                geo_field='geom',
+                id_field='insee_reg',
+                tolerance='1500'
+            )
+        }}
+    )
     SELECT
         id,
         nom as name,
         insee_reg as code,
-        ST_Area(geom) as surface,
-        geom
+        ST_Area(source.geom) as surface,
+        source.geom,
+        simplified.geom as simple_geom
     FROM
-        {{ source('public', source_table_name) }}
+        {{ source('public', source_table_name) }} as source
+    LEFT JOIN
+        simplified
+    ON
+        source.insee_reg = simplified.id_field
+
 {% endmacro %}

airflow/include/sql/sparte/macros/simplify.sql

@@ -0,0 +1,46 @@
+{% macro simplify(source, geo_field, id_field, tolerance) %}
+sELECT * FROM (
+with poly as (
+    select
+        {{ id_field }} as id_field,
+        (st_dump({{ geo_field }})).geom as geom
+    from {{ source }}
+),
+
+rings as (
+    select
+        st_exteriorRing((st_dumpRings(geom)).geom) as geom
+    from poly
+),
+
+merged as (
+    select
+        st_linemerge(st_union(geom)) as geom
+    from rings
+),
+
+simplified as (
+    select
+        (st_dump(st_simplifyPreserveTopology(geom, {{ tolerance }}))).geom as geom
+    from merged
+),
+
+polygonized as (
+    select
+        (st_dump(st_polygonize(distinct geom))).geom as geom
+    from simplified
+), last as (
+select
+    d.id_field,
+    p.geom
+from polygonized p
+join poly d
+    on st_intersects(d.geom, p.geom)
+where st_area(st_intersection(d.geom, p.geom)) / st_area(p.geom) > 0.5
+)
+SELECT id_field, ST_Union(geom) as geom
+FROM last
+GROUP BY id_field
+)
+
+{% endmacro %}

airflow/include/sql/sparte/models/admin_express/land.sql

@@ -9,7 +9,7 @@
 }}
 
 
-{% set common_fields = "geom, surface" %}
+{% set common_fields = "geom, simple_geom, surface" %}
 {% set admin_express_common_fields = "name" %}
 
 SELECT

airflow/include/sql/sparte/models/admin_express/schema.yml

@@ -7,6 +7,11 @@ code_is_unique_and_not_null: &code_is_unique_and_not_null
     data_tests:
     - not_null
     - unique
+  - name: simple_geom
+    data_tests:
+    - not_null
+    - is_not_empty_geom
+    - is_valid_geom
 
 
 models:

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

@@ -12,6 +12,7 @@ SELECT
     {{ m2_to_ha('land.surface') }} as surface,
     'ha' as surface_unit,
     ST_Transform(geom, 4326) as geom,
+    ST_Transform(simple_geom, 4326) as simple_geom,
     {{ m2_to_ha('artif.surface') }} as surface_artif,
     artif.percent as percent_artif,
     artif.years as years_artif,

airflow/include/sql/sparte/models/sudocuh/models.yml

@@ -16,6 +16,12 @@ models:
       - unique
       - is_valid_geom
       - is_not_empty_geom
+    - name: simple_geom
+      data_tests:
+      - not_null
+      - unique
+      - is_not_empty_geom
+      - is_valid_geom
   - name: scot
     columns:
     - name: id_scot

airflow/include/sql/sparte/models/sudocuh/scot.sql

@@ -55,7 +55,8 @@ SELECT
     perimetre_en_cours_pcsuperficie,
     scot_geom.geom as geom,
     scot_geom.srid_source as srid_source,
-    ST_Area(scot_geom.geom) as surface
+    ST_Area(geom) as surface,
+    simple_geom
 FROM {{ source('public', 'sudocuh_scot') }} as scot
 LEFT JOIN {{ ref('scot_geom') }} as scot_geom
 ON scot_geom.id_scot::text = scot.id_scot::text