From 6900a6a2c91d3e63974738d05762a123b8dce845 Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Tue, 17 Feb 2026 17:45:31 +0100
Subject: [PATCH] Updated MapsforgeTileSource

---
 MapsforgeTiles/Shared/MapsforgeTileSource.cs | 51 +++++++++++++++++---
 MapsforgeTiles/Shared/TileRenderer.cs        | 18 ++++---
 2 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/MapsforgeTiles/Shared/MapsforgeTileSource.cs b/MapsforgeTiles/Shared/MapsforgeTileSource.cs
index 05d60ea0..e22606cb 100644
--- a/MapsforgeTiles/Shared/MapsforgeTileSource.cs
+++ b/MapsforgeTiles/Shared/MapsforgeTileSource.cs
@@ -1,4 +1,9 @@
-using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Threading.Tasks;
 #if WPF
 using System.Windows.Media;
 #elif UWP
@@ -11,19 +16,53 @@ using ImageSource=Avalonia.Media.IImage;
 
 namespace MapControl.MapsforgeTiles
 {
-    public partial class MapsforgeTileSource(string theme, int cacheCapacity = 200) : TileSource
+    public partial class MapsforgeTileSource(string theme, int cacheCapacity = 200, float textScale = 1f) : TileSource
     {
-        private readonly TileRenderer renderer = new(theme, cacheCapacity);
+        private static ILogger Logger => field ??= ImageLoader.LoggerFactory?.CreateLogger<MapsforgeTileSource>();
+
+        private readonly TileRenderer renderer = new(theme, cacheCapacity, textScale);
 
         public static void Initialize(string mapFilePath, float dpiScale)
         {
-            TileRenderer.Initialize(mapFilePath, dpiScale);
+            List<string> mapFiles;
+
+            if (mapFilePath.EndsWith(".map"))
+            {
+                mapFiles = [mapFilePath];
+            }
+            else
+            {
+                mapFiles = [.. Directory.EnumerateFiles(mapFilePath, "*.map")];
+            }
+
+            foreach (var mapFile in mapFiles)
+            {
+                Logger?.LogInformation("Loading {mapFile}", mapFile);
+            }
+
+            TileRenderer.Initialize(mapFiles, dpiScale);
         }
 
         public override Task<ImageSource> LoadImageAsync(int zoomLevel, int column, int row)
         {
-            var pixels = renderer.RenderTile(zoomLevel, column, row);
-            ImageSource image = pixels != null ? CreateImage(pixels) : null;
+            ImageSource image = null;
+
+            try
+            {
+                var sw = Stopwatch.StartNew();
+                var pixels = renderer.RenderTile(zoomLevel, column, row);
+
+                Debug.WriteLine(sw.ElapsedMilliseconds);
+
+                if (pixels != null)
+                {
+                    image = CreateImage(pixels);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger?.LogError(ex, "LoadImageAsync");
+            }
 
             return Task.FromResult(image);
         }
diff --git a/MapsforgeTiles/Shared/TileRenderer.cs b/MapsforgeTiles/Shared/TileRenderer.cs
index ff1f7a4b..17eb3808 100644
--- a/MapsforgeTiles/Shared/TileRenderer.cs
+++ b/MapsforgeTiles/Shared/TileRenderer.cs
@@ -7,7 +7,7 @@ using org.mapsforge.map.reader;
 using org.mapsforge.map.rendertheme;
 using org.mapsforge.map.rendertheme.@internal;
 using org.mapsforge.map.rendertheme.rule;
-using System.IO;
+using System.Collections.Generic;
 
 namespace MapControl.MapsforgeTiles
 {
@@ -16,23 +16,23 @@ namespace MapControl.MapsforgeTiles
         private static DisplayModel displayModel;
         private static MapDataStore dataStore;
 
-        public static void Initialize(string mapFilePath, float dpiScale)
+        public static void Initialize(List<string> mapFiles, float dpiScale)
         {
             DisplayModel.setDeviceScaleFactor(dpiScale);
             displayModel = new DisplayModel();
 
-            if (mapFilePath.EndsWith(".map"))
+            if (mapFiles.Count == 1)
             {
-                dataStore = new MapFile(mapFilePath);
+                dataStore = new MapFile(mapFiles[0]);
             }
             else
             {
                 var multiMapDataStore = new MultiMapDataStore(MultiMapDataStore.DataPolicy.DEDUPLICATE);
                 dataStore = multiMapDataStore;
 
-                foreach (var file in Directory.EnumerateFiles(mapFilePath, "*.map"))
+                foreach (var mapFile in mapFiles)
                 {
-                    multiMapDataStore.addMapDataStore(new MapFile(file), false, false);
+                    multiMapDataStore.addMapDataStore(new MapFile(mapFile), false, false);
                 }
             }
         }
@@ -40,8 +40,9 @@ namespace MapControl.MapsforgeTiles
         private readonly InMemoryTileCache tileCache;
         private readonly DatabaseRenderer renderer;
         private readonly RenderThemeFuture renderThemeFuture;
+        private readonly float textScale;
 
-        public TileRenderer(string theme, int cacheCapacity = 200)
+        public TileRenderer(string theme, int cacheCapacity, float renderTextScale)
         {
             XmlRenderTheme renderTheme;
 
@@ -57,6 +58,7 @@ namespace MapControl.MapsforgeTiles
             tileCache = new InMemoryTileCache(cacheCapacity);
             renderer = new DatabaseRenderer(dataStore, AwtGraphicFactory.INSTANCE, tileCache, null, true, false, null);
             renderThemeFuture = new RenderThemeFuture(AwtGraphicFactory.INSTANCE, renderTheme, displayModel);
+            textScale = renderTextScale;
         }
 
         public int[] RenderTile(int zoomLevel, int column, int row)
@@ -68,7 +70,7 @@ namespace MapControl.MapsforgeTiles
 
             int[] imageBuffer = null;
             var tile = new org.mapsforge.core.model.Tile(column, row, (byte)zoomLevel, displayModel.getTileSize());
-            var job = new RendererJob(tile, dataStore, renderThemeFuture, displayModel, 1f, false, false);
+            var job = new RendererJob(tile, dataStore, renderThemeFuture, displayModel, textScale, false, false);
             var bitmap = tileCache.get(job) ?? renderer.executeJob(job);
 
             if (bitmap != null)