Tried to deal with even more potentially invalid mask shapes

kueda · Oct 19, 2023 · a8c1a84 · a8c1a84
1 parent 2e7bb3a
commit a8c1a84
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/sources/util/__init__.py b/sources/util/__init__.py
@@ -197,12 +197,16 @@ def initialize_masks_table(mask_table_name, source_table_name, buff=0.01):
           ST_Multi(
             ST_MakeValid(
               ST_Buffer(
-                ST_Buffer(
-                  ST_MakeValid(
-                    ST_Union(geom)
-                  ),
-                  {buff},
-                  'join=mitre'
+                ST_MakeValid(
+                  ST_Buffer(
+                    ST_MakeValid(
+                      ST_Union(
+                          ST_MakeValid(geom)
+                      )
+                    ),
+                    {buff},
+                    'join=mitre'
+                  )
                 ),
                 -{buff},
                 'join=mitre'
@@ -229,16 +233,22 @@ def update_masks_table(mask_table_name, source_table_name, buff=0.01):
               ST_Multi(
                 (
                   SELECT
-                    ST_Buffer(
+                    ST_MakeValid(
                       ST_Buffer(
                         ST_MakeValid(
-                          ST_Union(ST_MakeValid(s.geom))
+                          ST_Buffer(
+                            ST_MakeValid(
+                              ST_Union(
+                                ST_MakeValid(s.geom)
+                              )
+                            ),
+                            {buff},
+                            'join=mitre'
+                          )
                         ),
-                        {buff},
+                        -{buff},
                         'join=mitre'
-                      ),
-                      -{buff},
-                      'join=mitre'
+                      )
                     )
                   FROM {source_table_name} s
                 )