Context menu
+
+
+
+
+
+
+
+
+
+
+
-
`,
+ html: ` `,
className: 'ol-unit-marker',
- iconAnchor: [30, 30]
+ iconAnchor: [60, 60]
});
this.setIcon(icon);
@@ -88,19 +79,19 @@ export class Unit extends Marker {
this.#targetsPolylines = [];
}
- update(response: UnitData) {
+ setData(data: UnitData) {
var updateMarker = true;
- //if (this.#data.flightData.latitude != response.flightData.latitude ||
- // this.#data.flightData.longitude != response.flightData.longitude ||
- // this.#data.alive != response.alive ||
+ //if (this.getFlightData().latitude != response.flightData.latitude ||
+ // this.getFlightData().longitude != response.flightData.longitude ||
+ // this.getData().alive != response.alive ||
// this.#forceUpdate ||
// !getMap().hasLayer(this.#marker))
// updateMarker = true;
- this.#data = response;
+ this.#data = data;
/* Dead units can't be selected */
- this.setSelected(this.getSelected() && this.#data.alive)
+ this.setSelected(this.getSelected() && this.getData().alive)
if (updateMarker)
this.#updateMarker();
@@ -114,9 +105,33 @@ export class Unit extends Marker {
this.#clearPath();
}
+ getData() {
+ return this.#data;
+ }
+
+ getFlightData() {
+ return this.getData().flightData;
+ }
+
+ getTaskData() {
+ return this.getData().taskData;
+ }
+
+ getMissionData() {
+ return this.getData().missionData;
+ }
+
+ getFormationData() {
+ return this.getData().formationData;
+ }
+
+ getOptionsData() {
+ return this.getData().optionsData;
+ }
+
setSelected(selected: boolean) {
/* Only alive units can be selected. Some units are not selectable (weapons) */
- if ((this.#data.alive || !selected) && this.#selectable && this.#selected != selected) {
+ if ((this.getData().alive || !selected) && this.#selectable && this.#selected != selected) {
this.#selected = selected;
this.getElement()?.querySelector(".unit")?.setAttribute("data-is-selected", String(this.getSelected()));
document.dispatchEvent(new CustomEvent("unitSelection", { detail: this }));
@@ -137,8 +152,8 @@ export class Unit extends Marker {
addDestination(latlng: L.LatLng) {
var path: any = {};
- if (this.#data.taskData.activePath != null) {
- path = this.#data.taskData.activePath;
+ if (this.getTaskData().activePath != null) {
+ path = this.getTaskData().activePath;
path[(Object.keys(path).length + 1).toString()] = latlng;
}
else {
@@ -148,7 +163,7 @@ export class Unit extends Marker {
}
clearDestinations() {
- this.#data.taskData.activePath = null;
+ this.getTaskData().activePath = null;
}
getHidden() {
@@ -156,7 +171,7 @@ export class Unit extends Marker {
}
getLeader() {
- return getUnitsManager().getUnitByID(this.#data.formationData.leaderID);
+ return getUnitsManager().getUnitByID(this.getFormationData().leaderID);
}
getFormation() {
@@ -165,8 +180,8 @@ export class Unit extends Marker {
getWingmen() {
var wingmen: Unit[] = [];
- if (this.#data.formationData.wingmenIDs != null) {
- for (let ID of this.#data.formationData.wingmenIDs) {
+ if (this.getFormationData().wingmenIDs != null) {
+ for (let ID of this.getFormationData().wingmenIDs) {
var unit = getUnitsManager().getUnitByID(ID)
if (unit)
wingmen.push(unit);
@@ -179,30 +194,6 @@ export class Unit extends Marker {
this.#forceUpdate = true;
}
- getData() {
- return this.#data;
- }
-
- getFlightData() {
- return this.#data.flightData;
- }
-
- getTaskData() {
- return this.#data.taskData;
- }
-
- getMissionData() {
- return this.#data.missionData;
- }
-
- getFormationData() {
- return this.#data.formationData;
- }
-
- getOptionsData() {
- return this.#data.optionsData;
- }
-
attackUnit(targetID: number) {
/* Call DCS attackUnit function */
if (this.ID != targetID) {
@@ -241,20 +232,14 @@ export class Unit extends Marker {
setReactionToThreat(this.ID, reactionToThreat);
}
- delete() {
- deleteUnit(this.ID);
- }
-
- /*
- setformation(formation)
- {
- }
- */
-
setLeader(isLeader: boolean, wingmenIDs: number[] = []) {
setLeader(this.ID, isLeader, wingmenIDs);
}
+ delete() {
+ deleteUnit(this.ID);
+ }
+
#onClick(e: any) {
this.#timer = setTimeout(() => {
if (!this.#preventClick) {
@@ -279,8 +264,7 @@ export class Unit extends Marker {
'Attack',
'Follow'
]
-
- getMap().showContextMenu(e.originalEvent, "Action: " + this.#data.unitName, options, (action: string) => this.#executeAction(action));
+ getMap().showContextMenu(e.originalEvent, "Action: " + this.getData().unitName, options.map((option: string) => {return {tooltip: option, src: "", callback: (action: string) => this.#executeAction(action)}}));
}
#executeAction(action: string) {
@@ -300,49 +284,48 @@ export class Unit extends Marker {
getMap().removeLayer(this);
}
else {
- this.setLatLng(new LatLng(this.#data.flightData.latitude, this.#data.flightData.longitude));
+ this.setLatLng(new LatLng(this.getFlightData().latitude, this.getFlightData().longitude));
var element = this.getElement();
- if (element != null)
- {
- element.querySelector(".unit-vvi-heading")?.setAttribute("style",`transform: rotate(${rad2deg(this.getFlightData().heading)}deg); width: ${15 + this.getFlightData().speed / 5}px`);
+ if (element != null) {
+ element.querySelector(".unit-vvi")?.setAttribute("style", `transform:rotate( calc( var( --unit-marker-air-vvi-rotation-offset ) + ${rad2deg(this.getFlightData().heading)}deg ) ); height:calc( ( var( --unit-marker-air-height ) / 2 ) + ${this.getFlightData().speed / 5}px );`);
element.querySelector(".unit")?.setAttribute("data-fuel-level", "20");
element.querySelector(".unit")?.setAttribute("data-has-fox-1", "true");
-
+
var unitHeadingDiv = element.querySelector(".unit-heading");
if (unitHeadingDiv != null)
unitHeadingDiv.innerHTML = String(Math.floor(rad2deg(this.getFlightData().heading)));
-
+
var unitAltitudeDiv = element.querySelector(".unit-altitude");
if (unitAltitudeDiv != null)
unitAltitudeDiv.innerHTML = String(Math.floor(this.getFlightData().altitude / 0.3048 / 1000));
}
var pos = getMap().latLngToLayerPoint(this.getLatLng()).round();
- this.setZIndexOffset(Math.floor(this.getFlightData().altitude) - pos.y);
+ this.setZIndexOffset(Math.floor(this.getFlightData().altitude) - pos.y);
}
this.#forceUpdate = false;
}
#drawPath() {
- if (this.#data.taskData.activePath != null) {
+ if (this.getTaskData().activePath != null) {
var points = [];
- points.push(new LatLng(this.#data.flightData.latitude, this.#data.flightData.longitude));
+ points.push(new LatLng(this.getFlightData().latitude, this.getFlightData().longitude));
/* Add markers if missing */
- while (this.#pathMarkers.length < Object.keys(this.#data.taskData.activePath).length) {
+ while (this.#pathMarkers.length < Object.keys(this.getTaskData().activePath).length) {
var marker = new Marker([0, 0], { icon: pathIcon }).addTo(getMap());
this.#pathMarkers.push(marker);
}
/* Remove markers if too many */
- while (this.#pathMarkers.length > Object.keys(this.#data.taskData.activePath).length) {
+ while (this.#pathMarkers.length > Object.keys(this.getTaskData().activePath).length) {
getMap().removeLayer(this.#pathMarkers[this.#pathMarkers.length - 1]);
this.#pathMarkers.splice(this.#pathMarkers.length - 1, 1)
}
/* Update the position of the existing markers (to avoid creating markers uselessly) */
- for (let WP in this.#data.taskData.activePath) {
- var destination = this.#data.taskData.activePath[WP];
+ for (let WP in this.getTaskData().activePath) {
+ var destination = this.getTaskData().activePath[WP];
this.#pathMarkers[parseInt(WP) - 1].setLatLng([destination.lat, destination.lng]);
points.push(new LatLng(destination.lat, destination.lng));
this.#pathPolyline.setLatLngs(points);
@@ -364,7 +347,7 @@ export class Unit extends Marker {
var targetData = this.getMissionData().targets[typeIndex][index];
var target = getUnitsManager().getUnitByID(targetData.object["id_"])
if (target != null) {
- var startLatLng = new LatLng(this.#data.flightData.latitude, this.#data.flightData.longitude)
+ var startLatLng = new LatLng(this.getFlightData().latitude, this.getFlightData().longitude)
var endLatLng = new LatLng(target.getFlightData().latitude, target.getFlightData().longitude)
var color;
@@ -393,7 +376,7 @@ export class Unit extends Marker {
export class AirUnit extends Unit {
getHidden() {
- return false;
+ return false;
}
}
diff --git a/client/src/units/unitdatabase.ts b/client/src/units/unitdatabase.ts
index 6f606cf9..1359d491 100644
--- a/client/src/units/unitdatabase.ts
+++ b/client/src/units/unitdatabase.ts
@@ -1,23 +1,3 @@
-export interface LoadoutItemBlueprint {
- name: string;
- quantity: number;
-}
-
-export interface LoadoutBlueprint {
- fuel: number;
- items: LoadoutItemBlueprint[];
- roles: string[];
- code: string;
- name: string;
-}
-
-export interface UnitBlueprint {
- name: string;
- label: string;
- shortLabel: string;
- loadouts: LoadoutBlueprint[];
-}
-
export class UnitDatabase {
units: {[key: string]: UnitBlueprint} = {};
diff --git a/client/src/units/unitmarker.ts b/client/src/units/unitmarker.ts
deleted file mode 100644
index be78bf1b..00000000
--- a/client/src/units/unitmarker.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import * as L from 'leaflet'
-import { getMap } from '..'
-import { rad2deg } from '../other/utils'
-
-export interface MarkerOptions {
- unitName: string,
- name: string,
- human: boolean,
- coalition: string,
- AI: boolean
-}
-
-export interface MarkerData {
- heading: number,
- speed: number,
- altitude: number,
- alive: boolean
-}
-
-export class UnitMarker extends L.Marker {
- #options: MarkerOptions;
- #data: MarkerData;
- #selected: boolean = false
-
- constructor(options: MarkerOptions) {
- super(new L.LatLng(0, 0), { riseOnHover: true });
-
- this.#options = options;
- this.#data = {heading: 0, speed: 0, altitude: 0, alive: true};
-
- var icon = new L.DivIcon({
- html: `
-
-
-
-
-
-
- ${aircraftDatabase.getShortLabelByName(this.getData().name)}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${this.getData().unitName}
-
-
-
-
`,
- className: 'ol-unit-marker',
- iconAnchor: [30, 30]
- });
- this.setIcon(icon);
- }
-
- onAdd(map: L.Map): this {
- super.onAdd(map);
- this.addEventListener('mouseover', function (e: any) { e.target?.setHovered(true); });
- this.addEventListener('mouseout', function (e: any) { e.target?.setHovered(false); });
- return this
- }
-
- draw(data: MarkerData) {
- this.#data;
-
- var element = this.getElement();
- if (element != null)
- {
- element.querySelector(".unit-vvi-heading")?.setAttribute("style",`transform: rotate(${rad2deg(data.heading)}deg); width: ${15 + data.speed / 5}px`);
- element.querySelector(".unit")?.setAttribute("data-fuel-level", "20");
- element.querySelector(".unit")?.setAttribute("data-has-fox-1", "true");
-
- var unitHeadingDiv = element.querySelector(".unit-heading");
- if (unitHeadingDiv != null)
- unitHeadingDiv.innerHTML = String(Math.floor(rad2deg(data.heading)));
-
- var unitAltitudeDiv = element.querySelector(".unit-altitude");
- if (unitAltitudeDiv != null)
- unitAltitudeDiv.innerHTML = String(Math.floor(data.altitude / 0.3048 / 1000));
- }
- var pos = getMap().latLngToLayerPoint(this.getLatLng()).round();
- this.setZIndexOffset(Math.floor(data.altitude) - pos.y);
- }
-
- setSelected(selected: boolean) {
- this.#selected = selected;
- this.getElement()?.querySelector(".unit")?.setAttribute("data-is-selected", String(this.getSelected()));
- }
-
- getSelected() {
- return this.#selected;
- }
-
- setHovered(hovered: boolean) {
- this.getElement()?.querySelector("#icon")?.classList.toggle("ol-unit-marker-hovered", hovered && this.#data.alive);
- }
-
- getData() {
- return this.#data;
- }
-
- getOptions() {
- return this.#options;
- }
-}
-
-export class AirUnitMarker extends UnitMarker {
-
-}
-
-export class AircraftMarker extends AirUnitMarker {
-
-}
-
-export class HelicopterMarker extends AirUnitMarker {
-
-}
-
-export class GroundUnitMarker extends UnitMarker {
-
-}
-
-export class NavyUnitMarker extends UnitMarker {
-
-}
-
-export class WeaponMarker extends UnitMarker {
-
-}
-
-export class BombMarker extends WeaponMarker {
-
-}
-
-export class MissileMarker extends WeaponMarker {
-
-}
\ No newline at end of file
diff --git a/client/src/units/unitsmanager.ts b/client/src/units/unitsmanager.ts
index 524d44d3..83ebe814 100644
--- a/client/src/units/unitsmanager.ts
+++ b/client/src/units/unitsmanager.ts
@@ -17,37 +17,10 @@ export class UnitsManager {
document.addEventListener('keydown', (event) => this.#onKeyDown(event));
}
- #updateUnitControlPanel() {
- /* Update the unit control panel */
- if (this.getSelectedUnits().length > 0) {
- getUnitControlPanel().show();
- getUnitControlPanel().update(this.getSelectedLeaders().concat(this.getSelectedSingletons()));
- }
- else {
- getUnitControlPanel().hide();
- }
- }
-
- #onKeyDown(event: KeyboardEvent)
- {
- if (event.key === "Delete")
- {
- this.selectedUnitsDelete();
- }
- }
-
getUnits() {
return this.#units;
}
- addUnit(ID: number, data: UnitData) {
- /* The name of the unit category is exactly the same as the constructor name */
- var constructor = Unit.getConstructor(data.category);
- if (constructor != undefined) {
- this.#units[ID] = new constructor(ID, data);
- }
- }
-
getUnitByID(ID: number) {
if (ID in this.#units)
return this.#units[ID];
@@ -55,21 +28,17 @@ export class UnitsManager {
return null;
}
- removeUnit(ID: number) {
-
- }
-
- deselectAllUnits() {
- for (let ID in this.#units) {
- this.#units[ID].setSelected(false);
+ addUnit(ID: number, data: UnitData) {
+ /* The name of the unit category is exactly the same as the constructor name */
+ var constructor = Unit.getConstructor(data.category);
+ if (constructor != undefined) {
+ this.#units[ID] = new constructor(ID, data);
}
}
+
+
+ removeUnit(ID: number) {
- selectUnit(ID: number, deselectAllUnits: boolean = true)
- {
- if (deselectAllUnits)
- this.deselectAllUnits();
- this.#units[ID]?.setSelected(true);
}
update(data: ServerData) {
@@ -78,16 +47,16 @@ export class UnitsManager {
if (!(ID in this.#units)) {
this.addUnit(parseInt(ID), data.units[ID]);
}
- this.#units[parseInt(ID)].update(data.units[ID]);
+ this.#units[parseInt(ID)].setData(data.units[ID]);
}
/* Update the unit info panel */
if (this.getSelectedUnits().length == 1) {
- getUnitInfoPanel().show();
- getUnitInfoPanel().update(this.getSelectedUnits()[0]);
+ getUnitInfoPanel()?.show();
+ getUnitInfoPanel()?.update(this.getSelectedUnits()[0]);
}
else {
- getUnitInfoPanel().hide();
+ getUnitInfoPanel()?.hide();
}
}
@@ -97,6 +66,13 @@ export class UnitsManager {
}
}
+ selectUnit(ID: number, deselectAllUnits: boolean = true)
+ {
+ if (deselectAllUnits)
+ this.deselectAllUnits();
+ this.#units[ID]?.setSelected(true);
+ }
+
onUnitSelection() {
if (this.getSelectedUnits().length > 0) {
getMap().setState("MOVE_UNIT");
@@ -135,6 +111,12 @@ export class UnitsManager {
return selectedUnits;
}
+ deselectAllUnits() {
+ for (let ID in this.#units) {
+ this.#units[ID].setSelected(false);
+ }
+ }
+
getSelectedLeaders() {
var leaders: Unit[] = [];
for (let idx in this.getSelectedUnits())
@@ -163,14 +145,34 @@ export class UnitsManager {
return singletons;
}
+ getSelectedUnitsType () {
+ return this.getSelectedUnits().map((unit: Unit) => {
+ return unit.constructor.name
+ }).reduce((a: any, b: any) => {
+ return a == b? a: undefined
+ });
+ };
+
+ getSelectedUnitsTargetSpeed () {
+ return this.getSelectedUnits().map((unit: Unit) => {
+ return unit.getTaskData().targetSpeed
+ }).reduce((a: any, b: any) => {
+ return a == b? a: undefined
+ });
+ };
+
+ getSelectedUnitsTargetAltitude () {
+ return this.getSelectedUnits().map((unit: Unit) => {
+ return unit.getTaskData().targetAltitude
+ }).reduce((a: any, b: any) => {
+ return a == b? a: undefined
+ });
+ };
+
selectedUnitsAddDestination(latlng: L.LatLng) {
var selectedUnits = this.getSelectedUnits();
for (let idx in selectedUnits) {
var commandedUnit = selectedUnits[idx];
- //if (selectedUnits[idx].wingman)
- //{
- // commandedUnit = this.getLeader(selectedUnits[idx].ID);
- //}
commandedUnit.addDestination(latlng);
}
}
@@ -179,10 +181,6 @@ export class UnitsManager {
var selectedUnits = this.getSelectedUnits();
for (let idx in selectedUnits) {
var commandedUnit = selectedUnits[idx];
- //if (selectedUnits[idx].wingman)
- //{
- // commandedUnit = this.getLeader(selectedUnits[idx].ID);
- //}
commandedUnit.clearDestinations();
}
}
@@ -327,6 +325,15 @@ export class UnitsManager {
setTimeout(() => this.#updateUnitControlPanel(), 300); // TODO find better method, may fail
}
+ selectedUnitsDelete()
+ {
+ var selectedUnits = this.getSelectedUnits();
+ for (let idx in selectedUnits)
+ {
+ selectedUnits[idx].delete();
+ }
+ }
+
copyUnits()
{
this.#copiedUnits = this.getSelectedUnits();
@@ -341,12 +348,22 @@ export class UnitsManager {
}
}
- selectedUnitsDelete()
+ #updateUnitControlPanel() {
+ /* Update the unit control panel */
+ if (this.getSelectedUnits().length > 0) {
+ getUnitControlPanel()?.show();
+ getUnitControlPanel()?.update(this.getSelectedLeaders().concat(this.getSelectedSingletons()));
+ }
+ else {
+ getUnitControlPanel()?.hide();
+ }
+ }
+
+ #onKeyDown(event: KeyboardEvent)
{
- var selectedUnits = this.getSelectedUnits();
- for (let idx in selectedUnits)
+ if (event.key === "Delete")
{
- selectedUnits[idx].delete();
+ this.selectedUnitsDelete();
}
}
}
\ No newline at end of file
diff --git a/client/views/aicformationpanel.ejs b/client/views/aic.ejs
similarity index 52%
rename from client/views/aicformationpanel.ejs
rename to client/views/aic.ejs
index 1f248c2c..229a5a82 100644
--- a/client/views/aicformationpanel.ejs
+++ b/client/views/aic.ejs
@@ -1,3 +1,22 @@
+
-
-
-
-
-
-
- ${this.#options.name}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${this.#options.unitName}
-
-
-
+
+
+
+
+
+
+
+
@@ -9,7 +28,7 @@
\ No newline at end of file
diff --git a/client/views/aiccontrolpanel.ejs b/client/views/aiccontrolpanel.ejs
deleted file mode 100644
index a1486db4..00000000
--- a/client/views/aiccontrolpanel.ejs
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
+
-
+
+Control
@@ -21,13 +40,13 @@
-
+
-Formations
- + - +
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/client/views/atc.ejs b/client/views/atc.ejs
index 87f727e3..ee082b92 100644
--- a/client/views/atc.ejs
+++ b/client/views/atc.ejs
@@ -102,4 +102,5 @@
-
\ No newline at end of file
diff --git a/client/views/contextmenu.ejs b/client/views/contextmenu.ejs
index 581a4f97..cb9864db 100644
--- a/client/views/contextmenu.ejs
+++ b/client/views/contextmenu.ejs
@@ -1,11 +1,10 @@
- Connected
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/client/views/index.ejs b/client/views/index.ejs
index f5acfa44..966be9d7 100644
--- a/client/views/index.ejs
+++ b/client/views/index.ejs
@@ -2,7 +2,7 @@
Olympus client
-
+
@@ -14,7 +14,6 @@
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
-
gtag('config', 'G-Z4L2TC3YX0');
@@ -22,21 +21,17 @@
+ <%- include('aic.ejs') %>
+ <%- include('atc.ejs') %>
+
<%- include('contextmenu.ejs') %>
-
-
- <%- include('unitinfopanel.ejs') %>
- <%- include('unitcontrolpanel.ejs') %>
- <%- include('visibilitycontrolpanel.ejs') %>
- <%- include('connectionstatuspanel.ejs') %>
- <%- include('mouseinfopanel.ejs') %>
-
- <%- include('aiccontrolpanel.ejs') %>
- <%- include('aicformationpanel.ejs') %>
-
- <%- include( 'atc.ejs' ) %>
-
- <%- include('logpanel.ejs') %>
+ <%- include('unitcontrol.ejs') %>
+ <%- include('settings.ejs') %>
+ <%- include('mouseinfo.ejs') %>
+
+ <% /* %>
+ <%- include('log.ejs') %>
+ <% */ %>
diff --git a/client/views/log.ejs b/client/views/log.ejs
new file mode 100644
index 00000000..d92ecd2d
--- /dev/null
+++ b/client/views/log.ejs
@@ -0,0 +1,3 @@
+ action)
{
auto answer = json::value::object();
-
request.extract_json().then([&answer, &action](pplx::task task)
{
try
@@ -148,7 +159,7 @@ void Server::handle_put(http_request request)
void Server::task()
{
- http_listener listener(REST_ADDRESS);
+ http_listener listener(wstring(REST_ADDRESS) + L"/" + wstring(REST_URI));
std::function handle_options = std::bind(&Server::handle_options, this, std::placeholders::_1);
std::function handle_get = std::bind(&Server::handle_get, this, std::placeholders::_1);
diff --git a/src/core/src/unitsmanager.cpp b/src/core/src/unitsmanager.cpp
index d3aca042..101eb523 100644
--- a/src/core/src/unitsmanager.cpp
+++ b/src/core/src/unitsmanager.cpp
@@ -48,32 +48,20 @@ void UnitsManager::updateExportData(lua_State* L)
if (type[L"level1"].as_number().to_int32() == 1)
{
if (type[L"level2"].as_number().to_int32() == 1)
- {
units[ID] = dynamic_cast(new Aircraft(p.second, ID));
- }
else if (type[L"level2"].as_number().to_int32() == 2)
- {
units[ID] = dynamic_cast(new Helicopter(p.second, ID));
- }
}
else if (type[L"level1"].as_number().to_int32() == 2)
- {
units[ID] = dynamic_cast(new GroundUnit(p.second, ID));
- }
else if (type[L"level1"].as_number().to_int32() == 3)
- {
units[ID] = dynamic_cast(new NavyUnit(p.second, ID));
- }
else if (type[L"level1"].as_number().to_int32() == 4)
{
if (type[L"level2"].as_number().to_int32() == 4)
- {
units[ID] = dynamic_cast(new Missile(p.second, ID));
- }
else if (type[L"level2"].as_number().to_int32() == 5)
- {
units[ID] = dynamic_cast(new Bomb(p.second, ID));
- }
}
}
}
@@ -87,10 +75,7 @@ void UnitsManager::updateExportData(lua_State* L)
/* Set the units that are not present in the JSON as dead (probably have been destroyed) */
for (auto const& unit : units)
{
- if (unitJSONs.find(unit.first) == unitJSONs.end())
- {
- unit.second->setAlive(false);
- }
+ unit.second->setAlive(unitJSONs.find(unit.first) != unitJSONs.end());
}
}
@@ -107,16 +92,13 @@ void UnitsManager::updateMissionData(json::value missionData)
}
}
-void UnitsManager::updateAnswer(json::value& answer)
+void UnitsManager::updateAnswer(json::value& answer, bool fullRefresh)
{
- // TODO THREAT SAFEY!
auto unitsJson = json::value::object();
-
for (auto const& p : units)
{
- unitsJson[to_wstring(p.first)] = p.second->json();
+ unitsJson[to_wstring(p.first)] = p.second->json(fullRefresh);
}
-
answer[L"units"] = unitsJson;
}
diff --git a/src/shared/include/defines.h b/src/shared/include/defines.h
index ae844c49..6a214075 100644
--- a/src/shared/include/defines.h
+++ b/src/shared/include/defines.h
@@ -2,6 +2,13 @@
#define VERSION "v0.0.1"
#define LOG_NAME "Olympus_log.txt"
-#define REST_ADDRESS L"http://localhost:30000/restdemo"
+#define REST_ADDRESS L"http://localhost:30000"
+#define REST_URI L"olympus"
+#define UNITS_URI L"units"
+#define PARTIAL_REFRESH_URI L"partial"
+#define FULL_REFRESH_URI L"full"
+#define LOGS_URI L"logs"
+#define AIRBASES_URI L"airbases"
+#define BULLSEYE_URI L"bullseye"
#define UPDATE_TIME_INTERVAL 0.25
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/client/views/logpanel.ejs b/client/views/logpanel.ejs
deleted file mode 100644
index baccbec1..00000000
--- a/client/views/logpanel.ejs
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/client/views/mouseinfo.ejs b/client/views/mouseinfo.ejs
new file mode 100644
index 00000000..3b029240
--- /dev/null
+++ b/client/views/mouseinfo.ejs
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/client/views/mouseinfopanel.ejs b/client/views/mouseinfopanel.ejs
deleted file mode 100644
index 3a798661..00000000
--- a/client/views/mouseinfopanel.ejs
+++ /dev/null
@@ -1,6 +0,0 @@
----° / --- NM
---° / --- NM
---° / --- NM
---° / --- NM
- 
- 
- 
- 
-
\ No newline at end of file
diff --git a/client/views/settings.ejs b/client/views/settings.ejs
new file mode 100644
index 00000000..8c64112d
--- /dev/null
+++ b/client/views/settings.ejs
@@ -0,0 +1,38 @@
+---° / --- NM
---° / --- NM
---° / --- NM
---° / --- NM
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ View BLUEFOR
+ View REDFOR
+ View NEUTRAL
+
+
\ No newline at end of file
diff --git a/client/views/unitcontrol.ejs b/client/views/unitcontrol.ejs
new file mode 100644
index 00000000..5aa18176
--- /dev/null
+++ b/client/views/unitcontrol.ejs
@@ -0,0 +1,64 @@
+Connected
+
+
+
+Selected units
+
+
+
+
+ Controls
+ + +Formation
+ + +Rules of engagement
+ + +Reaction to threat
+ +
+
\ No newline at end of file
diff --git a/client/views/unitcontrolpanel.ejs b/client/views/unitcontrolpanel.ejs
deleted file mode 100644
index c9f5dd6e..00000000
--- a/client/views/unitcontrolpanel.ejs
+++ /dev/null
@@ -1,65 +0,0 @@
-
+
+
+
+ Olympus 1-1
+Name
+ Group
+ Task
+
+
+ Flight data
+ + +
+ 
+ 
+ 
+
+ Ground Speed
12
Altitude
Heading
+
+ Loadout
+
+ 
+
+ Fuel
+
+
-
-
-
-
-
\ No newline at end of file
diff --git a/client/views/unitinfopanel.ejs b/client/views/unitinfopanel.ejs
deleted file mode 100644
index 578ef8b6..00000000
--- a/client/views/unitinfopanel.ejs
+++ /dev/null
@@ -1,33 +0,0 @@
-Controls
-
-
-
-
-
-
- Rules of engagement
-
-
-
-
- Reaction to threat
-
-
-
-
\ No newline at end of file
diff --git a/client/views/visibilitycontrolpanel.ejs b/client/views/visibilitycontrolpanel.ejs
deleted file mode 100644
index fb9f747b..00000000
--- a/client/views/visibilitycontrolpanel.ejs
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- Flight data
-
-
-
- Ground Speed
-
-
- Altitude
-
-
- Heading
-
-
-
-
-Loadout
-
- Fuel
-
-
-
-
-
-
\ No newline at end of file
diff --git a/img/icon-38x38.png b/img/icon-38x38.png
deleted file mode 100644
index 9ddcb4b9..00000000
Binary files a/img/icon-38x38.png and /dev/null differ
diff --git a/img/icon.png b/img/icon.png
index d4b60c09..dc5c994e 100644
Binary files a/img/icon.png and b/img/icon.png differ
diff --git a/img/icon.xcf b/img/icon.xcf
deleted file mode 100644
index c33dd3ed..00000000
Binary files a/img/icon.xcf and /dev/null differ
diff --git a/img/icon_284.png b/img/icon_284.png
new file mode 100644
index 00000000..b11172d3
Binary files /dev/null and b/img/icon_284.png differ
diff --git a/img/icon_active.png b/img/icon_active.png
new file mode 100644
index 00000000..56f59ba4
Binary files /dev/null and b/img/icon_active.png differ
diff --git a/img/icon_select.png b/img/icon_select.png
new file mode 100644
index 00000000..5771d3b5
Binary files /dev/null and b/img/icon_select.png differ
diff --git a/img/incon_active.png b/img/incon_active.png
deleted file mode 100644
index 3b69985d..00000000
Binary files a/img/incon_active.png and /dev/null differ
diff --git a/mod/Theme/icon.png b/mod/Theme/icon.png
index d4b60c09..dc5c994e 100644
Binary files a/mod/Theme/icon.png and b/mod/Theme/icon.png differ
diff --git a/mod/Theme/icon_284.png b/mod/Theme/icon_284.png
new file mode 100644
index 00000000..b11172d3
Binary files /dev/null and b/mod/Theme/icon_284.png differ
diff --git a/mod/Theme/icon_active.png b/mod/Theme/icon_active.png
index 3b69985d..56f59ba4 100644
Binary files a/mod/Theme/icon_active.png and b/mod/Theme/icon_active.png differ
diff --git a/mod/Theme/icon_select.png b/mod/Theme/icon_select.png
index 3b69985d..5771d3b5 100644
Binary files a/mod/Theme/icon_select.png and b/mod/Theme/icon_select.png differ
diff --git a/src/core/include/Unit.h b/src/core/include/Unit.h
index 4b0a30b2..8a0d229a 100644
--- a/src/core/include/Unit.h
+++ b/src/core/include/Unit.h
@@ -16,7 +16,7 @@ public:
void updateExportData(json::value json);
void updateMissionData(json::value json);
- json::value json();
+ json::value json(bool fullRefresh);
virtual void setState(int newState) { state = newState; };
void resetTask();
diff --git a/src/core/include/server.h b/src/core/include/server.h
index d55e5174..f77cba5b 100644
--- a/src/core/include/server.h
+++ b/src/core/include/server.h
@@ -18,7 +18,6 @@ public:
private:
std::thread* serverThread;
- json::value answer;
void handle_options(http_request request);
void handle_get(http_request request);
diff --git a/src/core/include/unitsmanager.h b/src/core/include/unitsmanager.h
index 1864c8ad..b73c791f 100644
--- a/src/core/include/unitsmanager.h
+++ b/src/core/include/unitsmanager.h
@@ -13,7 +13,7 @@ public:
Unit* getUnit(int ID);
void updateExportData(lua_State* L);
void updateMissionData(json::value missionData);
- void updateAnswer(json::value& answer);
+ void updateAnswer(json::value& answer, bool fullRefresh);
void deleteUnit(int ID);
private:
diff --git a/src/core/src/Unit.cpp b/src/core/src/Unit.cpp
index ea25899b..f2849807 100644
--- a/src/core/src/Unit.cpp
+++ b/src/core/src/Unit.cpp
@@ -34,7 +34,6 @@ void Unit::updateExportData(json::value json)
}
oldPosition = Coords(latitude, longitude, altitude);
- /* Update all the internal fields from the input json file */
if (json.has_string_field(L"Name"))
name = json[L"Name"].as_string();
if (json.has_string_field(L"UnitName"))
@@ -80,17 +79,71 @@ void Unit::updateMissionData(json::value json)
hasTask = json[L"hasTask"].as_bool();
}
-json::value Unit::json()
+json::value Unit::json(bool fullRefresh)
{
auto json = json::value::object();
- /********** Base data **********/
- json[L"AI"] = AI;
- json[L"name"] = json::value::string(name);
- json[L"unitName"] = json::value::string(unitName);
- json[L"groupName"] = json::value::string(groupName);
- json[L"alive"] = alive;
- json[L"category"] = json::value::string(getCategory());
+ if (fullRefresh)
+ {
+ /********** Base data **********/
+ json[L"AI"] = AI;
+ json[L"name"] = json::value::string(name);
+ json[L"unitName"] = json::value::string(unitName);
+ json[L"groupName"] = json::value::string(groupName);
+ json[L"alive"] = alive;
+ json[L"category"] = json::value::string(getCategory());
+
+ /********** Mission data **********/
+ json[L"missionData"] = json::value::object();
+ json[L"missionData"][L"fuel"] = fuel;
+ json[L"missionData"][L"ammo"] = ammo;
+ json[L"missionData"][L"targets"] = targets;
+ json[L"missionData"][L"hasTask"] = hasTask;
+ if (coalitionID == 0)
+ json[L"missionData"][L"coalition"] = json::value::string(L"neutral");
+ else if (coalitionID == 1)
+ json[L"missionData"][L"coalition"] = json::value::string(L"red");
+ else
+ json[L"missionData"][L"coalition"] = json::value::string(L"blue");
+ json[L"missionData"][L"flags"] = flags;
+
+ /********** Formation data **********/
+ json[L"formationData"] = json::value::object();
+ json[L"formationData"][L"isLeader"] = isLeader;
+ json[L"formationData"][L"isWingman"] = isWingman;
+ json[L"formationData"][L"formation"] = json::value::string(formation);
+ int i = 0;
+ for (auto itr = wingmen.begin(); itr != wingmen.end(); itr++)
+ json[L"formationData"][L"wingmenIDs"][i++] = (*itr)->getID();
+
+ if (leader != nullptr)
+ json[L"formationData"][L"leaderID"] = leader->getID();
+
+ /********** Task data **********/
+ json[L"taskData"] = json::value::object();
+ json[L"taskData"][L"currentTask"] = json::value::string(getCurrentTask());
+ json[L"taskData"][L"targetSpeed"] = getTargetSpeed();
+ json[L"taskData"][L"targetAltitude"] = getTargetAltitude();
+ /* Send the active path as a json object */
+ auto path = json::value::object();
+ if (activePath.size() > 0) {
+ int count = 1;
+ for (auto& destination : activePath)
+ {
+ auto json = json::value::object();
+ json[L"lat"] = destination.lat;
+ json[L"lng"] = destination.lng;
+ json[L"alt"] = destination.alt;
+ path[to_wstring(count++)] = json;
+ }
+ }
+ json[L"taskData"][L"activePath"] = path;
+
+ /********** Options data **********/
+ json[L"optionsData"] = json::value::object();
+ json[L"optionsData"][L"ROE"] = json::value::string(ROE);
+ json[L"optionsData"][L"reactionToThreat"] = json::value::string(reactionToThreat);
+ }
/********** Flight data **********/
json[L"flightData"] = json::value::object();
@@ -100,57 +153,6 @@ json::value Unit::json()
json[L"flightData"][L"speed"] = speed;
json[L"flightData"][L"heading"] = heading;
- /********** Mission data **********/
- json[L"missionData"] = json::value::object();
- json[L"missionData"][L"fuel"] = fuel;
- json[L"missionData"][L"ammo"] = ammo;
- json[L"missionData"][L"targets"] = targets;
- json[L"missionData"][L"hasTask"] = hasTask;
- if (coalitionID == 0)
- json[L"missionData"][L"coalition"] = json::value::string(L"neutral");
- else if (coalitionID == 1)
- json[L"missionData"][L"coalition"] = json::value::string(L"red");
- else
- json[L"missionData"][L"coalition"] = json::value::string(L"blue");
- json[L"missionData"][L"flags"] = flags;
-
- /********** Formation data **********/
- json[L"formationData"] = json::value::object();
- json[L"formationData"][L"isLeader"] = isLeader;
- json[L"formationData"][L"isWingman"] = isWingman;
- json[L"formationData"][L"formation"] = json::value::string(formation);
- int i = 0;
- for (auto itr = wingmen.begin(); itr != wingmen.end(); itr++)
- json[L"formationData"][L"wingmenIDs"][i++] = (*itr)->getID();
-
- if (leader != nullptr)
- json[L"formationData"][L"leaderID"] = leader->getID();
-
- /********** Task data **********/
- json[L"taskData"] = json::value::object();
- json[L"taskData"][L"currentTask"] = json::value::string(getCurrentTask());
- json[L"taskData"][L"targetSpeed"] = getTargetSpeed();
- json[L"taskData"][L"targetAltitude"] = getTargetAltitude();
- /* Send the active path as a json object */
- auto path = json::value::object();
- if (activePath.size() > 0) {
- int count = 1;
- for (auto& destination : activePath)
- {
- auto json = json::value::object();
- json[L"lat"] = destination.lat;
- json[L"lng"] = destination.lng;
- json[L"alt"] = destination.alt;
- path[to_wstring(count++)] = json;
- }
- }
- json[L"taskData"][L"activePath"] = path;
-
- /********** Options data **********/
- json[L"optionsData"] = json::value::object();
- json[L"optionsData"][L"ROE"] = json::value::string(ROE);
- json[L"optionsData"][L"reactionToThreat"] = json::value::string(reactionToThreat);
-
return json;
}
diff --git a/src/core/src/server.cpp b/src/core/src/server.cpp
index 32fbd5b4..f4d77970 100644
--- a/src/core/src/server.cpp
+++ b/src/core/src/server.cpp
@@ -32,7 +32,6 @@ Server::Server(lua_State* L):
}
-
void Server::start(lua_State* L)
{
log("Starting RESTServer");
@@ -71,15 +70,28 @@ void Server::handle_get(http_request request)
std::exception_ptr eptr;
try {
- unitsManager->updateAnswer(answer);
+ auto answer = json::value::object();
+ wstring requestUri = request.request_uri().to_string();
+ log(requestUri);
+ if (requestUri.compare(L"/" + wstring(REST_URI) + L"/" + wstring(UNITS_URI) + L"/" + wstring(PARTIAL_REFRESH_URI)) == 0)
+ unitsManager->updateAnswer(answer, false);
+
+ if (requestUri.compare(L"/" + wstring(REST_URI) + L"/" + wstring(UNITS_URI) + L"/" + wstring(FULL_REFRESH_URI)) == 0)
+ unitsManager->updateAnswer(answer, true);
/* Get the logs from the logger */
- auto logs = json::value::object();
- getLogsJSON(logs); // By reference, for thread safety
+ if (requestUri.compare(L"/" + wstring(REST_URI) + L"/" + wstring(LOGS_URI)) == 0)
+ {
+ auto logs = json::value::object();
+ getLogsJSON(logs); // By reference, for thread safety
+ answer[L"logs"] = logs;
+ }
- answer[L"airbases"] = airbasesData;
- answer[L"bullseye"] = bullseyeData;
- answer[L"logs"] = logs;
+ if (requestUri.compare(L"/" + wstring(REST_URI) + L"/" + wstring(AIRBASES_URI)) == 0)
+ answer[L"airbases"] = airbasesData;
+
+ if (requestUri.compare(L"/" + wstring(REST_URI) + L"/" + wstring(BULLSEYE_URI)) == 0)
+ answer[L"bullseye"] = bullseyeData;
response.set_body(answer);
}
@@ -94,7 +106,6 @@ void Server::handle_get(http_request request)
void Server::handle_request(http_request request, functionAir:
-
-
-
-
- Ground:
-
-
-
-
- Navy:
-
-
-
-
- Weapons:
-
-
-
-
-
-
- Full:
-
-
-
-
- Partial:
-
-
-
-
- Minimal:
-
-
-
-
-
- Olympus only:
-
-
-
-