Skip to content

Commit 0126be0

Browse files
Merge branch 'geode-objects-redesign' of https://github.com/Geode-solutions/OpenGeodeWeb-Viewer into geode-objects-redesign
2 parents 070a5d7 + fd00161 commit 0126be0

File tree

7 files changed

+13
-14
lines changed

7 files changed

+13
-14
lines changed

commitlint.config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export default {
1+
const Configuration = {
22
extends: ["@commitlint/config-angular"],
33
rules: {
44
"scope-empty": [2, "never"],
@@ -12,5 +12,8 @@ export default {
1212
"subject-full-stop": [0],
1313
"type-case": [0],
1414
"type-empty": [0],
15+
"type-enum": [2, "always", ["feat", "fix", "perf"]],
1516
},
1617
}
18+
19+
export default Configuration

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.9

src/opengeodeweb_viewer/rpc/mesh/cells/cells_protocols.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ def setMeshCellsColor(self, rpc_params: RpcParams) -> None:
4444
color = params.color
4545
self.SetColor(params.id, color.r, color.g, color.b)
4646

47-
@exportRpc(
48-
mesh_cells_prefix + mesh_cells_schemas_dict["vertex_attribute"]["rpc"]
49-
)
47+
@exportRpc(mesh_cells_prefix + mesh_cells_schemas_dict["vertex_attribute"]["rpc"])
5048
def setMeshCellsVertexAttribute(self, rpc_params: RpcParams) -> None:
5149
validate_schema(
5250
rpc_params,
@@ -56,9 +54,7 @@ def setMeshCellsVertexAttribute(self, rpc_params: RpcParams) -> None:
5654
params = schemas.VertexAttribute.from_dict(rpc_params)
5755
self.displayAttributeOnVertices(params.id, params.name)
5856

59-
@exportRpc(
60-
mesh_cells_prefix + mesh_cells_schemas_dict["cell_attribute"]["rpc"]
61-
)
57+
@exportRpc(mesh_cells_prefix + mesh_cells_schemas_dict["cell_attribute"]["rpc"])
6258
def setMeshCellsCellAttribute(self, rpc_params: RpcParams) -> None:
6359
validate_schema(
6460
rpc_params,

tests/conftest.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,7 @@ def configure_test_environment() -> Generator[None, None, None]:
210210
def dataset_factory() -> Callable[..., str]:
211211
def create_dataset(*, id: str, viewable_file: str) -> str:
212212
session = get_session()
213-
viewer_object = (
214-
"model" if viewable_file.lower().endswith(".vtm") else "mesh"
215-
)
213+
viewer_object = "model" if viewable_file.lower().endswith(".vtm") else "mesh"
216214

217215
row = session.get(Data, id)
218216
if row is None:

tests/mesh/cells/test_mesh_cells_protocols.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# Local constants
1313
id = "regular_grid_2d"
1414

15+
1516
def test_register(server: ServerMonitor, dataset_factory: Callable[..., str]) -> None:
1617

1718
dataset_factory(id=id, viewable_file=f"{id}.vti")
@@ -22,6 +23,7 @@ def test_register(server: ServerMonitor, dataset_factory: Callable[..., str]) ->
2223
)
2324
assert server.compare_image("mesh/cells/register.jpeg") == True
2425

26+
2527
def test_cells_color(
2628
server: ServerMonitor, dataset_factory: Callable[..., str]
2729
) -> None:
@@ -49,6 +51,7 @@ def test_cells_visibility(
4951
)
5052
assert server.compare_image("mesh/cells/visibility.jpeg") == True
5153

54+
5255
def test_cells_vertex_attribute(
5356
server: ServerMonitor, dataset_factory: Callable[..., str]
5457
) -> None:
@@ -62,6 +65,7 @@ def test_cells_vertex_attribute(
6265
)
6366
assert server.compare_image("mesh/cells/vertex_attribute.jpeg") == True
6467

68+
6569
def test_cells_cell_attribute(
6670
server: ServerMonitor, dataset_factory: Callable[..., str]
6771
) -> None:

tests/mesh/polygons/test_mesh_polygons_protocols.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ def test_polygons_vertex_attribute(
5151
)
5252
assert server.compare_image("mesh/polygons/vertex_attribute.jpeg") == True
5353

54+
5455
def test_polygons_polygon_attribute(
5556
server: ServerMonitor, dataset_factory: Callable[..., str]
5657
) -> None:

tests/mesh/test_mesh_protocols.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ def test_apply_textures(
6262
server: ServerMonitor, dataset_factory: Callable[..., str]
6363
) -> None:
6464
test_register_mesh(server, dataset_factory)
65-
texture_entry = dataset_factory(
66-
id="987654321", viewable_file="hat_lambert2SG.vti"
67-
)
65+
texture_entry = dataset_factory(id="987654321", viewable_file="hat_lambert2SG.vti")
6866

6967
server.call(
7068
VtkMeshView.mesh_prefix

0 commit comments

Comments
 (0)