weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move UI-only waypoint number out of the model.

Browse Source 
This isn't needed by the backend, so just handle it in the front end.
This commit is contained in:
Dan Albert
2022-02-19 15:09:58 -08:00
parent 4c3509a455
commit 5cd9af32fa
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
resources/ui/map/map.js
View File

@@ -747,8 +747,9 @@ function drawFrontLines() {
const SHOW_WAYPOINT_INFO_AT_ZOOM = 9;
class Waypoint {
constructor(waypoint, flight) {
constructor(waypoint, number, flight) {
this.waypoint = waypoint;
this.number = number;
this.flight = flight;
this.marker = this.makeMarker();
this.waypoint.positionChanged.connect(() => this.relocate());
@@ -804,7 +805,7 @@ class Waypoint {
? "Waiting to recompute TOT..."
: this.waypoint.timing;
return (
`${this.waypoint.number} ${this.waypoint.name}<br />` +
`${this.number} ${this.waypoint.name}<br />` +
`${this.waypoint.altitudeFt} ft ${this.waypoint.altitudeReference}<br />` +
`${timing}`
);
@@ -830,7 +831,7 @@ class Waypoint {
.on("drag", (e) => {
const marker = e.target;
const destination = marker.getLatLng();
this.flight.updatePath(this.waypoint.number, destination);
this.flight.updatePath(this.number, destination);
})
.on("dragend", (e) => {
const marker = e.target;
@@ -857,7 +858,9 @@ class Flight {
constructor(flight) {
this.flight = flight;
this.id = flight.id;
this.flightPlan = this.flight.flightPlan.map((p) => new Waypoint(p, this));
this.flightPlan = this.flight.flightPlan.map(
(p, idx) => new Waypoint(p, idx, this)
);
this.aircraft = null;
this.path = null;
this.markers = [];