Startup script updated

Modified isTanker and isAWACS to isActiveTanker and isActiveAWACS

.github/workflows/ci.yml

@@ -0,0 +1,33 @@
+# ci.yml file for GitHub Actions
+name: CI
+
+on: [push]
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: write
+  pages: write
+  id-token: write
+
+jobs:
+  build_docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v2
+        
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+
+      - name: Install dependencies
+        run: npm ci
+        working-directory: ./client
+
+      - name: Create the docs directory locally in CI
+        run: npx typedoc --out ../docs/client @types/*.d.ts src/**/*.ts
+        working-directory: ./client
+        
+      - name: Deploy 🚀
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: docs 

.gitignore

@@ -9,4 +9,8 @@ Output
 node_modules
 /client/TODO.txt
 /client/public/javascripts/bundle.js
-!client/bin
+!client/bin
+/client/public/plugins
+/client/plugins/controltips/index.js
+hgt
+/client/public/databases/units/old

build_package.bat

@@ -0,0 +1,17 @@
+cd src
+msbuild olympus.sln /t:Rebuild /p:Configuration=Release
+cd ..
+cd client
+call npm install
+rmdir /s /q "hgt"
+call npm run emit-declarations
+call npm run build
+cd "plugins\controltips"
+call npm run build
+cd "..\.."
+cd "plugins\databasemanager"
+call npm run build
+cd "..\.."
+call npm prune --production
+cd ..
+call "C:\Program Files (x86)\Inno Setup 6\iscc.exe" "installer\olympus.iss"

client/.vscode/launch.json

@@ -4,17 +4,6 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-    {
-        "name": "Attach to Chrome",
-        "port": 9222,
-        "urlFilter": "http://localhost:3000/*",
-        "request": "attach",
-        "type": "chrome",
-        "webRoot": "${workspaceFolder}/public/",
-        "sourceMapPathOverrides": {
-            "src/*": "${workspaceFolder}/src/*"
-        }
-    },
         {
             "type": "chrome",
             "request": "launch",
@@ -24,7 +13,8 @@
             "sourceMapPathOverrides": {
                 "src/*": "${workspaceFolder}/src/*"
             },
-            "preLaunchTask": "server"
+            "preLaunchTask": "server",
+            "port": 9222
         }
     ]
 }

client/.vscode/tasks.json

@@ -6,7 +6,7 @@
         {
             "label": "server",
             "type": "shell",
-            "command": "npm run start",
+            "command": "npm run debug",
             "isBackground": true
         }
     ]

client/app.js

@@ -3,25 +3,32 @@ var path = require('path');
 var cookieParser = require('cookie-parser');
 var logger = require('morgan');
 var fs = require('fs');
+var bodyParser = require('body-parser');
 
 var atcRouter       = require('./routes/api/atc');
 var airbasesRouter  = require('./routes/api/airbases');
+var elevationRouter = require('./routes/api/elevation');
+var databasesRouter = require('./routes/api/databases');
 var indexRouter     = require('./routes/index');
 var uikitRouter     = require('./routes/uikit');
 var usersRouter     = require('./routes/users');
 var resourcesRouter = require('./routes/resources');
+var pluginsRouter   = require('./routes/plugins');
 
 var app = express();
 
 app.use(logger('dev'));
-app.use(express.json());
-app.use(express.urlencoded({ extended: false }));
+app.use(bodyParser.json({limit: '50mb'}));
+app.use(bodyParser.urlencoded({limit: '50mb', extended: true}));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
 app.use('/', indexRouter);
 app.use('/api/atc', atcRouter);
 app.use('/api/airbases', airbasesRouter);
+app.use('/api/elevation', elevationRouter);
+app.use('/api/databases', databasesRouter);
+app.use('/plugins', pluginsRouter)
 app.use('/users', usersRouter);
 app.use('/uikit', uikitRouter);
 app.use('/resources', resourcesRouter);

client/copy.bat

@@ -1,3 +1,4 @@
 copy .\\node_modules\\leaflet\\dist\\leaflet.css .\\public\\stylesheets\\leaflet\\leaflet.css 
+copy .\\node_modules\\leaflet-gesture-handling\\dist\\leaflet-gesture-handling.css .\\public\\stylesheets\\leaflet\\leaflet-gesture-handling.css
 copy .\\node_modules\\leaflet.nauticscale\\dist\\leaflet.nauticscale.js .\\public\\javascripts\\leaflet.nauticscale.js
-copy .\\node_modules\\leaflet-path-drag\\dist\\L.Path.Drag.js .\\public\\javascripts\\L.Path.Drag.js
+copy .\\node_modules\\leaflet-path-drag\\dist\\L.Path.Drag.js .\\public\\javascripts\\L.Path.Drag.js

client/demo.js

@@ -1,12 +1,59 @@
+const { random } = require('@turf/turf');
 var basicAuth = require('express-basic-auth')
 var enc = new TextEncoder();
 
 const DEMO_UNIT_DATA = {
-    ["1"]:{ category: "Aircraft", alive: true, human: false, controlled: true, coalition: 2, country: 0, name: "KC-135", unitName: "Cool guy 1-1 who also has a very long name", groupName: "Cool group 1", state: 3, task: "Being cool!",
-        hasTask: true, position: { lat: 37, lng: -116, alt: 1000 }, speed: 200, heading: 45, isTanker: true, isAWACS: false, onOff: true, followRoads: false, fuel: 50, 
+    ["1"]:{ category: "Aircraft", alive: true, human: false, controlled: true, coalition: 2, country: 0, name: "KC-135", unitName: "Cool guy 1-1 who also has a very long name", groupName: "Cool group 1", state: 1, task: "Being cool!",
+        hasTask: true, position: { lat: 37, lng: -116, alt: 1000 }, speed: 200, heading: 45, isActiveTanker: true, isActiveAWACS: false, onOff: true, followRoads: false, fuel: 50, 
         desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
         formationOffset: { x: 0, y: 0, z: 0 },
-        targetID: 2,
+        targetID: 0,
+        targetPosition: { lat: 0, lng: 0, alt: 0 },
+        ROE: 1,
+        reactionToThreat: 1,
+        emissionsCountermeasures: 1,
+        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
+        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
+        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
+        ammo: [{ quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 }, { quantity: 2, name: "A cool missile with a longer name\0Ciao", guidance: 0, category: 0, missileCategory: 0 }, { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } ,  { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 }   ],
+        contacts: [{ID: 2, detectionMethod: 1}, {ID: 3, detectionMethod: 4}, {ID: 4, detectionMethod: 1}],
+        activePath: [{lat: 38, lng: -115, alt: 0}, {lat: 38, lng: -114, alt: 0}]
+    },
+    ["2"]:{ category: "Aircraft", alive: true, human: false, controlled: true, coalition: 1, country: 0, name: "E-3A", unitName: "Cool guy 1-2", groupName: "Cool group 2", state: 1, task: "Being cool",
+        hasTask: true, position: { lat: 36.9, lng: -116, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isActiveTanker: false, isActiveAWACS: true, onOff: true, followRoads: false, fuel: 50, 
+        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
+        formationOffset: { x: 0, y: 0, z: 0 },
+        targetID: 0,
+        targetPosition: { lat: 0, lng: 0, alt: 0 },
+        ROE: 1,
+        reactionToThreat: 1,
+        emissionsCountermeasures: 1,
+        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
+        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
+        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
+        ammo: [{ quantity: 2, name: "A cool missile", guidance: 0, category: 0, missileCategory: 0 } ],
+        contacts: [{ID: 4, detectionMethod: 1}],
+        activePath: [ ]
+    }, ["3"]:{ category: "Helicopter", alive: true, human: false, controlled: false, coalition: 1, country: 0, name: "AH-64D_BLK_II", unitName: "Cool guy 1-4", groupName: "Cool group 3", state: 1, task: "Being cool",
+        hasTask: false, position: { lat: 37.1, lng: -116.1, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isActiveTanker: false, isActiveAWACS: false, onOff: true, followRoads: false, fuel: 50, 
+        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
+        formationOffset: { x: 0, y: 0, z: 0 },
+        targetID: 0,
+        targetPosition: { lat: 0, lng: 0, alt: 0 },
+        ROE: 1,
+        reactionToThreat: 1,
+        emissionsCountermeasures: 1,
+        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
+        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
+        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
+        ammo: [{ quantity: 2, name: "A cool missile", guidance: 0, category: 0, missileCategory: 0 } ],
+        contacts: [{ID: 1, detectionMethod: 16}],
+        activePath: [ ]
+    }, ["4"]:{ category: "GroundUnit", alive: true, human: false, controlled: true, coalition: 2, country: 0, name: "Tor 9A331", unitName: "Cool guy 2-1", groupName: "Cool group 4", state: 1, task: "Being cool",
+        hasTask: false, position: { lat: 37.2, lng: -116.1, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isActiveTanker: false, isActiveAWACS: false, onOff: false, followRoads: false, fuel: 50, 
+        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
+        formationOffset: { x: 0, y: 0, z: 0 },
+        targetID: 0,
         targetPosition: { lat: 0, lng: 0, alt: 0 },
         ROE: 1,
         reactionToThreat: 1,
@@ -15,11 +62,30 @@ const DEMO_UNIT_DATA = {
         radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
         generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
         ammo: [{ quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } ],
-        contacts: [{ID: 2, detectionMethod: 1}, {ID: 3, detectionMethod: 4}],
-        activePath: [{lat: 38, lng: -115, alt: 0}, {lat: 38, lng: -114, alt: 0}]
+        contacts: [{ID: 1001, detectionMethod: 16}],
+        activePath: [ ],
+        isLeader: true,
+        operateAs: 2
+    }, ["5"]:{ category: "GroundUnit", alive: true, human: false, controlled: true, coalition: 2, country: 0, name: "Gepard", unitName: "Cool guy 2-2", groupName: "Cool group 4", state: 1, task: "Being cool",
+        hasTask: false, position: { lat: 37.21, lng: -116.1, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isActiveTanker: false, isActiveAWACS: false, onOff: false, followRoads: false, fuel: 50, 
+        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
+        formationOffset: { x: 0, y: 0, z: 0 },
+        targetID: 0,
+        targetPosition: { lat: 0, lng: 0, alt: 0 },
+        ROE: 1,
+        reactionToThreat: 1,
+        emissionsCountermeasures: 1,
+        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
+        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
+        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
+        ammo: [{ quantity: 2, name: "A cool missile", guidance: 0, category: 0, missileCategory: 0 } ],
+        contacts: [],
+        activePath: [ ],
+        isLeader: false,
+        operateAs: 2
     },
-    ["2"]:{ category: "Aircraft", alive: true, human: false, controlled: false, coalition: 1, country: 0, name: "FA-18C_hornet", unitName: "Cool guy 1-2", groupName: "Cool group 2", state: 1, task: "Being cool",
-        hasTask: false, position: { lat: 36.9, lng: -116, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isTanker: false, isAWACS: false, onOff: true, followRoads: false, fuel: 50, 
+    ["6"]:{ category: "Aircraft", alive: true, human: false, controlled: false, coalition: 1, country: 0, name: "FA-18C_hornet", unitName: "Bad boi 1-2", groupName: "Bad group 1", state: 1, task: "Being bad",
+        hasTask: false, position: { lat: 36.8, lng: -116, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isActiveTanker: false, isActiveAWACS: false, onOff: true, followRoads: false, fuel: 50, 
         desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
         formationOffset: { x: 0, y: 0, z: 0 },
         targetID: 0,
@@ -33,23 +99,8 @@ const DEMO_UNIT_DATA = {
         ammo: [{ quantity: 2, name: "A cool missile", guidance: 0, category: 0, missileCategory: 0 } ],
         contacts: [{ID: 1, detectionMethod: 16}],
         activePath: [ ]
-    }, ["3"]:{ category: "Helicopter", alive: true, human: false, controlled: false, coalition: 1, country: 0, name: "AH-64D_BLK_II", unitName: "Cool guy 1-4", groupName: "Cool group 3", state: 1, task: "Being cool",
-        hasTask: false, position: { lat: 37.1, lng: -116.1, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isTanker: false, isAWACS: false, onOff: true, followRoads: false, fuel: 50, 
-        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
-        formationOffset: { x: 0, y: 0, z: 0 },
-        targetID: 0,
-        targetPosition: { lat: 0, lng: 0, alt: 0 },
-        ROE: 1,
-        reactionToThreat: 1,
-        emissionsCountermeasures: 1,
-        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
-        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
-        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
-        ammo: [{ quantity: 2, name: "A cool missile", guidance: 0, category: 0, missileCategory: 0 } ],
-        contacts: [{ID: 1, detectionMethod: 16}],
-        activePath: [ ]
-    }, ["4"]:{ category: "GroundUnit", alive: true, human: false, controlled: true, coalition: 1, country: 0, name: "Gepard", unitName: "Cool guy 2-1", groupName: "Cool group 4", state: 1, task: "Being cool",
-        hasTask: false, position: { lat: 37.2, lng: -116.1, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isTanker: false, isAWACS: false, onOff: true, followRoads: false, fuel: 50, 
+    }, ["7"]:{ category: "GroundUnit", alive: true, human: false, controlled: true, coalition: 1, country: 0, name: "Tor 9A331", unitName: "Cool guy 2-1", groupName: "Cool group 10", state: 1, task: "Being cool",
+        hasTask: false, position: { lat: 37.2, lng: -116.2, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isActiveTanker: false, isActiveAWACS: false, onOff: true, followRoads: false, fuel: 50, 
         desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
         formationOffset: { x: 0, y: 0, z: 0 },
         targetID: 0,
@@ -64,39 +115,7 @@ const DEMO_UNIT_DATA = {
         contacts: [{ID: 1001, detectionMethod: 16}],
         activePath: [ ],
         isLeader: true
-    }, ["5"]:{ category: "GroundUnit", alive: true, human: false, controlled: true, coalition: 1, country: 0, name: "S_75M_Volhov", unitName: "Cool guy 2-2", groupName: "Cool group 4", state: 1, task: "Being cool",
-        hasTask: false, position: { lat: 37.21, lng: -116.1, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isTanker: false, isAWACS: false, onOff: true, followRoads: false, fuel: 50, 
-        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
-        formationOffset: { x: 0, y: 0, z: 0 },
-        targetID: 0,
-        targetPosition: { lat: 0, lng: 0, alt: 0 },
-        ROE: 1,
-        reactionToThreat: 1,
-        emissionsCountermeasures: 1,
-        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
-        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
-        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
-        ammo: [{ quantity: 2, name: "A cool missile", guidance: 0, category: 0, missileCategory: 0 } ],
-        contacts: [],
-        activePath: [ ],
-        isLeader: false
-    },
-    ["6"]:{ category: "Aircraft", alive: true, human: false, controlled: false, coalition: 1, country: 0, name: "FA-18C_hornet", unitName: "Bad boi 1-2", groupName: "Bad group 1", state: 1, task: "Being bad",
-        hasTask: false, position: { lat: 36.8, lng: -116, alt: 1000 }, speed: 200, heading: 315 * Math.PI / 180, isTanker: false, isAWACS: false, onOff: true, followRoads: false, fuel: 50, 
-        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
-        formationOffset: { x: 0, y: 0, z: 0 },
-        targetID: 0,
-        targetPosition: { lat: 0, lng: 0, alt: 0 },
-        ROE: 1,
-        reactionToThreat: 1,
-        emissionsCountermeasures: 1,
-        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
-        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
-        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
-        ammo: [{ quantity: 2, name: "A cool missile", guidance: 0, category: 0, missileCategory: 0 } ],
-        contacts: [{ID: 1, detectionMethod: 16}],
-        activePath: [ ]
-    },
+    }, 
 }
 
 const DEMO_WEAPONS_DATA = {
@@ -112,6 +131,8 @@ class DemoDataGenerator {
         app.get('/demo/bullseyes', (req, res) => this.bullseyes(req, res));
         app.get('/demo/airbases', (req, res) => this.airbases(req, res));
         app.get('/demo/mission', (req, res) => this.mission(req, res));
+        app.get('/demo/commands', (req, res) => this.command(req, res));
+        app.put('/demo', (req, res) => this.put(req, res));
 
         app.use('/demo', basicAuth({
             users: { 
@@ -121,6 +142,27 @@ class DemoDataGenerator {
             },
         }))
 
+        //for (let i = 8; i < 100; i++) {
+        //    var randomUnit = { category: "Aircraft", alive: true, human: false, controlled: true, coalition: 2, country: 0, name: "KC-135", unitName: "Cool guy 1-1 who also has a very long name", groupName: "Cool group 1", state: 1, task: "Being cool!",
+        //        hasTask: true, position: { lat: 37 + Math.random(), lng: -116 + Math.random(), alt: 1000 }, speed: 200, heading: 45, isActiveTanker: true, isActiveAWACS: false, onOff: true, followRoads: false, fuel: 50, 
+        //        desiredSpeed: 300, desiredSpeedType: 1, desiredAltitude: 1000, desiredAltitudeType: 1, leaderID: 0,
+        //        formationOffset: { x: 0, y: 0, z: 0 },
+        //        targetID: 0,
+        //        targetPosition: { lat: 0, lng: 0, alt: 0 },
+        //        ROE: 1,
+        //        reactionToThreat: 1,
+        //        emissionsCountermeasures: 1,
+        //        TACAN: { isOn: false, XY: 'Y', callsign: 'TKR', channel: 40 },
+        //        radio: { frequency: 124000000, callsign: 1, callsignNumber: 1 },
+        //        generalSettings: { prohibitAA: false, prohibitAfterburner: false, prohibitAG: false, prohibitAirWpn: false, prohibitJettison: false },
+        //        ammo: [{ quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 }, { quantity: 2, name: "A cool missile with a longer name\0Ciao", guidance: 0, category: 0, missileCategory: 0 }, { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } ,  { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 } , { quantity: 2, name: "A cool missile\0Ciao", guidance: 0, category: 0, missileCategory: 0 }   ],
+        //        contacts: [{ID: 2, detectionMethod: 1}, {ID: 3, detectionMethod: 4}, {ID: 4, detectionMethod: 1}],
+        //        activePath: []
+        //    }
+        //    DEMO_UNIT_DATA[i.toString()] = randomUnit;
+        //}
+
+
         this.startTime = Date.now();
     }
     
@@ -146,8 +188,8 @@ class DemoDataGenerator {
             array = this.appendCoordinates(array, unit.position, 13);
             array = this.appendDouble(array, unit.speed, 14);
             array = this.appendDouble(array, unit.heading, 15);
-            array = this.appendUint8(array, unit.isTanker, 16);
-            array = this.appendUint8(array, unit.isAWACS, 17);
+            array = this.appendUint8(array, unit.isActiveTanker, 16);
+            array = this.appendUint8(array, unit.isActiveAWACS, 17);
             array = this.appendUint8(array, unit.onOff, 18);
             array = this.appendUint8(array, unit.followRoads, 19);
             array = this.appendUint16(array, unit.fuel, 20);
@@ -169,6 +211,7 @@ class DemoDataGenerator {
             array = this.appendContacts(array, unit.contacts, 36);
             array = this.appendActivePath(array, unit.activePath, 37);
             array = this.appendUint8(array, unit.isLeader, 38);
+            array = this.appendUint8(array, unit.operateAs, 39);
             array = this.concat(array, this.uint8ToByteArray(255));
         }
         res.end(Buffer.from(array, 'binary'));
@@ -409,7 +452,7 @@ class DemoDataGenerator {
         ret.time = Date.now();
 
         ret.mission.dateAndTime = {
-            time: Date.now(),
+            time: { h: 10, m: 15, s: 34 },
             date: "",
             elapsedTime: (Date.now() - this.startTime) / 1000,
             startTime: 0
@@ -417,21 +460,24 @@ class DemoDataGenerator {
 
         ret.mission.coalitions = {
             red: [ 
-                'Russia',
-                'China'
+                'RUSSIA',
+                'CHINA'
             ],
             blue: [
-                'United States',
-                'Great Britain'
+                'UK',
+                'USA'
+            ],
+            neutral: [
+                'ITALY'
             ]
         }
 
         ret.mission.commandModeOptions = {
-            restrictSpawns: false,
+            restrictSpawns: true,
             restrictToCoalition: true,
             setupTime: 0,
             spawnPoints: {
-                red: 1000,
+                red: 400,
                 blue: 400
             }, 
             eras: ["WW2", "Early Cold War", "Late Cold War", "Modern"]
@@ -439,7 +485,7 @@ class DemoDataGenerator {
 
         var auth = req.get("Authorization");
         if (auth) {
-            var username = atob(auth.replace("Basic ", "")).split(":")[0];
+            var username = Buffer.from(auth.replace("Basic ", ""), 'base64').toString('binary').split(":")[0];
             switch (username) {
                 case "admin":
                     ret.mission.commandModeOptions.commandMode = "Game master";
@@ -454,7 +500,17 @@ class DemoDataGenerator {
         }
         res.send(JSON.stringify(ret));
     }
+
+    command(req, res) {
+        var ret = {commandExecuted: Math.random() > 0.5};
+        res.send(JSON.stringify(ret));
+    }
     
+    put(req, res) {
+        var ret = {commandHash: Math.random().toString(36).slice(2, 19)}
+        res.send(JSON.stringify(ret));
+    }
+
 }
 
 module.exports = DemoDataGenerator;

client/package.json

@@ -2,29 +2,34 @@
   "name": "DCSOlympus",
   "node-main": "./bin/www",
   "main": "http://localhost:3000",
-  "version": "v0.4.3-alpha",
+  "version": "v0.4.5-alpha",
   "private": true,
   "scripts": {
+	  "build": "browserify .\\src\\index.ts --debug -o .\\public\\javascripts\\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ] && copy.bat",
+    "emit-declarations": "tsc --project tsconfig.json --declaration --emitDeclarationOnly --outfile ./@types/olympus/index.d.ts",
     "copy": "copy.bat",
-    "start": "npm run copy & concurrently --kill-others \"npm run watch\" \"nodemon ./bin/www\"",
+    "start": "node ./bin/www",
+    "debug": "npm run copy & concurrently --kill-others \"npm run watch\" \"nodemon --ignore ./public/databases/ ./bin/www\"",
     "watch": "watchify .\\src\\index.ts --debug -o .\\public\\javascripts\\bundle.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ]"
   },
   "dependencies": {
+    "@turf/turf": "^6.5.0",
+    "body-parser": "^1.20.2",
     "cookie-parser": "~1.4.4",
     "debug": "~2.6.9",
     "ejs": "^3.1.8",
     "express": "~4.16.1",
+    "express-basic-auth": "^1.2.1",
+    "leaflet-gesture-handling": "^1.2.2",
     "morgan": "~1.9.1",
     "save": "^2.9.0",
-    "express-basic-auth": "^1.2.1"
+    "srtm-elevation": "^2.1.2"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.21.4",
     "@tanem/svg-injector": "^10.1.55",
-    "@turf/turf": "^6.5.0",
     "@types/formatcoords": "^1.1.0",
     "@types/geojson": "^7946.0.10",
-    "@types/gtag.js": "^0.0.12",
     "@types/leaflet": "^1.9.0",
     "@types/node": "^18.16.1",
     "@types/sortablejs": "^1.15.0",
@@ -35,14 +40,20 @@
     "cp": "^0.2.0",
     "esmify": "^2.1.1",
     "formatcoords": "^1.1.3",
+    "geodesy": "^1.1.2",
     "leaflet": "^1.9.3",
     "leaflet-control-mini-map": "^0.4.0",
     "leaflet-path-drag": "*",
     "leaflet.nauticscale": "^1.1.0",
     "nodemon": "^2.0.20",
+    "requirejs": "^2.3.6",
     "sortablejs": "^1.15.0",
     "tsify": "^5.0.4",
+    "tslib": "latest",
+    "typedoc": "^0.24.8",
+    "typedoc-umlclass": "^0.7.1",
     "typescript": "^4.9.4",
+    "usng.js": "^0.4.5",
     "watchify": "^4.0.0"
   }
 }

client/plugins/controltips/copy.bat

@@ -0,0 +1,5 @@
+mkdir .\\..\\..\\public\\plugins\\controltipsplugin
+
+copy .\\index.js .\\..\\..\\public\\plugins\\controltipsplugin\\index.js
+copy .\\plugin.json .\\..\\..\\public\\plugins\\controltipsplugin\\plugin.json
+copy .\\style.css .\\..\\..\\public\\plugins\\controltipsplugin\\style.css

client/plugins/controltips/index.js

@@ -0,0 +1,366 @@
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _ControlTipsPlugin_instances, _ControlTipsPlugin_element, _ControlTipsPlugin_app, _ControlTipsPlugin_shortcutManager, _ControlTipsPlugin_cursorIsHoveringOverUnit, _ControlTipsPlugin_cursorIsHoveringOverAirbase, _ControlTipsPlugin_mouseoverElement, _ControlTipsPlugin_updateTips;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ControlTipsPlugin = void 0;
+const SHOW_CONTROL_TIPS = "Show control tips";
+class ControlTipsPlugin {
+    constructor() {
+        _ControlTipsPlugin_instances.add(this);
+        _ControlTipsPlugin_element.set(this, void 0);
+        _ControlTipsPlugin_app.set(this, void 0);
+        _ControlTipsPlugin_shortcutManager.set(this, void 0);
+        _ControlTipsPlugin_cursorIsHoveringOverUnit.set(this, false);
+        _ControlTipsPlugin_cursorIsHoveringOverAirbase.set(this, false);
+        _ControlTipsPlugin_mouseoverElement.set(this, void 0);
+        __classPrivateFieldSet(this, _ControlTipsPlugin_element, document.createElement("div"), "f");
+        __classPrivateFieldGet(this, _ControlTipsPlugin_element, "f").id = "control-tips-panel";
+        document.body.appendChild(__classPrivateFieldGet(this, _ControlTipsPlugin_element, "f"));
+    }
+    getName() {
+        return "Control Tips Plugin";
+    }
+    initialize(app) {
+        __classPrivateFieldSet(this, _ControlTipsPlugin_app, app, "f");
+        __classPrivateFieldSet(this, _ControlTipsPlugin_shortcutManager, __classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getShortcutManager(), "f");
+        __classPrivateFieldGet(this, _ControlTipsPlugin_shortcutManager, "f").onKeyDown(() => {
+            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
+        });
+        __classPrivateFieldGet(this, _ControlTipsPlugin_shortcutManager, "f").onKeyUp(() => {
+            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
+        });
+        document.addEventListener("airbaseMouseover", (ev) => {
+            __classPrivateFieldSet(this, _ControlTipsPlugin_cursorIsHoveringOverAirbase, true, "f");
+            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
+        });
+        document.addEventListener("airbaseMouseout", (ev) => {
+            __classPrivateFieldSet(this, _ControlTipsPlugin_cursorIsHoveringOverAirbase, false, "f");
+            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
+        });
+        document.addEventListener("unitDeselection", (ev) => {
+            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
+        });
+        document.addEventListener("unitMouseover", (ev) => {
+            __classPrivateFieldSet(this, _ControlTipsPlugin_cursorIsHoveringOverUnit, true, "f");
+            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
+        });
+        document.addEventListener("unitMouseout", (ev) => {
+            __classPrivateFieldSet(this, _ControlTipsPlugin_cursorIsHoveringOverUnit, false, "f");
+            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
+        });
+        document.addEventListener("unitsSelection", (ev) => {
+            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
+        });
+        document.addEventListener("mapVisibilityOptionsChanged", () => {
+            this.toggle(!__classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getMap().getVisibilityOptions()[SHOW_CONTROL_TIPS]);
+        });
+        document.addEventListener("mouseover", (ev) => {
+            if (ev.target instanceof HTMLElement) {
+                __classPrivateFieldSet(this, _ControlTipsPlugin_mouseoverElement, ev.target, "f");
+            }
+            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
+        });
+        document.addEventListener("mouseup", (ev) => {
+            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
+        });
+        __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
+        __classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getMap().addVisibilityOption(SHOW_CONTROL_TIPS, true);
+        return true;
+    }
+    getElement() {
+        return __classPrivateFieldGet(this, _ControlTipsPlugin_element, "f");
+    }
+    toggle(bool) {
+        this.getElement().classList.toggle("hide", bool);
+    }
+}
+exports.ControlTipsPlugin = ControlTipsPlugin;
+_ControlTipsPlugin_element = new WeakMap(), _ControlTipsPlugin_app = new WeakMap(), _ControlTipsPlugin_shortcutManager = new WeakMap(), _ControlTipsPlugin_cursorIsHoveringOverUnit = new WeakMap(), _ControlTipsPlugin_cursorIsHoveringOverAirbase = new WeakMap(), _ControlTipsPlugin_mouseoverElement = new WeakMap(), _ControlTipsPlugin_instances = new WeakSet(), _ControlTipsPlugin_updateTips = function _ControlTipsPlugin_updateTips() {
+    const combos = [
+        {
+            "keys": [],
+            "tips": [
+                {
+                    "key": `SHIFT`,
+                    "action": `Box select`,
+                    "showIfHoveringOverAirbase": false,
+                    "showIfHoveringOverUnit": false,
+                    "showIfUnitSelected": false
+                },
+                {
+                    "key": `Mouse1`,
+                    "action": `Deselect`,
+                    "showIfUnitSelected": true
+                },
+                {
+                    "key": `Mouse1+drag`,
+                    "action": `Move map`,
+                    "showIfHoveringOverAirbase": false,
+                    "showIfHoveringOverUnit": false,
+                    "showIfUnitSelected": false
+                },
+                {
+                    "key": `Mouse2`,
+                    "action": `Spawn menu`,
+                    "showIfUnitSelected": false,
+                    "showIfHoveringOverAirbase": false,
+                    "showIfHoveringOverUnit": false
+                },
+                {
+                    "key": `Mouse2`,
+                    "action": `Quick options`,
+                    "showIfUnitSelected": false,
+                    "showIfHoveringOverAirbase": false,
+                    "showIfHoveringOverUnit": true
+                },
+                {
+                    "key": `Mouse2`,
+                    "action": `Airbase menu`,
+                    "showIfUnitSelected": false,
+                    "showIfHoveringOverAirbase": true,
+                    "showIfHoveringOverUnit": false
+                },
+                {
+                    "key": `Mouse2`,
+                    "action": `Set first waypoint`,
+                    "showIfHoveringOverAirbase": false,
+                    "showIfUnitSelected": true,
+                    "unitsMustBeControlled": true
+                },
+                {
+                    "key": `Mouse2 (hold)`,
+                    "action": `Interact (ground)`,
+                    "showIfUnitSelected": true,
+                    "showIfHoveringOverAirbase": false,
+                    "showIfHoveringOverUnit": false,
+                    "unitsMustBeControlled": true
+                },
+                {
+                    "key": `Shift`,
+                    "action": "<em>  in formation...</em>",
+                    "showIfUnitSelected": true,
+                    "minSelectedUnits": 2
+                },
+                {
+                    "key": "CTRL",
+                    "action": "<em>  ... more</em>",
+                    "showIfUnitSelected": true,
+                    "showIfHoveringOverAirbase": false,
+                    "unitsMustBeControlled": true
+                },
+                {
+                    "key": "CTRL",
+                    "action": " Pin tool",
+                    "showIfUnitSelected": false,
+                    "showIfHoveringOverAirbase": false,
+                    "showIfHoveringOverUnit": false,
+                    "unitsMustBeControlled": true
+                },
+                {
+                    "key": "CTRL+Mouse2",
+                    "action": " Airbase menu",
+                    "showIfUnitSelected": true,
+                    "showIfHoveringOverAirbase": true,
+                    "unitsMustBeControlled": true
+                },
+                {
+                    "key": `Mouse1`,
+                    "action": "Toggle Blue/Red",
+                    "mouseoverSelector": "#coalition-switch .ol-switch-fill"
+                },
+                {
+                    "key": `Mouse2`,
+                    "action": "Set Neutral",
+                    "mouseoverSelector": "#coalition-switch .ol-switch-fill"
+                },
+                {
+                    "key": `Mouse1`,
+                    "action": "Toggle time display",
+                    "mouseoverSelector": "#connection-status-panel[data-is-connected] #connection-status-message abbr"
+                },
+                {
+                    "key": `Mouse1 or Z`,
+                    "action": "Change location system",
+                    "mouseoverSelector": "#coordinates-tool, #coordinates-tool *"
+                },
+                {
+                    "key": `Comma`,
+                    "action": "Decrease precision",
+                    "mouseoverSelector": `#coordinates-tool[data-location-system="MGRS"], #coordinates-tool[data-location-system="MGRS"] *`
+                },
+                {
+                    "key": `Period`,
+                    "action": "Increase precision",
+                    "mouseoverSelector": `#coordinates-tool[data-location-system="MGRS"], #coordinates-tool[data-location-system="MGRS"] *`
+                }
+            ]
+        },
+        {
+            "keys": ["ControlLeft"],
+            "tips": [
+                {
+                    "key": `Mouse1`,
+                    "action": "Toggle pin",
+                    "showIfUnitSelected": false,
+                    "showIfHoveringOverAirbase": false,
+                    "showIfHoveringOverUnit": false
+                },
+                {
+                    "key": `Mouse1`,
+                    "action": "Toggle selection",
+                    "showIfUnitSelected": true,
+                    "showIfHoveringOverAirbase": false,
+                    "showIfHoveringOverUnit": true
+                },
+                {
+                    "key": `Mouse2`,
+                    "action": `Add waypoint`,
+                    "showIfHoveringOverAirbase": false,
+                    "showIfHoveringOverUnit": false,
+                    "showIfUnitSelected": true,
+                    "unitsMustBeControlled": true
+                },
+                {
+                    "key": `Mouse2`,
+                    "action": `Interact (airbase)`,
+                    "showIfHoveringOverAirbase": true,
+                    "showIfUnitSelected": true,
+                    "unitsMustBeControlled": true
+                },
+                {
+                    "key": `Mouse2`,
+                    "action": `Interact (unit)`,
+                    "showIfHoveringOverAirbase": false,
+                    "showIfHoveringOverUnit": true,
+                    "showIfUnitSelected": true,
+                    "unitsMustBeControlled": true
+                },
+                {
+                    "key": `Shift`,
+                    "action": "<em>  in formation...</em>",
+                    "showIfUnitSelected": true,
+                    "minSelectedUnits": 2
+                },
+                {
+                    "key": `[Num 1-9]`,
+                    "action": "Set hotgroup",
+                    "showIfUnitSelected": true
+                }
+            ]
+        },
+        {
+            "keys": ["ShiftLeft"],
+            "tips": [
+                {
+                    "key": `Mouse1+drag`,
+                    "action": "Box select",
+                    "showIfUnitSelected": false
+                },
+                {
+                    "key": `Mouse2`,
+                    "action": "Set first formation waypoint",
+                    "showIfUnitSelected": true,
+                    "minSelectedUnits": 2
+                },
+                {
+                    "key": "CTRL",
+                    "action": "<em>  ... more</em>",
+                    "minSelectedUnits": 2,
+                    "showIfUnitSelected": true,
+                    "showIfHoveringOverAirbase": false,
+                    "unitsMustBeControlled": true
+                }
+            ]
+        },
+        {
+            "keys": ["ControlLeft", "ShiftLeft"],
+            "tips": [
+                {
+                    "key": `Mouse2`,
+                    "action": "Add formation waypoint",
+                    "showIfUnitSelected": true,
+                    "minSelectedUnits": 2,
+                    "unitsMustBeControlled": true
+                }
+            ]
+        }
+    ];
+    const currentCombo = combos.find((combo) => __classPrivateFieldGet(this, _ControlTipsPlugin_shortcutManager, "f").keyComboMatches(combo.keys)) || combos[0];
+    const element = this.getElement();
+    element.innerHTML = "";
+    let numSelectedUnits = 0;
+    let numSelectedControlledUnits = 0;
+    let unitSelectionContainsControlled = false;
+    if (__classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getUnitsManager()) {
+        let selectedUnits = Object.values(__classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getUnitsManager().getSelectedUnits());
+        numSelectedUnits = selectedUnits.length;
+        numSelectedControlledUnits = selectedUnits.filter((unit) => unit.getControlled()).length;
+        unitSelectionContainsControlled = numSelectedControlledUnits > 0;
+    }
+    const tipsIncludesActiveMouseover = (currentCombo.tips.some((tip) => {
+        if (!tip.mouseoverSelector) {
+            return false;
+        }
+        if (__classPrivateFieldGet(this, _ControlTipsPlugin_mouseoverElement, "f") instanceof HTMLElement === false) {
+            return false;
+        }
+        if (!__classPrivateFieldGet(this, _ControlTipsPlugin_mouseoverElement, "f").matches(tip.mouseoverSelector)) {
+            return false;
+        }
+        return true;
+    }));
+    currentCombo.tips.filter((tip) => {
+        if (numSelectedUnits > 0) {
+            if (tip.showIfUnitSelected === false) {
+                return false;
+            }
+            if (tip.unitsMustBeControlled === true && unitSelectionContainsControlled === false) {
+                return false;
+            }
+            if (typeof tip.minSelectedUnits === "number" && numSelectedControlledUnits < tip.minSelectedUnits) {
+                return false;
+            }
+        }
+        if (numSelectedUnits === 0 && tip.showIfUnitSelected === true) {
+            return false;
+        }
+        if (typeof tip.showIfHoveringOverAirbase === "boolean") {
+            if (tip.showIfHoveringOverAirbase !== __classPrivateFieldGet(this, _ControlTipsPlugin_cursorIsHoveringOverAirbase, "f")) {
+                return false;
+            }
+        }
+        if (typeof tip.showIfHoveringOverUnit === "boolean") {
+            if (tip.showIfHoveringOverUnit !== __classPrivateFieldGet(this, _ControlTipsPlugin_cursorIsHoveringOverUnit, "f")) {
+                return false;
+            }
+        }
+        if (tipsIncludesActiveMouseover && (typeof tip.mouseoverSelector !== "string" || !__classPrivateFieldGet(this, _ControlTipsPlugin_mouseoverElement, "f").matches(tip.mouseoverSelector))) {
+            return false;
+        }
+        if (!tipsIncludesActiveMouseover && typeof tip.mouseoverSelector === "string") {
+            return false;
+        }
+        element.innerHTML += `<div><span class="key">${tip.key}</span><span class="action">${tip.action}</span></div>`;
+    });
+};
+
+},{}],2:[function(require,module,exports){
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const controltipsplugin_1 = require("./controltipsplugin");
+globalThis.getOlympusPlugin = () => {
+    return new controltipsplugin_1.ControlTipsPlugin();
+};
+
+},{"./controltipsplugin":1}]},{},[2]);

client/plugins/controltips/package-lock.json

@@ -0,0 +1,162 @@
+{
+  "name": "ControlTipsPlugin",
+  "version": "v0.0.1",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+    },
+    "convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+    },
+    "core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q=="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==",
+      "requires": {
+        "error-ex": "^1.2.0"
+      }
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==",
+      "requires": {
+        "is-utf8": "^0.2.0"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "tsconfig": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-5.0.3.tgz",
+      "integrity": "sha512-Cq65A3kVp6BbsUgg9DRHafaGmbMb9EhAc7fjWvudNWKjkbWrt43FnrtZt6awshH1R0ocfF2Z0uxock3lVqEgOg==",
+      "requires": {
+        "any-promise": "^1.3.0",
+        "parse-json": "^2.2.0",
+        "strip-bom": "^2.0.0",
+        "strip-json-comments": "^2.0.0"
+      }
+    },
+    "tsify": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/tsify/-/tsify-5.0.4.tgz",
+      "integrity": "sha512-XAZtQ5OMPsJFclkZ9xMZWkSNyMhMxEPsz3D2zu79yoKorH9j/DT4xCloJeXk5+cDhosEibu4bseMVjyPOAyLJA==",
+      "requires": {
+        "convert-source-map": "^1.1.0",
+        "fs.realpath": "^1.0.0",
+        "object-assign": "^4.1.0",
+        "semver": "^6.1.0",
+        "through2": "^2.0.0",
+        "tsconfig": "^5.0.3"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+    }
+  }
+}

client/plugins/controltips/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "ControlTipsPlugin",
+  "version": "v0.0.1",
+  "private": true,
+  "scripts": {
+    "build": "browserify ./src/index.ts -p [ tsify --noImplicitAny] > index.js && copy.bat"
+  },
+  "dependencies": {},
+  "devDependencies": {}
+}

client/plugins/controltips/plugin.json

@@ -0,0 +1,6 @@
+{
+    "name": "Control Tip Plugin",
+    "version": "0.0.1",
+    "description": "This plugin shows useful control tips on the right side of the screen. The tips change dynamically depending on what the user does",
+    "author": "Peekaboo"
+}

client/plugins/controltips/src/controltipsplugin.ts

@@ -0,0 +1,382 @@
+import { OlympusPlugin } from "interfaces";
+
+
+const SHOW_CONTROL_TIPS = "Show control tips"
+
+export class ControlTipsPlugin implements OlympusPlugin {
+    #element: HTMLElement;
+    #app: any;
+    #shortcutManager: any;
+    #cursorIsHoveringOverUnit: boolean = false;
+    #cursorIsHoveringOverAirbase: boolean = false;
+    #mouseoverElement!: HTMLElement;
+    
+    constructor() {
+        this.#element = document.createElement("div");
+        this.#element.id = "control-tips-panel";
+        document.body.appendChild(this.#element);
+    }
+
+    getName() {
+        return "Control Tips Plugin"
+    }
+
+    initialize(app: any) {
+        this.#app = app;
+
+        this.#shortcutManager = this.#app.getShortcutManager();
+
+        this.#shortcutManager.onKeyDown(() => {
+           this.#updateTips()
+        });
+
+        this.#shortcutManager.onKeyUp(() => {
+           this.#updateTips()
+        });
+
+        document.addEventListener("airbaseMouseover", (ev: CustomEventInit) => {
+            this.#cursorIsHoveringOverAirbase = true;
+            this.#updateTips();
+        });
+
+        document.addEventListener("airbaseMouseout", (ev: CustomEventInit) => {
+            this.#cursorIsHoveringOverAirbase = false;
+            this.#updateTips();
+        });
+
+        document.addEventListener("unitDeselection", (ev: CustomEventInit ) => {
+            this.#updateTips();
+        });
+
+        document.addEventListener("unitMouseover", (ev: CustomEventInit) => {
+            this.#cursorIsHoveringOverUnit = true;
+            this.#updateTips();
+        });
+
+        document.addEventListener("unitMouseout", (ev: CustomEventInit) => {
+            this.#cursorIsHoveringOverUnit = false;
+            this.#updateTips();
+        });
+
+        document.addEventListener("unitsSelection", (ev: CustomEventInit ) => {
+            this.#updateTips();
+        });
+
+        document.addEventListener("mapVisibilityOptionsChanged", () => {
+            this.toggle( !this.#app.getMap().getVisibilityOptions()[SHOW_CONTROL_TIPS] );
+        });
+
+        document.addEventListener( "mouseover", ( ev: MouseEvent ) => {
+            if ( ev.target instanceof HTMLElement ) {
+                this.#mouseoverElement = <HTMLElement>ev.target;
+            }
+            this.#updateTips();
+        });
+
+        document.addEventListener( "mouseup", ( ev: MouseEvent ) => {
+            this.#updateTips();
+        });
+
+        this.#updateTips();
+
+        this.#app.getMap().addVisibilityOption(SHOW_CONTROL_TIPS, true);
+
+        return true;
+    }
+
+    getElement() {
+        return this.#element;
+    }
+
+    toggle(bool?: boolean) {
+        this.getElement().classList.toggle("hide", bool);
+    }
+
+    #updateTips() {
+        const combos: Array<object> = [
+            {
+                "keys": [],
+                "tips": [
+                    {
+                        "key": `SHIFT`,
+                        "action": `Box select`,
+                        "showIfHoveringOverAirbase": false,
+                        "showIfHoveringOverUnit": false,
+                        "showIfUnitSelected": false
+                    },
+                    {
+                        "key": `Mouse1`,
+                        "action": `Deselect`,
+                        "showIfUnitSelected": true
+                    },
+                    {
+                        "key": `Mouse1+drag`,
+                        "action": `Move map`,
+                        "showIfHoveringOverAirbase": false,
+                        "showIfHoveringOverUnit": false,
+                        "showIfUnitSelected": false
+                    },
+                    {
+                        "key": `Mouse2`,
+                        "action": `Spawn menu`,
+                        "showIfUnitSelected": false,
+                        "showIfHoveringOverAirbase": false,
+                        "showIfHoveringOverUnit": false
+                    },
+                    {
+                        "key": `Mouse2`,
+                        "action": `Quick options`,
+                        "showIfUnitSelected": false,
+                        "showIfHoveringOverAirbase": false,
+                        "showIfHoveringOverUnit": true
+                    },
+                    {
+                        "key": `Mouse2`,
+                        "action": `Airbase menu`,
+                        "showIfUnitSelected": false,
+                        "showIfHoveringOverAirbase": true,
+                        "showIfHoveringOverUnit": false
+                    },
+                    {
+                        "key": `Mouse2`,
+                        "action": `Set first waypoint`,
+                        "showIfHoveringOverAirbase": false,
+                        "showIfUnitSelected": true,
+                        "unitsMustBeControlled": true
+                    },
+                    {
+                        "key": `Mouse2 (hold)`,
+                        "action": `Interact (ground)`,
+                        "showIfUnitSelected": true,
+                        "showIfHoveringOverAirbase": false,
+                        "showIfHoveringOverUnit": false,
+                        "unitsMustBeControlled": true
+                    },
+                    {
+                        "key": `Shift`,
+                        "action": "<em>  in formation...</em>",
+                        "showIfUnitSelected": true,
+                        "minSelectedUnits": 2
+                    },
+                    {
+                        "key": "CTRL",
+                        "action": "<em>  ... more</em>",
+                        "showIfUnitSelected": true,
+                        "showIfHoveringOverAirbase": false,
+                        "unitsMustBeControlled": true
+                    },
+                    {
+                        "key": "CTRL",
+                        "action": " Pin tool",
+                        "showIfUnitSelected": false,
+                        "showIfHoveringOverAirbase": false,
+                        "showIfHoveringOverUnit": false,
+                        "unitsMustBeControlled": true
+                    },
+                    {
+                        "key": "CTRL+Mouse2",
+                        "action": " Airbase menu",
+                        "showIfUnitSelected": true,
+                        "showIfHoveringOverAirbase": true,
+                        "unitsMustBeControlled": true
+                    },
+                    {
+                        "key": `Mouse1`,
+                        "action": "Toggle Blue/Red",
+                        "mouseoverSelector": "#coalition-switch .ol-switch-fill"
+                    },
+                    {
+                        "key": `Mouse2`,
+                        "action": "Set Neutral",
+                        "mouseoverSelector": "#coalition-switch .ol-switch-fill"
+                    },
+                    {
+                        "key": `Mouse1`,
+                        "action": "Toggle time display",
+                        "mouseoverSelector": "#connection-status-panel[data-is-connected] #connection-status-message abbr"
+                    },
+                    {
+                        "key": `Mouse1 or Z`,
+                        "action": "Change location system",
+                        "mouseoverSelector": "#coordinates-tool, #coordinates-tool *"
+                    },
+                    {
+                        "key": `Comma`,
+                        "action": "Decrease precision",
+                        "mouseoverSelector": `#coordinates-tool[data-location-system="MGRS"], #coordinates-tool[data-location-system="MGRS"] *`
+                    },
+                    {
+                        "key": `Period`,
+                        "action": "Increase precision",
+                        "mouseoverSelector": `#coordinates-tool[data-location-system="MGRS"], #coordinates-tool[data-location-system="MGRS"] *`
+                    }
+                ]
+            },
+            {
+                "keys": ["ControlLeft"],
+                "tips": [
+                    {
+                        "key": `Mouse1`,
+                        "action": "Toggle pin",
+                        "showIfUnitSelected": false,
+                        "showIfHoveringOverAirbase": false,
+                        "showIfHoveringOverUnit": false
+                    },
+                    {
+                        "key": `Mouse1`,
+                        "action": "Toggle selection",
+                        "showIfUnitSelected": true,
+                        "showIfHoveringOverAirbase": false,
+                        "showIfHoveringOverUnit": true
+                    },
+                    {
+                        "key": `Mouse2`,
+                        "action": `Add waypoint`,
+                        "showIfHoveringOverAirbase": false,
+                        "showIfHoveringOverUnit": false,
+                        "showIfUnitSelected": true,
+                        "unitsMustBeControlled": true
+                    },
+                    {
+                        "key": `Mouse2`,
+                        "action": `Interact (airbase)`,
+                        "showIfHoveringOverAirbase": true,
+                        "showIfUnitSelected": true,
+                        "unitsMustBeControlled": true
+                    },
+                    {
+                        "key": `Mouse2`,
+                        "action": `Interact (unit)`,
+                        "showIfHoveringOverAirbase": false,
+                        "showIfHoveringOverUnit": true,
+                        "showIfUnitSelected": true,
+                        "unitsMustBeControlled": true
+                    },
+                    {
+                        "key": `Shift`,
+                        "action": "<em>  in formation...</em>",
+                        "showIfUnitSelected": true,
+                        "minSelectedUnits": 2
+                    },
+                    {
+                        "key": `[Num 1-9]`,
+                        "action": "Set hotgroup",
+                        "showIfUnitSelected": true
+                    }
+                ]
+            },
+            {
+                "keys": ["ShiftLeft"],
+                "tips": [
+                    {
+                        "key": `Mouse1+drag`,
+                        "action": "Box select",
+                        "showIfUnitSelected": false
+                    },
+                    {
+                        "key": `Mouse2`,
+                        "action": "Set first formation waypoint",
+                        "showIfUnitSelected": true,
+                        "minSelectedUnits": 2
+                    },
+                    {
+                        "key": "CTRL",
+                        "action": "<em>  ... more</em>",
+                        "minSelectedUnits": 2,
+                        "showIfUnitSelected": true,
+                        "showIfHoveringOverAirbase": false,
+                        "unitsMustBeControlled": true
+                    }
+                ]
+            },
+            {
+                "keys": ["ControlLeft", "ShiftLeft"],
+                "tips": [
+                    {
+                        "key": `Mouse2`,
+                        "action": "Add formation waypoint",
+                        "showIfUnitSelected": true,
+                        "minSelectedUnits": 2,
+                        "unitsMustBeControlled": true
+                    }
+                ]
+            }
+        ];
+
+        const currentCombo: any = combos.find((combo: any) => this.#shortcutManager.keyComboMatches(combo.keys)) || combos[0];
+
+        const element = this.getElement();
+
+        element.innerHTML = "";
+
+        let numSelectedUnits = 0;
+        let numSelectedControlledUnits = 0;
+        let unitSelectionContainsControlled = false;
+
+        if (this.#app.getUnitsManager()) {
+            let selectedUnits = Object.values(this.#app.getUnitsManager().getSelectedUnits());
+            numSelectedUnits                = selectedUnits.length;
+            numSelectedControlledUnits      = selectedUnits.filter((unit: any) => unit.getControlled()).length;
+            unitSelectionContainsControlled = numSelectedControlledUnits > 0;
+        }
+
+        const tipsIncludesActiveMouseover = ( currentCombo.tips.some( ( tip:any ) => {
+            if ( !tip.mouseoverSelector ) {
+                return false;
+            }
+
+            if ( this.#mouseoverElement instanceof HTMLElement === false ) {
+                return false;
+            }
+
+            if ( !this.#mouseoverElement.matches( tip.mouseoverSelector ) ) {
+                return false;
+            }
+
+            return true;
+        }));
+
+        currentCombo.tips.filter((tip: any) => {
+            if (numSelectedUnits > 0) {
+                if (tip.showIfUnitSelected === false) {
+                    return false;
+                }
+
+                if (tip.unitsMustBeControlled === true && unitSelectionContainsControlled === false) {
+                    return false;
+                }
+
+                if ( typeof tip.minSelectedUnits === "number" && numSelectedControlledUnits < tip.minSelectedUnits ) {
+                    return false;
+                }
+            }
+
+            if (numSelectedUnits === 0 && tip.showIfUnitSelected === true) {
+                return false;
+            }
+
+            if (typeof tip.showIfHoveringOverAirbase === "boolean") {
+                if (tip.showIfHoveringOverAirbase !== this.#cursorIsHoveringOverAirbase) {
+                    return false;
+                }
+            }
+
+            if (typeof tip.showIfHoveringOverUnit === "boolean") {
+                if (tip.showIfHoveringOverUnit !== this.#cursorIsHoveringOverUnit) {
+                    return false;
+                }
+            }
+
+            if ( tipsIncludesActiveMouseover && ( typeof tip.mouseoverSelector !== "string" || !this.#mouseoverElement.matches( tip.mouseoverSelector ) ) ) {
+                return false;
+            }
+
+            if ( !tipsIncludesActiveMouseover && typeof tip.mouseoverSelector === "string" ) {
+                return false;
+            }
+
+            element.innerHTML += `<div><span class="key">${tip.key}</span><span class="action">${tip.action}</span></div>`;
+
+        });
+    }
+}

client/plugins/controltips/src/index.ts

@@ -0,0 +1,5 @@
+import { ControlTipsPlugin } from "./controltipsplugin";
+
+globalThis.getOlympusPlugin = () => {
+    return new ControlTipsPlugin();
+}

client/plugins/controltips/style.css

@@ -0,0 +1,33 @@
+#control-tips-panel {
+    align-self: center;
+    display: flex;
+    flex-flow: column wrap;
+    font-size: 13px;
+    justify-self: flex-end;
+    position: absolute;
+    right: 10px;
+    row-gap: 20px;
+    text-align: right;
+    z-index: 999;
+}
+
+#control-tips-panel>* {
+    align-items: center;
+    align-self: end;
+    background-color: var(--background-steel);
+    border-radius: var(--border-radius-md);
+    color: white;
+    column-gap: 8px;
+    display: flex;
+    justify-items: right;
+    opacity: .9;
+    padding: 5px;
+    width: fit-content;
+}
+
+#control-tips-panel>*>.key {
+    background-color: var(--background-grey);
+    border-radius: var(--border-radius-sm);
+    color: white;
+    padding: 1px 4px;
+}

client/plugins/controltips/tsconfig.json

@@ -0,0 +1,104 @@
+{
+    "compilerOptions": {
+      /* Visit https://aka.ms/tsconfig to read more about this file */
+      /* Projects */
+      // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
+      // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
+      // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
+      // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
+      // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
+      // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
+      /* Language and Environment */
+      "target": "ES2017", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+      // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+      // "jsx": "preserve",                                /* Specify what JSX code is generated. */
+      // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
+      // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
+      // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
+      // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
+      // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
+      // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
+      // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
+      // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
+      // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
+      /* Modules */
+      "module": "commonjs", /* Specify what module code is generated. */
+      "rootDirs": ["./src",  "../../@types"], /* Specify the root folder within your source files. */
+      // "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
+      // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+      // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+      // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
+      "typeRoots": [
+        "./node_modules/@types",
+        "../../@types"
+      ], /* Specify multiple folders that act like './node_modules/@types'. */
+      "types": [
+        "olympus"
+      ], /* Specify type package names to be included without being referenced in a source file. */
+      // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
+      // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
+      // "resolveJsonModule": true,                        /* Enable importing .json files. */
+      // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
+      /* JavaScript Support */
+       "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
+      // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
+      // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
+      /* Emit */
+      // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+      // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
+      // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
+      // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
+      // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
+      // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+      // "removeComments": true,                           /* Disable emitting comments. */
+      // "noEmit": true,                                   /* Disable emitting files from a compilation. */
+      // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
+      // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
+      // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
+      // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
+      // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
+      // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
+      // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
+      // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
+      // "newLine": "crlf",                                /* Set the newline character for emitting files. */
+      // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
+      // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
+      // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
+      // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
+      // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
+      // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
+      /* Interop Constraints */
+      // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
+      // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
+      "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+      // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+      "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
+      /* Type Checking */
+      "strict": true, /* Enable all strict type-checking options. */
+      // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
+      // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
+      // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
+      // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
+      // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
+      // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
+      // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
+      // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
+      // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
+      // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
+      // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
+      // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
+      // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
+      // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
+      // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
+      // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
+      // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
+      // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
+      /* Completeness */
+      // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+      "skipLibCheck": true /* Skip type checking all .d.ts files. */
+    },
+    "include": [ 
+        "src/*.ts",
+        "../../@types/olympus/*.d.ts"
+    ]
+}

client/plugins/databasemanager/.vscode/launch.json

@@ -0,0 +1,20 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Attach to Chrome",
+            "port": 9222,
+            "urlFilter": "http://localhost:3000/*",
+            "request": "attach",
+            "type": "chrome",
+            "webRoot": "${workspaceFolder}../../public/",
+            "sourceMapPathOverrides": {
+                "src/*": "src/*"
+            },
+            "preLaunchTask": "start"
+        }
+    ]
+}

client/plugins/databasemanager/.vscode/tasks.json

@@ -0,0 +1,13 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "start",
+            "type": "shell",
+            "command": "npm run start",
+            "isBackground": true
+        }
+    ]
+}

client/plugins/databasemanager/copy.bat

@@ -0,0 +1,5 @@
+mkdir .\\..\\..\\public\\plugins\\databasemanager
+
+copy .\\index.js .\\..\\..\\public\\plugins\\databasemanager\\index.js
+copy .\\plugin.json .\\..\\..\\public\\plugins\\databasemanager\\plugin.json
+copy .\\style.css .\\..\\..\\public\\plugins\\databasemanager\\style.css

client/plugins/databasemanager/package-lock.json

@@ -0,0 +1,13 @@
+{
+  "name": "DatabaseManagerPlugin",
+  "version": "v0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "DatabaseManagerPlugin",
+      "version": "v0.0.1",
+      "devDependencies": {}
+    }
+  }
+}

client/plugins/databasemanager/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "DatabaseManagerPlugin",
+  "version": "v0.0.1",
+  "private": true,
+  "scripts": {
+    "build": "browserify ./src/index.ts -p [ tsify --noImplicitAny] > index.js && copy.bat",
+    "start": "npm run copy & concurrently --kill-others \"npm run watch\"",
+    "copy": "copy.bat",
+    "watch": "watchify ./src/index.ts --debug -o ../../public/plugins/databasemanager/index.js -t [ babelify --global true --presets [ @babel/preset-env ] --extensions '.js'] -p [ tsify --noImplicitAny ]"
+  },
+  "dependencies": {},
+  "devDependencies": {}
+}

client/plugins/databasemanager/plugin.json

@@ -0,0 +1,6 @@
+{
+    "name": "Control Tip Plugin",
+    "version": "0.0.1",
+    "description": "This plugin shows useful control tips on the right side of the screen. The tips change dynamically depending on what the user does",
+    "author": "Peekaboo"
+}

client/plugins/databasemanager/src/airuniteditor.ts

@@ -0,0 +1,110 @@
+import { LoadoutBlueprint, UnitBlueprint } from "interfaces";
+import { UnitEditor } from "./uniteditor";
+import { LoadoutEditor } from "./loadouteditor";
+import { addCheckboxInput, addDropdownInput, addLoadoutsScroll, addNewElementInput, addStringInput } from "./utils";
+
+/** Database editor for Air Units, both Aircraft and Helicopter since they are identical in terms of datbase entries.
+ * 
+ */
+export class AirUnitEditor extends UnitEditor {
+
+    #loadoutEditor: LoadoutEditor | null = null;
+
+    constructor(contentDiv1: HTMLElement, contentDiv2: HTMLElement, contentDiv3: HTMLElement) {
+        super(contentDiv1, contentDiv2, contentDiv3);
+
+        /* The loadout editor allows to edit the loadout (who could have thought eh?) */
+        this.#loadoutEditor = new LoadoutEditor(this.contentDiv3);
+
+        /* Refresh the loadout editor if needed */
+        this.contentDiv3.addEventListener("refresh", () => {
+            if (this.visible)
+                this.#loadoutEditor?.show();
+        });
+    }
+
+    /** Sets a unit blueprint as the currently active one
+     * 
+     * @param blueprint The blueprint to edit
+     */
+    setBlueprint(blueprint: UnitBlueprint) {
+        this.blueprint = blueprint;
+
+        if (this.blueprint !== null) {
+            this.contentDiv2.replaceChildren();
+
+            var title = document.createElement("label");
+            title.innerText = "Unit properties";
+            this.contentDiv2.appendChild(title);
+
+            addStringInput(this.contentDiv2, "Name", blueprint.name, "text", (value: string) => { blueprint.name = value; }, true);
+            addStringInput(this.contentDiv2, "Label", blueprint.label, "text", (value: string) => { blueprint.label = value; });
+            addStringInput(this.contentDiv2, "Short label", blueprint.shortLabel, "text", (value: string) => { blueprint.shortLabel = value; });
+            addDropdownInput(this.contentDiv2, "Coalition", blueprint.coalition, ["", "blue", "red"], (value: string) => {blueprint.coalition = value; });
+            addDropdownInput(this.contentDiv2, "Era", blueprint.era, ["WW2", "Early Cold War", "Mid Cold War", "Late Cold War", "Modern"], (value: string) => {blueprint.era = value; });
+            addStringInput(this.contentDiv2, "Filename", blueprint.filename ?? "", "text", (value: string) => { blueprint.filename = value; });
+            addStringInput(this.contentDiv2, "Cost", String(blueprint.cost) ?? "", "number", (value: string) => { blueprint.cost = parseFloat(value); });
+            addCheckboxInput(this.contentDiv2, "Can target point", blueprint.canTargetPoint ?? false, (value: boolean) => {blueprint.canTargetPoint = value;})
+            addStringInput(this.contentDiv2, "Description", blueprint.description ?? "", "text", (value: string) => {blueprint.description = value; });
+            addStringInput(this.contentDiv2, "Abilities", blueprint.abilities ?? "", "text", (value: string) => {blueprint.abilities = value; });
+
+            /* Add a scrollable list of loadouts that the user can edit */
+            var title = document.createElement("label");
+            title.innerText = "Loadouts";
+            this.contentDiv2.appendChild(title);
+            addLoadoutsScroll(this.contentDiv2, blueprint.loadouts ?? [], (loadout: LoadoutBlueprint) => {
+                this.#loadoutEditor?.setLoadout(loadout);
+                this.#loadoutEditor?.show();
+            });
+            addNewElementInput(this.contentDiv2, (ev: MouseEvent, input: HTMLInputElement) => { this.addLoadout(input.value); });
+
+            this.#loadoutEditor?.hide();
+        }
+    }
+
+    /** Add a new empty blueprint
+     * 
+     * @param key Blueprint key
+     */
+    addBlueprint(key: string) {
+        if (this.database != null) {
+            this.database.blueprints[key] = {
+                name: key,
+                coalition: "",
+                label: "",
+                shortLabel: "",
+                era: "",
+                loadouts: [],
+                enabled: true
+            }
+            this.show();
+            this.setBlueprint(this.database.blueprints[key]);
+        }
+    }
+
+    /** Add a new empty loadout to the currently active blueprint
+     * 
+     * @param loadoutName The name of the new loadout
+     */
+    addLoadout(loadoutName: string) {
+        if (loadoutName && this.blueprint !== null) {
+            this.blueprint.loadouts?.push({
+                name: loadoutName,
+                code: "",
+                fuel: 1,
+                items: [],
+                roles: [],
+                enabled: true
+            })
+            this.setBlueprint(this.blueprint);
+        }
+    }
+
+    /** Hide the editor 
+     * 
+     */
+    hide() {
+        super.hide();
+        this.#loadoutEditor?.hide();
+    }
+}

client/plugins/databasemanager/src/databasemanagerplugin.ts

@@ -0,0 +1,412 @@
+import { OlympusPlugin, UnitBlueprint } from "interfaces";
+import { AirUnitEditor } from "./airuniteditor";
+import { OlympusApp } from "olympusapp";
+import { GroundUnitEditor } from "./grounduniteditor";
+import { PrimaryToolbar } from "toolbars/primarytoolbar";
+import { NavyUnitEditor } from "./navyuniteditor";
+
+/** Database Manager
+ * 
+ * This database provides a user interface to allow easier and convenient unit databases manipulation. It allows to edit all the fields of the units databases, save them
+ * on the server, and restore the defaults.
+ * 
+ * TODO:
+ * Add ability to manage liveries
+ * 
+ */
+ 
+export class DatabaseManagerPlugin implements OlympusPlugin {
+    #app: OlympusApp | null = null;
+
+    #element: HTMLElement;
+    #mainContentContainer: HTMLElement;
+    #contentDiv1: HTMLElement;
+    #contentDiv2: HTMLElement;
+    #contentDiv3: HTMLElement;
+
+    /* Upper tab buttons */
+    #button1: HTMLButtonElement;
+    #button2: HTMLButtonElement;
+    #button3: HTMLButtonElement;
+    #button4: HTMLButtonElement;
+
+    /* Lower operation buttons */
+    #button5: HTMLButtonElement;
+    #button6: HTMLButtonElement;
+    #button7: HTMLButtonElement;
+    #button8: HTMLButtonElement;
+    #button9: HTMLButtonElement;
+
+    /* Database editors */
+    #aircraftEditor: AirUnitEditor;
+    #helicopterEditor: AirUnitEditor;
+    #groundUnitEditor: GroundUnitEditor;
+    #navyUnitEditor: NavyUnitEditor;
+
+    constructor() {
+        /* Create main HTML element */
+        this.#element = document.createElement("div");
+        this.#element.id = "database-manager-panel";
+        this.#element.oncontextmenu = () => { return false; }
+        this.#element.classList.add("ol-dialog");
+        document.body.appendChild(this.#element);
+
+        /* Start hidden */
+        this.toggle(false);
+
+        /* Create the top tab buttons container and buttons */
+        let topButtonContainer = document.createElement("div");
+
+        this.#button1 = document.createElement("button");
+        this.#button1.classList.add("tab-button");
+        this.#button1.textContent = "Aircraft database";
+        this.#button1.onclick = () => { this.#hideAll(); this.#aircraftEditor.show(); this.#button1.classList.add("selected"); };
+        topButtonContainer.appendChild(this.#button1);
+
+        this.#button2 = document.createElement("button");
+        this.#button2.classList.add("tab-button");
+        this.#button2.textContent = "Helicopter database";
+        this.#button2.onclick = () => { this.#hideAll(); this.#helicopterEditor.show(); this.#button2.classList.add("selected"); };
+        topButtonContainer.appendChild(this.#button2);
+
+        this.#button3 = document.createElement("button");
+        this.#button3.classList.add("tab-button");
+        this.#button3.textContent = "Ground Unit database";
+        this.#button3.onclick = () => { this.#hideAll(); this.#groundUnitEditor.show(); this.#button3.classList.add("selected"); };
+        topButtonContainer.appendChild(this.#button3);
+
+        this.#button4 = document.createElement("button");
+        this.#button4.classList.add("tab-button");
+        this.#button4.textContent = "Navy Unit database";
+        this.#button4.onclick = () => { this.#hideAll(); this.#navyUnitEditor.show(); this.#button4.classList.add("selected"); };
+        topButtonContainer.appendChild(this.#button4);
+
+        this.#element.appendChild(topButtonContainer);
+
+        /* Create the container for the database editor elements  and the elements themselves */
+        this.#mainContentContainer = document.createElement("div");
+        this.#mainContentContainer.classList.add("dm-container");
+        this.#element.appendChild(this.#mainContentContainer)
+
+        this.#contentDiv1 = document.createElement("div");
+        this.#contentDiv1.classList.add("dm-content-container");
+        this.#mainContentContainer.appendChild(this.#contentDiv1);
+
+        this.#contentDiv2 = document.createElement("div");
+        this.#contentDiv2.classList.add("dm-content-container");
+        this.#mainContentContainer.appendChild(this.#contentDiv2);
+
+        this.#contentDiv3 = document.createElement("div");
+        this.#contentDiv3.classList.add("dm-content-container");
+        this.#mainContentContainer.appendChild(this.#contentDiv3);
+
+        /* Create the database editors, which use the three divs created before */
+        this.#aircraftEditor = new AirUnitEditor(this.#contentDiv1, this.#contentDiv2, this.#contentDiv3);
+        this.#helicopterEditor = new AirUnitEditor(this.#contentDiv1, this.#contentDiv2, this.#contentDiv3);
+        this.#groundUnitEditor = new GroundUnitEditor(this.#contentDiv1, this.#contentDiv2, this.#contentDiv3);
+        this.#navyUnitEditor = new NavyUnitEditor(this.#contentDiv1, this.#contentDiv2, this.#contentDiv3);
+
+        /* Create the bottom buttons container. These buttons allow to save, restore, reset, and discard the changes */
+        let bottomButtonContainer = document.createElement("div");
+
+        this.#button5 = document.createElement("button");
+        this.#button5.textContent = "Save";
+        this.#button5.title = "Save the changes on the server"
+        this.#button5.onclick = () => { this.#saveDatabases();};
+        bottomButtonContainer.appendChild(this.#button5);
+
+        this.#button6 = document.createElement("button");
+        this.#button6.textContent = "Discard";
+        this.#button6.title = "Discard all changes and reload the database from the server";
+        this.#button6.onclick = () => { this.#loadDatabases(); };
+        bottomButtonContainer.appendChild(this.#button6);
+
+        this.#button7 = document.createElement("button");
+        this.#button7.textContent = "Reset defaults";
+        this.#button7.onclick = () => { this.#resetToDefaultDatabases(); };
+        this.#button7.title = "Reset the databases to the default values";
+        bottomButtonContainer.appendChild(this.#button7);
+
+        this.#button8 = document.createElement("button");
+        this.#button8.textContent = "Restore previous";
+        this.#button8.onclick = () => { this.#restoreToPreviousDatabases(); };
+        this.#button8.title = "Restore the previously saved databases. Use this if you saved a database by mistake.";
+        bottomButtonContainer.appendChild(this.#button8);
+
+        this.#button9 = document.createElement("button");
+        this.#button9.textContent = "Close";
+        this.#button9.title = "Close the Database Manager"
+        this.#button9.onclick = () => { this.toggle(false); };
+        bottomButtonContainer.appendChild(this.#button9);
+
+        this.#element.appendChild(bottomButtonContainer);
+    }
+
+    /**
+     * 
+     * @returns The name of the plugin
+     */
+    getName() {
+        return "Database Control Plugin"
+    }
+
+    /** Initialize the plugin
+     * 
+     * @param app The OlympusApp singleton
+     * @returns True if successfull
+     */
+    initialize(app: any) {
+        this.#app = app;
+    
+        /* Load the databases and initialize the editors */
+        this.#loadDatabases();
+
+        /* Add a button to the main Olympus App to allow the users to open the dialog */
+        var mainButtonDiv = document.createElement("div");
+        var mainButton = document.createElement("button");
+        mainButton.textContent = "Database manager";
+        mainButtonDiv.appendChild(mainButton);
+        var toolbar: PrimaryToolbar = this.#app?.getToolbarsManager().get("primaryToolbar") as PrimaryToolbar;
+        var elements = toolbar.getMainDropdown().getOptionElements();
+        var arr = Array.prototype.slice.call(elements);
+        arr.splice(arr.length - 1, 0, mainButtonDiv);
+        toolbar.getMainDropdown().setOptionsElements(arr);
+        mainButton.onclick = () => {
+            toolbar.getMainDropdown().close();
+            if (this.#app?.getMissionManager().getCommandModeOptions().commandMode === "Game master") 
+                this.toggle();
+        }
+    
+        return true;
+    }
+
+    /**
+     * 
+     * @returns The main container element
+     */
+    getElement() {
+        return this.#element;
+    }
+
+    /** Toggles the visibility of the dialog
+     * 
+     * @param bool Force a specific visibility state
+     */
+    toggle(bool?: boolean) {
+        if (bool)
+            this.getElement().classList.toggle("hide", !bool);
+        else
+            this.getElement().classList.toggle("hide");
+    }
+
+    /** Hide all the editors
+     * 
+     */
+    #hideAll() {
+        this.#aircraftEditor.hide();
+        this.#helicopterEditor.hide();
+        this.#groundUnitEditor.hide();
+        this.#navyUnitEditor.hide();
+
+        this.#button1.classList.remove("selected");
+        this.#button2.classList.remove("selected");
+        this.#button3.classList.remove("selected");
+        this.#button4.classList.remove("selected");
+    }
+
+    /** Load the databases from the app to the editor. Note, this does not reload the databases from the server to the app
+     * 
+     */
+    #loadDatabases() {
+        var aircraftDatabase = this.#app?.getAircraftDatabase();
+        if (aircraftDatabase != null)
+            this.#aircraftEditor.setDatabase(aircraftDatabase);
+
+        var helicopterDatabase = this.#app?.getHelicopterDatabase();
+        if (helicopterDatabase != null)
+            this.#helicopterEditor.setDatabase(helicopterDatabase);
+
+        var groundUnitDatabase = this.#app?.getGroundUnitDatabase();
+        if (groundUnitDatabase != null)
+            this.#groundUnitEditor.setDatabase(groundUnitDatabase);
+
+        var navyUnitDatabase = this.#app?.getNavyUnitDatabase();
+        if (navyUnitDatabase != null)
+            this.#navyUnitEditor.setDatabase(navyUnitDatabase);
+
+        this.#hideAll();
+        this.#aircraftEditor.show();
+        this.#button1.classList.add("selected");
+    }
+
+    /** Save the databases on the server and reloads it to apply the changes
+     * 
+     */
+    #saveDatabases() {
+        var aircraftDatabase = this.#aircraftEditor.getDatabase();
+        if (aircraftDatabase){
+            this.#uploadDatabase(aircraftDatabase, "aircraftdatabase", "Aircraft database", () => {
+                var helicopterDatabase = this.#helicopterEditor.getDatabase();
+                if (helicopterDatabase) {
+                    this.#uploadDatabase(helicopterDatabase, "helicopterDatabase", "Helicopter database", () => {
+                        var groundUnitDatabase = this.#groundUnitEditor.getDatabase();
+                        if (groundUnitDatabase) {
+                            this.#uploadDatabase(groundUnitDatabase, "groundUnitDatabase", "Ground Unit database", () => {
+                                var navyUnitDatabase = this.#navyUnitEditor.getDatabase();
+                                if (navyUnitDatabase) {
+                                    this.#uploadDatabase(navyUnitDatabase, "navyUnitDatabase", "Navy Unit database", () => {
+                                        this.#app?.getAircraftDatabase().load(() => {});
+                                        this.#app?.getHelicopterDatabase().load(() => {});
+                                        this.#app?.getGroundUnitDatabase().load(() => {});
+                                        this.#app?.getNavyUnitDatabase().load(() => {});
+
+                                        this.#app?.getServerManager().reloadDatabases(() => {
+                                            this.#app?.getPopupsManager().get("infoPopup")?.setText("Olympus core databases reloaded");
+                                        })
+                                    });
+                                }
+                            });
+                        }
+                    });
+                }
+            });
+        }
+    }
+
+    /** Resets the databases to the default values 
+     * 
+     */
+    #resetToDefaultDatabases() {
+        this.#resetToDefaultDatabase("aircraftdatabase", "Aircraft database", () => {
+            this.#app?.getAircraftDatabase().load(() => {
+                this.#resetToDefaultDatabase("helicopterdatabase", "Helicopter database", () => {
+                    this.#app?.getHelicopterDatabase().load(() => {
+                        this.#resetToDefaultDatabase("groundunitdatabase", "Ground Unit database", () => {
+                            this.#app?.getGroundUnitDatabase().load(() => {
+                                this.#resetToDefaultDatabase("navyunitdatabase", "Navy Unit database", () => {
+                                    this.#app?.getNavyUnitDatabase().load(() => {
+                                        this.#loadDatabases();
+
+                                        this.#app?.getServerManager().reloadDatabases(() => {
+                                            this.#app?.getPopupsManager().get("infoPopup")?.setText("Olympus core databases reloaded");
+                                        })
+
+                                        this.#hideAll();
+                                        this.#aircraftEditor.show();
+                                        this.#button1.classList.add("selected");
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    }
+
+    /** Restores the databases to the previous saved values. This is useful if you saved the databases by mistake and want to undo the error.
+     * 
+     */
+    #restoreToPreviousDatabases() {
+        this.#restoreToPreviousDatabase("aircraftdatabase", "Aircraft database", () => {
+            this.#app?.getAircraftDatabase().load(() => {
+                this.#restoreToPreviousDatabase("helicopterdatabase", "Helicopter database", () => {
+                    this.#app?.getHelicopterDatabase().load(() => {
+                        this.#restoreToPreviousDatabase("groundunitdatabase", "Ground Unit database", () => {
+                            this.#app?.getGroundUnitDatabase().load(() => {
+                                this.#restoreToPreviousDatabase("navyunitdatabase", "Navy Unit database", () => {
+                                    this.#app?.getNavyUnitDatabase().load(() => {
+                                        this.#loadDatabases();
+
+                                        this.#app?.getServerManager().reloadDatabases(() => {
+                                            this.#app?.getPopupsManager().get("infoPopup")?.setText("Olympus core databases reloaded");
+                                        })
+
+                                        this.#hideAll();
+                                        this.#aircraftEditor.show();
+                                        this.#button1.classList.add("selected");
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    }
+
+    /** Upload a single database to the server
+     * 
+     * @param database The database 
+     * @param name The name of the database as it will be saved on the server
+     * @param label A label used in the info popup
+     */
+    #uploadDatabase(database: { blueprints: { [key: string]: UnitBlueprint } }, name: string, label: string, callback: CallableFunction) {
+        var xmlHttp = new XMLHttpRequest();
+        xmlHttp.open("PUT", "/api/databases/save/units/" + name);
+        xmlHttp.setRequestHeader("Content-Type", "application/json");
+        xmlHttp.onload = (res: any) => {
+            if (xmlHttp.status == 200) {
+                this.#app?.getPopupsManager().get("infoPopup")?.setText(label + " saved successfully");
+                callback();
+            }
+            else {
+                this.#app?.getPopupsManager().get("infoPopup")?.setText("An error has occurred while saving the " + label);
+            }
+        };
+        xmlHttp.onerror = (res: any) => {
+            this.#app?.getPopupsManager().get("infoPopup")?.setText("An error has occurred while saving the " + label);
+        }
+        xmlHttp.send(JSON.stringify(database));
+    }
+
+    /** Resets a database to its default values on the server. NOTE: this only resets the database on the server, it will not reload it in the app.
+     * 
+     * @param name The name of the database as it is saved on the server
+     * @param label A label used in the info popup
+     * @param callback Called when the operation is completed
+     */
+    #resetToDefaultDatabase(name: string, label: string, callback: CallableFunction) {
+        var xmlHttp = new XMLHttpRequest();
+        xmlHttp.open("PUT", "/api/databases/reset/units/" + name);
+        xmlHttp.setRequestHeader("Content-Type", "application/json");
+        xmlHttp.onload = (res: any) => {
+            if (xmlHttp.status == 200) {
+                this.#app?.getPopupsManager().get("infoPopup")?.setText(label + " reset successfully");
+                callback();
+            }
+            else {
+                this.#app?.getPopupsManager().get("infoPopup")?.setText("An error has occurred while resetting the " + label);
+            }
+        };
+        xmlHttp.onerror = (res: any) => {
+            this.#app?.getPopupsManager().get("infoPopup")?.setText("An error has occurred while resetting the " + label)
+        }
+        xmlHttp.send("");
+    }
+
+    /** Restores a database to its previously saved values on the server. NOTE: this only restores the database on the server, it will not reload it in the app.
+     * 
+     * @param name The name of the database as it is saved on the server
+     * @param label A label used in the info popup
+     * @param callback Called when the operation is completed
+     */
+    #restoreToPreviousDatabase(name: string, label: string, callback: CallableFunction) {
+        var xmlHttp = new XMLHttpRequest();
+        xmlHttp.open("PUT", "/api/databases/restore/units/" + name);
+        xmlHttp.setRequestHeader("Content-Type", "application/json");
+        xmlHttp.onload = (res: any) => {
+            if (xmlHttp.status == 200) {
+                this.#app?.getPopupsManager().get("infoPopup")?.setText(label + " restored successfully");
+                callback();
+            }
+            else {
+                this.#app?.getPopupsManager().get("infoPopup")?.setText("An error has occurred while restoring the " + label);
+            }
+        };
+        xmlHttp.onerror = (res: any) => {
+            this.#app?.getPopupsManager().get("infoPopup")?.setText("An error has occurred while restoring the " + label)
+        }
+        xmlHttp.send("");
+    }
+}

