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

Check for relative URIs first

Browse source
This commit is contained in:
ClemensFischer 2025-09-19 14:06:23 +02:00
parent cd40a627ce
commit f897ce3d36
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
MapControl/Shared/ImageLoader.cs
View file

@ -46,7 +46,11 @@ namespace MapControl
try try
{ {
if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps) if (!uri.IsAbsoluteUri)
{
image = await LoadImageAsync(uri.OriginalString);
}
else if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
{ {
(var buffer, var _) = await GetHttpResponseAsync(uri, progress); (var buffer, var _) = await GetHttpResponseAsync(uri, progress);
@ -55,9 +59,9 @@ namespace MapControl
image = await LoadImageAsync(buffer); image = await LoadImageAsync(buffer);
} }
} }
else if (uri.IsFile || !uri.IsAbsoluteUri) else if (uri.IsFile)
{ {
image = await LoadImageAsync(uri.IsAbsoluteUri ? uri.LocalPath : uri.OriginalString); image = await LoadImageAsync(uri.LocalPath);
} }
else else
{ {

12
MapControl/Shared/WmtsCapabilities.cs
View file

@ -31,15 +31,23 @@ namespace MapControl
Stream xmlStream; Stream xmlStream;
string defaultUrl = null; string defaultUrl = null;
if (uri.IsAbsoluteUri && (uri.Scheme == "http" || uri.Scheme == "https")) if (!uri.IsAbsoluteUri)
{
xmlStream = File.OpenRead(uri.OriginalString);
}
else if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
{ {
defaultUrl = uri.OriginalString.Split('?')[0]; defaultUrl = uri.OriginalString.Split('?')[0];
xmlStream = await ImageLoader.HttpClient.GetStreamAsync(uri); xmlStream = await ImageLoader.HttpClient.GetStreamAsync(uri);
} }
else if (uri.IsFile)
{
xmlStream = File.OpenRead(uri.LocalPath);
}
else else
{ {
xmlStream = File.OpenRead(uri.IsAbsoluteUri ? uri.LocalPath : uri.OriginalString); throw new ArgumentException($"Invalid Capabilities URI: {uri}");
} }
using var stream = xmlStream; using var stream = xmlStream;