diff --git a/MapControlExtended.sln b/MapControlExtended.sln index bf2165d3..5a678c02 100644 --- a/MapControlExtended.sln +++ b/MapControlExtended.sln @@ -55,6 +55,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileDbCache.WinUI", "FileDb EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLiteCache.WinUI", "SQLiteCache\WinUI\SQLiteCache.WinUI.csproj", "{E33FC359-F713-462C-8A8E-7EEA15E36BE1}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MapProjections.WinUI", "MapProjections\WinUI\MapProjections.WinUI.csproj", "{3572F71A-83FE-459D-8370-002CA28827FE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -217,6 +219,14 @@ Global {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|Any CPU.Build.0 = Release|Any CPU {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|x64.ActiveCfg = Release|Any CPU {E33FC359-F713-462C-8A8E-7EEA15E36BE1}.Release|x64.Build.0 = Release|Any CPU + {3572F71A-83FE-459D-8370-002CA28827FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3572F71A-83FE-459D-8370-002CA28827FE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3572F71A-83FE-459D-8370-002CA28827FE}.Debug|x64.ActiveCfg = Debug|Any CPU + {3572F71A-83FE-459D-8370-002CA28827FE}.Debug|x64.Build.0 = Debug|Any CPU + {3572F71A-83FE-459D-8370-002CA28827FE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3572F71A-83FE-459D-8370-002CA28827FE}.Release|Any CPU.Build.0 = Release|Any CPU + {3572F71A-83FE-459D-8370-002CA28827FE}.Release|x64.ActiveCfg = Release|Any CPU + {3572F71A-83FE-459D-8370-002CA28827FE}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -241,6 +251,7 @@ Global {2DB6959F-1768-495C-8EED-4830EF185584} = {8F2103C2-78AF-4810-8FB9-67572F50C8FC} {DFE09FD5-530D-48AB-8A46-4611F21BBBC3} = {261905DE-9653-4567-B498-1F46BEA2A4F3} {E33FC359-F713-462C-8A8E-7EEA15E36BE1} = {96FD1258-1597-48A2-8D64-1ADAE13E886A} + {3572F71A-83FE-459D-8370-002CA28827FE} = {7BC11E28-8D3B-4C5B-AC08-AB249CC95F6D} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {458346DD-B23F-4FDC-8F9D-A10F1882A4DB} diff --git a/MapProjections/Shared/GeoApiProjection.cs b/MapProjections/Shared/GeoApiProjection.cs index 1ae0b627..529fa999 100644 --- a/MapProjections/Shared/GeoApiProjection.cs +++ b/MapProjections/Shared/GeoApiProjection.cs @@ -2,18 +2,20 @@ // © 2021 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) -using System; -using System.Globalization; -#if WINDOWS_UWP -using Windows.Foundation; -#else -using System.Windows; -#endif using GeoAPI.CoordinateSystems; using GeoAPI.CoordinateSystems.Transformations; using GeoAPI.Geometries; using ProjNet.CoordinateSystems; using ProjNet.CoordinateSystems.Transformations; +using System; +using System.Globalization; +#if WINUI +using Windows.Foundation; +#elif WINDOWS_UWP +using Windows.Foundation; +#else +using System.Windows; +#endif namespace MapControl.Projections { diff --git a/MapProjections/Shared/WebMercatorProjection.cs b/MapProjections/Shared/WebMercatorProjection.cs index 48fffb3d..3ee21d06 100644 --- a/MapProjections/Shared/WebMercatorProjection.cs +++ b/MapProjections/Shared/WebMercatorProjection.cs @@ -2,11 +2,11 @@ // © 2021 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) +using ProjNet.CoordinateSystems; using System; #if !WINDOWS_UWP using System.Windows; #endif -using ProjNet.CoordinateSystems; namespace MapControl.Projections { diff --git a/MapProjections/WinUI/MapProjections.WinUI.csproj b/MapProjections/WinUI/MapProjections.WinUI.csproj new file mode 100644 index 00000000..e1ee29c6 --- /dev/null +++ b/MapProjections/WinUI/MapProjections.WinUI.csproj @@ -0,0 +1,43 @@ + + + net5.0-windows10.0.19041.0 + 10.0.17763.0 + MapProjections.WinUI + win10-x86;win10-x64;win10-arm64 + true + ..\..\MapControl.snk + false + XAML Map Control + 6.0.0 + Map Projections Library for XAML Map Control + Clemens Fischer + Copyright © 2021 Clemens Fischer + false + true + + + WINUI + + + WINUI + + + + + + + + + + + + + + + + + + + + +