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

Pop up CV move errors.

Browse Source
This commit is contained in:
Dan Albert 2021-05-15 14:22:19 -07:00
parent 06dedf51aa
commit 95b107ffad
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,6 +165,7 @@ class ControlPoint {
this.cp.setDestination([destination.lat, destination.lng]).then((err) => { this.cp.setDestination([destination.lat, destination.lng]).then((err) => {
if (err) { if (err) {
console.log(`Could not set control point destination: ${err}`); console.log(`Could not set control point destination: ${err}`);
this.locationMarker().bindPopup(err).openPopup();
// Reset markers and paths on error. On success this happens when we get // Reset markers and paths on error. On success this happens when we get
// the destinationChanged signal from the backend. // the destinationChanged signal from the backend.
this.onDestinationChanged(); this.onDestinationChanged();
@ -203,14 +204,21 @@ class ControlPoint {
this.secondaryMarker.off("contextmenu"); this.secondaryMarker.off("contextmenu");
} }
locationMarker(dragging = false) {
return this.hasDestination() || dragging
? this.secondaryMarker
: this.primaryMarker;
}
destinationMarker() {
return this.hasDestination() ? this.primaryMarker : null;
}
attachTooltipsAndHandlers(dragging = false) { attachTooltipsAndHandlers(dragging = false) {
this.detachTooltipsAndHandlers(); this.detachTooltipsAndHandlers();
const zoom = map.getZoom(); const zoom = map.getZoom();
const locationMarker = const locationMarker = this.locationMarker(dragging);
this.hasDestination() || dragging const destinationMarker = this.destinationMarker();
? this.secondaryMarker
: this.primaryMarker;
const destinationMarker = this.hasDestination() ? this.primaryMarker : null;
locationMarker locationMarker
.bindTooltip(`<h3 style="margin: 0;">${this.cp.name}</h3>`, { .bindTooltip(`<h3 style="margin: 0;">${this.cp.name}</h3>`, {
permanent: zoom >= SHOW_BASE_NAME_AT_ZOOM, permanent: zoom >= SHOW_BASE_NAME_AT_ZOOM,