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

More cleanup on version 2.3.1.

Browse source
This commit is contained in:
ClemensF 2014-10-30 16:27:36 +01:00
parent b2063e2c6c
commit f04025067c
9 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MapControl/Extensions.Silverlight.cs
View file

@ -7,7 +7,7 @@ using System.Windows.Media.Animation;
namespace MapControl
{
internal static partial class Extensions
internal static class Extensions
{
public static void BeginAnimation(this DependencyObject obj, DependencyProperty property, Timeline animation)
{

2
MapControl/Extensions.WinRT.cs
View file

@ -11,7 +11,7 @@ using Windows.UI.Xaml.Media.Animation;
namespace MapControl
{
internal static partial class Extensions
internal static class Extensions
{
public static void BeginInvoke(this CoreDispatcher dispatcher, Action action)
{

2
MapControl/MapControl.PhoneSilverlight.csproj
View file

@ -44,7 +44,6 @@
<Compile Include="BingMapsTileLayer.cs" />
<Compile Include="BingMapsTileSource.cs" />
<Compile Include="Extensions.Silverlight.cs" />
<Compile Include="Extensions.Silverlight.WinRT.cs" />
<Compile Include="HyperlinkText.cs" />
<Compile Include="ImageTileSource.Silverlight.WinRT.cs" />
<Compile Include="IMapElement.cs" />
@ -74,6 +73,7 @@
<Compile Include="MapRectangle.cs" />
<Compile Include="MapRectangle.Silverlight.WinRT.cs" />
<Compile Include="MapTransform.cs" />
<Compile Include="MatrixEx.cs" />
<Compile Include="MercatorTransform.cs" />
<Compile Include="PanelBase.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />

15
MapControl/MapControl.PhoneSilverlight.csproj.user Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{C089C8C0-30E0-4E22-80C0-CE093F111A43}">
<SilverlightMobileCSProjectFlavor>
<FullDeploy>True</FullDeploy>
<DebuggerType>Managed</DebuggerType>
<DebuggerAgentType>Managed</DebuggerAgentType>
<Tombstone>False</Tombstone>
</SilverlightMobileCSProjectFlavor>
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>

6
MapControl/MapControl.Silverlight.csproj
View file

@ -71,11 +71,8 @@
<Compile Include="BingMapsTileLayer.cs" />
<Compile Include="BingMapsTileSource.cs" />
<Compile Include="Extensions.Silverlight.cs" />
<Compile Include="Extensions.Silverlight.WinRT.cs" />
<Compile Include="HyperlinkText.cs" />
<Compile Include="ImageTileSource.Silverlight.WinRT.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ImageTileSource.Silverlight.WinRT.cs" />
<Compile Include="IMapElement.cs" />
<Compile Include="Int32Rect.cs" />
<Compile Include="Location.cs" />
@ -103,6 +100,7 @@
<Compile Include="MapRectangle.cs" />
<Compile Include="MapRectangle.Silverlight.WinRT.cs" />
<Compile Include="MapTransform.cs" />
<Compile Include="MatrixEx.cs" />
<Compile Include="MercatorTransform.cs" />
<Compile Include="PanelBase.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />

2
MapControl/Extensions.Silverlight.WinRT.cs → MapControl/MatrixEx.cs
View file

@ -11,7 +11,7 @@ using System.Windows.Media;
namespace MapControl
{
internal static partial class Extensions
internal static class MatrixEx
{
public static Matrix Translate(this Matrix matrix, double offsetX, double offsetY)
{

8
MapControl/TileContainer.Silverlight.WinRT.cs
View file

@ -25,8 +25,8 @@ namespace MapControl
private void UpdateViewportTransform(double scale, Point mapOrigin)
{
ViewportTransform.Matrix =
new Matrix(1d, 0d, 0d, 1d, -mapOrigin.X, -mapOrigin.Y)
ViewportTransform.Matrix = Matrix.Identity
.Translate(-mapOrigin.X, -mapOrigin.Y)
.Scale(scale, -scale)
.Rotate(rotation)
.Translate(viewportOrigin.X, viewportOrigin.Y);
@ -39,8 +39,8 @@ namespace MapControl
{
var scale = Math.Pow(2d, zoomLevel - tileZoomLevel);
((MatrixTransform)RenderTransform).Matrix =
new Matrix(1d, 0d, 0d, 1d, tileGrid.X * TileSource.TileSize, tileGrid.Y * TileSource.TileSize)
((MatrixTransform)RenderTransform).Matrix = Matrix.Identity
.Translate(tileGrid.X * TileSource.TileSize, tileGrid.Y * TileSource.TileSize)
.Scale(scale, scale)
.Translate(tileLayerOffset.X, tileLayerOffset.Y)
.RotateAt(rotation, viewportOrigin.X, viewportOrigin.Y);

6
MapControl/TileContainer.WPF.cs
View file

@ -22,7 +22,8 @@ namespace MapControl
private void UpdateViewportTransform(double scale, Point mapOrigin)
{
var transform = new Matrix(1d, 0d, 0d, 1d, -mapOrigin.X, -mapOrigin.Y);
var transform = Matrix.Identity;
transform.Translate(-mapOrigin.X, -mapOrigin.Y);
transform.Scale(scale, -scale);
transform.Rotate(rotation);
transform.Translate(viewportOrigin.X, viewportOrigin.Y);
@ -36,7 +37,8 @@ namespace MapControl
private void UpdateRenderTransform()
{
var scale = Math.Pow(2d, zoomLevel - tileZoomLevel);
var transform = new Matrix(1d, 0d, 0d, 1d, tileGrid.X * TileSource.TileSize, tileGrid.Y * TileSource.TileSize);
var transform = Matrix.Identity;
transform.Translate(tileGrid.X * TileSource.TileSize, tileGrid.Y * TileSource.TileSize);
transform.Scale(scale, scale);
transform.Translate(tileLayerOffset.X, tileLayerOffset.Y);
transform.RotateAt(rotation, viewportOrigin.X, viewportOrigin.Y);

6
MapControl/WinRT/MapControl.WinRT.csproj
View file

@ -42,9 +42,6 @@
<Compile Include="..\BingMapsTileSource.cs">
<Link>BingMapsTileSource.cs</Link>
</Compile>
<Compile Include="..\Extensions.Silverlight.WinRT.cs">
<Link>Extensions.Silverlight.WinRT.cs</Link>
</Compile>
<Compile Include="..\Extensions.WinRT.cs">
<Link>Extensions.WinRT.cs</Link>
</Compile>
@ -135,6 +132,9 @@
<Compile Include="..\MapTransform.cs">
<Link>MapTransform.cs</Link>
</Compile>
<Compile Include="..\MatrixEx.cs">
<Link>MatrixEx.cs</Link>
</Compile>
<Compile Include="..\MercatorTransform.cs">
<Link>MercatorTransform.cs</Link>
</Compile>