From 16341793ec9cb249ab966f9d076539e2108760de Mon Sep 17 00:00:00 2001 From: SpliiT Date: Fri, 28 Feb 2025 14:57:49 +0100 Subject: [PATCH 1/4] fix(createpoint): Fix create point function --- .../routes/blueprint_routes.py | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/opengeodeweb_back/routes/blueprint_routes.py b/src/opengeodeweb_back/routes/blueprint_routes.py index 15df7fc9..b355e19c 100644 --- a/src/opengeodeweb_back/routes/blueprint_routes.py +++ b/src/opengeodeweb_back/routes/blueprint_routes.py @@ -283,6 +283,7 @@ def save_viewable_file(): def create_point(): utils_functions.validate_request(flask.request, create_point_json) DATA_FOLDER_PATH = flask.current_app.config["DATA_FOLDER_PATH"] + title = flask.request.json["title"] x = flask.request.json["x"] y = flask.request.json["y"] z = flask.request.json["z"] @@ -290,16 +291,34 @@ def create_point(): PointSet3D = class_.create() builder = geode_functions.create_builder("PointSet3D", PointSet3D) builder.create_point(opengeode.Point3D([x, y, z])) - + builder.set_name(title) + print(PointSet3D.name(), flush=True) + name = PointSet3D.name() generated_id = str(uuid.uuid4()).replace("-", "") + object_type = geode_functions.get_object_type("PointSet3D") + saved_native_file_path = geode_functions.save( + "PointSet3D", PointSet3D, DATA_FOLDER_PATH, generated_id + ".og_pts3d" + ) saved_viewable_file_path = geode_functions.save_viewable( "PointSet3D", PointSet3D, DATA_FOLDER_PATH, generated_id ) + print(saved_native_file_path, flush=True) + + native_file_name = os.path.basename(saved_native_file_path[0]) + viewable_file_name = os.path.basename(saved_viewable_file_path) + + print(f"{native_file_name=}", flush=True) + print(f"{viewable_file_name=}", flush=True) return flask.make_response( { "viewable_file_name": os.path.basename(saved_viewable_file_path), "id": generated_id, + "name": name, + "native_file_name": native_file_name, + "viewable_file_name": viewable_file_name, + "object_type": object_type, + "geode_object": "PointSet3D", }, 200, ) From c0007fe2c1e5d1bedf7cfad6f09b1b763b5578f2 Mon Sep 17 00:00:00 2001 From: SpliiT Date: Fri, 28 Feb 2025 14:59:35 +0100 Subject: [PATCH 2/4] rv print --- src/opengeodeweb_back/routes/blueprint_routes.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/opengeodeweb_back/routes/blueprint_routes.py b/src/opengeodeweb_back/routes/blueprint_routes.py index b355e19c..2a355074 100644 --- a/src/opengeodeweb_back/routes/blueprint_routes.py +++ b/src/opengeodeweb_back/routes/blueprint_routes.py @@ -292,7 +292,6 @@ def create_point(): builder = geode_functions.create_builder("PointSet3D", PointSet3D) builder.create_point(opengeode.Point3D([x, y, z])) builder.set_name(title) - print(PointSet3D.name(), flush=True) name = PointSet3D.name() generated_id = str(uuid.uuid4()).replace("-", "") object_type = geode_functions.get_object_type("PointSet3D") @@ -302,14 +301,10 @@ def create_point(): saved_viewable_file_path = geode_functions.save_viewable( "PointSet3D", PointSet3D, DATA_FOLDER_PATH, generated_id ) - print(saved_native_file_path, flush=True) native_file_name = os.path.basename(saved_native_file_path[0]) viewable_file_name = os.path.basename(saved_viewable_file_path) - print(f"{native_file_name=}", flush=True) - print(f"{viewable_file_name=}", flush=True) - return flask.make_response( { "viewable_file_name": os.path.basename(saved_viewable_file_path), From 9c17f7b84beea2922f385d61457e95dc622da72a Mon Sep 17 00:00:00 2001 From: SpliiT Date: Fri, 28 Feb 2025 15:03:18 +0100 Subject: [PATCH 3/4] edit schema --- src/opengeodeweb_back/routes/schemas/create_point.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/opengeodeweb_back/routes/schemas/create_point.json b/src/opengeodeweb_back/routes/schemas/create_point.json index 6f77eebf..c70ba130 100644 --- a/src/opengeodeweb_back/routes/schemas/create_point.json +++ b/src/opengeodeweb_back/routes/schemas/create_point.json @@ -5,6 +5,9 @@ ], "type": "object", "properties": { + "title": { + "type": "string" + }, "x": { "type": "number" }, @@ -16,6 +19,7 @@ } }, "required": [ + "title", "x", "y", "z" From 3ac5bf2aa63a9a1b511b2d76fb2e03240fccc9ed Mon Sep 17 00:00:00 2001 From: SpliiT Date: Fri, 28 Feb 2025 15:14:34 +0100 Subject: [PATCH 4/4] edit test to add the title field --- tests/test_routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_routes.py b/tests/test_routes.py index dd01f0c0..bd44c2da 100644 --- a/tests/test_routes.py +++ b/tests/test_routes.py @@ -294,7 +294,7 @@ def get_full_data(): def test_create_point(client): route = f"/create_point" - get_full_data = lambda: {"x": 1, "y": 2, "z": 3} + get_full_data = lambda: {"title": "test_point", "x": 1, "y": 2, "z": 3} # Normal test with all keys response = client.post(route, json=get_full_data())