client/plugins/databasemanager/src/grounduniteditor.ts

@@ -0,0 +1,68 @@
+import { UnitBlueprint } from "interfaces";
+import { UnitEditor } from "./uniteditor";
+import { addCheckboxInput, addDropdownInput, addStringInput } from "./utils";
+
+/** Database editor for ground units
+ * 
+ */
+export class GroundUnitEditor extends UnitEditor {
+    #blueprint: UnitBlueprint | null = null;
+
+    constructor(contentDiv1: HTMLElement, contentDiv2: HTMLElement, contentDiv3: HTMLElement) {
+        super(contentDiv1, contentDiv2, contentDiv3);
+    }
+
+    /** Sets a unit blueprint as the currently active one
+     * 
+     * @param blueprint The blueprint to edit
+     */
+    setBlueprint(blueprint: UnitBlueprint) {
+        this.#blueprint = blueprint;
+
+        if (this.#blueprint !== null) {
+            this.contentDiv2.replaceChildren();
+
+            var title = document.createElement("label");
+            title.innerText = "Unit properties";
+            this.contentDiv2.appendChild(title);
+            
+            addStringInput(this.contentDiv2, "Name", blueprint.name, "text", (value: string) => {blueprint.name = value; }, true);
+            addStringInput(this.contentDiv2, "Label", blueprint.label, "text", (value: string) => {blueprint.label = value; });
+            addStringInput(this.contentDiv2, "Short label", blueprint.shortLabel, "text", (value: string) => {blueprint.shortLabel = value; });
+            addStringInput(this.contentDiv2, "Type", blueprint.type?? "", "text", (value: string) => {blueprint.type = value; });
+            addDropdownInput(this.contentDiv2, "Coalition", blueprint.coalition, ["", "blue", "red"], (value: string) => {blueprint.coalition = value; });
+            addDropdownInput(this.contentDiv2, "Era", blueprint.era, ["WW2", "Early Cold War", "Mid Cold War", "Late Cold War", "Modern"], (value: string) => {blueprint.era = value; });
+            //addStringInput(this.contentDiv2, "Filename", blueprint.filename?? "", "text", (value: string) => {blueprint.filename = value; });
+            addStringInput(this.contentDiv2, "Cost", String(blueprint.cost)?? "", "number", (value: string) => {blueprint.cost = parseFloat(value); });
+            addStringInput(this.contentDiv2, "Acquisition range [m]", String(blueprint.acquisitionRange)?? "", "number", (value: string) => {blueprint.acquisitionRange = parseFloat(value); });
+            addStringInput(this.contentDiv2, "Engagement range [m]", String(blueprint.engagementRange)?? "", "number", (value: string) => {blueprint.engagementRange = parseFloat(value); });
+            addStringInput(this.contentDiv2, "Barrel height [m]", String(blueprint.barrelHeight)?? "", "number", (value: string) => {blueprint.barrelHeight = parseFloat(value); });
+            addStringInput(this.contentDiv2, "Muzzle velocity [m/s]", String(blueprint.muzzleVelocity)?? "", "number", (value: string) => {blueprint.muzzleVelocity = parseFloat(value); });
+            addStringInput(this.contentDiv2, "Aim time [s]", String(blueprint.aimTime)?? "", "number", (value: string) => {blueprint.aimTime = parseFloat(value); });
+            addStringInput(this.contentDiv2, "Burst quantity", String(blueprint.shotsToFire)?? "", "number", (value: string) => {blueprint.shotsToFire = Math.round(parseFloat(value)); });
+            addCheckboxInput(this.contentDiv2, "Can target point", blueprint.canTargetPoint ?? false, (value: boolean) => {blueprint.canTargetPoint = value;})
+            addCheckboxInput(this.contentDiv2, "Can rearm", blueprint.canRearm ?? false, (value: boolean) => {blueprint.canRearm = value;})
+            addStringInput(this.contentDiv2, "Description", blueprint.description ?? "", "text", (value: string) => {blueprint.description = value; });
+            addStringInput(this.contentDiv2, "Abilities", blueprint.abilities ?? "", "text", (value: string) => {blueprint.abilities = value; });
+        }
+    }
+
+    /** Add a new empty blueprint
+     * 
+     * @param key Blueprint key
+     */
+    addBlueprint(key: string) {
+        if (this.database != null) {
+            this.database.blueprints[key] = {
+                name: key,
+                coalition: "",
+                label: "",
+                shortLabel: "",
+                era: "",
+                enabled: true
+            }
+            this.show();
+            this.setBlueprint(this.database.blueprints[key]);
+        }
+    }
+}

client/plugins/databasemanager/src/index.ts

@@ -0,0 +1,5 @@
+import { DatabaseManagerPlugin } from "./databasemanagerplugin";
+
+globalThis.getOlympusPlugin = () => {
+    return new DatabaseManagerPlugin();
+}

client/plugins/databasemanager/src/loadouteditor.ts

@@ -0,0 +1,55 @@
+import { LoadoutBlueprint } from "interfaces";
+import { addLoadoutItemsEditor, addStringInput, arrayToString, stringToArray } from "./utils";
+
+/** The LoadoutEditor allows the user to edit a loadout
+ * 
+ */
+export class LoadoutEditor {
+    #contentDiv: HTMLElement;
+    #loadout: LoadoutBlueprint | null = null;
+    #visible: boolean = false;
+
+    constructor(contentDiv: HTMLElement) {
+        this.#contentDiv = contentDiv;
+        this.#contentDiv.addEventListener("refresh", () => { 
+            if (this.#visible)
+                this.show(); 
+        })
+    }
+
+    /** Set the loadout to edit
+     * 
+     * @param loadout The loadout to edit
+     */
+    setLoadout(loadout: LoadoutBlueprint) {
+        this.#loadout = loadout;
+    }
+
+    /** Show the editor
+     * 
+     */
+    show() {
+        this.#visible = true;
+        this.#contentDiv.replaceChildren();
+
+        var title = document.createElement("label");
+        title.innerText = "Loadout properties";
+        this.#contentDiv.appendChild(title);
+
+        if (this.#loadout) {
+            var laodout = this.#loadout;
+            addStringInput(this.#contentDiv, "Name", laodout.name, "text", (value: string) => {laodout.name = value; this.#contentDiv.dispatchEvent(new Event("refresh"));});
+            addStringInput(this.#contentDiv, "Code", laodout.code, "text", (value: string) => {laodout.code = value; });
+            addStringInput(this.#contentDiv, "Roles", arrayToString(laodout.roles), "text", (value: string) => {laodout.roles = stringToArray(value);});
+            addLoadoutItemsEditor(this.#contentDiv, this.#loadout);
+        }
+    }
+
+    /** Hide the editor
+     * 
+     */
+    hide() {
+        this.#visible = false;
+        this.#contentDiv.replaceChildren();
+    }
+}

client/plugins/databasemanager/src/navyuniteditor.ts

@@ -0,0 +1,60 @@
+import { UnitBlueprint } from "interfaces";
+import { UnitEditor } from "./uniteditor";
+import { addDropdownInput, addStringInput } from "./utils";
+
+/** Database editor for navy units
+ * 
+ */
+export class NavyUnitEditor extends UnitEditor {
+    #blueprint: UnitBlueprint | null = null;
+
+    constructor(contentDiv1: HTMLElement, contentDiv2: HTMLElement, contentDiv3: HTMLElement) {
+        super(contentDiv1, contentDiv2, contentDiv3);
+    }
+
+    /** Sets a unit blueprint as the currently active one
+     * 
+     * @param blueprint The blueprint to edit
+     */
+    setBlueprint(blueprint: UnitBlueprint) {
+        this.#blueprint = blueprint;
+
+        if (this.#blueprint !== null) {
+            this.contentDiv2.replaceChildren();
+
+            var title = document.createElement("label");
+            title.innerText = "Unit properties";
+            this.contentDiv2.appendChild(title);
+            
+            addStringInput(this.contentDiv2, "Name", blueprint.name, "text", (value: string) => {blueprint.name = value; }, true);
+            addStringInput(this.contentDiv2, "Label", blueprint.label, "text", (value: string) => {blueprint.label = value; });
+            addStringInput(this.contentDiv2, "Short label", blueprint.shortLabel, "text", (value: string) => {blueprint.shortLabel = value; });
+            addStringInput(this.contentDiv2, "Type", blueprint.type?? "", "text", (value: string) => {blueprint.type = value; });
+            addDropdownInput(this.contentDiv2, "Coalition", blueprint.coalition, ["", "blue", "red"], (value: string) => {blueprint.coalition = value; });
+            addDropdownInput(this.contentDiv2, "Era", blueprint.era, ["WW2", "Early Cold War", "Mid Cold War", "Late Cold War", "Modern"], (value: string) => {blueprint.era = value; });
+            //addStringInput(this.contentDiv2, "Filename", blueprint.filename?? "", "text", (value: string) => {blueprint.filename = value; });
+            addStringInput(this.contentDiv2, "Cost", String(blueprint.cost)?? "", "number", (value: string) => {blueprint.cost = parseFloat(value); });
+            addStringInput(this.contentDiv2, "Barrel height [m]", String(blueprint.barrelHeight)?? "", "number", (value: string) => {blueprint.barrelHeight = parseFloat(value); });
+            addStringInput(this.contentDiv2, "Muzzle velocity [m/s]", String(blueprint.muzzleVelocity)?? "", "number", (value: string) => {blueprint.muzzleVelocity = parseFloat(value); });
+        }
+    }
+
+    /** Add a new empty blueprint
+     * 
+     * @param key Blueprint key
+     */
+    addBlueprint(key: string) {
+        if (this.database != null) {
+            this.database.blueprints[key] = {
+                name: key,
+                coalition: "",
+                label: "",
+                shortLabel: "",
+                era: "",
+                enabled: true
+            }
+            this.show();
+            this.setBlueprint(this.database.blueprints[key]);
+        }
+    }
+}

client/plugins/databasemanager/src/uniteditor.ts

@@ -0,0 +1,99 @@
+import { UnitBlueprint } from "interfaces";
+import { UnitDatabase } from "unit/databases/unitdatabase";
+import { addBlueprintsScroll, addNewElementInput } from "./utils";
+
+/** Base abstract class of Unit database editors
+ * 
+ */
+export abstract class UnitEditor {
+    blueprint: UnitBlueprint | null = null;
+    database: {blueprints: {[key: string]: UnitBlueprint}} | null = null;
+    visible: boolean = false;
+    contentDiv1: HTMLElement;
+    contentDiv2: HTMLElement;
+    contentDiv3: HTMLElement;
+
+    constructor(contentDiv1: HTMLElement, contentDiv2: HTMLElement, contentDiv3: HTMLElement) {
+        this.contentDiv1 = contentDiv1;
+        this.contentDiv2 = contentDiv2;
+        this.contentDiv3 = contentDiv3;
+
+        /* Refresh the list of units if it changes */
+        this.contentDiv1.addEventListener("refresh", () => { 
+            if (this.visible)
+                this.show(); 
+        })
+
+        /* If the unit properties or loadout are edited, reload the editor */
+        this.contentDiv2.addEventListener("refresh", () => { 
+            if (this.visible) {
+                if (this.blueprint !== null)
+                    this.setBlueprint(this.blueprint);
+            }
+        });
+        
+        this.contentDiv3.addEventListener("refresh", () => { 
+            if (this.visible) {
+                if (this.blueprint !== null)
+                    this.setBlueprint(this.blueprint);
+            }
+        });
+    }
+
+    /**
+     * 
+     * @param database The database that the editor will operate on
+     */
+    setDatabase(database: UnitDatabase) {
+        this.database = JSON.parse(JSON.stringify({blueprints: database.getBlueprints(true)}));
+    }
+
+    /** Show the editor
+     * 
+     */
+    show() {
+        this.visible = true;
+        this.contentDiv1.replaceChildren();
+        this.contentDiv2.replaceChildren();
+        this.contentDiv3.replaceChildren();
+
+        /* Create the list of units. Each unit is clickable to activate the editor on it */
+        if (this.database != null) {
+            var title = document.createElement("label");
+            title.innerText = "Units list";
+            this.contentDiv1.appendChild(title);
+            
+            addBlueprintsScroll(this.contentDiv1, this.database, (key: string) => {
+                if (this.database != null) 
+                    this.setBlueprint(this.database.blueprints[key])
+            })
+
+            addNewElementInput(this.contentDiv1, (ev: MouseEvent, input: HTMLInputElement) => {
+                if (input.value != "")
+                    this.addBlueprint((input).value);
+            });
+        }
+    }
+
+    /** Hid the editor
+     * 
+     */
+    hide() {
+        this.visible = false;
+        this.contentDiv1.replaceChildren();
+        this.contentDiv2.replaceChildren();
+        this.contentDiv3.replaceChildren();
+    }
+
+    /** 
+     * 
+     * @returns The edited database
+     */
+    getDatabase() {
+        return this.database;
+    }
+
+    /* Abstract methods which will depend on the specific type of units */
+    abstract setBlueprint(blueprint: UnitBlueprint): void;
+    abstract addBlueprint(key: string): void;
+}

client/plugins/databasemanager/src/utils.ts

@@ -0,0 +1,287 @@
+import { LoadoutBlueprint, LoadoutItemBlueprint, UnitBlueprint } from "interfaces";
+
+/** This file contains a set of utility functions that are reused in the various editors and allows to declutter the classes
+ * 
+ */
+
+/** Add a string input in the form of String: [ value ]
+ * 
+ * @param div The HTMLElement that will contain the input
+ * @param key The key of the input, which will be used as label
+ * @param value The initial value of the input
+ * @param type The type of the input, e.g. "Text" or "Number" as per html standard
+ * @param callback Callback called when the user enters a new value
+ * @param disabled If true, the input will be disabled and read only
+ */
+export function addStringInput(div: HTMLElement, key: string, value: string, type: string, callback: CallableFunction, disabled?: boolean) {
+    var row = document.createElement("div");
+    var dt = document.createElement("dt");
+    var dd = document.createElement("dd");
+    dt.innerText = key;
+    var input = document.createElement("input");
+    input.value = value;
+    input.textContent = value;
+    input.type = type?? "text";
+    input.disabled = disabled?? false;
+    input.onchange = () => callback(input.value);
+    dd.appendChild(input);
+    row.appendChild(dt);
+    row.appendChild(dd);
+    row.classList.add("input-row");
+    div.appendChild(row);
+}
+
+/** Add a dropdown (select) input
+ * 
+ * @param div The HTMLElement that will contain the input
+ * @param key The key of the input, which will be used as label
+ * @param value The initial value of the input
+ * @param options The dropdown options
+ */
+export function addDropdownInput(div: HTMLElement, key: string, value: string, options: string[], callback: CallableFunction, disabled?: boolean) {
+    var row = document.createElement("div");
+    var dt = document.createElement("dt");
+    var dd = document.createElement("dd");
+    dt.innerText = key;
+    var select = document.createElement("select");
+    options.forEach((option: string) => {
+        var el = document.createElement("option");
+        el.value = option;
+        el.innerText = option;
+        select.appendChild(el);
+    });
+    select.value = value;
+    select.disabled = disabled?? false;
+    select.onchange = () => callback(select.value);
+    dd.appendChild(select);
+    row.appendChild(dt);
+    row.appendChild(dd);
+    row.classList.add("input-row");
+    div.appendChild(row);
+}
+
+/** Add a checkbox input in the form of String: [ value ]
+ * 
+ * @param div The HTMLElement that will contain the input
+ * @param key The key of the input, which will be used as label
+ * @param value The initial value of the input
+ * @param callback Callback called when the user enters a new value
+ * @param disabled If true, the input will be disabled and read only
+ */
+export function addCheckboxInput(div: HTMLElement, key: string, value: boolean, callback: CallableFunction, disabled?: boolean) {
+    var row = document.createElement("div");
+    var dt = document.createElement("dt");
+    var dd = document.createElement("dd");
+    dt.innerText = key;
+    var input = document.createElement("input");
+    input.checked = value;
+    input.type = "checkbox";
+    input.disabled = disabled?? false;
+    input.onchange = () => callback(input.checked);
+    dd.appendChild(input);
+    row.appendChild(dt);
+    row.appendChild(dd);
+    row.classList.add("input-row");
+    div.appendChild(row);
+}
+
+/** Create a loadout items editor. This editor allows to add or remove loadout items, as well as changing their name and quantity
+ * 
+ * @param div The HTMLElement that will contain the editor
+ * @param loadout The loadout to edit
+ */
+export function addLoadoutItemsEditor(div: HTMLElement, loadout: LoadoutBlueprint) {
+    var itemsEl = document.createElement("div");
+    itemsEl.classList.add("dm-scroll-container", "dm-items-container");
+
+    /* Create a row for each loadout item to allow and change the name and quantity of the item itself */
+    loadout.items.sort((a: LoadoutItemBlueprint, b: LoadoutItemBlueprint) => a.name.localeCompare(b.name, undefined, {sensitivity: 'base'}));
+    loadout.items.forEach((item: LoadoutItemBlueprint, index: number) => {
+        var rowDiv = document.createElement("div");
+
+        var nameLabel = document.createElement("label");
+        nameLabel.innerText = "Name"
+        rowDiv.appendChild(nameLabel);
+
+        var nameInput = document.createElement("input");
+        rowDiv.appendChild(nameInput);
+        nameInput.textContent = item.name;
+        nameInput.value = item.name
+        nameInput.onchange = () => { loadout.items[index].name = nameInput.value; }
+
+        var quantityLabel = document.createElement("label");
+        quantityLabel.innerText = "Quantity"
+        rowDiv.appendChild(quantityLabel);
+
+        var quantityInput = document.createElement("input");
+        rowDiv.appendChild(quantityInput);
+        quantityInput.textContent = String(item.quantity);
+        quantityInput.value = String(item.quantity);
+        quantityInput.type = "number";
+        quantityInput.step = "1";
+        quantityInput.onchange = () => { loadout.items[index].quantity = parseInt(quantityInput.value); }
+
+        /* This button allows to remove the item */
+        var button = document.createElement("button");
+        button.innerText = "X";
+        button.onclick = () => {
+            loadout.items.splice(index, 1);
+            div.dispatchEvent(new Event("refresh"));
+        }
+        rowDiv.appendChild(button);
+
+        itemsEl.appendChild(rowDiv);
+    })
+    div.appendChild(itemsEl);
+
+    /* Button to add a new item to the loadout */
+    var inputDiv = document.createElement("div");
+    inputDiv.classList.add("dm-new-item-input");
+    var button = document.createElement("button");
+    button.innerText = "Add";
+    inputDiv.appendChild(button);
+    div.appendChild(inputDiv);
+
+    button.addEventListener("click", (ev: MouseEvent) => {
+        loadout?.items.push({
+            name: "",
+            quantity: 1
+        })
+        div.dispatchEvent(new Event("refresh"));
+    });
+}
+
+/** Add a input and button to create a new element in a list. It uses a generic callback to actually add the element.
+ * 
+ * @param div The HTMLElement that will contain the input and button
+ * @param callback Callback called when the user clicks on "Add"
+ */
+export function addNewElementInput(div: HTMLElement, callback: CallableFunction) {
+    var inputDiv = document.createElement("div");
+    inputDiv.classList.add("dm-new-element-input");
+
+    var input = document.createElement("input");
+    inputDiv.appendChild(input);
+
+    var button = document.createElement("button");
+    button.innerText = "Add";
+    button.addEventListener("click", (ev: MouseEvent) => callback(ev, input));
+    inputDiv.appendChild(button);
+    div.appendChild(inputDiv);
+}
+
+/** Add a scrollable list of blueprints
+ * 
+ * @param div The HTMLElement that will contain the list
+ * @param database The database that will be used to fill the list of blueprints
+ * @param callback Callback called when the user clicks on one of the elements
+ */
+export function addBlueprintsScroll(div: HTMLElement, database: {blueprints: {[key: string]: UnitBlueprint}}, callback: CallableFunction) {
+    var scrollDiv = document.createElement("div");
+    scrollDiv.classList.add("dm-scroll-container");
+    if (database !== null) {
+        var blueprints: {[key: string]: UnitBlueprint} = database.blueprints;
+
+        for (let key of Object.keys(blueprints).sort((a, b) => a.localeCompare(b, undefined, {sensitivity: 'base'}))) {
+            var rowDiv = document.createElement("div");
+            scrollDiv.appendChild(rowDiv);
+
+            var text = document.createElement("label");
+            text.textContent = key;
+            text.onclick = () => callback(key);
+            rowDiv.appendChild(text);
+
+            let checkbox = document.createElement("input");
+            checkbox.type = "checkbox";
+            checkbox.checked = blueprints[key].enabled;
+            checkbox.onclick = () => {
+                console.log(checkbox.checked);
+                blueprints[key].enabled = checkbox.checked;
+            }
+            rowDiv.appendChild(checkbox);
+
+            /* This button allows to remove an element from the list. It requires a refresh. */
+            var button = document.createElement("button");
+            button.innerText = "X";
+            button.onclick = () => {
+                delete blueprints[key];
+                div.dispatchEvent(new Event("refresh"));
+            }
+            rowDiv.appendChild(button);
+        }      
+    }
+    div.appendChild(scrollDiv);
+}
+
+/** Add a scrollable list of loadouts
+ * 
+ * @param div The HTMLElement that will contain the list
+ * @param loadouts The loadouts that will be used to fill the list
+ * @param callback Callback called when the user clicks on one of the elements
+ */
+export function addLoadoutsScroll(div: HTMLElement, loadouts: LoadoutBlueprint[], callback: CallableFunction) {
+    var loadoutsEl = document.createElement("div");
+    loadoutsEl.classList.add("dm-scroll-container", "dm-loadout-container")
+    
+    loadouts.sort((a: LoadoutBlueprint, b: LoadoutBlueprint) => a.name.localeCompare(b.name, undefined, {sensitivity: 'base'}));
+    loadouts.forEach((loadout: LoadoutBlueprint, index: number) => {
+        var rowDiv = document.createElement("div");
+        loadoutsEl.appendChild(rowDiv);
+
+        var text = document.createElement("label");
+        text.textContent = loadout.name;
+        text.onclick = () => { callback(loadout) };
+        rowDiv.appendChild(text);
+
+        /* The "Empty loadout" can not be removed */
+        if (loadout.name !== "Empty loadout") {
+            let checkbox = document.createElement("input");
+            checkbox.type = "checkbox";
+            checkbox.checked = loadout.enabled;
+            checkbox.onclick = () => {
+                console.log(checkbox.checked);
+                loadout.enabled = checkbox.checked;
+            }
+            rowDiv.appendChild(checkbox);
+
+            /* This button allows to remove an element from the list. It requires a refresh. */
+            var button = document.createElement("button");
+            button.innerText = "X";
+            button.onclick = () => {
+                loadouts.splice(index, 1);
+                div.dispatchEvent(new Event("refresh"));
+            }
+            rowDiv.appendChild(button);
+        }
+    });
+
+    div.appendChild(loadoutsEl);
+}
+
+/** Converts an array of string into a single string like [val1, val2, val3]
+ * 
+ * @param array The input array of strings
+ * @returns The string
+ */
+export function arrayToString(array: string[]) {
+    var value = "[";
+    var firstRole = true;
+    array.forEach((role: string) => {
+        value += firstRole? "": ", ";
+        firstRole = false; 
+        value += role;
+    })
+    value += "]";
+    return value;
+}
+
+
+export function stringToArray(input: string) {
+    input = input.replace("[", "").replace("]", "");
+    var values = input.split(",");
+    var result: string[] = [];
+    values.forEach((value: string) => {
+        result.push(value.trim());
+    })
+    return result;
+}

client/plugins/databasemanager/style.css

@@ -0,0 +1,267 @@
+#database-manager-panel {
+    flex-direction: column;
+    display: flex;
+    width: 80%;
+    height: 80%;
+    padding: 10px;
+    border-radius: 5px;
+    background-color: var(--background-steel) !important;
+    z-index: 9999999;
+}
+
+@media (min-width: 1200px) {
+    .dm-container {
+      flex-direction: row;
+    }
+}
+  
+@media (max-width: 1200px) {
+    .dm-container {
+        flex-direction: column;
+        overflow-y: auto;
+    }
+}
+
+#database-manager-panel * {
+    font-size: 13;
+    font-family: 'Open Sans', sans-serif !important;
+    user-select: none;
+}
+
+#database-manager-panel>div:first-child {
+    display: flex;
+    align-items: center;
+}
+
+#database-manager-panel>div:last-child {
+    display: flex;
+    column-gap: 5px;
+    align-items: center;
+    justify-content: end;
+    justify-items: end;
+    margin-top: 5px;
+}
+
+#database-manager-panel>div:last-child>button {
+    border: 1px solid white;
+}
+
+.dm-container {
+    background-color: var(--background-grey);
+    border: 2px solid #777777;
+    position: relative;
+    display: flex;
+    width: 100%;
+    padding: 5px;
+    height: calc(100% - 64px - 5px);
+    border-radius: 0px 5px 5px 5px;
+}
+
+.dm-content-container {
+    position: relative;
+    margin: 10px;
+    display: flex;
+    flex-direction: column;
+    row-gap: 5px;
+}
+
+@media (min-width: 1200px) {
+    .dm-content-container {
+        height: calc(100% - 20px);
+    }
+
+    .dm-content-container:nth-of-type(1) {
+        width: 300px;
+    }
+
+    .dm-content-container:nth-of-type(2) {
+        width: 500px;
+    }
+    
+    .dm-content-container:nth-of-type(3) {
+        flex: 1;
+    }
+}
+  
+@media (max-width: 1200px) {
+    .dm-content-container {
+        width: calc(100% - 20px);
+    }
+
+    .dm-content-container:nth-of-type(1) {
+        height: 30%;
+    }
+
+    .dm-content-container:nth-of-type(2) {
+        height: 50%;
+    }
+    
+    .dm-content-container:nth-of-type(3) {
+        flex: 1;
+    }
+}
+
+.dm-content-container>label {
+    font-size: 18px !important;
+    font-weight: bold;
+}
+
+.dm-scroll-container {
+    display: flex;
+    flex-direction: column;
+    overflow-y: scroll;
+    max-height: 100%;
+    color: black;
+    font-weight: bold;
+}
+
+.dm-scroll-container>div:nth-child(even) {
+    background-color: gainsboro;
+}
+
+.dm-scroll-container>div:nth-child(odd) {
+    background-color: white;
+}
+
+.dm-scroll-container>div *:nth-child(1) {
+    height: 100%;
+    width: calc(100% - 25px);
+    padding: 2px;
+    word-wrap: break-word;
+}
+
+.dm-scroll-container>div *:nth-child(1):hover {
+    background-color: var(--secondary-blue-text);
+    color: white;
+    cursor: pointer;
+}
+
+.dm-scroll-container>div {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.dm-scroll-container>div>button {
+    height: 20px;
+    width: 20px;
+    padding: 0px;
+}
+
+.input-row {
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+}
+
+@media (max-width: 1200px) {
+    .dm-content-container label {
+        width: 100%;
+    }
+    .input-row {
+        width: 50%;
+    }
+}
+
+.input-row>dt {
+    width: 250px;
+}
+
+.input-row>dd {
+    width: 100%;
+    text-align: right;
+}
+
+.input-row>dd>* {
+    width: 100%;
+    font-weight: bold;
+}
+
+.input-row>dd>*[type="checkbox"] {
+    width: 20px;
+    font-weight: bold;
+}
+
+.dm-loadout-container {
+    max-height: 100%;
+    max-width: 500px;
+    width: 100%;
+}
+
+.dm-items-container {
+    max-height: 100%;
+    height: fit-content;
+}
+
+.dm-items-container>div {
+    display: flex;
+    align-items: center;
+    column-gap: 2px;
+}
+
+.dm-items-container>div>label {
+    width: 80px !important;
+}
+
+.dm-items-container div>input:nth-of-type(1) {
+    flex: 1;
+    font-weight: bold;
+}
+
+.dm-items-container div>input:nth-of-type(2) {
+    width: 40px;
+    font-weight: bold;
+}
+
+.dm-new-element-input {
+    display: flex;
+    flex-direction: row;
+    column-gap: 2px;
+    width: 100%;
+    align-items: center;
+}
+
+.dm-new-element-input>input {
+    width: 100%;
+}
+
+.dm-new-element-input>button {
+    width: 60px;
+}
+
+.dm-new-item-input {
+    display: flex;
+    justify-content: end;
+}
+
+.dm-new-item-input>button {
+    width: 60px;
+}
+
+.tab-button {
+    transform: translateY(+3px);
+    background-color: var(--background-steel);
+    border-radius: 0;
+    border-bottom: 2px solid transparent !important;
+    border-top: 2px solid #777777 !important;
+    border-left: 2px solid #777777 !important;
+    border-right: 0px solid #777777 !important;
+}
+
+.tab-button.selected {
+    background-color: var(--background-grey);
+    z-index: 10;
+}
+
+.tab-button:first-of-type {
+    border-top-left-radius: 5px;
+}
+
+.tab-button:last-of-type {
+    border-top-right-radius: 5px;
+    border-right: 2px solid #777777 !important;
+}
+
+#database-manager-panel button :not(.dm-scroll-container>div) {
+    border: 1px solid white;
+}

