Post PR4 fixes; (added static HTML to project_,

changed helper method [C# 8 compatibility, revert in future]

diff --git a/Automap/Automap.csproj b/Automap/Automap.csproj
index 6042ebb..f9541a1 100644 (file)
--- a/Automap/Automap.csproj
+++ b/Automap/Automap.csproj
@@ -96,7 +96,6 @@
     <Folder Include="Data\" />
     <Folder Include="assets\" />
     <Folder Include="assets\automap\" />
-    <Folder Include="assets\automap\config\" />
     <Folder Include="Designators\" />
     <Folder Include="Libs\" />
     <Folder Include="Subsystems\" />
@@ -106,7 +105,7 @@
     <None Include="modinfo.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="assets\automap\config\automap_format.css">
+    <None Include="assets\automap\config\automap.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>

diff --git a/Automap/Helpers.cs b/Automap/Helpers.cs
index 205f450..4703379 100644 (file)
--- a/Automap/Helpers.cs
+++ b/Automap/Helpers.cs
@@ -37,14 +37,14 @@ namespace Automap
             int q = Convert.ToInt32(value * (1 - f * saturation));
             int t = Convert.ToInt32(value * (1 - (1 - f) * saturation));
 
-            return hi switch
+                       switch (hi) 
             {
-                0 => Color.FromArgb(255, v, t, p),
-                1 => Color.FromArgb(255, q, v, p),
-                2 => Color.FromArgb(255, p, v, t),
-                3 => Color.FromArgb(255, p, q, v),
-                4 => Color.FromArgb(255, t, p, v),
-                _ => Color.FromArgb(255, v, p, q),
+                               case 0: return Color.FromArgb(255, v, t, p);
+                               case 1: return Color.FromArgb(255, q, v, p);
+                               case 2: return Color.FromArgb(255, p, v, t);
+                               case 3: return Color.FromArgb(255, p, q, v);
+                               case 4: return Color.FromArgb(255, t, p, v);
+                               default: return Color.FromArgb(255, v, p, q);
             };
         }
 

diff --git a/Automap/Subsystems/AutomapSystem.cs b/Automap/Subsystems/AutomapSystem.cs
index 7880ac2..889b65b 100644 (file)
--- a/Automap/Subsystems/AutomapSystem.cs
+++ b/Automap/Subsystems/AutomapSystem.cs
@@ -400,16 +400,16 @@ namespace Automap
                                                        int Z_chunk_pos = int.Parse(result.Groups["Z"].Value);
 
                                                        //Parse PNG chunks for METADATA in shard
-                                                       using var fileStream = shardFile.OpenRead();
+                                                       using (var fileStream = shardFile.OpenRead( )) {
                                                        //TODO: Add corrupted PNG Exception handing HERE !
                                                        PngReader pngRead = new PngReader(fileStream);
-                                                       pngRead.ReadSkippingAllRows();
-                                                       pngRead.End();
+                                                       pngRead.ReadSkippingAllRows( );
+                                                       pngRead.End( );
 
-                                                       PngMetadataChunk metadataFromPng = pngRead.GetChunksList().GetById1(PngMetadataChunk.ID) as PngMetadataChunk;
+                                                       PngMetadataChunk metadataFromPng = pngRead.GetChunksList( ).GetById1(PngMetadataChunk.ID) as PngMetadataChunk;
 
                                                        chunkTopMetadata.Add(metadataFromPng.ChunkMetadata);
-
+                                                       }
                                                }
                                        }