From 50ec76996add0e7e4c01cc6c224a3b45da6b6631 Mon Sep 17 00:00:00 2001 From: Vincent Date: Wed, 7 Jun 2023 15:46:35 +0200 Subject: [PATCH] Handle invalid geometries when attributing departments and facades --- .../pipeline/queries/monitorenv/update_actions_departments.sql | 2 +- .../src/pipeline/queries/monitorenv/update_actions_facades.sql | 2 +- .../src/pipeline/queries/monitorenv/update_missions_facades.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/datascience/src/pipeline/queries/monitorenv/update_actions_departments.sql b/datascience/src/pipeline/queries/monitorenv/update_actions_departments.sql index 6fceeb2d47..9eb223804c 100644 --- a/datascience/src/pipeline/queries/monitorenv/update_actions_departments.sql +++ b/datascience/src/pipeline/queries/monitorenv/update_actions_departments.sql @@ -7,7 +7,7 @@ WITH departments_intersection_areas AS ( JOIN missions ON missions.id = env_actions.mission_id LEFT JOIN departments_areas - ON ST_Intersects(env_actions.geom, departments_areas.geometry) + ON ST_Intersects(ST_MakeValid(env_actions.geom), departments_areas.geometry) WHERE missions.mission_source = 'MONITORENV' GROUP BY env_actions.id, departments_areas.insee_dep ), diff --git a/datascience/src/pipeline/queries/monitorenv/update_actions_facades.sql b/datascience/src/pipeline/queries/monitorenv/update_actions_facades.sql index e433263f8e..a614d375f1 100644 --- a/datascience/src/pipeline/queries/monitorenv/update_actions_facades.sql +++ b/datascience/src/pipeline/queries/monitorenv/update_actions_facades.sql @@ -7,7 +7,7 @@ WITH facades_intersection_areas AS ( JOIN missions ON missions.id = env_actions.mission_id LEFT JOIN facade_areas_subdivided - ON ST_Intersects(env_actions.geom, facade_areas_subdivided.geometry) + ON ST_Intersects(ST_MakeValid(env_actions.geom), facade_areas_subdivided.geometry) WHERE missions.mission_source = 'MONITORENV' GROUP BY env_actions.id, facade_areas_subdivided.facade ), diff --git a/datascience/src/pipeline/queries/monitorenv/update_missions_facades.sql b/datascience/src/pipeline/queries/monitorenv/update_missions_facades.sql index 05b0044e00..ba7f7b692b 100644 --- a/datascience/src/pipeline/queries/monitorenv/update_missions_facades.sql +++ b/datascience/src/pipeline/queries/monitorenv/update_missions_facades.sql @@ -5,7 +5,7 @@ WITH facades_intersection_areas AS ( SUM(ST_Area(ST_Intersection(ST_MakeValid(missions.geom), facade_areas_subdivided.geometry)::geography)) AS intersection_area FROM missions LEFT JOIN facade_areas_subdivided - ON ST_Intersects(missions.geom, facade_areas_subdivided.geometry) + ON ST_Intersects(ST_MakeValid(missions.geom), facade_areas_subdivided.geometry) WHERE mission_source IN ('MONITORENV', 'MONITORFISH') GROUP BY missions.id, facade_areas_subdivided.facade ),