From 5d96a09520b3d937a7eb614c3609e27800bc5b74 Mon Sep 17 00:00:00 2001
From: srcejon <jon@beniston.com>
Date: Tue, 27 Feb 2024 16:00:18 +0000
Subject: [PATCH] Update map QML/HTML.

---
 plugins/feature/map/map/antennakiwi.png      |  Bin 0 -> 3654 bytes
 plugins/feature/map/map/antennaspyserver.png |  Bin 0 -> 3710 bytes
 plugins/feature/map/map/map.qml              |   19 +-
 plugins/feature/map/map/map3d.html           | 1399 ++++++++++--------
 plugins/feature/map/map/waypoint.png         |  Bin 0 -> 1651 bytes
 plugins/feature/map/readme.md                |    3 +-
 6 files changed, 791 insertions(+), 630 deletions(-)
 create mode 100644 plugins/feature/map/map/antennakiwi.png
 create mode 100644 plugins/feature/map/map/antennaspyserver.png
 create mode 100644 plugins/feature/map/map/waypoint.png

diff --git a/plugins/feature/map/map/antennakiwi.png b/plugins/feature/map/map/antennakiwi.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ba063180b6bfeb3bd45de3a1d7f727a49dbb908
GIT binary patch
literal 3654
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

literal 0
HcmV?d00001

diff --git a/plugins/feature/map/map/antennaspyserver.png b/plugins/feature/map/map/antennaspyserver.png
new file mode 100644
index 0000000000000000000000000000000000000000..85a4dd5dcdc09f1006a864c03251902f73571c0b
GIT binary patch
literal 3710
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
CC3evO

literal 0
HcmV?d00001

diff --git a/plugins/feature/map/map/map.qml b/plugins/feature/map/map/map.qml
index 2501a74e3..577bd63f0 100644
--- a/plugins/feature/map/map/map.qml
+++ b/plugins/feature/map/map/map.qml
@@ -303,22 +303,18 @@ Item {
                         height: text.height + 5
                         radius: 5
                         visible: mapTextVisible
-                        Text {
-                            id: text
-                            anchors.centerIn: parent
-                            text: mapText
-                            textFormat: TextEdit.RichText
-                        }
                         MouseArea {
                             anchors.fill: parent
                             hoverEnabled: true
                             acceptedButtons: Qt.LeftButton | Qt.RightButton
+                            //propagateComposedEvents: true // so links in Text work
                             onClicked: {
                                 if (mouse.button === Qt.LeftButton) {
                                     selected = !selected
                                     if (selected) {
                                         mapModel.moveToFront(mapModelFiltered.mapRowToSource(index))
                                     }
+                                    //mouse.accepted = false // propagate to text
                                 } else if (mouse.button === Qt.RightButton) {
                                     menuItems.clear()
                                     menus.clear()
@@ -406,6 +402,17 @@ Item {
                                 }
                             }
                         }
+                        // Have Text after MouseArea, so links can be clicked
+                        Text {
+                            id: text
+                            anchors.centerIn: parent
+                            text: mapText
+                            textFormat: TextEdit.RichText
+                            onLinkActivated: {
+                                console.log("Link", link);
+                                mapModel.link(link);
+                            }
+                        }
                     }
                 }
             }
