From 3e74ace58662a90e4d3e8bd73ded00fd4e7f6144 Mon Sep 17 00:00:00 2001
From: Daria Kolokolnikova <72koda1bif@hft-stuttgart.de>
Date: Thu, 16 Dec 2021 13:26:40 +0100
Subject: [PATCH] implemented getLocalShadowData()
---
public/js/connectToAPI.js | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/public/js/connectToAPI.js b/public/js/connectToAPI.js
index 714407c..a514281 100644
--- a/public/js/connectToAPI.js
+++ b/public/js/connectToAPI.js
@@ -5,7 +5,7 @@ var url2 = "http://vm24.fkc.hft-stuttgart.de:8082/workflow/timedShadowValueByDay
/*TODO#1: -get current data from the api and create local test data (apiData foler)
-add connection handeling (error messages when there isnt a connection and then using the local test data)
*/
-
+var localShadowData = "/3dclient4simstadtapi/public/test/APIdata/shadowData.json"
var buildingFunctionSort
var constructionYearSortPick
@@ -91,19 +91,25 @@ const response = await fetch(url, {
document.getElementById("loader").style.visibility = "hidden"
+async function getLocalShadowdata(){
+ // gets the response from the api and put it inside a constant
+ const response = await fetch(localShadowData);
+ //the response have to be converted to json type file, so it can be used
+ const data = await response.json();
+ console.log(data)
+ // shadowData=data;
+ return data;
+ }
function processData() {
console.log(coordinatesBB)
console.log("Waiting for data....")
-
-
-
timeout(25000, fetchshadowDataJSON()).then((response)=>{
console.log(response)
shadowdata = response ;
}).catch((error)=>{ //catching the error(no connection)/ timeout and displaying an alert for the user
-
- console.log("Using local test data");
+ // shadowdata= getLocalShadowdata();
+ console.log(shadowdata);
//loadLocalAPIshadowData here...
})
--
GitLab