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

Merge pull request #298 from Pax1601/296-create-airbases-api

Browse Source 
296 create airbases api
This commit is contained in:
Pax1601 2023-05-29 15:20:17 +02:00 committed by GitHub
commit 982ff838a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 151 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/app.js
View File

@ -5,10 +5,11 @@ var logger = require('morgan');
var fs = require('fs');
var basicAuth = require('express-basic-auth')
var atcRouter = require('./routes/api/atc');
var indexRouter = require('./routes/index');
var uikitRouter = require('./routes/uikit');
var usersRouter = require('./routes/users');
var atcRouter = require('./routes/api/atc');
var airbasesRouter = require('./routes/api/airbases');
var indexRouter = require('./routes/index');
var uikitRouter = require('./routes/uikit');
var usersRouter = require('./routes/users');
var resourcesRouter = require('./routes/resources');
var app = express();
@ -21,6 +22,7 @@ app.use(express.static(path.join(__dirname, 'public')));
app.use('/', indexRouter);
app.use('/api/atc', atcRouter);
app.use('/api/airbases', airbasesRouter);
app.use('/users', usersRouter);
app.use('/uikit', uikitRouter);
app.use('/resources', resourcesRouter);

93
client/routes/api/airbases.js Normal file
View File

@ -0,0 +1,93 @@
var express = require('express');
var app = express();
var fs = require('fs');
const bodyParser = require('body-parser');
app.use(bodyParser.urlencoded({ extended: false}));
app.use(bodyParser.json());
const allowedTheatres = [
"caucasus",
"marianas",
"nevada",
"persiangulf",
"syria"
];
function getAirbasesData( theatreName ) {
if ( !isValidTheatre( theatreName ) ) {
return false;
}
return JSON.parse( fs.readFileSync( `src/airfields/${theatreName}.json` ) ).airfields
}
function isValidTheatre( theatre ) {
return ( allowedTheatres.indexOf( theatre ) > -1 )
}
function sendInvalidTheatre( res ) {
res.status( 400 ).send( "Missing/invalid theatre name; must be one of:\n\t" + allowedTheatres.join( "\n\t" ) );
}
/**************************************************************************************************************/
// Endpoints
/**************************************************************************************************************/
app.get( "/", ( req, res ) => {
sendInvalidTheatre( res );
});
app.get( "/:theatreName/:airbaseName", ( req, res ) => {
const airbases = getAirbasesData( req.params.theatreName );
if ( !airbases ) {
sendInvalidTheatre( res );
return;
}
const airbaseName = req.params.airbaseName;
if ( !airbases.hasOwnProperty( airbaseName ) ) {
res.status( 404 ).send( `Unknown airbase name "${airbaseName}". Available options are:\n\t` + Object.keys( airbases ).join( "\n\t" ) );
} else {
res.status( 200 ).json( airbases[ airbaseName ] );
}
});
app.get( "/:theatreName", ( req, res ) => {
const airbases = getAirbasesData( req.params.theatreName );
if ( !airbases ) {
sendInvalidTheatre( res );
return;
}
res.status( 200 ).json( airbases );
});
module.exports = app;

56
client/src/airfields/caucasus.json
View File

@ -1,6 +1,6 @@
{
"airfields": {
"Anapa": {
"Anapa-Vityazevo": {
"ICAO": "URKA",
"Elevation": "141",
"TACAN": "",
@ -85,7 +85,7 @@
}
}
},
"KOBULETI": {
"Kobuleti": {
"ICAO": "UG5X",
"Elevation": "69",
"TACAN": "67X",
@ -102,7 +102,7 @@
}
}
},
"Krasnodar": {
"Krasnodar-Center": {
"ICAO": "URKL",
"Elevation": "98",
"TACAN": "",
@ -119,7 +119,7 @@
}
}
},
"Krasnodar-P": {
"Krasnodar-Pashkovsky": {
"ICAO": "URKK",
"Elevation": "112",
"TACAN": "",
@ -153,7 +153,7 @@
}
}
},
"KUTAISI": {
"Kutaisi": {
"ICAO": "UGKO",
"Elevation": "148",
"TACAN": "44X",
@ -170,7 +170,7 @@
}
}
},
"Maykop": {
"Maykop-Khanskaya": {
"ICAO": "URKH",
"Elevation": "591",
"TACAN": "",
@ -187,7 +187,7 @@
}
}
},
"MinVody": {
"Mineralnye Vody": {
"ICAO": "URMM",
"Elevation": "1050",
"TACAN": "",
@ -255,7 +255,7 @@
}
}
},
"Senaki": {
"Senaki-Kolkhi": {
"ICAO": "UGKS",
"Elevation": "43",
"TACAN": "31X",
@ -272,7 +272,7 @@
}
}
},
"Sochi": {
"Sochi-Adler": {
"ICAO": "URSS",
"Elevation": "98",
"TACAN": "",
@ -289,7 +289,24 @@
}
}
},
"TbilisiMilitary": {
"Tbilisi-Lochini": {
"ICAO": "UGTB",
"Elevation": "1574",
"TACAN": "25X",
"Runways": {
"13": {
"Mag Hdg": "121",
"Length": "9300",
"ILS": "110.30"
},
"31": {
"Mag Hdg": "301",
"Length": "9300",
"ILS": "108.90"
}
}
},
"Soganlug": {
"ICAO": "UG24",
"Elevation": "1500",
"TACAN": "25X",
@ -306,7 +323,7 @@
}
}
},
"Sukhumi": {
"Sukhumi-Babushara": {
"ICAO": "UGSS",
"Elevation": "43",
"TACAN": "",
@ -323,23 +340,6 @@
}
}
},
"Lochini": {
"ICAO": "UGTB",
"Elevation": "1574",
"TACAN": "25X",
"Runways": {
"13": {
"Mag Hdg": "121",
"Length": "9300",
"ILS": "110.30"
},
"31": {
"Mag Hdg": "301",
"Length": "9300",
"ILS": "108.90"
}
}
},
"Vaziani": {
"ICAO": "UG27",
"Elevation": "1524",

24
client/src/missionhandler/missionhandler.ts
View File

@ -9,6 +9,8 @@ export class MissionHandler
#airbases : {[name: string]: Airbase} = {};
#theatre : string = "";
#airbaseData : { [name: string]: object } = {};
// Time
#date : any;
#elapsedTime : any;
@ -40,8 +42,29 @@ export class MissionHandler
}
}
if ("mission" in data)
{
if (data.mission != null && data.mission.theatre != this.#theatre)
{
this.#theatre = data.mission.theatre;
getMap().setTheatre(this.#theatre);
getInfoPopup().setText("Map set to " + this.#theatre);
}
}
if ("airbases" in data)
{
/*
console.log( Object.values( data.airbases ).sort( ( a:any, b:any ) => {
const aVal = a.callsign.toLowerCase();
const bVal = b.callsign.toLowerCase();
return aVal > bVal ? 1 : -1;
}) );
//*/
for (let idx in data.airbases)
{
var airbase = data.airbases[idx]
@ -95,6 +118,7 @@ export class MissionHandler
if ( "time" in data ) {
this.#updateTime = data.time;
}
}
getBullseyes()