Merge pull request #107 from Geode-solutions/feat/get_viewer_object

Feat/get viewer object

Author: JulienChampagnol

src/opengeodeweb_back/geode_functions.py

@@ -76,8 +76,8 @@ def create_crs(
     )
 
 
-def is_model(geode_object: str):
-    return geode_object_value(geode_object)["is_model"]
+def get_object_type(geode_object: str):
+    return geode_object_value(geode_object)["object_type"]
 
 
 def is_3D(geode_object: str):

src/opengeodeweb_back/geode_objects.py

@@ -28,7 +28,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_brep_coordinate_reference_system,
                 "create": og.create_brep_coordinate_system,
             },
-            "is_model": True,
+            "object_type": "model",
             "is_3D": True,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_brep,
@@ -50,7 +50,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_section_coordinate_reference_system,
                 "create": og.create_section_coordinate_system,
             },
-            "is_model": True,
+            "object_type": "model",
             "is_3D": False,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_cross_section,
@@ -71,7 +71,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_edged_curve_coordinate_reference_system2D,
                 "create": og.create_edged_curve_coordinate_system2D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": False,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_edged_curve2D,
@@ -92,7 +92,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_edged_curve_coordinate_reference_system3D,
                 "create": og.create_edged_curve_coordinate_system3D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": True,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_edged_curve3D,
@@ -108,7 +108,7 @@ def geode_objects_dict():
             "is_saveable": og.is_graph_saveable,
             "save": og.save_graph,
             "builder": og.GraphBuilder.create,
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": False,
             "is_viewable": True,
         },
@@ -127,7 +127,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
                 "create": og.create_solid_mesh_coordinate_system3D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": True,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_hybrid_solid3D,
@@ -149,7 +149,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_section_coordinate_reference_system,
                 "create": og.create_section_coordinate_system,
             },
-            "is_model": True,
+            "object_type": "model",
             "is_3D": False,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_implicit_cross_section,
@@ -171,7 +171,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_brep_coordinate_reference_system,
                 "create": og.create_brep_coordinate_system,
             },
-            "is_model": True,
+            "object_type": "model",
             "is_3D": True,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_implicit_structural_model,
@@ -186,7 +186,7 @@ def geode_objects_dict():
             "load": og.load_light_regular_grid2D,
             "is_saveable": og.is_light_regular_grid_saveable2D,
             "save": og.save_light_regular_grid2D,
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": False,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_light_regular_grid2D,
@@ -200,7 +200,7 @@ def geode_objects_dict():
             "load": og.load_light_regular_grid3D,
             "is_saveable": og.is_light_regular_grid_saveable3D,
             "save": og.save_light_regular_grid3D,
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": True,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_light_regular_grid3D,
@@ -220,7 +220,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_point_set_coordinate_reference_system2D,
                 "create": og.create_point_set_coordinate_system2D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": False,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_point_set2D,
@@ -241,7 +241,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_point_set_coordinate_reference_system3D,
                 "create": og.create_point_set_coordinate_system3D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": True,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_point_set3D,
@@ -262,7 +262,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_surface_mesh_coordinate_reference_system2D,
                 "create": og.create_surface_mesh_coordinate_system2D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": False,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_polygonal_surface2D,
@@ -283,7 +283,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_surface_mesh_coordinate_reference_system3D,
                 "create": og.create_surface_mesh_coordinate_system3D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": True,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_polygonal_surface3D,
@@ -304,7 +304,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
                 "create": og.create_solid_mesh_coordinate_system3D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": True,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_polyhedral_solid3D,
@@ -319,7 +319,7 @@ def geode_objects_dict():
             "load": og.load_raster_image2D,
             "is_saveable": og.is_raster_image_saveable2D,
             "save": og.save_raster_image2D,
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": False,
             "is_viewable": False,
             "save_viewable": g_v.save_viewable_raster_image2D,
@@ -333,7 +333,7 @@ def geode_objects_dict():
             "load": og.load_raster_image3D,
             "is_saveable": og.is_raster_image_saveable3D,
             "save": og.save_raster_image3D,
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": False,
             "is_viewable": False,
             "save_viewable": g_v.save_viewable_raster_image3D,
@@ -353,7 +353,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_surface_mesh_coordinate_reference_system2D,
                 "create": og.create_surface_mesh_coordinate_system2D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": False,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_regular_grid2D,
@@ -373,7 +373,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
                 "create": og.create_surface_mesh_coordinate_system3D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": True,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_regular_grid3D,
@@ -393,7 +393,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_section_coordinate_reference_system,
                 "create": og.create_section_coordinate_system,
             },
-            "is_model": True,
+            "object_type": "model",
             "is_3D": False,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_section,
@@ -415,7 +415,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_brep_coordinate_reference_system,
                 "create": og.create_brep_coordinate_system,
             },
-            "is_model": True,
+            "object_type": "model",
             "is_3D": True,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_structural_model,
@@ -436,7 +436,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_solid_mesh_coordinate_reference_system3D,
                 "create": og.create_solid_mesh_coordinate_system3D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": True,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_tetrahedral_solid3D,
@@ -457,7 +457,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_surface_mesh_coordinate_reference_system2D,
                 "create": og.create_surface_mesh_coordinate_system2D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": False,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_triangulated_surface2D,
@@ -478,7 +478,7 @@ def geode_objects_dict():
                 "convert": og_gs.convert_surface_mesh_coordinate_reference_system3D,
                 "create": og.create_surface_mesh_coordinate_system3D,
             },
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": True,
             "is_viewable": True,
             "save_viewable": g_v.save_viewable_triangulated_surface3D,
@@ -494,7 +494,7 @@ def geode_objects_dict():
             "is_saveable": og.is_vertex_set_saveable,
             "save": og.save_vertex_set,
             "builder": og.VertexSetBuilder.create,
-            "is_model": False,
+            "object_type": "mesh",
             "is_3D": False,
             "is_viewable": False,
         },

src/opengeodeweb_back/routes/blueprint_routes.py

@@ -260,6 +260,9 @@ def save_viewable_file():
         DATA_FOLDER_PATH,
         generated_id + "." + native_extension,
     )
+    object_type = geode_functions.get_object_type(
+        flask.request.json["input_geode_object"]
+    )
 
     native_file_name = os.path.basename(absolute_native_file_path)
     viewable_file_name = os.path.basename(saved_viewable_file_path)
@@ -269,6 +272,7 @@ def save_viewable_file():
             "native_file_name": native_file_name,
             "viewable_file_name": viewable_file_name,
             "id": generated_id,
+            "object_type": object_type,
         },
         200,
     )

tests/test_geode_functions.py

@@ -125,10 +125,11 @@ def test_load():
                                 os.remove(saved_file)
 
 
-def test_is_model():
+def test_get_object_type():
     for geode_object, value in geode_objects.geode_objects_dict().items():
-        is_model = geode_functions.is_model(geode_object)
-        assert type(is_model) is bool
+        object_type = geode_functions.get_object_type(geode_object)
+        assert type(object_type) is str
+        assert object_type in ["model", "mesh"]
 
 
 def test_is_3D():

tests/test_routes.py

@@ -159,6 +159,9 @@ def get_full_data():
     assert type(viewable_file_name) is str
     id = response.json["id"]
     assert type(id) is str
+    object_type = response.json["object_type"]
+    assert type(object_type) is str
+    assert object_type in ["model", "mesh"]
 
     # Test all params
     test_utils.test_route_wrong_params(client, route, get_full_data)