Skip to content

Commit b799bec

Browse files
JulienChampagnolJulienChampagnol
committed
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into feat/texture_coordinates
1 parent 0776801 commit b799bec

File tree

7 files changed

+161
-128
lines changed

7 files changed

+161
-128
lines changed

‎requirements.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ flask[async]==3.1.0
2020
# flask-cors
2121
flask-cors==5.0.0
2222
# via -r requirements.in
23-
geode-background==8.8.10
23+
geode-background==8.9.3
2424
# via
2525
# geode-explicit
2626
# geode-implicit
2727
# geode-simplex
28-
geode-common==33.4.0
28+
geode-common==33.5.0
2929
# via
3030
# -r requirements.in
3131
# geode-background
@@ -35,23 +35,23 @@ geode-common==33.4.0
3535
# geode-numerics
3636
# geode-simplex
3737
# geode-viewables
38-
geode-conversion==6.1.4
38+
geode-conversion==6.1.5
3939
# via
4040
# geode-explicit
4141
# geode-implicit
4242
# geode-simplex
43-
geode-explicit==6.1.26
43+
geode-explicit==6.1.28
4444
# via
4545
# -r requirements.in
4646
# geode-implicit
47-
geode-implicit==3.5.0
47+
geode-implicit==3.5.2
4848
# via -r requirements.in
49-
geode-numerics==5.2.4
49+
geode-numerics==5.2.5
5050
# via
5151
# -r requirements.in
5252
# geode-implicit
5353
# geode-simplex
54-
geode-simplex==9.0.8
54+
geode-simplex==9.0.10
5555
# via
5656
# -r requirements.in
5757
# geode-implicit
@@ -69,7 +69,7 @@ markupsafe==3.0.2
6969
# via
7070
# jinja2
7171
# werkzeug
72-
opengeode-core==15.9.8
72+
opengeode-core==15.10.1
7373
# via
7474
# -r requirements.in
7575
# geode-background
@@ -90,17 +90,17 @@ opengeode-geosciences==8.2.2
9090
# geode-implicit
9191
# geode-viewables
9292
# opengeode-geosciencesio
93-
opengeode-geosciencesio==5.3.4
93+
opengeode-geosciencesio==5.3.6
9494
# via
9595
# -r requirements.in
9696
# geode-implicit
97-
opengeode-inspector==6.3.4
97+
opengeode-inspector==6.3.7
9898
# via
9999
# -r requirements.in
100100
# geode-explicit
101101
# geode-implicit
102102
# geode-simplex
103-
opengeode-io==7.0.9
103+
opengeode-io==7.1.0
104104
# via
105105
# -r requirements.in
106106
# geode-implicit

‎src/opengeodeweb_back/geode_functions.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ def get_object_type(geode_object: str):
7979
return geode_object_value(geode_object)["object_type"]
8080

8181

82+
def get_elements(geode_object: str):
83+
return geode_object_value(geode_object)["elements"]
84+
85+
8286
def is_3D(geode_object: str):
8387
return geode_object_value(geode_object)["is_3D"]
8488

‎src/opengeodeweb_back/geode_objects.py‎

Lines changed: 48 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010

1111
# Local application imports
1212

13+
mesh = "mesh"
14+
model = "model"
15+
16+
points = "points"
17+
edges = "edges"
18+
polygons = "polygons"
19+
polyhedrons = "polyhedrons"
20+
1321

