From 6558b5fa7bec5eadd8310b9b72f6517aa59ab779 Mon Sep 17 00:00:00 2001 From: ClemensFischer Date: Thu, 15 Dec 2022 08:58:31 +0100 Subject: [PATCH] Remove Nad27UtmProjection from base lib --- MapControl/Shared/MapProjectionFactory.cs | 4 -- MapControl/Shared/Nad27UtmProjection.cs | 40 -------------------- MapControl/UWP/MapControl.UWP.csproj | 3 -- MapProjections/UWP/MapProjections.UWP.csproj | 6 +++ 4 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 MapControl/Shared/Nad27UtmProjection.cs diff --git a/MapControl/Shared/MapProjectionFactory.cs b/MapControl/Shared/MapProjectionFactory.cs index 950a002d..0c5b005c 100644 --- a/MapControl/Shared/MapProjectionFactory.cs +++ b/MapControl/Shared/MapProjectionFactory.cs @@ -36,10 +36,6 @@ namespace MapControl projection = new Etrs89UtmProjection(epsgCode % 100); break; - case var c when c >= Nad27UtmProjection.FirstZoneEpsgCode && c <= Nad27UtmProjection.LastZoneEpsgCode: - projection = new Nad27UtmProjection(epsgCode % 100); - break; - case var c when c >= Nad83UtmProjection.FirstZoneEpsgCode && c <= Nad83UtmProjection.LastZoneEpsgCode: projection = new Nad83UtmProjection(epsgCode % 100); break; diff --git a/MapControl/Shared/Nad27UtmProjection.cs b/MapControl/Shared/Nad27UtmProjection.cs deleted file mode 100644 index ab0fe7bf..00000000 --- a/MapControl/Shared/Nad27UtmProjection.cs +++ /dev/null @@ -1,40 +0,0 @@ -// XAML Map Control - https://github.com/ClemensFischer/XAML-Map-Control -// © 2022 Clemens Fischer -// Licensed under the Microsoft Public License (Ms-PL) - -using System; - -namespace MapControl -{ - /// - /// NAD27 UTM Projection with zone number. - /// - public class Nad27UtmProjection : TransverseMercatorProjection - { - public const int FirstZone = 1; - public const int LastZone = 22; - public const int FirstZoneEpsgCode = 26700 + FirstZone; - public const int LastZoneEpsgCode = 26700 + LastZone; - - public int Zone { get; } - - public Nad27UtmProjection(int zone) - { - if (zone < FirstZone || zone > LastZone) - { - throw new ArgumentException($"Invalid NAD27 UTM zone {zone}.", nameof(zone)); - } - - Zone = zone; - CrsId = $"EPSG:{Zone - FirstZone + FirstZoneEpsgCode}"; - - // Clarke 1866 - EquatorialRadius = 6378206.4; - Flattening = 1d / 294.978698213898; - ScaleFactor = DefaultScaleFactor; - CentralMeridian = Zone * 6d - 183d; - FalseEasting = 5e5; - FalseNorthing = 0d; - } - } -} diff --git a/MapControl/UWP/MapControl.UWP.csproj b/MapControl/UWP/MapControl.UWP.csproj index 4ae146a5..cbdd7b58 100644 --- a/MapControl/UWP/MapControl.UWP.csproj +++ b/MapControl/UWP/MapControl.UWP.csproj @@ -146,9 +146,6 @@ MapTileLayerBase.cs - - Nad27UtmProjection.cs - Nad83UtmProjection.cs diff --git a/MapProjections/UWP/MapProjections.UWP.csproj b/MapProjections/UWP/MapProjections.UWP.csproj index 6ce0adee..872c94b7 100644 --- a/MapProjections/UWP/MapProjections.UWP.csproj +++ b/MapProjections/UWP/MapProjections.UWP.csproj @@ -52,6 +52,12 @@ GeoApiProjectionFactory.cs + + Nad27UtmProjection.cs + + + Nad83UtmProjection.cs + WebMercatorProjection.cs