Commit 645ee737 authored by Matthias Betz's avatar Matthias Betz
Browse files

change to vcmap 6

parent 510e3c90
This diff is collapsed.
...@@ -50,19 +50,21 @@ ...@@ -50,19 +50,21 @@
"three": "^0.169.0" "three": "^0.169.0"
}, },
"peerDependencies": { "peerDependencies": {
"@vcmap-cesium/engine": "^4.0.3", "@vcmap-cesium/engine": "^11.0.2",
"@vcmap/core": "^5.3.0", "@vcmap/core": "^6.1.9",
"@vcmap/ui": "^5.2.4", "@vcmap/ui": "^6.1.11",
"ol": "^7.5.2" "ol": "^10.5.0",
"vue": "~3.4.38",
"vuetify": "^3.7.19"
}, },
"devDependencies": { "devDependencies": {
"@vcmap/plugin-cli": "^3.1.2", "@vcmap/plugin-cli": "^4.1.1",
"@vcsuite/eslint-config": "^3.0.7", "@vcsuite/eslint-config": "^4.0.0",
"@vitest/coverage-v8": "^1.6.0", "@vitest/coverage-v8": "^3.1.4",
"jest-canvas-mock": "^2.5.2", "jest-canvas-mock": "^2.5.2",
"jsdom": "^24.1.0", "jsdom": "^26.1.0",
"resize-observer-polyfill": "^1.5.1", "resize-observer-polyfill": "^1.5.1",
"vitest": "^1.6.0" "vitest": "^3.1.4"
}, },
"mapVersion": "^5.0" "mapVersion": "^6.1"
} }
import { ToolboxType, WindowSlot, NotificationType } from '@vcmap/ui'; import { ToolboxType, WindowSlot, NotificationType } from '@vcmap/ui';
import { Cesium3DTileStyle, Math as CMath, Cartesian3, ConstantProperty, Transforms, HeadingPitchRoll, Cesium3DTileset, Matrix4 } from '@vcmap-cesium/engine'; import { Cesium3DTileStyle, Math as CMath, Cartesian3, ConstantProperty, Transforms, HeadingPitchRoll, Cesium3DTileset, Matrix4 } from '@vcmap-cesium/engine';
import { AbstractInteraction, createTransformationHandler, EventType, ScaleInteraction, TransformationHandler, TransformationMode } from '@vcmap/core'; import { AbstractInteraction, EventType } from '@vcmap/core';
import { name, version, mapVersion } from '../package.json'; import { name, version, mapVersion } from '../package.json';
import BIMOptions, { bimOptionsId } from './upload.vue'; import BIMOptions, { bimOptionsId } from './upload.vue';
import objectList, { objectListId } from './objectList.vue'; import objectList, { objectListId } from './objectList.vue';
......
...@@ -73,7 +73,6 @@ import { ...@@ -73,7 +73,6 @@ import {
VcsTextField, VcsTextField,
Icons, Icons,
VcsFormSection, VcsFormSection,
createListItemRenameAction,
NotificationType, NotificationType,
} from '@vcmap/ui'; } from '@vcmap/ui';
import { import {
...@@ -85,7 +84,7 @@ import { ...@@ -85,7 +84,7 @@ import {
VContainer, VContainer,
VRow, VRow,
VCol, VCol,
} from 'vuetify/lib'; } from 'vuetify/components';
import { computed, ref, inject } from 'vue'; import { computed, ref, inject } from 'vue';
import { name } from '../package.json'; import { name } from '../package.json';
import * as THREE from 'three'; import * as THREE from 'three';
...@@ -93,6 +92,7 @@ import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js'; ...@@ -93,6 +92,7 @@ import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
import { GLTFExporter } from 'three/addons/exporters/GLTFExporter.js'; import { GLTFExporter } from 'three/addons/exporters/GLTFExporter.js';
import { Cartesian2 } from '@vcmap-cesium/engine'; import { Cartesian2 } from '@vcmap-cesium/engine';
const defaultItems = []; const defaultItems = [];
const items = ref(defaultItems); const items = ref(defaultItems);
let setupModelFunction = undefined; let setupModelFunction = undefined;
...@@ -123,6 +123,9 @@ function uploadModel() { ...@@ -123,6 +123,9 @@ function uploadModel() {
type: "application/octet-stream", type: "application/octet-stream",
}); });
let url = URL.createObjectURL(blob); let url = URL.createObjectURL(blob);
const loader = new GLTFLoader(); const loader = new GLTFLoader();
loader.load(url, function(gltf) { loader.load(url, function(gltf) {
let bounds = new THREE.Box3().setFromObject(gltf.scene); let bounds = new THREE.Box3().setFromObject(gltf.scene);
...@@ -235,7 +238,6 @@ function uploadModel() { ...@@ -235,7 +238,6 @@ function uploadModel() {
disabled: false, disabled: false,
visible: true, visible: true,
icon: 'home-outline', icon: 'home-outline',
renameAction: false,
action: false, action: false,
clicked: false, clicked: false,
selected: false, selected: false,
...@@ -277,10 +279,6 @@ function uploadModel() { ...@@ -277,10 +279,6 @@ function uploadModel() {
item.actions = []; item.actions = [];
if (newItem.value.renameAction) {
item.rename = false;
item.actions.push(createListItemRenameAction(item));
}
items.value.push(item); items.value.push(item);
newItem.value = { newItem.value = {
name: 'foo', name: 'foo',
...@@ -288,7 +286,6 @@ function uploadModel() { ...@@ -288,7 +286,6 @@ function uploadModel() {
disabled: false, disabled: false,
visible: true, visible: true,
icon: false, icon: false,
renameAction: false,
action: false, action: false,
clicked: false, clicked: false,
selected: false, selected: false,
......
...@@ -41,13 +41,9 @@ function scaleModel() { ...@@ -41,13 +41,9 @@ function scaleModel() {
<script> <script>
import { import {
VcsList,
VcsFormButton, VcsFormButton,
VcsTextField, VcsTextField,
Icons,
VcsFormSection, VcsFormSection,
createListItemRenameAction,
NotificationType,
} from '@vcmap/ui'; } from '@vcmap/ui';
import { import {
VSwitch, VSwitch,
...@@ -58,7 +54,7 @@ import { ...@@ -58,7 +54,7 @@ import {
VContainer, VContainer,
VRow, VRow,
VCol, VCol,
} from 'vuetify/lib'; } from 'vuetify/components';
import { inject, watch } from 'vue'; import { inject, watch } from 'vue';
import { name } from '../package.json'; import { name } from '../package.json';
......
...@@ -37,7 +37,7 @@ import { ...@@ -37,7 +37,7 @@ import {
VcsTextArea, VcsTextArea,
VcsSlider, VcsSlider,
} from '@vcmap/ui'; } from '@vcmap/ui';
import { VContainer, VRow, VForm, VCol } from 'vuetify/lib'; import { VContainer, VRow, VForm, VCol } from 'vuetify/components';
import { name } from '../package.json'; import { name } from '../package.json';
export const bimOptionsId = 'upload_ifc_id'; export const bimOptionsId = 'upload_ifc_id';
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment