Skip to content

GitLab

Commit b045e623 authored by BujarMuharemi's avatar BujarMuharemi
Browse files

added beautify extension and formated all files

parent 613d4534
Expand all Hide whitespace changes
Inline Side-by-side
.jsbeautifyrc 0 → 100644
View file @ b045e623
{
"indent_size": 4,
"indent_char": " ",
"indent_level": 0,
"end-with-newline": true,
"indent_with_tabs": false,
"preserve_newlines": true,
"max_preserve_newlines": 10,
"jslint_happy": false,
"space_after_anon_function": false,
"brace_style": "collapse,preserve-inline",
"keep_array_indentation": false,
"keep_function_indentation": false,
"space_before_conditional": true,
"break_chained_methods": false,
"eval_code": false,
"unescape_strings": false,
"wrap_line_length": 0,
"css": {
"selector_separator_newline": false
}
}
\ No newline at end of file
public/js/connectToAPI.js
View file @ b045e623
...@@ -19,23 +19,23 @@ var uValueSortPick ...@@ -19,23 +19,23 @@ var uValueSortPick
var shadowdata var shadowdata
async function fetchPvPotentialJSON() { async function fetchPvPotentialJSON() {
var bottomLat = coordinatesBB[1] var bottomLat = coordinatesBB[1]
var leftLng = coordinatesBB[0] var leftLng = coordinatesBB[0]
var rightLng = coordinatesBB[2] var rightLng = coordinatesBB[2]
var topLat = coordinatesBB[3] var topLat = coordinatesBB[3]
const response = await fetch(pvURL, { const response = await fetch(pvURL, {
method: "POST", method: "POST",
body: JSON.stringify({ body: JSON.stringify({
"boundingBox": { "boundingBox": {
"bottomLat": bottomLat, //48.779004965, "bottomLat": bottomLat, //48.779004965,
"leftLng": leftLng, //9.1686843081, "leftLng": leftLng, //9.1686843081,
"lodType": "LOD2", "lodType": "LOD2",
"rightLng": rightLng, //9.175336684, "rightLng": rightLng, //9.175336684,
"topLat": topLat //48.7822869656 "topLat": topLat //48.7822869656
}, },
"cityGMLRef": "campusLOD2" "cityGMLRef": "campusLOD2"
}), }),
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
...@@ -51,17 +51,17 @@ async function fetchshadowDataJSON() { ...@@ -51,17 +51,17 @@ async function fetchshadowDataJSON() {
var bottomLat = coordinatesBB[1] var bottomLat = coordinatesBB[1]
var leftLng = coordinatesBB[0] var leftLng = coordinatesBB[0]
var rightLng = coordinatesBB[2] var rightLng = coordinatesBB[2]
var topLat = coordinatesBB[3]// var topLat = coordinatesBB[3] //
var day = "1"; var day = "1";
const response = await fetch(url2 + day, { const response = await fetch(url2 + day, {
method: "POST", method: "POST",
body: JSON.stringify({ body: JSON.stringify({
"boundingBox": { "boundingBox": {
"bottomLat": bottomLat, //48.779004965, "bottomLat": bottomLat, //48.779004965,
"leftLng": leftLng, //9.1686843081, "leftLng": leftLng, //9.1686843081,
"lodType": "LOD2", "lodType": "LOD2",
"rightLng": rightLng, //9.175336684, "rightLng": rightLng, //9.175336684,
"topLat": topLat //48.7822869656 "topLat": topLat //48.7822869656
}, },
"cityGMLRef": "campusLOD2" "cityGMLRef": "campusLOD2"
}), }),
...@@ -80,17 +80,17 @@ async function fetchDataJSON() { ...@@ -80,17 +80,17 @@ async function fetchDataJSON() {
var bottomLat = coordinatesBB[1] var bottomLat = coordinatesBB[1]
var leftLng = coordinatesBB[0] var leftLng = coordinatesBB[0]
var rightLng = coordinatesBB[2] var rightLng = coordinatesBB[2]
var topLat = coordinatesBB[3]// var topLat = coordinatesBB[3] //
const response = await fetch(url, { const response = await fetch(url, {
method: "POST", method: "POST",
body: JSON.stringify({ body: JSON.stringify({
"boundingBox": { "boundingBox": {
"bottomLat": bottomLat, //48.779004965, "bottomLat": bottomLat, //48.779004965,
"leftLng": leftLng, //9.1686843081, "leftLng": leftLng, //9.1686843081,
"lodType": "LOD2", "lodType": "LOD2",
"rightLng": rightLng, //9.175336684, "rightLng": rightLng, //9.175336684,
"topLat": topLat //48.7822869656 "topLat": topLat //48.7822869656
}, },
"cityGMLRef": "campusLOD2", "cityGMLRef": "campusLOD2",
"interestedAttributes": [ "interestedAttributes": [
...@@ -104,7 +104,7 @@ const response = await fetch(url, { ...@@ -104,7 +104,7 @@ const response = await fetch(url, {
"monthlyCooling", "monthlyCooling",
"pvPotential", "pvPotential",
"roofType", "roofType",
"totalSurfaceArea" "totalSurfaceArea"
], ],
"properies": { "properies": {
"physicsUseScenario": false "physicsUseScenario": false
...@@ -121,39 +121,39 @@ const response = await fetch(url, { ...@@ -121,39 +121,39 @@ const response = await fetch(url, {
document.getElementById("loader").style.visibility = "hidden" document.getElementById("loader").style.visibility = "hidden"
async function getLocalShadowdata(){ async function getLocalShadowdata() {
// gets the response from the api and put it inside a constant // gets the response from the api and put it inside a constant
const response = await fetch(localShadowData); const response = await fetch(localShadowData);
//the response have to be converted to json type file, so it can be used //the response have to be converted to json type file, so it can be used
const data = await response.json(); const data = await response.json();
console.log(data) console.log(data)
// shadowData=data; // shadowData=data;
return data; return data;
} }
function processData() { function processData() {
console.log(coordinatesBB) console.log(coordinatesBB)
console.log("Waiting for data....") console.log("Waiting for data....")
timeout(25000, fetchshadowDataJSON()).then((response)=>{ timeout(25000, fetchshadowDataJSON()).then((response) => {
console.log(response) console.log(response)
shadowdata = response ; shadowdata = response;
}).catch((error)=>{ //catching the error(no connection)/ timeout and displaying an alert for the user }).catch((error) => { //catching the error(no connection)/ timeout and displaying an alert for the user
// shadowdata= getLocalShadowdata(); // shadowdata= getLocalShadowdata();
console.log(shadowdata); console.log(shadowdata);
//loadLocalAPIshadowData here... //loadLocalAPIshadowData here...
}) })
timeout(10000, fetchPvPotentialJSON()).then((response)=>{ timeout(10000, fetchPvPotentialJSON()).then((response) => {
console.log(response) console.log(response)
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
}) })
timeout(10000, fetchDataJSON()).then((response)=>{ timeout(10000, fetchDataJSON()).then((response) => {
calculateData(response); calculateData(response);
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
/* /*
fetch("/3dclient4simstadtapi/public/test/APIdata/buildingInformation.json") fetch("/3dclient4simstadtapi/public/test/APIdata/buildingInformation.json")
...@@ -162,14 +162,14 @@ function processData() { ...@@ -162,14 +162,14 @@ function processData() {
*/ */
}) })
} }
function calculateData(data){ function calculateData(data) {
console.log(data); console.log(data);
document.getElementById("cesiumContainer").style.opacity = "1"; document.getElementById("cesiumContainer").style.opacity = "1";
document.getElementById("loader").style.visibility = "hidden" document.getElementById("loader").style.visibility = "hidden"
...@@ -199,7 +199,7 @@ function calculateData(data){ ...@@ -199,7 +199,7 @@ function calculateData(data){
p.attributes.monthlyCooling, p.attributes.monthlyCooling,
p.attributes.roofType))) p.attributes.roofType)))
buildingsMAP.set(bu.id, new Building(bu.id, partsArray)) //puts buildings with parts and surfaces in a map buildingsMAP.set(bu.id, new Building(bu.id, partsArray)) //puts buildings with parts and surfaces in a map
}) })
...@@ -299,7 +299,7 @@ function calculateData(data){ ...@@ -299,7 +299,7 @@ function calculateData(data){
availableAttributes() availableAttributes()
//color buildings with heating demand //color buildings with heating demand
document.getElementById("checkbox2").addEventListener("change", function () { document.getElementById("checkbox2").addEventListener("change", function() {
if (this.checked) { if (this.checked) {
tileContent.forEach(t => { tileContent.forEach(t => {
let tileID = t.getProperty("gml_parent_id") let tileID = t.getProperty("gml_parent_id")
...@@ -318,7 +318,7 @@ function calculateData(data){ ...@@ -318,7 +318,7 @@ function calculateData(data){
}) })
//color surfaces with uValue //color surfaces with uValue
document.getElementById("checkbox1").addEventListener("change", function () { document.getElementById("checkbox1").addEventListener("change", function() {
if (this.checked) { if (this.checked) {
tileContent.forEach(t => { tileContent.forEach(t => {
let tileID = t.getProperty("gml_id") let tileID = t.getProperty("gml_id")
...@@ -377,13 +377,13 @@ var modal = document.getElementById("myModal"); ...@@ -377,13 +377,13 @@ var modal = document.getElementById("myModal");
var span = document.getElementsByClassName("close")[0]; var span = document.getElementsByClassName("close")[0];
//close the modal //close the modal
span.onclick = function () { span.onclick = function() {
modal.style.display = "none"; modal.style.display = "none";
deleteTilesetButtons() deleteTilesetButtons()
} }
// modal closes, when the user clicks anywhere outside of the modal // modal closes, when the user clicks anywhere outside of the modal
window.onclick = function (event) { window.onclick = function(event) {
if (event.target == modal) { if (event.target == modal) {
modal.style.display = "none"; modal.style.display = "none";
deleteTilesetButtons() deleteTilesetButtons()
...@@ -401,24 +401,24 @@ var localTestTileset = '/3dclient4simstadtapi/public/test/gmlTileset_v1.json'; ...@@ -401,24 +401,24 @@ var localTestTileset = '/3dclient4simstadtapi/public/test/gmlTileset_v1.json';
function timeout(ms, promise) { function timeout(ms, promise) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
setTimeout(function() { setTimeout(function() {
reject(new Error("timeout")) reject(new Error("timeout"))
}, ms) }, ms)
promise.then(resolve, reject) promise.then(resolve, reject)
}) })
} }
//fetching the tileset and handling the connection //fetching the tileset and handling the connection
async function fetchTileset(){ async function fetchTileset() {
timeout(1000, fetch(tilesetURL)).then((response)=>{ timeout(1000, fetch(tilesetURL)).then((response) => {
loadAndZoomToTileset(tilesetURL); loadAndZoomToTileset(tilesetURL);
}).catch((error)=>{ //catching the error(no connection)/ timeout and displaying an alert for the user }).catch((error) => { //catching the error(no connection)/ timeout and displaying an alert for the user
//var errorString = error["stack"]+"\n"+error["message"]; // formatting the error array //var errorString = error["stack"]+"\n"+error["message"]; // formatting the error array
swal({text:"Could not connect to Server. Using now: local data",icon:"info" } ); swal({ text: "Could not connect to Server. Using now: local data", icon: "info" });
console.log("Using local test data"); console.log("Using local test data");
loadAndZoomToTileset(localTestTileset); //TODO#3: fix the link so the local tileset can be loaded loadAndZoomToTileset(localTestTileset); //TODO#3: fix the link so the local tileset can be loaded
}) })
} }
...@@ -436,26 +436,26 @@ async function fetchTileset(){ ...@@ -436,26 +436,26 @@ async function fetchTileset(){
//loads tileset after submit button is clicked //loads tileset after submit button is clicked
function loadTileset() { function loadTileset() {
viewer.scene.primitives.remove(tileset); viewer.scene.primitives.remove(tileset);
tileContent = []; tileContent = [];
modal.style.display = "block"; modal.style.display = "block";
fetchTileset(); fetchTileset();
//var userurl = document.getElementById("3Durl").value; //returns the chosen area from the dropdown //var userurl = document.getElementById("3Durl").value; //returns the chosen area from the dropdown
} }
//loads the tileset from the url into the cesium viewer and zooms to it //loads the tileset from the url into the cesium viewer and zooms to it
function loadAndZoomToTileset(url){ function loadAndZoomToTileset(url) {
tileset=viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ tileset = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
url: url url: url
})); }));
viewer.zoomTo(tileset, new Cesium.HeadingPitchRange(0, -0.5, 0)); viewer.zoomTo(tileset, new Cesium.HeadingPitchRange(0, -0.5, 0));
modal.style.display = "none"; modal.style.display = "none";
saveTilesetContent(tileset) saveTilesetContent(tileset)
deleteTilesetButtons() deleteTilesetButtons()
} }
...@@ -469,7 +469,7 @@ function useContent(content) { ...@@ -469,7 +469,7 @@ function useContent(content) {
document.getElementById("myList").appendChild(element); document.getElementById("myList").appendChild(element);
element.onclick = function () { element.onclick = function() {
tileset = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ tileset = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
url: cont.href url: cont.href
})); }));
...@@ -494,13 +494,13 @@ function saveTilesetContent(tileset) { ...@@ -494,13 +494,13 @@ function saveTilesetContent(tileset) {
function deleteTilesetButtons() { function deleteTilesetButtons() {
var x = document.getElementsByName("individualTileset") var x = document.getElementsByName("individualTileset")
var len = x.length var len = x.length
//checking if there are even tileset to delete //checking if there are even tileset to delete
if(x.length>0){ if (x.length > 0) {
parentNode = x[0].parentNode; parentNode = x[0].parentNode;
for (var i = 0; i < len; i++) { for (var i = 0; i < len; i++) {
parentNode.removeChild(x[0]); parentNode.removeChild(x[0]);
} }
} }
} }
public/js/globe.js
View file @ b045e623
This diff is collapsed.
public/js/shadowPalette.js
View file @ b045e623
//Shadow palette for coloring the roofs //Shadow palette for coloring the roofs
//color pallet white->black //color pallet white->black
var colorPalette = ['#ffffff','#f0f0f0','#d9d9d9','#bdbdbd','#969696','#737373','#525252','#252525']; var colorPalette = ['#ffffff', '#f0f0f0', '#d9d9d9', '#bdbdbd', '#969696', '#737373', '#525252', '#252525'];
const shadowPalette = colorPalette.reverse(); const shadowPalette = colorPalette.reverse();
//returns the responding color from the shadowPalette, depending on the inputShadowValue(0 to 1 in float) //returns the responding color from the shadowPalette, depending on the inputShadowValue(0 to 1 in float)
function getShadowPalette(inputShadowValue){ function getShadowPalette(inputShadowValue) {
//checking for the float values //checking for the float values
var index = Math.ceil((shadowPalette.length-1)*inputShadowValue); var index = Math.ceil((shadowPalette.length - 1) * inputShadowValue);
//console.log(inputShadowValue,"---",shadowPalette[index]); //console.log(inputShadowValue,"---",shadowPalette[index]);
return shadowPalette[index]; return shadowPalette[index];
} }
public/js/sidebar.js
View file @ b045e623
...@@ -4,75 +4,73 @@ var radio = document.getElementById('radio-group'); ...@@ -4,75 +4,73 @@ var radio = document.getElementById('radio-group');
var filterswitches = document.getElementById('filterswitches'); var filterswitches = document.getElementById('filterswitches');
//Show / hide chart //Show / hide chart
chartButton.addEventListener('click', function () { chartButton.addEventListener('click', function() {
//sets as default attribute building function //sets as default attribute building function
myChartArea("bar", "Building Function", 1, "Building Type", "Frequency", coloR); myChartArea("bar", "Building Function", 1, "Building Type", "Frequency", coloR);
addGlobalData(areaChart, buildingType, btFrequency, btFrequency.length) addGlobalData(areaChart, buildingType, btFrequency, btFrequency.length)
if (drawBox === false) { if (drawBox === false) {
swal("CAN'T LOAD DATA!", "mark an area first!", "error"); swal("CAN'T LOAD DATA!", "mark an area first!", "error");
} else {
var x = document.getElementById('areaChartContainer');
if (x.style.visibility === 'visible') {
//button.firstChild.data = "Show chart";
x.style.visibility = 'hidden';
} else { } else {
//button.firstChild.data = "Hide chart"; var x = document.getElementById('areaChartContainer');
x.style.visibility = 'visible';
}
}
}, false);
heatingdemand.addEventListener('click', function () { if (x.style.visibility === 'visible') {
var x = document.getElementById('heat-demand-legend'); //button.firstChild.data = "Show chart";
if (!document.getElementById('checkbox2').checked) { x.style.visibility = 'hidden';
x.style.visibility = 'hidden'; } else {
} else { //button.firstChild.data = "Hide chart";
x.style.visibility = 'visible'; x.style.visibility = 'visible';
} }
}
}, false); }, false);
radio.addEventListener('click', function () { heatingdemand.addEventListener('click', function() {
if (document.getElementById("surface").checked) { var x = document.getElementById('heat-demand-legend');
document.getElementById("checkbox1").disabled = false; if (!document.getElementById('checkbox2').checked) {
document.getElementById("checkbox2").disabled = true; x.style.visibility = 'hidden';
if (document.getElementById("checkbox2").checked) { } else {
document.getElementById("checkbox2").checked = false; x.style.visibility = 'visible';
document.getElementById('heat-demand-legend').style.visibility = 'hidden';
tileContent.forEach(t => t.color = new Cesium.Color(1, 1, 1, 1))
}
}
else {
document.getElementById("checkbox1").disabled = true;
document.getElementById("checkbox2").disabled = false;
if (document.getElementById("checkbox1").checked) {
document.getElementById("checkbox1").checked = false;
tileContent.forEach(t => t.color = new Cesium.Color(1, 1, 1, 1))
} }
}
}, false); }, false);
filterswitches.addEventListener('click', function () { radio.addEventListener('click', function() {
if (drawBox === false) {
swal("CAN'T LOAD DATA!", "mark an area first!", "error");
document.getElementById("checkbox2").disabled = true;
document.getElementById("checkbox1").disabled = true;
} else {
if (document.getElementById("surface").checked) { if (document.getElementById("surface").checked) {
document.getElementById("checkbox1").disabled = false; document.getElementById("checkbox1").disabled = false;
document.getElementById("checkbox2").disabled = true; document.getElementById("checkbox2").disabled = true;
if (document.getElementById("checkbox2").checked) {
document.getElementById("checkbox2").checked = false;
document.getElementById('heat-demand-legend').style.visibility = 'hidden';
tileContent.forEach(t => t.color = new Cesium.Color(1, 1, 1, 1))
}
} else {
document.getElementById("checkbox1").disabled = true;
document.getElementById("checkbox2").disabled = false;
if (document.getElementById("checkbox1").checked) {
document.getElementById("checkbox1").checked = false;
tileContent.forEach(t => t.color = new Cesium.Color(1, 1, 1, 1))
}
} }
else { }, false);
document.getElementById("checkbox1").disabled = true;
document.getElementById("checkbox2").disabled = false; filterswitches.addEventListener('click', function() {
if (drawBox === false) {
swal("CAN'T LOAD DATA!", "mark an area first!", "error");
document.getElementById("checkbox2").disabled = true;
document.getElementById("checkbox1").disabled = true;
} else {
if (document.getElementById("surface").checked) {
document.getElementById("checkbox1").disabled = false;
document.getElementById("checkbox2").disabled = true;
} else {
document.getElementById("checkbox1").disabled = true;
document.getElementById("checkbox2").disabled = false;
}
} }
}
}, false); }, false);
function toggleSidebar(ref) { function toggleSidebar(ref) {
document.getElementById("sidebar").classList.toggle('active'); document.getElementById("sidebar").classList.toggle('active');
} }
//loop through all dropdown buttons to toggle between hiding and showing its dropdown content //loop through all dropdown buttons to toggle between hiding and showing its dropdown content
...@@ -80,13 +78,13 @@ var dropdown = document.getElementsByClassName("dropdown-btn"); ...@@ -80,13 +78,13 @@ var dropdown = document.getElementsByClassName("dropdown-btn");
var i; var i;
for (i = 0; i < dropdown.length; i++) { for (i = 0; i < dropdown.length; i++) {
dropdown[i].addEventListener("click", function () { dropdown[i].addEventListener("click", function() {
this.classList.toggle("active"); this.classList.toggle("active");
var dropdownContent = this.nextElementSibling; var dropdownContent = this.nextElementSibling;
if (dropdownContent.style.display === "block") { if (dropdownContent.style.display === "block") {
dropdownContent.style.display = "none"; dropdownContent.style.display = "none";
} else { } else {
dropdownContent.style.display = "block"; dropdownContent.style.display = "block";
} }
}); });
} }
public/js/testingAPIValues.js
View file @ b045e623
...@@ -27,7 +27,7 @@ function test() { ...@@ -27,7 +27,7 @@ function test() {
p.attributes.monthlyHeating, p.attributes.monthlyHeating,
p.attributes.monthlyCooling))) p.attributes.monthlyCooling)))
buildingsMAP.set(bu.id, new Building(bu.id, partsArray)) //puts buildings with parts and surfaces in a map buildingsMAP.set(bu.id, new Building(bu.id, partsArray)) //puts buildings with parts and surfaces in a map
}) })
...@@ -104,7 +104,7 @@ function test() { ...@@ -104,7 +104,7 @@ function test() {
sortMap() sortMap()
//color buildings with heating demand //color buildings with heating demand
document.getElementById("checkbox2").addEventListener("change", function () { document.getElementById("checkbox2").addEventListener("change", function() {
if (this.checked) { if (this.checked) {
tileContent.forEach(t => { tileContent.forEach(t => {
let tileID = t.getProperty("gml_parent_id") let tileID = t.getProperty("gml_parent_id")
...@@ -124,7 +124,7 @@ function test() { ...@@ -124,7 +124,7 @@ function test() {
}) })
//color surfaces with uValue //color surfaces with uValue
document.getElementById("checkbox1").addEventListener("change", function () { document.getElementById("checkbox1").addEventListener("change", function() {
if (this.checked) { if (this.checked) {
tileContent.forEach(t => { tileContent.forEach(t => {
let tileID = t.getProperty("gml_id") let tileID = t.getProperty("gml_id")
...@@ -143,4 +143,3 @@ function test() { ...@@ -143,4 +143,3 @@ function test() {
} }
}) })
} }
Markdown is supported
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal