Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	Moose Development/Moose/Wrapper/Scenery.lua

Moose Development/Moose/Ops/Chief.lua

@@ -1485,6 +1485,17 @@ function CHIEF:AddGciCapZone(Zone, Altitude, Speed, Heading, Leg)
   return zone
 end
 
+--- Remove a GCI CAP
+-- @param #CHIEF self
+-- @param Core.Zone#ZONE Zone Zone, where the flight orbits.
+function CHIEF:RemoveGciCapZone(Zone)
+
+  -- Hand over to commander.
+  local zone=self.commander:RemoveGciCapZone(Zone)
+
+  return zone
+end
+
 --- Add an AWACS zone.
 -- @param #CHIEF self
 -- @param Core.Zone#ZONE Zone Zone.

Moose Development/Moose/Ops/Commander.lua

@@ -710,6 +710,26 @@ function COMMANDER:AddGciCapZone(Zone, Altitude, Speed, Heading, Leg)
   return patrolzone
 end
 
+--- Remove a GCI CAP.
+-- @param #COMMANDER self
+-- @param Core.Zone#ZONE Zone Zone, where the flight orbits.
+function COMMANDER:RemoveGciCapZone(Zone)
+
+  local patrolzone={} --Ops.AirWing#AIRWING.PatrolZone
+  
+  patrolzone.zone=Zone
+  for i,_patrolzone in pairs(self.gcicapZones) do
+    if _patrolzone.zone == patrolzone.zone then
+      if _patrolzone.mission and _patrolzone.mission:IsNotOver() then
+          _patrolzone.mission:Cancel()
+      end
+      table.remove(self.gcicapZones, i)
+      break
+    end
+  end
+  return patrolzone
+end
+
 --- Add an AWACS zone.
 -- @param #COMMANDER self
 -- @param Core.Zone#ZONE Zone Zone.

Moose Development/Moose/Wrapper/Scenery.lua

@@ -9,7 +9,7 @@
 -- ===
 -- 
 -- @module Wrapper.Scenery
--- @image Wrapper_Scenery.JPG+
+-- @image Wrapper_Scenery.JPG
 
 
 --- SCENERY Class