ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update GroundOverlay.cs

Browse source
This commit is contained in:
ClemensFischer 2025-09-04 16:29:26 +02:00
parent 733da9f231
commit 31b2e37b23
1 changed files with 24 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
MapControl/Shared/GroundOverlay.cs
View file

@ -33,7 +33,6 @@ namespace MapControl
private readonly string imagePath; private readonly string imagePath;
private readonly LatLonBox boundingBox; private readonly LatLonBox boundingBox;
private readonly int zIndex; private readonly int zIndex;
private ImageSource imageSource;
public ImageOverlay(string path, LatLonBox latLonBox, int zOrder) public ImageOverlay(string path, LatLonBox latLonBox, int zOrder)
{ {
@ -42,7 +41,9 @@ namespace MapControl
zIndex = zOrder; zIndex = zOrder;
} }
public async Task LoadImageSource(ZipArchive archive) public Image Image { get; private set; }
public async Task LoadImage(ZipArchive archive)
{ {
var entry = archive.GetEntry(imagePath); var entry = archive.GetEntry(imagePath);
@ -61,32 +62,23 @@ namespace MapControl
// Close Zip Stream before awaiting. // Close Zip Stream before awaiting.
// //
imageSource = await ImageLoader.LoadImageAsync(memoryStream); CreateImage(await ImageLoader.LoadImageAsync(memoryStream));
} }
} }
public async Task LoadImageSource(Uri docUri) public async Task LoadImage(Uri docUri)
{ {
imageSource = await ImageLoader.LoadImageAsync(new Uri(docUri, imagePath)); CreateImage(await ImageLoader.LoadImageAsync(new Uri(docUri, imagePath)));
} }
public Image CreateImage() private void CreateImage(ImageSource image)
{ {
Image image = null; if (image != null)
if (imageSource != null)
{ {
image = new Image Image = new Image { Source = image, Stretch = Stretch.Fill };
{ Image.SetValue(Canvas.ZIndexProperty, zIndex);
Source = imageSource, SetBoundingBox(Image, boundingBox);
Stretch = Stretch.Fill
};
image.SetValue(Canvas.ZIndexProperty, zIndex);
SetBoundingBox(image, boundingBox);
} }
return image;
} }
} }
@ -114,7 +106,7 @@ namespace MapControl
public async Task LoadAsync(string sourcePath) public async Task LoadAsync(string sourcePath)
{ {
IEnumerable<ImageOverlay> imageOverlays = null; List<ImageOverlay> imageOverlays = null;
if (!string.IsNullOrEmpty(sourcePath)) if (!string.IsNullOrEmpty(sourcePath))
{ {
@ -141,50 +133,46 @@ namespace MapControl
if (imageOverlays != null) if (imageOverlays != null)
{ {
foreach (var image in imageOverlays foreach (var image in imageOverlays.Select(imageOverlay => imageOverlay.Image).Where(image => image != null))
.Select(imageOverlay => imageOverlay.CreateImage())
.Where(image => image != null))
{ {
Children.Add(image); Children.Add(image);
} }
} }
} }
private static async Task<IEnumerable<ImageOverlay>> LoadGroundOverlaysFromArchive(string archiveFilePath) private static async Task<List<ImageOverlay>> LoadGroundOverlaysFromArchive(string archiveFilePath)
{ {
List<ImageOverlay> imageOverlays;
using (var archive = ZipFile.OpenRead(archiveFilePath)) using (var archive = ZipFile.OpenRead(archiveFilePath))
{ {
var docEntry = archive.GetEntry("doc.kml") ?? var docEntry = archive.GetEntry("doc.kml") ??
archive.Entries.FirstOrDefault(e => e.Name.EndsWith(".kml")) ?? archive.Entries.FirstOrDefault(e => e.Name.EndsWith(".kml")) ??
throw new ArgumentException($"No KML entry found in {archiveFilePath}."); throw new ArgumentException($"No KML entry found in {archiveFilePath}.");
List<ImageOverlay> imageOverlays;
using (var docStream = docEntry.Open()) using (var docStream = docEntry.Open())
{ {
imageOverlays = await ReadGroundOverlays(docStream); imageOverlays = await ReadGroundOverlays(docStream);
} }
await Task.WhenAll(imageOverlays.Select(imageOverlay => imageOverlay.LoadImageSource(archive))); await Task.WhenAll(imageOverlays.Select(imageOverlay => imageOverlay.LoadImage(archive)));
return imageOverlays;
} }
return imageOverlays;
} }
private static async Task<IEnumerable<ImageOverlay>> LoadGroundOverlaysFromFile(string docFilePath) private static async Task<List<ImageOverlay>> LoadGroundOverlaysFromFile(string docFilePath)
{ {
docFilePath = FilePath.GetFullPath(docFilePath);
List<ImageOverlay> imageOverlays; List<ImageOverlay> imageOverlays;
using (var docStream = File.OpenRead(docFilePath)) var docUri = new Uri(FilePath.GetFullPath(docFilePath));
using (var docStream = File.OpenRead(docUri.AbsolutePath))
{ {
imageOverlays = await ReadGroundOverlays(docStream); imageOverlays = await ReadGroundOverlays(docStream);
} }
var docUri = new Uri(docFilePath); await Task.WhenAll(imageOverlays.Select(imageOverlay => imageOverlay.LoadImage(docUri)));
await Task.WhenAll(imageOverlays.Select(imageOverlay => imageOverlay.LoadImageSource(docUri)));
return imageOverlays; return imageOverlays;
} }