diff --git a/plugins/feature/map/map/map3d.html b/plugins/feature/map/map/map3d.html
index 62ff61adc..7c529afee 100644
--- a/plugins/feature/map/map/map3d.html
+++ b/plugins/feature/map/map/map3d.html
@@ -1,623 +1,776 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <script src="/Cesium/Cesium.js"></script>
-    <style>
-      @import url(/Cesium/Widgets/widgets.css);
-      html,
-      body,
-      #cesiumContainer {
-        width: 100%;
-        height: 100%;
-        margin: 0;
-        padding: 0;
-        overflow: hidden;
-      }
-    </style>
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"
-    />
-</head>
-<body style="margin:0;padding:0">
-  <div id="cesiumContainer"></div>
-  <script>
-
-    // See: https://community.cesium.com/t/how-to-run-an-animation-for-an-entity-model/16932
-    function getActiveAnimations(viewer, entity) {
-        var primitives = viewer.scene.primitives;
-        var length = primitives.length;
-        for(var i = 0; i < length; i++) {
-            var primitive = primitives.get(i);
-            if (primitive.id === entity && primitive instanceof Cesium.Model && primitive.ready) {
-                return primitive.activeAnimations;
-            }
-        }
-        return undefined;
-    }
-
-    function playAnimation(viewer, command, retries) {
-        var entity = czmlStream.entities.getById(command.id);
-        if (entity !== undefined) {
-            var animations = getActiveAnimations(viewer, entity);
-            if (animations !== undefined) {
-                try {
-                    let options = {
-                        name: command.animation,
-                        startOffset: command.startOffset,
-                        reverse: command.reverse,
-                        loop: command.loop ? Cesium.ModelAnimationLoop.REPEAT : Cesium.ModelAnimationLoop.NONE,
-                        multiplier: command.multiplier,
-                    };
-                    options.startTime = Cesium.JulianDate.fromIso8601(command.startDateTime);
-                    // https://github.com/CesiumGS/cesium/issues/10048
-                    // Animations aren't moved to last frame if startTime in the past
-                    // so just play now, in order to ensure gears are down, etc
-                    if (Cesium.JulianDate.compare(options.startTime, viewer.clock.currentTime) < 0) {
-                        options.startTime = viewer.clock.currentTime;
-                    }
-                    if (command.duration != 0) {
-                        options.stopTime = Cesium.JulianDate.addSeconds(options.startTime, command.duration, new Cesium.JulianDate());
-                    }
-                    animations.add(options);
-                } catch (e) {
-                    // Note we get TypeError instead of DeveloperError, if running minified version of Cesium
-                    if ((e instanceof Cesium.DeveloperError) || (e instanceof TypeError)) {
-                        // ADS-B plugin doesn't know which animations each aircraft has
-                        // so we should expect a lot of these, as it tries to start slat animations
-                        // on aircraft that do not have them
-                        console.log(`Exception playing ${command.animation} for ${command.id}\n${e}`);
-                    } else {
-                        throw e;
-                    }
-                }
-            } else {
-                // Give Entity time to create primitive
-                // No ready promise in entity API - https://github.com/CesiumGS/cesium/issues/4727
-                if (retries > 0) {
-                    setTimeout(function() {
-                        //console.log(`Retrying animation for entity ${command.id}`);
-                        playAnimation(viewer, command, retries-1);
-                    }, 1000);
-                } else {
-                    console.log(`Gave up trying to play animation for entity ${command.id}`);
-                }
-            }
-        } else {
-            // It seems in some cases, entities aren't created immediately, so wait and retry
-            if (retries > 0) {
-                setTimeout(function() {
-                    //console.log(`Retrying entity ${command.id}`);
-                    playAnimation(viewer, command, retries-1);
-                }, 1000);
-            } else {
-                console.log(`Gave up trying to find entity ${command.id}`);
-            }
-        }
-    }
-
-    // There's no way to stop a looped animation that doesn't have a stopTime,
-    // only remove it
-    // So we need to remove it, then re-add it with a new stopTime, so that it
-    // plays again if the timeline is changed
-    function stopAnimation(viewer, command) {
-        var entity = czmlStream.entities.getById(command.id);
-        if (entity !== undefined) {
-            var animations = getActiveAnimations(viewer, entity);
-            if (animations !== undefined) {
-                var length = animations.length;
-                var anim = undefined;
-                // Find animation with lastet startTime
-                for (var i = 0; i < length; i++) {
-                    var a = animations.get(i);
-                    if (a.name == command.animation) {
-                        if ((anim === undefined) || (Cesium.JulianDate.compare(a.startTime, anim.startTime) >= 0)) {
-                            anim = a;
-                        }
-                    }
-                }
-                if (anim !== undefined) {
-                    animations.remove(anim);
-                    // Re add with new stopTime
-                    animations.add({
-                        name: anim.name,
-                        startOffset: anim.startOffset,
-                        reverse: anim.reverse,
-                        loop: anim.loop,
-                        multiplier: anim.multiplier,
-                        startTime: anim.startTime,
-                        stopTime: Cesium.JulianDate.fromIso8601(command.startDateTime)
-                    });
-                }
-            }
-        }
-    }
-
-    function icrf(scene, time) {
-        if (scene.mode !== Cesium.SceneMode.SCENE3D) {
-            return;
-        }
-        var icrfToFixed = Cesium.Transforms.computeIcrfToFixedMatrix(time);
-        if (Cesium.defined(icrfToFixed)) {
-            var camera = viewer.camera;
-            var offset = Cesium.Cartesian3.clone(camera.position);
-            var transform = Cesium.Matrix4.fromRotationTranslation(icrfToFixed);
-            camera.lookAtTransform(transform, offset);
-        }
-    }
-
-    // Polygons (such as for airspaces) should be prioritized behind other entities
-    function pickEntityPrioritized(e)
-    {
-        var picked = viewer.scene.drillPick(e.position);
-        if (Cesium.defined(picked)) {
-            var firstPolygon = null;
-            for (let i = 0; i < picked.length; i++) {
-                var id = Cesium.defaultValue(picked[i].id, picked[i].primitive.id);
-                if (id instanceof Cesium.Entity) {
-                    if (!Cesium.defined(id.polygon)) {
-                        return id;
-                    } else if (firstPolygon == null) {
-                        firstPolygon = id;
-                    }
-                }
-            }
-            return firstPolygon;
-        }
-    }
-
-    function pickEntity(e) {
-        viewer.selectedEntity = pickEntityPrioritized(e);
-    }
-
-    function showCoords(e) {
-        if (viewer.terrainProvider instanceof Cesium.EllipsoidTerrainProvider) {
-            var cartesian = viewer.camera.pickEllipsoid(e.position);
-            var cartographic = Cesium.Cartographic.fromCartesian(cartesian);
-            longitudeString = Cesium.Math.toDegrees(cartographic.longitude).toFixed(6);
-            latitudeString = Cesium.Math.toDegrees(cartographic.latitude).toFixed(6);
-            positionMarker.position = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 1);
-            positionMarker.point.show = true;
-            positionMarker.label.show = true;
-            positionMarker.label.text =
-                `Lon: ${`   ${longitudeString}`}\u00B0` +
-                `\nLat: ${`   ${latitudeString}`}\u00B0`;
-        } else {
-            // https://github.com/CesiumGS/cesium/issues/4368
-            // viewer.scene.pickPosition doesn't work because we have viewer.scene.globe.depthTestAgainstTerrain = false
-            const ray = viewer.camera.getPickRay(e.position);
-            const cartesian = viewer.scene.globe.pick(ray, viewer.scene);
-            var cartographic = Cesium.Cartographic.fromCartesian(cartesian);
-            var promise = Cesium.sampleTerrainMostDetailed(viewer.terrainProvider, [cartographic]);
-            Cesium.when(promise, function(updatedPositions) {
-                longitudeString = Cesium.Math.toDegrees(cartographic.longitude).toFixed(6);
-                latitudeString = Cesium.Math.toDegrees(cartographic.latitude).toFixed(6);
-                heightString = updatedPositions[0].height.toFixed(1);
-                positionMarker.position = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 1); // Height relative to ground
-                positionMarker.point.show = true;
-                positionMarker.label.show = true;
-                positionMarker.label.text =
-                    `Lon: ${`   ${longitudeString}`}\u00B0` +
-                    `\nLat: ${`   ${latitudeString}`}\u00B0` +
-                    `\nAlt: ${`   ${heightString}`}m`;
-            }, function() {
-                console.log(`Terrain doesn't support sampleTerrainMostDetailed`);
-            });
-        }
-    }
-
-    function hideCoords() {
-        positionMarker.point.show = false;
-        positionMarker.label.show = false;
-    }
-
-    Cesium.Ion.defaultAccessToken = '$CESIUM_ION_API_KEY$';
-
-    const viewer = new Cesium.Viewer('cesiumContainer', {
-        terrainProvider: Cesium.createWorldTerrain(),
-        animation: true,
-        shouldAnimate: true,
-        timeline: true,
-        geocoder: false,
-        fullscreenButton: true,
-        navigationHelpButton: false,
-        navigationInstructionsInitiallyVisible: false,
-        terrainProviderViewModels: [] // User should adjust terrain via dialog, so depthTestAgainstTerrain doesn't get set
-    });
-    viewer.scene.globe.depthTestAgainstTerrain = false; // So labels/points aren't clipped by terrain (this prevents pickPosition from working)
-    viewer.screenSpaceEventHandler.setInputAction(pickEntity, Cesium.ScreenSpaceEventType.LEFT_CLICK);
-    viewer.screenSpaceEventHandler.setInputAction(showCoords, Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK, Cesium.KeyboardEventModifier.SHIFT);
-    viewer.screenSpaceEventHandler.setInputAction(hideCoords, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
-    var buildings = undefined;
-    const images = new Map();
-
-    var mufGeoJSONStream = null;
-    var foF2GeoJSONStream = null;
-
-    const positionMarker = viewer.entities.add({
-        id: 'Position marker',
-        point : {
-            show: false,
-            pixelSize : 8,
-            color : Cesium.Color.RED,
-            heightReference: Cesium.HeightReference.RELATIVE_TO_GROUND
-            },
-        label: {
-            show: false,
-            showBackground: true,
-            font: "12px monospace",
-            fillColor: Cesium.Color.WHITE,
-            outlineColor: Cesium.Color.RED,
-            horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
-            verticalOrigin: Cesium.VerticalOrigin.TOP,
-            pixelOffset: new Cesium.Cartesian2(0, 9),
-            heightReference: Cesium.HeightReference.RELATIVE_TO_GROUND
-        },
-    });
-
-    // Generate HTML for MUF contour info box from properties in GeoJSON
-    function describeMUF(properties, nameProperty) {
-        let html = "";
-        if (properties.hasOwnProperty("level-value")) {
-            const value = properties["level-value"];
-            if (Cesium.defined(value)) {
-                html = `<p>MUF: ${value} MHz<p>MUF (Maximum Usable Frequency) is the highest frequency that will reflect from the ionosphere on a 3000km path`;
-            }
-        }
-        return html;
-    }
-
-    // Generate HTML for foF2 contour info box from properties in GeoJSON
-    function describefoF2(properties, nameProperty) {
-        let html = "";
-        if (properties.hasOwnProperty("level-value")) {
-            const value = properties["level-value"];
-            if (Cesium.defined(value)) {
-                html = `<p>foF2: ${value} MHz<p>foF2 (F2 region critical frequency) is the highest frequency that will be reflected vertically from the F2 ionosphere region`;
-            }
-        }
-        return html;
-    }
-
-    // Use CZML to stream data from Map plugin to Cesium
-    var czmlStream = new Cesium.CzmlDataSource();
-
-    viewer.dataSources.add(czmlStream);
-
-    function cameraLight(scene, time) {
-        viewer.scene.light.direction = Cesium.Cartesian3.clone(scene.camera.directionWC, viewer.scene.light.direction);
-    }
-
-    // Use WebSockets for handling commands from MapPlugin
-    // (CZML doesn't support camera control, for example)
-    // and sending events back to it
-    let socket = new WebSocket("ws://127.0.0.1:$WS_PORT$");
-
-    socket.onmessage = function(event) {
-        try {
-            const command = JSON.parse(event.data);
-
-            if (command.command == "trackId") {
-                // Track an entity with the given ID
-                viewer.trackedEntity = czmlStream.entities.getById(command.id);
-            } else if (command.command == "setHomeView") {
-                // Set the viewing rectangle used when the home button is pressed
-                Cesium.Camera.DEFAULT_VIEW_RECTANGLE = Cesium.Rectangle.fromDegrees(
-                    command.longitude - command.angle,
-                    command.latitude - command.angle,
-                    command.longitude + command.angle,
-                    command.latitude + command.angle
-                    );
-                Cesium.Camera.DEFAULT_VIEW_FACTOR = 0.0;
-                viewer.camera.flyHome(0);
-            } else if (command.command == "setView") {
-                // Set the camera view
-                viewer.scene.camera.setView({
-                    destination: Cesium.Cartesian3.fromDegrees(command.longitude, command.latitude, command.altitude),
-                    orientation: {
-                        heading: 0,
-                    },
-                });
-            } else if (command.command == "playAnimation") {
-                // Play model animation
-                if (command.stop) {
-                    //console.log(`stopping animation ${command.animation} for ${command.id}`);
-                    stopAnimation(viewer, command);
-                } else {
-                    //console.log(`playing animation ${command.animation} for ${command.id}`);
-                    playAnimation(viewer, command, 30);
-                }
-            } else if (command.command == "setDateTime") {
-                 // Set current date and time of viewer
-                 var dateTime = Cesium.JulianDate.fromIso8601(command.dateTime);
-                 viewer.clock.currentTime = dateTime;
-            } else if (command.command == "getDateTime") {
-                 // Get current date and time of viewer
-                 reportClock();
-            } else if (command.command == "setTerrain") {
-                // Support using Ellipsoid terrain for performance and also
-                // because paths can't be clammped to ground, so AIS paths
-                // currently appear underground if terrain is used
-                if (command.provider == "Ellipsoid") {
-                    if (!(viewer.terrainProvider instanceof Cesium.EllipsoidTerrainProvider)) {
-                        viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider();
-                    }
-                } else if (command.provider == "Cesium World Terrain") {
-                    viewer.terrainProvider = Cesium.createWorldTerrain();
-                } else if (command.provider == "CesiumTerrainProvider") {
-                    viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
-                        url: command.url
-                    });
-                } else if (command.provider == "ArcGISTiledElevationTerrainProvider") {
-                    viewer.terrainProvider = new Cesium.ArcGISTiledElevationTerrainProvider({
-                        url: command.url
-                    });
-                } else {
-                    console.log(`Unknown terrain ${command.terrain}`);
-                }
-                viewer.scene.globe.depthTestAgainstTerrain = false; // So labels/points aren't clipped by terrain
-            } else if (command.command == "setBuildings") {
-                if (command.buildings == "None") {
-                    if (buildings !== undefined) {
-                        viewer.scene.primitives.remove(buildings);
-                        buildings = undefined;
-                    }
-                } else {
-                    if (buildings === undefined) {
-                        buildings = viewer.scene.primitives.add(Cesium.createOsmBuildings());
-                    }
-                }
-            } else if (command.command == "setSunLight") {
-                // Enable illumination of the globe from the direction of the Sun or camera
-                viewer.scene.globe.enableLighting = command.useSunLight;
-                viewer.scene.globe.nightFadeOutDistance = 0.0;
-                if (!command.useSunLight) {
-                    viewer.scene.light = new Cesium.DirectionalLight({
-                        direction : new Cesium.Cartesian3(1, 0, 0)
-                    });
-                    viewer.scene.preRender.addEventListener(cameraLight);
-                } else {
-                    viewer.scene.light = new Cesium.SunLight();
-                    viewer.scene.preRender.removeEventListener(cameraLight);
-                }
-            } else if (command.command == "setCameraReferenceFrame") {
-                if (command.eci) {
-                    viewer.scene.postUpdate.addEventListener(icrf);
-                } else {
-                    viewer.scene.postUpdate.removeEventListener(icrf);
-                }
-            } else if (command.command == "setAntiAliasing") {
-                if (command.antiAliasing == "FXAA") {
-                    viewer.scene.postProcessStages.fxaa.enabled = true;
-                } else {
-                    viewer.scene.postProcessStages.fxaa.enabled = false;
-                }
-            } else if (command.command == "showMUF") {
-                if (mufGeoJSONStream != null) {
-                    viewer.dataSources.remove(mufGeoJSONStream, true);
-                    mufGeoJSONStream = null;
-                }
-                if (command.show == true) {
-                    viewer.dataSources.add(
-                        Cesium.GeoJsonDataSource.load(
-                            "muf.geojson",
-                            {describe: describeMUF}
-                        )
-                    ).then(function(dataSource) {mufGeoJSONStream = dataSource; });
-                }
-            } else if (command.command == "showfoF2") {
-                if (foF2GeoJSONStream != null) {
-                     viewer.dataSources.remove(foF2GeoJSONStream, true);
-                     foF2GeoJSONStream = null;
-                }
-                if (command.show == true) {
-                     viewer.dataSources.add(
-                        Cesium.GeoJsonDataSource.load(
-                            "fof2.geojson",
-                            {describe: describefoF2}
-                        )
-                    ).then(function(dataSource) {foF2GeoJSONStream = dataSource; });
-                }
-            } else if (command.command == "updateImage") {
-
-                // Textures on entities can flash white when changed: https://github.com/CesiumGS/cesium/issues/1640
-                // so we use a primitive instead of an entity
-                // Can't modify geometry of primitives, so need to create a new primitive each time
-                // Material needs to be set as translucent in order to allow camera to zoom through it
-                var oldImage = images.get(command.name);
-                var image = viewer.scene.primitives.add(new Cesium.Primitive({
-                    geometryInstances : new Cesium.GeometryInstance({
-                        geometry : new Cesium.RectangleGeometry({
-                            rectangle : Cesium.Rectangle.fromDegrees(command.west, command.south, command.east, command.north),
-                            vertexFormat : Cesium.EllipsoidSurfaceAppearance.VERTEX_FORMAT,
-                            height: command.altitude
-                        })
-                    }),
-                    appearance : new Cesium.EllipsoidSurfaceAppearance({
-                        aboveGround : false,
-                        material: new Cesium.Material({
-                            fabric: {
-                                type: 'Image',
-                                uniforms: {
-                                    image: command.data,
-                                }
-                            },
-                            translucent: true
-                        })
-                    })
-                }));
-                images.set(command.name, image);
-                if (oldImage !== undefined) {
-                    image.readyPromise.then(function(prim) {
-                        viewer.scene.primitives.remove(oldImage);
-                    });
-                }
-            } else if (command.command == "removeImage") {
-                var image = images.get(command.name);
-                if (image !== undefined) {
-                    viewer.scene.primitives.remove(image);
-                } else {
-                    console.log(`Can't find image ${command.name} to remove it`);
-                }
-            } else if (command.command == "removeAllImages") {
-                for (let [k,image] of images) {
-                    viewer.scene.primitives.remove(image);
-                }
-            } else if (command.command == "removeAllCZMLEntities") {
-                czmlStream.entities.removeAll();
-            } else if (command.command == "czml") {
-                // Implement CLIP_TO_GROUND, to work around https://github.com/CesiumGS/cesium/issues/4049
-                if (command.hasOwnProperty('altitudeReference') && command.hasOwnProperty('position') && command.position.hasOwnProperty('cartographicDegrees')) {
-                    var size = command.position.cartographicDegrees.length;
-                    if ((size == 3) || (size == 4)) {
-                        var position;
-                        var height;
-                        if (size == 3) {
-                            position = Cesium.Cartographic.fromDegrees(command.position.cartographicDegrees[0], command.position.cartographicDegrees[1]);
-                            height = command.position.cartographicDegrees[2];
-                        } else if (size == 4) {
-                            position = Cesium.Cartographic.fromDegrees(command.position.cartographicDegrees[1], command.position.cartographicDegrees[2]);
-                            height = command.position.cartographicDegrees[3];
-                        }
-                        if (viewer.terrainProvider instanceof Cesium.EllipsoidTerrainProvider) {
-                            // sampleTerrainMostDetailed will reject Ellipsoid.
-                            if (height < 0) {
-                                if (size == 3) {
-                                    command.position.cartographicDegrees[2] = 0;
-                                } else if (size == 4) {
-                                    command.position.cartographicDegrees[3] = 0;
-                                }
-                            }
-                            czmlStream.process(command);
-                        } else {
-                            var promise = Cesium.sampleTerrainMostDetailed(viewer.terrainProvider, [position]);
-                            Cesium.when(promise, function(updatedPositions) {
-                                if (height < updatedPositions[0].height) {
-                                    if (size == 3) {
-                                        command.position.cartographicDegrees[2] = updatedPositions[0].height;
-                                    } else if (size == 4) {
-                                        command.position.cartographicDegrees[3] = updatedPositions[0].height;
-                                    }
-                                }
-                                czmlStream.process(command);
-                            }, function() {
-                                console.log(`Terrain doesn't support sampleTerrainMostDetailed`);
-                                czmlStream.process(command);
-                            });
-                        };
-                    } else {
-                        console.log(`Can't currently use altitudeReference when more than one position`);
-                        czmlStream.process(command);
-                    }
-                } else if (   (command.hasOwnProperty('polygon') && command.polygon.hasOwnProperty('altitudeReference'))
-                           || (command.hasOwnProperty('polyline') && command.polyline.hasOwnProperty('altitudeReference'))) {
-                    // Support per vertex height reference in polygons and CLIP_TO_GROUND in polylines
-                    var prim = command.hasOwnProperty('polygon') ? command.polygon : command.polyline;
-                    var clipToGround = prim.altitudeReference == "CLIP_TO_GROUND";
-                    var clampToGround = prim.altitudeReference == "CLAMP_TO_GROUND";
-                    var size = prim.positions.cartographicDegrees.length;
-                    var positionCount = size/3;
-                    var positions = new Array(positionCount);
-                    if (viewer.terrainProvider instanceof Cesium.EllipsoidTerrainProvider) {
-                        if (clampToGround) {
-                            for (let i = 0; i < positionCount; i++) {
-                                prim.positions.cartographicDegrees[i*3+2] = 0;
-                            }
-                        } else if (clipToGround) {
-                            for (let i = 0; i < positionCount; i++) {
-                                if (prim.positions.cartographicDegrees[i*3+2] < 0) {
-                                    prim.positions.cartographicDegrees[i*3+2] = 0;
-                                }
-                            }
-                        }
-                        czmlStream.process(command);
-                    } else {
-                        for (let i = 0; i < positionCount; i++) {
-                            positions[i] = Cesium.Cartographic.fromDegrees(prim.positions.cartographicDegrees[i*3+0], prim.positions.cartographicDegrees[i*3+1]);
-                        }
-                        var promise = Cesium.sampleTerrainMostDetailed(viewer.terrainProvider, positions);
-                        Cesium.when(promise, function(updatedPositions) {
-                            if (clampToGround) {
-                                for (let i = 0; i < positionCount; i++) {
-                                    prim.positions.cartographicDegrees[i*3+2] = updatedPositions[i].height;
-                                }
-                            } else if (clipToGround) {
-                                for (let i = 0; i < positionCount; i++) {
-                                    if (prim.positions.cartographicDegrees[i*3+2] < updatedPositions[i].height) {
-                                        prim.positions.cartographicDegrees[i*3+2] = updatedPositions[i].height;
-                                    }
-                                }
-                            }
-                            czmlStream.process(command);
-                        }, function() {
-                            console.log(`Terrain doesn't support sampleTerrainMostDetailed`);
-                            czmlStream.process(command);
-                        });
-                    }
-                } else {
-                    czmlStream.process(command);
-                }
-
-            } else {
-                console.log(`Unknown command ${command.command}`);
-            }
-
-        } catch(e) {
-            console.log(`Erroring processing received message:\n${e}\n${event.data}`);
-        }
-    };
-
-    viewer.selectedEntityChanged.addEventListener(function(selectedEntity) {
-        if (Cesium.defined(selectedEntity) && Cesium.defined(selectedEntity.id)) {
-            socket.send(JSON.stringify({event: "selected", id: selectedEntity.id}));
-        } else {
-            socket.send(JSON.stringify({event: "selected"}));
-        }
-    });
-
-    viewer.trackedEntityChanged.addEventListener(function(trackedEntity) {
-        if (Cesium.defined(trackedEntity) && Cesium.defined(trackedEntity.id)) {
-            socket.send(JSON.stringify({event: "tracking", id: trackedEntity.id}));
-        } else {
-            socket.send(JSON.stringify({event: "tracking"}));
-        }
-    });
-
-    // Report clock changes for use by other plugins
-    var systemTime = new Cesium.JulianDate();
-    function reportClock() {
-        if (socket.readyState === 1) {
-            Cesium.JulianDate.now(systemTime);
-            socket.send(JSON.stringify({
-                event: "clock",
-                canAnimate: viewer.clock.canAnimate,
-                shouldAnimate: viewer.clock.shouldAnimate,
-                currentTime: Cesium.JulianDate.toIso8601(viewer.clock.currentTime),
-                multiplier: viewer.clock.multiplier,
-                systemTime: Cesium.JulianDate.toIso8601(systemTime)
-            }));
-        }
-    };
-
-    Cesium.knockout.getObservable(viewer.clockViewModel, 'shouldAnimate').subscribe(function(isAnimating) {
-        reportClock();
-    });
-    Cesium.knockout.getObservable(viewer.clockViewModel, 'multiplier').subscribe(function(multiplier) {
-        reportClock();
-    });
-    // This is called every frame
-    //Cesium.knockout.getObservable(viewer.clockViewModel, 'currentTime').subscribe(function(currentTime) {
-        //reportClock();
-    //});
-    viewer.timeline.addEventListener('settime', reportClock, false);
-
-    socket.onopen = () => {
-        reportClock();
-    };
-
-  </script>
- </div>
-</body>
-</html>
-
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <script src="/Cesium/Cesium.js"></script>
+    <style>
+      @import url(/Cesium/Widgets/widgets.css);
+      html,
+      body,
+      #cesiumContainer {
+        width: 100%;
+        height: 100%;
+        margin: 0;
+        padding: 0;
+        overflow: hidden;
+      }
+    </style>
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"
+    />
+</head>
+<body style="margin:0;padding:0">
+  <div id="cesiumContainer"></div>
+  <script>
+
+    // See: https://community.cesium.com/t/how-to-run-an-animation-for-an-entity-model/16932
+    function getActiveAnimations(viewer, entity) {
+        var primitives = viewer.scene.primitives;
+        var length = primitives.length;
+        for(var i = 0; i < length; i++) {
+            var primitive = primitives.get(i);
+            if (primitive.id === entity && primitive instanceof Cesium.Model && primitive.ready) {
+                return primitive.activeAnimations;
+            }
+        }
+        return undefined;
+    }
+
+    function playAnimation(viewer, command, retries) {
+        var entity = czmlStream.entities.getById(command.id);
+        if (entity !== undefined) {
+            var animations = getActiveAnimations(viewer, entity);
+            if (animations !== undefined) {
+                try {
+                    let options = {
+                        name: command.animation,
+                        startOffset: command.startOffset,
+                        reverse: command.reverse,
+                        loop: command.loop ? Cesium.ModelAnimationLoop.REPEAT : Cesium.ModelAnimationLoop.NONE,
+                        multiplier: command.multiplier,
+                    };
+                    options.startTime = Cesium.JulianDate.fromIso8601(command.startDateTime);
+                    // https://github.com/CesiumGS/cesium/issues/10048
+                    // Animations aren't moved to last frame if startTime in the past
+                    // so just play now, in order to ensure gears are down, etc
+                    if (Cesium.JulianDate.compare(options.startTime, viewer.clock.currentTime) < 0) {
+                        options.startTime = viewer.clock.currentTime;
+                    }
+                    if (command.duration != 0) {
+                        options.stopTime = Cesium.JulianDate.addSeconds(options.startTime, command.duration, new Cesium.JulianDate());
+                    }
+                    animations.add(options);
+                } catch (e) {
+                    // Note we get TypeError instead of DeveloperError, if running minified version of Cesium
+                    if ((e instanceof Cesium.DeveloperError) || (e instanceof TypeError)) {
+                        // ADS-B plugin doesn't know which animations each aircraft has
+                        // so we should expect a lot of these, as it tries to start slat animations
+                        // on aircraft that do not have them
+                        console.log(`Exception playing ${command.animation} for ${command.id}\n${e}`);
+                    } else {
+                        throw e;
+                    }
+                }
+            } else {
+                // Give Entity time to create primitive
+                // No ready promise in entity API - https://github.com/CesiumGS/cesium/issues/4727
+                if (retries > 0) {
+                    setTimeout(function() {
+                        //console.log(`Retrying animation for entity ${command.id}`);
+                        playAnimation(viewer, command, retries-1);
+                    }, 1000);
+                } else {
+                    console.log(`Gave up trying to play animation for entity ${command.id}`);
+                }
+            }
+        } else {
+            // It seems in some cases, entities aren't created immediately, so wait and retry
+            if (retries > 0) {
+                setTimeout(function() {
+                    //console.log(`Retrying entity ${command.id}`);
+                    playAnimation(viewer, command, retries-1);
+                }, 1000);
+            } else {
+                console.log(`Gave up trying to find entity ${command.id}`);
+            }
+        }
+    }
+
+    // There's no way to stop a looped animation that doesn't have a stopTime,
+    // only remove it
+    // So we need to remove it, then re-add it with a new stopTime, so that it
+    // plays again if the timeline is changed
+    function stopAnimation(viewer, command) {
+        var entity = czmlStream.entities.getById(command.id);
+        if (entity !== undefined) {
+            var animations = getActiveAnimations(viewer, entity);
+            if (animations !== undefined) {
+                var length = animations.length;
+                var anim = undefined;
+                // Find animation with lastet startTime
+                for (var i = 0; i < length; i++) {
+                    var a = animations.get(i);
+                    if (a.name == command.animation) {
+                        if ((anim === undefined) || (Cesium.JulianDate.compare(a.startTime, anim.startTime) >= 0)) {
+                            anim = a;
+                        }
+                    }
+                }
+                if (anim !== undefined) {
+                    animations.remove(anim);
+                    // Re add with new stopTime
+                    animations.add({
+                        name: anim.name,
+                        startOffset: anim.startOffset,
+                        reverse: anim.reverse,
+                        loop: anim.loop,
+                        multiplier: anim.multiplier,
+                        startTime: anim.startTime,
+                        stopTime: Cesium.JulianDate.fromIso8601(command.startDateTime)
+                    });
+                }
+            }
+        }
+    }
+
+    function icrf(scene, time) {
+        if (scene.mode !== Cesium.SceneMode.SCENE3D) {
+            return;
+        }
+        var icrfToFixed = Cesium.Transforms.computeIcrfToFixedMatrix(time);
+        if (Cesium.defined(icrfToFixed)) {
+            var camera = viewer.camera;
+            var offset = Cesium.Cartesian3.clone(camera.position);
+            var transform = Cesium.Matrix4.fromRotationTranslation(icrfToFixed);
+            camera.lookAtTransform(transform, offset);
+        }
+    }
+
+    // Polygons (such as for airspaces) should be prioritized behind other entities
+    function pickEntityPrioritized(e)
+    {
+        var picked = viewer.scene.drillPick(e.position);
+        if (Cesium.defined(picked)) {
+            var firstPolygon = null;
+            for (let i = 0; i < picked.length; i++) {
+                var id = Cesium.defaultValue(picked[i].id, picked[i].primitive.id);
+                if (id instanceof Cesium.Entity) {
+                    if (!Cesium.defined(id.polygon)) {
+                        return id;
+                    } else if (firstPolygon == null) {
+                        firstPolygon = id;
+                    }
+                }
+            }
+            return firstPolygon;
+        }
+    }
+
+    function pickEntity(e) {
+        viewer.selectedEntity = pickEntityPrioritized(e);
+    }
+
+    function showCoords(e) {
+        if (viewer.terrainProvider instanceof Cesium.EllipsoidTerrainProvider) {
+            var cartesian = viewer.camera.pickEllipsoid(e.position);
+            var cartographic = Cesium.Cartographic.fromCartesian(cartesian);
+            longitudeString = Cesium.Math.toDegrees(cartographic.longitude).toFixed(6);
+            latitudeString = Cesium.Math.toDegrees(cartographic.latitude).toFixed(6);
+            positionMarker.position = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 1);
+            positionMarker.point.show = true;
+            positionMarker.label.show = true;
+            positionMarker.label.text =
+                `Lon: ${`   ${longitudeString}`}\u00B0` +
+                `\nLat: ${`   ${latitudeString}`}\u00B0`;
+        } else {
+            // https://github.com/CesiumGS/cesium/issues/4368
+            // viewer.scene.pickPosition doesn't work because we have viewer.scene.globe.depthTestAgainstTerrain = false
+            const ray = viewer.camera.getPickRay(e.position);
+            const cartesian = viewer.scene.globe.pick(ray, viewer.scene);
+            var cartographic = Cesium.Cartographic.fromCartesian(cartesian);
+            var promise = Cesium.sampleTerrainMostDetailed(viewer.terrainProvider, [cartographic]);
+            Cesium.when(promise, function(updatedPositions) {
+                longitudeString = Cesium.Math.toDegrees(cartographic.longitude).toFixed(6);
+                latitudeString = Cesium.Math.toDegrees(cartographic.latitude).toFixed(6);
+                heightString = updatedPositions[0].height.toFixed(1);
+                positionMarker.position = Cesium.Cartesian3.fromRadians(cartographic.longitude, cartographic.latitude, 1); // Height relative to ground
+                positionMarker.point.show = true;
+                positionMarker.label.show = true;
+                positionMarker.label.text =
+                    `Lon: ${`   ${longitudeString}`}\u00B0` +
+                    `\nLat: ${`   ${latitudeString}`}\u00B0` +
+                    `\nAlt: ${`   ${heightString}`}m`;
+            }, function() {
+                console.log(`Terrain doesn't support sampleTerrainMostDetailed`);
+            });
+        }
+    }
+
+    function hideCoords() {
+        positionMarker.point.show = false;
+        positionMarker.label.show = false;
+    }
+
+    Cesium.Ion.defaultAccessToken = '$CESIUM_ION_API_KEY$';
+
+    const viewer = new Cesium.Viewer('cesiumContainer', {
+        terrainProvider: Cesium.createWorldTerrain(),
+        animation: true,
+        shouldAnimate: true,
+        timeline: true,
+        geocoder: false,
+        fullscreenButton: true,
+        navigationHelpButton: false,
+        navigationInstructionsInitiallyVisible: false,
+        terrainProviderViewModels: [] // User should adjust terrain via dialog, so depthTestAgainstTerrain doesn't get set
+    });
+    viewer.scene.globe.depthTestAgainstTerrain = false; // So labels/points aren't clipped by terrain (this prevents pickPosition from working)
+    viewer.screenSpaceEventHandler.setInputAction(pickEntity, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+    viewer.screenSpaceEventHandler.setInputAction(showCoords, Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK, Cesium.KeyboardEventModifier.SHIFT);
+    viewer.screenSpaceEventHandler.setInputAction(hideCoords, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+
+    viewer.infoBox.frame.setAttribute('sandbox', 'allow-same-origin allow-popups allow-forms allow-scripts allow-top-navigation');
+    viewer.infoBox.frame.src = "about:blank"; // Force reload so new attributes are applied
+
+    var buildings = undefined;
+    const images = new Map();
+
+    var mufGeoJSONStream = null;
+    var foF2GeoJSONStream = null;
+
+    const positionMarker = viewer.entities.add({
+        id: 'Position marker',
+        point : {
+            show: false,
+            pixelSize : 8,
+            color : Cesium.Color.RED,
+            heightReference: Cesium.HeightReference.RELATIVE_TO_GROUND
+            },
+        label: {
+            show: false,
+            showBackground: true,
+            font: "12px monospace",
+            fillColor: Cesium.Color.WHITE,
+            outlineColor: Cesium.Color.RED,
+            horizontalOrigin: Cesium.HorizontalOrigin.LEFT,
+            verticalOrigin: Cesium.VerticalOrigin.TOP,
+            pixelOffset: new Cesium.Cartesian2(0, 9),
+            heightReference: Cesium.HeightReference.RELATIVE_TO_GROUND
+        },
+    });
+
+    // Generate HTML for MUF contour info box from properties in GeoJSON
+    function describeMUF(properties, nameProperty) {
+        let html = "";
+        if (properties.hasOwnProperty("level-value")) {
+            const value = properties["level-value"];
+            if (Cesium.defined(value)) {
+                html = `<p>MUF: ${value} MHz<p>MUF (Maximum Usable Frequency) is the highest frequency that will reflect from the ionosphere on a 3000km path`;
+            }
+        }
+        return html;
+    }
+
+    // Generate HTML for foF2 contour info box from properties in GeoJSON
+    function describefoF2(properties, nameProperty) {
+        let html = "";
+        if (properties.hasOwnProperty("level-value")) {
+            const value = properties["level-value"];
+            if (Cesium.defined(value)) {
+                html = `<p>foF2: ${value} MHz<p>foF2 (F2 region critical frequency) is the highest frequency that will be reflected vertically from the F2 ionosphere region`;
+            }
+        }
+        return html;
+    }
+
+    // Use CZML to stream data from Map plugin to Cesium
+    var czmlStream = new Cesium.CzmlDataSource();
+
+    viewer.dataSources.add(czmlStream);
+
+    function cameraLight(scene, time) {
+        viewer.scene.light.direction = Cesium.Cartesian3.clone(scene.camera.directionWC, viewer.scene.light.direction);
+    }
+
+    // Image overlays
+
+    function dataCallback(interval, index) {
+        let time;
+        //console.log("Interval: " + interval + " start:" + interval.start + " stop:" + interval.stop + " index: " + index);
+        if (index === 0) {
+            // leading
+            time = Cesium.JulianDate.toIso8601(interval.stop);
+        } else {
+            time = Cesium.JulianDate.toIso8601(interval.start);
+        }
+        //console.log("Returning time: " + time);
+        return {
+            Time: time,
+        };
+    }
+
+    const times = Cesium.TimeIntervalCollection.fromIso8601({
+        iso8601: "2015-07-30/2017-06-16/P1D",   // P1D = 1 day
+        leadingInterval: true,
+        trailingInterval: true,
+        isStopIncluded: false,
+        dataCallback: dataCallback,
+    });
+
+    // See https://wiki.earthdata.nasa.gov/display/GIBS/GIBS+API+for+Developers#GIBSAPIforDevelopers-OGCWebMapService(WMS)
+    var gibsProvider = new Cesium.WebMapTileServiceImageryProvider({
+        url: "https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/MODIS_Terra_CorrectedReflectance_TrueColor/default/{Time}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpg",
+        style: "default",
+        tileMatrixSetID: "250m",
+        format: "image/jpeg",
+        clock: viewer.clock,
+        times: times
+    });
+    const seaMarksProvider = new Cesium.UrlTemplateImageryProvider({
+        url: "https://tiles.openseamap.org/seamark/{z}/{x}/{y}.png"
+    });
+    const railwaysProvider = new Cesium.UrlTemplateImageryProvider({
+        url: "https://a.tiles.openrailwaymap.org/standard/{z}/{x}/{y}.png"
+    });
+    var rainProvider = new Cesium.UrlTemplateImageryProvider({
+        url: "https://tilecache.rainviewer.com/v2/radar/0000000000/256/{z}/{x}/{y}/4/1_1.png"
+    });
+    var cloudProvider = new Cesium.UrlTemplateImageryProvider({
+        url: "https://tilecache.rainviewer.com/v2/satellite/0000000000/256/{z}/{x}/{y}/0/0_0.png"
+    });
+
+    var gibsLayer = new Cesium.ImageryLayer(gibsProvider);
+    gibsLayer.show = false;
+    viewer.imageryLayers.add(gibsLayer);
+    var cloudLayer = new Cesium.ImageryLayer(cloudProvider);
+    cloudLayer.show = false;
+    viewer.imageryLayers.add(cloudLayer);
+    var rainLayer = new Cesium.ImageryLayer(rainProvider);
+    rainLayer.show = false;
+    viewer.imageryLayers.add(rainLayer);
+    const seaMarksLayer = new Cesium.ImageryLayer(seaMarksProvider);
+    seaMarksLayer.show = false;
+    viewer.imageryLayers.add(seaMarksLayer);
+    const railwaysLayer = new Cesium.ImageryLayer(railwaysProvider);
+    railwaysLayer.show = false;
+    viewer.imageryLayers.add(railwaysLayer);
+
+    const layers = new Map([
+        ["nasaGlobalImagery", gibsLayer],
+        ["clouds", cloudLayer],
+        ["rain", rainLayer],
+        ["seaMarks", seaMarksLayer],
+        ["railways", railwaysLayer]
+    ]);
+
+    // Use WebSockets for handling commands from MapPlugin
+    // (CZML doesn't support camera control, for example)
+    // and sending events back to it
+    let socket = new WebSocket("ws://127.0.0.1:$WS_PORT$");
+
+    socket.onmessage = function(event) {
+        try {
+            const command = JSON.parse(event.data);
+
+            if (command.command == "trackId") {
+                // Track an entity with the given ID
+                viewer.trackedEntity = czmlStream.entities.getById(command.id);
+            } else if (command.command == "setHomeView") {
+                // Set the viewing rectangle used when the home button is pressed
+                Cesium.Camera.DEFAULT_VIEW_RECTANGLE = Cesium.Rectangle.fromDegrees(
+                    command.longitude - command.angle,
+                    command.latitude - command.angle,
+                    command.longitude + command.angle,
+                    command.latitude + command.angle
+                );
+                Cesium.Camera.DEFAULT_VIEW_FACTOR = 0.0;
+                viewer.camera.flyHome(0);
+            } else if (command.command == "setView") {
+                // Set the camera view
+                viewer.scene.camera.setView({
+                    destination: Cesium.Cartesian3.fromDegrees(command.longitude, command.latitude, command.altitude),
+                    orientation: {
+                        heading: 0,
+                    },
+                });
+            } else if (command.command == "playAnimation") {
+                // Play model animation
+                if (command.stop) {
+                    //console.log(`stopping animation ${command.animation} for ${command.id}`);
+                    stopAnimation(viewer, command);
+                } else {
+                    //console.log(`playing animation ${command.animation} for ${command.id}`);
+                    playAnimation(viewer, command, 30);
+                }
+            } else if (command.command == "setDateTime") {
+                // Set current date and time of viewer
+                var dateTime = Cesium.JulianDate.fromIso8601(command.dateTime);
+                viewer.clock.currentTime = dateTime;
+            } else if (command.command == "getDateTime") {
+                // Get current date and time of viewer
+                reportClock();
+            } else if (command.command == "setTerrain") {
+                // Support using Ellipsoid terrain for performance and also
+                // because paths can't be clammped to ground, so AIS paths
+                // currently appear underground if terrain is used
+                if (command.provider == "Ellipsoid") {
+                    if (!(viewer.terrainProvider instanceof Cesium.EllipsoidTerrainProvider)) {
+                        viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider();
+                    }
+                } else if (command.provider == "Cesium World Terrain") {
+                    viewer.terrainProvider = Cesium.createWorldTerrain();
+                } else if (command.provider == "CesiumTerrainProvider") {
+                    viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
+                        url: command.url
+                    });
+                } else if (command.provider == "ArcGISTiledElevationTerrainProvider") {
+                    viewer.terrainProvider = new Cesium.ArcGISTiledElevationTerrainProvider({
+                        url: command.url
+                    });
+                } else {
+                    console.log(`Unknown terrain ${command.terrain}`);
+                }
+                viewer.scene.globe.depthTestAgainstTerrain = false; // So labels/points aren't clipped by terrain
+            } else if (command.command == "setBuildings") {
+                if (command.buildings == "None") {
+                    if (buildings !== undefined) {
+                        viewer.scene.primitives.remove(buildings);
+                        buildings = undefined;
+                    }
+                } else {
+                    if (buildings === undefined) {
+                        buildings = viewer.scene.primitives.add(Cesium.createOsmBuildings());
+                    }
+                }
+            } else if (command.command == "setSunLight") {
+                // Enable illumination of the globe from the direction of the Sun or camera
+                viewer.scene.globe.enableLighting = command.useSunLight;
+                viewer.scene.globe.nightFadeOutDistance = 0.0;
+                if (!command.useSunLight) {
+                    viewer.scene.light = new Cesium.DirectionalLight({
+                        direction: new Cesium.Cartesian3(1, 0, 0)
+                    });
+                    viewer.scene.preRender.addEventListener(cameraLight);
+                } else {
+                    viewer.scene.light = new Cesium.SunLight();
+                    viewer.scene.preRender.removeEventListener(cameraLight);
+                }
+            } else if (command.command == "setCameraReferenceFrame") {
+                if (command.eci) {
+                    viewer.scene.postUpdate.addEventListener(icrf);
+                } else {
+                    viewer.scene.postUpdate.removeEventListener(icrf);
+                }
+            } else if (command.command == "setAntiAliasing") {
+                if (command.antiAliasing == "FXAA") {
+                    viewer.scene.postProcessStages.fxaa.enabled = true;
+                } else {
+                    viewer.scene.postProcessStages.fxaa.enabled = false;
+                }
+            } else if (command.command == "showMUF") {
+                if (mufGeoJSONStream != null) {
+                    viewer.dataSources.remove(mufGeoJSONStream, true);
+                    mufGeoJSONStream = null;
+                }
+                if (command.show == true) {
+                    viewer.dataSources.add(
+                        Cesium.GeoJsonDataSource.load(
+                            "muf.geojson",
+                            { describe: describeMUF }
+                        )
+                    ).then(function (dataSource) { mufGeoJSONStream = dataSource; });
+                }
+            } else if (command.command == "showfoF2") {
+                if (foF2GeoJSONStream != null) {
+                    viewer.dataSources.remove(foF2GeoJSONStream, true);
+                    foF2GeoJSONStream = null;
+                }
+                if (command.show == true) {
+                    viewer.dataSources.add(
+                        Cesium.GeoJsonDataSource.load(
+                            "fof2.geojson",
+                            { describe: describefoF2 }
+                        )
+                    ).then(function (dataSource) { foF2GeoJSONStream = dataSource; });
+                }
+            } else if (command.command == "showLayer") {
+                layers.get(command.layer).show = command.show;
+            } else if (command.command == "setLayerSettings") {
+                if (command.layer == "NASAGlobalImagery") {
+                    if ('url' in command) {
+                        console.log("Using URL: " + command.url + " format: " + command.format + " matrixSet: " + command.tileMatrixSet + " dates:" + command.dates + " length: " + command.dates.length + " typeof: " + typeof(command.dates));
+
+                        viewer.imageryLayers.remove(gibsLayer, true);
+
+                        const times = Cesium.TimeIntervalCollection.fromIso8601({
+                            iso8601: command.dates[0],
+                            leadingInterval: true,
+                            trailingInterval: true,
+                            isStopIncluded: false,
+                            dataCallback: dataCallback,
+                        });
+
+                        for (let i = 1; i < command.dates.length; i++) {
+
+                            const times2 = Cesium.TimeIntervalCollection.fromIso8601({
+                                iso8601: command.dates[i],
+                                leadingInterval: true,
+                                trailingInterval: true,
+                                isStopIncluded: false,
+                                dataCallback: dataCallback,
+                            });
+
+                            times.removeInterval(times.get(times.length - 1)); // Remove element that goes to end of time
+                            for (let i = 1; i < times2.length; i++) {
+                                times.addInterval(times2.get(i));
+                            }
+                        }
+
+                        gibsProvider = new Cesium.WebMapTileServiceImageryProvider({
+                            url: command.url,
+                            style: "default",
+                            tileMatrixSetID: command.tileMatrixSet,
+                            format: command.format,
+                            clock: viewer.clock,
+                            times: times
+                        });
+
+                        gibsLayer = new Cesium.ImageryLayer(gibsProvider);
+                        gibsLayer.alpha = 0.5;
+                        gibsLayer.show = command.show;
+                        viewer.imageryLayers.add(gibsLayer);
+                        layers.set(command.layer, gibsLayer);
+                    }
+                    if ('opacity' in command) {
+                        gibsLayer.alpha = command.opacity / 100.0;
+                    }
+                } else if (command.layer == "clouds") {
+                    viewer.imageryLayers.remove(cloudLayer, true);
+                    cloudProvider = new Cesium.UrlTemplateImageryProvider({
+                        url: "https://tilecache.rainviewer.com/" + command.path + "/256/{z}/{x}/{y}/0/0_0.png"
+                    });
+                    cloudLayer = new Cesium.ImageryLayer(cloudProvider);
+                    cloudLayer.show = command.show;
+                    viewer.imageryLayers.add(cloudLayer);
+                    layers.set(command.layer, cloudLayer);
+                } else if (command.layer == "rain") {
+                    viewer.imageryLayers.remove(rainLayer, true);
+                    rainProvider = new Cesium.UrlTemplateImageryProvider({
+                        url: "https://tilecache.rainviewer.com/" + command.path + "/256/{z}/{x}/{y}/4/1_1.png"
+                    });
+                    rainLayer = new Cesium.ImageryLayer(rainProvider);
+                    rainLayer.show = command.show;
+                    viewer.imageryLayers.add(rainLayer);
+                    layers.set(command.layer, rainLayer);
+                } else {
+                    console.log("Unknown layer: " + command.layer);
+                }
+            } else if (command.command == "updateImage") {
+
+                // Textures on entities can flash white when changed: https://github.com/CesiumGS/cesium/issues/1640
+                // so we use a primitive instead of an entity
+                // Can't modify geometry of primitives, so need to create a new primitive each time
+                // Material needs to be set as translucent in order to allow camera to zoom through it
+                var oldImage = images.get(command.name);
+                var image = viewer.scene.primitives.add(new Cesium.Primitive({
+                    geometryInstances : new Cesium.GeometryInstance({
+                        geometry : new Cesium.RectangleGeometry({
+                            rectangle : Cesium.Rectangle.fromDegrees(command.west, command.south, command.east, command.north),
+                            vertexFormat : Cesium.EllipsoidSurfaceAppearance.VERTEX_FORMAT,
+                            height: command.altitude
+                        })
+                    }),
+                    appearance : new Cesium.EllipsoidSurfaceAppearance({
+                        aboveGround : false,
+                        material: new Cesium.Material({
+                            fabric: {
+                                type: 'Image',
+                                uniforms: {
+                                    image: command.data,
+                                }
+                            },
+                            translucent: true
+                        })
+                    })
+                }));
+                images.set(command.name, image);
+                if (oldImage !== undefined) {
+                    image.readyPromise.then(function(prim) {
+                        viewer.scene.primitives.remove(oldImage);
+                    });
+                }
+            } else if (command.command == "removeImage") {
+                var image = images.get(command.name);
+                if (image !== undefined) {
+                    viewer.scene.primitives.remove(image);
+                } else {
+                    console.log(`Can't find image ${command.name} to remove it`);
+                }
+            } else if (command.command == "removeAllImages") {
+                for (let [k,image] of images) {
+                    viewer.scene.primitives.remove(image);
+                }
+            } else if (command.command == "removeAllCZMLEntities") {
+                czmlStream.entities.removeAll();
+            } else if (command.command == "czml") {
+                // Implement CLIP_TO_GROUND, to work around https://github.com/CesiumGS/cesium/issues/4049
+                if (command.hasOwnProperty('altitudeReference') && command.hasOwnProperty('position') && command.position.hasOwnProperty('cartographicDegrees')) {
+                    var size = command.position.cartographicDegrees.length;
+                    if ((size == 3) || (size == 4)) {
+                        var position;
+                        var height;
+                        if (size == 3) {
+                            position = Cesium.Cartographic.fromDegrees(command.position.cartographicDegrees[0], command.position.cartographicDegrees[1]);
+                            height = command.position.cartographicDegrees[2];
+                        } else if (size == 4) {
+                            position = Cesium.Cartographic.fromDegrees(command.position.cartographicDegrees[1], command.position.cartographicDegrees[2]);
+                            height = command.position.cartographicDegrees[3];
+                        }
+                        if (viewer.terrainProvider instanceof Cesium.EllipsoidTerrainProvider) {
+                            // sampleTerrainMostDetailed will reject Ellipsoid.
+                            if (height < 0) {
+                                if (size == 3) {
+                                    command.position.cartographicDegrees[2] = 0;
+                                } else if (size == 4) {
+                                    command.position.cartographicDegrees[3] = 0;
+                                }
+                            }
+                            czmlStream.process(command);
+                        } else {
+                            var promise = Cesium.sampleTerrainMostDetailed(viewer.terrainProvider, [position]);
+                            Cesium.when(promise, function(updatedPositions) {
+                                if (height < updatedPositions[0].height) {
+                                    if (size == 3) {
+                                        command.position.cartographicDegrees[2] = updatedPositions[0].height;
+                                    } else if (size == 4) {
+                                        command.position.cartographicDegrees[3] = updatedPositions[0].height;
+                                    }
+                                }
+                                czmlStream.process(command);
+                            }, function() {
+                                console.log(`Terrain doesn't support sampleTerrainMostDetailed`);
+                                czmlStream.process(command);
+                            });
+                        };
+                    } else {
+                        console.log(`Can't currently use altitudeReference when more than one position`);
+                        czmlStream.process(command);
+                    }
+                } else if (   (command.hasOwnProperty('polygon') && command.polygon.hasOwnProperty('altitudeReference'))
+                           || (command.hasOwnProperty('polyline') && command.polyline.hasOwnProperty('altitudeReference'))) {
+                    // Support per vertex height reference in polygons and CLIP_TO_GROUND in polylines
+                    var prim = command.hasOwnProperty('polygon') ? command.polygon : command.polyline;
+                    var clipToGround = prim.altitudeReference == "CLIP_TO_GROUND";
+                    var clampToGround = prim.altitudeReference == "CLAMP_TO_GROUND";
+                    var size = prim.positions.cartographicDegrees.length;
+                    var positionCount = size/3;
+                    var positions = new Array(positionCount);
+                    if (viewer.terrainProvider instanceof Cesium.EllipsoidTerrainProvider) {
+                        if (clampToGround) {
+                            for (let i = 0; i < positionCount; i++) {
+                                prim.positions.cartographicDegrees[i*3+2] = 0;
+                            }
+                        } else if (clipToGround) {
+                            for (let i = 0; i < positionCount; i++) {
+                                if (prim.positions.cartographicDegrees[i*3+2] < 0) {
+                                    prim.positions.cartographicDegrees[i*3+2] = 0;
+                                }
+                            }
+                        }
+                        czmlStream.process(command);
+                    } else {
+                        for (let i = 0; i < positionCount; i++) {
+                            positions[i] = Cesium.Cartographic.fromDegrees(prim.positions.cartographicDegrees[i*3+0], prim.positions.cartographicDegrees[i*3+1]);
+                        }
+                        var promise = Cesium.sampleTerrainMostDetailed(viewer.terrainProvider, positions);
+                        Cesium.when(promise, function(updatedPositions) {
+                            if (clampToGround) {
+                                for (let i = 0; i < positionCount; i++) {
+                                    prim.positions.cartographicDegrees[i*3+2] = updatedPositions[i].height;
+                                }
+                            } else if (clipToGround) {
+                                for (let i = 0; i < positionCount; i++) {
+                                    if (prim.positions.cartographicDegrees[i*3+2] < updatedPositions[i].height) {
+                                        prim.positions.cartographicDegrees[i*3+2] = updatedPositions[i].height;
+                                    }
+                                }
+                            }
+                            czmlStream.process(command);
+                        }, function() {
+                            console.log(`Terrain doesn't support sampleTerrainMostDetailed`);
+                            czmlStream.process(command);
+                        });
+                    }
+                } else {
+                    czmlStream.process(command);
+                }
+
+            } else {
+                console.log(`Unknown command ${command.command}`);
+            }
+
+        } catch(e) {
+            console.log(`Erroring processing received message:\n${e}\n${event.data}`);
+        }
+    };
+
+    viewer.selectedEntityChanged.addEventListener(function(selectedEntity) {
+        if (Cesium.defined(selectedEntity) && Cesium.defined(selectedEntity.id)) {
+            socket.send(JSON.stringify({event: "selected", id: selectedEntity.id}));
+        } else {
+            socket.send(JSON.stringify({event: "selected"}));
+        }
+    });
+
+    viewer.trackedEntityChanged.addEventListener(function(trackedEntity) {
+        if (Cesium.defined(trackedEntity) && Cesium.defined(trackedEntity.id)) {
+            socket.send(JSON.stringify({event: "tracking", id: trackedEntity.id}));
+        } else {
+            socket.send(JSON.stringify({event: "tracking"}));
+        }
+    });
+
+    // Report clock changes for use by other plugins
+    var systemTime = new Cesium.JulianDate();
+    function reportClock() {
+        if (socket.readyState === 1) {
+            Cesium.JulianDate.now(systemTime);
+            socket.send(JSON.stringify({
+                event: "clock",
+                canAnimate: viewer.clock.canAnimate,
+                shouldAnimate: viewer.clock.shouldAnimate,
+                currentTime: Cesium.JulianDate.toIso8601(viewer.clock.currentTime),
+                multiplier: viewer.clock.multiplier,
+                systemTime: Cesium.JulianDate.toIso8601(systemTime)
+            }));
+        }
+    };
+
+    // Can be called by onclick handler in anchors in the infobox, to pass a URL to SDRangel
+    function infoboxLink(url) {
+        socket.send(JSON.stringify({ event: "link", url: url }));
+        return false;
+    }
+
+    Cesium.knockout.getObservable(viewer.clockViewModel, 'shouldAnimate').subscribe(function(isAnimating) {
+        reportClock();
+    });
+    Cesium.knockout.getObservable(viewer.clockViewModel, 'multiplier').subscribe(function(multiplier) {
+        reportClock();
+    });
+    // This is called every frame
+    //Cesium.knockout.getObservable(viewer.clockViewModel, 'currentTime').subscribe(function(currentTime) {
+        //reportClock();
+    //});
+    viewer.timeline.addEventListener('settime', reportClock, false);
+
+    socket.onopen = () => {
+        reportClock();
+    };
+
+  </script>
+ </div>
+</body>
+</html>
+
diff --git a/plugins/feature/map/map/waypoint.png b/plugins/feature/map/map/waypoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ff6fdc6be4970fb6d4f5664bd30fa13e4711da9
GIT binary patch
literal 1651
zcmbVNYfKzf7#$FbV%iiVP%E+H5Vb2iJCEIkov{Of-L34li-fL%Vl2bVWtp(^=*++_
zr0+B>Yg5{!_K(Cw6HV+7jEYg?qZWmRsF0#5&^AiN_aoL;o7#YlclMR4sA(s;GvA##
z_nhx>zdMP>h6k4yt}a9nWO<<8*94!d;3&R%8N5IKz2jc^xJ9df)IgBjF>B-`rgxl2
zki0WexW#M<ZDa*icJQLw4jge=gJ=X<R}<HGp$nL3JBUaMhn;`>Jq(pZ4r_LY$dKj*
zol<?D4mR~QgoVB?ff2EqYII$kg#<D%c{DCZ6@!g)Sdy28w)L98&?Lm{;;>pv5N!!H
zqFz-8DC3}Tfg~xk3R<p8+QTq*lqP8>K~@s98>dN@q*%8bO<x$4)5Q+9$+tc&24@`B
zX_^{K5V2Uy5pz0JJwi|n!w@7*&@>JaxY4Vad>mJd@(hCy7=kWorlcyU#mKj--6n@Y
zS5q;_T9#HZ(s_azBjUV9P!7_HDG3yXEKcjzqe*d5AV3tzKrs!7rLtJ9Q#DniQ~ej}
z?B~A-z}$vHS&b!qk>#v}VfuSu80my8i8jK$8X%g0p?2#6@b^GB%dKcM)~f^FRQ0f`
zMl+Ra%(#rwZif?H+bk)f8Z&IyEC4><1RMsd=E6w|r=4LMmaLMc=*Lp1kSa<Yz5hhf
ztjonxWCjIyipZP%f8j)d?ND`@hY?CL9|44>L@+d)H`c30RUOJfcbrM>P>2mEhRG`e
z2>3V*2I-I_k)?Pya924+yn`1Qob<RvoM)gV08*p`(dldlAhX`53f)#IGwa3cT>p?R
z!CvB{H_T&on6(GkddYy*=}ou5Ca@)KMI|&@c9s{c?aX0<RYxFV>DST?XCOrz>jaQ=
z>H4M+hT37qcpcP6V50ta>k!ay!s@wH2*lr`OMbhiKQnOH^p=@DZr~()U;zc5QaU`2
zezm=pgCIFI0bgy{b711sD;vuAmHEHSjk~dLi@!KtH+rbDWaPJ!=GoE7=?{ZXxkm2y
zU(E^F_J(U$hWBXiR_<;|%s*`VNf^XJ=Qa$#|JGMMmj_zMkC!|!ckJ>v6CYpn2Lp$x
zQ)?Gq%q^Nq^pCC2!`hcs%^vJOow&8Fblc)+pBxSzy*NTUPM)}}fod*jof)}rYlH2N
zpzSkZ=TO2k-hb?N-FS2Kqu|#3E4ka-uC9rk^?1ANIUB#s8}v@z)coCnikEi{7w+TA
zp5s0_R6bw)Irsn{oMX0Ew4S~D$hNVCrz;j$&rJ<|jbhU$N8Wh#2P1!lw*Q%6L3~$%
zedcKOz8~jT?0>;~;;!m}x+i|$JWxFS`jM`Q!bi5ODq6F*`}x@^d+F(gJKq_*^l8CR
y?z0DL7>#;z&y}*Wa~JMFhi6(AH&>nUTqw2QbE)X(*p5l-w-E3*_+F}O+x;i8sXV>_

literal 0
HcmV?d00001

diff --git a/plugins/feature/map/readme.md b/plugins/feature/map/readme.md
index 6f6f57cf3..52da3af5d 100644
--- a/plugins/feature/map/readme.md
+++ b/plugins/feature/map/readme.md
@@ -9,7 +9,7 @@ On top of this, it can plot data from other plugins, such as:
 * Aircraft from the ADS-B Demodulator,
 * Ships from the AIS Demodulator,
 * Satellites from the Satellite Tracker,
-* Weather imagery from APT Demodulator,
+* Satellite imagery from APT Demodulator,
 * The Sun, Moon and Stars from the Star Tracker,
 * Weather balloons from the Radiosonde feature,
 * RF Heat Maps from the Heap Map channel,
@@ -28,6 +28,7 @@ As well as internet data sources:
 * Navtex transmitters,
 * VLF transmitters,
 * KiwiSDRs,
+* Spy Servers,
 * Weather radar,
 * Satellite infra-red data (clouds),
 * Sea marks,