Merge pull request #13 from memsom/feature/explore-why-land-is-rendered-as-sea

Feature/explore why land is rendered as sea

Author: memsom

Directory.Packages.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="BruTile" Version="5.0.6" />
@@ -11,11 +11,13 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NLog" Version="5.0.0" />
-    <PackageVersion Include="SkiaSharp" Version="2.88.7" />
+    <PackageVersion Include="SkiaSharp" Version="2.88.9" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="Svg" Version="3.4.7" />
     <PackageVersion Include="Svg.Skia" Version="1.0.0.3" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Text.Json" Version="6.0.10" />
     <PackageVersion Include="VexTile.Clipper" Version="6.4.0" />
     <PackageVersion Include="VexTile.Mapbox.VectorTile.ExtensionMethods" Version="1.0.6" />
     <PackageVersion Include="VexTile.Mapbox.VectorTile.Geometry" Version="1.0.6" />

source/AliFlux/VexTile.Renderers.Mvt.AliFlux.Tests/RenderTest.cs

@@ -1,3 +1,5 @@
+using System.Diagnostics;
+using System.Drawing;
 using System.IO;
 using System.Threading.Tasks;
 using SQLite;
@@ -101,4 +103,37 @@ public async Task BasicTileRendererTest()
 
         await File.WriteAllBytesAsync("test2.png", tile);
     }
+
+
+    [Fact]
+    public async Task BasicFactoryRenderTest_WaterOnly()
+    {
+        var canvas = new SkiaCanvas();
+        var style = new VectorStyle(VectorStyleKind.Default);
+
+        string path = "zurich.mbtiles";
+        Assert.True(File.Exists(path));
+
+        SQLiteConnectionString val = new(path, SQLiteOpenFlags.ReadOnly, false);
+        var dataSource = new SqliteDataSource(val);
+        var provider = new VectorTilesSource(dataSource);
+        style.SetSourceProvider("openmaptiles", provider);
+
+        var info = new TileInfo(3, 1, 2, layerWhiteList:["water"]); // australia
+        var tile = await TileRendererFactory.RenderAsync(style, canvas, info);
+
+        Assert.NotNull(tile);
+        Assert.True(tile.Length > 0);
+
+        // tile should be a PNG image
+
+        Assert.True(IsPng(tile));
+
+        if (File.Exists("wateronly.png"))
+        {
+            File.Delete("wateronly.png");
+        }
+
+        await File.WriteAllBytesAsync("wateronly.png", tile);
+    }
 }

source/AliFlux/VexTile.Renderers.Mvt.AliFlux/DoubleExtension.cs

@@ -2,18 +2,11 @@
 
 namespace VexTile.Renderer.Mvt.AliFlux;
 
-[System.Diagnostics.CodeAnalysis.SuppressMessage("Major Code Smell", "S125:Sections of code should not be commented out", Justification = "<Pending>")]
 internal static class DoubleExtension
 {
     //private const double DefaultPrecision = 0.0001;
 
-    internal static bool BasicallyEqualTo(this double a, double b)
-    {
-        return a.BasicallyEqualTo(b, 0.0001);
-    }
+    internal static bool BasicallyEqualTo(this double a, double b) => a.BasicallyEqualTo(b, 0.0001);
 
-    private static bool BasicallyEqualTo(this double a, double b, double precision)
-    {
-        return Math.Abs(a - b) <= precision;
-    }
+    private static bool BasicallyEqualTo(this double a, double b, double precision) => Math.Abs(a - b) <= precision;
 }

source/AliFlux/VexTile.Renderers.Mvt.AliFlux/Drawing/VisualLayer.cs

@@ -15,5 +15,8 @@ public class VisualLayer
 
     public Brush Brush { get; set; }
 
-    public string Id { get; set; } = "";
+    public string Id => $"{LayerId} :: {SourceName} :: {SourceLayer}";
+    public string LayerId { get; set; }
+    public string SourceName { get; set; }
+    public string SourceLayer { get; set; }
 }