client/plugins/databasemanager/tsconfig.json

@@ -0,0 +1,103 @@
+{
+    "compilerOptions": {
+      /* Visit https://aka.ms/tsconfig to read more about this file */
+      /* Projects */
+      // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
+      // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
+      // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
+      // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
+      // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
+      // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
+      /* Language and Environment */
+      "target": "ES2017", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+      // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+      // "jsx": "preserve",                                /* Specify what JSX code is generated. */
+      // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
+      // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
+      // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
+      // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
+      // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
+      // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
+      // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
+      // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
+      // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
+      /* Modules */
+      "module": "commonjs", /* Specify what module code is generated. */
+      "rootDirs": ["./src"], /* Specify the root folder within your source files. */
+      // "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
+      // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+      // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+      // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
+      "typeRoots": [
+        "./node_modules/@types",
+        "../../@types"
+      ], /* Specify multiple folders that act like './node_modules/@types'. */
+      "types": [
+        "olympus"
+      ], /* Specify type package names to be included without being referenced in a source file. */
+      // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
+      // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
+      // "resolveJsonModule": true,                        /* Enable importing .json files. */
+      // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
+      /* JavaScript Support */
+       "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
+      // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
+      // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
+      /* Emit */
+      // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+      // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
+      // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
+      // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
+      // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
+      // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+      // "removeComments": true,                           /* Disable emitting comments. */
+      // "noEmit": true,                                   /* Disable emitting files from a compilation. */
+      // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
+      // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
+      // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
+      // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
+      // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
+      // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
+      // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
+      // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
+      // "newLine": "crlf",                                /* Set the newline character for emitting files. */
+      // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
+      // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
+      // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
+      // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
+      // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
+      // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
+      /* Interop Constraints */
+      // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
+      // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
+      "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+      // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+      "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
+      /* Type Checking */
+      "strict": true, /* Enable all strict type-checking options. */
+      // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
+      // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
+      // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
+      // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
+      // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
+      // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
+      // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
+      // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
+      // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
+      // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
+      // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
+      // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
+      // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
+      // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
+      // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
+      // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
+      // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
+      // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
+      /* Completeness */
+      // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+      "skipLibCheck": true /* Skip type checking all .d.ts files. */
+    },
+    "include": [ 
+        "src/*.ts"
+    ]
+}

client/prepare.bat

@@ -1,2 +0,0 @@
-copy .\\node_modules\\leaflet\\dist\\leaflet.css .\\public\\stylesheets\\leaflet\\leaflet.css 
-copy .\\node_modules\\leaflet.nauticscale\\dist\\leaflet.nauticscale.js .\\public\\javascripts\\leaflet.nauticscale.js

client/public/databases/units/iran-iraq_fictional/aircraftdatabase.json

@@ -1,767 +0,0 @@
-{
-	"An-26B": {
-		"name": "An-26B",
-		"coalition": "red",
-		"label": "An-26B Curl",
-		"era": "Mid Cold War",
-		"shortLabel": "26",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					"Transport"
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"filename": "an-26.png",
-		"cost": 0
-	},
-	"An-30M": {
-		"name": "An-30M",
-		"coalition": "red",
-		"label": "An-30M Clank",
-		"era": "Mid Cold War",
-		"shortLabel": "30",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					"Transport"
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"filename": "a-50.png",
-		"cost": 0
-	},
-	"C-130": {
-		"name": "C-130",
-		"label": "C-130 Hercules",
-		"era": "Early Cold War",
-		"shortLabel": "130",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					"Transport"
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"filename": "c-130.png",
-		"cost": 0
-	},
-	"F-14A-135-GR": {
-		"name": "F-14A-135-GR",
-		"coalition": "blue",
-		"label": "F-14A-135-GR Tomcat",
-		"era": "Mid Cold War",
-		"shortLabel": "14A",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "fuel",
-						"quantity": 2
-					},
-					{
-						"name": "AIM-54A",
-						"quantity": 2
-					},
-					{
-						"name": "AIM-7F",
-						"quantity": 1
-					},
-					{
-						"name": "AIM-9L",
-						"quantity": 4
-					}
-				],
-				"roles": [
-					"CAP"
-				],
-				"code": "AIM-54A-MK47*2, AIM-7F*1, AIM-9L*4, XT*2",
-				"name": "Heavy / Fox 3 / Long Range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "fuel",
-						"quantity": 2
-					},
-					{
-						"name": "AIM-7F",
-						"quantity": 4
-					},
-					{
-						"name": "AIM-9L",
-						"quantity": 4
-					}
-				],
-				"roles": [
-					"CAP"
-				],
-				"code": "AIM-7F*4, AIM-9L*4, XT*2",
-				"name": "Heavy / Fox 1 / Long Range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "fuel",
-						"quantity": 2
-					},
-					{
-						"name": "AIM-7M",
-						"quantity": 1
-					},
-					{
-						"name": "AIM-9M",
-						"quantity": 2
-					},
-					{
-						"name": "GBU-12",
-						"quantity": 2
-					},
-					{
-						"name": "LANTIRN",
-						"quantity": 1
-					}
-				],
-				"roles": [
-					"Strike"
-				],
-				"code": "AIM-7M*1, AIM-9M*2, XT*2, GBU-12*2, LANTIRN",
-				"name": "Heavy / Fox 3, GBU-12 / Long Range"
-			},
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					""
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"filename": "f-14.png",
-		"cost": 300,
-		"liveryID": "IRIAF Asia Minor"
-	},
-	"F-4E": {
-		"name": "F-4E",
-		"coalition": "blue",
-		"label": "F-4E Phantom II",
-		"era": "Mid Cold War",
-		"shortLabel": "4",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "fuel",
-						"quantity": 2
-					},
-					{
-						"name": "AIM-7M",
-						"quantity": 4
-					},
-					{
-						"name": "AIM-9M",
-						"quantity": 4
-					}
-				],
-				"roles": [
-					"CAP"
-				],
-				"code": "AIM-9*4,AIM-7*4,Fuel*2",
-				"name": "Heavy / Fox 1 / Long Range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "ECM",
-						"quantity": 1
-					},
-					{
-						"name": "AIM-7M",
-						"quantity": 2
-					},
-					{
-						"name": "Mk-82",
-						"quantity": 18
-					}
-				],
-				"roles": [
-					"Strike"
-				],
-				"code": "Mk-82*18,AIM-7*2,ECM",
-				"name": "Heavy / Fox 1, Mk-82 / Short Range"
-			},
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					""
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"filename": "f-4.png",
-		"cost": 100, 
-		"liveryID": "IRIAF Asia Minor"
-	},
-	"F-5E-3": {
-		"name": "F-5E-3",
-		"coalition": "blue",
-		"label": "F-5E Tiger",
-		"era": "Mid Cold War",
-		"shortLabel": "5",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "Fuel 275",
-						"quantity": 3
-					},
-					{
-						"name": "AIM-9P5",
-						"quantity": 2
-					}
-				],
-				"roles": [
-					"CAP"
-				],
-				"code": "AIM-9P5*2, Fuel 275*3",
-				"name": "Heavy / Fox 2 / Long Range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "Mk-82",
-						"quantity": 4
-					},
-					{
-						"name": "AIM-9P5",
-						"quantity": 2
-					},
-					{
-						"name": "Fuel 275",
-						"quantity": 1
-					}
-				],
-				"roles": [
-					"Strike"
-				],
-				"code": "Mk-82LD*4,AIM-9P*2,Fuel 275",
-				"name": "Heavy / Fox 2 / Short Range"
-			},
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					""
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"liveryID": "ir iriaf 43rd tfs",
-		"filename": "f-5.png",
-		"cost": 80
-	},
-	"F-86F Sabre": {
-		"name": "F-86F Sabre",
-		"coalition": "blue",
-		"label": "F-86F Sabre",
-		"era": "Early Cold War",
-		"shortLabel": "86",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "120gal Fuel",
-						"quantity": 2
-					}
-				],
-				"roles": [
-					"CAP"
-				],
-				"code": "120gal Fuel*2",
-				"name": "Light / Guns / Short Range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "HVAR",
-						"quantity": 16
-					}
-				],
-				"roles": [
-					"CAS"
-				],
-				"code": "HVAR*16",
-				"name": "Light / HVAR / Short Range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "AN-M64",
-						"quantity": 2
-					}
-				],
-				"roles": [
-					"Strike"
-				],
-				"code": "AN-M64*2",
-				"name": "Light / AN-M64 / Short Range"
-			},
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					""
-				],
-				"code": "",
-				"name": "Light / Guns / Short Range"
-			}
-		],
-		"filename": "f-86.png",
-		"cost": 40,
-		"liveryID": "iiaf bare metall"
-	},
-	"IL-76MD": {
-		"name": "IL-76MD",
-		"label": "IL-76MD Candid",
-		"era": "Mid Cold War",
-		"shortLabel": "76",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					"Transport"
-				],
-				"code": "",
-				"name": "Default Transport"
-			}
-		],
-		"filename": "il-76.png",
-		"cost": 0
-	},
-	"MiG-15bis": {
-		"name": "MiG-15bis",
-		"coalition": "red",
-		"label": "MiG-15 Fagot",
-		"era": "Early Cold War",
-		"shortLabel": "M15",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "300L Fuel Tanks",
-						"quantity": 2
-					}
-				],
-				"roles": [
-					"CAP"
-				],
-				"code": "2*300L",
-				"name": "Medium / Guns / Medium Range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "FAB-100M",
-						"quantity": 2
-					}
-				],
-				"roles": [
-					"Strike"
-				],
-				"code": "2*FAB-100M",
-				"name": "Medium / FAB-100M / Short Range"
-			},
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					"CAP"
-				],
-				"code": "",
-				"name": "Light / Guns / Short Range"
-			}
-		],
-		"filename": "mig-15.png",
-		"cost": 30, 
-		"liveryID": "Iraqi_Camo"
-	},
-	"MiG-21Bis": {
-		"name": "MiG-21Bis",
-		"coalition": "red",
-		"label": "MiG-21 Fishbed",
-		"era": "Mid Cold War",
-		"shortLabel": "21",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "R-3 Atoll",
-						"quantity": 2
-					},
-					{
-						"name": "R-60 Aphid",
-						"quantity": 2
-					},
-					{
-						"name": "130 gal tanks",
-						"quantity": 1
-					},
-					{
-						"name": "ASO-2 Countermeasures",
-						"quantity": 1
-					}
-				],
-				"roles": [
-					"CAP"
-				],
-				"code": "Patrol, short range",
-				"name": "Light / Fox-2 / Short range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "R-3 Atoll",
-						"quantity": 2
-					},
-					{
-						"name": "R-60 Aphid",
-						"quantity": 2
-					},
-					{
-						"name": "210 gal tanks",
-						"quantity": 1
-					},
-					{
-						"name": "ASO-2 Countermeasures",
-						"quantity": 1
-					}
-				],
-				"roles": [
-					"CAP"
-				],
-				"code": "Patrol, medium range",
-				"name": "Medium / Fox-2 / Medium range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "R-3R Atoll",
-						"quantity": 2
-					},
-					{
-						"name": "R-3S Atoll",
-						"quantity": 2
-					},
-					{
-						"name": "210 gal tanks",
-						"quantity": 1
-					},
-					{
-						"name": "ASO-2 Countermeasures",
-						"quantity": 1
-					}
-				],
-				"roles": [
-					"CAP"
-				],
-				"code": "Patrol, long range",
-				"name": "Medium / Fox-1, Fox-2 / Medium range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "GROM",
-						"quantity": 2
-					},
-					{
-						"name": "FAB-250",
-						"quantity": 2
-					},
-					{
-						"name": "210 gal tanks",
-						"quantity": 1
-					},
-					{
-						"name": "ASO-2 Countermeasures",
-						"quantity": 1
-					}
-				],
-				"roles": [
-					"Strike"
-				],
-				"code": "Few big targets, GROM + BOMBS",
-				"name": "Heavy / GROM, FAB250 / Medium range"
-			},
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					"CAP"
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"filename": "mig-21.png", 
-		"cost": 100,
-		"liveryID": "iran - standard"
-	},
-	"MiG-23MLD": {
-		"name": "MiG-23MLD",
-		"coalition": "red",
-		"label": "MiG-23 Flogger",
-		"era": "Mid Cold War",
-		"shortLabel": "23",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "Fuel-800",
-						"quantity": 1
-					},
-					{
-						"name": "R-60M",
-						"quantity": 4
-					},
-					{
-						"name": "R-24R",
-						"quantity": 2
-					}
-				],
-				"roles": [
-					"CAP"
-				],
-				"code": "R-24R*2,R-60M*4,Fuel-800",
-				"name": "Heavy / Fox 1 / Long Range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "Fuel-800",
-						"quantity": 1
-					},
-					{
-						"name": "FAB-500",
-						"quantity": 2
-					},
-					{
-						"name": "R-60M",
-						"quantity": 2
-					}
-				],
-				"roles": [
-					"Strike"
-				],
-				"code": "FAB-500*2,R-60M*2,Fuel-800",
-				"name": "Heavy / FAB-500 / Long Range"
-			},
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					""
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"filename": "mig-23.png",
-		"cost": 200
-	},
-	"Mirage-F1EE": {
-		"name": "Mirage-F1EE",
-		"coalition": "red",
-		"label": "Mirage-F1EE",
-		"era": "Mid Cold War",
-		"shortLabel": "F1EE",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "AIM-9JULI",
-						"quantity": 2
-					},
-					{
-						"name": "R530EM",
-						"quantity": 2
-					},
-					{
-						"name": "1137L Fuel Tank",
-						"quantity": 1
-					}
-				],
-				"roles": [
-					"CAP"
-				],
-				"code": "2*AIM9-JULI, 2*R530EM, 1*Fuel Tank",
-				"name": "Medium / Fox 1 / Medium Range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "AIM-9JULI",
-						"quantity": 2
-					},
-					{
-						"name": "SAMP 400 LD",
-						"quantity": 8
-					}
-				],
-				"roles": [
-					"Strike"
-				],
-				"code": "2*AIM-9JULI, 8*SAMP 400 LD",
-				"name": "Heavy / SAMP400 / Short Range"
-			},
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					""
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"filename": "mig-25.png",
-		"cost": 150, 
-		"liveryID": "iriaf 3-6215 _ 1990-2010s desert (eq variant)"
-	},
-	"Mirage-F1CE": {
-		"name": "Mirage-F1CE",
-		"coalition": "red",
-		"label": "Mirage-F1CE",
-		"era": "Mid Cold War",
-		"shortLabel": "F1CE",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "AIM-9JULI",
-						"quantity": 2
-					},
-					{
-						"name": "R530IR",
-						"quantity": 2
-					},
-					{
-						"name": "1137L Fuel Tank",
-						"quantity": 1
-					}
-				],
-				"roles": [
-					"CAP"
-				],
-				"code": "2*AIM9-JULI, 2*R530IR, 1*Fuel Tank",
-				"name": "Medium / Fox 2 / Medium Range"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "AIM-9JULI",
-						"quantity": 2
-					},
-					{
-						"name": "SAMP 400 LD",
-						"quantity": 8
-					}
-				],
-				"roles": [
-					"Strike"
-				],
-				"code": "2*AIM-9JULI, 8*SAMP 400 LD",
-				"name": "Heavy / SAMP400 / Short Range"
-			},
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					""
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"filename": "mig-25.png",
-		"cost": 150, 
-		"liveryID": "iraq air force (fictional eq version)"
-	},
-	"Su-24M": {
-		"name": "Su-24M",
-		"coalition": "red",
-		"label": "Su-24M Fencer",
-		"era": "Mid Cold War",
-		"shortLabel": "24",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "R-60M",
-						"quantity": 2
-					},
-					{
-						"name": "FAB-1500",
-						"quantity": 2
-					}
-				],
-				"roles": [
-					"Strike"
-				],
-				"code": "FAB-1500*2,R-60M*2",
-				"name": "Heavy / FAB-500 / Short Range"
-			},
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					""
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"filename": "su-24.png",
-		"cost": 250,
-		"liveryID": "iran air force"
-	}
-}

client/public/databases/units/iran-iraq_fictional/groundunitdatabase.json

@@ -1,153 +0,0 @@
-{
-	"BMP-1": {
-		"name": "BMP-1",
-		"coalition": "red",
-		"era": "Mid Cold War",
-		"label": "BMP-1",
-		"shortLabel": "BMP-1",
-		"filename": "",
-		"type": "IFV",
-		"cost": 10, 
-		"liveryID": "desert"
-	},
-	"Hawk SAM Battery": {
-		"name": "Hawk SAM Battery",
-		"coalition": "blue",
-		"era": "Early Cold War",
-		"label": "Hawk SAM Battery",
-		"shortLabel": "Hawk SAM Battery",
-		"range": "Medium",
-		"filename": "",
-		"type": "SAM Site",
-		"cost": 500
-	},
-	"Infantry AK": {
-		"name": "Infantry AK",
-		"era": "Mid Cold War",
-		"label": "Infantry AK",
-		"shortLabel": "Infantry AK",
-		"filename": "",
-		"type": "Infantry",
-		"cost": 1
-	},
-	"M-113": {
-		"name": "M-113",
-		"coalition": "blue",
-		"era": "Early Cold War",
-		"label": "M-113",
-		"shortLabel": "M-113",
-		"filename": "",
-		"type": "APC",
-		"cost": 5
-	},
-	"M-60": {
-		"name": "M-60",
-		"coalition": "blue",
-		"era": "Early Cold War",
-		"label": "M-60",
-		"shortLabel": "M-60",
-		"filename": "",
-		"type": "Tank",
-		"cost": 10
-	},
-	"SA-2 SAM Battery": {
-		"name": "SA-2 SAM Battery",
-		"coalition": "red",
-		"era": "Early Cold War",
-		"label": "SA-2 SAM Battery",
-		"shortLabel": "SA-2 SAM Battery",
-		"range": "Long",
-		"filename": "",
-		"type": "SAM Site",
-		"cost": 500
-	},
-	"T-55": {
-		"name": "T-55",
-		"coalition": "red",
-		"era": "Early Cold War",
-		"label": "T-55",
-		"shortLabel": "T-55",
-		"filename": "",
-		"type": "Tank",
-		"cost": 10, 
-		"liveryID": "desert"
-	},
-	"T-72B": {
-		"name": "T-72B",
-		"coalition": "red",
-		"era": "Mid Cold War",
-		"label": "T-72B",
-		"shortLabel": "T-72B",
-		"filename": "",
-		"type": "Tank",
-		"cost": 20, 
-		"liveryID": "desert"
-	},
-	"ZSU-23-4 Shilka": {
-		"name": "ZSU-23-4 Shilka",
-		"era": "Late Cold War",
-		"label": "ZSU-23-4 Shilka",
-		"shortLabel": "ZSU-23-4 Shilka",
-		"filename": "",
-		"type": "AAA",
-		"cost": 100
-	},
-	"Ural-375 ZU-23": {
-		"name": "Ural-375 ZU-23",
-		"era": "Early Cold War",
-		"label": "Ural-375 ZU-23",
-		"shortLabel": "Ural-375 ZU-23",
-		"filename": "",
-		"type": "AAA",
-		"cost": 50
-	},
-	"SAU Gvozdika": {
-		"name": "SAU Gvozdika",
-		"coalition": "red",
-		"era": "Early Cold War",
-		"label": "SAU Gvozdika",
-		"shortLabel": "SAU Gvozdika",
-		"filename": "",
-		"type": "Gun Artillery",
-		"cost": 10, 
-		"liveryID": "desert"
-	},
-	"Grad-URAL": {
-		"name": "Grad-URAL",
-		"coalition": "blue",
-		"era": "Early Cold War",
-		"label": "BM-21",
-		"shortLabel": "BM-21",
-		"filename": "",
-		"type": "Rocket Artillery",
-		"cost": 10
-	},
-	"Chieftain_mk3": {
-		"name": "Chieftain_mk3",
-		"coalition": "blue",
-		"era": "Early Cold War",
-		"label": "Chieftain Mk3",
-		"shortLabel": "Chieftain Mk3",
-		"filename": "",
-		"type": "Tank",
-		"cost": 20
-	}, 
-	"Scud_B": {
-		"name": "Scud_B",
-		"era": "Early Cold War",
-		"label": "SCUD",
-		"shortLabel": "SCUD",
-		"filename": "",
-		"type": "Rocket Artillery",
-		"cost": 10
-	}, 
-	"tt_ZU-23": {
-		"name": "tt_ZU-23",
-		"era": "Early Cold War",
-		"label": "Technical ZSU-23",
-		"shortLabel": "Technical ZSU-23",
-		"filename": "",
-		"type": "AAA",
-		"cost": 25
-	}
-}

client/public/databases/units/iran-iraq_fictional/helicopterdatabase.json

@@ -1,141 +0,0 @@
-{
-	"Mi-24P": {
-		"name": "Mi-24P",
-		"coalition": "red",
-		"era": "Mid Cold War",
-		"label": "Mi-24P Hind",
-		"shortLabel": "Mi24",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "S-8KOM",
-						"quantity": 40
-					},
-					{
-						"name": "9M114 ATGM",
-						"quantity": 8
-					}
-				],
-				"roles": [
-					"CAS"
-				],
-				"code": "2xB8V20 (S-8KOM)+8xATGM 9M114",
-				"name": "Gun / ATGM / Rockets"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "S-24B",
-						"quantity": 4
-					},
-					{
-						"name": "9M114 ATGM",
-						"quantity": 4
-					}
-				],
-				"roles": [
-					"Strike"
-				],
-				"code": "4xS-24B+4xATGM 9M114",
-				"name": "Gun / ATGM / Rockets"
-			},
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "GUV-1 Grenade Launcher",
-						"quantity": 4
-					},
-					{
-						"name": "9M114 ATGM",
-						"quantity": 4
-					}
-				],
-				"roles": [
-					"CAS"
-				],
-				"code": "4xGUV-1 AP30+4xATGM 9M114",
-				"name": "Gun / ATGM / Grenade Launcher"
-			},
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					""
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"filename": "mi-24.png", 
-		"cost": 150, 
-		"liveryID": "IQAF"
-	},
-	"Mi-8MT": {
-		"name": "Mi-8MT",
-		"coalition": "blue",
-		"era": "Mid Cold War",
-		"label": "Mi-8MT Hip",
-		"shortLabel": "Mi8",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "UPK",
-						"quantity": 2
-					},
-					{
-						"name": "B8",
-						"quantity": 2
-					}
-				],
-				"roles": [
-					"CAS"
-				],
-				"code": "2 x UPK +2 x B8",
-				"name": "Rockets / Gunpods"
-			},
-			{
-				"fuel": 1,
-				"items": [],
-				"roles": [
-					"Transport"
-				],
-				"code": "",
-				"name": "Empty Loadout"
-			}
-		],
-		"filename": "mi-8.png",
-		"cost": 100, 
-		"liveryID": "IR Iranian Special Police Forces"
-	},
-	"SA342M": {
-		"name": "SA342M",
-		"coalition": "blue",
-		"era": "Mid Cold War",
-		"label": "SA342M Gazelle",
-		"shortLabel": "342",
-		"loadouts": [
-			{
-				"fuel": 1,
-				"items": [
-					{
-						"name": "HOT3",
-						"quantity": 4
-					}
-				],
-				"roles": [
-					"CAS"
-				],
-				"code": "4x HOT3, IR Deflector, Sand Filter",
-				"name": "ATGM"
-			}
-		],
-		"filename": "sa-342.png",
-		"cost": 80
-	}
-}

client/public/databases/units/iran-iraq_fictional/navyunitdatabase.json

@@ -1,3 +0,0 @@
-{
-	
-}

client/public/images/countries/ad.svg

@@ -75,7 +75,7 @@
       <path d="M232.2 261.4a3.7 3.7 0 0 1 3.7-3 3.7 3.7 0 0 1 3.6 3.7 3.8 3.8 0 0 1-1 2.6"/>
       <path d="M239.4 261.3a15.5 15.5 0 0 0 6.2-12.4c0-4.1-1.6-8.4-3.6-10"/>
       <path stroke-linecap="round" d="M244.7 259.4a16.5 16.5 0 0 1-6.3 6"/>
-      <path d="M254.6 273.7c-1-2.2-2.8-3.2-5.8-3.5-3-.3-5.5.5-8.2 1.9a18.6 18.6 0 0 0-10.8 17 25 25 0 0 0 2 9.5c.9 1.6 3 9 15.3 14a86.1 86.1 0 0 0 25.7 3.9c10.4.4 20 .8 25.6 7.6"/>
+      <path d="M254.6 273.7c-1-2.2-2.8-3.2-5.8-3.5-3-.3-5.5.5-8.2 1.9a18.6 18.6 0 0 0-10.8 17 25 25 0 0 0 2 9.5c.9 1.6 3 9 15.3 14a86.1 86.1 0 0 0 25.7 3.9c10.4.5 20 .8 25.6 7.6"/>
       <path stroke-linecap="round" d="M239.7 275.9c3.3-2.2 9.5-5 15.1-2.2a8 8 0 0 1 4.3 4.4 10 10 0 0 1-1.8 9.5c-.9 1-2.7 2.6-5 2.7-3.8 0-4.7-2.6-4.8-3.2-.4-2.8 1.2-3.9 2-4.2.7-.2 2.8-.1 3.2 1.4.2.5.2 1.3-.2 2"/>
       <path d="M252.7 285.7c.3-1 .2-2.2-.8-3.3a5.1 5.1 0 0 0-6-1c-.7.5-1.6 1-2.4 2.2-.4.4-1 1.1-1.2 1.6-.7 1.1-1 2-1 2.5-2.5 7 1.5 14.4 6.5 17.6 4.4 2.8 8.8 3.6 14.4 4 2.5.3 4 .3 6.5.5h9.6a70.1 70.1 0 0 1 7.2 0c3 .3 5.1.4 7.6.8 1.6.2 3.5.5 5.4 1 .6 0 1.2.2 1.8.4l1.2.3c3.6 1.1 7 2.4 9.8 4.2.8.5 1.8 1 2.5 1.7l1.3 1.2c2 2 4 4 4.4 6.7v1.6c0 1.8-1.4 4.3-5.3 5"/>
       <path d="M298.6 328.4c-1 2.2.2 3.2 1.6 3.4 2.2.3 3.3-1.4 3.5-3a4.4 4.4 0 0 0-4.4-4.7 5.5 5.5 0 0 0-5 3.5 6.9 6.9 0 0 0-.5 2.4 5.8 5.8 0 0 0 1.4 4.1 7.5 7.5 0 0 0 5.4 2.5c4.2.1 7.5-3.8 7.5-7.8 0-7.7-11.4-12-16-13a84 84 0 0 0-17.9-2.4c-3.5-.1-6.2 0-10.1-.5-3.5-.3-5.4-.5-9-1.3a27.2 27.2 0 0 1-12.5-6.4 17 17 0 0 1-4.7-22 14.3 14.3 0 0 1 10.3-6.9c3.8-.5 7 1.1 9 4.8 1 1.8.6 4.8-.1 6.2a6 6 0 0 1-4.8 3c-3.8 0-4.7-2.6-4.8-3.2-.4-2.8 1.2-3.9 2-4.2.7-.2 2.8-.1 3.2 1.4.2.5.2 1.3-.2 2"/>

