Merge pull request #584 from Xian55/refactor/tidyup-pathingapi

PathingAPI improvements REST.API and Swagger

PPather/Data/DrawPathDtos.cs

@@ -0,0 +1,8 @@
+
+using System.Numerics;
+
+namespace PPather;
+
+public readonly record struct DrawMapPathRequest(int uiMapId, Vector3[] path);
+
+public readonly record struct DrawWorldPathRequest(int mapId, Vector3[] path);

PPather/Graph/PathGraph.cs

@@ -192,20 +192,17 @@ private void CheckForChunkEvict()
 
     public void Save()
     {
-        lock (chunks)
+        long timestamp = Stopwatch.GetTimestamp();
+        foreach (GraphChunk gc in chunks.GetAllElements())
         {
-            long timestamp = Stopwatch.GetTimestamp();
-            foreach (GraphChunk gc in chunks.GetAllElements())
+            if (gc.modified)
             {
-                if (gc.modified)
-                {
-                    gc.Save();
-                }
+                gc.Save();
             }
-
-            if (logger.IsEnabled(LogLevel.Trace))
-                logger.LogTrace($"Saved GraphChunks {Stopwatch.GetElapsedTime(timestamp).TotalMilliseconds} ms");
         }
+
+        if (logger.IsEnabled(LogLevel.Trace))
+            logger.LogTrace($"Saved GraphChunks {Stopwatch.GetElapsedTime(timestamp).TotalMilliseconds} ms");
     }
 
     // Create and load from file if exisiting

PPather/Search/PPatherService.cs

@@ -7,6 +7,7 @@
 using SharedLib.Data;
 using Microsoft.Extensions.Logging;
 using System.Numerics;
+using SharedLib.Extensions;
 
 namespace PPather;
 
@@ -25,6 +26,8 @@ public sealed class PPatherService
 
     private Search search { get; set; }
 
+    public bool Initialised => search != null;
+
     public Vector4 SearchFrom => search.locationFrom;
     public Vector4 SearchTo => search.locationTo;
     public Vector3 ClosestLocation => search?.PathGraph?.ClosestSpot?.Loc ?? Vector3.Zero;
@@ -83,6 +86,20 @@ public void ChunkAdded(ChunkEventArgs e)
         OnChunkAdded?.Invoke(e);
     }
 
+    public Vector4[] CreateLocations(LineArgs lines)
+    {
+        Vector4[] result = new Vector4[lines.Spots.Length];
+        Span<Vector4> span = result.AsSpan();
+
+        for (int i = 0; i < span.Length; i++)
+        {
+            Vector3 spot = lines.Spots[i];
+            span[i] = ToWorld(lines.MapId, spot.X, spot.Y, spot.Z);
+        }
+
+        return result;
+    }
+
     public Vector4 ToWorld(int uiMap, float mapX, float mapY, float z = 0)
     {
         if (!worldMapAreaDB.TryGet(uiMap, out WorldMapArea wma))
@@ -106,6 +123,11 @@ public Vector4 ToWorldZ(int uiMap, float x, float y, float z)
         return search.CreateWorldLocation(x, y, z, wma.MapID);
     }
 
+    public int GetMapId(int uiMap)
+    {
+        return worldMapAreaDB.GetMapId(uiMap);
+    }
+
     public Vector3 ToLocal(Vector3 world, float mapId, int uiMapId)
     {
         WorldMapArea wma = worldMapAreaDB.GetWorldMapArea(world.X, world.Y, (int)mapId, uiMapId);
@@ -143,6 +165,29 @@ public List<Spot> GetCurrentSearchPath()
         return search.PathGraph.CurrentSearchPath();
     }
 
+    public float TransformMapToWorld(int uiMapId, Vector3[] path)
+    {
+        float mapId = -1;
+
+        Span<Vector3> span = path;
+        for (int i = 0; i < span.Length; i++)
+        {
+            Vector3 p = span[i];
+            if (p.Z != 0)
+            {
+                mapId = GetMapId(uiMapId);
+                break;
+            }
+
+            Vector4 world = ToWorld(uiMapId, p.X, p.Y, p.Z);
+
+            span[i] = world.AsVector3();
+            mapId = world.W;
+        }
+
+        return mapId;
+    }
+
     public void DrawPath(float mapId, ReadOnlySpan<Vector3> path)
     {
         Vector4 from = new(path[0], mapId);
@@ -155,7 +200,7 @@ public void DrawPath(float mapId, ReadOnlySpan<Vector3> path)
             search.CreatePathGraph(mapId);
         }
 
-        List<Spot> spots = new();
+        List<Spot> spots = new(path.Length);
         for (int i = 0; i < path.Length; i++)
         {
             Spot spot = new(path[i]);