From 6cbeabea87510394f66aa46ee654bb9683a92d31 Mon Sep 17 00:00:00 2001
From: Sven Schneider <sven.schneider@hft-stuttgart.de>
Date: Thu, 29 Oct 2020 16:54:30 +0100
Subject: [PATCH] fixed that the footer was shown above the cesiumviewer.
 missing </div>...

---
 public/StreamlinesMultipart.html | 41 ++++++++++++++++++--------------
 public/css/index.css             |  2 ++
 public/css/main.css              | 15 ++++++++++++
 public/iStoeck.html              |  1 -
 public/iStoeckHM.html            |  3 ++-
 public/iStoeckHMGeoJSON.html     |  3 ++-
 public/iStoeckHexgrid_2m.html    |  4 +---
 public/iStoeckStreams.html       |  3 ++-
 public/index.html                |  2 +-
 public/polylineStreams.js        | 20 +++++++++++++++-
 10 files changed, 67 insertions(+), 27 deletions(-)

diff --git a/public/StreamlinesMultipart.html b/public/StreamlinesMultipart.html
index 884092d..89a57eb 100644
--- a/public/StreamlinesMultipart.html
+++ b/public/StreamlinesMultipart.html
@@ -20,14 +20,14 @@
     integrity="sha256-0rguYS0qgS6L4qVzANq4kjxPLtvnp5nn2nB5G1lWRv4=" crossorigin="anonymous"></script>
   <script src="https://cesium.com/downloads/cesiumjs/releases/1.69/Build/Cesium/Cesium.js"></script>
   <script src="https://d3js.org/d3-dsv.v1.min.js"></script>
-<script src="https://d3js.org/d3-fetch.v1.min.js"></script>
+  <script src="https://d3js.org/d3-fetch.v1.min.js"></script>
 
 
 </head>
 
 <body>
 
-  
+
 
   <header>
     <img src="imgs/icity.png" class="titleFigure">
@@ -39,26 +39,31 @@
   <script src="polylineStreams.js"></script>
   <div id="cesiumContainer" class="pagecesium">
 
-    <div id="legend">
-      <!-- <p>Wind speed (m/s)</p>
-      <div class="inner"></div>
-    </div> -->
-    <table>
-      <tr style="height: 30px;vertical-align: top;"> 
-        <td colspan="2">Wind speed (m/s)  </td>
-        <td></td>
-      </tr>     
-      <tr>
-        <td  rowspan="1"  style="height:100px;text-align:right;"><img src="imgs/colorbarJET.png" height="100" width="20">   </td>          
-        <td>- 3.5<p style="margin-top: 78px;"><p> - 0</td>
-      </tr>
-    </table>
+    <div id="legend">     
+      <table>
+        <tr style="height: 30px;vertical-align: top;">
+          <td colspan="2">Wind speed (m/s) </td>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="1" style="height:100px;text-align:right;"><img src="imgs/colorbarJET.png" height="100"
+              width="20"> </td>
+          <td>- 3.5<p style="margin-top: 78px;">
+            <p> - 0
+          </td>
+        </tr>
+      </table>
+    </div>
   </div>
+
+
+  
+
   <footer>
     <p align="center">
-      <h5>Copyright &copy; 2018 - 2020, HFT-Stuttgart. All rights reserved</h5>
+    <h5>Copyright &copy; 2018 - 2020, HFT-Stuttgart. All rights reserved</h5>
     </p>
-  
+
   </footer>
 
 </body>
diff --git a/public/css/index.css b/public/css/index.css
index 162eb0b..09074db 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -9,6 +9,8 @@
     /* font: 1em "Fira Sans", sans-serif; */
 }
 
+
+
 .mytab { 
        display:inline-block; 
        margin-left: 35px; 
diff --git a/public/css/main.css b/public/css/main.css
index 1efbf44..226b12f 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -52,6 +52,21 @@ body{
 }
 
 
+
+a {
+	color: black;
+}
+
+a:hover{
+  color: white;
+}
+
+a:visited {
+	color: black;
+
+}
+
+
 .myBtn {
     color: #fff;
     background-color: tomato;
diff --git a/public/iStoeck.html b/public/iStoeck.html
index fcdd633..6188397 100644
--- a/public/iStoeck.html
+++ b/public/iStoeck.html
@@ -58,7 +58,6 @@
 
 </body>
 
-</body>
 
 
 </html>
\ No newline at end of file
diff --git a/public/iStoeckHM.html b/public/iStoeckHM.html
index 16f4252..6718e5c 100644
--- a/public/iStoeckHM.html
+++ b/public/iStoeckHM.html
@@ -50,6 +50,7 @@
           <td>- 113006<p style="margin-top: 78px;"><p> - 112976</td>
         </tr>
       </table>
+    </div>
 
   </div>
 
@@ -61,7 +62,7 @@
 
 </body>
 
-</body>
+
 
 
 </html>
\ No newline at end of file
diff --git a/public/iStoeckHMGeoJSON.html b/public/iStoeckHMGeoJSON.html
index 8a1fb71..73ce81d 100644
--- a/public/iStoeckHMGeoJSON.html
+++ b/public/iStoeckHMGeoJSON.html
@@ -50,6 +50,7 @@
           <td>- 113006<p style="margin-top: 78px;"><p> - 112976</td>
         </tr>
       </table>
+    </div>
 
   </div>
 
@@ -61,7 +62,7 @@
 
 </body>
 
-</body>
+
 
 
 </html>
\ No newline at end of file
diff --git a/public/iStoeckHexgrid_2m.html b/public/iStoeckHexgrid_2m.html
index 595430c..be38779 100644
--- a/public/iStoeckHexgrid_2m.html
+++ b/public/iStoeckHexgrid_2m.html
@@ -44,6 +44,7 @@
           <td>- 113006<p style="margin-top: 78px;"><p> - 112976</td>
         </tr>
       </table>  
+    </div>
 
     <!-- <div id="legend">
       <p>Pressure (Pa) <br>
@@ -62,7 +63,4 @@
 
 </body>
 
-</body>
-
-
 </html>
\ No newline at end of file
diff --git a/public/iStoeckStreams.html b/public/iStoeckStreams.html
index a1b8e58..05afbd9 100644
--- a/public/iStoeckStreams.html
+++ b/public/iStoeckStreams.html
@@ -48,6 +48,7 @@
       </tr>
     </table>
   </div>
+</div>
 
   <footer>
     <p align="center">
@@ -57,7 +58,7 @@
 
 </body>
 
-</body>
+
 
 
 </html>
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 87675d2..31b5697 100644
--- a/public/index.html
+++ b/public/index.html
@@ -40,7 +40,7 @@
               <ul class="list-unstyled">
                 <!-- <li><a href="#" class="text-white">Follow on Twitter</a></li> -->
                 <!-- <li><a href="#" class="text-white">Like on Facebook</a></li> -->
-                <li><a href="mailto:sven.schneider[at]hft-stuttgart.de" class="text-white">Email me</a></li>
+                <li><a href="mailto:sven.schneider[at]hft-stuttgart.de">Email me</a></li>
               </ul>
             </div>
           </div>
diff --git a/public/polylineStreams.js b/public/polylineStreams.js
index 1b3f9e4..7746860 100644
--- a/public/polylineStreams.js
+++ b/public/polylineStreams.js
@@ -160,7 +160,7 @@ d3.dsv(",", "results/polylines.csv").then(function(text) {
 			positions: positions,
 			width: 5.0,
 			vertexFormat: Cesium.PolylineColorAppearance.VERTEX_FORMAT,
-			colors: colors,
+			colors: colors,			
 			colorsPerVertex: true,
 		  }),
 		}),
@@ -172,6 +172,24 @@ d3.dsv(",", "results/polylines.csv").then(function(text) {
 
 	})
 
+	// This adds a large arrow to the viewer. Works fine. for testing
+
+	// var purpleArrow = viewer.entities.add({
+	// 	name: "Purple straight arrow at height",
+	// 	polyline: {
+	// 	  positions: Cesium.Cartesian3.fromDegreesArrayHeights([
+	// 		9.187290, 48.784567, 400,
+	// 		9.195991, 48.790575, 400
+	// 	  ]),
+	// 	  width: 50,
+	// 	  arcType: Cesium.ArcType.NONE,
+	// 	  material: new Cesium.PolylineArrowMaterialProperty(
+	// 		Cesium.Color.PURPLE
+	// 	  ),
+	// 	},
+	//   });
+	  
+
 // var f = new File([""], "results/singlePolyline.csv", {type: "text/plain", lastModified: Date()})
 
 
-- 
GitLab