client/public/images/countries/blue.svg

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="640"
+   height="480"
+   id="svg10"
+   sodipodi:docname="blue.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.88166667"
+     inkscape:cx="497.3535"
+     inkscape:cy="301.13421"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <path
+     fill="#bc0000"
+     fill-opacity="1"
+     d="M 0,0 H 640 V 480 H 0 Z"
+     id="path2"
+     style="fill:#0000cd;fill-opacity:1;stroke-width:0.999996" />
+</svg>

client/public/images/countries/codes.json

@@ -1,84 +1,556 @@
 {
-    "RED": "AGGRESSORS",
-    "INS": "INSURGENTS",
-    "DZ" : "ALGERIA",
-    "AR" : "ARGENTINA",
-    "AU" : "AUSTRALIA",
-    "AT" : "AUSTRIA",
-    "BH" : "BAHRAIN",
-    "BY" : "BELARUS",
-    "BE" : "BELGIUM",
-    "BO" : "BOLIVIA",
-    "BR" : "BRAZIL",
-    "BG" : "BULGARIA",
-    "CA" : "CANADA",
-    "CL" : "CHILE",
-    "CN" : "CHINA",
-    "HR" : "CROATIA",
-    "CU" : "CUBA",
-    "CY" : "CYPRUS",
-    "CZ" : "CHEZH_REPUBLIC",
-    "DK" : "DENMARK",
-    "EG" : "EGYPT",
-    "ET" : "ETHIOPIA",
-    "FI" : "FINLAND",
-    "FR" : "FRANCE",
-    "GE" : "GEORGIA",
-    "DE" : "GERMANY",
-    "GH" : "GHANA",
-    "GI" : "Gibraltar",
-    "GR" : "GREECE",
-    "HN" : "HONDURAS",
-    "HU" : "HUNGARY",
-    "IS" : "Iceland",
-    "IN" : "INDIA",
-    "ID" : "INDONESIA",
-    "IR" : "IRAN",
-    "IQ" : "IRAQ",
-    "IE" : "Ireland",
-    "IM" : "Isle Of Man",
-    "IL" : "ISRAEL",
-    "IT" : "ITALY",
-    "JP" : "JAPAN",
-    "JO" : "JORDAN",
-    "KZ" : "KAZAKHSTAN",
-    "KR" : "SOUTH_KOREA",
-    "KW" : "KUWAIT",
-    "LB" : "LEBANON",
-    "LY" : "LIBYIA",
-    "MY" : "MALAYSIA",
-    "MX" : "MEXICO",
-    "MA" : "MOROCCO",
-    "NL" : "THE_NETHERLANDS",
-    "NG" : "NIGERIA",
-    "NO" : "NORWAY",
-    "OM" : "OMAN",
-    "PK" : "PAKISTAN",
-    "PE" : "PERU",
-    "PH" : "PHILIPPINES",
-    "PL" : "POLAND",
-    "PT" : "PORTUGAL",
-    "QA" : "QATAR",
-    "RO" : "ROMANIA",
-    "RU" : "RUSSIA",
-    "SA" : "SAUDI ARABIA",
-    "RS" : "SERBIA",
-    "SK" : "SLOVAKIA",
-    "SI" : "SLOVENIA",
-    "ZA" : "SOUTH AFRICA",
-    "ES" : "SPAIN",
-    "SD" : "SUDAN",
-    "SE" : "SWEDEN",
-    "CH" : "SWITZERLAND",
-    "SY" : "SYRIA",
-    "TH" : "THAILAND",
-    "TN" : "TUNISIA",
-    "TR" : "TURKEY",
-    "UA" : "UKRAINE",
-    "AE" : "UNITED ARAB EMIRATES",
-    "GB" : "UK",
-    "US" : "USA",
-    "VE" : "VENEZUELA",
-    "VN" : "VIETNAM",
-    "YE" : "YEMEN"
+  "AGGRESSORS": {
+    "flagCode": "RED",
+    "liveryCodes": [
+      "RSO"
+    ]
+  },
+  "INSURGENTS": {
+    "flagCode": "UNK",
+    "liveryCodes": [
+      "INS"
+    ]
+  },
+  "ALGERIA": {
+    "flagCode": "DZ",
+    "liveryCodes": [
+      "DZA"
+    ]
+  },
+  "ARGENTINA": {
+    "flagCode": "AR",
+    "liveryCodes": [
+      "ARG"
+    ]
+  },
+  "AUSTRALIA": {
+    "flagCode": "AU",
+    "liveryCodes": [
+      "AUS",
+      "AUSAF"
+    ]
+  },
+  "AUSTRIA": {
+    "flagCode": "AT",
+    "liveryCodes": [
+      "AUT"
+    ]
+  },
+  "BAHRAIN": {
+    "flagCode": "BH",
+    "liveryCodes": [
+      "BHR"
+    ]
+  },
+  "BELARUS": {
+    "flagCode": "BY",
+    "liveryCodes": [
+      "BLR"
+    ]
+  },
+  "BELGIUM": {
+    "flagCode": "BE",
+    "liveryCodes": [
+      "BEL"
+    ]
+  },
+  "BOLIVIA": {
+    "flagCode": "BO",
+    "liveryCodes": [
+      "BOL"
+    ]
+  },
+  "BRAZIL": {
+    "flagCode": "BR",
+    "liveryCodes": [
+      "BRA"
+    ]
+  },
+  "BULGARIA": {
+    "flagCode": "BG",
+    "liveryCodes": [
+      "BGR"
+    ]
+  },
+  "CANADA": {
+    "flagCode": "CA",
+    "liveryCodes": [
+      "CAN"
+    ]
+  },
+  "CHILE": {
+    "flagCode": "CL",
+    "liveryCodes": [
+      "CHL"
+    ]
+  },
+  "CHINA": {
+    "flagCode": "CN",
+    "liveryCodes": [
+      "CHN"
+    ]
+  },
+  "CROATIA": {
+    "flagCode": "HR",
+    "liveryCodes": [
+      "HRV"
+    ]
+  },
+  "CUBA": {
+    "flagCode": "CU",
+    "liveryCodes": [
+      "CUB"
+    ]
+  },
+  "CYPRUS": {
+    "flagCode": "CY",
+    "liveryCodes": [
+      "CYP"
+    ]
+  },
+  "CHEZH_REPUBLIC": {
+    "displayName": "Czech Republic",
+    "flagCode": "CZ",
+    "liveryCodes": [
+      "CZE"
+    ]
+  },
+  "DENMARK": {
+    "flagCode": "DK",
+    "liveryCodes": [
+      "DEN"
+    ]
+  },
+  "EGYPT": {
+    "flagCode": "EG",
+    "liveryCodes": [
+      "EGY",
+      "EGP"
+    ]
+  },
+  "ETHIOPIA": {
+    "flagCode": "ET",
+    "liveryCodes": [
+      "ETH"
+    ]
+  },
+  "FINLAND": {
+    "flagCode": "FI",
+    "liveryCodes": [
+      "FIN"
+    ]
+  },
+  "FRANCE": {
+    "flagCode": "FR",
+    "liveryCodes": [
+      "FRA"
+    ]
+  },
+  "GEORGIA": {
+    "flagCode": "GE",
+    "liveryCodes": [
+      "GRG"
+    ]
+  },
+  "GERMANY": {
+    "flagCode": "DE",
+    "liveryCodes": [
+      "GER"
+    ]
+  },
+  "GHANA": {
+    "flagCode": "GH",
+    "liveryCodes": [
+      "GHA"
+    ]
+  },
+  "GREECE": {
+    "flagCode": "GR",
+    "liveryCodes": [
+      "GRC"
+    ]
+  },
+  "HONDURAS": {
+    "flagCode": "HN",
+    "liveryCodes": [
+      "HND"
+    ]
+  },
+  "HUNGARY": {
+    "flagCode": "HU",
+    "liveryCodes": [
+      "HUN"
+    ]
+  },
+  "INDIA": {
+    "flagCode": "IN",
+    "liveryCodes": [
+      "IND"
+    ]
+  },
+  "INDONESIA": {
+    "flagCode": "ID",
+    "liveryCodes": [
+      "IDN"
+    ]
+  },
+  "IRAN": {
+    "flagCode": "IR",
+    "liveryCodes": [
+      "IRN"
+    ]
+  },
+  "IRAQ": {
+    "flagCode": "IQ",
+    "liveryCodes": [
+      "IRQ"
+    ]
+  },
+  "ISRAEL": {
+    "flagCode": "IL",
+    "liveryCodes": [
+      "ISR"
+    ]
+  },
+  "ITALY": {
+    "flagCode": "IT",
+    "liveryCodes": [
+      "ITA"
+    ]
+  },
+  "JAPAN": {
+    "flagCode": "JP",
+    "liveryCodes": [
+      "JPN"
+    ]
+  },
+  "JORDAN": {
+    "flagCode": "JO",
+    "liveryCodes": [
+      "JOR"
+    ]
+  },
+  "KAZAKHSTAN": {
+    "flagCode": "KZ",
+    "liveryCodes": [
+      "KAZ"
+    ]
+  },
+  "SOUTH_KOREA": {
+    "displayName": "South Korea",
+    "flagCode": "KR",
+    "liveryCodes": [
+      "KOR"
+    ]
+  },
+  "KUWAIT": {
+    "flagCode": "KW",
+    "liveryCodes": [
+      "KWT"
+    ]
+  },
+  "LEBANON": {
+    "flagCode": "LB",
+    "liveryCodes": [
+      "LBN"
+    ]
+  },
+  "MALAYSIA": {
+    "flagCode": "MY",
+    "liveryCodes": [
+      "MYS"
+    ]
+  },
+  "MEXICO": {
+    "flagCode": "MX",
+    "liveryCodes": [
+      "MEX"
+    ]
+  },
+  "MOROCCO": {
+    "flagCode": "MA",
+    "liveryCodes": [
+      "MAR"
+    ]
+  },
+  "THE_NETHERLANDS": {
+    "displayName": "The Netherlands",
+    "flagCode": "NL",
+    "liveryCodes": [
+      "NETH"
+    ]
+  },
+  "NIGERIA": {
+    "flagCode": "NG",
+    "liveryCodes": [
+      "NGA"
+    ]
+  },
+  "NORWAY": {
+    "flagCode": "NO",
+    "liveryCodes": [
+      "NOR"
+    ]
+  },
+  "OMAN": {
+    "flagCode": "OM",
+    "liveryCodes": [
+      "OMN"
+    ]
+  },
+  "PAKISTAN": {
+    "flagCode": "PK",
+    "liveryCodes": [
+      "PAK"
+    ]
+  },
+  "PERU": {
+    "flagCode": "PE",
+    "liveryCodes": [
+      "PER"
+    ]
+  },
+  "PHILIPPINES": {
+    "flagCode": "PH",
+    "liveryCodes": [
+      "PHL"
+    ]
+  },
+  "POLAND": {
+    "flagCode": "PL",
+    "liveryCodes": [
+      "POL"
+    ]
+  },
+  "PORTUGAL": {
+    "flagCode": "PT",
+    "liveryCodes": [
+      "PRT"
+    ]
+  },
+  "QATAR": {
+    "flagCode": "QA",
+    "liveryCodes": [
+      "QAT"
+    ]
+  },
+  "ROMANIA": {
+    "flagCode": "RO",
+    "liveryCodes": [
+      "ROU"
+    ]
+  },
+  "RUSSIA": {
+    "flagCode": "RU",
+    "liveryCodes": [
+      "RUS"
+    ]
+  },
+  "SAUDI_ARABIA": {
+    "displayName": "Saudi Arabia",
+    "flagCode": "SA",
+    "liveryCodes": [
+      "SAU"
+    ]
+  },
+  "SERBIA": {
+    "flagCode": "RS",
+    "liveryCodes": [
+      "SRB"
+    ]
+  },
+  "SLOVAKIA": {
+    "flagCode": "SK",
+    "liveryCodes": [
+      "SVK"
+    ]
+  },
+  "SLOVENIA": {
+    "flagCode": "SI",
+    "liveryCodes": [
+      "SVN"
+    ]
+  },
+  "SOUTH_AFRICA": {
+    "displayName": "South Africa",
+    "flagCode": "ZA",
+    "liveryCodes": []
+  },
+  "SPAIN": {
+    "flagCode": "ES",
+    "liveryCodes": [
+      "SPN",
+      "SPA"
+    ]
+  },
+  "SUDAN": {
+    "flagCode": "SD",
+    "liveryCodes": [
+      "SDN",
+      "SUN"
+    ]
+  },
+  "SWEDEN": {
+    "flagCode": "SE",
+    "liveryCodes": [
+      "SWE"
+    ]
+  },
+  "SWITZERLAND": {
+    "flagCode": "CH",
+    "liveryCodes": [
+      "SUI"
+    ]
+  },
+  "SYRIA": {
+    "flagCode": "SY",
+    "liveryCodes": [
+      "SYR"
+    ]
+  },
+  "THAILAND": {
+    "flagCode": "TH",
+    "liveryCodes": [
+      "THA"
+    ]
+  },
+  "TUNISIA": {
+    "flagCode": "TN",
+    "liveryCodes": [
+      "TUN"
+    ]
+  },
+  "TURKEY": {
+    "flagCode": "TR",
+    "liveryCodes": [
+      "TUR"
+    ]
+  },
+  "UKRAINE": {
+    "flagCode": "UA",
+    "liveryCodes": [
+      "UKR"
+    ]
+  },
+  "UNITED_ARAB_EMIRATES": {
+    "displayName": "United Arab Emirates",
+    "flagCode": "AE",
+    "liveryCodes": [
+      "ARE"
+    ]
+  },
+  "UK": {
+    "displayName": "United Kingdom",
+    "flagCode": "GB",
+    "liveryCodes": [
+      "UK"
+    ]
+  },
+  "USA": {
+    "displayName": "United States of America",
+    "flagCode": "US",
+    "liveryCodes": [
+      "USA",
+      "USAF"
+    ]
+  },
+  "VENEZUELA": {
+    "flagCode": "VE",
+    "liveryCodes": [
+      "VEN"
+    ]
+  },
+  "VIETNAM": {
+    "flagCode": "VN",
+    "liveryCodes": [
+      "VNM"
+    ]
+  },
+  "YEMEN": {
+    "flagCode": "YE",
+    "liveryCodes": [
+      "YEM"
+    ]
+  },
+  "CJTF_BLUE": {
+    "displayName": "Combined Joint Task Force Blue",
+    "flagCode": "BLUE",
+    "liveryCodes": [
+      "BLUE"
+    ]
+  },
+  "SOUTH_OSETIA": {
+    "displayName": "South Ossetia",
+    "flagCode": "UNK",
+    "liveryCodes": []
+  },
+  "NORTH_KOREA": {
+    "displayName": "Democratic People's Republic of Korea",
+    "flagCode": "KP",
+    "liveryCodes": [
+      "PRK"
+    ]
+  },
+  "CJTF_RED": {
+    "displayName": "Combined Joint Task Force Red",
+    "flagCode": "RED",
+    "liveryCodes": [
+      "RED"
+    ]
+  },
+  "ABKHAZIA": {
+    "flagCode": "UNK",
+    "liveryCodes": [
+      "ABH"
+    ]
+  },
+  "ITALIAN_SOCIAL_REPUBLIC": {
+    "displayName": "Italian Social Republic",
+    "flagCode": "SOCIAL",
+    "liveryCodes": [
+      "RSI"
+    ]
+  },
+  "USSR": {
+    "displayName": "USSR",
+    "flagCode": "USSR",
+    "liveryCodes": []
+  },
+  "ECUADOR": {
+    "flagCode": "EC",
+    "liveryCodes": [
+      "ECU"
+    ]
+  },
+  "LIBYA": {
+    "flagCode": "LY",
+    "liveryCodes": [
+      "LBY",
+      "LIB"
+    ]
+  },
+  "UN_PEACEKEEPERS": {
+    "displayName": "United Nations",
+    "flagCode": "UNK",
+    "liveryCodes": [
+      "UN"
+    ]
+  },
+  "GDR": {
+    "flagCode": "UNK",
+    "liveryCodes": [
+      "GDR"
+    ]
+  },
+  "YUGOSLAVIA": {
+    "flagCode": "YUG",
+    "liveryCodes": [
+      "YUG"
+    ]
+  },
+  "THIRDREICH": {
+    "displayName": "Third Reich",
+    "flagCode": "THIRD",
+    "liveryCodes": []
+  }
 }

client/public/images/countries/pe.svg

@@ -216,7 +216,7 @@
   <g stroke="#d4af37" stroke-width=".9">
     <path fill="#fff" d="M367.7 432.4c-1.5.5-2.5 1-9 .5-4.6-.3-10.3-1.1-13.2-1.2-5.6 0-5.6.3-15.5 7.1-7 4.8-16 4.4-22.7 3-4-2-5.8-2.3-5.2-1.3 1.1 1.8 9 4.4 13.4 4.4 7 0 12.2-1.8 20.7-7.1 6.6-4.2 9.5-4.5 18.5-2.5 10.6 2.1 12.2 1.2 20.9-2.7-2.6 0-3.2 0-4 .4 1.4-1.6 1.5-3.2 1.8-4.2.4-.6-.8.2-2.1 1.2l-3.6 2.4z" transform="matrix(.59548 0 0 .58466 141.4 62.9)"/>
     <path fill="#d91023" d="M354 429.8c-4.9-.7-8.2-1.4-11.3-1-3.4.3-5.8 2-9.9 4.5-4 2.7-7.7 4.6-8.1 4.6-.6 0-5.8 1.2-9.8 1.2-1.8 0-5.9-1.3-8.6-2.3-5.7-2.1-7.8 1.4-1.8 3.9a33.4 33.4 0 0 0 15.6 1.8c5-.8 9.6-3 13.4-5.8 7.7-5.6 3.2-3 6.2-4.2 3-1.3 5.9-.9 5.9-.9 4 .2 11.9 1.5 15.9 1.6 7.2-.7 6-.7 8.4-2 .8-.6 3.5-2.3 3.6-2.7.2-.4 1.4-2.7 1.2-2.8-7.5 5.1-11.2 5.1-20.7 4.1z" transform="matrix(.59548 0 0 .58466 141.4 62.9)"/>
-    <path fill="#d91023" d="m341 435.4-7.1 4c-6.2 3.8-12 5.6-18.8 5.6-3 .5-13-3.6-11.5-3.1 1.6 3 4 3.4 9.6 4.5 4 .8 6.6.1 11.1-.8 5-.6 7-3 9-4.3a33.5 33.5 0 0 1 14-5.4c1 0 4.7 2.1 8.9 3 4.1.9 6.1 1.1 10.4.4s8.7-4.2 12.8-6.9c-.6.2-2 .2-4 .3-6 3.5-16 4.8-21.2 2.4-5.4-1.3-10.5-1-13.2.3z" transform="matrix(.59548 0 0 .58466 141.4 62.9)"/>
+    <path fill="#d91023" d="m341 435.4-7.1 4c-6.2 3.8-12 5.6-18.8 5.6-3 .5-13-3.6-11.5-3.1 1.6 3 4 3.4 9.6 4.5 4 .8 6.6.1 11.1-.8 5-.6 7-3 9-4.3a33.5 33.5 0 0 1 14-5.4c1 0 4.7 2.1 8.9 3 4.1.9 6.1 1.1 10.4.5s8.7-4.2 12.8-6.9c-.6.2-2 .2-4 .3-6 3.5-16 4.8-21.2 2.4-5.4-1.3-10.5-1-13.2.3z" transform="matrix(.59548 0 0 .58466 141.4 62.9)"/>
   </g>
   <path fill="#00a854" d="M276.4 176.3a37.7 37.7 0 0 0-17.5 13.2c-1 1.2-1.8 2.2-1.9 2.1 0 0 .4-2.7 1.2-5.7.7-3 1.2-6.1 1.2-6.8 0-1.2-.1-1.1-2 1a41 41 0 0 0-7 13c-.7 2.2-1 4.7-1 9.3l.1 6.3-1.2-4.5c-1.3-4.7-2.6-8-4-9.6-.6-1-.8-1-1.3-.3-1 1.5-.3 7.8 1.4 12.4.1.6-.5-.2-1.4-1.7-1-1.6-2-2.7-2.3-2.6-.6.3-.6 5.3 0 7.4.4 1.4.4 1.4-1.3-.5-2.9-3.3-3.5-3.6-3.5-1.3 0 .9.3 2.4.7 3.4l.8 2-1.6.4c-2.3.4-3 1.1-3 3 0 2 1.4 6.8 2 7.2.9.5 1.1 0 1.8-3l.6-2.6 1.9 2.5a76.7 76.7 0 0 1 8.8 17.7c2.2 6.4 2.3 7.7.3 3.7a72 72 0 0 0-3.2-5.2c-2-2.8-12.6-13.9-13.3-13.9-.8 0 0 3.5 1.3 6.4.7 1.4 2.7 4.2 4.4 6.2l2.9 3.6c-.2 0-1.4-.8-2.7-1.7-2.6-2-5.3-3.5-5.6-3.2-.1.1.9 2.3 2.3 4.8l2.4 4.6-1.6-.3a6 6 0 0 0-2.8.3c-1 .6-1 1.1-1 3.5 0 3.3.8 6.7 1.5 6.7.8 0 2-3.2 2-4.9 0-1.3 0-1.3 2.6 1.1 3.7 3.6 8.6 9.6 13.4 16.6l4 6-4.7-3.6c-4.6-3.3-14-8.6-15.5-8.6-.4 0-.8.2-.8.5 0 .2 3 3.3 6.7 6.8l6.7 6.3-3.5-1.1a71 71 0 0 0-5.3-1.5c-1.7-.4-1.7-.3 2.2 3.3a68 68 0 0 0 8.7 6.7c2.6 1.6 4.3 2.8 3.7 2.7a35.1 35.1 0 0 0-11.5-1.9c0 .7 3.5 3.5 6 4.8 1.4.7 5 2 7.8 3 6 2.1 9.6 4 12.6 6.6l2 1.9-3.5-1.6c-4.1-1.8-15.3-5.5-16.5-5.5s3.8 5 8.8 8.7a80.2 80.2 0 0 0 19.5 9.7c5.2 1.7 9.6 2.6 18 3.6 3.6.5 7 1 7.8 1.3.6.3 5 1 10 1.5a99.7 99.7 0 0 1 30.7 7.2c1.7.8 3.5 1.1 7.2 1.3 5.5.3 5.8.1 4.2-2.9-1.3-2.5-3.7-3.9-8.7-4.8l-9.2-1.8a726.1 726.1 0 0 0-29-5c-14-2.3-20.1-4.7-26.7-10.7A43.3 43.3 0 0 1 269 263c.4-3 .6-5.5.5-5.6-.5-.4-3.7 6.3-4.6 9.4l-1 3.3.3-5.4c.3-8.3 3.5-16.1 8.2-20.6 1-1 1.8-2 1.8-2.2 0-.2-1 0-2.1.2-1.6.4-3 1.3-5 3.2l-2.6 2.7 1.3-2.4a27 27 0 0 1 8.3-9.6l2.9-1.9-1.7-.1c-3.4-.4-9.5 4-12.9 9.3-2 3-2 2.1 0-2.6a41.8 41.8 0 0 1 8-12.5c1.9-1.8 2.2-2.5 1.5-2.5-2.7 0-7.2 3.5-11 8.4-1 1.5-1 1.4.2-1.5a40 40 0 0 1 6.1-9.7c1.6-1.9 1.2-2.1-1.5-1a26.4 26.4 0 0 0-8.6 9.7c-1 2-1.8 3-1.7 2.5a61 61 0 0 0 .8-3.3 46.4 46.4 0 0 1 12.8-22.7c2.4-2.2 3-3.2 2.3-3.2-2 0-6.5 2.6-9.5 5.5-3.1 3-3.2 3-2 .9a57 57 0 0 1 18.3-18.6l4.3-3c0-.8-7.8 1.6-11.3 3.3a42.3 42.3 0 0 0-4.4 3.2c-2.5 2-2.7 2.1-1.8.8 1.7-2.4 7.6-7.7 10-8.9 1.7-.9 2-1.2 1-1.3-2.3-.4-8.9 3-14 7.4l-2.2 1.9 1.2-2a48 48 0 0 1 14.7-15.6 60.5 60.5 0 0 1 4.4-2.6c.3-.1.5-.4.4-.5-.2-.2-2 .2-4 1zm77 145a6 6 0 0 1 1.4 1.9c0 .2-1.1.4-2.5.4-2.5 0-2.6 0-2.6-1.4 0-2.6 1.6-2.9 3.8-.8z"/>
   <path fill="#9eab05" d="M350.3 320.5c-1.3 1.2-1 3 .3 3.4 2.2.6 5 .4 5-.4s-3.3-3.8-4.1-3.8c-.3 0-.8.3-1.2.8z"/>

client/public/images/countries/red.svg

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="640"
+   height="480"
+   id="svg10"
+   sodipodi:docname="red.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.88166667"
+     inkscape:cx="497.3535"
+     inkscape:cy="301.13421"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <path
+     fill="#bc0000"
+     fill-opacity="1"
+     d="M 0,0 H 640 V 480 H 0 Z"
+     id="path2"
+     style="fill:#cc0000;fill-opacity:1;stroke-width:0.999996" />
+</svg>

client/public/images/countries/third.svg

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="640"
+   height="480"
+   viewBox="0 0 640 480"
+   id="svg8"
+   sodipodi:docname="third.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     width="640px"
+     inkscape:zoom="1.058"
+     inkscape:cx="284.97164"
+     inkscape:cy="274.57467"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <rect
+     width="640"
+     height="480"
+     fill="#dd0000"
+     id="rect2"
+     x="0"
+     y="0"
+     style="stroke-width:0.999997" />
+  <circle
+     cx="320"
+     cy="240"
+     r="180"
+     fill="#ffffff"
+     id="circle4"
+     style="stroke-width:1" />
+  <path
+     d="M 472.73507,256.97056 387.88225,172.11774 252.11775,307.88225 167.26494,223.02943 M 336.97057,87.264932 252.11775,172.11774 387.88225,307.88225 303.02944,392.73506"
+     fill="none"
+     stroke="#000000"
+     stroke-width="48"
+     id="path6" />
+</svg>

client/public/images/countries/unk.svg

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="640"
+   height="480"
+   id="svg10"
+   sodipodi:docname="unk.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.88166667"
+     inkscape:cx="497.3535"
+     inkscape:cy="300"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <path
+     fill="#bc0000"
+     fill-opacity="1"
+     d="M 0,0 H 640 V 480 H 0 Z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:0.999996" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:549.6px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
+     x="179.23065"
+     y="424.19662"
+     id="text2551"><tspan
+       sodipodi:role="line"
+       id="tspan2549"
+       x="179.23065"
+       y="424.19662"
+       style="stroke-width:1">?</tspan></text>
+</svg>

client/public/images/countries/ussr.svg

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="640"
+   height="480"
+   id="svg10"
+   sodipodi:docname="ussr.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.88166667"
+     inkscape:cx="497.3535"
+     inkscape:cy="300"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10" />
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <path
+     fill="#bc0000"
+     fill-opacity="1"
+     d="M 0,0 H 639.99998 V 480 H 0 Z"
+     id="path2"
+     style="fill:#cc0000;fill-opacity:1;stroke-width:0.999997" />
+  <path
+     id="path11728"
+     d="m 160.0004,30 -6.73546,20.729509 H 131.4688 L 149.10222,63.540898 142.36675,84.2704 160.0004,71.458772 177.63406,84.2704 170.89859,63.540898 188.532,50.729509 h -21.79613 z m 0,10.79999 4.31062,13.266778 h 13.94975 l -11.2856,8.199597 4.31061,13.266777 -11.28538,-8.199363 -11.28538,8.199363 4.31062,-13.266777 -11.28561,-8.199597 h 13.94975 z"
+     style="fill:#ffd700;fill-opacity:1;stroke:none;stroke-width:0.15px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <g
+     style="fill:#ffd700;fill-opacity:1;stroke-width:1.25"
+     id="g2900"
+     transform="matrix(0.79145503,0,0,0.78939049,3.0638126,3.0127518)">
+    <path
+       id="rect4165-6"
+       d="m 137.43744,171.69421 18.86296,18.9937 17.78834,-17.66589 c 27.05847,29.021 55.43807,56.99501 82.28704,86.12782 4.03444,4.06233 10.59815,4.085 14.66056,0.0506 4.06232,-4.03445 4.08499,-10.59815 0.0506,-14.66056 -28.81871,-27.1901 -57.72545,-54.60143 -86.55328,-81.89095 l 23.96499,-23.80003 -33.34026,-4.61605 z"
+       style="fill:#ffd700;fill-opacity:1;stroke:none;stroke-width:0.611489;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="path4179-3"
+       d="m 198.2887,110.1955 c 15.51743,8.7394 27.29872,21.28122 34.2484,34.3924 7.04394,13.28902 10.13959,27.16218 10.20325,38.25433 0.13054,22.74374 -18.43771,41.18184 -41.18183,41.18184 -12.13597,0 -23.04607,-5.24868 -30.58302,-13.60085 l -4.16863,3.51033 c -0.70999,-0.27231 -1.46387,-0.41221 -2.22429,-0.41276 -1.82948,1.9e-4 -3.56621,0.80531 -4.74859,2.20136 -2.97368,0.38896 -5.46251,2.44529 -6.40534,5.29224 -3.13486,6.28843 -8.63524,11.21997 -15.29104,13.4776 -0.0637,0.0216 -0.11992,0.05 -0.1758,0.0783 -3.07749,1.12758 -6.16259,3.1643 -8.78919,5.80245 -5.19155,5.23656 -7.72858,11.93658 -6.30024,16.63822 -0.14098,0.40857 -0.21361,0.83759 -0.21498,1.26979 1.5e-4,2.17082 1.75991,3.93058 3.93073,3.93073 0.54341,-0.002 1.08053,-0.11639 1.57745,-0.33632 4.69369,1.05881 11.06885,-1.54582 16.05444,-6.55917 2.82624,-2.85072 4.94356,-6.22349 5.98303,-9.53062 2.31696,-6.62278 7.29699,-12.01856 13.62281,-15.05312 0.15105,-0.0725 0.27303,-0.14714 0.38218,-0.22358 2.12082,-1.01408 3.67251,-2.92895 4.225,-5.2139 9.70222,11.44481 24.25255,18.75299 40.51876,19.13577 29.83352,0.70205 52.13299,-21.25802 53.16414,-52.83642 0.51894,-15.89259 -5.62993,-36.3847 -19.6412,-53.19089 -10.70835,-12.84441 -26.40987,-23.50795 -44.18699,-28.20777 z"
+       style="fill:#ffd700;fill-opacity:1;stroke:none;stroke-width:0.625044;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>

client/public/images/countries/yug.svg

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 640 480"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="yug.svg"
+   width="640"
+   height="480"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.91840278"
+     inkscape:cx="253.1569"
+     inkscape:cy="286.91115"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <path
+     fill="#dd0000"
+     d="M 0,320 H 640 V 480 H 0"
+     id="path2"
+     style="stroke-width:0.999996" />
+  <path
+     fill="#ffffff"
+     d="M 0,160 H 640 V 320 H 0"
+     id="path4"
+     style="stroke-width:0.999996" />
+  <path
+     fill="#003893"
+     d="M 0,0 H 640 V 160 H 0"
+     id="path6"
+     style="stroke-width:0.999996" />
+</svg>

client/public/stylesheets/aic/aic.css

@@ -1,194 +0,0 @@
-/**************************************/
-
-.olympus-dialog {
-	align-self: center;
-	background:white;
-	border-radius: 10px;
-	display: flex;
-	flex-direction: column;
-	justify-self: center;
-	padding:10px;
-	position:absolute;
-	width:fit-content;
-	z-index: 9999;
-}
-
-.olympus-dialog-close {
-	cursor:pointer;
-	position:absolute;
-	right:10px;
-	top:5px;
-}
-
-.olympus-dialog-header {
-	font-weight:bold;
-}
-
-
-/**************************************/
-
-
-/*****  AIC  *****/
-
-.aic-panel {
-    z-index: 9999;
-}
-
-#aic-control-panel {
-    bottom:30px;
-    position: absolute;
-    left:30px;
-}
-
-
-#aic-control-panel .olympus-button img {
-    max-width: 32px;
-}
-
-
-#aic-toolbox, #aic-callsign-panel {
-	align-items: flex-start;
-	align-self: center;
-	flex-direction: column;
-	row-gap: 10px;
-	display:none;
-	position:absolute;
-}
-
-.aic-panel {
-	background:#eaeaea;
-	border-bottom-right-radius: 10px;
-	border-top-right-radius: 10px;
-	justify-self: left;
-	padding:5px 10px;
-}
-
-.aic-enabled #aic-toolbox, .aic-enabled #aic-callsign-panel {
-	display:flex;
-}
-
-.aic-enabled #aic-callsign-panel {
-	align-self: auto;
-	top: 100px;
-}
-
-.aic-panel h2 {
-	font-size:90%;
-	margin:0;
-	padding:0;
-	text-align: center;
-}
-
-#aic-callsign-display {
-	text-align: center;
-}
-
-#aic-formation-list {
-	display:flex;
-	flex-direction: column;
-	justify-content: center;
-}
-
-#aic-formation-list > div {
-	align-items: center;
-	cursor: pointer;
-	display:flex;
-	flex-direction: column;
-	justify-content: center;
-	margin-top:10px;
-	position:relative;
-}
-
-#aic-formation-list .aic-formation-image img {
-	border: 1px solid #ccc;
-	border-radius: 10px;
-	max-width: 50px;
-}
-
-#aic-formation-list .aic-formation-name {
-	font-size:90%;
-}
-
-#aic-formation-list .aic-formation-descriptor {
-	background:white;
-	border-radius: 10px;
-	left:100px;
-	padding:5px;
-	position:absolute;
-	width: max-content;
-}
-
-#aic-teleprompt {
-	background-color: white;
-	border:2px solid black;
-	border-radius: 10px;
-	bottom: 50px;
-	color: black;
-	display: none;
-	justify-content: center;
-	justify-self: center;
-	padding: 10px;
-	position: absolute;
-	width: fit-content;
-	z-index: 9999;
-}
-
-.aic-enabled #aic-teleprompt {
-	display:flex;
-}
-
-#aic-descriptor {
-	display:flex;
-	flex-direction: row;
-}
-
-#aic-descriptor .aic-descriptor-section {
-	display:flex;
-	flex-direction: column;
-	margin:0 10px;
-}
-
-#aic-descriptor .aic-descriptor-section-label {
-	background-color:#eaeaea;
-	border-top-left-radius: 10px;
-	border-top-right-radius: 10px;
-	padding:.25em;
-	text-align: center;
-}
-
-#aic-descriptor .aic-descriptor-phrase {
-	border-bottom: 1px solid #ccc;
-	display:flex;
-	flex-direction: row;
-	margin-bottom:5px;
-	padding-bottom:2px;
-}
-
-#aic-descriptor .aic-descriptor-phrase:last-of-type {
-	margin-bottom: 0;
-}
-
-#aic-descriptor .aic-descriptor-components .aic-descriptor-component {
-	margin:0 5px;
-	text-align: center;
-}
-
-#aic-descriptor .aic-descriptor-component-label {
-	display:none;
-}
-
-#aic-descriptor .aic-descriptor-component-value:after {
-	content:",";
-	margin-right:5px;
-}
-
-#aic-descriptor .aic-descriptor-component:last-of-type .aic-descriptor-component-value:after {
-	content:"; ";
-}
-
-#aic-descriptor .aic-descriptor-section:last-of-type .aic-descriptor-component:last-of-type .aic-descriptor-component-value:after {
-	content:".";
-}
-
-
-/**************************************/

