diff --git a/public/iStoeckHexgrid_2m.html b/public/iStoeckHexgrid_2m.html
index f3dadadc09aaafea32406adf6fa5e38fd302d2b3..595430c58de8cb0a9e2ae2407f688d55a6f3d8e5 100644
--- a/public/iStoeckHexgrid_2m.html
+++ b/public/iStoeckHexgrid_2m.html
@@ -34,11 +34,23 @@
+
+
+ | Pressure (Pa) |
+ |
+
+
+  |
+ - 113006 - 112976 |
+
+
+
+
diff --git a/public/imgs/colorbarJET.png b/public/imgs/colorbarJET.png
new file mode 100644
index 0000000000000000000000000000000000000000..a88f8fecd8b9a562f7635d4d1f10d731e2603f1b
Binary files /dev/null and b/public/imgs/colorbarJET.png differ
diff --git a/public/stoeckachStreams.js b/public/stoeckachStreams.js
index be50277e29bcdafc29955c04112c93468bfd1092..9a2e5d1043d253d41c9fe9650f1634b64d091fea 100644
--- a/public/stoeckachStreams.js
+++ b/public/stoeckachStreams.js
@@ -234,8 +234,8 @@ $(function () {
nameOverlay.style.backgroundColor = 'green';
- var dataSourcePromise = Cesium.CzmlDataSource.load(czml);
- viewer.dataSources.add(dataSourcePromise);
+ // var dataSourcePromise = Cesium.CzmlDataSource.load(czml);
+ // viewer.dataSources.add(dataSourcePromise);
/*
// Information about the currently selected feature
@@ -440,163 +440,43 @@ viewer.screenSpaceEventHandler.setInputAction(function onLeftClick(movement) {
}, Cesium.ScreenSpaceEventType.MIDDLE_CLICK);
+
+ function showLegend() {
+ $("#legend").css("display", "block");
+ }
+ function hideLegend() {
+ $("#legend").css("display", "none");
+ }
+
+ // Legend - Colour Table
+ function emptyColourTable() {
+ $(".inner").empty();
+ }
+
+
+
+ function setHeightTable() {
+ $(".inner").append( "
" +
+ "| | > 3.5 |
" +
+ " | 3 |
" +
+ " | 2.5 |
" +
+ " | 2 |
" +
+ " | 1.5 |
" +
+ " | 1 |
" +
+ " | 0.5 |
" +
+ "
" );
+ }
- /*
- return Cesium.when(tileset.readyPromise).then(function (tileset) {
- tileset.style = new Cesium.Cesium3DTileStyle({
-
- color: {
-
- conditions: [
-
-
- ["${Latitude} >= 48.8170", "color('purple', 0.5)"],
-
- ["${Latitude} >= 48.7950", "color('red')"],
-
- ["${Latitude} >= 48.7830", "color('orange')"],
-
- ["${Latitude} >= 48.7710", "color('yellow')"],
-
- ["${Latitude} >= 48.7690", "color('lime')"],
-
- ["${Latitude} >= 48.7570", "color('cyan')"],
-
- ["${Latitude} >= 48.7470", "color('CORNFLOWERBLUE')"],
-
- ["${Latitude} >= 48.7370", "color('DARKMAGENTA')"],
-
- ["true", "color('lightblue')"]
-
- ]
-
- }
-
- });
- });
-*/
-
-function showLegend() {
- $("#legend").css("display", "block");
-}
-function hideLegend() {
- $("#legend").css("display", "none");
-}
-
-// Legend - Colour Table
-function emptyColourTable() {
- $(".inner").empty();
-}
-
-/*
-function setHeightTable() {
- $(".inner").append( "
" +
- "| | 113007 |
" +
- " | 113001 |
" +
- " | 112996 |
" +
- " | 112991 |
" +
- " | 112986 |
" +
- " | 112981 |
" +
- " | 112976 |
" +
- "
" );
-}
-*/
-
-/*
-function setHeightTable() {
- $(".inner").append( "
" +
- "| | x |
" +
- " | y |
" +
- " | z |
" +
- "
" );
-}
-*/
-
-
-function setHeightTable() {
- $(".inner").append( "
" +
- "| | > 3.5 |
" +
- " | 3 |
" +
- " | 2.5 |
" +
- " | 2 |
" +
- " | 1.5 |
" +
- " | 1 |
" +
- " | 0.5 |
" +
- "
" );
-}
-
- return Cesium.when(tileset.readyPromise).then(function (tileset) {
- tileset.style = new Cesium.Cesium3DTileStyle({
-
- color: "color('white',1)",
- /*color: {
-
- conditions: [
-
-
-
- ['Number(${MeasuredHeight}) >= 40', 'rgb(255,0,0)'],
-
- ['Number(${MeasuredHeight}) >= 30.', 'rgb(255, 93 , 0)'],
-
- ['Number(${MeasuredHeight}) >= 25', 'rgb(255, 180, 0)'],
-
- ['Number(${MeasuredHeight}) >= 20', 'rgb(255,255,0)'],
-
- ['Number(${MeasuredHeight}) >= 15', 'rgb(0,255,0)'],
-
- ['Number(${MeasuredHeight}) >= 10', 'rgb(0,0,255)'],
-
- ['Number(${MeasuredHeight}) >= 7.5', 'rgb(75, 0, 130)'],
-
- ['Number(${MeasuredHeight}) >= 4', 'rgb(248, 100, 221)'],
-
- ['Number(${MeasuredHeight}) >= 0.1', 'rgb(248, 100, 221)'],
+ return Cesium.when(tileset.readyPromise).then(function (tileset) {
+ tileset.style = new Cesium.Cesium3DTileStyle({
+
+ color: "color('white',1)",
- ['true', 'color("lightblue")']
-
- ]
-
- }
- */
-
- });
- showLegend();
- setHeightTable();
- });
-
- /*
- return Cesium.when(tileset.readyPromise).then(function (tileset) {
- tileset.style = new Cesium.Cesium3DTileStyle({
-
- color: {
-
- conditions: [
-
- ['Number(${YearOfConstruction}) >= 2015', 'rgb(127,201,127)'],
-
- ['Number(${YearOfConstruction}) >= 2005', 'rgb(190,174,212)'],
-
- ['Number(${YearOfConstruction}) >= 1990', 'rgb(253,192,134)'],
-
- ['Number(${YearOfConstruction}) >= 1975', 'rgb(255,255,153)'],
-
- ['Number(${YearOfConstruction}) >= 1950', 'rgb(56,108,176)'],
-
- ['Number(${YearOfConstruction}) >= 1920', 'rgb(240,2,127)'],
-
- ['Number(${YearOfConstruction}) >= 1900', 'rgb(191,91,23)'],
-
- ['Number(${YearOfConstruction}) >= 1800', 'rgb(102,102,102)'],
-
- ['true', 'color("lightblue")']
-
- ]
-
- }
-
- });
- }); */
+ });
+ showLegend();
+ setHeightTable();
+ });
+
});
\ No newline at end of file