From 278d7adfc25f53bdd3aac27120d9042cf27634e6 Mon Sep 17 00:00:00 2001
From: Luna Riegel <luna.riegel@hft-stuttgart.de>
Date: Fri, 19 Sep 2025 16:40:47 +0200
Subject: [PATCH 1/6] Use VCSExpansionPanel for object library

---
 src/objectList.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/objectList.vue b/src/objectList.vue
index 7045585..f3cee8f 100644
--- a/src/objectList.vue
+++ b/src/objectList.vue
@@ -6,9 +6,8 @@
         <span>Die Objektbibliothek.</span>
       </template>
       <template #default>
-        <v-expansion-panels v-for = "(subcats, categoryName) in objLib" :key="categoryName">
-          <v-expansion-panel >
-            <v-expansion-panel-title class="text-h5">{{ categoryName }}</v-expansion-panel-title>
+        <v-expansion-panels>
+          <VcsExpansionPanel v-for = "(subcats, categoryName) in objLib" :key="categoryName" :heading="categoryName">
             <v-container v-for="(entries, subCategory) in subcats" :key = "subCategory" class=" py-1 px-1 border-b-md" expandable>
               <v-col>
               <VcsLabel class="mb-4 text-h2">{{subCategory}}</VcsLabel>
@@ -29,7 +28,7 @@
               </v-col>
               <v-divider/>
             </v-container>
-          </v-expansion-panel>
+          </VcsExpansionPanel>
         </v-expansion-panels>
 
       </template>
@@ -113,7 +112,7 @@ import {
   VcsTreeview,
   VcsTreeviewTitle,
 } from '@vcmap/ui';
-import {VCard, VCol, VContainer, VDialog, VForm, VRow, VSheet, VSwitch,} from 'vuetify/components';
+import {VCard, VCol, VContainer, VDialog, VForm, VRow, VSheet, VSwitch, VExpansionPanels} from 'vuetify/components';
 import {computed, inject, onMounted, ref} from 'vue';
 import {name} from '../package.json';
 import * as THREE from 'three';
@@ -403,6 +402,7 @@ function uploadModel() {
       VContainer,
       VRow,
       VCol,
+      VExpansionPanels,
     },
     setup() {
       app = inject('vcsApp');
-- 
GitLab


From 1573e33595b3e28633144cc38c73e74a16d7e196 Mon Sep 17 00:00:00 2001
From: Luna Riegel <luna.riegel@hft-stuttgart.de>
Date: Mon, 22 Sep 2025 09:18:41 +0200
Subject: [PATCH 2/6] Add multiple tag to expansion panels

---
 src/objectList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/objectList.vue b/src/objectList.vue
index f3cee8f..fe14316 100644
--- a/src/objectList.vue
+++ b/src/objectList.vue
@@ -6,9 +6,9 @@
         <span>Die Objektbibliothek.</span>
       </template>
       <template #default>
-        <v-expansion-panels>
-          <VcsExpansionPanel v-for = "(subcats, categoryName) in objLib" :key="categoryName" :heading="categoryName">
-            <v-container v-for="(entries, subCategory) in subcats" :key = "subCategory" class=" py-1 px-1 border-b-md" expandable>
+        <v-expansion-panels multiple>
+          <VcsExpansionPanel v-for = "(subcats, categoryName) in objLib" :key="categoryName" :heading="categoryName" value="opened">
+            <v-container v-for="(entries, subCategory) in subcats" :key = "subCategory" class=" py-1 px-1 border-b-md">
               <v-col>
               <VcsLabel class="mb-4 text-h2">{{subCategory}}</VcsLabel>
               <v-list>
-- 
GitLab


From 5a38e4d761fe5f8c90234ec0affd6ae74932c9d5 Mon Sep 17 00:00:00 2001
From: Luna Riegel <luna.riegel@hft-stuttgart.de>
Date: Tue, 23 Sep 2025 09:53:41 +0200
Subject: [PATCH 3/6] Rework Catalog model loading

---
 src/index.js       |  36 ++++++++++---
 src/objectList.vue | 129 +++++++++++++++++++++++----------------------
 2 files changed, 94 insertions(+), 71 deletions(-)

diff --git a/src/index.js b/src/index.js
index f170740..50a3d58 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,7 +6,7 @@ import BIMOptions, { bimOptionsId } from './upload.vue';
 import objectList, { objectListId } from './objectList.vue';
 import scaleControl, { scaleControlId } from './scaleControl.vue';
 import * as Cesium from "@vcmap-cesium/engine";
-
+import {loadCatalogModel} from "./objectList.vue";
 
 let model;
 let conditions = [[true, true]];
@@ -56,6 +56,7 @@ function setScale(scaleValue) {
   const position = currentlyScaledModel.position.getValue();
   const orientation = currentlyScaledModel.orientation;
   const uri = currentlyScaledModel.model.uri;
+  const fromCatalog = currentlyScaledModel.fromCatalog;
 
   vcMap.getEntities().remove(currentlyScaledModel);
   removePlacedModel(currentlyScaledModel);
@@ -70,6 +71,7 @@ function setScale(scaleValue) {
       scale: scaleValue,
       show: true,
     },
+    fromCatalog: fromCatalog,
   });
   placedModels.push({
     model: newModel,
@@ -102,6 +104,7 @@ function saveObjects() {
       position: [wgs84X, wgs84Y, height],
       heading: heading,
       scale: m.model.model.scale.getValue(),
+      fromCatalog:  m.fromCatalog,
     });
   }
   outputObject.placedObjects = outputArray;
