Skip to content

Commit f425483

Browse files
committed
Merge branch 'feat/save_and_load' of https://github.com/Geode-solutions/OpenGeodeWeb-Viewer into feat/save_and_load
2 parents a8f1a05 + 34933a2 commit f425483

File tree

6 files changed

+20
-3
lines changed

6 files changed

+20
-3
lines changed

opengeodeweb_viewer_schemas.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,6 +1135,14 @@
11351135
}
11361136
}
11371137
},
1138+
"reset_project": {
1139+
"$id": "opengeodeweb_viewer.reset_project",
1140+
"rpc": "reset_project",
1141+
"type": "object",
1142+
"properties": {},
1143+
"required": [],
1144+
"additionalProperties": false
1145+
},
11381146
"kill": {
11391147
"$id": "opengeodeweb_viewer.kill",
11401148
"rpc": "kill",

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,3 @@ wslink==1.12.4
6161
yarl>=1
6262
# via aiohttp
6363

64-
opengeodeweb-microservice==1.*,>=1.0.6rc1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
from .reset_project import *
12
from .kill import *
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from dataclasses_json import DataClassJsonMixin
2+
from dataclasses import dataclass
3+
4+
5+
@dataclass
6+
class ResetProject(DataClassJsonMixin):
7+
pass

src/opengeodeweb_viewer/rpc/utils_protocols.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ def importProject(self, rpc_params: ImportProjectParams) -> None:
5757
if connection.engine is not None:
5858
connection.engine.dispose()
5959
# Reset all connection attributes to None
60-
connection.engine = connection.session_factory = connection.scoped_session_registry = None
60+
connection.engine = connection.session_factory = (
61+
connection.scoped_session_registry
62+
) = None
6163

6264
db_full_path = os.path.join(self.DATA_FOLDER_PATH, "project.db")
6365
connection.init_database(db_full_path, create_tables=False)

tests/test_utils_protocols.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def test_reset_project_after_import(
3838
+ VtkViewerView.viewer_schemas_dict["reset_visualization"]["rpc"]
3939
)
4040
assert server.compare_image(3, "viewer/reset_visualization.jpeg") is True
41-
41+
4242
server.call(
4343
VtkMeshView.mesh_prefix + VtkMeshView.mesh_schemas_dict["register"]["rpc"],
4444
[{"id": post_id}],

0 commit comments

Comments
 (0)