first version using SkiaSharp

bassmaster187 · Oct 14, 2024 · e152852 · e152852
1 parent 0f6935b
commit e152852
Show file tree

Hide file tree

Showing 7 changed files with 233 additions and 100 deletions.
diff --git a/OSMMapGenerator/OSMMapGenerator.cs b/OSMMapGenerator/OSMMapGenerator.cs
diff --git a/OSMMapGenerator/OSMMapGeneratorNET8.csproj b/OSMMapGenerator/OSMMapGeneratorNET8.csproj
@@ -6,6 +6,7 @@
     <AssemblyTitle>OSMMapGenerator</AssemblyTitle>
     <Copyright>%24{AuthorCopyright}</Copyright>
     <AssemblyVersion>1.1.0</AssemblyVersion>
+    <StartupObject>TeslaLogger.OSMMapGenerator</StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug</OutputPath>
@@ -19,6 +20,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.2" />
+    <PackageReference Include="SkiaSharp" Version="2.88.8" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.8" />
   </ItemGroup>
 </Project>
diff --git a/TeslaLogger/OSMMapProvider.cs b/TeslaLogger/OSMMapProvider.cs
@@ -53,7 +53,9 @@ public override void CreateTripMap(DataTable coords, int width, int height, MapM
             File.WriteAllText(tempfile, JsonConvert.SerializeObject(job), Encoding.UTF8);
 
             GetOSMMapGeneratorFilename(out string fileName, out string arguments);
-            arguments += "-jobfile " + tempfile + (Program.VERBOSE ? " - debug" : "");
+            arguments += "-jobfile " + tempfile + (Program.VERBOSE ? " -debug" : "");
+
+            Logfile.Log("cmd: " + fileName + " " + arguments);
 
             using (Process process = new Process
             {
@@ -254,14 +256,18 @@ private static void GetOSMMapGeneratorFilename(out string fileName, out string a
             else
             {
                 fileName = "/home/cli/dotnet";
-                arguments = "/etc/teslalogger/OSMMapGenerator.exe ";
+                if (!File.Exists(fileName))
+                    fileName = "dotnet";
 
+                arguments = "OSMMapGeneratorNET8.dll ";
+
+                /*
                 if (!Tools.IsMono())
                 {
                     var f = new FileInfo("OSMMapGeneratorNET8.dll");
                     fileName = f.FullName;
                     arguments = "";
-                }
+                }*/
             }
         }
 

diff --git a/TeslaLogger/Program.cs b/TeslaLogger/Program.cs
@@ -352,7 +352,7 @@ private static void InitStage2()
 
             try
             {
-                if (Environment.Version?.ToString()?.StartsWith("8.0") == true)
+                if (Tools.IsDotnet8())
                 {
                     ExceptionlessClient.Default.Configuration.DefaultData.Add("dotnet", Environment.Version?.ToString());
                     ExceptionlessClient.Default.CreateFeatureUsage("USE_DOTNET8").FirstCarUserID().AddObject(Environment.Version.ToString(), "DOTNET8").Submit();

diff --git a/TeslaLogger/StaticMapService.cs b/TeslaLogger/StaticMapService.cs
@@ -142,13 +142,14 @@ private void Work()
                 int queueLength = queue.Count;
                 if (queue.TryDequeue(out Request request))
                 {
-                    //Tools.DebugLog("StaticMapService:Work() queue:" + queue.Count + " MapProvider:" + _StaticMapProvider);
+                    Tools.DebugLog("StaticMapService:Work() queue:" + queue.Count + " MapProvider:" + _StaticMapProvider);
                     int width = request.Width > 0 ? request.Width : 200;
                     int height = request.Height > 0 ? request.Height : 150;
                     if (request is TripRequest)
                     {
                         //Tools.DebugLog($"StaticMapService:Work() request:{request.Type} {((TripRequest)request).StartPosID}->{((TripRequest)request).EndPosID}");
                         string filename = System.IO.Path.Combine(GetMapDir(), GetMapFileName(((TripRequest)request).CarID, ((TripRequest)request).StartPosID, ((TripRequest)request).EndPosID));
+                        Tools.DebugLog("StaticMapService:filename = " + filename);
                         if (MapFileExistsOrIsTooOld(filename))
                         {
                             using (DataTable dt = TripToCoords((TripRequest)request))
@@ -384,7 +385,7 @@ public static string GetMapDir()
         {
             string mapdir = "/var/lib/grafana/plugins/teslalogger-timeline-panel/dist/maps";
 
-            if (!Tools.IsMono())
+            if (!Tools.IsMono() && !Tools.IsDotnet8())
                 mapdir = new DirectoryInfo("maps").FullName;
 
             try

diff --git a/TeslaLogger/Tools.cs b/TeslaLogger/Tools.cs
@@ -53,6 +53,7 @@ internal static bool UseNearbySuCService()
         public enum UpdateType { all, stable, none };
 
         internal static ConcurrentQueue<Tuple<DateTime, string>> debugBuffer = new ConcurrentQueue<Tuple<DateTime, string>>();
+        internal static bool dotnet8;
 
         public static void SetThreadEnUS()
         {
@@ -1234,6 +1235,11 @@ public static bool IsUnitTest()
             return false;
         }
 
+        public static bool IsDotnet8()
+        {
+            return Environment.Version?.ToString()?.StartsWith("8.0") == true;
+        }
+
         public static bool IsDockerNET8()
         {
             try

diff --git a/UnitTestsTeslalogger/UnitTestOSMMapGenerator.cs b/UnitTestsTeslalogger/UnitTestOSMMapGenerator.cs
@@ -12,10 +12,23 @@ namespace UnitTestsTeslalogger
     [TestClass]
     public class UnitTestOSMMapGenerator
     {
+        [TestInitialize]
+        public void InitializeTests()
+        {
+            if (!Directory.Exists("maps"))
+                Directory.CreateDirectory("maps");
+            else
+            {
+                var files = Directory.GetFiles("maps");
+                foreach (var file in files)
+                    File.Delete(file);
+            }
+        }
+
         [TestMethod]
         public void ParkingP1()
         {
-            var f = new FileInfo("../../Testfile-P1.txt");
+            var f = new FileInfo("../../../Testfile-P1.txt");
             string tempfile = GetTempFileName();
             f.CopyTo(tempfile,true);
 
@@ -35,7 +48,7 @@ public void ParkingP1()
         [TestMethod]
         public void ParkingP2()
         {
-            var f = new FileInfo("../../Testfile-P2.txt");
+            var f = new FileInfo("../../../Testfile-P2.txt");
             string tempfile = GetTempFileName();
             f.CopyTo(tempfile, true);
 
@@ -52,7 +65,7 @@ public void ParkingP2()
         [TestMethod]
         public void ParkingP3()
         {
-            var f = new FileInfo("../../Testfile-P3.txt");
+            var f = new FileInfo("../../../Testfile-P3.txt");
             string tempfile = GetTempFileName();
             f.CopyTo(tempfile, true);
 
@@ -69,7 +82,7 @@ public void ParkingP3()
         [TestMethod]
         public void ParkingP4()
         {
-            var f = new FileInfo("../../Testfile-P4.txt");
+            var f = new FileInfo("../../../Testfile-P4.txt");
             string tempfile = GetTempFileName();
             f.CopyTo(tempfile, true);
 
@@ -86,7 +99,7 @@ public void ParkingP4()
         [TestMethod]
         public void TripT1()
         {
-            var f = new FileInfo("../../Testfile-T1.txt");
+            var f = new FileInfo("../../../Testfile-T1.txt");
             string tempfile = GetTempFileName();
             f.CopyTo(tempfile, true);