Small bugfixes

client/src/constants/constants.ts

@@ -104,26 +104,26 @@ export const mapBounds = {
 export const mapLayers = {
     "ArcGIS Satellite": {
         urlTemplate: "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
-        maxZoom: 20,
         minZoom: 1,
+        maxZoom: 16,
         attribution: "Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, GetApp().getMap()ping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community"
     },
     "USGS Topo": {
         urlTemplate: 'https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/{z}/{y}/{x}',
         minZoom: 1,
-        maxZoom: 20,
+        maxZoom: 16,
         attribution: 'Tiles courtesy of the <a href="https://usgs.gov/">U.S. Geological Survey</a>'
     },
     "OpenStreetMap Mapnik": {
         urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
         minZoom: 1,
-        maxZoom: 19,
+        maxZoom: 16,
         attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
     },
     "OPENVKarte": {
         urlTemplate: 'https://tileserver.memomaps.de/tilegen/{z}/{x}/{y}.png',
         minZoom: 1,
-        maxZoom: 18,
+        maxZoom: 16,
         attribution: 'Map <a href="https://memomaps.de/">memomaps.de</a> <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, map data &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
     },
     "Esri.DeLorme": {
@@ -135,7 +135,7 @@ export const mapLayers = {
     "CyclOSM": {
         urlTemplate: 'https://{s}.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png',
         minZoom: 1,
-        maxZoom: 20,
+        maxZoom: 16,
         attribution: '<a href="https://github.com/cyclosm/cyclosm-cartocss-style/releases" title="CyclOSM - Open Bicycle render">CyclOSM</a> | Map data: &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
     }
 }

client/src/map/map.ts

@@ -94,7 +94,7 @@ export class Map extends L.Map {
         super(ID, { 
             zoomSnap: 0, 
             zoomDelta: 0.25, 
-            preferCanvas: false, 
+            preferCanvas: true, 
             doubleClickZoom: false, 
             zoomControl: false, 
             boxZoom: false, 
@@ -400,6 +400,7 @@ export class Map extends L.Map {
             this.options.scrollWheelZoom = undefined;
             this.#centerUnit = null;
         }
+        this.#updateCursor();
     }
 
     getCenterUnit() {
@@ -714,6 +715,8 @@ export class Map extends L.Map {
     #panToUnit(unit: Unit) {
         var unitPosition = new L.LatLng(unit.getPosition().lat, unit.getPosition().lng);
         this.setView(unitPosition, this.getZoom(), { animate: false });
+        this.#updateCursor();
+        this.#updateDestinationCursors();
     }
 
     #getMinimapBoundaries() {

client/src/unit/unit.ts

@@ -1361,7 +1361,7 @@ export class AirUnit extends Unit {
             if (getApp().getUnitsManager().getSelectedUnits().length == 1) {
                 options["center-map"] = { text: "Center map", tooltip: "Center the map on the unit and follow it", type: "and" };
             } else {
-                /* Provision */
+                options["follow"] = { text: "Follow", tooltip: "Follow the unit at a user defined distance and position", type: "or" };
             }
 
             options["refuel"] = { text: "Air to air refuel", tooltip: "Refuel units at the nearest AAR Tanker. If no tanker is available the unit will RTB.", type: "and" }; // TODO Add some way of knowing which aircraft can AAR

client/src/unit/unitsmanager.ts

@@ -328,7 +328,7 @@ export class UnitsManager {
             const unit = selectedUnits[idx];
 
             /* If a unit is following another unit, and that unit is also selected, send the command to the followed ("leader") unit */
-            if (unit.getState() === "Follow") {
+            if (unit.getState() === "follow") {
                 const leader = this.getUnitByID(unit.getLeaderID())
                 if (leader && leader.getSelected())
                     leader.addDestination(latlng);
@@ -351,7 +351,7 @@ export class UnitsManager {
         var selectedUnits = this.getSelectedUnits({ excludeHumans: true, onlyOnePerGroup: true });
         for (let idx in selectedUnits) {
             const unit = selectedUnits[idx];
-            if (unit.getState() === "Follow") {
+            if (unit.getState() === "follow") {
                 const leader = this.getUnitByID(unit.getLeaderID())
                 if (leader && leader.getSelected())
                     leader.clearDestinations();
@@ -561,29 +561,32 @@ export class UnitsManager {
         }
 
         var selectedUnits = this.getSelectedUnits({ excludeHumans: true, onlyOnePerGroup: true });
+
         var count = 1;
         var xr = 0; var yr = 1; var zr = -1;
         var layer = 1;
         for (let idx in selectedUnits) {
             var unit = selectedUnits[idx];
-            if (offset != undefined)
-                /* Offset is set, apply it */
-                unit.followUnit(ID, { "x": offset.x * count, "y": offset.y * count, "z": offset.z * count });
-            else {
-                /* More complex formations with variable offsets */
-                if (formation === "diamond") {
-                    var xl = xr * Math.cos(Math.PI / 4) - yr * Math.sin(Math.PI / 4);
-                    var yl = xr * Math.sin(Math.PI / 4) + yr * Math.cos(Math.PI / 4);
-                    unit.followUnit(ID, { "x": -yl * 50, "y": zr * 10, "z": xl * 50 });
+            if (unit.ID !== ID) {
+                if (offset != undefined)
+                    /* Offset is set, apply it */
+                    unit.followUnit(ID, { "x": offset.x * count, "y": offset.y * count, "z": offset.z * count });
+                else {
+                    /* More complex formations with variable offsets */
+                    if (formation === "diamond") {
+                        var xl = xr * Math.cos(Math.PI / 4) - yr * Math.sin(Math.PI / 4);
+                        var yl = xr * Math.sin(Math.PI / 4) + yr * Math.cos(Math.PI / 4);
+                        unit.followUnit(ID, { "x": -yl * 50, "y": zr * 10, "z": xl * 50 });
 
-                    if (yr == 0) { layer++; xr = 0; yr = layer; zr = -layer; }
-                    else {
-                        if (xr < layer) { xr++; zr--; }
-                        else { yr--; zr++; }
+                        if (yr == 0) { layer++; xr = 0; yr = layer; zr = -layer; }
+                        else {
+                            if (xr < layer) { xr++; zr--; }
+                            else { yr--; zr++; }
+                        }
                     }
                 }
+                count++;
             }
-            count++;
         }
         this.#showActionMessage(selectedUnits, `following unit ${this.getUnitByID(ID)?.getUnitName()}`);
     }