Skip to content

Commit 12a1b84

Browse files
JulienChampagnolJulienChampagnol
committed
revert changes model
1 parent 0562156 commit 12a1b84

File tree

14 files changed

+72
-415
lines changed

14 files changed

+72
-415
lines changed

‎internal_stores/model/blocks.js‎

Lines changed: 11 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
2+
import _ from "lodash"
23
const blocks_schemas = viewer_schemas.opengeodeweb_viewer.model.blocks
34

45
export function useBlocksStyle() {
6+
/** State **/
57
const dataStyleStore = useDataStyleStore()
68
const dataBaseStore = useDataBaseStore()
79

8-
function blockStyle(id, block_id) {
9-
return dataStyleStore.styles[id].blocks[block_id]
10-
}
11-
10+
/** Getters **/
1211
function blockVisibility(id, block_id) {
13-
return blockStyle(id, block_id).visibility
12+
return dataStyleStore.styles[id].blocks[block_id].visibility
1413
}
14+
15+
/** Actions **/
1516
function setBlockVisibility(id, block_ids, visibility) {
1617
const block_flat_indexes = dataBaseStore.getFlatIndexes(id, block_ids)
1718
return viewer_call(
@@ -26,48 +27,15 @@ export function useBlocksStyle() {
2627
dataStyleStore.styles[id].blocks[block_id] = {}
2728
dataStyleStore.styles[id].blocks[block_id].visibility = visibility
2829
}
29-
console.log(
30-
`${setBlockVisibility.name} ${id} ${block_ids} ${blockVisibility(
31-
id,
32-
block_ids[0],
33-
)}`,
34-
)
35-
},
36-
},
37-
)
38-
}
39-
40-
function blockColor(id, block_id) {
41-
return blockStyle(id, block_id).color
42-
}
43-
function setBlockColor(id, block_ids, color) {
44-
const block_flat_indexes = dataBaseStore.getFlatIndexes(id, block_ids)
45-
return viewer_call(
46-
{
47-
schema: blocks_schemas.visibility,
48-
params: { id, block_ids: block_flat_indexes, visibility },
49-
},
50-
{
51-
response_function: () => {
52-
for (const block_id of block_ids) {
53-
if (!dataStyleStore.styles[id].blocks[block_id])
54-
dataStyleStore.styles[id].blocks[block_id] = {}
55-
dataStyleStore.styles[id].blocks[block_id].color = color
56-
}
57-
console.log(
58-
`${setBlockColor.name} ${id} ${block_ids} ${blockColor(
59-
id,
60-
block_ids[0],
61-
)}`,
62-
)
30+
console.log("setBlockVisibility", block_ids, visibility)
6331
},
6432
},
6533
)
6634
}
6735