client/public/stylesheets/atc/atc.css

@@ -1,205 +0,0 @@
-.ol-strip-board .ol-dialog-header {
-    align-items: center;
-    display:flex;
-    justify-content: space-between;
-}
-
-.ol-strip-board-strips {
-    display:flex;
-    flex-direction: column;
-    row-gap: 4px;
-}
-
-.ol-strip-board-strip {
-    align-items: center;
-    border-radius: var( --border-radius-sm );
-    column-gap: 4px;
-    display:flex;
-    flex-flow: row nowrap;
-    row-gap:4px;
-}
-
-.ol-strip-board-strip[data-flight-status="checkedin"] {
-    background-color: #ffffff2A;
-}
-
-.ol-strip-board-strip[data-flight-status="readytotaxi"] {
-    background-color: #ffff0063;
-}
-
-.ol-strip-board-strip[data-flight-status="clearedtotaxi"] {
-    background-color: #00ff0030;
-}
-
-.ol-strip-board-strip[data-flight-status="halted"] {
-    background-color: #FF000040;
-}
-
-.ol-strip-board-strip[data-flight-status="terminated"] {
-    background-color: black;
-}
-
-.ol-strip-board-headers {
-    column-gap: 4px;
-    display:flex;
-    flex-flow:row nowrap;
-    text-align: center;
-}
-
-.ol-strip-board-headers > *, .ol-strip-board-strip > [data-point] {
-    padding: 4px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    width:80px;
-}
-
-.ol-strip-board-strip input[type="text"] {
-    appearance: none;
-    background-color: transparent;
-    border:1px solid #ffffff30;
-    border-radius: var( --border-radius-sm );
-    color:white;
-    font-size:12px;
-    font-weight:normal;
-    outline:none;
-    padding: 4px 0;
-    text-align: center;
-    width:100%;
-}
-
-.ol-strip-board-strip[data-time-warning="level-1"] [data-point="timeToGo"] {
-    border:1px solid #cc0000;
-}
-
-.ol-strip-board-headers :nth-child(1) {
-    width:12px;
-}
-
-.ol-strip-board-headers :nth-child(2),
-.ol-strip-board-strip :nth-child(2),
-[data-board-type="ground"] .ol-strip-board-headers :nth-child(3),
-[data-board-type="ground"] .ol-strip-board-strip :nth-child(3) {
-    width:130px;
-}
-
-[data-board-type="ground"] .ol-strip-board-strip :nth-child(5) {
-    text-align: center;
-}
-
-
-
-.ol-strip-board-headers :last-child,
-.ol-strip-board-strip :last-child {
-    width:20px;
-}
-
-
-
-
-
-
-[data-board-type="tower"] .ol-strip-board-strip > * {
-    text-align: center;
-}
-
-[data-board-type="tower"] .ol-strip-board-strip a {
-    color:white;
-}
-
-[data-board-type="tower"] .ol-strip-board-strip > :nth-child(2) {
-    text-align: left;
-}
-
-[data-board-type="tower"] .ol-strip-board-strip :nth-child(3) input,
-[data-board-type="tower"] .ol-strip-board-strip :nth-child(5) input {
-    width:30px;
-}
-
-[data-board-type="tower"] .ol-strip-board-strip :nth-child(3) {
-    font-size:10px;
-}
-
-
-[data-altitude-assigned] [data-point="assignedAltitude"] input,
-[data-speed-assigned] [data-point="assignedSpeed"] input {
-    background-color:#ffffffbb;
-    color: black;
-    font-weight: var( --font-weight-bolder );
-}
-
-[data-warning-altitude] [data-point="altitude"],
-[data-warning-speed] [data-point="speed"] {
-    background:#cc0000;
-    border-radius: var( --border-radius-sm );
-}
-
-
-
-.ol-strip-board-strip > [data-point="name"] {
-    text-overflow: ellipsis;
-    overflow:hidden;
-}
-
-.ol-strip-board-strip .ol-select-value {
-    opacity: .85;
-}
-
-
-.ol-strip-board-add-flight {
-    display:flex;
-    flex-flow: row nowrap;
-    position:relative;
-}
-
-
-.ol-strip-board-add-flight > * {
-    border:none;
-    outline: none;
-    padding:4px 8px;
-}
-
-.add-flight-by-click img {
-    filter:invert();
-    height: 12px;
-}
-
-.ol-strip-board-add-flight input {
-    border-radius: var( --border-radius-sm );
-}
-
-.ol-strip-board-add-flight .ol-auto-suggest {
-    background:white;
-    border-radius: var(--border-radius-sm );
-    color:black;
-    display:none;
-    flex-direction: column;
-    left:0;
-    margin:0;
-    position:absolute;
-    translate:0 -100%;
-    top:0;
-}
-
-.ol-strip-board-add-flight .ol-auto-suggest[data-has-suggestions] {
-    display:flex;
-    row-gap: 4px;
-}
-
-.ol-strip-board-add-flight .ol-auto-suggest[data-has-suggestions] a {
-    cursor: pointer;
-}
-
-
-[data-board-type="ground"] {
-    bottom:20px;
-}
-
-[data-board-type="tower"] {
-    right:10px;
-    top:10px;
-}
-
-[data-board-type="tower"] .ol-auto-suggest {
-    top:30px;
-    translate:0;
-}

client/public/stylesheets/atc/unitdatatable.css

@@ -1,27 +0,0 @@
-#unit-list {
-    display:flex;
-    flex-direction: column;
-    font-size:13px;
-    height: 250px;
-    width:fit-content;
-}
-
-#unit-list > div {
-    display:flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-}
-
-#unit-list > div > div {
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    width:100px;
-}
-
-#unit-list > div:first-of-type {
-    text-align: center;
-}
-
-#unit-list > div > div:nth-of-type( 4 ) {
-    text-align: center;
-}

client/public/stylesheets/layout/layout.css

@@ -1,3 +1,7 @@
+:root {
+	--right-panel-width:190px;
+}
+
 /* Page style */
 #map-container {
 	height: 100%;
@@ -11,13 +15,32 @@
 	left: 10px;
 	position: absolute;
 	top: 10px;
-	z-index: 9999;
+	z-index: 99999;
 	column-gap: 10px;
+	margin-right: 320px;
+	height: fit-content;
+}
+
+@media (max-width: 1820px) {
+    #toolbar-container {
+        flex-direction: column;
+		align-items: start;
+		row-gap: 10px;
+    }
 }
 
 #primary-toolbar {
 	align-items: center;
 	display: flex;
+	height: fit-content;
+	min-width: 650px;
+}
+
+@media (max-width: 1820px) {
+    #primary-toolbar {
+        row-gap: 10px;
+		flex-wrap: wrap;
+    }
 }
 
 #command-mode-toolbar {
@@ -49,16 +72,7 @@
 	font-size: 12px;
 	position: absolute;
 	right: 10px;
-	width: 180px;
-	z-index: 9999;
-}
-
-#server-status-panel {
-	bottom: 20px;
-	font-size: 12px;
-	position: absolute;
-	right: 200px;
-	width: 300px;
+	width: var( --right-panel-width );
 	z-index: 9999;
 }
 
@@ -70,7 +84,7 @@
 	position: absolute;
 	right: 10px;
 	row-gap: 10px;
-	width: 180px;
+	width: var( --right-panel-width );
 	z-index: 9999;
 }
 
@@ -83,6 +97,18 @@
 	z-index: 9999;
 }
 
+@media (max-width: 1820px) {
+    #unit-control-panel {
+        top: 150px;
+    }
+}
+
+@media (max-width: 1350px) {
+    #unit-control-panel {
+        top: 190px;
+    }
+}
+
 #unit-info-panel {
 	bottom: 20px;
 	font-size: 12px;
@@ -91,6 +117,15 @@
 	width: fit-content;
 	z-index: 9999;
 	padding: 24px 30px;
+	display: flex;
+    flex-direction: row;
+    justify-content: space-evenly;
+}
+
+@media (max-width: 1525px) {
+    #unit-info-panel {
+		flex-direction: column;
+    }
 }
 
 #info-popup {
@@ -100,7 +135,7 @@
     top: 100px;
     left: 50%;
     translate: -50% 0%;
-    z-index: 9999;
+    z-index: 9999999999;
 	display: flex;
 	align-items: center;
 }
@@ -108,7 +143,7 @@
 #log-panel {
 	position: absolute;
 	right: 0px;
-	top: 220px;
+	top: 170px;
 	width: 310px;
 	height: fit-content;
 	z-index: 9990;

client/public/stylesheets/leaflet/leaflet-gesture-handling.css

@@ -0,0 +1,47 @@
+@-webkit-keyframes leaflet-gestures-fadein {
+  0% {
+    opacity: 0; }
+  100% {
+    opacity: 1; } }
+
+@keyframes leaflet-gestures-fadein {
+  0% {
+    opacity: 0; }
+  100% {
+    opacity: 1; } }
+
+.leaflet-container:after {
+  -webkit-animation: leaflet-gestures-fadein 0.8s backwards;
+          animation: leaflet-gestures-fadein 0.8s backwards;
+  color: #fff;
+  font-family: "Roboto", Arial, sans-serif;
+  font-size: 22px;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  padding: 15px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  z-index: 461;
+  pointer-events: none; }
+
+.leaflet-gesture-handling-touch-warning:after,
+.leaflet-gesture-handling-scroll-warning:after {
+  -webkit-animation: leaflet-gestures-fadein 0.8s forwards;
+          animation: leaflet-gestures-fadein 0.8s forwards; }
+
+.leaflet-gesture-handling-touch-warning:after {
+  content: attr(data-gesture-handling-touch-content); }
+
+.leaflet-gesture-handling-scroll-warning:after {
+  content: attr(data-gesture-handling-scroll-content); }

client/public/stylesheets/markers/units.css

@@ -265,9 +265,9 @@
 }
 
 [data-object|="unit"][data-state="attack"] .unit-state,
-[data-object|="unit"][data-state="bombing point"] .unit-state,
-[data-object|="unit"][data-state="carpet bombing"] .unit-state,
-[data-object|="unit"][data-state="firing at area"] .unit-state {
+[data-object|="unit"][data-state="bomb-point"] .unit-state,
+[data-object|="unit"][data-state="carpet-bombing"] .unit-state,
+[data-object|="unit"][data-state="fire-at-area"] .unit-state {
     background-image: url("/resources/theme/images/states/attack.svg");
 }
 
@@ -287,10 +287,27 @@
     background-image: url("/resources/theme/images/states/dcs.svg");
 }
 
+[data-object|="unit"][data-state="land-at-point"] .unit-state {
+    background-image: url("/resources/theme/images/states/land-at-point.svg");
+}
+
 [data-object|="unit"][data-state="no-task"] .unit-state {
     background-image: url("/resources/theme/images/states/no-task.svg");
 }
 
+[data-object|="unit"][data-state="off"] .unit-state {
+    background-image: url("/resources/theme/images/states/off.svg");
+}
+
+[data-object|="unit"][data-state="tanker"] .unit-state {
+    background-image: url("/resources/theme/images/states/tanker.svg");
+}
+
+[data-object|="unit"][data-state="AWACS"] .unit-state {
+    background-image: url("/resources/theme/images/states/awacs.svg");
+}
+
+
 /*** Dead unit ***/
 [data-object|="unit"][data-is-dead] .unit-selected-spotlight,
 [data-object|="unit"][data-is-dead] .unit-short-label,

client/public/stylesheets/other/contextmenus.css

@@ -30,12 +30,74 @@
     flex-direction: column;
     justify-content: space-between;
     row-gap: 5px;
+    padding: 20px;
 }
 
-#aircraft-spawn-menu,
-#helicopter-spawn-menu,
-#groundunit-spawn-menu,
-#navyunit-spawn-menu {
+#map-contextmenu>div:nth-child(n+4)>div {
+    width: 100%;
+}
+
+.contextmenu-advanced-options,
+.contextmenu-metadata {
+    align-items: center;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    row-gap: 5px;
+    width: 100%;
+}
+
+.contextmenu-advanced-options-toggle,
+.contextmenu-metadata-toggle {
+    display: flex;
+    align-content: center;
+    text-align: left;
+    width: 100%;
+    margin: 5px;
+    column-gap: 5px;
+    cursor: pointer;
+}
+
+.contextmenu-advanced-options-toggle:after,
+.contextmenu-metadata-toggle:after {
+    content: url(/resources/theme/images/icons/chevron-down.svg);
+    margin: auto;
+}
+
+.contextmenu-advanced-options-toggle div:first-child,
+.contextmenu-metadata-toggle div:first-child {
+    width: fit-content;
+    white-space: nowrap;
+}
+
+.contextmenu-advanced-options>*,
+.contextmenu-metadata>* {
+    width: 100%;
+}
+
+.contextmenu-metadata {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    padding: 0px 10px 10px 10px;
+}
+
+.contextmenu-metadata>div:nth-child(1) {
+    margin-bottom: 5px;
+    width: 100%;
+}
+
+.contextmenu-metadata>div:nth-child(2) {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    row-gap: 5px;
+    column-gap: 5px;
+    width: 100%;
+    margin-top: 10px;
+}
+
+.unit-spawn-menu {
     height: fit-content;
 }
 
@@ -58,11 +120,30 @@
     width: 50px;
 }
 
-#aircraft-spawn-menu .ol-select.is-open .ol-select-options,
-#helicopter-spawn-menu .ol-select.is-open .ol-select-options {
+.unit-spawn-menu .ol-select.is-open .ol-select-options {
     max-height: 300px;
 }
 
+.unit-loadout-list {
+    min-width: 0;
+}
+
+.unit-loadout-list div {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    background-color: var(--background-steel);
+    padding: 2px 5px 2px 5px;
+}
+
+.unit-loadout-list div:hover {
+    overflow: visible;
+    white-space: nowrap;
+    background-color: var(--background-steel);
+    width: fit-content;
+    border-radius: var(--border-radius-sm);
+}
+
 .deploy-unit-button {
     margin-top: 5px;
     text-align: center;
@@ -82,7 +163,7 @@
     margin: 0px 5px;
 }
 
-.upper-bar button:nth-child(2) {
+.upper-bar button:first-of-type {
     margin-left: auto;
 }
 
@@ -137,31 +218,44 @@
     content: "Create neutral unit";
 }
 
-#aircraft-loadout-preview,
-#helicopter-loadout-preview {
+.unit-label-count-container {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    column-gap: 5px;
+}
+
+.unit-label-count-container>div:nth-child(1) {
+    width: 100%;
+    min-width: 0;
+}
+
+.unit-label-count-container>div:nth-child(2) {
+    font-size: large;
+}
+
+.unit-loadout-preview {
     align-content: space-between;
     align-items: center;
-    column-gap: 20px;
+    column-gap: 10px;
     display: flex;
     flex-direction: row;
     width: 100%;
 }
 
-#aircaft-loadout-list,
-#helicopter-loadout-list {
+.unit-loadout-list {
     align-content: center;
     display: flex;
     flex-direction: column;
     height: 100%;
+    padding: 5px;
 }
 
-#aircraft-unit-image,
-#helicopter-unit-image {
+.unit-image {
     filter: invert(100%);
-    height: 100px;
-    margin-bottom: 10px;
-    margin-top: 10px;
-    width: 100px;
+    width: 25%;
+    aspect-ratio: 1/1;
+    margin: 5px 0px;
 }
 
 #smoke-spawn-menu {
@@ -259,14 +353,25 @@
 #unit-contextmenu div:before {
     display: inline-block;
     filter: invert(100%);
-    height: 16px;
+    height: 20px;
     margin-right: 15px;
-    width: 16px;
+    width: 20px;
 }
 
+.ol-select>.ol-select-options>div button.country-dropdown-element {
+    display: flex;
+    flex-direction: row;
+    align-content: center;
+    column-gap: 10px;
+    width: 100%;
+}
+
+.country-dropdown-element img {
+    height: 20px;
+    aspect-ratio: initial;
+}
 
 /*  Buttons  */
-
 #center-map::before {
     content: url("/resources/theme/images/icons/arrows-to-eye-solid.svg");
 }
@@ -291,10 +396,34 @@
     content: url("/resources/theme/images/icons/crosshairs-solid.svg");
 }
 
+#simulate-fire-fight::before {
+    content: url("/resources/theme/images/icons/crosshairs-solid.svg");
+}
+
 #follow::before {
     content: url("/resources/theme/images/icons/follow.svg");
 }
 
+#scenic-aaa::before {
+    content: url("/resources/theme/images/icons/scenic.svg");
+}
+
+#miss-aaa::before {
+    content: url("/resources/theme/images/icons/miss.svg");
+}
+
+#group-ground::before {
+    content: url("/resources/theme/images/icons/group-ground.svg");
+}
+
+#group-navy::before {
+    content: url("/resources/theme/images/icons/group-navy.svg");
+}
+
+#land-at-point::before {
+    content: url("/resources/theme/images/icons/land-at-point.svg");
+}
+
 #trail::before {
     content: url("/resources/theme/images/icons/trail.svg");
 }
@@ -486,4 +615,36 @@
 
 #airbase-runways>.runway>.heading:last-of-type {
     flex-direction: row-reverse;
+}
+
+/* Airbase spawn menu */
+#airbase-spawn-contextmenu {
+    display: flex;
+    flex-direction: column;
+    height: fit-content;
+    position: absolute;
+    row-gap: 5px;
+    width: 300px;
+    z-index: 9999;
+}
+
+#airbase-spawn-contextmenu>div:nth-child(2) {
+    align-items: center;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-evenly;
+    padding-right: 0px;
+}
+
+#airbase-spawn-contextmenu >div:nth-child(n+3) {
+    align-items: center;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    row-gap: 5px;
+    padding: 20px;
+}
+
+#airbase-spawn-contextmenu>div:nth-child(n+3)>div {
+    width: 100%;
 }

client/public/stylesheets/other/popup.css

@@ -1,8 +1,28 @@
+.ol-popup {
+    display: flex;
+    flex-direction: column;
+    row-gap: 5px;
+}
+
 .ol-popup > div {
+    background-color: var(--background-steel);
+    border-radius: var(--border-radius-md);
+    box-shadow: 0px 2px 5px #000A;
+    color: white;
+    font-size: 12px;
+    height: fit-content;
+    width: fit-content;
+    padding-top: 5px;
+    padding-bottom: 5px;
     padding-left: 15px;
     padding-right: 15px;
 }
 
+.ol-popup-stack {
+    margin-bottom: -20px;
+    z-index: -1;
+}
+
 .visible {
     opacity: 1;
 }

client/public/stylesheets/panels/connectionstatus.css

@@ -1,8 +1,15 @@
-#connection-status-panel dt::before {
+#connection-status-panel {
+	align-items: center;
+	display:flex;
+	flex-direction: row;
+	justify-content: space-between;
+}
+
+#connection-status-panel #connection-status-message::before {
 	content: "No connection";
 }
 
-#connection-status-panel dd::after {
+#connection-status-light {
 	border-radius: 50%;
 	background: red;
 	content: " ";
@@ -10,10 +17,48 @@
 	width: 12px;
 }
 
-#connection-status-panel[data-is-connected] dt::before {
-	content: "Connected";
+#connection-status-panel[data-is-connected] #connection-status-message::before {
+	content: "";
 }
 
-#connection-status-panel[data-is-connected] dd::after {
+#connection-status-panel .time-display {
+	cursor:pointer;
+	display:none;
+	font-weight: bold;
+	text-decoration: none;
+}
+
+#connection-status-panel[data-is-connected] .mission-elapsed-time,
+#connection-status-panel[data-is-connected]:not([data-mission-time]) .mission-time {
+	display:none;
+}
+
+#connection-status-panel[data-is-connected]:not([data-mission-time]) .mission-elapsed-time,
+#connection-status-panel[data-is-connected][data-mission-time] .mission-time {
+	display:block;
+}
+
+#connection-status-panel[data-is-connected] #connection-status-light {
 	background: var(--accent-green);
+}
+
+#connection-status-panel[data-is-paused] #connection-status-message::before {
+	content: "Server paused";
+}
+
+#connection-status-panel[data-is-paused] #connection-status-light {
+	animation: pulse 1s infinite;
+}
+
+@keyframes pulse {
+	0% {
+		opacity: 0;
+	}
+	100% {
+		opacity: 1;
+	}
+}
+
+#connection-status-panel[data-is-paused] #connection-status-light {
+	background: var(--accent-amber);
 }

client/public/stylesheets/panels/logpanel.css

@@ -26,3 +26,55 @@
 #log-panel.open>div:nth-child(2) {
 	display: block;
 }
+
+
+#log-panel-header-right {
+    align-items: center;
+    column-gap: 16px;
+    display:flex;
+    flex-flow: row nowrap;
+}
+
+#server-status-panel abbr {
+	text-decoration: none;
+}
+
+#server-status-panel dl {
+    column-gap: 4px;
+    display:flex;
+    flex-direction: row;
+    width:fit-content;
+}
+
+#server-status-panel dl > * {
+    margin:0;
+    width:fit-content;
+}
+
+#server-status-panel dd {
+    font-weight: bold;
+}
+
+.fps-low {
+    color: red;
+}
+
+.fps-medium {
+    color: orange;
+}
+
+.fps-high {
+    color: lightgreen;
+}
+
+.load-low {
+    color: lightgreen;
+}
+
+.load-medium {
+    color: orange;
+}
+
+.load-high {
+    color: red;
+}

client/public/stylesheets/panels/mouseinfo.css

@@ -1,9 +1,116 @@
-#mouse-info-panel>* {
+#mouse-info-panel .mouse-tool {
 	background-color: var(--background-grey);
 	border-radius: var(--border-radius-sm);
+	display:flex;
+	flex-flow:column wrap;
+	row-gap: 4px;
 	padding: 6px;
 }
 
+#mouse-info-panel .mouse-tool .mouse-tool-item {
+	align-items: center;
+	display:flex;
+	flex-flow: row nowrap;
+	justify-content: space-between;
+}
+
+
+#mouse-info-panel svg {
+	padding: 3px;
+	height: 100%;
+	width: 100%;
+}
+
+#mouse-info-panel svg > * {
+	fill: black;
+	stroke: black;
+}
+
+#mouse-info-panel .mouse-tool .mouse-tool-item > * {
+	width:fit-content;
+}
+
+#mouse-info-panel .mouse-tool .mouse-tool-item > *:last-child {
+	text-align: right;
+	width:100%;
+}
+
+#mouse-info-panel .svg-icon, #mouse-info-panel .mouse-tool .mouse-tool-item :first-child {
+	align-items: center;
+	background-color: white;
+	border-radius: var(--border-radius-sm);
+	color: var(--background-steel);
+	display: flex;
+	font-size: 15.6px;
+	font-weight: bolder;
+	height: 22px;
+	justify-content: center;
+	text-transform: uppercase;
+	width: 22px;
+}
+
+#mouse-info-panel .mouse-tool .mouse-tool-item [data-label]::after {
+	border-radius: var(--border-radius-sm);
+	content: attr(data-label);
+}
+
+
+#mouse-info-panel .mouse-tool .mouse-tool-item :last-child {
+	color: var(--background-offwhite);
+	font-weight: bold;
+	font-size: 13px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	width:fit-content;
+}
+
+
+/*  Bullseye info  */
+
+#mouse-info-panel .mouse-tool .mouse-tool-item [data-label][data-coalition="blue"] {
+	background-color: var(--primary-blue);
+}
+
+#mouse-info-panel .mouse-tool .mouse-tool-item [data-label][data-coalition="red"] {
+	background-color: var(--primary-red);
+}
+
+.br-info::after {
+    content: attr(data-bearing) '\00B0  / ' attr(data-distance) " " attr(data-distance-units);
+}
+
+.br-info[data-coalition="blue"]::after {
+    color: var(--primary-blue)
+}
+
+.br-info[data-coalition="red"]::after {
+    color: var(--primary-red)
+}
+
+.br-info[data-message]::after {
+    content: attr(data-message);
+}
+
+
+/*  Coordinates  */
+#coordinates-tool .elevation::after {
+	content: attr(data-value)
+}
+
+#coordinates-tool[data-location-system] [data-location-system] {
+	cursor:pointer;
+	display:none;
+}
+
+#coordinates-tool[data-location-system="LatLng"] [data-location-system="LatLng"],
+#coordinates-tool[data-location-system="MGRS"] [data-location-system="MGRS"],
+#coordinates-tool[data-location-system="UTM"] [data-location-system="UTM"] {
+	display:flex;
+}
+
+
+/* 
 #mouse-info-panel dl {
 	margin-bottom: 4px;
 	row-gap: 5px;
@@ -14,7 +121,7 @@
 	width: 30%;
 }
 
-#mouse-info-panel dt::after {
+#mouse-info-panel dt::after, #coordinates-tool [data-label] {
 	align-items: center;
 	background-color: white;
 	border-radius: var(--border-radius-sm);
@@ -30,6 +137,11 @@
 	width: 16px;
 }
 
+#coordinates-tool [data-label] {
+	height:24px;
+	width:24px;
+}
+
 #mouse-info-panel #measuring-tool dt {
 	height: 24px;
 	width: 24px;
@@ -48,7 +160,7 @@
 	stroke: black;
 }
 
-#mouse-info-panel dt[data-label]::after {
+#mouse-info-panel [data-label]::after {
 	content: attr(data-label);
 }
 
@@ -60,7 +172,7 @@
 	background-color: var(--primary-red);
 }
 
-#mouse-info-panel dt[data-tooltip]:hover::before {
+#mouse-info-panel [data-tooltip]:hover::before {
 	background-color: var(--background-grey);
 	border-radius: 5px;
 	content: attr(data-tooltip);
@@ -72,8 +184,30 @@
 	white-space: nowrap;
 }
 
-#mouse-info-panel dd {
-	width: 70%;
+#coordinates-tool[data-location-system] [data-location-system] {
+	display:none;
+	flex-direction: column;
+}
+
+#coordinates-tool[data-location-system="LatLng"] [data-location-system="LatLng"],
+#coordinates-tool[data-location-system="MGRS"] [data-location-system="MGRS"] {
+	display:flex;
+}
+
+#coordinates-tool > * > * {
+	align-items: center;
+	display:flex;
+	flex-flow: row nowrap;
+}
+
+#coordinates-tool > * > * > * {
+	display:table-cell;
+	width:fit-content;
+}
+
+#coordinates-tool > * > * > :last-child {
+	text-align: right;
+	width:100%;
 }
 
 .br-info::after {
@@ -106,4 +240,14 @@
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	color: var(--background-offwhite);
-}
+}
+
+.elevation::after {
+    content: attr(data-value);
+	font-weight: bold;
+	font-size: 13px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	color: var(--background-offwhite);
+} */

client/public/stylesheets/panels/serverstatus.css

@@ -5,13 +5,24 @@
     column-gap: 10px;
 }
 
-#server-status-panel .ol-data-grid {
-    width: 100%;
+
+#log-panel-header-right {
+    align-items: center;
+    column-gap: 16px;
+    display:flex;
+    flex-flow: row nowrap;
 }
 
-#server-status-panel .ol-data-grid:first-of-type {
-    border-right: 1px solid gray;
-    padding-right: 10px;
+#server-status-panel dl {
+    column-gap: 4px;
+    display:flex;
+    flex-direction: row;
+    width:fit-content;
+}
+
+#server-status-panel dl > * {
+    margin:0;
+    width:fit-content;
 }
 
 #server-status-panel dd {

client/public/stylesheets/panels/unitcontrol.css

@@ -91,8 +91,8 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 	justify-content: space-between;
 }
 
-#advanced-settings-dialog h4 {
-	white-space: nowrap;
+#advanced-settings-dialog>.ol-dialog-content>div input[type="number"] {
+    width: 60px;
 }
 
 #advanced-settings-dialog hr {
@@ -102,6 +102,12 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 
 #advanced-settings-dialog .ol-text-input input {
 	height: 40px;
+	width: fit-content;
+}
+
+#advanced-settings-dialog h4 {
+	width: fit-content;
+	text-wrap: nowrap;
 }
 
 #general-settings-grid {
@@ -136,19 +142,19 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 }
 
 #altitude-type-switch[data-value="true"]>.ol-switch-fill::before {
-	content: "AGL";
-}
-
-#altitude-type-switch[data-value="false"]>.ol-switch-fill::before {
 	content: "ASL";
 }
 
+#altitude-type-switch[data-value="false"]>.ol-switch-fill::before {
+	content: "AGL";
+}
+
 #speed-type-switch[data-value="true"]>.ol-switch-fill::before {
-	content: "GS";
+	content: "CAS";
 }
 
 #speed-type-switch[data-value="false"]>.ol-switch-fill::before {
-	content: "CAS";
+	content: "GS";
 }
 
 #unit-control-panel .ol-slider-value {
@@ -197,6 +203,22 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 	content: "NO";
 }
 
+#operate-as-switch[data-value="true"] .ol-switch-fill {
+	background-color: var(--accent-light-blue);
+}
+
+#operate-as-switch[data-value="false"] .ol-switch-fill {
+	background-color: var(--primary-red);
+}
+
+#operate-as-switch[data-value="true"]>.ol-switch-fill::before {
+	content: "BLUE" !important;
+}
+
+#operate-as-switch[data-value="false"]>.ol-switch-fill::before {
+	content: "RED" !important;
+}
+
 #advanced-settings-div {
 	column-gap: 5px;
 	display: flex;
@@ -217,14 +239,16 @@ body.feature-forceShowUnitControlPanel #unit-control-panel {
 #unit-control-panel:not([data-show-roe]) #roe,
 #unit-control-panel:not([data-show-threat]) #threat,
 #unit-control-panel:not([data-show-emissions-countermeasures]) #emissions-countermeasures,
+#unit-control-panel:not([data-show-tanker-button]) #tanker-on,
+#unit-control-panel:not([data-show-AWACS-button]) #AWACS-on,
 #unit-control-panel:not([data-show-on-off]) #ai-on-off,
 #unit-control-panel:not([data-show-follow-roads]) #follow-roads,
+#unit-control-panel:not([data-show-operate-as]) #operate-as,
 #unit-control-panel:not([data-show-advanced-settings-button]) #advanced-settings-button,
 #advanced-settings-dialog:not([data-show-settings]) #general-settings,
 #advanced-settings-dialog:not([data-show-tasking]) #tasking,
-#advanced-settings-dialog:not([data-show-tanker]) #tanker-checkbox,
-#advanced-settings-dialog:not([data-show-AWACS]) #AWACS-checkbox,
 #advanced-settings-dialog:not([data-show-TACAN]) #TACAN-options,
-#advanced-settings-dialog:not([data-show-radio]) #radio-options {
+#advanced-settings-dialog:not([data-show-radio]) #radio-options,
+#advanced-settings-dialog:not([data-show-air-unit-checkboxes]) .air-unit-checkbox {
 	display: none;
-}
+}

client/public/stylesheets/panels/unitinfo.css

@@ -4,6 +4,45 @@
 	bottom: 0px;
 }
 
+@media (min-width: 1525px) {  
+	#unit-info-panel>.panel-section {
+		border-right: 1px solid #555;
+		padding: 0 30px;
+	}
+
+	#unit-info-panel>.panel-section:first-child {
+		padding-left: 0px;
+	}
+
+	#unit-info-panel>.panel-section:last-child {
+		padding-right: 0px;
+	}
+
+	#unit-info-panel>.panel-section:last-of-type {
+		border-right-width: 0;
+	}
+}
+
+@media (max-width: 1525px) {
+	#unit-info-panel>.panel-section {
+		border-bottom: 1px solid #555;
+		padding: 30px 0px;
+	}
+
+	#unit-info-panel>.panel-section:first-child {
+		padding-top: 0px;
+	}
+
+	#unit-info-panel>.panel-section:last-child {
+		padding-bottom: 0px;
+	}
+
+	#unit-info-panel>.panel-section:last-of-type {
+		border-bottom-width: 0;
+	}
+}
+
+
 #general {
 	display: flex;
 	flex-direction: column;
@@ -58,10 +97,14 @@
 }
 
 #loadout-items {
+	margin-right: 20px;
 	align-self: center;
 	display: flex;
-	flex-flow: column nowrap;
+	flex-flow: column;
 	row-gap: 8px;
