changes

Author: SpliiT

opengeodeweb_back_schemas.json

@@ -61,8 +61,7 @@
               ],
               "additionalProperties": false
             },
-            "minItems": 4,
-            "maxItems": 4
+            "minItems": 3
           },
           "z": {
             "type": "number"
@@ -92,18 +91,19 @@
           },
           "aoi_id": {
             "type": "string",
-            "description": "ID of the corresponding AOI from which to take X and Y coordinates"
+            "description": "ID of the corresponding AOI"
           },
           "z_min": {
             "type": "number",
-            "description": "Minimum Z coordinate for the VOI"
+            "description": "Minimum Z coordinate"
           },
           "z_max": {
             "type": "number",
-            "description": "Maximum Z coordinate for the VOI"
+            "description": "Maximum Z coordinate"
           },
           "id": {
-            "type": "string"
+            "type": "string",
+            "description": "Optional ID for updating existing VOI"
           }
         },
         "required": [

src/opengeodeweb_back/routes/create/blueprint_create.py

@@ -80,55 +80,56 @@ def create_voi() -> flask.Response:
     utils_functions.validate_request(flask.request, schemas_dict["create_voi"])
     params = schemas.CreateVoi.from_dict(flask.request.get_json())
 
-    # Define the 4 vertices of the AOI (bottom face in the XY plane)
+    aoi_data = geode_functions.get_data_info(params.aoi_id)
+    if not aoi_data:
+        flask.abort(404, f"AOI with id {params.aoi_id} not found")
+
+    edged_curve_aoi = geode_functions.load_data(params.aoi_id)
+    if not isinstance(edged_curve_aoi, opengeode.EdgedCurve3D):
+        flask.abort(400, "Referenced object is not an EdgedCurve3D (AOI)")
+
+    bbox_aoi = edged_curve_aoi.bounding_box()
+    min_x = bbox_aoi.min().value(0)
+    min_y = bbox_aoi.min().value(1)
+    max_x = bbox_aoi.max().value(0)
+    max_y = bbox_aoi.max().value(1)
+
     aoi_vertices = [
-        (params.min_x, params.min_y),
-        (params.max_x, params.min_y),
-        (params.max_x, params.max_y),
-        (params.min_x, params.max_y),
+        (min_x, min_y),
+        (max_x, min_y),
+        (max_x, max_y),
+        (min_x, max_y),
     ]
 
-    # Create the EdgedCurve object and its builder
     edged_curve = geode_functions.geode_object_class("EdgedCurve3D").create()
     builder = geode_functions.create_builder("EdgedCurve3D", edged_curve)
     builder.set_name(params.name)
 
-    # Extract Z bounds
     z_min = params.z_min
     z_max = params.z_max
 
-    # --- 1. Create the 8 vertices of the bounding box ---
 
-    # Create the 4 bottom vertices (indices 0 to 3)
     for x, y in aoi_vertices:
         builder.create_point(opengeode.Point3D([x, y, z_min]))
 
-    # Create the 4 top vertices (indices 4 to 7)
     for x, y in aoi_vertices:
         builder.create_point(opengeode.Point3D([x, y, z_max]))
 
-    # --- 2. Define and create the 12 edges of the bounding box ---
 
-    # Edges of the bottom face (connecting vertices 0-1, 1-2, 2-3, 3-0)
     bottom_edges = [(i, (i + 1) % 4) for i in range(4)]
 
-    # Edges of the top face (connecting vertices 4-5, 5-6, 6-7, 7-4)
-    # The (i + 4) and ((i + 1) % 4 + 4) ensure we use indices 4, 5, 6, 7
     top_edges = [(i + 4, (i + 1) % 4 + 4) for i in range(4)]
 
-    # Vertical edges (connecting bottom (0-3) to top (4-7) vertices: 0-4, 1-5, 2-6, 3-7)
     vertical_edges = [(i, i + 4) for i in range(4)]
 
-    # Combine all edges
     all_edges = bottom_edges + top_edges + vertical_edges
 
-    # Create the edges in the EdgedCurve
     for v1, v2 in all_edges:
         builder.create_edge_with_vertices(v1, v2)
 
-    # Save and get info
     result = utils_functions.generate_native_viewable_and_light_viewable_from_object(
         geode_object="EdgedCurve3D",
         data=edged_curve,
     )
+    result["aoi_id"] = params.aoi_id  
     return flask.make_response(result, 200)

src/opengeodeweb_back/routes/create/schemas/create_aoi.json

@@ -27,8 +27,7 @@
                 ],
                 "additionalProperties": false
             },
-            "minItems": 4,
-            "maxItems": 4
+            "minItems": 3
         },
         "z": {
             "type": "number"

src/opengeodeweb_back/routes/create/schemas/create_voi.json

@@ -13,22 +13,6 @@
             "type": "string",
             "description": "ID of the corresponding AOI"
         },
-        "min_x": {
-            "type": "number",
-            "description": "Minimum X coordinate from AOI"
-        },
-        "min_y": {
-            "type": "number",
-            "description": "Minimum Y coordinate from AOI"
-        },
-        "max_x": {
-            "type": "number",
-            "description": "Maximum X coordinate from AOI"
-        },
-        "max_y": {
-            "type": "number",
-            "description": "Maximum Y coordinate from AOI"
-        },
         "z_min": {
             "type": "number",
             "description": "Minimum Z coordinate"
@@ -45,10 +29,6 @@
     "required": [
         "name",
         "aoi_id",
-        "min_x",
-        "min_y",
-        "max_x",
-        "max_y",
         "z_min",
         "z_max"
     ],

src/opengeodeweb_back/routes/create/schemas/create_voi.py

@@ -10,18 +10,6 @@ class CreateVoi(DataClassJsonMixin):
     aoi_id: str
     """ID of the corresponding AOI"""
 
-    min_x: float
-    """Minimum X coordinate from AOI"""
-
-    min_y: float
-    """Minimum Y coordinate from AOI"""
-
-    max_x: float
-    """Maximum X coordinate from AOI"""
-
-    max_y: float
-    """Maximum Y coordinate from AOI"""
-
     z_min: float
     """Minimum Z coordinate for the VOI"""