Small fixes to get the user stories working together

Only crucial part for the integration was ViewerAPI line 23 changing .viewerImages to .currentFloor.viewerImages

src/js/main.js

@@ -4,28 +4,27 @@ import { ViewerViewState } from "./viewer/ViewerViewState.js";
 import { ViewerPanoAPI } from "./viewer/ViewerPanoAPI.js";
 import { MAX_FOV, DEFAULT_FOV } from "./viewer/Globals.js"
 import { ViewerAPI } from "./viewer/ViewerAPI.js";
+import { ViewerMapAPI } from "./viewer/ViewerMapAPI.js"
 
 
-let viewerPanoAPI, , viewerMapAPI, viewerViewState, renderer, viewerAPI, viewerImageAPI;
-let spriteMap; // for createHUDSprites and updateHUDSprites
+let viewerPanoAPI, viewerMapAPI, viewerViewState, renderer, viewerAPI, viewerImageAPI;
 
 let onPointerDownMouseX = 0, onPointerDownMouseY = 0, onPointerDownLon = 0, onPointerDownLat = 0;
 
 // Load the metadata only once
 const jsonImageDataFilepath = "../assets/data.json";
 $.getJSON(jsonImageDataFilepath, function(data) {
     viewerImageAPI = new ViewerImageAPI(data);
-    viewerAPI = new ViewerAPI(data,viewerPanoAPI);
-    setTimeout(function() { viewerAPI.move(15,15,1); }, 5000);
-
+
     init();
     animate();
+
+    viewerAPI = new ViewerAPI(viewerImageAPI, viewerPanoAPI);
+    setTimeout(function () { viewerAPI.move(15, 15, 1); }, 5000);
 });
 
 
 function init() {
-    const width = window.innerWidth;
-    const height = window.innerHeight;
 
     const container = document.getElementById('pano-viewer');
     // the only html element we work with (the pano-viewer div)
@@ -150,6 +149,7 @@ function onWindowResize() {
     viewerMapAPI.camera.updateProjectionMatrix();
 
     renderer.setSize(width, height);
+    render();
 
 }
 

src/js/viewer/ViewerAPI.js

@@ -4,36 +4,40 @@ import { ViewerImageAPI } from "./ViewerImageAPI.js";
 
 // API provided by the viewer
 export class ViewerAPI {
-    constructor(data,vpAPI) {
-        this.min=1;
-        this.viewerImageAPI = new ViewerImageAPI(data);
-        this.viewerPanoAPI = vpAPI;
+
+    constructor(viewerImageAPI, viewerPanoAPI) {
+        this.min = 1;
+        this.viewerImageAPI = viewerImageAPI;
+        this.viewerPanoAPI = viewerPanoAPI;
     }
 
 
     //Move the view to the given position.
-    move ( lon,  lat,  z ){
+    move(lon, lat, z) {
 
-        let temp = [lon,lat,z];
+        let temp = [lon, lat, z];
         let resultset = [];
         let minval;
         let minkey;
 
         //console.log(viewerImageAPI.viewerImages);
-        for (let i in this.viewerImageAPI.viewerImages){
+        for (let i in this.viewerImageAPI.currentFloor.viewerImages) {
             //console.log(viewerImageAPI.viewerImages[i].pos);
             //console.log(viewerImageAPI.viewerImages[i].pos[0]);
             //console.log(temp[0]);
-            let result = Math.sqrt(Math.pow(this.viewerImageAPI.viewerImages[i].pos[0]-temp[0],2)+Math.pow(this.viewerImageAPI.viewerImages[i].pos[1]-temp[1],2)+Math.pow(this.viewerImageAPI.viewerImages[i].pos[2]-temp[2],2));
+            let result = Math.sqrt(
+                Math.pow(this.viewerImageAPI.currentFloor.viewerImages[i].pos[0] - temp[0], 2) +
+                Math.pow(this.viewerImageAPI.currentFloor.viewerImages[i].pos[1] - temp[1], 2) +
+                Math.pow(this.viewerImageAPI.currentFloor.viewerImages[i].pos[2] - temp[2], 2) );
             //console.log(result);
             resultset.push(result);  
         }
 
         console.log(resultset);
         minkey = 0;
         minval = resultset[0];
-        for (let i in resultset){
-            if (resultset[i]<minval){
+        for (let i in resultset) {
+            if (resultset[i] < minval) {
                 minval = resultset[i];
                 minkey = i;
             }