+	column-gap: 8px;
+	max-height: 90px;
+	flex-wrap: wrap;
 }
 
 #loadout-items>* {

client/public/stylesheets/panels/unitlist.css

@@ -0,0 +1,92 @@
+#unit-list-panel {
+    bottom:20px;
+    display:flex;
+    flex-direction: column;
+    justify-self:center;
+    position: absolute;
+    z-index:999;
+}
+
+#unit-list-panel h3 {
+    margin-bottom:4px;
+}
+
+#unit-list-panel-content {
+    display:flex;
+    flex-flow: column nowrap;
+    max-height: 200px;
+    row-gap: 4px;
+}
+
+.unit-list-unit {
+    border-radius: var( --border-radius-sm );
+    column-gap: 2px;
+    display:flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+}
+
+
+.unit-list-unit:nth-of-type(even) {
+    background:#ffffff10;
+    overflow:visible;
+}
+
+.unit-list-unit.headers {
+    margin-bottom:3px;
+    margin-right:10px;
+    overflow: hidden;
+}
+
+.unit-list-unit.headers [data-sort-field] {
+    cursor:pointer;
+}
+
+.unit-list-unit.headers > * {
+    background-color: var( --background-grey );
+    text-align: center;
+}
+
+.unit-list-unit > * {
+    font-size:13px;
+    overflow: hidden;
+    padding:2px;
+    width:80px;
+}
+
+.unit-list-unit :first-child {
+    overflow-x: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    width:150px;
+}
+
+.unit-list-unit :first-child:hover {
+    overflow:visible;
+}
+
+.unit-list-unit :first-child:hover span {
+    position:relative;
+    z-index:9999;
+}
+
+.unit-list-unit :first-child:hover span:hover {
+    background-color: white;
+    color: var( --background-steel );
+}
+
+.unit-list-unit :nth-child(2) {
+    width:120px;
+}
+
+.unit-list-unit > [data-unit-id] {
+    cursor:pointer;
+}
+
+#unit-list-panel-content > * {
+    cursor:pointer;
+}
+
+#unit-list-panel-content > .unit-list-unit:hover {
+    background-color: var( --background-grey );
+}

client/public/themes/olympus/images/buttons/visibility/helicopter.svg

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15.75"
+   height="14"
+   viewBox="0 0 15.75 14"
+   fill="none"
+   version="1.1"
+   id="svg7234"
+   sodipodi:docname="helicopter.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata6">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7238" />
+  <sodipodi:namedview
+     id="namedview7236"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="6.5390625"
+     inkscape:cx="26.041618"
+     inkscape:cy="10.30219"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7234" />
+  <path
+     inkscape:connector-curvature="0"
+     d="m 3.173155,1.0409694 c 0,-0.46651814 0.3476271,-0.84342412 0.7779063,-0.84342412 h 9.3348367 c 0.430278,0 0.777906,0.37690598 0.777906,0.84342412 0,0.4665187 -0.347628,0.8434202 -0.777906,0.8434202 H 9.3963807 V 3.571233 h 0.7779053 c 2.148956,0 3.889518,1.8871557 3.889518,4.2171087 v 1.686841 c 0,0.4665172 -0.347628,0.8434233 -0.777906,0.8434233 H 9.3963807 7.8405774 c -0.4886243,0 -0.9505011,-0.250391 -1.2446479,-0.6747365 L 4.8602324,7.1346873 C 4.7751488,7.0108098 4.6584662,6.9159274 4.5271922,6.8579429 L 1.2089503,5.4188529 C 0.97800953,5.318696 0.80298167,5.1025686 0.7422081,4.8389987 L 0.18309237,2.4088928 C 0.11988251,2.1426888 0.30706869,1.8843896 0.55988607,1.8843896 H 1.2283992 c 0.245524,0 0.4764649,0.1238773 0.6223221,0.3373706 L 2.7842066,3.571233 H 7.8405774 V 1.8843896 H 3.9510613 c -0.4302792,0 -0.7779063,-0.3769015 -0.7779063,-0.8434202 z m 6.2232257,7.5907923 h 3.1116153 v -0.84342 c 0,-1.3969171 -1.045307,-2.5302639 -2.33371,-2.5302639 H 9.3963807 Z m 5.9947173,2.7780193 c 0.303871,0.329462 0.303871,0.864511 0,1.193968 l -0.09481,0.102794 c -0.583429,0.632565 -1.375917,0.988385 -2.200006,0.988385 H 6.2847694 c -0.4302775,0 -0.7779054,-0.376906 -0.7779054,-0.843421 0,-0.466518 0.3476279,-0.843424 0.7779054,-0.843424 h 6.8115166 c 0.413259,0 0.809506,-0.176591 1.101221,-0.492874 l 0.09481,-0.102793 c 0.30387,-0.329461 0.79735,-0.329461 1.101219,0 z"
+     id="path1174-3"
+     style="fill:#202831;fill-opacity:1;stroke-width:0.02531246" />
+</svg>

client/public/themes/olympus/images/icons/burst-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M37.6 4.2C28-2.3 15.2-1.1 7 7s-9.4 21-2.8 30.5l112 163.3L16.6 233.2C6.7 236.4 0 245.6 0 256s6.7 19.6 16.6 22.8l103.1 33.4L66.8 412.8c-4.9 9.3-3.2 20.7 4.3 28.1s18.8 9.2 28.1 4.3l100.6-52.9 33.4 103.1c3.2 9.9 12.4 16.6 22.8 16.6s19.6-6.7 22.8-16.6l33.4-103.1 100.6 52.9c9.3 4.9 20.7 3.2 28.1-4.3s9.2-18.8 4.3-28.1L392.3 312.2l103.1-33.4c9.9-3.2 16.6-12.4 16.6-22.8s-6.7-19.6-16.6-22.8L388.9 198.7l25.7-70.4c3.2-8.8 1-18.6-5.6-25.2s-16.4-8.8-25.2-5.6l-70.4 25.7L278.8 16.6C275.6 6.7 266.4 0 256 0s-19.6 6.7-22.8 16.6l-32.3 99.6L37.6 4.2z"/></svg>

client/public/themes/olympus/images/icons/group-ground.svg

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1156"
+   sodipodi:docname="group-ground.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1160" /><sodipodi:namedview
+     id="namedview1158"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.3838301"
+     inkscape:cx="350.83787"
+     inkscape:cy="229.07436"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1156" /><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><g
+     id="g17054"
+     transform="matrix(1.0569047,0,0,1.0569047,-16.868728,-5.190059)"><rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+       id="rect13768"
+       width="162.59222"
+       height="162.59222"
+       x="200.25279"
+       y="-165.09651"
+       ry="1.6436043"
+       transform="rotate(45)" /><circle
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:10;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+       id="path15109"
+       cx="258.34097"
+       cy="139.82932"
+       r="52.56604" /></g><g
+     id="g17054-1"
+     transform="matrix(1.0569047,0,0,1.0569047,110.67584,204.85819)"><rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+       id="rect13768-9"
+       width="162.59222"
+       height="162.59222"
+       x="200.25279"
+       y="-165.09651"
+       ry="1.6436043"
+       transform="rotate(45)" /><circle
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:10;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+       id="path15109-6"
+       cx="258.34097"
+       cy="139.82932"
+       r="52.56604" /></g><g
+     id="g17054-3"
+     transform="matrix(1.0569047,0,0,1.0569047,-141.52275,204.13556)"><rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+       id="rect13768-7"
+       width="162.59222"
+       height="162.59222"
+       x="200.25279"
+       y="-165.09651"
+       ry="1.6436043"
+       transform="rotate(45)" /><circle
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:10;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+       id="path15109-8"
+       cx="258.34097"
+       cy="139.82932"
+       r="52.56604" /></g></svg>

client/public/themes/olympus/images/icons/group-navy.svg

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1156"
+   sodipodi:docname="group-navy.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1160" /><sodipodi:namedview
+     id="namedview1158"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.9570312"
+     inkscape:cx="262.38723"
+     inkscape:cy="288.19162"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1156" /><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:65.39;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+     id="path15424"
+     sodipodi:type="arc"
+     sodipodi:cx="259.66818"
+     sodipodi:cy="230.83046"
+     sodipodi:rx="226.81407"
+     sodipodi:ry="212.6382"
+     sodipodi:start="4.1887902"
+     sodipodi:end="5.2359878"
+     sodipodi:arc-type="slice"
+     d="m 146.26115,46.680378 a 226.81407,212.6382 0 0 1 226.81408,4e-6 L 259.66818,230.83046 Z" /><path
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:65.39;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+     id="path15424-9"
+     sodipodi:type="arc"
+     sodipodi:cx="386.81033"
+     sodipodi:cy="495.42886"
+     sodipodi:rx="226.81407"
+     sodipodi:ry="212.6382"
+     sodipodi:start="4.1887902"
+     sodipodi:end="5.2359878"
+     sodipodi:arc-type="slice"
+     d="m 273.4033,311.27878 a 226.81407,212.6382 0 0 1 226.81408,1e-5 L 386.81033,495.42886 Z" /><path
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:65.39;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1"
+     id="path15424-4"
+     sodipodi:type="arc"
+     sodipodi:cx="127.74452"
+     sodipodi:cy="495.42886"
+     sodipodi:rx="226.81407"
+     sodipodi:ry="212.6382"
+     sodipodi:start="4.1887902"
+     sodipodi:end="5.2359878"
+     sodipodi:arc-type="slice"
+     d="m 14.337485,311.27878 a 226.81407,212.6382 0 0 1 226.814085,1e-5 L 127.74452,495.42886 Z" /></svg>

client/public/themes/olympus/images/icons/jet-fighter-up-solid.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M270.7 9.7C268.2 3.8 262.4 0 256 0s-12.2 3.8-14.7 9.7L197.2 112.6c-3.4 8-5.2 16.5-5.2 25.2v77l-144 84V280c0-13.3-10.7-24-24-24s-24 10.7-24 24v56 32 24c0 13.3 10.7 24 24 24s24-10.7 24-24v-8H192v32.7L133.5 468c-3.5 3-5.5 7.4-5.5 12v16c0 8.8 7.2 16 16 16h96V448c0-8.8 7.2-16 16-16s16 7.2 16 16v64h96c8.8 0 16-7.2 16-16V480c0-4.6-2-9-5.5-12L320 416.7V384H464v8c0 13.3 10.7 24 24 24s24-10.7 24-24V368 336 280c0-13.3-10.7-24-24-24s-24 10.7-24 24v18.8l-144-84v-77c0-8.7-1.8-17.2-5.2-25.2L270.7 9.7z"/></svg>

client/public/themes/olympus/images/icons/land-at-point.svg

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="none"
+   version="1.1"
+   id="svg7234"
+   sodipodi:docname="land-at-point.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata6">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7238" />
+  <sodipodi:namedview
+     id="namedview7236"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="18.495262"
+     inkscape:cx="12.030108"
+     inkscape:cy="17.220627"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7234"
+     inkscape:pageshadow="2"
+     width="512px" />
+  <path
+     inkscape:connector-curvature="0"
+     d="m 3.4418938,1.8579231 c 0,-0.4470615 0.3331285,-0.8082476 0.7454662,-0.8082476 h 8.945519 c 0.412333,0 0.745462,0.3611861 0.745462,0.8082476 0,0.4470624 -0.333129,0.8082443 -0.745462,0.8082443 H 9.4055765 v 1.616493 h 0.7454615 c 2.059333,0 3.727303,1.80845 3.727303,4.04123 v 1.616491 c 0,0.4470596 -0.333129,0.8082466 -0.745462,0.8082466 H 9.4055765 7.9146585 c -0.468246,0 -0.910858,-0.239949 -1.192738,-0.646596 L 5.0586105,7.6974974 C 4.9770785,7.5787864 4.865263,7.4878614 4.7394601,7.4322944 L 1.5596118,6.0532234 C 1.3382988,5.9572434 1.1705709,5.7501304 1.1123358,5.4975524 L 0.57653646,3.1687964 c -0.0605718,-0.255102 0.1188069,-0.502629 0.36108,-0.502629 H 1.5782493 c 0.2352817,0 0.45659,0.118712 0.5963664,0.323301 l 0.894552,1.293192 H 7.9146585 V 2.6661674 H 4.18736 c -0.4123377,0 -0.7454662,-0.3611819 -0.7454662,-0.8082443 z m 5.9636827,7.2742113 h 2.9818415 v -0.808244 c 0,-1.338658 -1.001708,-2.424737 -2.23638,-2.424737 H 9.4055765 Z m 5.7447015,2.6621596 c 0.291199,0.315723 0.291199,0.828456 0,1.144173 l -0.09085,0.09851 c -0.559097,0.606184 -1.318536,0.947164 -2.108255,0.947164 H 6.4237353 c -0.4123284,0 -0.7454616,-0.361187 -0.7454616,-0.808246 0,-0.447061 0.3331332,-0.808248 0.7454616,-0.808248 h 6.5274377 c 0.396023,0 0.775745,-0.169226 1.055293,-0.472318 l 0.09085,-0.09851 c 0.291199,-0.31572 0.764099,-0.31572 1.055293,0 z"
+     id="path1174-3"
+     style="fill:#202831;fill-opacity:1;stroke-width:0.0290252" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:1.07268px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 0.90212206,15.260973 H 15.104269"
+     id="path855" />
+</svg>

client/public/themes/olympus/images/icons/miss-blue.svg

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1156"
+   sodipodi:docname="miss-blue.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1160" />
+  <sodipodi:namedview
+     id="namedview1158"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.3838301"
+     inkscape:cx="310.37048"
+     inkscape:cy="217.51226"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1156" />
+  <!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
+  <path
+     d="m 376.91839,231.41639 c -1.31238,-3.09721 -4.35709,-5.09202 -7.71677,-5.09202 -3.35968,0 -6.40439,1.99481 -7.71677,5.09202 l -23.1503,54.01737 c -1.78483,4.1996 -2.72974,8.66167 -2.72974,13.22874 v 40.42116 l -75.59281,44.0958 v -9.86906 c 0,-6.98183 -5.61697,-12.5988 -12.5988,-12.5988 -6.98184,0 -12.59881,5.61697 -12.59881,12.5988 v 29.39721 16.7984 12.5988 c 0,6.98184 5.61697,12.59881 12.59881,12.59881 6.98183,0 12.5988,-5.61697 12.5988,-12.59881 v -4.1996 h 75.59281 v 17.16587 l -30.70958,26.92994 c -1.83732,1.57485 -2.88722,3.88463 -2.88722,6.2994 v 8.3992 c 0,4.61956 3.77964,8.39921 8.3992,8.39921 h 50.39521 v -33.59681 c 0,-4.61956 3.77964,-8.3992 8.3992,-8.3992 4.61956,0 8.3992,3.77964 8.3992,8.3992 v 33.59681 h 50.39521 c 4.61956,0 8.3992,-3.77965 8.3992,-8.39921 v -8.3992 c 0,-2.41477 -1.0499,-4.72455 -2.88722,-6.2994 l -30.70958,-26.92994 v -17.16587 h 75.59281 v 4.1996 c 0,6.98184 5.61697,12.59881 12.5988,12.59881 6.98184,0 12.59881,-5.61697 12.59881,-12.59881 v -12.5988 -16.7984 -29.39721 c 0,-6.98183 -5.61697,-12.5988 -12.59881,-12.5988 -6.98183,0 -12.5988,5.61697 -12.5988,12.5988 v 9.86906 l -75.59281,-44.0958 V 298.6625 c 0,-4.56707 -0.94491,-9.02914 -2.72974,-13.22874 z"
+     id="path1154"
+     style="fill:#db841d;fill-opacity:1;stroke:none;stroke-width:0.52495;stroke-opacity:1" />
+  <path
+     d="m 184.66044,8.5185895 c 12.17907,0 22.01865,9.8395825 22.01865,22.0186445 v 7.15606 C 271.15243,47.257643 322.07055,98.244571 331.6349,162.6491 h 7.15606 c 12.17906,0 22.01864,9.83958 22.01864,22.01864 0,12.17907 -9.83958,22.01865 -22.01864,22.01865 h -7.15606 c -9.56435,64.47334 -60.55128,115.39146 -124.95581,124.95581 v 7.15606 c 0,12.17906 -9.83958,22.01864 -22.01865,22.01864 -12.17906,0 -22.01864,-9.83958 -22.01864,-22.01864 V 331.6422 C 98.168455,322.07785 47.250339,271.15973 37.68599,206.68639 h -7.156059 c -12.179063,0 -22.0186444,-9.83958 -22.0186444,-22.01865 0,-12.17906 9.8395814,-22.01864 22.0186444,-22.01864 H 37.68599 C 47.250339,98.175761 98.168455,47.257643 162.6418,37.693294 v -7.15606 c 0,-12.179062 9.83958,-22.0186445 22.01864,-22.0186445 z M 82.411363,206.68639 c 8.601033,40.11522 40.184027,71.6294 80.230437,80.23043 v -14.1745 c 0,-12.17906 9.83958,-22.01864 22.01864,-22.01864 12.17907,0 22.01865,9.83958 22.01865,22.01864 v 14.1745 c 40.11522,-8.60103 71.6294,-40.18402 80.23044,-80.23043 h -14.17451 c -12.17906,0 -22.01864,-9.83958 -22.01864,-22.01865 0,-12.17906 9.83958,-22.01864 22.01864,-22.01864 h 14.17451 C 278.30849,122.53388 246.79431,91.019701 206.67909,82.418665 v 14.174506 c 0,12.179059 -9.83958,22.018639 -22.01865,22.018639 -12.17906,0 -22.01864,-9.83958 -22.01864,-22.018639 V 82.418665 C 122.52658,91.019701 91.012396,122.53388 82.411363,162.6491 h 14.174502 c 12.179065,0 22.018645,9.83958 22.018645,22.01864 0,12.17907 -9.83958,22.01865 -22.018645,22.01865 z M 184.66044,162.6491 a 22.018645,22.018645 0 1 1 0,44.03729 22.018645,22.018645 0 1 1 0,-44.03729 z"
+     id="path2"
+     style="stroke-width:0.688083" />
+</svg>

client/public/themes/olympus/images/icons/miss-red.svg

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1156"
+   sodipodi:docname="miss-red.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1160" />
+  <sodipodi:namedview
+     id="namedview1158"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.3838301"
+     inkscape:cx="310.37048"
+     inkscape:cy="217.51226"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1156" />
+  <!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
+  <path
+     d="m 376.91839,231.41639 c -1.31238,-3.09721 -4.35709,-5.09202 -7.71677,-5.09202 -3.35968,0 -6.40439,1.99481 -7.71677,5.09202 l -23.1503,54.01737 c -1.78483,4.1996 -2.72974,8.66167 -2.72974,13.22874 v 40.42116 l -75.59281,44.0958 v -9.86906 c 0,-6.98183 -5.61697,-12.5988 -12.5988,-12.5988 -6.98184,0 -12.59881,5.61697 -12.59881,12.5988 v 29.39721 16.7984 12.5988 c 0,6.98184 5.61697,12.59881 12.59881,12.59881 6.98183,0 12.5988,-5.61697 12.5988,-12.59881 v -4.1996 h 75.59281 v 17.16587 l -30.70958,26.92994 c -1.83732,1.57485 -2.88722,3.88463 -2.88722,6.2994 v 8.3992 c 0,4.61956 3.77964,8.39921 8.3992,8.39921 h 50.39521 v -33.59681 c 0,-4.61956 3.77964,-8.3992 8.3992,-8.3992 4.61956,0 8.3992,3.77964 8.3992,8.3992 v 33.59681 h 50.39521 c 4.61956,0 8.3992,-3.77965 8.3992,-8.39921 v -8.3992 c 0,-2.41477 -1.0499,-4.72455 -2.88722,-6.2994 l -30.70958,-26.92994 v -17.16587 h 75.59281 v 4.1996 c 0,6.98184 5.61697,12.59881 12.5988,12.59881 6.98184,0 12.59881,-5.61697 12.59881,-12.59881 v -12.5988 -16.7984 -29.39721 c 0,-6.98183 -5.61697,-12.5988 -12.59881,-12.5988 -6.98183,0 -12.5988,5.61697 -12.5988,12.5988 v 9.86906 l -75.59281,-44.0958 V 298.6625 c 0,-4.56707 -0.94491,-9.02914 -2.72974,-13.22874 z"
+     id="path1154"
+     style="fill:#00a7a7;fill-opacity:1;stroke:none;stroke-width:0.52495;stroke-opacity:1" />
+  <path
+     d="m 184.66044,8.5185895 c 12.17907,0 22.01865,9.8395825 22.01865,22.0186445 v 7.15606 C 271.15243,47.257643 322.07055,98.244571 331.6349,162.6491 h 7.15606 c 12.17906,0 22.01864,9.83958 22.01864,22.01864 0,12.17907 -9.83958,22.01865 -22.01864,22.01865 h -7.15606 c -9.56435,64.47334 -60.55128,115.39146 -124.95581,124.95581 v 7.15606 c 0,12.17906 -9.83958,22.01864 -22.01865,22.01864 -12.17906,0 -22.01864,-9.83958 -22.01864,-22.01864 V 331.6422 C 98.168455,322.07785 47.250339,271.15973 37.68599,206.68639 h -7.156059 c -12.179063,0 -22.0186444,-9.83958 -22.0186444,-22.01865 0,-12.17906 9.8395814,-22.01864 22.0186444,-22.01864 H 37.68599 C 47.250339,98.175761 98.168455,47.257643 162.6418,37.693294 v -7.15606 c 0,-12.179062 9.83958,-22.0186445 22.01864,-22.0186445 z M 82.411363,206.68639 c 8.601033,40.11522 40.184027,71.6294 80.230437,80.23043 v -14.1745 c 0,-12.17906 9.83958,-22.01864 22.01864,-22.01864 12.17907,0 22.01865,9.83958 22.01865,22.01864 v 14.1745 c 40.11522,-8.60103 71.6294,-40.18402 80.23044,-80.23043 h -14.17451 c -12.17906,0 -22.01864,-9.83958 -22.01864,-22.01865 0,-12.17906 9.83958,-22.01864 22.01864,-22.01864 h 14.17451 C 278.30849,122.53388 246.79431,91.019701 206.67909,82.418665 v 14.174506 c 0,12.179059 -9.83958,22.018639 -22.01865,22.018639 -12.17906,0 -22.01864,-9.83958 -22.01864,-22.018639 V 82.418665 C 122.52658,91.019701 91.012396,122.53388 82.411363,162.6491 h 14.174502 c 12.179065,0 22.018645,9.83958 22.018645,22.01864 0,12.17907 -9.83958,22.01865 -22.018645,22.01865 z M 184.66044,162.6491 a 22.018645,22.018645 0 1 1 0,44.03729 22.018645,22.018645 0 1 1 0,-44.03729 z"
+     id="path2"
+     style="stroke-width:0.688083" />
+</svg>

client/public/themes/olympus/images/icons/miss.svg

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1156"
+   sodipodi:docname="miss.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1160" />
+  <sodipodi:namedview
+     id="namedview1158"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.3838301"
+     inkscape:cx="311.0931"
+     inkscape:cy="217.51225"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1156" />
+  <!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
+  <path
+     d="m 376.91839,231.41639 c -1.31238,-3.09721 -4.35709,-5.09202 -7.71677,-5.09202 -3.35968,0 -6.40439,1.99481 -7.71677,5.09202 l -23.1503,54.01737 c -1.78483,4.1996 -2.72974,8.66167 -2.72974,13.22874 v 40.42116 l -75.59281,44.0958 v -9.86906 c 0,-6.98183 -5.61697,-12.5988 -12.5988,-12.5988 -6.98184,0 -12.59881,5.61697 -12.59881,12.5988 v 29.39721 16.7984 12.5988 c 0,6.98184 5.61697,12.59881 12.59881,12.59881 6.98183,0 12.5988,-5.61697 12.5988,-12.59881 v -4.1996 h 75.59281 v 17.16587 l -30.70958,26.92994 c -1.83732,1.57485 -2.88722,3.88463 -2.88722,6.2994 v 8.3992 c 0,4.61956 3.77964,8.39921 8.3992,8.39921 h 50.39521 v -33.59681 c 0,-4.61956 3.77964,-8.3992 8.3992,-8.3992 4.61956,0 8.3992,3.77964 8.3992,8.3992 v 33.59681 h 50.39521 c 4.61956,0 8.3992,-3.77965 8.3992,-8.39921 v -8.3992 c 0,-2.41477 -1.0499,-4.72455 -2.88722,-6.2994 l -30.70958,-26.92994 v -17.16587 h 75.59281 v 4.1996 c 0,6.98184 5.61697,12.59881 12.5988,12.59881 6.98184,0 12.59881,-5.61697 12.59881,-12.59881 v -12.5988 -16.7984 -29.39721 c 0,-6.98183 -5.61697,-12.5988 -12.59881,-12.5988 -6.98183,0 -12.5988,5.61697 -12.5988,12.5988 v 9.86906 l -75.59281,-44.0958 V 298.6625 c 0,-4.56707 -0.94491,-9.02914 -2.72974,-13.22874 z"
+     id="path1154"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.52495;stroke-opacity:1" />
+  <path
+     d="m 184.66044,8.5185895 c 12.17907,0 22.01865,9.8395825 22.01865,22.0186445 v 7.15606 C 271.15243,47.257643 322.07055,98.244571 331.6349,162.6491 h 7.15606 c 12.17906,0 22.01864,9.83958 22.01864,22.01864 0,12.17907 -9.83958,22.01865 -22.01864,22.01865 h -7.15606 c -9.56435,64.47334 -60.55128,115.39146 -124.95581,124.95581 v 7.15606 c 0,12.17906 -9.83958,22.01864 -22.01865,22.01864 -12.17906,0 -22.01864,-9.83958 -22.01864,-22.01864 V 331.6422 C 98.168455,322.07785 47.250339,271.15973 37.68599,206.68639 h -7.156059 c -12.179063,0 -22.0186444,-9.83958 -22.0186444,-22.01865 0,-12.17906 9.8395814,-22.01864 22.0186444,-22.01864 H 37.68599 C 47.250339,98.175761 98.168455,47.257643 162.6418,37.693294 v -7.15606 c 0,-12.179062 9.83958,-22.0186445 22.01864,-22.0186445 z M 82.411363,206.68639 c 8.601033,40.11522 40.184027,71.6294 80.230437,80.23043 v -14.1745 c 0,-12.17906 9.83958,-22.01864 22.01864,-22.01864 12.17907,0 22.01865,9.83958 22.01865,22.01864 v 14.1745 c 40.11522,-8.60103 71.6294,-40.18402 80.23044,-80.23043 h -14.17451 c -12.17906,0 -22.01864,-9.83958 -22.01864,-22.01865 0,-12.17906 9.83958,-22.01864 22.01864,-22.01864 h 14.17451 C 278.30849,122.53388 246.79431,91.019701 206.67909,82.418665 v 14.174506 c 0,12.179059 -9.83958,22.018639 -22.01865,22.018639 -12.17906,0 -22.01864,-9.83958 -22.01864,-22.018639 V 82.418665 C 122.52658,91.019701 91.012396,122.53388 82.411363,162.6491 h 14.174502 c 12.179065,0 22.018645,9.83958 22.018645,22.01864 0,12.17907 -9.83958,22.01865 -22.018645,22.01865 z M 184.66044,162.6491 a 22.018645,22.018645 0 1 1 0,44.03729 22.018645,22.018645 0 1 1 0,-44.03729 z"
+     id="path2"
+     style="stroke-width:0.688083" />
+</svg>

client/public/themes/olympus/images/icons/scenic-blue.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1156"
+   sodipodi:docname="scenic-blue.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1160" /><sodipodi:namedview
+     id="namedview1158"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.3838301"
+     inkscape:cx="350.11524"
+     inkscape:cy="229.07437"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1156" /><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path
+     d="m 376.91839,231.41639 c -1.31238,-3.09721 -4.35709,-5.09202 -7.71677,-5.09202 -3.35968,0 -6.40439,1.99481 -7.71677,5.09202 l -23.1503,54.01737 c -1.78483,4.1996 -2.72974,8.66167 -2.72974,13.22874 v 40.42116 l -75.59281,44.0958 v -9.86906 c 0,-6.98183 -5.61697,-12.5988 -12.5988,-12.5988 -6.98184,0 -12.59881,5.61697 -12.59881,12.5988 v 29.39721 16.7984 12.5988 c 0,6.98184 5.61697,12.59881 12.59881,12.59881 6.98183,0 12.5988,-5.61697 12.5988,-12.59881 v -4.1996 h 75.59281 v 17.16587 l -30.70958,26.92994 c -1.83732,1.57485 -2.88722,3.88463 -2.88722,6.2994 v 8.3992 c 0,4.61956 3.77964,8.39921 8.3992,8.39921 h 50.39521 v -33.59681 c 0,-4.61956 3.77964,-8.3992 8.3992,-8.3992 4.61956,0 8.3992,3.77964 8.3992,8.3992 v 33.59681 h 50.39521 c 4.61956,0 8.3992,-3.77965 8.3992,-8.39921 v -8.3992 c 0,-2.41477 -1.0499,-4.72455 -2.88722,-6.2994 l -30.70958,-26.92994 v -17.16587 h 75.59281 v 4.1996 c 0,6.98184 5.61697,12.59881 12.5988,12.59881 6.98184,0 12.59881,-5.61697 12.59881,-12.59881 v -12.5988 -16.7984 -29.39721 c 0,-6.98183 -5.61697,-12.5988 -12.59881,-12.5988 -6.98183,0 -12.5988,5.61697 -12.5988,12.5988 v 9.86906 l -75.59281,-44.0958 V 298.6625 c 0,-4.56707 -0.94491,-9.02914 -2.72974,-13.22874 z"
+     id="path1154"
+     style="fill:#db841d;fill-opacity:1;stroke:none;stroke-width:0.52495;stroke-opacity:1" /><path
+     style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 90.329008,471.87874 294.83388,138.74536"
+     id="path9928"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 37.215553,461.40058 33.602384,51.668198"
+     id="path9928-3"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 61.785043,466.45901 134.77088,205.58883"
+     id="path9928-31"
+     sodipodi:nodetypes="cc" /><path
+     d="m 97.776883,46.496287 c -2.69052,-1.821707 -6.27788,-1.485392 -8.576032,0.784735 -2.298159,2.270126 -2.634474,5.885513 -0.784735,8.548007 l 31.389404,45.766871 -27.914144,9.08052 c -2.774607,0.89684 -4.652369,3.47525 -4.652369,6.38998 0,2.91473 1.877762,5.49315 4.652369,6.38999 l 28.895064,9.36076 -14.82589,28.19441 c -1.37329,2.60645 -0.89684,5.80143 1.20513,7.87538 2.10197,2.07394 5.26893,2.57842 7.87538,1.20513 l 28.19442,-14.82589 9.36076,28.89507 c 0.89684,2.7746 3.47525,4.65236 6.38998,4.65236 2.91474,0 5.49316,-1.87776 6.39,-4.65236 l 9.36076,-28.89507 28.19441,14.82589 c 2.60645,1.37329 5.80144,0.89684 7.87539,-1.20513 2.07393,-2.10197 2.57841,-5.26893 1.20512,-7.87538 l -14.82589,-28.19441 28.89507,-9.36076 c 2.7746,-0.89684 4.65236,-3.47526 4.65236,-6.38999 0,-2.91473 -1.87776,-5.49314 -4.65236,-6.38998 l -29.84797,-9.66907 7.20276,-19.730481 c 0.89684,-2.466311 0.28026,-5.212883 -1.56947,-7.062617 -1.84974,-1.849732 -4.59631,-2.46631 -7.06262,-1.56947 l -19.73049,7.202748 -9.69707,-29.875988 c -0.89684,-2.7746 -3.47526,-4.652359 -6.39,-4.652359 -2.91473,0 -5.49314,1.877759 -6.38998,4.652359 l -9.05248,27.91415 z"
+     id="path10424"
+     style="stroke-width:0.280262" /></svg>

client/public/themes/olympus/images/icons/scenic-red.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1156"
+   sodipodi:docname="scenic-red.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1160" /><sodipodi:namedview
+     id="namedview1158"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.3838301"
+     inkscape:cx="350.11524"
+     inkscape:cy="229.07437"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1156" /><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path
+     d="m 376.91839,231.41639 c -1.31238,-3.09721 -4.35709,-5.09202 -7.71677,-5.09202 -3.35968,0 -6.40439,1.99481 -7.71677,5.09202 l -23.1503,54.01737 c -1.78483,4.1996 -2.72974,8.66167 -2.72974,13.22874 v 40.42116 l -75.59281,44.0958 v -9.86906 c 0,-6.98183 -5.61697,-12.5988 -12.5988,-12.5988 -6.98184,0 -12.59881,5.61697 -12.59881,12.5988 v 29.39721 16.7984 12.5988 c 0,6.98184 5.61697,12.59881 12.59881,12.59881 6.98183,0 12.5988,-5.61697 12.5988,-12.59881 v -4.1996 h 75.59281 v 17.16587 l -30.70958,26.92994 c -1.83732,1.57485 -2.88722,3.88463 -2.88722,6.2994 v 8.3992 c 0,4.61956 3.77964,8.39921 8.3992,8.39921 h 50.39521 v -33.59681 c 0,-4.61956 3.77964,-8.3992 8.3992,-8.3992 4.61956,0 8.3992,3.77964 8.3992,8.3992 v 33.59681 h 50.39521 c 4.61956,0 8.3992,-3.77965 8.3992,-8.39921 v -8.3992 c 0,-2.41477 -1.0499,-4.72455 -2.88722,-6.2994 l -30.70958,-26.92994 v -17.16587 h 75.59281 v 4.1996 c 0,6.98184 5.61697,12.59881 12.5988,12.59881 6.98184,0 12.59881,-5.61697 12.59881,-12.59881 v -12.5988 -16.7984 -29.39721 c 0,-6.98183 -5.61697,-12.5988 -12.59881,-12.5988 -6.98183,0 -12.5988,5.61697 -12.5988,12.5988 v 9.86906 l -75.59281,-44.0958 V 298.6625 c 0,-4.56707 -0.94491,-9.02914 -2.72974,-13.22874 z"
+     id="path1154"
+     style="fill:#00a7a7;fill-opacity:1;stroke:none;stroke-width:0.52495;stroke-opacity:1" /><path
+     style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 90.329008,471.87874 294.83388,138.74536"
+     id="path9928"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 37.215553,461.40058 33.602384,51.668198"
+     id="path9928-3"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 61.785043,466.45901 134.77088,205.58883"
+     id="path9928-31"
+     sodipodi:nodetypes="cc" /><path
+     d="m 97.776883,46.496287 c -2.69052,-1.821707 -6.27788,-1.485392 -8.576032,0.784735 -2.298159,2.270126 -2.634474,5.885513 -0.784735,8.548007 l 31.389404,45.766871 -27.914144,9.08052 c -2.774607,0.89684 -4.652369,3.47525 -4.652369,6.38998 0,2.91473 1.877762,5.49315 4.652369,6.38999 l 28.895064,9.36076 -14.82589,28.19441 c -1.37329,2.60645 -0.89684,5.80143 1.20513,7.87538 2.10197,2.07394 5.26893,2.57842 7.87538,1.20513 l 28.19442,-14.82589 9.36076,28.89507 c 0.89684,2.7746 3.47525,4.65236 6.38998,4.65236 2.91474,0 5.49316,-1.87776 6.39,-4.65236 l 9.36076,-28.89507 28.19441,14.82589 c 2.60645,1.37329 5.80144,0.89684 7.87539,-1.20513 2.07393,-2.10197 2.57841,-5.26893 1.20512,-7.87538 l -14.82589,-28.19441 28.89507,-9.36076 c 2.7746,-0.89684 4.65236,-3.47526 4.65236,-6.38999 0,-2.91473 -1.87776,-5.49314 -4.65236,-6.38998 l -29.84797,-9.66907 7.20276,-19.730481 c 0.89684,-2.466311 0.28026,-5.212883 -1.56947,-7.062617 -1.84974,-1.849732 -4.59631,-2.46631 -7.06262,-1.56947 l -19.73049,7.202748 -9.69707,-29.875988 c -0.89684,-2.7746 -3.47526,-4.652359 -6.39,-4.652359 -2.91473,0 -5.49314,1.877759 -6.38998,4.652359 l -9.05248,27.91415 z"
+     id="path10424"
+     style="stroke-width:0.280262" /></svg>

