Embedded DCS maps directly into website

.gitignore

@@ -39,3 +39,4 @@ frontend/website/plugins/controltips/index.js
 /frontend/server/public/maps
 *.pyc
 /scripts/**/*.jpg
+manager/manager.log

frontend/server/demo.js

@@ -458,7 +458,7 @@ module.exports = function (configLocation) {
 		};
 
 		mission(req, res){
-			var ret = {mission: {theatre: "Syria"}};
+			var ret = {mission: {theatre: "MarianaIslands"}};
 			ret.time = Date.now();
 
 			ret.mission.dateAndTime = {

frontend/website/src/constants/constants.ts

@@ -122,14 +122,14 @@ export const minimapBoundaries = {
     ],
     "Falklands": [   // South Atlantic
         new LatLng(-49.097217, -79.418267),
-        new LatLng(-56.874517,-79.418267),
+        new LatLng(-56.874517, -79.418267),
         new LatLng(-56.874517, -43.316433),
         new LatLng(-49.097217, -43.316433),
         new LatLng(-49.097217, -79.418267)
     ],
     "Normandy": [   // Normandy
         new LatLng(50.44, -3.29),
-        new LatLng(48.12,-3.29),
+        new LatLng(48.12, -3.29),
         new LatLng(48.12, 3.70),
         new LatLng(50.44, 3.70),
         new LatLng(50.44, -3.29)
@@ -161,36 +161,34 @@ export const defaultMapLayers = {
         maxZoom: 19,
         attribution: "Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Mapping, 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: 14,
-        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: 20,
         attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
     },
-    "OPENVKarte": {
+    "DCS Marianas Modern": [
-        urlTemplate: 'https://tileserver.memomaps.de/tilegen/{z}/{x}/{y}.png',
+        {
-        minZoom: 1,
+            urlTemplate: "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
-        maxZoom: 20,
+            minZoom: 1,
-        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'
+            maxZoom: 19
-    },
+        },
-    "Esri.DeLorme": {
+        {
-        urlTemplate: 'https://server.arcgisonline.com/ArcGIS/rest/services/Specialty/DeLorme_World_Base_Map/MapServer/tile/{z}/{y}/{x}',
+            urlTemplate: 'http://maps.dcsolympus.com/maps/marianas-modern/{z}/{x}/{y}.png',
-        minZoom: 1,
+            minNativeZoom: 1,
-        maxZoom: 11,
+            maxNativeZoom: 13,
-        attribution: 'Tiles &copy; Esri &mdash; Copyright: &copy;2012 DeLorme',
+            minZoom: 1,
-    },
+            maxZoom: 20
-    "CyclOSM": {
+        },
-        urlTemplate: 'https://{s}.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png',
+        {
-        minZoom: 1,
+            urlTemplate: 'http://maps.dcsolympus.com/maps/marianas-modern/{z}/{x}/{y}.png',
-        maxZoom: 20,
+            minNativeZoom: 14,
-        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'
+            maxNativeZoom: 16,
-    }
+            minZoom: 14,
+            maxZoom: 20,
+            attribution: 'Map extracted by OzDeaDMeaT (DCS Olympus Team)'
+        }
+    ]
 }
 
 /* Map constants */
@@ -258,7 +256,7 @@ export const MAP_MARKER_CONTROLS: MapMarkerVisibilityControl[] = [{
 
 export const IADSTypes = ["AAA", "SAM Site", "Radar (EWR)"];
 export const IADSDensities: { [key: string]: number } = { "AAA": 0.8, "SAM Site": 0.1, "Radar (EWR)": 0.05 };
-export const GROUND_UNIT_AIR_DEFENCE_REGEX:RegExp = /(\b(AAA|SAM|MANPADS?|[mM]anpads?)|[sS]tinger\b)/;
+export const GROUND_UNIT_AIR_DEFENCE_REGEX: RegExp = /(\b(AAA|SAM|MANPADS?|[mM]anpads?)|[sS]tinger\b)/;
 export const HIDE_GROUP_MEMBERS = "Hide group members when zoomed out";
 export const SHOW_UNIT_LABELS = "Show unit labels (L)";
 export const SHOW_UNITS_ENGAGEMENT_RINGS = "Show units threat range rings (Q)";

manager/manager.log

@@ -1,123 +0,0 @@
- ======================= New log starting at Thu Feb 08 2024 21:55:39 GMT+0100 (Central European Standard Time) =======================
-Running in C:\Users\dpass\Documents\DCSOlympus\manager\javascripts
-Development build detected, skipping version checks...
- ======================= New log starting at Thu Feb 08 2024 21:55:43 GMT+0100 (Central European Standard Time) =======================
-Running in C:\Users\dpass\Documents\DCSOlympus\manager\javascripts
-Found instance in C:\Users\dpass\Saved Games\DCS.openbeta, checking for Olympus
-Comparing Mods content in C:\Users\dpass\Saved Games\DCS.openbeta
-Comparing Scripts content in C:\Users\dpass\Saved Games\DCS.openbeta
-Error: ENOENT: no such file or directory, lstat 'C:\Users\dpass\Documents\DCSOlympus\scripts\OlympusHook.lua'
-    at Object.realpathSync (node:fs:2655:7)
-    at Object.realpathSync (node:electron/js2c/asar_bundle:2:5358)
-    at Object.compareSync (C:\Users\dpass\Documents\DCSOlympus\manager\node_modules\dir-compare\build\src\index.js:44:88)
-    at DCSInstance.checkInstallation (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\dcsinstance.js:196:41)
-    at async DCSInstance.findInstances (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\dcsinstance.js:68:21)
-    at async Manager.start (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\manager.js:97:29)
-    at async C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\preload.js:267:5 {
-  errno: -4058,
-  syscall: 'lstat',
-  code: 'ENOENT',
-  path: 'C:\\Users\\dpass\\Documents\\DCSOlympus\\scripts\\OlympusHook.lua'
-}
-Differences found!
-Comparing Mods content in C:\Users\dpass\Saved Games\DCS.openbeta
-Development build detected, skipping version checks...
-Comparing Scripts content in C:\Users\dpass\Saved Games\DCS.openbeta
-Error: ENOENT: no such file or directory, lstat 'C:\Users\dpass\Documents\DCSOlympus\scripts\OlympusHook.lua'
-    at Object.realpathSync (node:fs:2655:7)
-    at Object.realpathSync (node:electron/js2c/asar_bundle:2:5358)
-    at Object.compareSync (C:\Users\dpass\Documents\DCSOlympus\manager\node_modules\dir-compare\build\src\index.js:44:88)
-    at DCSInstance.checkInstallation (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\dcsinstance.js:196:41)
-    at async DCSInstance.reloadInstances (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\dcsinstance.js:38:13)
-    at async Manager.setState (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\manager.js:725:9)
-    at async menuPage.options.onShow (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\manager.js:165:17) {
-  errno: -4058,
-  syscall: 'lstat',
-  code: 'ENOENT',
-  path: 'C:\\Users\\dpass\\Documents\\DCSOlympus\\scripts\\OlympusHook.lua'
-}
-Differences found!
-Fixing Olympus in C:\Users\dpass\Saved Games\DCS.openbeta
-Deleting mod from C:\Users\dpass\Saved Games\DCS.openbeta
-Mod succesfully removed from C:\Users\dpass\Saved Games\DCS.openbeta
-Deleting hooks from C:\Users\dpass\Saved Games\DCS.openbeta
-Deleting C:\Users\dpass\Saved Games\DCS.openbeta\Scripts\Hooks\OlympusHook.lua
-C:\Users\dpass\Saved Games\DCS.openbeta\Scripts\Hooks\OlympusHook.lua does not exist, nothing to do
-Installing mod in C:\Users\dpass\Saved Games\DCS.openbeta
-Mod succesfully installed in C:\Users\dpass\Saved Games\DCS.openbeta
-C:\Users\dpass\Documents\DCS Olympus backups\DCS.openbeta\databases
-Backup databases found, copying over
-Backup mods.lua found, copying over
-Installing hooks in C:\Users\dpass\Saved Games\DCS.openbeta
-[Error: ENOENT: no such file or directory, lstat 'C:\Users\dpass\Documents\DCSOlympus\scripts\OlympusHook.lua'] {
-  errno: -4058,
-  code: 'ENOENT',
-  syscall: 'lstat',
-  path: 'C:\\Users\\dpass\\Documents\\DCSOlympus\\scripts\\OlympusHook.lua'
-}
-Comparing Mods content in C:\Users\dpass\Saved Games\DCS.openbeta
-Comparing Scripts content in C:\Users\dpass\Saved Games\DCS.openbeta
-Error: ENOENT: no such file or directory, lstat 'C:\Users\dpass\Documents\DCSOlympus\scripts\OlympusHook.lua'
-    at Object.realpathSync (node:fs:2655:7)
-    at Object.realpathSync (node:electron/js2c/asar_bundle:2:5358)
-    at Object.compareSync (C:\Users\dpass\Documents\DCSOlympus\manager\node_modules\dir-compare\build\src\index.js:44:88)
-    at DCSInstance.checkInstallation (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\dcsinstance.js:196:41)
-    at async DCSInstance.reloadInstances (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\dcsinstance.js:38:13)
-    at async Manager.setState (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\manager.js:725:9)
-    at async Manager.onEditMenuClicked (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\manager.js:298:9) {
-  errno: -4058,
-  syscall: 'lstat',
-  code: 'ENOENT',
-  path: 'C:\\Users\\dpass\\Documents\\DCSOlympus\\scripts\\OlympusHook.lua'
-}
-Differences found!
-Comparing Mods content in C:\Users\dpass\Saved Games\DCS.openbeta
-Comparing Scripts content in C:\Users\dpass\Saved Games\DCS.openbeta
-Error: ENOENT: no such file or directory, lstat 'C:\Users\dpass\Documents\DCSOlympus\scripts\OlympusHook.lua'
-    at Object.realpathSync (node:fs:2655:7)
-    at Object.realpathSync (node:electron/js2c/asar_bundle:2:5358)
-    at Object.compareSync (C:\Users\dpass\Documents\DCSOlympus\manager\node_modules\dir-compare\build\src\index.js:44:88)
-    at DCSInstance.checkInstallation (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\dcsinstance.js:196:41)
-    at async DCSInstance.reloadInstances (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\dcsinstance.js:38:13)
-    at async Manager.setState (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\manager.js:725:9)
-    at async Manager.onUninstallClicked (C:\Users\dpass\Documents\DCSOlympus\manager\javascripts\manager.js:580:9) {
-  errno: -4058,
-  syscall: 'lstat',
-  code: 'ENOENT',
-  path: 'C:\\Users\\dpass\\Documents\\DCSOlympus\\scripts\\OlympusHook.lua'
-}
-Differences found!
-Uninstalling Olympus from C:\Users\dpass\Saved Games\DCS.openbeta
-Deleting mod from C:\Users\dpass\Saved Games\DCS.openbeta
-Mod succesfully removed from C:\Users\dpass\Saved Games\DCS.openbeta
-Deleting hooks from C:\Users\dpass\Saved Games\DCS.openbeta
-Deleting C:\Users\dpass\Saved Games\DCS.openbeta\Scripts\Hooks\OlympusHook.lua
-C:\Users\dpass\Saved Games\DCS.openbeta\Scripts\Hooks\OlympusHook.lua does not exist, nothing to do
-Deleting JSON from C:\Users\dpass\Saved Games\DCS.openbeta
-Deleting C:\Users\dpass\Saved Games\DCS.openbeta\Config\olympus.json
-C:\Users\dpass\Saved Games\DCS.openbeta\Config\olympus.json does not exist, nothing to do
-Deleting ShortCuts from C:\Users\dpass\Saved Games\DCS.openbeta and desktop
-Deleting C:\Users\dpass\Saved Games\DCS.openbeta\DCS Olympus Server (DCS.openbeta).lnk
-C:\Users\dpass\Saved Games\DCS.openbeta\DCS Olympus Server (DCS.openbeta).lnk does not exist, nothing to do
-Deleting C:\Users\dpass\Saved Games\DCS.openbeta\DCS Olympus Client (DCS.openbeta).lnk
-C:\Users\dpass\Saved Games\DCS.openbeta\DCS Olympus Client (DCS.openbeta).lnk does not exist, nothing to do
-Deleting C:\Users\dpass\Desktop\DCS Olympus Server (DCS.openbeta).lnk
-C:\Users\dpass\Desktop\DCS Olympus Server (DCS.openbeta).lnk does not exist, nothing to do
-Deleting C:\Users\dpass\Desktop\DCS Olympus Client (DCS.openbeta).lnk
-C:\Users\dpass\Desktop\DCS Olympus Client (DCS.openbeta).lnk does not exist, nothing to do
-ShortCuts deleted from C:\Users\dpass\Saved Games\DCS.openbeta and desktop
-Olympus removed from C:\Users\dpass\Saved Games\DCS.openbeta
-Installing hooks in C:\Users\dpass\Saved Games\DCS.openbeta
-An error occurred during installation: Error: ENOENT: no such file or directory, lstat 'C:\Users\dpass\Documents\DCSOlympus\scripts\OlympusHook.lua'
- ======================= New log starting at Thu Feb 08 2024 21:58:08 GMT+0100 (Central European Standard Time) =======================
-Running in C:\Users\dpass\Documents\DCSOlympus\manager\javascripts
-Found instance in C:\Users\dpass\Saved Games\DCS.openbeta, checking for Olympus
-Development build detected, skipping version checks...
- ======================= New log starting at Thu Feb 08 2024 21:59:00 GMT+0100 (Central European Standard Time) =======================
-Running in C:\Users\dpass\Documents\DCSOlympus\manager\javascripts
-Found instance in C:\Users\dpass\Saved Games\DCS.openbeta, checking for Olympus
-Development build detected, skipping version checks...
- ======================= New log starting at Thu Feb 08 2024 21:59:52 GMT+0100 (Central European Standard Time) =======================
-Running in C:\Users\dpass\Documents\DCSOlympus\manager\javascripts
-Found instance in C:\Users\dpass\Saved Games\DCS.openbeta, checking for Olympus
-Development build detected, skipping version checks...

olympus.json

@@ -16,6 +16,22 @@
             "password": null
         }, 
 		"additionalMaps": {
+			"TestMap": [
+				{
+					"urlTemplate": "http://localhost:3000/maps/TestMap/{z}/{x}/{y}.png",
+					"minNativeZoom": 1,
+					"maxNativeZoom": 13,
+					"minZoom": 1,
+					"maxZoom": 20
+				},
+				{
+					"urlTemplate": "http://localhost:3000/maps/TestMap/{z}/{x}/{y}.png",
+					"minNativeZoom": 14,
+					"maxNativeZoom": 17,
+					"minZoom": 14,
+					"maxZoom": 20
+				}
+			]
 		}
     }
 }