diff --git a/FileDbCache/UWP/Properties/AssemblyInfo.cs b/FileDbCache/UWP/Properties/AssemblyInfo.cs index 0304a72b..714e7b6c 100644 --- a/FileDbCache/UWP/Properties/AssemblyInfo.cs +++ b/FileDbCache/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.0.0")] -[assembly: AssemblyFileVersion("5.0.0")] +[assembly: AssemblyVersion("5.0.1")] +[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/FileDbCache/WPF/FileDbCache.WPF.csproj b/FileDbCache/WPF/FileDbCache.WPF.csproj index d2b1680b..c70a95d2 100644 --- a/FileDbCache/WPF/FileDbCache.WPF.csproj +++ b/FileDbCache/WPF/FileDbCache.WPF.csproj @@ -1,68 +1,55 @@ - - - - - Debug - AnyCPU - {AD1CB53E-7AA4-4EC0-B901-B4E0E2665133} - Library - Properties - MapControl.Caching - FileDbCache.WPF - v4.6.2 - 512 - - - - true - full - false - bin\Debug\ - DEBUG - prompt - 4 - - - none - true - bin\Release\ - - - prompt - 4 - - - true - - - ..\..\MapControl.snk - - - - - - - - FileDbCache.cs - - - - - - - MapControl.snk - - - - - 7.4.3 - - - - - {a204a102-c745-4d65-aec8-7b96faedef2d} - MapControl.WPF - - - - \ No newline at end of file + + + + netcoreapp3.0;netcoreapp3.1;net462;net48 + true + MapControl.Caching + FileDbCache.WPF + true + ..\..\MapControl.snk + false + XAML Map Control + 5.0.1 + ObjectCache implementation based on EzTools FileDb + Clemens Fischer + Copyright © 2020 Clemens Fischer + false + XAML.MapControl.FileDbCache + + + + none + false + + + + + full + true + DEBUG + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FileDbCache/WPF/Properties/AssemblyInfo.cs b/FileDbCache/WPF/Properties/AssemblyInfo.cs deleted file mode 100644 index 384d334e..00000000 --- a/FileDbCache/WPF/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("XAML Map Control FileDbCache (WPF)")] -[assembly: AssemblyDescription("ObjectCache implementation based on EzTools FileDb")] -[assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.0.0")] -[assembly: AssemblyFileVersion("5.0.0")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] diff --git a/MBTiles/UWP/Properties/AssemblyInfo.cs b/MBTiles/UWP/Properties/AssemblyInfo.cs index caf20f8c..e55e5ede 100644 --- a/MBTiles/UWP/Properties/AssemblyInfo.cs +++ b/MBTiles/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.0.0")] -[assembly: AssemblyFileVersion("5.0.0")] +[assembly: AssemblyVersion("5.0.1")] +[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MBTiles/WPF/MBTiles.WPF.csproj b/MBTiles/WPF/MBTiles.WPF.csproj index 5f2f8cca..55a6063a 100644 --- a/MBTiles/WPF/MBTiles.WPF.csproj +++ b/MBTiles/WPF/MBTiles.WPF.csproj @@ -1,79 +1,47 @@ - - - - - Debug - AnyCPU - {38B18AB6-6E70-4696-8FB4-E8C8E12BF50C} - Library - Properties - MapControl.MBTiles - MBTiles.WPF - v4.6.2 - 512 - - - - - - true - full - false - bin\Debug\ - DEBUG - prompt - 4 - - - none - true - bin\Release\ - - - prompt - 4 - - - true - - - ..\..\MapControl.snk - - - - - - - - - - - - MBTileData.cs - - - MBTileLayer.cs - - - MBTileSource.cs - - - - - - MapControl.snk - - - - - 1.0.112 - - - - - {a204a102-c745-4d65-aec8-7b96faedef2d} - MapControl.WPF - - - - \ No newline at end of file + + + + netcoreapp3.0;netcoreapp3.1;net462;net48 + true + MapControl.MBTiles + MBTiles.WPF + true + ..\..\MapControl.snk + false + XAML Map Control + 5.0.1 + MBTiles Support Library for XAML Map Control + Clemens Fischer + Copyright © 2020 Clemens Fischer + false + XAML.MapControl.MBTiles + + + + none + false + + + + + full + true + DEBUG + + + + + + + + + + + + + + + + + + diff --git a/MBTiles/WPF/Properties/AssemblyInfo.cs b/MBTiles/WPF/Properties/AssemblyInfo.cs deleted file mode 100644 index 26ac782f..00000000 --- a/MBTiles/WPF/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("XAML Map Control MBTiles Support (WPF)")] -[assembly: AssemblyDescription("MBTiles Support Library for XAML Map Control")] -[assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.0.0")] -[assembly: AssemblyFileVersion("5.0.0")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] diff --git a/MapControl/Shared/MapBase.cs b/MapControl/Shared/MapBase.cs index 6a9b7ee1..66b1e1d8 100644 --- a/MapControl/Shared/MapBase.cs +++ b/MapControl/Shared/MapBase.cs @@ -239,12 +239,6 @@ namespace MapControl /// public ViewTransform ViewTransform { get; } = new ViewTransform(); - /// - /// Gets a MatrixTransform that can be used to transform from cartesian map coordinates - /// to view coordinates. - /// - public MatrixTransform MapToViewTransform { get; } = new MatrixTransform(); - /// /// Gets the horizontal and vertical scaling factors from cartesian map coordinates to view /// coordinates at the specified location, i.e. pixels per meter. @@ -739,7 +733,6 @@ namespace MapControl } ViewScale = ViewTransform.Scale; - MapToViewTransform.Matrix = ViewTransform.MapToViewMatrix; OnViewportChanged(new ViewportChangedEventArgs(projectionChanged, Center.Longitude - centerLongitude)); diff --git a/MapControl/Shared/MapPath.cs b/MapControl/Shared/MapPath.cs index 638b8cfe..4a311cde 100644 --- a/MapControl/Shared/MapPath.cs +++ b/MapControl/Shared/MapPath.cs @@ -13,8 +13,8 @@ using System.Windows.Media; namespace MapControl { /// - /// A path element with a Data property that holds a Geometry in cartesian map coordinates - /// or view coordinates. Cartesian coordinates can optionally be relative to an origin Location. + /// A path element with a Data property that holds a Geometry in view coordinates or + /// cartesian map coordinates that are relative to an origin Location. /// public partial class MapPath : IMapElement { @@ -90,26 +90,19 @@ namespace MapControl protected virtual void UpdateData() { - if (parentMap != null && Data != null) + if (parentMap != null && Data != null && Location != null) { if (dataTransform == null) { Data.Transform = dataTransform = new MatrixTransform(); } - if (Location != null) - { - var viewPos = LocationToView(Location); - var scale = parentMap.GetScale(Location); - var matrix = new Matrix(scale.X, 0, 0, scale.Y, 0, 0); - matrix.Rotate(parentMap.Heading); - matrix.Translate(viewPos.X, viewPos.Y); - dataTransform.Matrix = matrix; - } - else - { - dataTransform.Matrix = parentMap.ViewTransform.MapToViewMatrix; - } + var viewPos = LocationToView(Location); + var scale = parentMap.GetScale(Location); + var transform = new Matrix(scale.X, 0d, 0d, scale.Y, 0d, 0d); + transform.Rotate(parentMap.Heading); + transform.Translate(viewPos.X, viewPos.Y); + dataTransform.Matrix = transform; } } diff --git a/MapControl/UWP/Properties/AssemblyInfo.cs b/MapControl/UWP/Properties/AssemblyInfo.cs index 11355637..07c4a39b 100644 --- a/MapControl/UWP/Properties/AssemblyInfo.cs +++ b/MapControl/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.0.0")] -[assembly: AssemblyFileVersion("5.0.0")] +[assembly: AssemblyVersion("5.0.1")] +[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WPF/MapControl.WPF.csproj b/MapControl/WPF/MapControl.WPF.csproj index b46c21e3..5c555721 100644 --- a/MapControl/WPF/MapControl.WPF.csproj +++ b/MapControl/WPF/MapControl.WPF.csproj @@ -9,7 +9,7 @@ ..\..\MapControl.snk false XAML Map Control - 5.0.0 + 5.0.1 XAML Map Control Library Clemens Fischer Copyright © 2020 Clemens Fischer diff --git a/MapImages/UWP/Properties/AssemblyInfo.cs b/MapImages/UWP/Properties/AssemblyInfo.cs index 2865e4ae..27112e38 100644 --- a/MapImages/UWP/Properties/AssemblyInfo.cs +++ b/MapImages/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.0.0")] -[assembly: AssemblyFileVersion("5.0.0")] +[assembly: AssemblyVersion("5.0.1")] +[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapImages/WPF/MapImages.WPF.csproj b/MapImages/WPF/MapImages.WPF.csproj index 05d97812..60895272 100644 --- a/MapImages/WPF/MapImages.WPF.csproj +++ b/MapImages/WPF/MapImages.WPF.csproj @@ -1,76 +1,48 @@ - - - - - Debug - AnyCPU - {52042F63-563A-45BB-9A08-A8635AAAB84C} - Library - Properties - MapControl.Images - MapImages.WPF - v4.6.2 - 512 - true - - - - true - full - false - bin\Debug\ - DEBUG - prompt - 4 - - - none - true - bin\Release\ - - - prompt - 4 - - - true - - - ..\..\MapControl.snk - - - - - - - - - - - - - - GroundOverlayPanel.cs - - - WorldFileImage.cs - - - - - - {a204a102-c745-4d65-aec8-7b96faedef2d} - MapControl.WPF - - - {426c21c0-5f14-491f-bcd1-6d2993510420} - MapProjections.WPF - - - - - MapControl.snk - - - - \ No newline at end of file + + + + netcoreapp3.0;netcoreapp3.1;net462;net48 + true + MapControl.Images + MapImages.WPF + true + ..\..\MapControl.snk + false + XAML Map Control + 5.0.1 + Image Support Library for XAML Map Control + Clemens Fischer + Copyright © 2020 Clemens Fischer + false + XAML.MapControl.MapImages + + + + none + false + + + + + full + true + DEBUG + + + + + + + + + + + + + + + + + + + diff --git a/MapImages/WPF/Properties/AssemblyInfo.cs b/MapImages/WPF/Properties/AssemblyInfo.cs deleted file mode 100644 index d7c6831b..00000000 --- a/MapImages/WPF/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("XAML Map Control Image Support (WPF)")] -[assembly: AssemblyDescription("Image Support Library for XAML Map Control")] -[assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.0.0")] -[assembly: AssemblyFileVersion("5.0.0")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] diff --git a/MapProjections/UWP/Properties/AssemblyInfo.cs b/MapProjections/UWP/Properties/AssemblyInfo.cs index 3188633b..44cb5a09 100644 --- a/MapProjections/UWP/Properties/AssemblyInfo.cs +++ b/MapProjections/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.0.0")] -[assembly: AssemblyFileVersion("5.0.0")] +[assembly: AssemblyVersion("5.0.1")] +[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapProjections/WPF/MapProjections.WPF.csproj b/MapProjections/WPF/MapProjections.WPF.csproj index 2f69b2b4..9d81b562 100644 --- a/MapProjections/WPF/MapProjections.WPF.csproj +++ b/MapProjections/WPF/MapProjections.WPF.csproj @@ -1,85 +1,47 @@ - - - - - Debug - AnyCPU - {426C21C0-5F14-491F-BCD1-6D2993510420} - library - Properties - MapControl.Projections - MapProjections.WPF - v4.6.2 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - - true - full - false - bin\Debug\ - DEBUG - prompt - 4 - - - pdbonly - true - bin\Release\ - - - prompt - 4 - - - true - - - ..\..\MapControl.snk - - - - - - - - - GeoApiProjection.cs - - - PolarStereographicProjection.cs - - - UtmProjection.cs - - - WebMercatorProjection.cs - - - WorldMercatorProjection.cs - - - Code - - - - - - MapControl.snk - - - - - 1.4.1 - - - - - {a204a102-c745-4d65-aec8-7b96faedef2d} - MapControl.WPF - - - - \ No newline at end of file + + + + netcoreapp3.0;netcoreapp3.1;net462;net48 + true + MapControl.Projections + MapProjections.WPF + true + ..\..\MapControl.snk + false + XAML Map Control + 5.0.1 + Map Projections Library for XAML Map Control + Clemens Fischer + Copyright © 2020 Clemens Fischer + false + XAML.MapControl.MapProjections + + + + none + false + + + + + full + true + DEBUG + + + + + + + + + + + + + + + + + + diff --git a/MapProjections/WPF/Properties/AssemblyInfo.cs b/MapProjections/WPF/Properties/AssemblyInfo.cs deleted file mode 100644 index d1193d96..00000000 --- a/MapProjections/WPF/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("XAML Map Control Projections (WPF)")] -[assembly: AssemblyDescription("Map Projections Library for XAML Map Control")] -[assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.0.0")] -[assembly: AssemblyFileVersion("5.0.0")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] diff --git a/MapProjections/WPF/Properties/Settings.Designer.cs b/MapProjections/WPF/Properties/Settings.Designer.cs deleted file mode 100644 index efdbdaa8..00000000 --- a/MapProjections/WPF/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace MapProjections.WPF.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/SQLiteCache/UWP/Properties/AssemblyInfo.cs b/SQLiteCache/UWP/Properties/AssemblyInfo.cs index f735e7a3..0609858f 100644 --- a/SQLiteCache/UWP/Properties/AssemblyInfo.cs +++ b/SQLiteCache/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.0.0")] -[assembly: AssemblyFileVersion("5.0.0")] +[assembly: AssemblyVersion("5.0.1")] +[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SQLiteCache/WPF/Properties/AssemblyInfo.cs b/SQLiteCache/WPF/Properties/AssemblyInfo.cs deleted file mode 100644 index 247801b4..00000000 --- a/SQLiteCache/WPF/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("XAML Map Control SQLiteCache (WPF)")] -[assembly: AssemblyDescription("ObjectCache implementation based on SQLite")] -[assembly: AssemblyProduct("XAML Map Control")] -[assembly: AssemblyCompany("Clemens Fischer")] -[assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("5.0.0")] -[assembly: AssemblyFileVersion("5.0.0")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] diff --git a/SQLiteCache/WPF/SQLiteCache.WPF.csproj b/SQLiteCache/WPF/SQLiteCache.WPF.csproj index c65af12e..a35322d3 100644 --- a/SQLiteCache/WPF/SQLiteCache.WPF.csproj +++ b/SQLiteCache/WPF/SQLiteCache.WPF.csproj @@ -1,76 +1,55 @@ - - - - - Debug - AnyCPU - {0109C2F0-BA2C-420F-B2CA-DB5B29B1A349} - library - Properties - MapControl.Caching - SQLiteCache.WPF - v4.6.2 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - - - - true - full - false - bin\Debug\ - DEBUG - prompt - 4 - - - none - true - bin\Release\ - - - prompt - 4 - - - true - - - ..\..\MapControl.snk - - - - - - - - - SQLiteCache.cs - - - Code - - - - - - - MapControl.snk - - - - - 1.0.112 - - - - - {A204A102-C745-4D65-AEC8-7B96FAEDEF2D} - MapControl.WPF - - - - \ No newline at end of file + + + + netcoreapp3.0;netcoreapp3.1;net462;net48 + true + MapControl.Caching + SQLiteCache.WPF + true + ..\..\MapControl.snk + false + XAML Map Control + 5.0.1 + ObjectCache implementation based on SQLite + Clemens Fischer + Copyright © 2020 Clemens Fischer + false + XAML.MapControl.SQLiteCache + + + + none + false + + + + + full + true + DEBUG + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SampleApps/ProjectionDemo/ProjectionDemo.csproj b/SampleApps/ProjectionDemo/ProjectionDemo.csproj index b74ec9a4..8dd47257 100644 --- a/SampleApps/ProjectionDemo/ProjectionDemo.csproj +++ b/SampleApps/ProjectionDemo/ProjectionDemo.csproj @@ -4,7 +4,7 @@ WinExe netcoreapp3.1 true - 5.0.0 + 5.0.1 Clemens Fischer XAML Map Control Map Projection Demo Application XAML Map Control diff --git a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs index f5e14ed5..853495f2 100644 --- a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs +++ b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright © 2020 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("5.0.0")] -[assembly: AssemblyFileVersion("5.0.0")] +[assembly: AssemblyVersion("5.0.1")] +[assembly: AssemblyFileVersion("5.0.1")] [assembly: AssemblyConfiguration("")] [assembly: ComVisible(false)] diff --git a/SampleApps/WpfApplication/WpfApplication.csproj b/SampleApps/WpfApplication/WpfApplication.csproj index 46dd1894..7f323b29 100644 --- a/SampleApps/WpfApplication/WpfApplication.csproj +++ b/SampleApps/WpfApplication/WpfApplication.csproj @@ -6,7 +6,7 @@ true WpfApplication XAML Map Control - 5.0.0 + 5.0.1 XAML Map Control WPF Sample Application Clemens Fischer Copyright © 2020 Clemens Fischer