mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2026-08-11 11:48:38 +00:00
Merge remote-tracking branch 'origin/master' into branch
This commit is contained in:
@@ -2109,7 +2109,7 @@ end
|
|||||||
function AIRBASE:GetParkingSpotsNumber(termtype)
|
function AIRBASE:GetParkingSpotsNumber(termtype)
|
||||||
|
|
||||||
-- Get free parking spots data.
|
-- Get free parking spots data.
|
||||||
local parkingdata=self:GetParkingData(false)
|
local parkingdata=self:GetParkingData(false) or {}
|
||||||
|
|
||||||
local nspots=0
|
local nspots=0
|
||||||
for _,parkingspot in pairs(parkingdata) do
|
for _,parkingspot in pairs(parkingdata) do
|
||||||
@@ -2129,7 +2129,7 @@ end
|
|||||||
function AIRBASE:GetFreeParkingSpotsNumber(termtype, allowTOAC)
|
function AIRBASE:GetFreeParkingSpotsNumber(termtype, allowTOAC)
|
||||||
|
|
||||||
-- Get free parking spots data.
|
-- Get free parking spots data.
|
||||||
local parkingdata=self:GetParkingData(true)
|
local parkingdata=self:GetParkingData(true) or {}
|
||||||
|
|
||||||
local nfree=0
|
local nfree=0
|
||||||
for _,parkingspot in pairs(parkingdata) do
|
for _,parkingspot in pairs(parkingdata) do
|
||||||
@@ -2152,7 +2152,7 @@ end
|
|||||||
function AIRBASE:GetFreeParkingSpotsCoordinates(termtype, allowTOAC)
|
function AIRBASE:GetFreeParkingSpotsCoordinates(termtype, allowTOAC)
|
||||||
|
|
||||||
-- Get free parking spots data.
|
-- Get free parking spots data.
|
||||||
local parkingdata=self:GetParkingData(true)
|
local parkingdata=self:GetParkingData(true) or {}
|
||||||
|
|
||||||
-- Put coordinates of free spots into table.
|
-- Put coordinates of free spots into table.
|
||||||
local spots={}
|
local spots={}
|
||||||
@@ -2251,7 +2251,7 @@ end
|
|||||||
function AIRBASE:_InitParkingSpots()
|
function AIRBASE:_InitParkingSpots()
|
||||||
|
|
||||||
-- Get parking data of all spots (free or occupied)
|
-- Get parking data of all spots (free or occupied)
|
||||||
local parkingdata=self:GetParkingData(false)
|
local parkingdata=self:GetParkingData(false) or {}
|
||||||
|
|
||||||
-- Init table.
|
-- Init table.
|
||||||
self.parking={}
|
self.parking={}
|
||||||
@@ -2327,10 +2327,10 @@ end
|
|||||||
function AIRBASE:GetParkingSpotsTable(termtype)
|
function AIRBASE:GetParkingSpotsTable(termtype)
|
||||||
|
|
||||||
-- Get parking data of all spots (free or occupied)
|
-- Get parking data of all spots (free or occupied)
|
||||||
local parkingdata=self:GetParkingData(false)
|
local parkingdata=self:GetParkingData(false) or {}
|
||||||
|
|
||||||
-- Get parking data of all free spots.
|
-- Get parking data of all free spots.
|
||||||
local parkingfree=self:GetParkingData(true)
|
local parkingfree=self:GetParkingData(true) or {}
|
||||||
|
|
||||||
-- Function to ckeck if any parking spot is free.
|
-- Function to ckeck if any parking spot is free.
|
||||||
local function _isfree(_tocheck)
|
local function _isfree(_tocheck)
|
||||||
@@ -2379,7 +2379,7 @@ end
|
|||||||
function AIRBASE:GetFreeParkingSpotsTable(termtype, allowTOAC)
|
function AIRBASE:GetFreeParkingSpotsTable(termtype, allowTOAC)
|
||||||
|
|
||||||
-- Get parking data of all free spots.
|
-- Get parking data of all free spots.
|
||||||
local parkingfree=self:GetParkingData(true)
|
local parkingfree=self:GetParkingData(true) or {}
|
||||||
|
|
||||||
-- Put coordinates of free spots into table.
|
-- Put coordinates of free spots into table.
|
||||||
local freespots={}
|
local freespots={}
|
||||||
@@ -2409,7 +2409,7 @@ end
|
|||||||
function AIRBASE:GetParkingSpotData(TerminalID)
|
function AIRBASE:GetParkingSpotData(TerminalID)
|
||||||
|
|
||||||
-- Get parking data.
|
-- Get parking data.
|
||||||
local parkingdata=self:GetParkingSpotsTable()
|
local parkingdata=self:GetParkingSpotsTable() or {}
|
||||||
|
|
||||||
for _,_spot in pairs(parkingdata) do
|
for _,_spot in pairs(parkingdata) do
|
||||||
local spot=_spot --#AIRBASE.ParkingSpot
|
local spot=_spot --#AIRBASE.ParkingSpot
|
||||||
@@ -2435,7 +2435,7 @@ function AIRBASE:MarkParkingSpots(termtype, mark)
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- Get parking data from getParking() wrapper function.
|
-- Get parking data from getParking() wrapper function.
|
||||||
local parkingdata=self:GetParkingSpotsTable(termtype)
|
local parkingdata=self:GetParkingSpotsTable(termtype) or {}
|
||||||
|
|
||||||
-- Get airbase name.
|
-- Get airbase name.
|
||||||
local airbasename=self:GetName()
|
local airbasename=self:GetName()
|
||||||
@@ -2550,7 +2550,7 @@ function AIRBASE:FindFreeParkingSpotForAircraft(group, terminaltype, scanradius,
|
|||||||
local markobstacles=false
|
local markobstacles=false
|
||||||
|
|
||||||
-- Loop over all known parking spots
|
-- Loop over all known parking spots
|
||||||
for _,parkingspot in pairs(parkingdata) do
|
for _,parkingspot in pairs(parkingdata or {}) do
|
||||||
|
|
||||||
-- Coordinate of the parking spot.
|
-- Coordinate of the parking spot.
|
||||||
local _spot=parkingspot.Coordinate -- Core.Point#COORDINATE
|
local _spot=parkingspot.Coordinate -- Core.Point#COORDINATE
|
||||||
|
|||||||
Reference in New Issue
Block a user