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

Replace var with const/let in map.js.

Browse Source
This commit is contained in:
Dan Albert 2021-05-14 23:18:34 -07:00
parent 2a401a302d
commit dae9c368b7
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,33 +19,33 @@ const Colors = Object.freeze({
Red: "#c85050", Red: "#c85050",
}); });
var map = L.map("map").setView([0, 0], 3); const map = L.map("map").setView([0, 0], 3);
L.control.scale({ maxWidth: 200 }).addTo(map); L.control.scale({ maxWidth: 200 }).addTo(map);
// https://esri.github.io/esri-leaflet/api-reference/layers/basemap-layer.html // https://esri.github.io/esri-leaflet/api-reference/layers/basemap-layer.html
var baseLayers = { const baseLayers = {
"Imagery Clarity": L.esri.basemapLayer("ImageryClarity", { maxZoom: 17 }), "Imagery Clarity": L.esri.basemapLayer("ImageryClarity", { maxZoom: 17 }),
"Imagery Firefly": L.esri.basemapLayer("ImageryFirefly", { maxZoom: 17 }), "Imagery Firefly": L.esri.basemapLayer("ImageryFirefly", { maxZoom: 17 }),
Topographic: L.esri.basemapLayer("Topographic", { maxZoom: 16 }), Topographic: L.esri.basemapLayer("Topographic", { maxZoom: 16 }),
}; };
var defaultBaseMap = baseLayers["Imagery Clarity"]; const defaultBaseMap = baseLayers["Imagery Clarity"];
defaultBaseMap.addTo(map); defaultBaseMap.addTo(map);
// Enabled by default, so addTo(map). // Enabled by default, so addTo(map).
var controlPointsLayer = L.layerGroup().addTo(map); const controlPointsLayer = L.layerGroup().addTo(map);
var groundObjectsLayer = L.markerClusterGroup().addTo(map); const groundObjectsLayer = L.markerClusterGroup().addTo(map);
var supplyRoutesLayer = L.layerGroup().addTo(map); const supplyRoutesLayer = L.layerGroup().addTo(map);
var frontLinesLayer = L.layerGroup().addTo(map); const frontLinesLayer = L.layerGroup().addTo(map);
var redSamThreatLayer = L.layerGroup().addTo(map); const redSamThreatLayer = L.layerGroup().addTo(map);
var blueFlightPlansLayer = L.layerGroup().addTo(map); const blueFlightPlansLayer = L.layerGroup().addTo(map);
// Added to map by the user via layer controls. // Added to map by the user via layer controls.
var blueSamThreatLayer = L.layerGroup(); const blueSamThreatLayer = L.layerGroup();
var blueSamDetectionLayer = L.layerGroup(); const blueSamDetectionLayer = L.layerGroup();
var redSamDetectionLayer = L.layerGroup(); const redSamDetectionLayer = L.layerGroup();
var redFlightPlansLayer = L.layerGroup(); const redFlightPlansLayer = L.layerGroup();
var selectedFlightPlansLayer = L.layerGroup(); const selectedFlightPlansLayer = L.layerGroup();
L.control L.control
.groupedLayers( .groupedLayers(
@ -74,7 +74,7 @@ L.control
) )
.addTo(map); .addTo(map);
var friendlyCpIcon = new L.Icon({ const friendlyCpIcon = new L.Icon({
iconUrl: iconUrl:
"https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-blue.png", "https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-blue.png",
shadowUrl: shadowUrl:
@ -85,7 +85,7 @@ var friendlyCpIcon = new L.Icon({
shadowSize: [41, 41], shadowSize: [41, 41],
}); });
var enemyCpIcon = new L.Icon({ const enemyCpIcon = new L.Icon({
iconUrl: iconUrl:
"https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-red.png", "https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-red.png",
shadowUrl: shadowUrl:
@ -96,7 +96,7 @@ var enemyCpIcon = new L.Icon({
shadowSize: [41, 41], shadowSize: [41, 41],
}); });
var game; let game;
new QWebChannel(qt.webChannelTransport, function (channel) { new QWebChannel(qt.webChannelTransport, function (channel) {
game = channel.objects.game; game = channel.objects.game;
drawInitialMap(); drawInitialMap();
@ -125,7 +125,7 @@ const SHOW_BASE_NAME_AT_ZOOM = 8;
function drawControlPoints() { function drawControlPoints() {
controlPointsLayer.clearLayers(); controlPointsLayer.clearLayers();
var zoom = map.getZoom(); const zoom = map.getZoom();
game.controlPoints.forEach((cp) => { game.controlPoints.forEach((cp) => {
L.marker(cp.position, { icon: iconFor(cp.blue) }) L.marker(cp.position, { icon: iconFor(cp.blue) })
.bindTooltip(`<h3 style="margin: 0;">${cp.name}</h3>`, { .bindTooltip(`<h3 style="margin: 0;">${cp.name}</h3>`, {
@ -142,10 +142,12 @@ function drawControlPoints() {
} }
function drawSamThreatsAt(tgo) { function drawSamThreatsAt(tgo) {
var detectionLayer = tgo.blue ? blueSamDetectionLayer : redSamDetectionLayer; const detectionLayer = tgo.blue
var threatLayer = tgo.blue ? blueSamThreatLayer : redSamThreatLayer; ? blueSamDetectionLayer
var threatColor = tgo.blue ? Colors.Blue : Colors.Red; : redSamDetectionLayer;
var detectionColor = tgo.blue ? "#bb89ff" : "#eee17b"; const threatLayer = tgo.blue ? blueSamThreatLayer : redSamThreatLayer;
const threatColor = tgo.blue ? Colors.Blue : Colors.Red;
const detectionColor = tgo.blue ? "#bb89ff" : "#eee17b";
tgo.samDetectionRanges.forEach((range) => { tgo.samDetectionRanges.forEach((range) => {
L.circle(tgo.position, { L.circle(tgo.position, {
@ -189,7 +191,7 @@ function drawGroundObjects() {
function drawSupplyRoutes() { function drawSupplyRoutes() {
supplyRoutesLayer.clearLayers(); supplyRoutesLayer.clearLayers();
game.supplyRoutes.forEach((route) => { game.supplyRoutes.forEach((route) => {
var color; let color;
if (route.frontActive) { if (route.frontActive) {
color = Colors.Red; color = Colors.Red;
} else if (route.blue) { } else if (route.blue) {
@ -218,14 +220,14 @@ function drawFrontLines() {
const SHOW_WAYPOINT_INFO_AT_ZOOM = 9; const SHOW_WAYPOINT_INFO_AT_ZOOM = 9;
function drawFlightPlan(flight) { function drawFlightPlan(flight) {
var layer = flight.blue ? blueFlightPlansLayer : redFlightPlansLayer; const layer = flight.blue ? blueFlightPlansLayer : redFlightPlansLayer;
var color = flight.blue ? Colors.Blue : Colors.Red; const color = flight.blue ? Colors.Blue : Colors.Red;
var highlight = "#ffff00"; const highlight = "#ffff00";
// We don't need a marker for the departure waypoint (and it's likely // We don't need a marker for the departure waypoint (and it's likely
// coincident with the landing waypoint, so hard to see). We do want to draw // coincident with the landing waypoint, so hard to see). We do want to draw
// the path from it though. // the path from it though.
var points = [flight.flightPlan[0].position]; const points = [flight.flightPlan[0].position];
var zoom = map.getZoom(); const zoom = map.getZoom();
flight.flightPlan.slice(1).forEach((waypoint) => { flight.flightPlan.slice(1).forEach((waypoint) => {
if (!waypoint.isDivert) { if (!waypoint.isDivert) {
points.push(waypoint.position); points.push(waypoint.position);
@ -256,7 +258,7 @@ function drawFlightPlans() {
blueFlightPlansLayer.clearLayers(); blueFlightPlansLayer.clearLayers();
redFlightPlansLayer.clearLayers(); redFlightPlansLayer.clearLayers();
selectedFlightPlansLayer.clearLayers(); selectedFlightPlansLayer.clearLayers();
var selected = null; let selected = null;
game.flights.forEach((flight) => { game.flights.forEach((flight) => {
// Draw the selected waypoint last so it's on top. bringToFront only brings // Draw the selected waypoint last so it's on top. bringToFront only brings
// it to the front of the *extant* elements, so any flights drawn later will // it to the front of the *extant* elements, so any flights drawn later will
@ -292,14 +294,14 @@ function clearAllLayers() {
} }
function setTooltipZoomThreshold(layerGroup, showAt) { function setTooltipZoomThreshold(layerGroup, showAt) {
var showing = map.getZoom() >= showAt; let showing = map.getZoom() >= showAt;
map.on("zoomend", function () { map.on("zoomend", function () {
var zoom = map.getZoom(); const zoom = map.getZoom();
if (zoom < showAt && showing) { if (zoom < showAt && showing) {
showing = false; showing = false;
layerGroup.eachLayer(function (layer) { layerGroup.eachLayer(function (layer) {
if (layer.getTooltip()) { if (layer.getTooltip()) {
var tooltip = layer.getTooltip(); const tooltip = layer.getTooltip();
layer.unbindTooltip().bindTooltip(tooltip, { layer.unbindTooltip().bindTooltip(tooltip, {
permanent: false, permanent: false,
}); });
@ -309,7 +311,7 @@ function setTooltipZoomThreshold(layerGroup, showAt) {
showing = true; showing = true;
layerGroup.eachLayer(function (layer) { layerGroup.eachLayer(function (layer) {
if (layer.getTooltip()) { if (layer.getTooltip()) {
var tooltip = layer.getTooltip(); const tooltip = layer.getTooltip();
layer.unbindTooltip().bindTooltip(tooltip, { layer.unbindTooltip().bindTooltip(tooltip, {
permanent: true, permanent: true,
}); });