ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-01-20 23:50:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed EPSG:4326 in WMTS

Browse source
This commit is contained in:
ClemensF 2020-06-19 00:00:32 +02:00
parent 004d9501ad
commit 5c4c328216
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
MapControl/Shared/WmtsCapabilities.cs
View file

@ -151,7 +151,7 @@ namespace MapControl
foreach (var tileMatrixElement in tileMatrixSetElement.Descendants(ns + "TileMatrix"))
{
tileMatrixes.Add(ReadTileMatrix(tileMatrixElement));
tileMatrixes.Add(ReadTileMatrix(tileMatrixElement, supportedCrs));
}
if (tileMatrixes.Count <= 0)
@ -162,7 +162,7 @@ namespace MapControl
return new WmtsTileMatrixSet(identifier, supportedCrs, tileMatrixes);
}
public static WmtsTileMatrix ReadTileMatrix(XElement tileMatrixElement)
public static WmtsTileMatrix ReadTileMatrix(XElement tileMatrixElement, string supportedCrs)
{
XNamespace ns = tileMatrixElement.Name.Namespace;
XNamespace ows = "http://www.opengis.net/ows/1.1";
@ -221,8 +221,12 @@ namespace MapControl
throw new ArgumentException("No MatrixHeight element found in TileMatrix \"" + identifier + "\".");
}
var topLeft = supportedCrs == "EPSG:4326"
? new Point(MapProjection.Wgs84MetersPerDegree * top, MapProjection.Wgs84MetersPerDegree * left)
: new Point(left, top);
return new WmtsTileMatrix(
identifier, scaleDenominator, new Point(left, top), tileWidth, tileHeight, matrixWidth, matrixHeight);
identifier, scaleDenominator, topLeft, tileWidth, tileHeight, matrixWidth, matrixHeight);
}
}
}

2
MapControl/Shared/WmtsTileLayer.cs
View file

@ -194,8 +194,6 @@ namespace MapControl
{
var capabilities = await WmtsCapabilities.ReadCapabilities(CapabilitiesUri, LayerIdentifier);
TileMatrixSets.Clear();
foreach (var tileMatrixSet in capabilities.TileMatrixSets
.Where(s => !TileMatrixSets.ContainsKey(s.SupportedCrs)))
{