weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed typo in map attribution

Browse Source
This commit is contained in:
Pax1601
2023-12-05 15:59:19 +01:00
parent 7fbc19e90a
commit e29fdfd8c7
4 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
build.bat Normal file
View File

@@ -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 ..

30
build_package.bat
View File

@@ -1,30 +1,2 @@
call git clean -fx call build.bat
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 "C:\Program Files (x86)\Inno Setup 6\iscc.exe" "installer\olympus.iss" call "C:\Program Files (x86)\Inno Setup 6\iscc.exe" "installer\olympus.iss"

9
client/@types/olympus/index.d.ts vendored
View File

@@ -158,6 +158,10 @@ declare module "constants/constants" {
bounds: LatLngBounds; bounds: LatLngBounds;
zoom: number; zoom: number;
}; };
SinaiMap: {
bounds: LatLngBounds;
zoom: number;
};
}; };
export const mapLayers: { export const mapLayers: {
"ArcGIS Satellite": { "ArcGIS Satellite": {
@@ -2396,7 +2400,7 @@ declare module "server/servermanager" {
constructor(); constructor();
toggleDemoEnabled(): void; toggleDemoEnabled(): void;
setCredentials(newUsername: string, newPassword: string): 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; PUT(request: object, callback: CallableFunction): void;
getConfig(callback: CallableFunction): void; getConfig(callback: CallableFunction): void;
setAddress(address: string, port: number): void; setAddress(address: string, port: number): void;
@@ -2464,6 +2468,9 @@ declare module "server/servermanager" {
setPaused(newPaused: boolean): void; setPaused(newPaused: boolean): void;
getPaused(): boolean; getPaused(): boolean;
getServerIsPaused(): boolean; getServerIsPaused(): boolean;
getRequests(): {
[key: string]: XMLHttpRequest;
};
} }
} }
declare module "panels/unitlistpanel" { declare module "panels/unitlistpanel" {

2
client/src/constants/constants.ts
View File

@@ -142,7 +142,7 @@ export const mapLayers = {
urlTemplate: "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", urlTemplate: "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
minZoom: 1, minZoom: 1,
maxZoom: 19, maxZoom: 19,
attribution: "Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, GetApp().getMap()ping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community" attribution: "Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Mapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community"
}, },
"USGS Topo": { "USGS Topo": {
urlTemplate: 'https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/{z}/{y}/{x}', urlTemplate: 'https://basemap.nationalmap.gov/arcgis/rest/services/USGSTopo/MapServer/tile/{z}/{y}/{x}',