@@ -127,7 +130,7 @@ function saveFile(fileName, urlFile){
 }
 
 
-function setupModel(vcsApp, windowPos, url, name) {
+function setupModel(vcsApp, windowPos, url, name, fromCatalog) {
   const vcMap = vcsApp.maps.activeMap;
   const scene = vcMap.getScene();
   const ray = scene.camera.getPickRay(windowPos);
@@ -141,6 +144,7 @@ function setupModel(vcsApp, windowPos, url, name) {
       show: true,
       scale: 1,
     },
+    fromCatalog: fromCatalog,
   });
   placedModels.push({
     model: model,
@@ -351,12 +355,27 @@ export default function smartVillagesPlugin(config, baseUrl) {
               }
             }
             if (objectUrl === undefined) {
-              app.notifier.add({
-                type: NotificationType.ERROR,
-                message: "Objekt mit dem namen: " + loadingObject.name + " konnte nicht in den geladenen Objekten gefunden werden. Konfiguration konnte nicht vollständig geladen werden.",
-              });
-              // abort
-              return;
+              console.log("From Catalog:" + loadingObject.fromCatalog);
+              if (loadingObject.fromCatalog === true){
+                // TODO: Fetch from catalog
+                objectUrl = loadingObject.uri;
+                // Load the model into memory
+                loadCatalogModel(objectUrl).catch(e => {
+                  console.error(e);
+                  app.notifier.add({
+                    type: NotificationType.ERROR,
+                    message: "Katalogobject: " + loadingObject.name + " konnte nicht geladenen werden. Konfiguration konnte nicht vollständig geladen werden.",
+                  });
+                });
+                return;
+              }else {
+                app.notifier.add({
+                  type: NotificationType.ERROR,
+                  message: "Objekt mit dem namen: " + loadingObject.name + " konnte nicht in den geladenen Objekten gefunden werden. Konfiguration konnte nicht vollständig geladen werden.",
+                });
+                // abort
+                return;
+              }
             }
             const cartPos = Cartesian3.fromDegrees(loadingObject.position[0], loadingObject.position[1], loadingObject.position[2]);
             // Add the model to the viewer
@@ -368,6 +387,7 @@ export default function smartVillagesPlugin(config, baseUrl) {
                 scale: loadingObject.scale,
                 show: true,
               },
+              fromCatalog: loadingObject.fromCatalog,
             });
             const roll = new HeadingPitchRoll();
             hpRollMap.set(model, roll);
diff --git a/src/objectList.vue b/src/objectList.vue
index fe14316..31d91b9 100644
--- a/src/objectList.vue
+++ b/src/objectList.vue
@@ -7,7 +7,7 @@
       </template>
       <template #default>
         <v-expansion-panels multiple>
