ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-05 14:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

XDocument.LoadRootElementAsync

Browse source
This commit is contained in:
ClemensFischer 2025-09-19 11:53:25 +02:00
parent fedf5eba12
commit cd40a627ce
6 changed files with 53 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

32
MapControl/Shared/GroundOverlay.cs
View file

@ -131,41 +131,40 @@ namespace MapControl
var docEntry = archive.GetEntry("doc.kml") ??
archive.Entries.FirstOrDefault(e => e.Name.EndsWith(".kml")) ??
throw new ArgumentException($"No KML entry found in {archiveFilePath}.");
XDocument document;
XElement element;
using (var docStream = docEntry.Open())
using (var stream = docEntry.Open())
{
document = await LoadXDocument(docStream);
element = await XDocument.LoadRootElementAsync(stream);
}
return await LoadImageOverlays(document, imageOverlay => imageOverlay.LoadImage(archive));
return await LoadImageOverlays(element, imageOverlay => imageOverlay.LoadImage(archive));
}
private static async Task<List<ImageOverlay>> LoadImageOverlaysFromFile(string docFilePath)
{
var docUri = new Uri(FilePath.GetFullPath(docFilePath));
XDocument document;
XElement element;
using (var docStream = File.OpenRead(docUri.AbsolutePath))
using (var stream = File.OpenRead(docUri.AbsolutePath))
{
document = await LoadXDocument(docStream);
element = await XDocument.LoadRootElementAsync(stream);
}
return await LoadImageOverlays(document, imageOverlay => imageOverlay.LoadImage(docUri));
return await LoadImageOverlays(element, imageOverlay => imageOverlay.LoadImage(docUri));
}
private static async Task<List<ImageOverlay>> LoadImageOverlays(XDocument document, Func<ImageOverlay, Task> loadFunc)
private static async Task<List<ImageOverlay>> LoadImageOverlays(XElement rootElement, Func<ImageOverlay, Task> loadFunc)
{
var imageOverlays = ReadImageOverlays(document);
var imageOverlays = ReadImageOverlays(rootElement);
await Task.WhenAll(imageOverlays.Select(loadFunc));
return imageOverlays;
}
private static List<ImageOverlay> ReadImageOverlays(XDocument document)
private static List<ImageOverlay> ReadImageOverlays(XElement rootElement)
{
var rootElement = document.Root;
var ns = rootElement.Name.Namespace;
var docElement = rootElement.Element(ns + "Document") ?? rootElement;
var imageOverlays = new List<ImageOverlay>();
@ -241,14 +240,5 @@ namespace MapControl
return new LatLonBox(south, west, north, east, rotation);
}
private static Task<XDocument> LoadXDocument(Stream docStream)
{
#if NETFRAMEWORK
return Task.Run(() => XDocument.Load(docStream, LoadOptions.None));
#else
return XDocument.LoadAsync(docStream, LoadOptions.None, System.Threading.CancellationToken.None);
#endif
}
}
}