Skip to content

Commit 7662153

Browse files
authored
Merge pull request #253 from Geode-solutions/fix/apply_model_surfaces_style
fix(ApplyModelSurfacesStyle): harmonise with other stores
2 parents 9925205 + 86110a8 commit 7662153

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

.oxlintrc.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@
2828
{
2929
"files": ["**/components/*"],
3030
"rules": {
31-
"unicorn/filename-case": "PascalCase"
31+
"unicorn/filename-case": [
32+
"error",
33+
{
34+
"case": "PascalCase"
35+
}
36+
]
3237
}
3338
}
3439
]

internal_stores/model/surfaces.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ export function useModelSurfacesStyle() {
88
const dataStyleStore = useDataStyleStore()
99
const dataBaseStore = useDataBaseStore()
1010

11+
function modelSurfacesStyle(id) {
12+
return dataStyleStore.getStyle(id).surfaces
13+
}
1114
function modelSurfaceStyle(id, surface_id) {
12-
if (!dataStyleStore.getStyle(id).surfaces[surface_id]) {
13-
dataStyleStore.getStyle(id).surfaces[surface_id] = {}
15+
if (!modelSurfacesStyle(id)[surface_id]) {
16+
modelSurfacesStyle(id)[surface_id] = {}
1417
}
15-
return dataStyleStore.getStyle(id).surfaces[surface_id]
18+
return modelSurfacesStyle(id)[surface_id]
1619
}
1720

1821
function modelSurfaceVisibility(id, surface_id) {
@@ -74,7 +77,7 @@ export function useModelSurfacesStyle() {
7477
}
7578

7679
function applyModelSurfacesStyle(id) {
77-
const style = dataStyleStore.getStyle(id).surfaces
80+
const style = modelSurfacesStyle(id)
7881
const surface_ids = dataBaseStore.getSurfacesUuids(id)
7982
return Promise.all([
8083
setModelSurfacesVisibility(id, surface_ids, style.visibility),

tests/integration/microservices/back/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
# pip-compile --output-file=tests/integration/microservices/back/requirements.txt tests/integration/microservices/back/requirements.in
66
#
77

8-
opengeodeweb-back==5.*,>=5.12.0rc1

tests/integration/microservices/viewer/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
# pip-compile --output-file=tests/integration/microservices/viewer/requirements.txt tests/integration/microservices/viewer/requirements.in
66
#
77

8-
opengeodeweb-viewer==1.*,>=1.11.8rc1

0 commit comments

Comments
 (0)