Added the new layers to the group of layers

FLO-2DSoftware · Jan 21, 2025 · 8e50331 · 8e50331
1 parent d8b2db5
commit 8e50331
Show file tree

Hide file tree

Showing 3 changed files with 115 additions and 2 deletions.
diff --git a/flo2d/db_structure.sql b/flo2d/db_structure.sql
@@ -1326,6 +1326,56 @@ INSERT INTO gpkg_contents (table_name, data_type, srs_id) VALUES ('fpxsec_cells'
 SELECT gpkgAddGeometryColumn('fpxsec_cells', 'geom', 'POINT', 0, 0, 0);
 SELECT gpkgAddGeometryTriggers('fpxsec_cells', 'geom');
 
+-- MULTIDOMAIN.DAT
+
+CREATE TABLE "mult_domains" (
+    "fid" INTEGER NOT NULL PRIMARY KEY,
+    "name" TEXT,
+    "domain_cellsize" INTEGER,
+    "notes" TEXT
+);
+INSERT INTO gpkg_contents (table_name, data_type, srs_id) VALUES ('mult_domains', 'features', 4326);
+SELECT gpkgAddGeometryColumn('mult_domains', 'geom', 'POLYGON', 0, 0, 0);
+SELECT gpkgAddGeometryTriggers('mult_domains', 'geom');
+
+CREATE TABLE "user_md_connect_points" (
+    "fid" INTEGER NOT NULL PRIMARY KEY,
+    "name" TEXT, -- fid of the domain on the mult_domains
+    "domain_fid" INTEGER,
+    "notes" TEXT
+);
+INSERT INTO gpkg_contents (table_name, data_type, srs_id) VALUES ('user_md_connect_points', 'features', 4326);
+SELECT gpkgAddGeometryColumn('user_md_connect_points', 'geom', 'POINT', 0, 0, 0);
+SELECT gpkgAddGeometryTriggers('user_md_connect_points', 'geom');
+
+CREATE TABLE "user_md_connect_lines" (
+    "fid" INTEGER NOT NULL PRIMARY KEY,
+    "name" TEXT, -- fid of the domain on the mult_domains
+    "domain_fid" INTEGER,
+    "notes" TEXT
+);
+INSERT INTO gpkg_contents (table_name, data_type, srs_id) VALUES ('user_md_connect_lines', 'features', 4326);
+SELECT gpkgAddGeometryColumn('user_md_connect_lines', 'geom', 'LINESTRING', 0, 0, 0);
+SELECT gpkgAddGeometryTriggers('user_md_connect_lines', 'geom');
+
+CREATE TABLE "user_md_connect_polygons" (
+    "fid" INTEGER NOT NULL PRIMARY KEY,
+    "name" TEXT, -- fid of the domain on the mult_domains
+    "domain_fid" INTEGER,
+    "notes" TEXT
+);
+INSERT INTO gpkg_contents (table_name, data_type, srs_id) VALUES ('user_md_connect_polygons', 'features', 4326);
+SELECT gpkgAddGeometryColumn('user_md_connect_polygons', 'geom', 'POLYGON', 0, 0, 0);
+SELECT gpkgAddGeometryTriggers('user_md_connect_polygons', 'geom');
+
+CREATE TABLE "schema_md_connect_cells" (
+    "fid" INTEGER NOT NULL PRIMARY KEY,
+    "domain_fid" INTEGER,
+    "grid_fid" INTEGER
+);
+INSERT INTO gpkg_contents (table_name, data_type, srs_id) VALUES ('schema_md_connect_cells', 'features', 4326);
+SELECT gpkgAddGeometryColumn('schema_md_connect_cells', 'geom', 'POINT', 0, 0, 0);
+SELECT gpkgAddGeometryTriggers('schema_md_connect_cells', 'geom');
 
 -- FPFROUDE.DAT
 

diff --git a/flo2d/geopackage_utils.py b/flo2d/geopackage_utils.py
@@ -271,7 +271,9 @@ class GeoPackageUtils(object):
         'user_infiltration', 'user_effective_impervious_area', 'raincell',
         'raincell_data', 'buildings_areas', 'buildings_stats', 'sd_fields', 'outrc', 'swmm_control',
         'user_tailings', 'user_tailing_reservoirs', 'tailing_reservoirs', 'tailing_cells', 'external_layers',
-        'user_swmm_inlets_junctions', 'user_swmm_outlets'
+        'user_swmm_inlets_junctions', 'user_swmm_outlets',
+        'mult_domains', 'user_md_connect_points', 'user_md_connect_lines', 'user_md_connect_polygons',
+        'schema_md_connect_cells'
     ]
 
     def __init__(self, con, iface):

diff --git a/flo2d/layers.py b/flo2d/layers.py
@@ -548,6 +548,54 @@ def __init__(self, iface):
                         "advanced": True
                     },
                 ),
+                (
+                    "mult_domains",
+                    {
+                        "name": "Domains",
+                        "sgroup": "User Layers",
+                        "ssgroup": "Multiple Domains",
+                        "styles": None,
+                        "attrs_edit_widgets": {},
+                        "readonly": False,
+                        "advanced": False
+                    },
+                ),
+                (
+                    "user_md_connect_points",
+                    {
+                        "name": "Connectivity Points",
+                        "sgroup": "User Layers",
+                        "ssgroup": "Multiple Domains",
+                        "styles": None,
+                        "attrs_edit_widgets": {},
+                        "readonly": False,
+                        "advanced": False
+                    },
+                ),
+                (
+                    "user_md_connect_lines",
+                    {
+                        "name": "Connectivity Lines",
+                        "sgroup": "User Layers",
+                        "ssgroup": "Multiple Domains",
+                        "styles": None,
+                        "attrs_edit_widgets": {},
+                        "readonly": False,
+                        "advanced": False
+                    },
+                ),
+                (
+                    "user_md_connect_polygons",
+                    {
+                        "name": "Connectivity Polygons",
+                        "sgroup": "User Layers",
+                        "ssgroup": "Multiple Domains",
+                        "styles": None,
+                        "attrs_edit_widgets": {},
+                        "readonly": False,
+                        "advanced": False
+                    },
+                ),
                 # Schematic layers:
                 (
                     "grid",
@@ -907,7 +955,20 @@ def __init__(self, iface):
                         "readonly": False,
                         "advanced": True
                     },
-                ),                
+                ),
+                # Multiple Domains Layers
+                (
+                    "schema_md_connect_cells",
+                    {
+                        "name": "Multiple Domains Cells",
+                        "sgroup": "Schematic Layers",
+                        "ssgroup": "Multiple Domains",
+                        "styles": None,
+                        "attrs_edit_widgets": {},
+                        "readonly": False,
+                        "advanced": False
+                    },
+                ),
                 # Infiltration Layers
                 (
                     "infil",