A simpler sql processing

FLO-2DSoftware · Jan 14, 2025 · bce488b · bce488b
1 parent 75e7f42
commit bce488b
Showing 1 changed file with 9 additions and 30 deletions.
diff --git a/flo2d/flo2d_tools/elevation_correctors.py b/flo2d/flo2d_tools/elevation_correctors.py
@@ -229,17 +229,10 @@ def elevation_from_lines(self):
                 SET levcrest = (
                     SELECT ull.correction + ull.elev
                     FROM user_levee_lines AS ull
-                    JOIN grid AS g
-                      ON ST_Intersects(CastAutomagic(g.geom), CastAutomagic(ull.geom))
-                    WHERE ull.fid IN ({fids}) AND g.fid = ld.grid_fid
+                    WHERE ull.fid = ld.user_line_fid
+                    LIMIT 1 
                 )
-                WHERE EXISTS (
-                    SELECT 1
-                    FROM user_levee_lines AS ull
-                    JOIN grid AS g
-                      ON ST_Intersects(CastAutomagic(g.geom), CastAutomagic(ull.geom))
-                    WHERE ull.fid IN ({fids}) AND g.fid = ld.grid_fid
-                );
+                WHERE ld.user_line_fid IN ({fids});
             """)
 
         if updates["elev_only"]:
@@ -249,17 +242,10 @@ def elevation_from_lines(self):
                 SET levcrest = (
                     SELECT ull.elev
                     FROM user_levee_lines AS ull
-                    JOIN grid AS g
-                      ON ST_Intersects(CastAutomagic(g.geom), CastAutomagic(ull.geom))
-                    WHERE ull.fid IN ({fids}) AND g.fid = ld.grid_fid
+                    WHERE ull.fid = ld.user_line_fid
+                    LIMIT 1 
                 )
-                WHERE EXISTS (
-                    SELECT 1
-                    FROM user_levee_lines AS ull
-                    JOIN grid AS g
-                      ON ST_Intersects(CastAutomagic(g.geom), CastAutomagic(ull.geom))
-                    WHERE ull.fid IN ({fids}) AND g.fid = ld.grid_fid
-                );
+                WHERE ld.user_line_fid IN ({fids});
             """)
 
         if updates["cor_only"]:
@@ -269,17 +255,10 @@ def elevation_from_lines(self):
                 SET levcrest = levcrest + (
                     SELECT ull.correction
                     FROM user_levee_lines AS ull
-                    JOIN grid AS g
-                      ON ST_Intersects(CastAutomagic(g.geom), CastAutomagic(ull.geom))
-                    WHERE ull.fid IN ({fids}) AND g.fid = ld.grid_fid
+                    WHERE ull.fid = ld.user_line_fid
+                    LIMIT 1 
                 )
-                WHERE EXISTS (
-                    SELECT 1
-                    FROM user_levee_lines AS ull
-                    JOIN grid AS g
-                      ON ST_Intersects(CastAutomagic(g.geom), CastAutomagic(ull.geom))
-                    WHERE ull.fid IN ({fids}) AND g.fid = ld.grid_fid
-                );
+                WHERE ld.user_line_fid IN ({fids});
             """)