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

Update ViewTransform.cs

Browse source
This commit is contained in:
ClemensFischer 2026-01-08 22:49:25 +01:00
parent 57913c0cf4
commit ea43aa6a98
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
MapControl/Shared/ViewTransform.cs
View file

@ -49,7 +49,7 @@ namespace MapControl
/// Gets an axis-aligned bounding box in projected map coordinates that contains /// Gets an axis-aligned bounding box in projected map coordinates that contains
/// a rectangle in view coordinates. /// a rectangle in view coordinates.
/// </summary> /// </summary>
public Rect ViewToMapBounds(Rect rect) => TransformBounds(ViewToMapMatrix, rect); public Rect ViewToMapBounds(Rect rect) => TransformBounds(ViewToMapMatrix, rect.X, rect.Y, rect.Width, rect.Height);
/// <summary> /// <summary>
/// Initializes a ViewTransform from a map center point in projected coordinates, /// Initializes a ViewTransform from a map center point in projected coordinates,
@ -114,24 +114,24 @@ namespace MapControl
// Transform view bounds to tile pixel bounds. // Transform view bounds to tile pixel bounds.
// //
return TransformBounds(transform, new Rect(0d, 0d, viewWidth, viewHeight)); return TransformBounds(transform, 0d, 0d, viewWidth, viewHeight);
} }
private static Rect TransformBounds(Matrix transform, Rect rect) private static Rect TransformBounds(Matrix transform, double x, double y, double width, double height)
{ {
if (transform.M12 == 0d && transform.M21 == 0d) if (transform.M12 == 0d && transform.M21 == 0d)
{ {
return new Rect( return new Rect(
rect.X * transform.M11 + transform.OffsetX, x * transform.M11 + transform.OffsetX,
rect.Y * transform.M22 + transform.OffsetY, y * transform.M22 + transform.OffsetY,
rect.Width * transform.M11, width * transform.M11,
rect.Height * transform.M22); height * transform.M22);
} }
var p1 = transform.Transform(new Point(rect.X, rect.Y)); var p1 = transform.Transform(new Point(x, y));
var p2 = transform.Transform(new Point(rect.X, rect.Y + rect.Height)); var p2 = transform.Transform(new Point(x, y + height));
var p3 = transform.Transform(new Point(rect.X + rect.Width, rect.Y)); var p3 = transform.Transform(new Point(x + width, y));
var p4 = transform.Transform(new Point(rect.X + rect.Width, rect.Y + rect.Height)); var p4 = transform.Transform(new Point(x + width, y + height));
var x1 = Math.Min(p1.X, Math.Min(p2.X, Math.Min(p3.X, p4.X))); var x1 = Math.Min(p1.X, Math.Min(p2.X, Math.Min(p3.X, p4.X)));
var y1 = Math.Min(p1.Y, Math.Min(p2.Y, Math.Min(p3.Y, p4.Y))); var y1 = Math.Min(p1.Y, Math.Min(p2.Y, Math.Min(p3.Y, p4.Y)));