-          <VcsExpansionPanel v-for = "(subcats, categoryName) in objLib" :key="categoryName" :heading="categoryName" value="opened">
+          <VcsExpansionPanel v-for = "(subcats, categoryName) in objLib" :key="categoryName" :heading="categoryName">
             <v-container v-for="(entries, subCategory) in subcats" :key = "subCategory" class=" py-1 px-1 border-b-md">
               <v-col>
               <VcsLabel class="mb-4 text-h2">{{subCategory}}</VcsLabel>
@@ -210,71 +210,74 @@ function getCatalogueEntries(json, linkPrefix) {
   }
 
 async function retrieveCatalogModel(modelLink){
-  if(preloadedModels.value[modelLink] != null){
-    const catModel = preloadedModels.value[modelLink];
+  loadCatalogModel(modelLink).then(model => {
+    const catModel = model;
     const x = window.innerWidth / 2;
     const y = window.innerHeight / 2;
     const cart = new Cartesian2(x, y);
-    setupModelFunction(app, cart, catModel.url, catModel.modelLink);
-  } else {
-    const loader = new GLTFLoader();
-    loader.load(
-        modelLink,
-        function (gltf) {
-          const bounds = new THREE.Box3().setFromObject(gltf.scene);
-          const x = bounds.min.x + (bounds.max.x - bounds.min.x) / 2;
-          const z = bounds.min.z + (bounds.max.z - bounds.min.z) / 2;
-          const m = new THREE.Matrix4().makeTranslation(-x, -bounds.min.y, -z);
-          gltf.scene.applyMatrix4(m);
-
-          const exporter = new GLTFExporter();
-          const options = {
-            binary: true,
-            animations: gltf.animations,
-          };
+    setupModelFunction(app, cart, catModel.url, catModel.modelLink, true);
+  }).catch(error => {
+    console.error(error);
+    app.notifier.add({
+      type: NotificationType.ERROR,
+      message:
+          'Ein Fehler ist beim Laden des Katalogobjektes aufgetreten.',
+      timeout: 20000,
+    });
+  });
+}
 
-          exporter.parse(
-              gltf.scene,
-              function (output) {
-                const blob = new Blob([output], { type: 'application/octet-stream' });
-                const url = URL.createObjectURL(blob);
-
-                projectStateObject.objects.push({
-                  name: modelLink,
-                  url: url,
-                });
-                const x = window.innerWidth / 2;
-                const y = window.innerHeight / 2;
-                const cart = new Cartesian2(x, y);
-                setupModelFunction(app, cart, url, modelLink);
-                preloadedModels.value[modelLink] = {
-                  url: url,
-                  modelLink: modelLink,
-                };
-              },
-              function (error) {
-                app.notifier.add({
-                  type: NotificationType.ERROR,
-                  message:
-                      'Ein Fehler ist beim Laden der glTF Datei aufgetreten. Bitte vergewissern Sie sich, dass es sich um eine gültige glTF2.0 Datei handelt.',
-                  timeout: 20000,
-                });
-              },
-              options
-          );
-        },
-        undefined,
-        function (error) {
-          app.notifier.add({
-            type: NotificationType.ERROR,
-            message:
-                'Ein Fehler ist beim Laden der glTF Datei aufgetreten. Bitte vergewissern Sie sich, dass es sich um eine gültige glTF2.0 Datei handelt.' +
-                ' Fehlermeldung: ' + error.message,
-            timeout: 20000,
-          });
-        }
-    );
-  }
+export async function loadCatalogModel(modelLink){
+  return new Promise( (resolve, reject) => {
+    if(preloadedModels.value[modelLink] != null){
+      resolve(preloadedModels.value[modelLink]);
+    } else{
+      //Todo: parse model from catalog
+      const loader = new GLTFLoader();
+      loader.load(
+          modelLink,
+          function (gltf) {
+            const bounds = new THREE.Box3().setFromObject(gltf.scene);
+            const x = bounds.min.x + (bounds.max.x - bounds.min.x) / 2;
+            const z = bounds.min.z + (bounds.max.z - bounds.min.z) / 2;
+            const m = new THREE.Matrix4().makeTranslation(-x, -bounds.min.y, -z);
+            gltf.scene.applyMatrix4(m);
+
+            const exporter = new GLTFExporter();
+            const options = {
+              binary: true,
+              animations: gltf.animations,
+            };
+
+            exporter.parse(
+                gltf.scene,
+                function (output) {
+                  const blob = new Blob([output], { type: 'application/octet-stream' });
+                  const url = URL.createObjectURL(blob);
+
+                  projectStateObject.objects.push({
+                    name: modelLink,
+                    url: url,
+                  });
+                  preloadedModels.value[modelLink] = {
+                    url: url,
+                    modelLink: modelLink,
+                  };
+                  resolve(preloadedModels.value[modelLink]);
+                },
+                function (error) {
+                  reject(error);
+                },
+                options
+            );
+          },
+          undefined,
+          function (error) {
+            reject(error);
+          }
+      );
+    }
+  })
 }
 
 function uploadModel() {
@@ -336,7 +339,7 @@ function uploadModel() {
                   const x = window.innerWidth / 2;
                   const y = window.innerHeight / 2;
                   const cart = new Cartesian2(x, y);
-                  setupModelFunction(app, cart, url, name);
+                  setupModelFunction(app, cart, url, name, false);
                 },
               }
             ]
