Merge pull request #25 from juliangiebel/2024.06.05-release-v1.1.8

2024.06.05 release v1.1.8 - Fixes tiles stretching at the edges of the map
space-wizards · Oct 9, 2024 · f5d3794 · f5d3794
2 parents 1e1364f + af945d3
commit f5d3794
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/SS14.MapServer.Tests/ImageProcessingServiceTests.cs b/SS14.MapServer.Tests/ImageProcessingServiceTests.cs
@@ -1,3 +1,4 @@
+using SixLabors.ImageSharp;
 using SS14.MapServer.Helpers;
 using SS14.MapServer.MapProcessing.Services;
 using SS14.MapServer.Services;
@@ -39,6 +40,9 @@ public async Task ImageTilingTest()
         {
             Assert.That(tiles, Has.Count.EqualTo(198));
             Assert.That(File.Exists(tiles[0].Path), Is.True);
+            // Also check that the edge tiles are properly sized
+            Assert.That(Image.Load(tiles.First(t => t.Y == 10).Path).Height, Is.EqualTo(256));
+            Assert.That(Image.Load(tiles.First(t => t.X == 17).Path).Width, Is.EqualTo(256));
         });
     }
 }
diff --git a/SS14.MapServer/MapProcessing/Services/ImageProcessingService.cs b/SS14.MapServer/MapProcessing/Services/ImageProcessingService.cs
@@ -24,8 +24,8 @@ public async Task<List<Tile>> TileImage(Guid mapGuid, int gridId, string sourceP
         using var image = await Image.LoadAsync(file);
 
         var bounds = image.Bounds;
-        var heightSteps = Math.Ceiling((double)bounds.Height / tileSize);
-        var widthSteps = Math.Ceiling((double)bounds.Width / tileSize);
+        var heightSteps = Math.Ceiling((double) bounds.Height / tileSize);
+        var widthSteps = Math.Ceiling((double) bounds.Width / tileSize);
 
         var tiles = new List<Tile>();
         var extension = Path.GetExtension(sourcePath);
@@ -49,6 +49,16 @@ public async Task<List<Tile>> TileImage(Guid mapGuid, int gridId, string sourceP
                 rectangle.Intersect(bounds);
 
                 var tile = image.Clone(img => img.Crop(rectangle));
+                // Make sure to pad the edge tiles to full size
+                if (x == widthSteps - 1 || y == heightSteps - 1)
+                    tile.Mutate(img => img.Resize(new ResizeOptions
+                    {
+                        Size = new Size(tileSize, tileSize),
+                        Mode = ResizeMode.Pad,
+                        Sampler = KnownResamplers.NearestNeighbor,
+                        PadColor = default,
+                        Position = AnchorPositionMode.TopLeft
+                    }));
                 var preview = tile.Clone(img => img.Pixelate(8));
 
                 var path = Path.Combine(targetPath, $"tile_{Guid.NewGuid()}{extension}");

diff --git a/SS14.MapServer/SS14.MapServer.csproj b/SS14.MapServer/SS14.MapServer.csproj
@@ -5,7 +5,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <Version>1.1.7</Version>
+        <Version>1.1.8</Version>
     </PropertyGroup>
 
     <ItemGroup>