client/public/themes/olympus/images/icons/scenic.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg1156"
+   sodipodi:docname="scenic.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1160" /><sodipodi:namedview
+     id="namedview1158"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.3838301"
+     inkscape:cx="350.83787"
+     inkscape:cy="229.07436"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1156" /><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path
+     d="m 376.91839,231.41639 c -1.31238,-3.09721 -4.35709,-5.09202 -7.71677,-5.09202 -3.35968,0 -6.40439,1.99481 -7.71677,5.09202 l -23.1503,54.01737 c -1.78483,4.1996 -2.72974,8.66167 -2.72974,13.22874 v 40.42116 l -75.59281,44.0958 v -9.86906 c 0,-6.98183 -5.61697,-12.5988 -12.5988,-12.5988 -6.98184,0 -12.59881,5.61697 -12.59881,12.5988 v 29.39721 16.7984 12.5988 c 0,6.98184 5.61697,12.59881 12.59881,12.59881 6.98183,0 12.5988,-5.61697 12.5988,-12.59881 v -4.1996 h 75.59281 v 17.16587 l -30.70958,26.92994 c -1.83732,1.57485 -2.88722,3.88463 -2.88722,6.2994 v 8.3992 c 0,4.61956 3.77964,8.39921 8.3992,8.39921 h 50.39521 v -33.59681 c 0,-4.61956 3.77964,-8.3992 8.3992,-8.3992 4.61956,0 8.3992,3.77964 8.3992,8.3992 v 33.59681 h 50.39521 c 4.61956,0 8.3992,-3.77965 8.3992,-8.39921 v -8.3992 c 0,-2.41477 -1.0499,-4.72455 -2.88722,-6.2994 l -30.70958,-26.92994 v -17.16587 h 75.59281 v 4.1996 c 0,6.98184 5.61697,12.59881 12.5988,12.59881 6.98184,0 12.59881,-5.61697 12.59881,-12.59881 v -12.5988 -16.7984 -29.39721 c 0,-6.98183 -5.61697,-12.5988 -12.59881,-12.5988 -6.98183,0 -12.5988,5.61697 -12.5988,12.5988 v 9.86906 l -75.59281,-44.0958 V 298.6625 c 0,-4.56707 -0.94491,-9.02914 -2.72974,-13.22874 z"
+     id="path1154"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.52495;stroke-opacity:1" /><path
+     style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 90.329008,471.87874 294.83388,138.74536"
+     id="path9928"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 37.215553,461.40058 33.602384,51.668198"
+     id="path9928-3"
+     sodipodi:nodetypes="cc" /><path
+     style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+     d="M 61.785043,466.45901 134.77088,205.58883"
+     id="path9928-31"
+     sodipodi:nodetypes="cc" /><path
+     d="m 97.776883,46.496287 c -2.69052,-1.821707 -6.27788,-1.485392 -8.576032,0.784735 -2.298159,2.270126 -2.634474,5.885513 -0.784735,8.548007 l 31.389404,45.766871 -27.914144,9.08052 c -2.774607,0.89684 -4.652369,3.47525 -4.652369,6.38998 0,2.91473 1.877762,5.49315 4.652369,6.38999 l 28.895064,9.36076 -14.82589,28.19441 c -1.37329,2.60645 -0.89684,5.80143 1.20513,7.87538 2.10197,2.07394 5.26893,2.57842 7.87538,1.20513 l 28.19442,-14.82589 9.36076,28.89507 c 0.89684,2.7746 3.47525,4.65236 6.38998,4.65236 2.91474,0 5.49316,-1.87776 6.39,-4.65236 l 9.36076,-28.89507 28.19441,14.82589 c 2.60645,1.37329 5.80144,0.89684 7.87539,-1.20513 2.07393,-2.10197 2.57841,-5.26893 1.20512,-7.87538 l -14.82589,-28.19441 28.89507,-9.36076 c 2.7746,-0.89684 4.65236,-3.47526 4.65236,-6.38999 0,-2.91473 -1.87776,-5.49314 -4.65236,-6.38998 l -29.84797,-9.66907 7.20276,-19.730481 c 0.89684,-2.466311 0.28026,-5.212883 -1.56947,-7.062617 -1.84974,-1.849732 -4.59631,-2.46631 -7.06262,-1.56947 l -19.73049,7.202748 -9.69707,-29.875988 c -0.89684,-2.7746 -3.47526,-4.652359 -6.39,-4.652359 -2.91473,0 -5.49314,1.877759 -6.38998,4.652359 l -9.05248,27.91415 z"
+     id="path10424"
+     style="stroke-width:0.280262" /></svg>

client/public/themes/olympus/images/markers/smoke.svg

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="52"
+   height="52"
+   viewBox="0 0 13.758333 13.758333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   sodipodi:docname="smoke.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     width="52mm"
+     units="px"
+     inkscape:zoom="1.4823794"
+     inkscape:cx="-107.59729"
+     inkscape:cy="-51.268927"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient4717"
+       inkscape:swatch="solid">
+      <stop
+         style="stop-color:#0cffff;stop-opacity:1;"
+         offset="0"
+         id="stop4715" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <circle
+       style="stroke-width:13.3879;stroke-linecap:round;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path901"
+       cx="6.3892984"
+       cy="12.526179"
+       r="0.40000001" />
+    <circle
+       style="stroke-width:21.3082;stroke-linecap:round;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path901-1"
+       cx="6.1684337"
+       cy="11.768929"
+       r="0.63664067" />
+    <circle
+       style="stroke-width:28.7005;stroke-linecap:round;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path901-5"
+       cx="7.067668"
+       cy="11.674273"
+       r="0.85750532" />
+    <circle
+       style="stroke-width:28.1725;stroke-linecap:round;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path901-4"
+       cx="6.8468037"
+       cy="10.711934"
+       r="0.84172928" />
+    <circle
+       style="stroke-width:51.9334;stroke-linecap:round;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path901-6"
+       cx="8.7714815"
+       cy="8.3928556"
+       r="1.5516512" />
+    <circle
+       style="stroke-width:41.373;stroke-linecap:round;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path901-2"
+       cx="7.9037986"
+       cy="10.159773"
+       r="1.2361304" />
+    <circle
+       style="stroke-width:53.5174;stroke-linecap:round;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path901-3"
+       cx="7.320085"
+       cy="7.6040535"
+       r="1.5989795" />
+    <circle
+       style="fill-opacity:1;stroke:none;stroke-width:53.5174;stroke-linecap:round;stroke-opacity:1"
+       id="path901-3-9"
+       cx="7.05018"
+       cy="9.5266676"
+       r="1.5989795" />
+    <circle
+       style="stroke-width:60.3817;stroke-linecap:round;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path901-20"
+       cx="10.033565"
+       cy="6.5155067"
+       r="1.804068" />
+    <circle
+       style="stroke-width:60.9097;stroke-linecap:round;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path901-15"
+       cx="8.0300064"
+       cy="4.9221258"
+       r="1.819844" />
+    <circle
+       style="stroke-width:56.6856;stroke-linecap:round;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path901-0"
+       cx="11.800482"
+       cy="2.3821828"
+       r="1.6936357" />
+    <circle
+       style="stroke-width:56.1575;stroke-linecap:round;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path901-0-9"
+       cx="11.3272"
+       cy="4.7801414"
+       r="1.6778597" />
+    <circle
+       style="stroke-width:68.302;stroke-linecap:round;stroke:none;stroke-opacity:1;fill-opacity:1"
+       id="path901-0-4"
+       cx="9.8600283"
+       cy="2.6345997"
+       r="2.0407088" />
+  </g>
+</svg>

client/public/themes/olympus/images/markers/target - Copy.svg

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="52"
+   height="52"
+   viewBox="0 0 13.758333 13.758333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   sodipodi:docname="target.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     width="52mm"
+     units="px"
+     inkscape:zoom="16.771208"
+     inkscape:cx="31.989348"
+     inkscape:cy="27.63665"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient4717"
+       inkscape:swatch="solid">
+      <stop
+         style="stop-color:#0cffff;stop-opacity:1;"
+         offset="0"
+         id="stop4715" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <ellipse
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.03188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+       id="path5477"
+       cx="6.8599777"
+       cy="6.8209338"
+       rx="1.9410306"
+       ry="1.948356" />
+    <rect
+       style="fill:#ff5858;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect3980"
+       width="0.54935014"
+       height="2.6236348"
+       x="6.5846372"
+       y="3.3855996"
+       rx="0.29515001" />
+    <rect
+       style="fill:#ff5858;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect3980-4"
+       width="0.54935014"
+       height="2.6236348"
+       x="6.5858645"
+       y="7.6347723"
+       rx="0.29515001" />
+    <rect
+       style="fill:#ff5858;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect3980-47"
+       width="0.54935014"
+       height="2.6236348"
+       x="6.5517845"
+       y="-10.252322"
+       rx="0.29515001"
+       transform="rotate(90)" />
+    <rect
+       style="fill:#ff5858;fill-opacity:1;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+       id="rect3980-4-3"
+       width="0.54935014"
+       height="2.6236348"
+       x="6.5530119"
+       y="-6.003149"
+       rx="0.29515001"
+       transform="rotate(90)" />
+    <ellipse
+       style="fill:none;fill-opacity:1;stroke:#ff5858;stroke-width:0.449792;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+       id="path5477-2"
+       cx="6.8613305"
+       cy="6.8167095"
+       rx="1.9410306"
+       ry="1.948356" />
+  </g>
+</svg>

client/public/themes/olympus/images/states/awacs.svg

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="19"
+   height="15"
+   viewBox="0 0 19 15"
+   fill="none"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="awacs.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="55.289474"
+     inkscape:cx="15.961447"
+     inkscape:cy="9.2422656"
+     inkscape:window-width="2560"
+     inkscape:window-height="1377"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:4.1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+     id="path900"
+     sodipodi:type="arc"
+     sodipodi:cx="9.5228071"
+     sodipodi:cy="13.755494"
+     sodipodi:rx="2.5"
+     sodipodi:ry="2.5"
+     sodipodi:start="4.0142573"
+     sodipodi:end="5.4105207"
+     sodipodi:arc-type="arc"
+     d="m 7.9158381,11.840383 a 2.5,2.5 0 0 1 3.2139379,0"
+     sodipodi:open="true" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+     id="path900-1"
+     sodipodi:type="arc"
+     sodipodi:cx="9.5228071"
+     sodipodi:cy="13.755494"
+     sodipodi:rx="2.5"
+     sodipodi:ry="2.5"
+     sodipodi:start="4.0142573"
+     sodipodi:end="5.4105207"
+     sodipodi:arc-type="arc"
+     d="m 7.9158381,11.840383 a 2.5,2.5 0 0 1 3.2139379,0"
+     sodipodi:open="true" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:4.1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+     id="path900-5"
+     sodipodi:type="arc"
+     sodipodi:cx="9.5228071"
+     sodipodi:cy="13.755494"
+     sodipodi:rx="7"
+     sodipodi:ry="7"
+     sodipodi:start="4.0142573"
+     sodipodi:end="5.4105207"
+     sodipodi:arc-type="arc"
+     d="m 5.023294,8.3931829 a 7,7 0 0 1 8.999026,2e-7"
+     sodipodi:open="true" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+     id="path900-1-7"
+     sodipodi:type="arc"
+     sodipodi:cx="9.5228071"
+     sodipodi:cy="13.755494"
+     sodipodi:rx="7"
+     sodipodi:ry="7"
+     sodipodi:start="4.0142573"
+     sodipodi:end="5.4105207"
+     sodipodi:arc-type="arc"
+     d="m 5.023294,8.3931829 a 7,7 0 0 1 8.999026,2e-7"
+     sodipodi:open="true" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:4.1;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+     id="path900-5-1"
+     sodipodi:type="arc"
+     sodipodi:cx="9.5228071"
+     sodipodi:cy="13.755494"
+     sodipodi:rx="11.5"
+     sodipodi:ry="11.5"
+     sodipodi:start="4.0142573"
+     sodipodi:end="5.4105207"
+     sodipodi:arc-type="arc"
+     d="m 2.1307496,4.945983 a 11.5,11.5 0 0 1 14.7841154,2e-7"
+     sodipodi:open="true" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+     id="path900-1-7-8"
+     sodipodi:type="arc"
+     sodipodi:cx="9.5228071"
+     sodipodi:cy="13.755494"
+     sodipodi:rx="11.5"
+     sodipodi:ry="11.5"
+     sodipodi:start="4.0142573"
+     sodipodi:end="5.4105207"
+     sodipodi:arc-type="arc"
+     d="m 2.1307496,4.945983 a 11.5,11.5 0 0 1 14.7841154,2e-7"
+     sodipodi:open="true" />
+</svg>

client/public/themes/olympus/images/states/land-at-point.svg

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="17"
+   height="17"
+   viewBox="0 0 17 17"
+   fill="none"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="land-at-point.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="24.470588"
+     inkscape:cx="5.2512019"
+     inkscape:cy="15.018029"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <path
+     style="fill:none;stroke:#2f2f2f;stroke-width:6.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 4.9812012,10.145404 8.4655861,13.629789 11.998366,10.09701"
+     id="path1044-2" />
+  <path
+     style="fill:none;stroke:#2f2f2f;stroke-width:6.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 8.4655861,13.629789 V 3.3702107"
+     id="path1046-6" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 4.9812012,10.145404 8.4655865,13.629789 11.998366,10.09701"
+     id="path1044" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 8.4655865,13.629789 V 3.3702106"
+     id="path1046" />
+</svg>

client/public/themes/olympus/images/states/off.svg

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="19"
+   height="15"
+   viewBox="0 0 19 15"
+   fill="none"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="off.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="19.610428"
+     inkscape:cx="9.9691859"
+     inkscape:cy="8.5413741"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <path
+     style="fill:none;stroke:#262626;stroke-width:5.24218;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 3.0879876,3.12136 h 3.64493 L 3.0577919,6.6693495 h 3.6373077"
+     id="path2294-5-2-7"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#faffff;stroke-width:1.45616px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="m 3.0879876,3.12136 h 3.64493 L 3.0577919,6.6693495 h 3.6373077"
+     id="path2294-0-0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#262626;stroke-width:5.24218;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 7.8695831,5.8697467 H 11.514514 L 7.8393874,9.4177362 h 3.6373086"
+     id="path2294-5-2"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#faffff;stroke-width:1.45616px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 7.8695831,5.8697467 H 11.514514 L 7.8393874,9.4177362 h 3.6373086"
+     id="path2294-0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#262626;stroke-width:5.24218;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 12.62373,8.6286342 h 3.64493 l -3.675126,3.5479888 h 3.637308"
+     id="path2294-5-2-0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#faffff;stroke-width:1.45616px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="m 12.62373,8.6286342 h 3.64493 l -3.675126,3.5479888 h 3.637308"
+     id="path2294-0-3"
+     sodipodi:nodetypes="cccc" />
+</svg>

client/public/themes/olympus/images/states/tanker.svg

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="19"
+   height="15"
+   viewBox="0 0 19 15"
+   fill="none"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="tanker.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     id="namedview8"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="39.220856"
+     inkscape:cx="9.7269678"
+     inkscape:cy="8.2226661"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <circle
+     style="fill:none;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path3770-9"
+     cx="9.6203575"
+     cy="12.305709"
+     r="2.7614126"
+     transform="rotate(-15.856279)" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 16.324548,12.175881 15.276455,8.4858326"
+     id="path4303-4" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 13.139727,6.4687226 4.9398446,2.7015716"
+     id="path4305-3"
+     sodipodi:nodetypes="cc" />
+  <circle
+     style="fill:none;stroke:#ffffff;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5.6;stroke-opacity:1;paint-order:stroke fill markers"
+     id="path3770"
+     cx="9.6203575"
+     cy="12.305709"
+     r="2.7614126"
+     transform="rotate(-15.856279)" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 16.324547,12.175881 15.276454,8.4858326"
+     id="path4303" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 13.139727,6.4687226 4.9398446,2.7015716"
+     id="path4305"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:2.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 3.1921806,7.8893766 -1.346436,3.4161044 c -1.06976036,3.041593 3.897171,3.083564 2.699761,0 z"
+     id="path4659"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#fffffd;stroke-width:0.998182;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 3.2037126,10.332473 -0.559996,1.42079 c -0.444923,1.265028 1.620872,1.282484 1.122857,0 z"
+     id="path4659-0"
+     sodipodi:nodetypes="cccc" />
+</svg>

client/public/themes/olympus/theme.css

@@ -20,8 +20,10 @@
     --unit-background-red: #FF5858;
 
     /*** UI Colours **/
+    --accent-amber: #ffd828;
     --accent-green: #8bff63;
     --accent-light-blue: #5ca7ff;
+    --transparent-accent-light-blue: rgba(92, 167, 255, .33);
     --accent-light-red: #F5B6B6;
 
     --background-grey: #3d4651;

client/routes/api/atc.js

@@ -1,82 +1,65 @@
-var express    = require('express');
-var app        = express();
+var express = require('express');
+var app = express();
 
 const bodyParser = require('body-parser');
-app.use(bodyParser.urlencoded({ extended: false}));
+app.use(bodyParser.urlencoded({ extended: false }));
 app.use(bodyParser.json());
 
-
-/*
-
-    Flight:
-        "name"
-        "take-off time"
-        "priority"
-        "status"
-
-//*/
-
 function uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
         var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
         return v.toString(16);
     });
 }
-
-
-
-function Flight( name, boardId, unitId ) {
+function Flight(name, boardId, unitId) {
     this.assignedAltitude = 0;
-    this.assignedSpeed    = 0;
-    this.id               = uuidv4();
-    this.boardId          = boardId;
-    this.name             = name;
-    this.status           = "unknown";
-    this.takeoffTime      = -1;
-    this.unitId           = parseInt( unitId );
+    this.assignedSpeed = 0;
+    this.id = uuidv4();
+    this.boardId = boardId;
+    this.name = name;
+    this.status = "unknown";
+    this.takeoffTime = -1;
+    this.unitId = parseInt(unitId);
 }
 
-Flight.prototype.getData = function() {
+Flight.prototype.getData = function () {
     return {
-        "assignedAltitude" : this.assignedAltitude,
-        "assignedSpeed"    : this.assignedSpeed,
-        "id"               : this.id,
-        "boardId"          : this.boardId,
-        "name"             : this.name,
-        "status"           : this.status,
-        "takeoffTime"      : this.takeoffTime,
-        "unitId"           : this.unitId
+        "assignedAltitude": this.assignedAltitude,
+        "assignedSpeed": this.assignedSpeed,
+        "id": this.id,
+        "boardId": this.boardId,
+        "name": this.name,
+        "status": this.status,
+        "takeoffTime": this.takeoffTime,
+        "unitId": this.unitId
     };
 }
 
+Flight.prototype.setAssignedAltitude = function (assignedAltitude) {
 
-Flight.prototype.setAssignedAltitude = function( assignedAltitude ) {
-
-    if ( isNaN( assignedAltitude ) ) {
+    if (isNaN(assignedAltitude)) {
         return "Altitude must be a number"
     }
 
-    this.assignedAltitude = parseInt( assignedAltitude );
+    this.assignedAltitude = parseInt(assignedAltitude);
 
     return true;
 
 }
 
+Flight.prototype.setAssignedSpeed = function (assignedSpeed) {
 
-Flight.prototype.setAssignedSpeed = function( assignedSpeed ) {
-
-    if ( isNaN( assignedSpeed ) ) {
+    if (isNaN(assignedSpeed)) {
         return "Speed must be a number"
     }
 
-    this.assignedSpeed = parseInt( assignedSpeed );
+    this.assignedSpeed = parseInt(assignedSpeed);
 
     return true;
 
 }
 
-
-Flight.prototype.setOrder = function( order ) {
+Flight.prototype.setOrder = function (order) {
 
     this.order = order;
 
@@ -84,10 +67,9 @@ Flight.prototype.setOrder = function( order ) {
 
 }
 
+Flight.prototype.setStatus = function (status) {
 
-Flight.prototype.setStatus = function( status ) {
-
-    if ( [ "unknown", "checkedin", "readytotaxi", "clearedtotaxi", "halted", "terminated" ].indexOf( status ) < 0 ) {
+    if (["unknown", "checkedin", "readytotaxi", "clearedtotaxi", "halted", "terminated"].indexOf(status) < 0) {
         return "Invalid status";
     }
 
@@ -97,197 +79,186 @@ Flight.prototype.setStatus = function( status ) {
 
 }
 
+Flight.prototype.setTakeoffTime = function (takeoffTime) {
 
-Flight.prototype.setTakeoffTime = function( takeoffTime ) {
-
-    if ( takeoffTime === "" || takeoffTime === -1 ) {
+    if (takeoffTime === "" || takeoffTime === -1) {
         this.takeoffTime = -1;
     }
 
-    if ( isNaN( takeoffTime ) ) {
+    if (isNaN(takeoffTime)) {
         return "Invalid takeoff time"
     }
 
-    this.takeoffTime = parseInt( takeoffTime );
+    this.takeoffTime = parseInt(takeoffTime);
 
     return true;
 
 }
 
-
-
-function ATCDataHandler( data ) {
+function ATCDataHandler(data) {
     this.data = data;
 }
 
-ATCDataHandler.prototype.addFlight = function( flight ) {
+ATCDataHandler.prototype.addFlight = function (flight) {
 
-    if ( flight instanceof Flight === false ) {
-        throw new Error( "Given flight is not an instance of Flight" );
+    if (flight instanceof Flight === false) {
+        throw new Error("Given flight is not an instance of Flight");
     }
 
-    this.data.flights[ flight.id ] = flight;
+    this.data.flights[flight.id] = flight;
 
 }
 
-
-ATCDataHandler.prototype.deleteFlight = function( flightId ) {
-    delete this.data.flights[ flightId ];
+ATCDataHandler.prototype.deleteFlight = function (flightId) {
+    delete this.data.flights[flightId];
 }
 
-
-ATCDataHandler.prototype.getFlight = function( flightId ) {
-    return this.data.flights[ flightId ] || false;
+ATCDataHandler.prototype.getFlight = function (flightId) {
+    return this.data.flights[flightId] || false;
 }
 
-
-ATCDataHandler.prototype.getFlights = function() {
+ATCDataHandler.prototype.getFlights = function () {
     return this.data.flights;
 }
 
-
-const dataHandler = new ATCDataHandler( {
+const dataHandler = new ATCDataHandler({
     "flights": {}
-} );
-
-
+});
 
 /**************************************************************************************************************/
 //  Endpoints
 /**************************************************************************************************************/
+app.get("/flight", (req, res) => {
 
+    let flights = Object.values(dataHandler.getFlights());
 
-app.get( "/flight", ( req, res ) => {
+    if (flights && req.query.boardId) {
 
-    let flights = Object.values( dataHandler.getFlights() );
-
-    if ( flights && req.query.boardId ) {
-        
-        flights = flights.reduce( ( acc, flight ) => {
-            if ( flight.boardId === req.query.boardId ) {
-                acc[ flight.id ] = flight;
+        flights = flights.reduce((acc, flight) => {
+            if (flight.boardId === req.query.boardId) {
+                acc[flight.id] = flight;
             }
             return acc;
-        }, {} );
+        }, {});
 
     }
 
-    res.json( flights );
+    res.json(flights);
 
 });
 
 
-app.patch( "/flight/:flightId", ( req, res ) => {
+app.patch("/flight/:flightId", (req, res) => {
 
     const flightId = req.params.flightId;
-    const flight   = dataHandler.getFlight( flightId );
+    const flight = dataHandler.getFlight(flightId);
 
-    if ( !flight ) {
-        res.status( 400 ).send( `Unrecognised flight ID (given: "${req.params.flightId}")` );
+    if (!flight) {
+        res.status(400).send(`Unrecognised flight ID (given: "${req.params.flightId}")`);
     }
 
-    if ( req.body.hasOwnProperty( "assignedAltitude" ) ) {
+    if (req.body.hasOwnProperty("assignedAltitude")) {
 
-        const altitudeChangeSuccess = flight.setAssignedAltitude( req.body.assignedAltitude );
+        const altitudeChangeSuccess = flight.setAssignedAltitude(req.body.assignedAltitude);
 
-        if ( altitudeChangeSuccess !== true ) {
-            res.status( 400 ).send( altitudeChangeSuccess );
+        if (altitudeChangeSuccess !== true) {
+            res.status(400).send(altitudeChangeSuccess);
         }
 
     }
 
-    if ( req.body.hasOwnProperty( "assignedSpeed" ) ) {
+    if (req.body.hasOwnProperty("assignedSpeed")) {
 
-        const speedChangeSuccess = flight.setAssignedSpeed( req.body.assignedSpeed );
+        const speedChangeSuccess = flight.setAssignedSpeed(req.body.assignedSpeed);
 
-        if ( speedChangeSuccess !== true ) {
-            res.status( 400 ).send( speedChangeSuccess );
+        if (speedChangeSuccess !== true) {
+            res.status(400).send(speedChangeSuccess);
         }
 
     }
 
-    if ( req.body.status ) {
+    if (req.body.status) {
 
-        const statusChangeSuccess = flight.setStatus( req.body.status );
+        const statusChangeSuccess = flight.setStatus(req.body.status);
 
-        if ( statusChangeSuccess !== true ) {
-            res.status( 400 ).send( statusChangeSuccess );
+        if (statusChangeSuccess !== true) {
+            res.status(400).send(statusChangeSuccess);
         }
 
     }
 
-    if ( req.body.hasOwnProperty( "takeoffTime" ) ) {
+    if (req.body.hasOwnProperty("takeoffTime")) {
 
-        const takeoffChangeSuccess = flight.setTakeoffTime( req.body.takeoffTime );
+        const takeoffChangeSuccess = flight.setTakeoffTime(req.body.takeoffTime);
 
-        if ( takeoffChangeSuccess !== true ) {
-            res.status( 400 ).send( takeoffChangeSuccess );
+        if (takeoffChangeSuccess !== true) {
+            res.status(400).send(takeoffChangeSuccess);
         }
 
     }
 
-    res.json( flight.getData() );
+    res.json(flight.getData());
 
 });
 
 
-app.post( "/flight/order", ( req, res ) => {
+app.post("/flight/order", (req, res) => {
 
-    if ( !req.body.boardId ) {
-        res.status( 400 ).send( "Invalid/missing boardId" );
+    if (!req.body.boardId) {
+        res.status(400).send("Invalid/missing boardId");
     }
 
-    if ( !req.body.order || !Array.isArray( req.body.order ) ) {
-        res.status( 400 ).send( "Invalid/missing boardId" );
+    if (!req.body.order || !Array.isArray(req.body.order)) {
+        res.status(400).send("Invalid/missing boardId");
     }
 
-    req.body.order.forEach( ( flightId, i ) => {
+    req.body.order.forEach((flightId, i) => {
 
-        dataHandler.getFlight( flightId ).setOrder( i );
+        dataHandler.getFlight(flightId).setOrder(i);
 
     });
 
-    res.send( "" );
+    res.send("");
 
 });
 
 
-app.post( "/flight", ( req, res ) => {
+app.post("/flight", (req, res) => {
 
-    if ( !req.body.boardId ) {
-        res.status( 400 ).send( "Invalid/missing boardId" );
+    if (!req.body.boardId) {
+        res.status(400).send("Invalid/missing boardId");
     }
 
-    if ( !req.body.name ) {
-        res.status( 400 ).send( "Invalid/missing flight name" );
+    if (!req.body.name) {
+        res.status(400).send("Invalid/missing flight name");
     }
 
-    if ( !req.body.unitId || isNaN( req.body.unitId ) ) {
-        res.status( 400 ).send( "Invalid/missing unitId" );
+    if (!req.body.unitId || isNaN(req.body.unitId)) {
+        res.status(400).send("Invalid/missing unitId");
     }
 
-    const flight = new Flight( req.body.name, req.body.boardId, req.body.unitId );
+    const flight = new Flight(req.body.name, req.body.boardId, req.body.unitId);
 
-    dataHandler.addFlight( flight );
+    dataHandler.addFlight(flight);
 
-    res.status( 201 );
+    res.status(201);
 
-    res.json( flight.getData() );
+    res.json(flight.getData());
 
 });
 
 
-app.delete( "/flight/:flightId", ( req, res ) => {
+app.delete("/flight/:flightId", (req, res) => {
 
-    const flight = dataHandler.getFlight( req.params.flightId );
+    const flight = dataHandler.getFlight(req.params.flightId);
 
-    if ( !flight ) {
-        res.status( 400 ).send( `Unrecognised flight ID (given: "${req.params.flightId}")` );
+    if (!flight) {
+        res.status(400).send(`Unrecognised flight ID (given: "${req.params.flightId}")`);
     }
 
-    dataHandler.deleteFlight( req.params.flightId );
+    dataHandler.deleteFlight(req.params.flightId);
 
-    res.status( 204 ).send( "" );
+    res.status(204).send("");
 
 });
 

client/routes/api/databases.js

@@ -0,0 +1,58 @@
+const express = require('express');
+const router = express.Router();
+const fs = require("fs");
+const path = require("path");
+
+router.get('/:type/:name', function (req, res) {
+    console.log(req.params.database)
+});
+
+router.put('/save/:type/:name', function (req, res) {
+    var dir = path.join("./public/databases", req.params.type, "old");
+    if (!fs.existsSync(dir)){
+        fs.mkdirSync(dir);
+    }
+
+    var filepath = path.join("./public/databases", req.params.type, req.params.name + ".json");
+    if (fs.existsSync(filepath)) {
+        var newFilepath = path.join("./public/databases/", req.params.type, "old", req.params.name + ".json");
+        fs.copyFileSync(filepath, newFilepath);
+        if (fs.existsSync(newFilepath)) {
+            try {
+                var json = JSON.stringify(req.body.blueprints, null, "\t" );
+                fs.writeFileSync(filepath, json, 'utf8');
+                res.send("OK");
+            } catch {
+                res.status(422).send("Error");
+            }
+        } else {
+            res.status(422).send("Error");
+        }
+    } else {
+        res.status(404).send('Not found');
+    }
+});
+
+router.put('/reset/:type/:name', function (req, res) {
+    var filepath = path.join("./public/databases", req.params.type, "default", req.params.name + ".json");
+    if (fs.existsSync(filepath)) {
+        var newFilepath = path.join("./public/databases", req.params.type, req.params.name + ".json");
+        fs.copyFileSync(filepath, newFilepath);
+        res.send("OK");
+    } else {
+        res.status(404).send('Not found');
+    }
+});
+
+router.put('/restore/:type/:name', function (req, res) {
+    var filepath = path.join("./public/databases", req.params.type, "old", req.params.name + ".json");
+    if (fs.existsSync(filepath)) {
+        var newFilepath = path.join("./public/databases", req.params.type, req.params.name + ".json");
+        fs.copyFileSync(filepath, newFilepath);
+        res.send("OK");
+    } else {
+        res.status(404).send('Not found');
+    }
+});
+
+module.exports = router;

client/routes/api/elevation.js

@@ -0,0 +1,28 @@
+const express = require('express');
+var fs = require('fs');
+const router = express.Router();
+const TileSet = require('srtm-elevation').TileSet;
+const SRTMElevationDownloader = require('srtm-elevation').SRTMElevationDownloader;
+
+let rawdata = fs.readFileSync('../olympus.json');
+let config = JSON.parse(rawdata);
+var tileset = null;
+
+if (config["client"] === undefined || config["client"]["elevationProvider"] === undefined)
+    tileset = new TileSet('./hgt');
+else
+    tileset = new TileSet('./hgt', {downloader: new SRTMElevationDownloader('./hgt', config["client"]["elevationProvider"])});
+
+router.get( "/:lat/:lng", ( req, res ) => {
+    tileset.getElevation([req.params.lat, req.params.lng], function(err, elevation) {
+        if (err) {
+            console.log('getElevation failed: ' + err.message);
+            res.send("n/a");
+        } else {
+            res.send(String(elevation));
+        }
+    });
+    
+});
+
+module.exports = router;