Skip to content
Merged

Next #119

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
# CHANGELOG


## v5.5.1-rc.1 (2025-02-24)

### Bug Fixes

- **attributes**: Elements key on meshes
([`6f0c0a6`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/6f0c0a61fe2dcaf12e956832bed81028be6a0644))

- **deps**: Update
([`9eab238`](https://github.com/Geode-solutions/OpenGeodeWeb-Back/commit/9eab2385f601ed526eb984804ce2f30d61e2d822))


## v5.5.0 (2025-02-13)


Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "OpenGeodeWeb-Back"
version = "5.5.0"
version = "5.5.1-rc.1"
dynamic = ["dependencies"]
authors = [
{ name="Geode-solutions", email="[email protected]" },
Expand Down
22 changes: 11 additions & 11 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ flask[async]==3.1.0
# flask-cors
flask-cors==5.0.0
# via -r requirements.in
geode-background==8.8.10
geode-background==8.9.3
# via
# geode-explicit
# geode-implicit
# geode-simplex
geode-common==33.4.0
geode-common==33.5.0
# via
# -r requirements.in
# geode-background
Expand All @@ -35,23 +35,23 @@ geode-common==33.4.0
# geode-numerics
# geode-simplex
# geode-viewables
geode-conversion==6.1.4
geode-conversion==6.1.5
# via
# geode-explicit
# geode-implicit
# geode-simplex
geode-explicit==6.1.26
geode-explicit==6.1.28
# via
# -r requirements.in
# geode-implicit
geode-implicit==3.5.0
geode-implicit==3.5.2
# via -r requirements.in
geode-numerics==5.2.4
geode-numerics==5.2.5
# via
# -r requirements.in
# geode-implicit
# geode-simplex
geode-simplex==9.0.8
geode-simplex==9.0.10
# via
# -r requirements.in
# geode-implicit
Expand All @@ -69,7 +69,7 @@ markupsafe==3.0.2
# via
# jinja2
# werkzeug
opengeode-core==15.9.8
opengeode-core==15.10.1
# via
# -r requirements.in
# geode-background
Expand All @@ -90,17 +90,17 @@ opengeode-geosciences==8.2.2
# geode-implicit
# geode-viewables
# opengeode-geosciencesio
opengeode-geosciencesio==5.3.4
opengeode-geosciencesio==5.3.6
# via
# -r requirements.in
# geode-implicit
opengeode-inspector==6.3.4
opengeode-inspector==6.3.7
# via
# -r requirements.in
# geode-explicit
# geode-implicit
# geode-simplex
opengeode-io==7.0.9
opengeode-io==7.1.0
# via
# -r requirements.in
# geode-implicit
Expand Down
4 changes: 4 additions & 0 deletions src/opengeodeweb_back/geode_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ def get_object_type(geode_object: str):
return geode_object_value(geode_object)["object_type"]


def get_elements(geode_object: str):
return geode_object_value(geode_object)["elements"]


def is_3D(geode_object: str):
return geode_object_value(geode_object)["is_3D"]

Expand Down
73 changes: 48 additions & 25 deletions src/opengeodeweb_back/geode_objects.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@

# Local application imports

mesh = "mesh"
model = "model"

points = "points"
edges = "edges"
polygons = "polygons"
polyhedrons = "polyhedrons"


def geode_objects_dict():
return {
Expand All @@ -28,7 +36,7 @@ def geode_objects_dict():
"convert": og_gs.convert_brep_coordinate_reference_system,
"create": og.create_brep_coordinate_system,
},
"object_type": "model",
"object_type": model,
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_brep,
Expand All @@ -50,7 +58,7 @@ def geode_objects_dict():
"convert": og_gs.convert_section_coordinate_reference_system,
"create": og.create_section_coordinate_system,
},
"object_type": "model",
"object_type": model,
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_cross_section,
Expand All @@ -71,7 +79,8 @@ def geode_objects_dict():
"convert": og_gs.convert_edged_curve_coordinate_reference_system2D,
"create": og.create_edged_curve_coordinate_system2D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points, edges],
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_edged_curve2D,
Expand All @@ -92,7 +101,8 @@ def geode_objects_dict():
"convert": og_gs.convert_edged_curve_coordinate_reference_system3D,
"create": og.create_edged_curve_coordinate_system3D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points, edges],
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_edged_curve3D,
Expand All @@ -108,7 +118,7 @@ def geode_objects_dict():
"is_saveable": og.is_graph_saveable,
"save": og.save_graph,
"builder": og.GraphBuilder.create,
"object_type": "mesh",
"object_type": mesh,
"is_3D": False,
"is_viewable": False,
},
Expand All @@ -127,7 +137,8 @@ def geode_objects_dict():
"convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
"create": og.create_solid_mesh_coordinate_system3D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points, polyhedrons],
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_hybrid_solid3D,
Expand All @@ -149,7 +160,7 @@ def geode_objects_dict():
"convert": og_gs.convert_section_coordinate_reference_system,
"create": og.create_section_coordinate_system,
},
"object_type": "model",
"object_type": model,
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_implicit_cross_section,
Expand All @@ -171,7 +182,7 @@ def geode_objects_dict():
"convert": og_gs.convert_brep_coordinate_reference_system,
"create": og.create_brep_coordinate_system,
},
"object_type": "model",
"object_type": model,
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_implicit_structural_model,
Expand All @@ -186,7 +197,8 @@ def geode_objects_dict():
"load": og.load_light_regular_grid2D,
"is_saveable": og.is_light_regular_grid_saveable2D,
"save": og.save_light_regular_grid2D,
"object_type": "mesh",
"object_type": mesh,
"elements": [points, polygons],
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_light_regular_grid2D,
Expand All @@ -200,7 +212,8 @@ def geode_objects_dict():
"load": og.load_light_regular_grid3D,
"is_saveable": og.is_light_regular_grid_saveable3D,
"save": og.save_light_regular_grid3D,
"object_type": "mesh",
"object_type": mesh,
"elements": [points, polyhedrons],
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_light_regular_grid3D,
Expand All @@ -220,7 +233,8 @@ def geode_objects_dict():
"convert": og_gs.convert_point_set_coordinate_reference_system2D,
"create": og.create_point_set_coordinate_system2D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points],
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_point_set2D,
Expand All @@ -241,7 +255,8 @@ def geode_objects_dict():
"convert": og_gs.convert_point_set_coordinate_reference_system3D,
"create": og.create_point_set_coordinate_system3D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points],
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_point_set3D,
Expand All @@ -262,7 +277,8 @@ def geode_objects_dict():
"convert": og_gs.convert_surface_mesh_coordinate_reference_system2D,
"create": og.create_surface_mesh_coordinate_system2D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points, polygons],
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_polygonal_surface2D,
Expand All @@ -283,7 +299,8 @@ def geode_objects_dict():
"convert": og_gs.convert_surface_mesh_coordinate_reference_system3D,
"create": og.create_surface_mesh_coordinate_system3D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points, polygons],
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_polygonal_surface3D,
Expand All @@ -304,7 +321,8 @@ def geode_objects_dict():
"convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
"create": og.create_solid_mesh_coordinate_system3D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points, polyhedrons],
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_polyhedral_solid3D,
Expand All @@ -319,7 +337,7 @@ def geode_objects_dict():
"load": og.load_raster_image2D,
"is_saveable": og.is_raster_image_saveable2D,
"save": og.save_raster_image2D,
"object_type": "mesh",
"object_type": mesh,
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_raster_image2D,
Expand All @@ -333,7 +351,7 @@ def geode_objects_dict():
"load": og.load_raster_image3D,
"is_saveable": og.is_raster_image_saveable3D,
"save": og.save_raster_image3D,
"object_type": "mesh",
"object_type": mesh,
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_raster_image3D,
Expand All @@ -353,7 +371,8 @@ def geode_objects_dict():
"convert": og_gs.convert_surface_mesh_coordinate_reference_system2D,
"create": og.create_surface_mesh_coordinate_system2D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points, polygons],
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_regular_grid2D,
Expand All @@ -373,7 +392,8 @@ def geode_objects_dict():
"convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
"create": og.create_surface_mesh_coordinate_system3D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points, polyhedrons],
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_regular_grid3D,
Expand All @@ -393,7 +413,7 @@ def geode_objects_dict():
"convert": og_gs.convert_section_coordinate_reference_system,
"create": og.create_section_coordinate_system,
},
"object_type": "model",
"object_type": model,
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_section,
Expand All @@ -415,7 +435,7 @@ def geode_objects_dict():
"convert": og_gs.convert_brep_coordinate_reference_system,
"create": og.create_brep_coordinate_system,
},
"object_type": "model",
"object_type": model,
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_structural_model,
Expand All @@ -436,7 +456,8 @@ def geode_objects_dict():
"convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
"create": og.create_solid_mesh_coordinate_system3D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points, polyhedrons],
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_tetrahedral_solid3D,
Expand All @@ -457,7 +478,8 @@ def geode_objects_dict():
"convert": og_gs.convert_surface_mesh_coordinate_reference_system2D,
"create": og.create_surface_mesh_coordinate_system2D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points, polygons],
"is_3D": False,
"is_viewable": True,
"save_viewable": g_v.save_viewable_triangulated_surface2D,
Expand All @@ -478,7 +500,8 @@ def geode_objects_dict():
"convert": og_gs.convert_surface_mesh_coordinate_reference_system3D,
"create": og.create_surface_mesh_coordinate_system3D,
},
"object_type": "mesh",
"object_type": mesh,
"elements": [points, polygons],
"is_3D": True,
"is_viewable": True,
"save_viewable": g_v.save_viewable_triangulated_surface3D,
Expand All @@ -494,7 +517,7 @@ def geode_objects_dict():
"is_saveable": og.is_vertex_set_saveable,
"save": og.save_vertex_set,
"builder": og.VertexSetBuilder.create,
"object_type": "mesh",
"object_type": mesh,
"is_3D": False,
"is_viewable": False,
},
Expand Down
7 changes: 7 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Standard library imports
import time
import shutil

# Third party imports
import pytest
Expand All @@ -8,6 +9,12 @@
from app import app


@pytest.fixture(scope="session", autouse=True)
def copy_data():
shutil.rmtree("./data", ignore_errors=True)
shutil.copytree("./tests/data", "./data", dirs_exist_ok=True)


@pytest.fixture
def client():
app.config["TESTING"] = True
Expand Down
Binary file added tests/data/test.tif
Binary file not shown.
Binary file added tests/data/test.tiff
Binary file not shown.
Loading