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

Version 4.12.1 Added AutoEquirectangularProjection

Browse source
This commit is contained in:
ClemensF 2019-04-05 22:47:22 +02:00
parent bd9a16e921
commit ae09b0e55d
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MapControl/Shared/MapImageLayer.cs
View file

@ -23,7 +23,7 @@ using System.Windows.Threading;
namespace MapControl namespace MapControl
{ {
/// <summary> /// <summary>
/// Map image layer. Fills the entire viewport with a map image, e.g. provided by a Web Map Service (WMS). /// Map image layer. Fills the entire viewport with a map image, e.g. provided by a Web Map Service.
/// The image must be provided by the abstract GetImageAsync method. /// The image must be provided by the abstract GetImageAsync method.
/// </summary> /// </summary>
public abstract class MapImageLayer : MapPanel, IMapLayer public abstract class MapImageLayer : MapPanel, IMapLayer

25
MapControl/Shared/WmsImageLayer.cs
View file

@ -150,9 +150,10 @@ namespace MapControl
uri += "&FORMAT=" + Format; uri += "&FORMAT=" + Format;
} }
var crs = GetCrsValue();
var rect = projection.BoundingBoxToRect(BoundingBox); var rect = projection.BoundingBoxToRect(BoundingBox);
uri += "&" + GetBboxParameters(rect); uri += "&" + GetBboxParameters(crs, rect);
uri += "&WIDTH=" + (int)Math.Round(projection.ViewportScale * rect.Width); uri += "&WIDTH=" + (int)Math.Round(projection.ViewportScale * rect.Width);
uri += "&HEIGHT=" + (int)Math.Round(projection.ViewportScale * rect.Height); uri += "&HEIGHT=" + (int)Math.Round(projection.ViewportScale * rect.Height);
@ -162,18 +163,6 @@ namespace MapControl
return imageUri; return imageUri;
} }
/// <summary>
/// Gets a query substring for the projected bounding box, which contains the CRS and BBOX or equivalent parameters.
/// </summary>
protected virtual string GetBboxParameters(Rect bbox)
{
var crsId = GetCrsValue();
return string.Format(CultureInfo.InvariantCulture,
crsId == "EPSG:4326" ? "CRS={0}&BBOX={2},{1},{4},{3}" : "CRS={0}&BBOX={1},{2},{3},{4}",
crsId, bbox.X, bbox.Y, (bbox.X + bbox.Width), (bbox.Y + bbox.Height));
}
/// <summary> /// <summary>
/// Gets the effective value of the CRS query parameter. /// Gets the effective value of the CRS query parameter.
/// </summary> /// </summary>
@ -197,6 +186,16 @@ namespace MapControl
return crsId; return crsId;
} }
/// <summary>
/// Gets a query substring for the projected bounding box, which contains the CRS and BBOX or equivalent parameters.
/// </summary>
protected virtual string GetBboxParameters(string crs, Rect bbox)
{
return string.Format(CultureInfo.InvariantCulture,
crs == "EPSG:4326" ? "CRS={0}&BBOX={2},{1},{4},{3}" : "CRS={0}&BBOX={1},{2},{3},{4}",
crs, bbox.X, bbox.Y, (bbox.X + bbox.Width), (bbox.Y + bbox.Height));
}
private string GetRequestUri(string request) private string GetRequestUri(string request)
{ {
var uri = ServiceUri.ToString(); var uri = ServiceUri.ToString();