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

Version 4.1.0

Browse source
This commit is contained in:
ClemensF 2017-10-07 17:43:28 +02:00
parent 078f3173da
commit 6efad6df0f
23 changed files with 549 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MapControl/Shared/BingMapsTileLayer.cs
View file

@ -45,7 +45,7 @@ namespace MapControl
public MapMode Mode { get; set; }
public string Culture { get; set; }
public Uri LogoImageUri { get; set; }
public Uri LogoImageUri { get; private set; }
private async void OnLoaded(object sender, RoutedEventArgs e)
{

7
MapControl/Shared/MapTileLayer.cs
View file

@ -344,7 +344,12 @@ namespace MapControl
if (parentMap != null && TileGrid != null && TileSource != null)
{
var maxZoomLevel = Math.Min(TileGrid.ZoomLevel, MaxZoomLevel);
var minZoomLevel = parentMap.MapLayer == this ? MinZoomLevel : maxZoomLevel; // load background tiles only if this is the base layer
var minZoomLevel = MinZoomLevel;
if (minZoomLevel < maxZoomLevel && parentMap.MapLayer != this) // load lower tiles only in a base layer
{
minZoomLevel = maxZoomLevel;
}
for (var z = minZoomLevel; z <= maxZoomLevel; z++)
{

8
MapControl/UWP/MapBase.UWP.cs
View file

@ -53,11 +53,13 @@ namespace MapControl
style.Setters.Add(new Setter(BackgroundProperty, new SolidColorBrush(Colors.Transparent)));
Style = style;
Clip = new RectangleGeometry();
SizeChanged += (s, e) =>
{
Clip.Rect = new Rect(0d, 0d, e.NewSize.Width, e.NewSize.Height);
Clip = new RectangleGeometry
{
Rect = new Rect(0d, 0d, e.NewSize.Width, e.NewSize.Height)
};
ResetTransformCenter();
UpdateTransform();
};

4
MapControl/UWP/Properties/AssemblyInfo.cs
View file

@ -1,8 +1,8 @@
using System.Reflection;
using System.Runtime.InteropServices;
[assembly: AssemblyTitle("XAML Map Control for UWP")]
[assembly: AssemblyDescription("XAML Map Control Library for UWP")]
[assembly: AssemblyTitle("XAML Map Control (UWP)")]
[assembly: AssemblyDescription("XAML Map Control Library")]
[assembly: AssemblyProduct("XAML Map Control")]
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2017 Clemens Fischer")]

7
MapControl/UWP/TileSource.UWP.cs
View file

@ -53,17 +53,16 @@ namespace MapControl
}
else if (TileAvailable(response.Headers))
{
var bitmapImage = new BitmapImage();
using (var stream = new InMemoryRandomAccessStream())
{
await response.Content.WriteToStreamAsync(stream);
stream.Seek(0);
var bitmapImage = new BitmapImage();
await bitmapImage.SetSourceAsync(stream);
}
imageSource = bitmapImage;
imageSource = bitmapImage;
}
}
}
}

4
MapControl/WPF/Properties/AssemblyInfo.cs
View file

@ -2,8 +2,8 @@
using System.Runtime.InteropServices;
using System.Windows;
[assembly: AssemblyTitle("XAML Map Control for WPF")]
[assembly: AssemblyDescription("XAML Map Control Library for WPF")]
[assembly: AssemblyTitle("XAML Map Control (WPF)")]
[assembly: AssemblyDescription("XAML Map Control Library")]
[assembly: AssemblyProduct("XAML Map Control")]
[assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("© 2017 Clemens Fischer")]