Refactor geometric and geodetic interfaces

NetFabric · Oct 29, 2023 · 3562832 · 3562832
1 parent f04f507
commit 3562832
Show file tree

Hide file tree

Showing 30 changed files with 462 additions and 300 deletions.
diff --git a/src/NetFabric.Numerics.Geography/Datum.cs b/src/NetFabric.Numerics.Geography/Datum.cs
@@ -1,12 +1,32 @@
-namespace NetFabric.Numerics.Geography;
+using System.Numerics;
 
-public readonly record struct Datum<TDatum>
-    where TDatum : IDatum<TDatum>?
+namespace NetFabric.Numerics.Geography;
+
+public abstract class Datum<T>
+    where T : struct, IFloatingPoint<T>, IMinMaxValue<T>
+{
+    public abstract string Name { get; }
+
+    public abstract Offset<T> Offset { get; }
+    public abstract Ellipsoid<T> Ellipsoid { get; }
+}
+
+public sealed class Datum<TDatum, T>
+    : Datum<T>
+    where TDatum : IDatum<T>
+    where T : struct, IFloatingPoint<T>, IMinMaxValue<T>
 {
-    public string Name 
+    static Lazy<Datum<TDatum, T>> lazyInstance = new(() => new());
+
+    private Datum() {}
+
+    internal static Datum<TDatum, T> Instance
+        => lazyInstance.Value;
+
+    public override string Name 
         => TDatum.Name;
-    public Offset<double> Offset 
+    public override Offset<T> Offset 
         => TDatum.Offset;
-    public Ellipsoid<double> Ellipsoid 
+    public override Ellipsoid<T> Ellipsoid 
         => TDatum.Ellipsoid;
 }
diff --git a/src/NetFabric.Numerics.Geography/Geodetic2/CoordinateSystem.cs b/src/NetFabric.Numerics.Geography/Geodetic2/CoordinateSystem.cs
@@ -1,22 +1,18 @@
-using System.Collections.ObjectModel;
 using System.Numerics;
 
 namespace NetFabric.Numerics.Geography.Geodetic2;
 
-public readonly record struct CoordinateSystem<TDatum, TAngle>
-    : IGeodeticCoordinateSystem<TDatum>
-    where TDatum : IDatum<TDatum>
-    where TAngle : struct, IFloatingPoint<TAngle>, IMinMaxValue<TAngle>
+public readonly record struct CoordinateSystem<TDatum, T>
+    : IGeodeticCoordinateSystem<CoordinateSystem<TDatum, T>, TDatum, T>
+    where TDatum : IDatum<T>
+    where T : struct, IFloatingPoint<T>, IMinMaxValue<T>
 {
-    public Datum<TDatum> Datum 
-        => new();
-
     static readonly IReadOnlyList<Coordinate> coordinates 
         = new[] {
-            new Coordinate("Latitude", typeof(Angle<Degrees, TAngle>)), 
-            new Coordinate("Longitude", typeof(Angle<Degrees, TAngle>)),
+            new Coordinate("Latitude", typeof(Angle<Degrees, T>)), 
+            new Coordinate("Longitude", typeof(Angle<Degrees, T>)),
         };
 
-    public IReadOnlyList<Coordinate> Coordinates 
+    public static IReadOnlyList<Coordinate> Coordinates 
         => coordinates;
 }
diff --git a/src/NetFabric.Numerics.Geography/Geodetic2/Point.cs b/src/NetFabric.Numerics.Geography/Geodetic2/Point.cs
@@ -6,9 +6,9 @@ namespace NetFabric.Numerics.Geography.Geodetic2;
 [System.Diagnostics.DebuggerDisplay("Latitude = {Latitude}, Longitude = {Longitude}")]
 [SkipLocalsInit]
 public readonly record struct Point<TDatum, TAngleUnits, T>(Angle<TAngleUnits, T> Latitude, Angle<TAngleUnits, T> Longitude) 
