From e29fdfd8c7e39fb2e78d83bbf7f778c244d86daa Mon Sep 17 00:00:00 2001
From: Pax1601 <d.passoni92@gmail.com>
Date: Tue, 5 Dec 2023 15:59:19 +0100
Subject: [PATCH] Fixed typo in map attribution

---
 build.bat                         | 28 ++++++++++++++++++++++++++++
 build_package.bat                 | 30 +-----------------------------
 client/@types/olympus/index.d.ts  |  9 ++++++++-
 client/src/constants/constants.ts |  2 +-
 4 files changed, 38 insertions(+), 31 deletions(-)
 create mode 100644 build.bat

diff --git a/build.bat b/build.bat
new file mode 100644
index 00000000..1b5bc532
--- /dev/null
+++ b/build.bat
@@ -0,0 +1,28 @@
+call git clean -fx
+
+cd src
+msbuild olympus.sln /t:Rebuild /p:Configuration=Release
+cd ..
+
+cd scripts/python/configurator
+call build_configurator.bat
+cd ../../..
+
+cd client
+rmdir /s /q "hgt"
+call npm install
+call npm run emit-declarations
+call npm run build-release
+
+cd "plugins\controltips"
+call npm install
+call npm run build-release
+cd "..\.."
+
+cd "plugins\databasemanager"
+call npm install
+call npm run build-release
+cd "..\.."
+
+call npm prune --production
+cd ..
diff --git a/build_package.bat b/build_package.bat
index 51d8d755..af5a5490 100644
--- a/build_package.bat
+++ b/build_package.bat
@@ -1,30 +1,2 @@
-call git clean -fx
-
-cd src
-msbuild olympus.sln /t:Rebuild /p:Configuration=Release
-cd ..
-
-cd scripts/python/configurator
-call build_configurator.bat
-cd ../../..
-
-cd client
-rmdir /s /q "hgt"
-call npm install
-call npm run emit-declarations
-call npm run build-release
-
-cd "plugins\controltips"
-call npm install
-call npm run build-release
-cd "..\.."
-
-cd "plugins\databasemanager"
-call npm install
-call npm run build-release
-cd "..\.."
-
-call npm prune --production
-cd ..
-
+call build.bat
 call "C:\Program Files (x86)\Inno Setup 6\iscc.exe" "installer\olympus.iss"
diff --git a/client/@types/olympus/index.d.ts b/client/@types/olympus/index.d.ts
index e490f5af..37fb00a0 100644
--- a/client/@types/olympus/index.d.ts
+++ b/client/@types/olympus/index.d.ts
@@ -158,6 +158,10 @@ declare module "constants/constants" {
             bounds: LatLngBounds;
             zoom: number;
         };
+        SinaiMap: {
+            bounds: LatLngBounds;
+            zoom: number;
+        };
     };
     export const mapLayers: {
         "ArcGIS Satellite": {
@@ -2396,7 +2400,7 @@ declare module "server/servermanager" {
         constructor();
         toggleDemoEnabled(): void;
         setCredentials(newUsername: string, newPassword: string): void;
-        GET(callback: CallableFunction, uri: string, options?: ServerRequestOptions, responseType?: string): void;
+        GET(callback: CallableFunction, uri: string, options?: ServerRequestOptions, responseType?: string, force?: boolean): void;
         PUT(request: object, callback: CallableFunction): void;
         getConfig(callback: CallableFunction): void;
         setAddress(address: string, port: number): void;
@@ -2464,6 +2468,9 @@ declare module "server/servermanager" {
         setPaused(newPaused: boolean): void;
         getPaused(): boolean;
         getServerIsPaused(): boolean;
+        getRequests(): {
+            [key: string]: XMLHttpRequest;
+        };
     }
 }
 declare module "panels/unitlistpanel" {
diff --git a/client/src/constants/constants.ts b/client/src/constants/constants.ts
index a43061d0..788b9511 100644
--- a/client/src/constants/constants.ts
+++ b/client/src/constants/constants.ts
@@ -142,7 +142,7 @@ export const mapLayers = {
         urlTemplate: "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
         minZoom: 1,
         maxZoom: 19,
-        attribution: "Tiles &copy; Esri &mdash; Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, GetApp().getMap()ping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community"
+        attribution: "Tiles &copy; Esri &mdash; 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}',