1422
def geode_objects_dict():
1523
return {
@@ -28,7 +36,7 @@ def geode_objects_dict():
2836
"convert": og_gs.convert_brep_coordinate_reference_system,
2937
"create": og.create_brep_coordinate_system,
3038
},
31-
"object_type": "model",
39+
"object_type": model,
3240
"is_3D": True,
3341
"is_viewable": True,
3442
"save_viewable": g_v.save_viewable_brep,
@@ -50,7 +58,7 @@ def geode_objects_dict():
5058
"convert": og_gs.convert_section_coordinate_reference_system,
5159
"create": og.create_section_coordinate_system,
5260
},
53-
"object_type": "model",
61+
"object_type": model,
5462
"is_3D": False,
5563
"is_viewable": True,
5664
"save_viewable": g_v.save_viewable_cross_section,
@@ -71,7 +79,8 @@ def geode_objects_dict():
7179
"convert": og_gs.convert_edged_curve_coordinate_reference_system2D,
7280
"create": og.create_edged_curve_coordinate_system2D,
7381
},
74-
"object_type": "mesh",
82+
"object_type": mesh,
83+
"elements": [points, edges],
7584
"is_3D": False,
7685
"is_viewable": True,
7786
"save_viewable": g_v.save_viewable_edged_curve2D,
@@ -92,7 +101,8 @@ def geode_objects_dict():
92101
"convert": og_gs.convert_edged_curve_coordinate_reference_system3D,
93102
"create": og.create_edged_curve_coordinate_system3D,
94103
},
95-
"object_type": "mesh",
104+
"object_type": mesh,
105+
"elements": [points, edges],
96106
"is_3D": True,
97107
"is_viewable": True,
98108
"save_viewable": g_v.save_viewable_edged_curve3D,
@@ -108,7 +118,7 @@ def geode_objects_dict():
108118
"is_saveable": og.is_graph_saveable,
109119
"save": og.save_graph,
110120
"builder": og.GraphBuilder.create,
111-
"object_type": "mesh",
121+
"object_type": mesh,
112122
"is_3D": False,
113123
"is_viewable": False,
114124
},
@@ -127,7 +137,8 @@ def geode_objects_dict():
127137
"convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
128138
"create": og.create_solid_mesh_coordinate_system3D,
129139
},
130-
"object_type": "mesh",
140+
"object_type": mesh,
141+
"elements": [points, polyhedrons],
131142
"is_3D": True,
132143
"is_viewable": True,
133144
"save_viewable": g_v.save_viewable_hybrid_solid3D,
@@ -149,7 +160,7 @@ def geode_objects_dict():
149160
"convert": og_gs.convert_section_coordinate_reference_system,
150161
"create": og.create_section_coordinate_system,
151162
},
152-
"object_type": "model",
163+
"object_type": model,
153164
"is_3D": False,
154165
"is_viewable": True,
155166
"save_viewable": g_v.save_viewable_implicit_cross_section,
@@ -171,7 +182,7 @@ def geode_objects_dict():
171182
"convert": og_gs.convert_brep_coordinate_reference_system,
172183
"create": og.create_brep_coordinate_system,
173184
},
174-
"object_type": "model",
185+
"object_type": model,
175186
"is_3D": True,
176187
"is_viewable": True,
177188
"save_viewable": g_v.save_viewable_implicit_structural_model,
@@ -186,7 +197,8 @@ def geode_objects_dict():
186197
"load": og.load_light_regular_grid2D,
187198
"is_saveable": og.is_light_regular_grid_saveable2D,
188199
"save": og.save_light_regular_grid2D,
189-
"object_type": "mesh",
200+
"object_type": mesh,
201+
"elements": [points, polygons],
190202
"is_3D": False,
191203
"is_viewable": True,
192204
"save_viewable": g_v.save_viewable_light_regular_grid2D,
@@ -200,7 +212,8 @@ def geode_objects_dict():
200212
"load": og.load_light_regular_grid3D,
201213
"is_saveable": og.is_light_regular_grid_saveable3D,
202214
"save": og.save_light_regular_grid3D,
203-
"object_type": "mesh",
215+
"object_type": mesh,
216+
"elements": [points, polyhedrons],
204217
"is_3D": True,
205218
"is_viewable": True,
206219
"save_viewable": g_v.save_viewable_light_regular_grid3D,
@@ -220,7 +233,8 @@ def geode_objects_dict():
220233
"convert": og_gs.convert_point_set_coordinate_reference_system2D,
221234
"create": og.create_point_set_coordinate_system2D,
222235
},
223-
"object_type": "mesh",
236+
"object_type": mesh,
237+
"elements": [points],
224238
"is_3D": False,
225239
"is_viewable": True,
226240
"save_viewable": g_v.save_viewable_point_set2D,
@@ -241,7 +255,8 @@ def geode_objects_dict():
241255
"convert": og_gs.convert_point_set_coordinate_reference_system3D,
242256
"create": og.create_point_set_coordinate_system3D,
243257
},
244-
"object_type": "mesh",
258+
"object_type": mesh,
259+
"elements": [points],
245260
"is_3D": True,
246261
"is_viewable": True,
247262
"save_viewable": g_v.save_viewable_point_set3D,
@@ -262,7 +277,8 @@ def geode_objects_dict():
262277
"convert": og_gs.convert_surface_mesh_coordinate_reference_system2D,
263278
"create": og.create_surface_mesh_coordinate_system2D,
264279
},
265-
"object_type": "mesh",
280+
"object_type": mesh,
281+
"elements": [points, polygons],
266282
"is_3D": False,
267283
"is_viewable": True,
268284
"save_viewable": g_v.save_viewable_polygonal_surface2D,
@@ -283,7 +299,8 @@ def geode_objects_dict():
283299
"convert": og_gs.convert_surface_mesh_coordinate_reference_system3D,
284300
"create": og.create_surface_mesh_coordinate_system3D,
285301
},
286-
"object_type": "mesh",
302+
"object_type": mesh,
303+
"elements": [points, polygons],
287304
"is_3D": True,
288305
"is_viewable": True,
289306
"save_viewable": g_v.save_viewable_polygonal_surface3D,
@@ -304,7 +321,8 @@ def geode_objects_dict():
304321
"convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
305322
"create": og.create_solid_mesh_coordinate_system3D,
306323
},
307-
"object_type": "mesh",
324+
"object_type": mesh,
325+
"elements": [points, polyhedrons],
308326
"is_3D": True,
309327
"is_viewable": True,
310328
"save_viewable": g_v.save_viewable_polyhedral_solid3D,
@@ -319,7 +337,7 @@ def geode_objects_dict():
319337
"load": og.load_raster_image2D,
320338
"is_saveable": og.is_raster_image_saveable2D,
321339
"save": og.save_raster_image2D,
322-
"object_type": "mesh",
340+
"object_type": mesh,
323341
"is_3D": False,
324342
"is_viewable": True,
325343
"save_viewable": g_v.save_viewable_raster_image2D,
@@ -333,7 +351,7 @@ def geode_objects_dict():
333351
"load": og.load_raster_image3D,
334352
"is_saveable": og.is_raster_image_saveable3D,
335353
"save": og.save_raster_image3D,
336-
"object_type": "mesh",
354+
"object_type": mesh,
337355
"is_3D": False,
338356
"is_viewable": True,
339357
"save_viewable": g_v.save_viewable_raster_image3D,
@@ -353,7 +371,8 @@ def geode_objects_dict():
353371
"convert": og_gs.convert_surface_mesh_coordinate_reference_system2D,
354372
"create": og.create_surface_mesh_coordinate_system2D,
355373
},
356-
"object_type": "mesh",
374+
"object_type": mesh,
375+
"elements": [points, polygons],
357376
"is_3D": False,
358377
"is_viewable": True,
359378
"save_viewable": g_v.save_viewable_regular_grid2D,
@@ -373,7 +392,8 @@ def geode_objects_dict():
373392
"convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
374393
"create": og.create_surface_mesh_coordinate_system3D,
375394
},
376-
"object_type": "mesh",
395+
"object_type": mesh,
396+
"elements": [points, polyhedrons],
377397
"is_3D": True,
378398
"is_viewable": True,
379399
"save_viewable": g_v.save_viewable_regular_grid3D,
@@ -393,7 +413,7 @@ def geode_objects_dict():
393413
"convert": og_gs.convert_section_coordinate_reference_system,
394414
"create": og.create_section_coordinate_system,
395415
},
396-
"object_type": "model",
416+
"object_type": model,
397417
"is_3D": False,
398418
"is_viewable": True,
399419
"save_viewable": g_v.save_viewable_section,
@@ -415,7 +435,7 @@ def geode_objects_dict():
415435
"convert": og_gs.convert_brep_coordinate_reference_system,
416436
"create": og.create_brep_coordinate_system,
417437
},
418-
"object_type": "model",
438+
"object_type": model,
419439
"is_3D": True,
420440
"is_viewable": True,
421441
"save_viewable": g_v.save_viewable_structural_model,
@@ -436,7 +456,8 @@ def geode_objects_dict():
436456
"convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
437457
"create": og.create_solid_mesh_coordinate_system3D,
438458
},
439-
"object_type": "mesh",
459+
"object_type": mesh,
460+
"elements": [points, polyhedrons],
440461
"is_3D": True,
441462
"is_viewable": True,
442463
"save_viewable": g_v.save_viewable_tetrahedral_solid3D,
@@ -457,7 +478,8 @@ def geode_objects_dict():
457478
"convert": og_gs.convert_surface_mesh_coordinate_reference_system2D,
458479
"create": og.create_surface_mesh_coordinate_system2D,
459480
},
460-
"object_type": "mesh",
481+
"object_type": mesh,
482+
"elements": [points, polygons],
461483
"is_3D": False,
462484
"is_viewable": True,
463485
"save_viewable": g_v.save_viewable_triangulated_surface2D,
@@ -478,7 +500,8 @@ def geode_objects_dict():
478500
"convert": og_gs.convert_surface_mesh_coordinate_reference_system3D,
479501
"create": og.create_surface_mesh_coordinate_system3D,
480502
},
481-
"object_type": "mesh",
503+
"object_type": mesh,
504+
"elements": [points, polygons],
482505
"is_3D": True,
483506
"is_viewable": True,
484507
"save_viewable": g_v.save_viewable_triangulated_surface3D,
@@ -494,7 +517,7 @@ def geode_objects_dict():
494517
"is_saveable": og.is_vertex_set_saveable,
495518
"save": og.save_vertex_set,
496519
"builder": og.VertexSetBuilder.create,
497-
"object_type": "mesh",
520+
"object_type": mesh,
498521
"is_3D": False,
499522
"is_viewable": False,
500523
},

‎tests/conftest.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Standard library imports
22
import time
3+
import shutil
34

45
# Third party imports
56
import pytest
@@ -8,6 +9,12 @@
89
from app import app
910

1011

12+
@pytest.fixture(scope="session", autouse=True)
13+
def copy_data():
14+
shutil.rmtree("./data", ignore_errors=True)
15+
shutil.copytree("./tests/data", "./data", dirs_exist_ok=True)
16+
17+
1118
@pytest.fixture
1219
def client():
1320
app.config["TESTING"] = True

‎tests/data/test.tif‎

265 KB
Binary file not shown.

‎tests/data/test.tiff‎

265 KB
Binary file not shown.

0 commit comments

Comments
 (0)