Skip to content

Commit 45967fc

Browse files
Merge pull request #85 from Geode-solutions/feat/opengeodeweb-viewer
Feat/opengeodeweb viewer
2 parents 97db804 + 60c5805 commit 45967fc

File tree

6 files changed

+11
-181
lines changed

6 files changed

+11
-181
lines changed

components/RemoteRenderingView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<script setup>
2323
import vtkRemoteView from "@kitware/vtk.js/Rendering/Misc/RemoteView"
2424
import { useElementSize } from "@vueuse/core"
25-
import schemas from "@/utils/schemas.json"
25+
import schemas from "@geode/opengeodeweb-viewer/schemas.json"
2626
2727
const viewer_store = use_viewer_store()
2828
const { client, is_running, picking_mode } = storeToRefs(viewer_store)

components/ViewToolbar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</template>
2020

2121
<script setup>
22-
import schemas from "@/utils/schemas.json"
22+
import schemas from "@geode/opengeodeweb-viewer/schemas.json"
2323
2424
function reset_camera() {
2525
viewer_call({

composables/viewer_call.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import _ from "lodash"
2-
31
export function viewer_call(
42
{ schema, params = {} },
53
{ request_error_function, response_function, response_error_function } = {},
@@ -21,19 +19,13 @@ export function viewer_call(
2119

2220
const client = viewer_store.client
2321

24-
if (!_.isEmpty(schema.properties)) {
25-
params = [params]
26-
} else {
27-
params = []
28-
}
29-
3022
let promise = new Promise((resolve, reject) => {
3123
if (client) {
3224
viewer_store.start_request()
3325
client
3426
.getConnection()
3527
.getSession()
36-
.call(schema.rpc, params)
28+
.call(schema.rpc, [params])
3729
.then(
3830
(value) => {
3931
if (response_function) {

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
"happy-dom": "^13.6.2",
2222
"jsdom": "^24.0.0",
2323
"nuxt": "^3.10.3",
24-
"playwright-core": "^1.42.0",
24+
"playwright-core": "^1.42.1",
2525
"prettier": "3.2.5",
2626
"resize-observer-polyfill": "^1.5.1",
27-
"vite": "^5.1.4",
27+
"vite": "^5.1.5",
2828
"vite-plugin-vuetify": "^2.0.2",
2929
"vitest": "^1.3.1",
3030
"vitest-environment-nuxt": "^1.0.0",
@@ -39,10 +39,11 @@
3939
"main": "./nuxt.config.js",
4040
"dependencies": {
4141
"@geode/opengeodeweb-back": "4.0.0",
42-
"@kitware/vtk.js": "^29.7.3",
42+
"@geode/opengeodeweb-viewer": "0.1.0",
43+
"@kitware/vtk.js": "^29.8.0",
4344
"@mdi/font": "^7.4.47",
4445
"@pinia/nuxt": "^0.5.1",
45-
"@types/node": "^20.11.22",
46+
"@types/node": "^20.11.25",
4647
"@vueuse/components": "^10.9.0",
4748
"@vueuse/core": "^10.9.0",
4849
"@vueuse/nuxt": "^10.9.0",
@@ -52,7 +53,7 @@
5253
"semver": "^7.6.0",
5354
"vue-recaptcha": "^2.0.3",
5455
"vue3-carousel": "^0.3.1",
55-
"vuetify": "^3.5.6"
56+
"vuetify": "^3.5.8"
5657
},
5758
"repository": {
5859
"type": "git",

stores/viewer.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import _ from "lodash"
22
import vtkWSLinkClient from "@kitware/vtk.js/IO/Core/WSLinkClient"
33
import "@kitware/vtk.js/Rendering/OpenGL/Profiles/Geometry"
4-
import schemas from "@/utils/schemas.json"
4+
import { connectImageStream } from "@kitware/vtk.js/Rendering/Misc/RemoteView"
5+
import schemas from "@geode/opengeodeweb-viewer/schemas.json"
56

67
export const use_viewer_store = defineStore("viewer", {
78
state: () => ({

utils/schemas.json

Lines changed: 0 additions & 164 deletions
This file was deleted.

0 commit comments

Comments
 (0)