Skip to content

GitLab

Commit 8c6dbdf1 authored by Patrick's avatar Patrick
Browse files

update some stuff

parent c613c105
Expand all Hide whitespace changes
Inline Side-by-side
servertest.js 0 → 100644
View file @ 8c6dbdf1
const http = require('http');
const fs = require('fs');
const express = require('express')
const app = express();
const bodyParser = require('body-parser')
const soap = require('soap');
app.use(bodyParser.urlencoded({ extended: false }))
app.use(bodyParser.json())
const request = require('ajax-request');
app.use(express.static('vcm'));
app.listen(process.env.PORT || 8083);
console.log("on 8080");
var url = 'http://193.196.137.147:8990/orchestration/services/SimStadt2MonthlyenergyBalance?wsdl';
var args = {
gmlid: 'DENW22AL80000AQv', // an example of a building in Essen DENW22AL700004Lv ----DEBW522AA0003113b---in Stockach
cityID: 3,// Essen 3 // Stockach 1
ui: {
attic: true,
atticHeating: true,
basement: true,
basementHeating: true,
buildingType: "EFH", // other options: "RH", "MFH", "GFH", "HH"
flatRoof: true,
id: 'DENW22AL80000AQv', // equal with glmid
latitude: 50.774414,//51.44679140365339, // an example of a building in Essen
longitude: 6.086995,//6.967781962878631, // an example of a building in Essen
refurbishment: "statuQuo", // other options: "medium", "advanced"
simulationName: "MonthlyEnergyBalance", // just use this value for Heat/Cooling Demand
storeyCount: 3,
timestep: 1, // dummy integer, not yet integrated but mandatory
usageProfile: "Single Family House", // // other options: "Multi Family House"
yearOfConstruction: 1946
}
};
app.post('/getSimS', function(req,res){
try {
const data = req.body;
console.log("data ==============")
console.log(data.id);
args.gmlid = data.id
console.log(data[0]);
console.log(data[1]);
console.log("args ==============")
console.log(args);
//asdf
const returnedTarget = Object.assign(args.ui,data);
args.ui = data;
args.gmlid = data.id;
console.log("returned ==============")
console.log(returnedTarget)
console.log("args ==============")
console.log(args);
soap.createClient(url, function(err, client) {
client.getMonthlyEnergyBalance(args, function(err, result) {
if (err) throw err;
console.log(result);
// const obj = JSON.parse(result);
// console.log(obj)
return res.send(result);
// res.json(result);
// return result;
});
});
}
catch (err) {
console.log('.../getSimS failed!\n' + err);
}
});
/* *************
WSDL SimStadt (Preston)
************* */
// router.get('/monthlyEnergyBalance', function(req, res) {
// var url = 'http://193.196.137.147:8990/orchestration/services/SimStadt2MonthlyenergyBalance?wsdl'
// var args = {
// gmlid: 'DENW22AL80000AQv', // req.params.gmlID,
// cityID: 3,// Essen
// ui: {
// attic: true,
// atticHeating: true,
// basement: true,
// basementHeating: true,
// buildingType: "EFH", // "RH" , "MFH" , "GFH" , "HH"
// flatRoof: true,
// id: "DENW22AL80000AQv",
// latitude: 50.774414,
// longitude: 6.086995,
// refurbishment: "statuQuo", // "medium", "advanced"
// simulationName: "MonthlyEnergyBalance",
// storeyCount: 3,
// timestep: 1, // dummy integer, not yet integrated but mandatory
// usageProfile: "Single Family House", // "Multi Family House"
// yearOfConstruction: 1946
// }
// };
// soap.createClient(url, function(err, client) {
// client.getMonthlyEnergyBalance(args, function(err, result) {
// if (err) throw err;
// return res.send(result);
// });
// });
// });
vcm/config.json
View file @ 8c6dbdf1
......@@ -811,7 +811,7 @@
},
{
"template": [
"<div class='balloon' onclick='showbereich(\"A\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"bereichA\")' id='myBalloon'>",
" <h1 class='balloon-title'>Bereich A</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -819,7 +819,7 @@
"<img style='padding-top:10px' src='images/MK_Images/A_Kita.jpg' alt='noch kein bild' width='375'>",
"</div>",
"<% showbereich(\"A\") %>",
"<% showbereich(\"bereichA\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......@@ -854,7 +854,7 @@
]
},{
"template": [
"<div class='balloon' onclick='showbereich(\"walz\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"InfoWalz\")' id='myBalloon'>",
" <h1 class='balloon-title'>Areal der ehem. Gärtnerei Walz</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -862,7 +862,7 @@
"<img style='padding-top:10px' src='images/MK_Images/Info_ehem.Walz Gärtnerei_vorläufig.jpg' alt='noch kein bild' width='375'>",
"</div>",
"<% showbereich(\"walz\") %>",
"<% showbereich(\"InfoWalz\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......@@ -960,7 +960,7 @@
},
{
"template": [
"<div class='balloon' onclick='showbereich(\"B\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"bereichB\")' id='myBalloon'>",
" <h1 class='balloon-title'>Bereich B</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -968,7 +968,7 @@
"<img style='padding-top:10px' src='images/MK_Images/Bereich_B.jpg' alt='noch kein bild' width='375'>",
"</div>",
"<% showbereich(\"B\") %>",
"<% showbereich(\"bereichB\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......@@ -983,7 +983,7 @@
},
{
"template": [
"<div class='balloon' onclick='showbereich(\"C\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"bereichC\")' id='myBalloon'>",
" <h1 id='bereichC' class='balloon-title'>Bereich C</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -991,7 +991,7 @@
"<img style='padding-top:10px' src='images/MK_Images/Bereich_C.jpg' alt='noch kein bild' width='375'>",
"</div>",
"<% showbereich(\"C\") %>",
"<% showbereich(\"bereichC\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......@@ -1006,7 +1006,7 @@
},
{
"template": [
"<div class='balloon' onclick='showbereich(\"D\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"bereichD\")' id='myBalloon'>",
" <h1 class='balloon-title'>Bereich D</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -1014,7 +1014,7 @@
"<img style='padding-top:10px' src='images/MK_Images/Bereich_D.jpg' alt='noch kein bild' width='375'>",
"</div>",
"<% showbereich(\"D\") %>",
"<% showbereich(\"bereichD\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......
vcm/config_ipad.json
View file @ 8c6dbdf1
......@@ -811,7 +811,7 @@
},
{
"template": [
"<div class='balloon' onclick='showbereich(\"A\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"bereichA\")' id='myBalloon'>",
" <h1 class='balloon-title'>Bereich A</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -819,7 +819,7 @@
"<img style='padding-top:10px' src='images/MK_Images/A_Kita.jpg' alt='noch kein bild' width='375'>",
"</div>",
"<% showbereich(\"A\") %>",
"<% showbereich(\"bereichA\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......@@ -854,7 +854,7 @@
]
},{
"template": [
"<div class='balloon' onclick='showbereich(\"walz\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"InfoWalz\")' id='myBalloon'>",
" <h1 class='balloon-title'>Areal der ehem. Gärtnerei Walz</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -862,7 +862,7 @@
"<img style='padding-top:10px' src='images/MK_Images/Info_ehem.Walz Gärtnerei_vorläufig.jpg' alt='noch kein bild' width='375'>",
"</div>",
"<% showbereich(\"walz\") %>",
"<% showbereich(\"InfoWalz\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......@@ -960,7 +960,7 @@
},
{
"template": [
"<div class='balloon' onclick='showbereich(\"B\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"bereichB\")' id='myBalloon'>",
" <h1 class='balloon-title'>Bereich B</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -968,7 +968,7 @@
"<img style='padding-top:10px' src='images/MK_Images/Bereich_B.jpg' alt='noch kein bild' width='375'>",
"</div>",
"<% showbereich(\"B\") %>",
"<% showbereich(\"bereichB\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......@@ -983,7 +983,7 @@
},
{
"template": [
"<div class='balloon' onclick='showbereich(\"C\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"bereichC\")' id='myBalloon'>",
" <h1 id='bereichC' class='balloon-title'>Bereich C</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -991,7 +991,7 @@
"<img style='padding-top:10px' src='images/MK_Images/Bereich_C.jpg' alt='noch kein bild' width='375'>",
"</div>",
"<% showbereich(\"C\") %>",
"<% showbereich(\"bereichC\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......@@ -1006,7 +1006,7 @@
},
{
"template": [
"<div class='balloon' onclick='showbereich(\"D\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"bereichD\")' id='myBalloon'>",
" <h1 class='balloon-title'>Bereich D</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -1014,7 +1014,7 @@
"<img style='padding-top:10px' src='images/MK_Images/Bereich_D.jpg' alt='noch kein bild' width='375'>",
"</div>",
"<% showbereich(\"D\") %>",
"<% showbereich(\"bereichD\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......
vcm/config_mobile.json
View file @ 8c6dbdf1
......@@ -504,7 +504,7 @@
},
{
"template": [
"<% showbereich(\"A\") %>",
"<% showbereich(\"bereichA\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......@@ -531,7 +531,7 @@
]
},{
"template": [
"<% showbereich(\"walz\") %>",
"<% showbereich(\"InfoWalz\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......@@ -597,7 +597,7 @@
},
{
"template": [
"<% showbereich(\"B\") %>",
"<% showbereich(\"bereichB\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......@@ -612,7 +612,7 @@
},
{
"template": [
"<% showbereich(\"C\") %>",
"<% showbereich(\"bereichC\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......@@ -627,7 +627,7 @@
},
{
"template": [
"<% showbereich(\"D\") %>",
"<% showbereich(\"bereichD\") %>",
"<% %>"
],
"minTop": "balloonHeight + 10",
......
vcm/config_safari.json
View file @ 8c6dbdf1
......@@ -833,7 +833,7 @@
},
{
"template": [
"<div class='balloon' onclick='showbereich(\"A\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"bereichA\")' id='myBalloon'>",
" <h1 class='balloon-title'>Bereich A</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -876,7 +876,7 @@
]
},{
"template": [
"<div class='balloon' onclick='showbereich(\"walz\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"InfoWalz\")' id='myBalloon'>",
" <h1 class='balloon-title'>Areal der ehem. Gärtnerei Walz</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -982,7 +982,7 @@
},
{
"template": [
"<div class='balloon' onclick='showbereich(\"B\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"bereichB\")' id='myBalloon'>",
" <h1 class='balloon-title'>Bereich B</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -1005,7 +1005,7 @@
},
{
"template": [
"<div class='balloon' onclick='showbereich(\"C\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"bereichC\")' id='myBalloon'>",
" <h1 id='bereichC' class='balloon-title'>Bereich C</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......@@ -1028,7 +1028,7 @@
},
{
"template": [
"<div class='balloon' onclick='showbereich(\"D\")' id='myBalloon'>",
"<div class='balloon' onclick='showbereich(\"bereichD\")' id='myBalloon'>",
" <h1 class='balloon-title'>Bereich D</h1>",
" <div class='balloon-content' style='height:310px; margin-right: 0px;'",
" </div>",
......
vcm/css/vcm.css
View file @ 8c6dbdf1
......@@ -211,11 +211,11 @@ img.scale {
.Cesium .featured-company{
float: left;
background-size: contain;
background-position: 0%, 15%, 35%, 53%, 72%, 100%;
background-position: 0%, 10%, 24%, 34%, 47%, 60%,73%,89%;
background-repeat: no-repeat, no-repeat, no-repeat, no-repeat, no-repeat, no-repeat;
/* background-image: url("../images/cesium-logo.png"); */
background-image: url(../icons/Türkis_Info.png),url(../legend/01_Legend.png), url(../icons/Türkis_multiplikatoren.png),url(../legend/02_Legend.png), url(../icons/Umfrage_Button_transpHintergrund_türkis.png),url(../legend/03_Legend.png);
width: 35rem;
background-image: url(../icons/Türkis_Info.png),url(../legend/01_Legend.png), url(../icons/Türkis_multiplikatoren.png),url(../legend/02_Legend.png), url(../icons/Umfrage_Button_transpHintergrund_türkis.png),url(../legend/03_Legend.png),url(../legend/ABCDSymbol_Legend.png),url(../legend/04_Legend03.png);
width: 50rem;
height: 50px;
display: inline-block;
vertical-align: top;
......
vcm/index.html
View file @ 8c6dbdf1
This diff is collapsed.
vcm/templates/custom.css
View file @ 8c6dbdf1
......@@ -67,7 +67,8 @@
}
.company-box {
height: 4rem;
height: 4rem;
width:52rem;
margin-bottom:0;
}
......
vcm/templates/custom.js
View file @ 8c6dbdf1
......@@ -110,6 +110,7 @@ function showbereich(bereich) {
if (mobile == false){
// document.getElementById("").style.display = "block";
}
} else if (bereich == "mk_kinder"){
document.getElementById("mk_kinder").style.display = "block";
......@@ -136,27 +137,27 @@ function showbereich(bereich) {
if (mobile == false){
// document.getElementById("").style.display = "block";
}
} else if (bereich == "A"){
} else if (bereich == "bereichA"){
document.getElementById("bereichA").style.display = "block";
if (mobile == false){
document.getElementById("bereichA_bild").style.display = "none";
}
} else if (bereich == "B") {
} else if (bereich == "bereichB") {
document.getElementById("bereichB").style.display = "block";
if (mobile == false){
document.getElementById("bereichB_bild").style.display = "none";
}
} else if (bereich == "C") {
} else if (bereich == "bereichC") {
document.getElementById("bereichC").style.display = "block";
if (mobile == false){
document.getElementById("bereichC_bild").style.display = "none";
}
} else if (bereich == "D") {
} else if (bereich == "bereichD") {
document.getElementById("bereichD").style.display = "block";
if (mobile == false){
document.getElementById("bereichD_bild").style.display = "none";
}
} else if (bereich == "walz"){
} else if (bereich == "InfoWalz"){
document.getElementById("InfoWalz").style.display = "block";
if (mobile == false){
document.getElementById("InfoWalz_bild").style.display = "none";
......@@ -204,6 +205,16 @@ function showbereich(bereich) {
}
}
showTour();
// if (mobile == true){
// document.getElementById(bereich + "_bild").scrollIntoView();
// } else {
// document.getElementById(bereich + "_cont").scrollIntoView();
// document.getElementById(bereich + "_cont").scrollTop += 60;
// }
}
function showtourSpecific(specify) {
if (specify == 'menu'){
......
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