-    : IGeodeticPoint<Point<TDatum, TAngleUnits, T>, TDatum>
-    where TDatum : IDatum<TDatum>
-    where TAngleUnits : struct, IAngleUnits<TAngleUnits>
+    : IGeodeticPoint<Point<TDatum, TAngleUnits, T>, CoordinateSystem<TDatum, T>, TDatum, T>
+    where TDatum : IDatum<T>
+    where TAngleUnits : IAngleUnits
     where T : struct, IFloatingPoint<T>, IMinMaxValue<T>
 {
     public Angle<TAngleUnits, T> Latitude { get; } 
@@ -30,7 +30,8 @@ public readonly record struct Point<TDatum, TAngleUnits, T>(Angle<TAngleUnits, T
     /// <returns>An instance of <see cref="Point{TDatum, TAngleUnits, TAngle}"/> created from <paramref name="point" />.</returns>
     /// <exception cref="NotSupportedException"><typeparamref name="TOther" /> is not supported.</exception>
     /// <exception cref="OverflowException"><paramref name="point" /> is not representable by <see cref="Point{TDatum, TAngleUnits, TAngle}"/>.</exception>
-    public static Point<TDatum, TAngleUnits, T> CreateChecked<TOther>(in Point<TDatum, TAngleUnits, TOther> point)
+    public static Point<TDatum, TAngleUnits, T> CreateChecked<TDatumOther, TOther>(in Point<TDatumOther, TAngleUnits, TOther> point)
+        where TDatumOther : IDatum<TOther>
         where TOther : struct, IFloatingPoint<TOther>, IMinMaxValue<TOther>
         => new(
             Angle<TAngleUnits, T>.CreateChecked(point.Latitude),
@@ -46,7 +47,8 @@ public static Point<TDatum, TAngleUnits, T> CreateChecked<TOther>(in Point<TDatu
     /// <returns>An instance of <see cref="Point{TDatum, TAngleUnits, TAngle}"/> created from <paramref name="point" />.</returns>
     /// <exception cref="NotSupportedException"><typeparamref name="TOther" /> is not supported.</exception>
     /// <exception cref="OverflowException"><paramref name="point" /> is not representable by <see cref="Point{TDatum, TAngleUnits, TAngle}"/>.</exception>
-    public static Point<TDatum, TAngleUnits, T> CreateSaturating<TOther>(in Point<TDatum, TAngleUnits, TOther> point)
+    public static Point<TDatum, TAngleUnits, T> CreateSaturating<TDatumOther, TOther>(in Point<TDatumOther, TAngleUnits, TOther> point)
+        where TDatumOther : IDatum<TOther>
         where TOther : struct, IFloatingPoint<TOther>, IMinMaxValue<TOther>
         => new(
             Angle<TAngleUnits, T>.CreateSaturating(point.Latitude),
@@ -62,7 +64,8 @@ public static Point<TDatum, TAngleUnits, T> CreateSaturating<TOther>(in Point<TD
     /// <returns>An instance of <see cref="Point{TDatum, TAngleUnits, TAngle}"/> created from <paramref name="point" />.</returns>
     /// <exception cref="NotSupportedException"><typeparamref name="TOther" /> is not supported.</exception>
     /// <exception cref="OverflowException"><paramref name="point" /> is not representable by <see cref="Point{TDatum, TAngleUnits, TAngle}"/>.</exception>
-    public static Point<TDatum, TAngleUnits, T> CreateTruncating<TOther>(in Point<TDatum, TAngleUnits, TOther> point)
+    public static Point<TDatum, TAngleUnits, T> CreateTruncating<TDatumOther, TOther>(in Point<TDatumOther, TAngleUnits, TOther> point)
+        where TDatumOther : IDatum<TOther>
         where TOther : struct, IFloatingPoint<TOther>, IMinMaxValue<TOther>
         => new(
             Angle<TAngleUnits, T>.CreateTruncating(point.Latitude),
@@ -74,7 +77,7 @@ public static Point<TDatum, TAngleUnits, T> CreateTruncating<TOther>(in Point<TD
     public static readonly Point<TDatum, TAngleUnits, T> Zero
         = new(Angle<TAngleUnits, T>.Zero, Angle<TAngleUnits, T>.Zero);
 
-    static Point<TDatum, TAngleUnits, T> IGeometricBase<Point<TDatum, TAngleUnits, T>>.Zero
+    static Point<TDatum, TAngleUnits, T> IGeometricBase<Point<TDatum, TAngleUnits, T>, CoordinateSystem<TDatum, T>>.Zero
         => Zero;
 
     /// <summary>
@@ -96,15 +99,7 @@ static Point<TDatum, TAngleUnits, T> IMinMaxValue<Point<TDatum, TAngleUnits, T>>
 
     #endregion
 
-    /// <summary>
-    /// Gets the coordinate system.
-    /// </summary>
-    public CoordinateSystem<TDatum, T> CoordinateSystem 
-        => new();
-    ICoordinateSystem IGeometricBase<Point<TDatum, TAngleUnits, T>>.CoordinateSystem 
-        => CoordinateSystem;
-
-    object IGeometricBase<Point<TDatum, TAngleUnits, T>>.this[int index] 
+    object IGeometricBase.this[int index] 
         => index switch
         {
             0 => Latitude,

diff --git a/src/NetFabric.Numerics.Geography/Geodetic3/CoordinateSystem.cs b/src/NetFabric.Numerics.Geography/Geodetic3/CoordinateSystem.cs
@@ -2,22 +2,18 @@
 
 namespace NetFabric.Numerics.Geography.Geodetic3;
 
-public readonly record struct CoordinateSystem<TDatum, TAngle, THeight>
-    : IGeodeticCoordinateSystem<TDatum>
-    where TDatum : IDatum<TDatum>
-    where TAngle : struct, IFloatingPoint<TAngle>, IMinMaxValue<TAngle>
-    where THeight : struct, INumber<THeight>
+public readonly record struct CoordinateSystem<TDatum, T>
+    : IGeodeticCoordinateSystem<CoordinateSystem<TDatum, T>, TDatum, T>
+    where TDatum : IDatum<T>
+    where T : struct, IFloatingPoint<T>, IMinMaxValue<T>
 {
-    public Datum<TDatum> Datum 
-        => new();
-
     static readonly IReadOnlyList<Coordinate> coordinates 
         = new[] {
-            new Coordinate("Latitude", typeof(Angle<Degrees, TAngle>)), 
-            new Coordinate("Longitude", typeof(Angle<Degrees, TAngle>)),
-            new Coordinate("Height", typeof(THeight)),
+            new Coordinate("Latitude", typeof(Angle<Degrees, T>)), 
+            new Coordinate("Longitude", typeof(Angle<Degrees, T>)),
+            new Coordinate("Height", typeof(T)),
         };
 
-    public IReadOnlyList<Coordinate> Coordinates 
+    public static IReadOnlyList<Coordinate> Coordinates 
         => coordinates;
 }