-- 
GitLab


From 9558fd2707a6865b945eb1c17459371d6dad1bb0 Mon Sep 17 00:00:00 2001
From: Luna Riegel <luna.riegel@hft-stuttgart.de>
Date: Tue, 23 Sep 2025 13:51:43 +0200
Subject: [PATCH 4/6] Add loading from catalog for placement files

---
 src/index.js       | 28 +++++++++++++++++++++-------
 src/objectList.vue | 23 +++++++++++------------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/index.js b/src/index.js
index 50a3d58..b598b32 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,5 +1,16 @@
 import { ToolboxType, WindowSlot, NotificationType } from '@vcmap/ui';
-import { Cesium3DTileStyle, Math as CMath, Ellipsoid, Cartesian3, ConstantProperty, Transforms, HeadingPitchRoll, Cesium3DTileset, Matrix4 } from '@vcmap-cesium/engine';
+import {
+  Cesium3DTileStyle,
+  Math as CMath,
+  Ellipsoid,
+  Cartesian3,
+  ConstantProperty,
+  Transforms,
+  HeadingPitchRoll,
+  Cesium3DTileset,
+  Matrix4,
+  EntityCollection
+} from '@vcmap-cesium/engine';
 import { AbstractInteraction, EventType } from '@vcmap/core';
 import { name, version, mapVersion } from '../package.json';
 import BIMOptions, { bimOptionsId } from './upload.vue';
@@ -104,7 +115,7 @@ function saveObjects() {
       position: [wgs84X, wgs84Y, height],
       heading: heading,
       scale: m.model.model.scale.getValue(),
-      fromCatalog:  m.fromCatalog,
+      fromCatalog:  m.model.fromCatalog.valueOf(),
     });
   }
   outputObject.placedObjects = outputArray;
