Commit eabf63bc authored by JOE XMG's avatar JOE XMG
Browse files

application update

parent 4085b066
Pipeline #8485 passed with stage
in 14 seconds
This diff is collapsed.
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
display: none!important; display: none!important;
} }
.cesium-viewer-animationContainer { /* .cesium-viewer-animationContainer {
display: none!important; display: none!important;
} } */
.cesium-viewer-bottom { /* .cesium-viewer-bottom {
display: none!important; display: none!important;
} } */
.form-group-inmenu { .form-group-inmenu {
padding-left: 45px!important; padding-left: 45px!important;
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
/* right: 20px; */ /* right: 20px; */
background: #ffffffff; background: #ffffffff;
border-radius: 15px; border-radius: 15px;
font-size: 1;
} }
.climate-index { .climate-index {
...@@ -56,3 +57,6 @@ ...@@ -56,3 +57,6 @@
border-color: black; border-color: black;
border-style: solid; border-style: solid;
} */ } */
.very-sm {
font-size:9px;
}
\ No newline at end of file
...@@ -19,3 +19,7 @@ ...@@ -19,3 +19,7 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.very-sm {
font-size:9px;
}
\ No newline at end of file
{
"accessors": [
{
"bufferView": 2,
"componentType": 5126,
"count": 2888,
"max": [
30.319591522216797,
7.15411376953125,
18.41762351989746
],
"min": [
-35.988407135009766,
-7.15411376953125,
-0.3937985897064209
],
"type": "VEC3"
},
{
"bufferView": 2,
"byteOffset": 34656,
"componentType": 5126,
"count": 2888,
"max": [
1.0,
1.0,
1.0
],
"min": [
-1.0,
-1.0,
-1.0
],
"type": "VEC3"
},
{
"bufferView": 1,
"componentType": 5126,
"count": 2888,
"max": [
2.283112049102783,
0.9881065487861633
],
"min": [
0.005747308023273945,
-0.006687730550765991
],
"type": "VEC2"
},
{
"bufferView": 0,
"componentType": 5125,
"count": 6540,
"type": "SCALAR"
}
],
"asset": {
"extras": {
"author": "The_Ping Pro (https://sketchfab.com/niktord22)",
"license": "CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)",
"source": "https://sketchfab.com/3d-models/bus-51b66585d32142058500fc5001567d1d",
"title": "bus"
},
"generator": "Sketchfab-12.68.0",
"version": "2.0"
},
"bufferViews": [
{
"buffer": 0,
"byteLength": 26160,
"name": "floatBufferViews",
"target": 34963
},
{
"buffer": 0,
"byteLength": 23104,
"byteOffset": 26160,
"byteStride": 8,
"name": "floatBufferViews",
"target": 34962
},
{
"buffer": 0,
"byteLength": 69312,
"byteOffset": 49264,
"byteStride": 12,
"name": "floatBufferViews",
"target": 34962
}
],
"buffers": [
{
"byteLength": 118576,
"uri": "scene.bin"
}
],
"extensionsRequired": [
"KHR_materials_pbrSpecularGlossiness"
],
"extensionsUsed": [
"KHR_materials_pbrSpecularGlossiness"
],
"images": [
{
"uri": "textures/Material_26_diffuse.jpeg"
},
{
"uri": "textures/Material_26_specularGlossiness.jpeg"
}
],
"materials": [
{
"doubleSided": true,
"extensions": {
"KHR_materials_pbrSpecularGlossiness": {
"diffuseFactor": [
1.0,
1.0,
1.0,
1.0
],
"diffuseTexture": {
"index": 0
},
"glossinessFactor": 0.8475609756097561,
"specularFactor": [
0.45121951219512196,
0.45121951219512196,
0.45121951219512196
],
"specularGlossinessTexture": {
"index": 1
}
}
},
"name": "Material_26"
}
],
"meshes": [
{
"name": "19BUS_Material #26_0",
"primitives": [
{
"attributes": {
"NORMAL": 1,
"POSITION": 0,
"TEXCOORD_0": 2
},
"indices": 3,
"material": 0,
"mode": 4
}
]
}
],
"nodes": [
{
"children": [
1
],
"matrix": [
1.0,
0.0,
0.0,
0.0,
0.0,
2.220446049250313e-16,
-1.0,
0.0,
0.0,
1.0,
2.220446049250313e-16,
0.0,
0.0,
0.0,
0.0,
1.0
],
"name": "Sketchfab_model"
},
{
"children": [
2
],
"matrix": [
1.0,
0.0,
0.0,
0.0,
0.0,
0.0,
1.0,
0.0,
0.0,
-1.0,
0.0,
0.0,
0.0,
0.0,
0.0,
1.0
],
"name": "������.FBX"
},
{
"children": [
3
],
"name": "RootNode"
},
{
"children": [
4
],
"matrix": [
1.0,
0.0,
0.0,
0.0,
0.0,
2.220446049250313e-16,
-1.0,
0.0,
0.0,
1.0,
2.220446049250313e-16,
0.0,
0.0,
0.0,
0.0,
1.0
],
"name": "19BUS"
},
{
"mesh": 0,
"name": "19BUS_Material #26_0"
}
],
"samplers": [
{
"magFilter": 9729,
"minFilter": 9987,
"wrapS": 10497,
"wrapT": 10497
}
],
"scene": 0,
"scenes": [
{
"name": "Sketchfab_Scene",
"nodes": [
0
]
}
],
"textures": [
{
"sampler": 0,
"source": 0
},
{
"sampler": 0,
"source": 1
}
]
}
This diff is collapsed.
...@@ -107,14 +107,23 @@ ...@@ -107,14 +107,23 @@
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
"></div> ">
<div class="col" style="position: absolute; bottom: 10px; left: 10px; z-index: 1000;">
<div class="pt-2 cesiumLegend" id="specific_heatdemand-legend"
style="display:none"></div>
<div class="pt-2 cesiumLegend" id="PVPotential-legend" style="display:none">
</div>
<div class="pt-2 cesiumLegend" id="PVSpecificYield-legend"
style="display:none"></div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-12 col-lg-3"> <div class="col-12 col-lg-3" style=" overflow: auto; max-height: 680px;">
<div class="card" style="height: 680px"> <div class="card">
<div class="card-header"> <div class="card-header">
<h4>3D Map Tool</h4> <h4>3D Map Tool</h4>
</div> </div>
...@@ -130,7 +139,8 @@ ...@@ -130,7 +139,8 @@
</label> </label>
</div> </div>
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="checkbox" value="" id="district_line_checkbox"> <input class="form-check-input" type="checkbox" value=""
id="district_line_checkbox">
<label class="form-check-label" for="district_line_checkbox"> <label class="form-check-label" for="district_line_checkbox">
District and Zone (Line) <span class="badge bg-secondary">Boundary</span> District and Zone (Line) <span class="badge bg-secondary">Boundary</span>
</label> </label>
...@@ -138,7 +148,15 @@ ...@@ -138,7 +148,15 @@
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="checkbox" value="" id="district_checkbox"> <input class="form-check-input" type="checkbox" value="" id="district_checkbox">
<label class="form-check-label" for="district_checkbox"> <label class="form-check-label" for="district_checkbox">
District and Zone (Polygon) <span class="badge bg-secondary">Heat Demand</span> District and Zone (Polygon) <span class="badge bg-secondary">Heat
Demand</span>
</label>
</div>
<div class="form-check">
<input class="form-check-input" type="checkbox" value=""
id="temperature_checkbox">
<label class="form-check-label" for="district_checkbox">
Air Temperature <span class="badge bg-secondary">Celcius</span>
</label> </label>
</div> </div>
...@@ -164,28 +182,29 @@ ...@@ -164,28 +182,29 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col" style=" padding-top: 10px; "> <small class="very-sm">
<small>
<b>discliamer:</b> The building energy data (Heat demand, PV Potential) <b>discliamer:</b> The building energy data (Heat demand, PV Potential)
are calculated based on 1) LoD-1 Building Models and 2) randomly assigned building year of are calculated based on 1) LoD-1 Building Models and 2) randomly assigned
building year of
construction. construction.
</small> </small>
</div>
<div class="col">
<div class="pt-2 cesiumLegend" id="specific_heatdemand-legend"
style="display:none"></div>
<div class="pt-2 cesiumLegend" id="PVPotential-legend" style="display:none">
</div>
<div class="pt-2 cesiumLegend" id="PVSpecificYield-legend"
style="display:none"></div>
</div>
</div> </div>
<hr> <hr>
<h6>Bus Route</h6>
<b>Camera Mode:</b>
<div class="nowrap">
<input id="freeMode" name="source" type="radio" checked />
<label for="freeMode">Free</label>
</div>
<div class="nowrap">
<input id="BusMode" name="source" type="radio" />
<label for="BusMode">Bus View</label>
</div>
</div> </div>
...@@ -217,7 +236,7 @@ ...@@ -217,7 +236,7 @@
<footer> <footer>
<div class="footer clearfix mb-0 text-muted"> <div class="footer clearfix mb-0 text-muted">
<div class="float-start"> <div class="float-start">
<p>2022 &copy; by <a href="https://www.hft-stuttgart.de/p/thunyathep-santhanavanich">Joe T.S. <p><span id="year">2022</span> &copy; by <a href="https://www.hft-stuttgart.de/p/thunyathep-santhanavanich">Joe T.S.
@HFT Stuttgart</a> </p> @HFT Stuttgart</a> </p>
</div> </div>
</div> </div>
...@@ -240,6 +259,10 @@ ...@@ -240,6 +259,10 @@
<!-- theme template --> <!-- theme template -->
<script src="assets/js/app.js"></script> <script src="assets/js/app.js"></script>
<script src="assets/js/app-min.js"></script> <script src="assets/js/app-min.js"></script>
<script>
var currentYear = new Date().getFullYear();
$("#year").html(currentYear)
</script>
<!-- <script src="assets/js/cesium_00_Main.js"></script> --> <!-- <script src="assets/js/cesium_00_Main.js"></script> -->
<!-- <script src="assets/js/cesium_01_mouse.js"></script> --> <!-- <script src="assets/js/cesium_01_mouse.js"></script> -->
......
Supports Markdown
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