6836
function setBlocksDefaultStyle(id) {
6937
const block_ids = dataBaseStore.getBlocksUuids(id)
70-
return setBlockVisibility(
38+
setBlockVisibility(
7139
id,
7240
block_ids,
7341
dataStyleStore.styles[id].blocks.visibility,
@@ -76,18 +44,15 @@ export function useBlocksStyle() {
7644

7745
function applyBlocksStyle(id) {
7846
const blocks = dataStyleStore.styles[id].blocks
79-
const promise_array = []
8047
for (const [block_id, style] of Object.entries(blocks)) {
81-
promise_array.push(setBlockVisibility(id, [block_id], style.visibility))
48+
setBlockVisibility(id, [block_id], style.visibility)
8249
}
83-
return Promise.all(promise_array)
8450
}
8551

8652
return {
87-
applyBlocksStyle,
8853
blockVisibility,
89-
setBlockColor,
90-
setBlockVisibility,
9154
setBlocksDefaultStyle,
55+
setBlockVisibility,
56+
applyBlocksStyle,
9257
}
9358
}

‎internal_stores/model/corners.js‎

Lines changed: 13 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
22
const corners_schemas = viewer_schemas.opengeodeweb_viewer.model.corners
33

44
export function useCornersStyle() {
5+
/** State **/
56
const dataStyleStore = useDataStyleStore()
67
const dataBaseStore = useDataBaseStore()
78

9+
/** Getters **/
810
function cornerVisibility(id, corner_id) {
911
return dataStyleStore.styles[id].corners[corner_id].visibility
1012
}
13+
14+
/** Actions **/
1115
function setCornerVisibility(id, corner_ids, visibility) {
1216
const corner_flat_indexes = dataBaseStore.getFlatIndexes(id, corner_ids)
1317
return viewer_call(
@@ -22,48 +26,19 @@ export function useCornersStyle() {
2226
dataStyleStore.styles[id].corners[corner_id] = {}
2327
dataStyleStore.styles[id].corners[corner_id].visibility = visibility
2428
}
25-
console.log(
26-
`${setCornerVisibility.name} ${id} ${block_ids} ${cornerVisibility(
27-
id,
28-
block_ids[0],
29-
)}`,
30-
)
31-
},
32-
},
33-
)
34-
}
35-
36-
function cornerColor(id, corner_id) {
37-
return dataStyleStore.styles[id].corners[corner_id].color
38-
}
39-
function setCornerColor(id, corner_ids, color) {
40-
const corner_flat_indexes = dataBaseStore.getFlatIndexes(id, corner_ids)
41-
return viewer_call(
42-
{
43-
schema: corners_schemas.color,
44-
params: { id, block_ids: corner_flat_indexes, color },
45-
},
46-
{
47-
response_function: () => {
48-
for (const corner_id of corner_ids) {
49-
if (!dataStyleStore.styles[id].corners[corner_id])
50-
dataStyleStore.styles[id].corners[corner_id] = {}
51-
dataStyleStore.styles[id].corners[corner_id].color = color
52-
}
53-
console.log(
54-
`${setCornerColor.name} ${id} ${block_ids} ${cornerColor(
55-
id,
56-
block_ids[0],
57-
)}`,
58-
)
29+
console.log("setCornerVisibility", corner_ids, visibility)
5930
},
6031
},
6132
)
6233
}
6334

6435
function setCornersDefaultStyle(id) {
6536
const corner_ids = dataBaseStore.getCornersUuids(id)
66-
return setCornerVisibility(
37+
console.log(
38+
"dataStyleStore.styles[id].corners.visibility",
39+
dataStyleStore.styles[id].corners.visibility,
40+
)
41+
setCornerVisibility(
6742
id,
6843
corner_ids,
6944
dataStyleStore.styles[id].corners.visibility,
@@ -72,19 +47,15 @@ export function useCornersStyle() {
7247

7348
function applyCornersStyle(id) {
7449
const corners = dataStyleStore.styles[id].corners
75-
const promise_array = []
7650
for (const [corner_id, style] of Object.entries(corners)) {
77-
promise_array.push(setCornerVisibility(id, [corner_id], style.visibility))
51+
setCornerVisibility(id, [corner_id], style.visibility)
7852
}
79-
return Promise.all(promise_array)
8053
}
8154

8255
return {
83-
applyCornersStyle,
84-
cornerColor,
8556
cornerVisibility,
86-
setCornerColor,
87-
setCornerVisibility,
8857
setCornersDefaultStyle,
58+
setCornerVisibility,
59+
applyCornersStyle,
8960
}
9061
}

‎internal_stores/model/edges.js‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,20 @@ const model_edges_schemas = viewer_schemas.opengeodeweb_viewer.model.edges
44
export function useModelEdgesStyle() {
55
const dataStyleStore = useDataStyleStore()
66

7-
function edgesStyle(id) {
8-
return dataStyleStore.getStyle(id).edges
9-
}
10-
117
function modelEdgesVisibility(id) {
12-
return edgesStyle(id).visibility
8+
return dataStyleStore.styles[id].edges.visibility
139
}
1410

1511
function setModelEdgesVisibility(id, visibility) {
16-
const edges_style = edgesStyle(id)
1712
return viewer_call(
1813
{
1914
schema: model_edges_schemas.visibility,
2015
params: { id, visibility },
2116
},
2217
{
2318
response_function: () => {
24-
edges_style.visibility = visibility
25-
console.log(
26-
`${setModelEdgesVisibility.name} ${id} ${modelEdgesVisibility(id)}`,
27-
)
19+
dataStyleStore.styles[id].edges.visibility = visibility
20+
console.log("setModelEdgesVisibility", visibility)
2821
},
2922
},
3023
)

‎internal_stores/model/index.js‎

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,11 @@ export default function useModelStyle() {
7272
response_function: () => {
7373
dataStyleStore.styles[id].visibility = visibility
7474
hybridViewerStore.setVisibility(id, visibility)
75-
console.log(`${setModelVisibility.name} ${id} ${modelVisibility(id)}`)
75+
console.log("setModelVisibility", visibility)
7676
},
7777
},
7878
)
7979
}
80-
function modelColor(id) {
81-
return dataStyleStore.styles[id].color
82-
}
8380

8481
function setModelColor(id, color) {
8582
viewer_call(
@@ -90,7 +87,7 @@ export default function useModelStyle() {
9087
{
9188
response_function: () => {
9289
dataStyleStore.styles[id].color = color
93-
console.log(`${setModelColor.name} ${id} ${modelColor(id)}`)
90+
console.log("setModelColor", color)
9491
},
9592
},
9693
)
@@ -102,36 +99,29 @@ export default function useModelStyle() {
10299
component_id,
103100
visibility,
104101
) {
105-
if (component_type === "Corner") {
106-
return cornersStyleStore.setCornerVisibility(
107-
id,
108-
[component_id],
109-
visibility,
110-
)
111-
} else if (component_type === "Line") {
112-
return linesStyleStore.setLineVisibility(id, [component_id], visibility)
113-
} else if (component_type === "Surface") {
114-
return surfacesStyleStore.setSurfaceVisibility(
115-
id,
116-
[component_id],
117-
visibility,
118-
)
119-
} else if (component_type === "Block") {
120-
return blocksStyleStore.setBlockVisibility(id, [component_id], visibility)
102+
switch (component_type) {
103+
case "Corner":
104+
cornersStyleStore.setCornerVisibility(id, [component_id], visibility)
105+
break
106+
case "Line":
107+
linesStyleStore.setLineVisibility(id, [component_id], visibility)
108+
break
109+
case "Surface":
110+
surfacesStyleStore.setSurfaceVisibility(id, [component_id], visibility)
111+
break
112+
case "Block":
113+
blocksStyleStore.setBlockVisibility(id, [component_id], visibility)
114+
break
121115
}
122116
}
123117

124118
function applyModelDefaultStyle(id) {
125119
const id_style = dataStyleStore.styles[id]
126-
const promise_array = []
127120
for (const [key, value] of Object.entries(id_style)) {
128-
if (key === "visibility") {
129-
promise_array.push(setModelVisibility(id, value))
130-
} else if (key === "edges") {
131-
promise_array.push(modelEdgesStore.applyModelEdgesStyle(id, value))
132-
} else if (key === "points") {
133-
promise_array.push(modelPointsStore.applyModelPointsStyle(id, value))
134-
}
121+
if (key === "visibility") setModelVisibility(id, value)
122+
else if (key === "edges") modelEdgesStore.applyModelEdgesStyle(id, value)
123+
else if (key === "points")
124+
modelPointsStore.applyModelPointsStyle(id, value)
135125
}
136126
}
137127

‎internal_stores/model/lines.js‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,20 @@ import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schem
22
const lines_schemas = viewer_schemas.opengeodeweb_viewer.model.lines
33

44
export function useLinesStyle() {
5+
/** State **/
56
const dataStyleStore = useDataStyleStore()
67
const dataBaseStore = useDataBaseStore()
78

9+
/** Getters **/
810
function lineVisibility(id, line_id) {
911
return dataStyleStore.styles[id].lines[line_id].visibility
1012
}
13+
14+
function linesColor(id) {
15+
return dataStyleStore.styles[id].lines.color
16+
}
17+
18+
/** Actions **/
1119
function setLineVisibility(id, line_ids, visibility) {
1220
const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
1321
return viewer_call(
@@ -22,17 +30,12 @@ export function useLinesStyle() {
2230
dataStyleStore.styles[id].lines[line_id] = {}
2331
dataStyleStore.styles[id].lines[line_id].visibility = visibility
2432
}
25-
console.log(
26-
`${setLineVisibility.name} ${id} ${lineVisibility(id, line_ids[0])}`,
27-
)
33+
console.log("setLineVisibility", line_ids, visibility)
2834
},
2935
},
3036
)
3137
}
3238

33-
function lineColor(id, line_id) {
34-
return dataStyleStore.styles[id].lines[line_id].color
35-
}
3639
function setLineColor(id, line_ids, color) {
3740
const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
3841
return viewer_call(
@@ -47,9 +50,7 @@ export function useLinesStyle() {
4750
dataStyleStore.styles[id].lines[line_id] = {}
4851
dataStyleStore.styles[id].lines[line_id].color = color
4952
}
50-
console.log(
51-
`${setLineColor.name} ${id} ${lineColor(id, line_ids[0])}`,
52-
)
53+
console.log("setLineColor", line_ids, color)
5354
},
5455
},
5556
)
@@ -69,10 +70,10 @@ export function useLinesStyle() {
6970
}
7071

7172
return {
72-
applyLinesStyle,
73-
lineColor,
7473
lineVisibility,
74+
linesColor,
7575
setLinesDefaultStyle,
7676
setLineVisibility,
77+
applyLinesStyle,
7778
}
7879
}

0 commit comments

Comments
 (0)