@@ -355,19 +366,22 @@ export default function smartVillagesPlugin(config, baseUrl) {
               }
             }
             if (objectUrl === undefined) {
-              console.log("From Catalog:" + loadingObject.fromCatalog);
               if (loadingObject.fromCatalog === true){
                 // TODO: Fetch from catalog
-                objectUrl = loadingObject.uri;
                 // Load the model into memory
-                loadCatalogModel(objectUrl).catch(e => {
+                const model = await loadCatalogModel(loadingObject.name).catch(e => {
                   console.error(e);
                   app.notifier.add({
                     type: NotificationType.ERROR,
                     message: "Katalogobject: " + loadingObject.name + " konnte nicht geladenen werden. Konfiguration konnte nicht vollständig geladen werden.",
                   });
+                  return undefined;
                 });
-                return;
+                if (model === undefined) {
+                  return;
+                } else {
+                  objectUrl = model.url;
+                }
               }else {
                 app.notifier.add({
                   type: NotificationType.ERROR,
@@ -386,8 +400,8 @@ export default function smartVillagesPlugin(config, baseUrl) {
                 uri: objectUrl,
                 scale: loadingObject.scale,
                 show: true,
+                fromCatalog: loadingObject.fromCatalog,
               },
-              fromCatalog: loadingObject.fromCatalog,
             });
             const roll = new HeadingPitchRoll();
             hpRollMap.set(model, roll);
diff --git a/src/objectList.vue b/src/objectList.vue
index 31d91b9..cdbc38d 100644
--- a/src/objectList.vue
+++ b/src/objectList.vue
@@ -16,7 +16,7 @@
                   <vcs-button
                       v-for="entry in entries"
                       :key="entry.title"
-                      @click="fetchCatalogueModel(entry.model)"
+                      @click="placeCatalogModel(entry.model)"
                       class="p-0 mx-1 my-0 border gc-2"
                       style="width: auto; height: auto; margin-left: 1rem; margin-bottom: 1px;"
                       variant="filled"
@@ -129,17 +129,17 @@ let setupModelFunction = undefined;
 let app = undefined;
 let projectStateObject = undefined;
 
-async function loadCataloguesFromConfig(config) {
+async function loadCatalogsFromConfig(config) {
   const configJson = JSON.parse(JSON.stringify(config));
   const catalogues = Object.values(configJson.objectCatalogues);
 
   for (const cat of catalogues) {
-    const catJson = await retrieveCatalogueJson(cat.url);
+    const catJson = await retrieveCatalogJson(cat.url);
     if (!catJson) continue;
 
     const category = cat.category.toString();
     const linkPrefix = cat.url.replace(/\/[^/]*catalog\.json$/, '/');
-    const entries = getCatalogueEntries(catJson, linkPrefix);
+    const entries = getCatalogEntries(catJson, linkPrefix);
 
     if (!objLib.value[category]) {
       objLib.value[category] = entries;
@@ -151,7 +151,7 @@ async function loadCataloguesFromConfig(config) {
 
 }
 
-async function retrieveCatalogueJson(link) {
+async function retrieveCatalogJson(link) {
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), 5000);
 
@@ -173,7 +173,7 @@ async function retrieveCatalogueJson(link) {
   }
 }
 
-function getCatalogueEntries(json, linkPrefix) {
+function getCatalogEntries(json, linkPrefix) {
   const part = {};
 
 
@@ -209,7 +209,7 @@ function getCatalogueEntries(json, linkPrefix) {
     return part;
   }
 
-async function retrieveCatalogModel(modelLink){
+async function placeCatalogModel(modelLink){
   loadCatalogModel(modelLink).then(model => {
     const catModel = model;
     const x = window.innerWidth / 2;
@@ -230,9 +230,9 @@ async function retrieveCatalogModel(modelLink){
 export async function loadCatalogModel(modelLink){
   return new Promise( (resolve, reject) => {
     if(preloadedModels.value[modelLink] != null){
+      // Model is already in memory
       resolve(preloadedModels.value[modelLink]);
     } else{
-      //Todo: parse model from catalog
       const loader = new GLTFLoader();
       loader.load(
           modelLink,
@@ -433,8 +433,7 @@ function uploadModel() {
       const dialog = ref(false);
       setupModelFunction = setupModel;
       projectStateObject = pluginState;
-      // loadCataloguesFromConfig(config).then(response => {console.log(objLib);});
-      onMounted(()=>loadCataloguesFromConfig(config).then(response => {console.log(objLib)}));
+      onMounted(()=>loadCatalogsFromConfig(config).then(response => {console.log(objLib)}));
       return {
         draggable,
         selectable,
@@ -528,8 +527,8 @@ function uploadModel() {
         loadModel() {
           uploadModel();
         },
-        fetchCatalogueModel(modelLink) {
-          retrieveCatalogModel(modelLink);
+        placeCatalogModel(modelLink) {
+          placeCatalogModel(modelLink);
         },
         loadConfiguration() {
           loadObjects(app);
-- 
GitLab


From eb5683df01da614bd32053914a4f9b8e0f1a3196 Mon Sep 17 00:00:00 2001
From: Luna Riegel <luna.riegel@hft-stuttgart.de>
Date: Tue, 23 Sep 2025 14:45:38 +0200
Subject: [PATCH 5/6] Remove leftover debug logs

---
 src/index.js       | 1 -
 src/objectList.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/index.js b/src/index.js
index b598b32..70af138 100644
--- a/src/index.js
+++ b/src/index.js
@@ -561,7 +561,6 @@ export default function smartVillagesPlugin(config, baseUrl) {
       }
 
       const map = vcsApp.maps.getByType("CesiumVisualisationType");
-      console.log(map);
       
     //  tileset.allTilesLoaded.addEventListener(function() {
     //    console.log('All tiles are loaded');
diff --git a/src/objectList.vue b/src/objectList.vue
index cdbc38d..bf67cc1 100644
--- a/src/objectList.vue
+++ b/src/objectList.vue
@@ -433,7 +433,7 @@ function uploadModel() {
       const dialog = ref(false);
       setupModelFunction = setupModel;
       projectStateObject = pluginState;
-      onMounted(()=>loadCatalogsFromConfig(config).then(response => {console.log(objLib)}));
+      onMounted(()=>loadCatalogsFromConfig(config).then(response => {console.log("Object library loaded")}));
       return {
         draggable,
         selectable,
-- 
GitLab


From 7fb28ca0a8f675019c03f36585d96790acc61b1b Mon Sep 17 00:00:00 2001
From: Luna Riegel <luna.riegel@hft-stuttgart.de>
Date: Tue, 23 Sep 2025 15:10:00 +0200
Subject: [PATCH 6/6] Code Cleaning

---
 src/index.js       | 42 ++++++++++++++++--------------------------
 src/objectList.vue | 26 ++++++++++++--------------
 2 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/src/index.js b/src/index.js
index 70af138..858aee8 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,23 +1,21 @@
-import { ToolboxType, WindowSlot, NotificationType } from '@vcmap/ui';
+import {NotificationType, ToolboxType, WindowSlot} from '@vcmap/ui';
+import * as Cesium from '@vcmap-cesium/engine';
 import {
-  Cesium3DTileStyle,
-  Math as CMath,
-  Ellipsoid,
   Cartesian3,
+  Cesium3DTileset,
+  Cesium3DTileStyle,
   ConstantProperty,
-  Transforms,
+  Ellipsoid,
   HeadingPitchRoll,
-  Cesium3DTileset,
-  Matrix4,
-  EntityCollection
+  Math as CMath,
+  Transforms
 } from '@vcmap-cesium/engine';
-import { AbstractInteraction, EventType } from '@vcmap/core';
-import { name, version, mapVersion } from '../package.json';
-import BIMOptions, { bimOptionsId } from './upload.vue';
-import objectList, { objectListId } from './objectList.vue';
-import scaleControl, { scaleControlId } from './scaleControl.vue';
-import * as Cesium from "@vcmap-cesium/engine";
-import {loadCatalogModel} from "./objectList.vue";
+import {AbstractInteraction, EventType} from '@vcmap/core';
+import {mapVersion, name, version} from '../package.json';
+import BIMOptions, {bimOptionsId} from './upload.vue';
+import objectList, {loadCatalogModel, objectListId} from './objectList.vue';
+import scaleControl, {scaleControlId} from './scaleControl.vue';
+
 
 let model;
 let conditions = [[true, true]];
@@ -195,7 +193,6 @@ class MoveInteraction extends AbstractInteraction {
       let xDif = pickResult.x - initialPickResult.x;
       let yDif = pickResult.y - initialPickResult.y;
       let zDif = pickResult.z - initialPickResult.z;
-      // pickResult.z = pickResult.z + heightDif;
       let pos = initialPosition.clone();
       pos.x = pos.x + xDif;
       pos.y = pos.y + yDif;
@@ -304,8 +301,7 @@ class RotateAction extends AbstractInteraction {
       if (hpRoll.heading < 0.0) {
         hpRoll.heading += CMath.TWO_PI;
       }
-      const orientation = new ConstantProperty(Transforms.headingPitchRollQuaternion(modelPos, hpRoll));
-      model.orientation = orientation;
+      model.orientation = new ConstantProperty(Transforms.headingPitchRollQuaternion(modelPos, hpRoll));
     }
     return event;
   }
@@ -358,7 +354,7 @@ export default function smartVillagesPlugin(config, baseUrl) {
           const objects = JSON.parse(content);
           const vcMap = app.maps.activeMap;
           for (const loadingObject of objects.placedObjects) {
-            let objectUrl = undefined;
+            let objectUrl;
             for (const loadedObject of pluginState.objects) {
               if (loadedObject.name === loadingObject.name) {
                 objectUrl = loadedObject.url;
@@ -367,7 +363,6 @@ export default function smartVillagesPlugin(config, baseUrl) {
             }
             if (objectUrl === undefined) {
               if (loadingObject.fromCatalog === true){
-                // TODO: Fetch from catalog
                 // Load the model into memory
                 const model = await loadCatalogModel(loadingObject.name).catch(e => {
                   console.error(e);
@@ -406,8 +401,7 @@ export default function smartVillagesPlugin(config, baseUrl) {
             const roll = new HeadingPitchRoll();
             hpRollMap.set(model, roll);
             roll.heading = loadingObject.heading;
-            const orientation = new ConstantProperty(Transforms.headingPitchRollQuaternion(model.position.getValue(), roll));
-            model.orientation = orientation;
+            model.orientation = new ConstantProperty(Transforms.headingPitchRollQuaternion(model.position.getValue(), roll));
   
             placedModels.push({
               model: model,
@@ -561,10 +555,6 @@ export default function smartVillagesPlugin(config, baseUrl) {
       }
 
       const map = vcsApp.maps.getByType("CesiumVisualisationType");
-      
-    //  tileset.allTilesLoaded.addEventListener(function() {
-    //    console.log('All tiles are loaded');
-    //  });
 
       const bimGroup = {
         id: 'bim-functions',
diff --git a/src/objectList.vue b/src/objectList.vue
index bf67cc1..1b89671 100644
--- a/src/objectList.vue
+++ b/src/objectList.vue
@@ -125,9 +125,9 @@ const preloadedModels = ref({});
 
 const defaultItems = [];
 const items = ref(defaultItems);
-let setupModelFunction = undefined;
-let app = undefined;
-let projectStateObject = undefined;
+let setupModelFunction;
+let app;
+let projectStateObject;
 
 async function loadCatalogsFromConfig(config) {
   const configJson = JSON.parse(JSON.stringify(config));
@@ -158,14 +158,15 @@ async function retrieveCatalogJson(link) {
   try {
     const response = await fetch(link, { signal: controller.signal });
     if (!response.ok) {
-      throw new Error(`HTTP error ${response.status} for ${link}`);
+      console.error(`Received HTTP error ${response.status} for ${link}`);
+      return null;
     }
     return await response.json();
   } catch (error) {
     if (error.name === 'AbortError') {
-      console.warn(`Fetch aborted (timeout) for: ${link}`);
-    } else {
-      console.error(`Fetch failed for ${link}:`, error);
+      console.error(`Catalog.json request timed out: ${link}`);
+    }else{
+      console.error(`Encountered error during catalog.json request: ${link}`, error);
     }
     return null;
   } finally {
@@ -305,8 +306,6 @@ function uploadModel() {
       });
       let url = URL.createObjectURL(blob);
 
-
-
       const loader = new GLTFLoader();
       loader.load(url, function(gltf) {
         let bounds = new THREE.Box3().setFromObject(gltf.scene);
@@ -348,10 +347,11 @@ function uploadModel() {
 
           },
           // called when there is an error in the generation
-          function ( error ) { 
+          function ( error ) {
             app.notifier.add({
               type: NotificationType.ERROR,
-              message: "Ein Fehler ist beim Laden der glTF Datei aufgetreten. Bitte vergewissern Sie sich, dass es sich um eine gültige glTF2.0 Datei handelt.",
+              message: "Ein Fehler ist beim Laden der glTF Datei aufgetreten. Bitte vergewissern Sie sich, dass es sich um eine gültige glTF2.0 Datei handelt." +
+                  " Fehlermeldung: " + error.message,
               timeout: 20000,
             });
           }, options);
@@ -364,8 +364,6 @@ function uploadModel() {
           });
        });
     }
-
-
       reader.readAsArrayBuffer(file);
     }
   });
@@ -433,7 +431,7 @@ function uploadModel() {
       const dialog = ref(false);
       setupModelFunction = setupModel;
       projectStateObject = pluginState;
-      onMounted(()=>loadCatalogsFromConfig(config).then(response => {console.log("Object library loaded")}));
+      onMounted(()=>loadCatalogsFromConfig(config).then(() => {console.log("Object library loaded")}));
       return {
         draggable,
         selectable,
-- 
GitLab