Merge pull request #2350 from FlightControl-Master/master

Merge from master

Moose Development/Moose/Core/Point.lua

@@ -837,6 +837,26 @@ do -- COORDINATE
     return land.getHeight( Vec2 )
   end
 
+  --- Returns a table of DCS#Vec3 points representing the terrain profile between two points.
+  -- @param #COORDINATE self
+  -- @param Destination DCS#Vec3 Ending point of the profile.
+  -- @return #table DCS#Vec3 table of the profile
+  function COORDINATE:GetLandProfileVec3(Destination)
+    return land.profile(self:GetVec3(), Destination)
+  end
+
+  --- Returns a table of #COORDINATE representing the terrain profile between two points.
+  -- @param #COORDINATE self
+  -- @param Destination #COORDINATE Ending coordinate of the profile.
+  -- @return #table #COORDINATE table of the profile
+  function COORDINATE:GetLandProfileCoordinates(Destination)
+    local points = self:GetLandProfileVec3(Destination:GetVec3())
+    local coords = {}
+    for _, point in ipairs(points) do
+      table.insert(coords, COORDINATE:NewFromVec3(point))
+    end
+    return coords
+  end
 
   --- Set the heading of the coordinate, if applicable.
   -- @param #COORDINATE self

Moose Development/Moose/Core/Zone.lua

@@ -1523,6 +1523,7 @@ function ZONE_RADIUS:IsVec3InZone( Vec3 )
 end
 
 --- Search for clear ground spawn zones within this zone. A powerful and efficient function using Disposition to find clear areas for spawning ground units avoiding trees, water and map scenery.
+-- @param #ZONE_RADIUS self
 -- @param #number PosRadius Required clear radius around each position.
 -- @param #number NumPositions Number of positions to find.
 -- @return #table A table of DCS#Vec2 positions that are clear of map objects within the given PosRadius. nil if no clear positions are found.
@@ -1532,6 +1533,7 @@ end
 
 
 --- Search for a random clear ground spawn coordinate within this zone. A powerful and efficient function using Disposition to find clear areas for spawning ground units avoiding trees, water and map scenery.
+-- @param #ZONE_RADIUS self
 -- @param #number PosRadius (Optional) Required clear radius around each position. (Default is math.min(Radius/10, 200))
 -- @param #number NumPositions (Optional) Number of positions to find. (Default 50)
 -- @return Core.Point#COORDINATE A random coordinate for a clear zone. nil if no clear positions are found.
@@ -2519,6 +2521,7 @@ function ZONE_POLYGON_BASE:Flush()
 end
 
 --- Search for clear ground spawn zones within this zone. A powerful and efficient function using Disposition to find clear areas for spawning ground units avoiding trees, water and map scenery.
+-- @param #ZONE_POLYGON_BASE self
 -- @param #number PosRadius Required clear radius around each position.
 -- @param #number NumPositions Number of positions to find.
 -- @return #table A table of DCS#Vec2 positions that are clear of map objects within the given PosRadius. nil if no clear positions are found.
@@ -2528,6 +2531,7 @@ end
 
 
 --- Search for a random clear ground spawn coordinate within this zone. A powerful and efficient function using Disposition to find clear areas for spawning ground units avoiding trees, water and map scenery.
+-- @param #ZONE_POLYGON_BASE self
 -- @param #number PosRadius (Optional) Required clear radius around each position. (Default is math.min(Radius/10, 200))
 -- @param #number NumPositions (Optional) Number of positions to find. (Default 50)
 -- @return Core.Point#COORDINATE A random coordinate for a clear zone. nil if no clear positions are found.