source/AliFlux/VexTile.Renderers.Mvt.AliFlux/ICanvas.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using SkiaSharp;
 using VexTile.Renderer.Mvt.AliFlux.Drawing;
 
 namespace VexTile.Renderer.Mvt.AliFlux;
@@ -9,11 +10,13 @@ public interface ICanvas
 
     void StartDrawing(double width, double height);
 
-    void DrawBackground(Brush style);
+    SKColor BackgroundColor { get; }
+
+    void DrawBackground(SKColor color);
 
     void DrawLineString(List<Point> geometry, Brush style);
 
-    void DrawPolygon(List<Point> geometry, Brush style);
+    void DrawPolygon(List<Point> geometry, Brush style, SKColor? background);
 
     void DrawPoint(Point geometry, Brush style);
 
@@ -25,5 +28,7 @@ public interface ICanvas
 
     void DrawUnknown(List<List<Point>> geometry, Brush style);
 
+    void DrawDebugBox(TileInfo tileData, SKColor color);
+
     byte[] FinishDrawing();
 }

source/AliFlux/VexTile.Renderers.Mvt.AliFlux/LineClipper.cs

@@ -8,7 +8,7 @@ namespace VexTile.Renderer.Mvt.AliFlux;
 
 internal static class LineClipper
 {
-    static readonly NLog.Logger log = NLog.LogManager.GetCurrentClassLogger();
+    private static readonly NLog.Logger Log = NLog.LogManager.GetCurrentClassLogger();
 
     private static OutCode ComputeOutCode(double x, double y, Rect r)
     {
@@ -37,7 +37,7 @@ private static OutCode ComputeOutCode(double x, double y, Rect r)
         return code;
     }
 
-    private static OutCode ComputeOutCode(Point p, Rect r) { return ComputeOutCode(p.X, p.Y, r); }
+    private static OutCode ComputeOutCode(Point p, Rect r) => ComputeOutCode(p.X, p.Y, r);
 
     private static Point CalculateIntersection(Rect r, Point p1, Point p2, OutCode clipTo)
     {
@@ -216,7 +216,7 @@ public static List<Point> ClipPolyline(List<Point> polyLine, Rect bounds)
             }
             else
             {
-                log.Debug("Segment is null");
+                Log.Debug("Segment is null");
             }
         }
 

source/AliFlux/VexTile.Renderers.Mvt.AliFlux/SKColorFactory.cs

@@ -7,17 +7,17 @@ namespace VexTile.Renderer.Mvt.AliFlux;
 // ReSharper disable once InconsistentNaming
 public static class SKColorFactory
 {
-    private static readonly Dictionary<string, SKColor> _colours = new();
+    private static readonly Dictionary<string, SKColor> Colours = new();
 
     // try to centralise this as tracking down where colours ar made is hard
     public static SKColor MakeColor(byte red, byte green, byte blue, byte alpha = 255, [CallerMemberName] string callerName = "<unknown>")
     {
         string key = MakeKey(red, green, blue, alpha);
 
-        if (!_colours.TryGetValue(key, out SKColor color))
+        if (!Colours.TryGetValue(key, out SKColor color))
         {
             color = new SKColor(red, green, blue, alpha);
-            _colours[key] = color;
+            Colours[key] = color;
 
 #if DEBUG_COLORS
             log.Debug($"{callerName} -> Created {key} :: SKColorFactory.MakeColor({red}, {green}, {blue}, {alpha})");
@@ -44,9 +44,9 @@ public static SKColor LogColor(SKColor color, [CallerMemberName] string callerNa
     {
         string key = MakeKey(color.Red, color.Green, color.Blue, color.Alpha);
 
-        if (!_colours.TryGetValue(key, out _))
+        if (!Colours.TryGetValue(key, out _))
         {
-            _colours.Add(key, color);
+            Colours.Add(key, color);
         }
         return color;
     }