From c998f19fe50f8bac7a5694e9f65c851340251909 Mon Sep 17 00:00:00 2001 From: Clemens Date: Wed, 2 Mar 2022 22:03:18 +0100 Subject: [PATCH] Renamed Wgs84MetersPerDegree --- MapControl/Shared/AutoEquirectangularProjection.cs | 8 ++++---- MapControl/Shared/AzimuthalProjection.cs | 8 ++++---- MapControl/Shared/BoundingBoxTileSource.cs | 8 ++++---- MapControl/Shared/EquirectangularProjection.cs | 12 ++++++------ MapControl/Shared/MapGraticule.cs | 2 +- MapControl/Shared/MapProjection.cs | 2 +- MapControl/Shared/MapTileLayer.cs | 2 +- MapControl/Shared/ViewTransform.cs | 4 ++-- MapControl/Shared/WebMercatorProjection.cs | 8 ++++---- MapControl/Shared/WmtsCapabilities.cs | 2 +- MapControl/Shared/WorldMercatorProjection.cs | 8 ++++---- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/MapControl/Shared/AutoEquirectangularProjection.cs b/MapControl/Shared/AutoEquirectangularProjection.cs index de9dfe92..dead303e 100644 --- a/MapControl/Shared/AutoEquirectangularProjection.cs +++ b/MapControl/Shared/AutoEquirectangularProjection.cs @@ -27,15 +27,15 @@ namespace MapControl public override Point LocationToMap(Location location) { return new Point( - Wgs84MetersPerDegree * (location.Longitude - Center.Longitude) * Math.Cos(Center.Latitude * Math.PI / 180d), - Wgs84MetersPerDegree * location.Latitude); + Wgs84MeterPerDegree * (location.Longitude - Center.Longitude) * Math.Cos(Center.Latitude * Math.PI / 180d), + Wgs84MeterPerDegree * location.Latitude); } public override Location MapToLocation(Point point) { return new Location( - point.Y / Wgs84MetersPerDegree, - point.X / (Wgs84MetersPerDegree * Math.Cos(Center.Latitude * Math.PI / 180d)) + Center.Longitude); + point.Y / Wgs84MeterPerDegree, + point.X / (Wgs84MeterPerDegree * Math.Cos(Center.Latitude * Math.PI / 180d)) + Center.Longitude); } } } diff --git a/MapControl/Shared/AzimuthalProjection.cs b/MapControl/Shared/AzimuthalProjection.cs index 6d3a15b1..4ec31b6d 100644 --- a/MapControl/Shared/AzimuthalProjection.cs +++ b/MapControl/Shared/AzimuthalProjection.cs @@ -19,8 +19,8 @@ namespace MapControl public override Rect BoundingBoxToRect(BoundingBox boundingBox) { var center = LocationToMap(boundingBox.Center); - var width = boundingBox.Width * Wgs84MetersPerDegree; - var height = boundingBox.Height * Wgs84MetersPerDegree; + var width = boundingBox.Width * Wgs84MeterPerDegree; + var height = boundingBox.Height * Wgs84MeterPerDegree; return new Rect(center.X - width / 2d, center.Y - height / 2d, width, height); } @@ -28,8 +28,8 @@ namespace MapControl public override BoundingBox RectToBoundingBox(Rect rect) { var center = MapToLocation(new Point(rect.X + rect.Width / 2d, rect.Y + rect.Height / 2d)); - var width = rect.Width / Wgs84MetersPerDegree; - var height = rect.Height / Wgs84MetersPerDegree; + var width = rect.Width / Wgs84MeterPerDegree; + var height = rect.Height / Wgs84MeterPerDegree; return new CenteredBoundingBox(center, width, height); } diff --git a/MapControl/Shared/BoundingBoxTileSource.cs b/MapControl/Shared/BoundingBoxTileSource.cs index 28551331..672ca01f 100644 --- a/MapControl/Shared/BoundingBoxTileSource.cs +++ b/MapControl/Shared/BoundingBoxTileSource.cs @@ -16,10 +16,10 @@ namespace MapControl if (UriFormat != null) { var tileSize = 360d / (1 << zoomLevel); // tile width in degrees - var west = MapProjection.Wgs84MetersPerDegree * (x * tileSize - 180d); - var east = MapProjection.Wgs84MetersPerDegree * ((x + 1) * tileSize - 180d); - var south = MapProjection.Wgs84MetersPerDegree * (180d - (y + 1) * tileSize); - var north = MapProjection.Wgs84MetersPerDegree * (180d - y * tileSize); + var west = MapProjection.Wgs84MeterPerDegree * (x * tileSize - 180d); + var east = MapProjection.Wgs84MeterPerDegree * ((x + 1) * tileSize - 180d); + var south = MapProjection.Wgs84MeterPerDegree * (180d - (y + 1) * tileSize); + var north = MapProjection.Wgs84MeterPerDegree * (180d - y * tileSize); if (UriFormat.Contains("{bbox}")) { diff --git a/MapControl/Shared/EquirectangularProjection.cs b/MapControl/Shared/EquirectangularProjection.cs index a2bd0be0..ef518b4b 100644 --- a/MapControl/Shared/EquirectangularProjection.cs +++ b/MapControl/Shared/EquirectangularProjection.cs @@ -37,23 +37,23 @@ namespace MapControl public override Point LocationToMap(Location location) { return new Point( - Wgs84MetersPerDegree * location.Longitude, - Wgs84MetersPerDegree * location.Latitude); + Wgs84MeterPerDegree * location.Longitude, + Wgs84MeterPerDegree * location.Latitude); } public override Location MapToLocation(Point point) { return new Location( - point.Y / Wgs84MetersPerDegree, - point.X / Wgs84MetersPerDegree); + point.Y / Wgs84MeterPerDegree, + point.X / Wgs84MeterPerDegree); } public override string GetBboxValue(Rect rect) { return string.Format(CultureInfo.InvariantCulture, CrsId == "CRS:84" ? "{0},{1},{2},{3}" : "{1},{0},{3},{2}", - rect.X / Wgs84MetersPerDegree, rect.Y / Wgs84MetersPerDegree, - (rect.X + rect.Width) / Wgs84MetersPerDegree, (rect.Y + rect.Height) / Wgs84MetersPerDegree); + rect.X / Wgs84MeterPerDegree, rect.Y / Wgs84MeterPerDegree, + (rect.X + rect.Width) / Wgs84MeterPerDegree, (rect.Y + rect.Height) / Wgs84MeterPerDegree); } } } diff --git a/MapControl/Shared/MapGraticule.cs b/MapControl/Shared/MapGraticule.cs index 7ee63e4e..0cb343e8 100644 --- a/MapControl/Shared/MapGraticule.cs +++ b/MapControl/Shared/MapGraticule.cs @@ -33,7 +33,7 @@ namespace MapControl private double GetLineDistance() { - var pixelPerDegree = ParentMap.ViewTransform.Scale * MapProjection.Wgs84MetersPerDegree; + var pixelPerDegree = ParentMap.ViewTransform.Scale * MapProjection.Wgs84MeterPerDegree; var minDistance = MinLineDistance / pixelPerDegree; var scale = 1d; diff --git a/MapControl/Shared/MapProjection.cs b/MapControl/Shared/MapProjection.cs index cef74fab..03060eaa 100644 --- a/MapControl/Shared/MapProjection.cs +++ b/MapControl/Shared/MapProjection.cs @@ -18,7 +18,7 @@ namespace MapControl public abstract class MapProjection { public const double Wgs84EquatorialRadius = 6378137d; - public const double Wgs84MetersPerDegree = Wgs84EquatorialRadius * Math.PI / 180d; + public const double Wgs84MeterPerDegree = Wgs84EquatorialRadius * Math.PI / 180d; public const double Wgs84Flattening = 1d / 298.257223563; public static readonly double Wgs84Eccentricity = Math.Sqrt((2d - Wgs84Flattening) * Wgs84Flattening); diff --git a/MapControl/Shared/MapTileLayer.cs b/MapControl/Shared/MapTileLayer.cs index 72021f5a..e98e772d 100644 --- a/MapControl/Shared/MapTileLayer.cs +++ b/MapControl/Shared/MapTileLayer.cs @@ -29,7 +29,7 @@ namespace MapControl public const int TileSize = 256; public static readonly Point MapTopLeft = new Point( - -180d * MapProjection.Wgs84MetersPerDegree, 180d * MapProjection.Wgs84MetersPerDegree); + -180d * MapProjection.Wgs84MeterPerDegree, 180d * MapProjection.Wgs84MeterPerDegree); /// /// A default MapTileLayer using OpenStreetMap data. diff --git a/MapControl/Shared/ViewTransform.cs b/MapControl/Shared/ViewTransform.cs index c1907e3a..eb15bb92 100644 --- a/MapControl/Shared/ViewTransform.cs +++ b/MapControl/Shared/ViewTransform.cs @@ -24,12 +24,12 @@ namespace MapControl { public static double ZoomLevelToScale(double zoomLevel) { - return 256d * Math.Pow(2d, zoomLevel) / (360d * MapProjection.Wgs84MetersPerDegree); + return 256d * Math.Pow(2d, zoomLevel) / (360d * MapProjection.Wgs84MeterPerDegree); } public static double ScaleToZoomLevel(double scale) { - return Math.Log(scale * 360d * MapProjection.Wgs84MetersPerDegree / 256d, 2d); + return Math.Log(scale * 360d * MapProjection.Wgs84MeterPerDegree / 256d, 2d); } /// diff --git a/MapControl/Shared/WebMercatorProjection.cs b/MapControl/Shared/WebMercatorProjection.cs index 234fb7ab..0660f028 100644 --- a/MapControl/Shared/WebMercatorProjection.cs +++ b/MapControl/Shared/WebMercatorProjection.cs @@ -35,15 +35,15 @@ namespace MapControl public override Point LocationToMap(Location location) { return new Point( - Wgs84MetersPerDegree * location.Longitude, - Wgs84MetersPerDegree * LatitudeToY(location.Latitude)); + Wgs84MeterPerDegree * location.Longitude, + Wgs84MeterPerDegree * LatitudeToY(location.Latitude)); } public override Location MapToLocation(Point point) { return new Location( - YToLatitude(point.Y / Wgs84MetersPerDegree), - point.X / Wgs84MetersPerDegree); + YToLatitude(point.Y / Wgs84MeterPerDegree), + point.X / Wgs84MeterPerDegree); } public static double LatitudeToY(double latitude) diff --git a/MapControl/Shared/WmtsCapabilities.cs b/MapControl/Shared/WmtsCapabilities.cs index 0c732f47..f50f037b 100644 --- a/MapControl/Shared/WmtsCapabilities.cs +++ b/MapControl/Shared/WmtsCapabilities.cs @@ -274,7 +274,7 @@ namespace MapControl } var topLeft = supportedCrs == "EPSG:4326" - ? new Point(MapProjection.Wgs84MetersPerDegree * top, MapProjection.Wgs84MetersPerDegree * left) + ? new Point(MapProjection.Wgs84MeterPerDegree * top, MapProjection.Wgs84MeterPerDegree * left) : new Point(left, top); return new WmtsTileMatrix( diff --git a/MapControl/Shared/WorldMercatorProjection.cs b/MapControl/Shared/WorldMercatorProjection.cs index abdc71f2..88e4d5ff 100644 --- a/MapControl/Shared/WorldMercatorProjection.cs +++ b/MapControl/Shared/WorldMercatorProjection.cs @@ -39,15 +39,15 @@ namespace MapControl public override Point LocationToMap(Location location) { return new Point( - Wgs84MetersPerDegree * location.Longitude, - Wgs84MetersPerDegree * LatitudeToY(location.Latitude)); + Wgs84MeterPerDegree * location.Longitude, + Wgs84MeterPerDegree * LatitudeToY(location.Latitude)); } public override Location MapToLocation(Point point) { return new Location( - YToLatitude(point.Y / Wgs84MetersPerDegree), - point.X / Wgs84MetersPerDegree); + YToLatitude(point.Y / Wgs84MeterPerDegree), + point.X / Wgs84MeterPerDegree); } public static double LatitudeToY(double latitude)