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 TileSource.GetUri arguments

Browse source
This commit is contained in:
Clemens 2022-08-19 08:38:48 +02:00
parent c9316bee74
commit 4b4eecf810
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
MapControl/Shared/BingMapsTileSource.cs
View file

@ -12,7 +12,8 @@ namespace MapControl
{
Uri uri = null;
if (UriFormat != null && Subdomains != null && Subdomains.Length > 0 && zoomLevel > 0)
if (UriFormat != null && Subdomains != null && Subdomains.Length > 0 &&
x >= 0 && y >= 0 && zoomLevel > 0)
{
var subdomain = Subdomains[(x + y) % Subdomains.Length];
var quadkey = new char[zoomLevel];

4
MapControl/Shared/TileSource.cs
View file

@ -32,7 +32,7 @@ namespace MapControl
get => uriFormat;
set
{
uriFormat = value?.Replace("{c}", "{s}"); // for backwards compatibility since 5.4.0
uriFormat = value;
if (Subdomains == null && uriFormat != null && uriFormat.Contains("{s}"))
{
@ -53,7 +53,7 @@ namespace MapControl
{
Uri uri = null;
if (UriFormat != null)
if (UriFormat != null && x >= 0 && y >= 0 && zoomLevel >= 0)
{
var uriString = UriFormat
.Replace("{x}", x.ToString())

5
MapControl/Shared/WmtsTileSource.cs
View file

@ -15,9 +15,8 @@ namespace MapControl
Uri uri = null;
if (UriFormat != null &&
TileMatrixSet != null &&
zoomLevel >= 0 &&
zoomLevel < TileMatrixSet.TileMatrixes.Count)
TileMatrixSet != null && TileMatrixSet.TileMatrixes.Count > zoomLevel &&
x >= 0 && y >= 0 && zoomLevel >= 0)
{
uri = new Uri(UriFormat
.Replace("{TileMatrixSet}", TileMatrixSet.Identifier)