From 6061883194b68b0d8ebf4c1ec918973c6c8e341f Mon Sep 17 00:00:00 2001
From: funkyfranky <frank@inter-zone.de>
Date: Thu, 5 Oct 2017 00:08:48 +0200
Subject: [PATCH] Added airport selection by zone.

---
 Moose Development/Moose/Functional/RAT.lua | 20 +++++++++++++++-----
 Moose Mission Setup/Moose.lua              |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Moose Development/Moose/Functional/RAT.lua b/Moose Development/Moose/Functional/RAT.lua
index dacf6a85e..ec24b97fa 100644
--- a/Moose Development/Moose/Functional/RAT.lua	
+++ b/Moose Development/Moose/Functional/RAT.lua	
@@ -510,7 +510,6 @@ function RAT:Spawn(naircraft)
     self.destination_ports=self:_GetAirportsInZone(self.destination_Azone)
   end
   
-
   -- debug message
   local text=string.format("\n******************************************************\n")
   text=text..string.format("Spawning %i aircraft from template %s of type %s.\n", self.ngroups, self.SpawnTemplatePrefix, self.aircraft.type)
@@ -732,10 +731,10 @@ function RAT:SetDestination(names)
 
 end
 
---- Airports, FARPs and ships explicitly excluded as departures and destinations.
+--- Include all airports which lie in a zone as possible destinations.
 -- @param #RAT self
--- @param #string ports Name or table of names of excluded airports.
-function RAT:SetDestinationFromZone(zone)
+-- @param Core.Zone#ZONE zone Zone in which the airports lie.
+function RAT:SetDestinationsFromZone(zone)
 
   -- Random departure is deactivated now that user specified departure ports.
   self.random_destination=false
@@ -743,6 +742,17 @@ function RAT:SetDestinationFromZone(zone)
   self.destination_Azone=zone
 end
 
+--- Include all airports which lie in a zone as possible destinations.
+-- @param #RAT self
+-- @param Core.Zone#ZONE zone Zone in which the airports lie.
+function RAT:SetDeparturesFromZone(zone)
+  -- Random departure is deactivated now that user specified departure ports.
+  self.random_departure=false
+
+  self.departure_Azone=zone
+end
+
+
 --- Airports, FARPs and ships explicitly excluded as departures and destinations.
 -- @param #RAT self
 -- @param #string ports Name or table of names of excluded airports.
@@ -1715,7 +1725,7 @@ end
 -- @return #list Table with airport names that lie within the zone.
 function RAT:_GetAirportsInZone(zone)
   local airports={}
-  for _,airport in self.airports do
+  for _,airport in pairs(self.airports) do
     local name=airport:GetName()
     local coord=airport:GetCoordinate()
     
diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua
index a510dd4d5..b9a0b6e20 100644
--- a/Moose Mission Setup/Moose.lua	
+++ b/Moose Mission Setup/Moose.lua	
@@ -1,5 +1,5 @@
 env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
-env.info( 'Moose Generation Timestamp: 20171003_1348' )
+env.info( 'Moose Generation Timestamp: 20171004_1944' )
 
 local base = _G