CustomDrawFunctionModel

SHAliakbari · Feb 24, 2024 · 9239b22 · 9239b22
1 parent 69e4ebb
commit 9239b22
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 36 deletions.
diff --git a/Examples/WebApp/gdal2tiles.cs b/Examples/WebApp/gdal2tiles.cs
@@ -25,7 +25,6 @@ public gdal2tiles(string geoTiffPath, GeoLayers geoLayers)
         {
             geoLayer = geoLayers.Get(geoTiffPath, () =>
             {
-
                 using Dataset dataset = Gdal.Open(geoTiffPath, Access.GA_ReadOnly);
                 if (dataset == null)
                 {
@@ -105,33 +104,17 @@ public gdal2tiles(string geoTiffPath, GeoLayers geoLayers)
                         values = bytes.ToArray()
 
                     },
-                    customDrawFunction= (
-                //{g
-                //            tile,
-                //            values,
-                //            context,
-                //            x,
-                //            y,
-                //            width,
-                //            height,
-                //            rasterX,
-                //            rasterY,
-                //            sampleX,
-                //            sampleY,
-                //            sampledRaster
-                //        }
-                customDrawFunctionModel a
-                ) =>
+                    customDrawFunction= (CustomDrawFunctionModel model) =>
                     {
                         SKColor color = SKColors.Transparent;
 
-                        if (a.values.Length == 3)
+                        if (model.Values.Length == 3)
                         {
-                            color = new SKColor((byte)a.values[0], (byte)a.values[1], (byte)a.values[2]);
+                            color = new SKColor((byte)model.Values[0], (byte)model.Values[1], (byte)model.Values[2]);
                         }
-                        if (a.values.Length == 1)
+                        if (model.Values.Length == 1)
                         {
-                            color = new SKColor(a.values[0]);
+                            color = new SKColor(model.Values[0]);
                         }
 
                         using SKPaint sKPaint = new SKPaint()
@@ -140,17 +123,14 @@ customDrawFunctionModel a
                             IsAntialias = true,
                             Style = SKPaintStyle.Fill
                         };
-                        a.Canvas.DrawRect((int)a.x, (int)a.y, (int)a.width, (int)a.height, sKPaint);
+                        model.Canvas.DrawRect((int)model.x, (int)model.y, (int)model.width, (int)model.height, sKPaint);
 
                     },
                     debugLevel=4,
                     resolution= 256 // optional parameter for adjusting display resolution
                 };
 
-
-
                 geoLayer tmp = new geoLayer(geoRasterLayerOptions);
-
                 tmp.initialize(geoRasterLayerOptions);
                 return tmp;
 

diff --git a/georaster-layer-for-leaflet-dot-net-core.sln b/georaster-layer-for-leaflet-dot-net-core.sln
@@ -19,8 +19,8 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{68F7D1D7-FA20-4A11-BDF4-23B676551C8F}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{68F7D1D7-FA20-4A11-BDF4-23B676551C8F}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{68F7D1D7-FA20-4A11-BDF4-23B676551C8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68F7D1D7-FA20-4A11-BDF4-23B676551C8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{68F7D1D7-FA20-4A11-BDF4-23B676551C8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{68F7D1D7-FA20-4A11-BDF4-23B676551C8F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9D5C0291-9157-4C73-B67A-26D2F1058E7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/src/CustomDrawFunctionModel.cs b/src/CustomDrawFunctionModel.cs
@@ -0,0 +1,28 @@
+using SkiaSharp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace georaster_layer_for_leaflet_dot_net_core
+{
+    public class CustomDrawFunctionModel
+    {
+        public SKCanvas  Canvas { get; set; }
+        public byte[] Values { get; set; }
+        public double x { get; set; }
+        public double y { get; set; }
+
+        public double width { get; set; }
+        public double height { get; set; }
+
+        public int rasterX { get; set; }
+        public int rasterY { get; set; }
+
+        public int sampleX { get; set; }
+        public int sampleY { get; set; }
+
+        public byte[][][] sampledRaster { get; set; }
+    }
+}
diff --git a/src/geoLayer.cs b/src/geoLayer.cs
@@ -27,7 +27,7 @@ public enum ResampleMethod
         public GeoRaster[]? georasters;
         public GeoRaster? georaster;
         public bool noWrap;
-        public Action<dynamic> customDrawFunction;
+        public Action<CustomDrawFunctionModel> customDrawFunction;
 
         public void Dispose()
         {
@@ -902,15 +902,15 @@ public byte[] drawTile(Coords coords, DoneCallback done)
 
                                         if (options.customDrawFunction != null)
                                         {
-                                            options.customDrawFunction(new
+                                            options.customDrawFunction(new CustomDrawFunctionModel
                                             {
-                                                canvas,
-                                                values,
+                                                Canvas = canvas,
+                                               Values = values,
                                                 //context,
-                                                x,
-                                                y,
-                                                width,
-                                                height,
+                                                x= x,
+                                                y=y,
+                                                width=width,
+                                                height=height,
                                                 rasterX = xInRasterPixels,
                                                 rasterY = yInRasterPixels,
                                                 sampleX = w,