Skip to content

Commit ad8e0f9

Browse files
committed
rm geode_object_data && fix icons & font && add Fiex(2)
1 parent e1c8179 commit ad8e0f9

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

app/components/CreateAOI.vue

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@
213213
const newMinY = boundsMinY - paddingY
214214
const newMaxY = boundsMaxY + paddingY
215215
216-
min_x.value = newMinX
217-
max_x.value = newMaxX
218-
min_y.value = newMinY
219-
max_y.value = newMaxY
216+
min_x.value = newMinX.toFixed(2)
217+
max_x.value = newMaxX.toFixed(2)
218+
min_y.value = newMinY.toFixed(2)
219+
max_y.value = newMaxY.toFixed(2)
220220
z.value = (bounds[4] + bounds[5]) / 2
221221
}
222222
@@ -262,10 +262,8 @@
262262
native_filename: data.native_file_name,
263263
viewable_filename: data.viewable_file_name,
264264
displayed_name: data.name,
265-
geode_object_data: {
266-
points: aoiPoints,
267-
z: z_val,
268-
},
265+
points: aoiPoints,
266+
z: z_val,
269267
vtk_js: {
270268
binary_light_viewable: data.binary_light_viewable,
271269
},
@@ -316,12 +314,6 @@
316314
}
317315
318316
const aoiSchema = back_schemas.opengeodeweb_back.create.create_aoi
319-
320-
if (!aoiSchema || typeof aoiSchema !== "object") {
321-
loading.value = false
322-
return
323-
}
324-
loading.value = true
325317
try {
326318
await api_fetch(
327319
{

app/components/CreateVOI.vue

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,9 @@
181181
item.object_type === "mesh" &&
182182
item.displayed_name &&
183183
!item.aoi_id &&
184-
item.geode_object_data &&
185-
((item.geode_object_data.min_x != null &&
186-
item.geode_object_data.max_x != null) ||
187-
(item.geode_object_data.points &&
188-
item.geode_object_data.points.length >= 2))
184+
item &&
185+
((item.min_x != null && item.max_x != null) ||
186+
(item.points && item.points.length >= 2))
189187
) {
190188
items.push({
191189
id: id,
@@ -234,14 +232,14 @@
234232
const extractAOICoordinates = (aoiItem) => {
235233
if (!aoiItem) return null
236234
237-
if (aoiItem.geode_object_data && aoiItem.geode_object_data.points) {
238-
const points = aoiItem.geode_object_data.points
235+
if (aoiItem && aoiItem.points) {
236+
const points = aoiItem.points
239237
if (points.length >= 4) {
240238
const min_x = Math.min(...points.map((p) => p.x))
241239
const min_y = Math.min(...points.map((p) => p.y))
242240
const max_x = Math.max(...points.map((p) => p.x))
243241
const max_y = Math.max(...points.map((p) => p.y))
244-
const z = aoiItem.geode_object_data.z || 0
242+
const z = aoiItem.z || 0
245243
246244
return { min_x, min_y, max_x, max_y, z, points }
247245
}

nuxt.config.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
import package_json from "./package.json"
2+
import path from "path"
3+
import { fileURLToPath } from "url"
4+
5+
const __dirname = path.dirname(fileURLToPath(import.meta.url))
26

37
export default defineNuxtConfig({
48
future: {
@@ -108,6 +112,14 @@ export default defineNuxtConfig({
108112
css: ["@vease/assets/css/main.css"],
109113

110114
vite: {
115+
server: {
116+
fs: {
117+
allow: [
118+
path.resolve(__dirname, "../../node_modules/@fontsource"),
119+
path.resolve(__dirname, "../../node_modules/@mdi/font"),
120+
],
121+
},
122+
},
111123
optimizeDeps: {
112124
include: [
113125
"@geode/opengeodeweb-front",

0 commit comments

Comments
 (0)