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 5.1: Use C# 7

Browse source
This commit is contained in:
ClemensF 2020-04-17 14:40:14 +02:00
parent 310f0cca9a
commit 7bd1d450dc
18 changed files with 42 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitignore vendored
View file

@ -2,4 +2,13 @@
bin/ bin/
obj/ obj/
packages/ packages/
TestApps/
Win2D/
MapControl.UWP1.csproj
MapControl.WPF.VS2015.csproj
MapProjections.WPF.VS2015.csproj
MapControl_TestApps.sln
MapLayers_ApiKey.cs
MergeNugetPackages.cmd
*.nupkg *.nupkg
*.txt

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

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("5.0.1")] [assembly: AssemblyVersion("5.1.0")]
[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyFileVersion("5.1.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

2
FileDbCache/WPF/FileDbCache.WPF.csproj
View file

@ -9,7 +9,7 @@
<AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<Product>XAML Map Control</Product> <Product>XAML Map Control</Product>
<Version>5.0.1</Version> <Version>5.1.0</Version>
<Description>ObjectCache implementation based on EzTools FileDb</Description> <Description>ObjectCache implementation based on EzTools FileDb</Description>
<Authors>Clemens Fischer</Authors> <Authors>Clemens Fischer</Authors>
<Copyright>Copyright © 2020 Clemens Fischer</Copyright> <Copyright>Copyright © 2020 Clemens Fischer</Copyright>

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

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("5.0.1")] [assembly: AssemblyVersion("5.1.0")]
[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyFileVersion("5.1.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

2
MBTiles/WPF/MBTiles.WPF.csproj
View file

@ -9,7 +9,7 @@
<AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<Product>XAML Map Control</Product> <Product>XAML Map Control</Product>
<Version>5.0.1</Version> <Version>5.1.0</Version>
<Description>MBTiles Support Library for XAML Map Control</Description> <Description>MBTiles Support Library for XAML Map Control</Description>
<Authors>Clemens Fischer</Authors> <Authors>Clemens Fischer</Authors>
<Copyright>Copyright © 2020 Clemens Fischer</Copyright> <Copyright>Copyright © 2020 Clemens Fischer</Copyright>

2
MapControl/Shared/MapProjection.cs
View file

@ -61,7 +61,7 @@ namespace MapControl
/// </summary> /// </summary>
public virtual Vector GetRelativeScale(Location location) public virtual Vector GetRelativeScale(Location location)
{ {
return new Vector(1, 1); return new Vector(1d, 1d);
} }
/// <summary> /// <summary>

17
MapControl/Shared/MapTileLayer.cs
View file

@ -23,7 +23,7 @@ namespace MapControl
{ {
public const int TileSize = 256; public const int TileSize = 256;
public static readonly Point TileMatrixTopLeft = new Point( public static readonly Point MapTopLeft = new Point(
-180d * MapProjection.Wgs84MetersPerDegree, 180d * MapProjection.Wgs84MetersPerDegree); -180d * MapProjection.Wgs84MetersPerDegree, 180d * MapProjection.Wgs84MetersPerDegree);
/// <summary> /// <summary>
@ -114,8 +114,8 @@ namespace MapControl
var tileMatrixScale = ViewTransform.ZoomLevelToScale(TileMatrix.ZoomLevel); var tileMatrixScale = ViewTransform.ZoomLevelToScale(TileMatrix.ZoomLevel);
((MatrixTransform)RenderTransform).Matrix = ParentMap.ViewTransform.GetTileLayerTransform( ((MatrixTransform)RenderTransform).Matrix =
tileMatrixScale, TileMatrixTopLeft, tileMatrixOrigin); ParentMap.ViewTransform.GetTileLayerTransform(tileMatrixScale, MapTopLeft, tileMatrixOrigin);
} }
private bool SetTileMatrix() private bool SetTileMatrix()
@ -126,15 +126,14 @@ namespace MapControl
// bounds in tile pixels from view size // bounds in tile pixels from view size
// //
var tileBounds = ParentMap.ViewTransform.GetTileMatrixBounds( var bounds = ParentMap.ViewTransform.GetTileMatrixBounds(tileMatrixScale, MapTopLeft, ParentMap.RenderSize);
tileMatrixScale, TileMatrixTopLeft, ParentMap.RenderSize);
// tile column and row index bounds // tile column and row index bounds
// //
var xMin = (int)Math.Floor(tileBounds.X / TileSize); var xMin = (int)Math.Floor(bounds.X / TileSize);
var yMin = (int)Math.Floor(tileBounds.Y / TileSize); var yMin = (int)Math.Floor(bounds.Y / TileSize);
var xMax = (int)Math.Floor((tileBounds.X + tileBounds.Width) / TileSize); var xMax = (int)Math.Floor((bounds.X + bounds.Width) / TileSize);
var yMax = (int)Math.Floor((tileBounds.Y + tileBounds.Height) / TileSize); var yMax = (int)Math.Floor((bounds.Y + bounds.Height) / TileSize);
if (TileMatrix != null && if (TileMatrix != null &&
TileMatrix.ZoomLevel == tileMatrixZoomLevel && TileMatrix.ZoomLevel == tileMatrixZoomLevel &&

7
MapControl/Shared/WorldMercatorProjection.cs
View file

@ -15,8 +15,8 @@ namespace MapControl
/// </summary> /// </summary>
public class WorldMercatorProjection : MapProjection public class WorldMercatorProjection : MapProjection
{ {
public static double ConvergenceTolerance = 1e-6; public static double ConvergenceTolerance { get; set; } = 1e-6;
public static int MaxIterations = 10; public static int MaxIterations { get; set; } = 10;
private static readonly double maxLatitude = YToLatitude(180d); private static readonly double maxLatitude = YToLatitude(180d);
@ -72,8 +72,7 @@ namespace MapControl
var lat = latitude * Math.PI / 180d; var lat = latitude * Math.PI / 180d;
return Math.Log(Math.Tan(lat / 2d + Math.PI / 4d) return Math.Log(Math.Tan(lat / 2d + Math.PI / 4d) * ConformalFactor(lat)) * 180d / Math.PI; // p.44 (7-7)
* ConformalFactor(lat)) * 180d / Math.PI; // p.44 (7-7)
} }
public static double YToLatitude(double y) public static double YToLatitude(double y)

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

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("5.0.1")] [assembly: AssemblyVersion("5.1.0")]
[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyFileVersion("5.1.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

2
MapControl/WPF/MapControl.WPF.csproj
View file

@ -9,7 +9,7 @@
<AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<Product>XAML Map Control</Product> <Product>XAML Map Control</Product>
<Version>5.0.1</Version> <Version>5.1.0</Version>
<Description>XAML Map Control Library</Description> <Description>XAML Map Control Library</Description>
<Authors>Clemens Fischer</Authors> <Authors>Clemens Fischer</Authors>
<Copyright>Copyright © 2020 Clemens Fischer</Copyright> <Copyright>Copyright © 2020 Clemens Fischer</Copyright>

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

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("5.0.1")] [assembly: AssemblyVersion("5.1.0")]
[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyFileVersion("5.1.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

2
MapImages/WPF/MapImages.WPF.csproj
View file

@ -9,7 +9,7 @@
<AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<Product>XAML Map Control</Product> <Product>XAML Map Control</Product>
<Version>5.0.1</Version> <Version>5.1.0</Version>
<Description>Image Support Library for XAML Map Control</Description> <Description>Image Support Library for XAML Map Control</Description>
<Authors>Clemens Fischer</Authors> <Authors>Clemens Fischer</Authors>
<Copyright>Copyright © 2020 Clemens Fischer</Copyright> <Copyright>Copyright © 2020 Clemens Fischer</Copyright>

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

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("5.0.1")] [assembly: AssemblyVersion("5.1.0")]
[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyFileVersion("5.1.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

2
MapProjections/WPF/MapProjections.WPF.csproj
View file

@ -9,7 +9,7 @@
<AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<Product>XAML Map Control</Product> <Product>XAML Map Control</Product>
<Version>5.0.1</Version> <Version>5.1.0</Version>
<Description>Map Projections Library for XAML Map Control</Description> <Description>Map Projections Library for XAML Map Control</Description>
<Authors>Clemens Fischer</Authors> <Authors>Clemens Fischer</Authors>
<Copyright>Copyright © 2020 Clemens Fischer</Copyright> <Copyright>Copyright © 2020 Clemens Fischer</Copyright>

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

@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCompany("Clemens Fischer")]
[assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyVersion("5.0.1")] [assembly: AssemblyVersion("5.1.0")]
[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyFileVersion("5.1.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

2
SQLiteCache/WPF/SQLiteCache.WPF.csproj
View file

@ -9,7 +9,7 @@
<AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<Product>XAML Map Control</Product> <Product>XAML Map Control</Product>
<Version>5.0.1</Version> <Version>5.1.0</Version>
<Description>ObjectCache implementation based on SQLite</Description> <Description>ObjectCache implementation based on SQLite</Description>
<Authors>Clemens Fischer</Authors> <Authors>Clemens Fischer</Authors>
<Copyright>Copyright © 2020 Clemens Fischer</Copyright> <Copyright>Copyright © 2020 Clemens Fischer</Copyright>

4
SampleApps/UniversalApp/Properties/AssemblyInfo.cs
View file

@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("5.0.1")] [assembly: AssemblyVersion("5.1.0")]
[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyFileVersion("5.1.0")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

2
SampleApps/WpfApplication/WpfApplication.csproj
View file

@ -6,7 +6,7 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<RootNamespace>WpfApplication</RootNamespace> <RootNamespace>WpfApplication</RootNamespace>
<Product>XAML Map Control</Product> <Product>XAML Map Control</Product>
<Version>5.0.1</Version> <Version>5.1.0</Version>
<Description>XAML Map Control WPF Sample Application</Description> <Description>XAML Map Control WPF Sample Application</Description>
<Authors>Clemens Fischer</Authors> <Authors>Clemens Fischer</Authors>
<Copyright>Copyright © 2020 Clemens Fischer</Copyright> <Copyright>Copyright © 2020 Clemens Fischer</Copyright>