clarify names, make methods protected

Author: markolbert

J4JMapLibrary/projections/base/IProjection.cs

@@ -44,7 +44,6 @@ public interface IProjection : IEquatable<IProjection>
     string Copyright { get; }
     Uri? CopyrightUri { get; }
 
-    string MapStyle { get; set; }
     event EventHandler<bool>? LoadComplete;
 
     int GetHeightWidth( int scale );
@@ -53,20 +52,20 @@ public interface IProjection : IEquatable<IProjection>
     MinMax<int> GetTileRange( int scale );
     int GetNumTiles( int scale );
 
-    HttpRequestMessage? CreateMessage( MapTile mapTile );
+    //HttpRequestMessage? CreateMessage( MapTile mapTile );
 
     bool SetCredentials( object credentials );
     Task<bool> SetCredentialsAsync( object credentials, CancellationToken ctx = default );
 
-    Task<MapTile> GetMapTileByProjectionCoordinatesAsync( int x, int y, int scale, CancellationToken ctx = default );
-    Task<MapTile> GetMapTileByRegionCoordinatesAsync( int x, int y, int scale, CancellationToken ctx = default );
+    Task<MapTile> GetMapTileWraparoundAsync( int x, int y, int scale, CancellationToken ctx = default );
+    Task<MapTile> GetMapTileAbsoluteAsync( int x, int y, int scale, CancellationToken ctx = default );
 
     Task<bool> LoadRegionAsync(
         MapRegion.MapRegion region,
         CancellationToken ctx = default
     );
 
-    byte[]? GetImage( MapTile mapTile );
+    //byte[]? GetImage( MapTile mapTile );
     Task<byte[]?> GetImageAsync( MapTile mapTile, CancellationToken ctx = default );
 
     Task<bool> LoadImageAsync( MapTile mapTile, CancellationToken ctx = default );

J4JMapLibrary/projections/base/Projection.cs

@@ -28,7 +28,6 @@ public abstract class Projection<TAuth> : IProjection
     where TAuth : class, new()
 {
     public const int DefaultMaxRequestLatency = 500;
-    private string _mapStyle = string.Empty;
     private float _maxLat = MapConstants.Wgs84MaxLatitude;
     private float _maxLong = 180;
     private int _maxScale;
@@ -84,7 +83,7 @@ public MinMax<int> GetTileRange( int scale )
 
     public int GetNumTiles( int scale )
     {
-        scale = ScaleRange.ConformValueToRange( scale, "GetNumTiles() Scale" );
+        scale = ScaleRange.ConformValueToRange( scale, "GetNumTiles()" );
         return InternalExtensions.Pow( 2, scale );
     }
 
@@ -105,31 +104,16 @@ public int GetHeightWidth( int scale )
     public string Copyright { get; protected set; } = string.Empty;
     public Uri? CopyrightUri { get; protected set; }
 
-    public string MapStyle
-    {
-        get => _mapStyle;
-
-        set
-        {
-            var changed = !value.Equals( _mapStyle, StringComparison.OrdinalIgnoreCase );
-
-            _mapStyle = value;
-
-            if( changed )
-                OnMapStyleChanged( value );
-        }
-    }
-
-    public abstract HttpRequestMessage? CreateMessage( MapTile mapTile );
+    protected abstract HttpRequestMessage? CreateMessage( MapTile mapTile );
 
-    public abstract Task<MapTile> GetMapTileByProjectionCoordinatesAsync(
+    public abstract Task<MapTile> GetMapTileWraparoundAsync(
         int x,
         int y,
         int scale,
         CancellationToken ctx = default
     );
 
-    public abstract Task<MapTile> GetMapTileByRegionCoordinatesAsync(
+    public abstract Task<MapTile> GetMapTileAbsoluteAsync(
         int x,
         int y,
         int scale,
@@ -208,10 +192,10 @@ protected abstract Task<bool> LoadRegionInternalAsync(
         CancellationToken ctx = default
     );
 
-    public byte[]? GetImage( MapTile mapTile )
-    {
-        return Task.Run( async () => await GetImageAsync( mapTile ) ).Result;
-    }
+    //public byte[]? GetImage( MapTile mapTile )
+    //{
+    //    return Task.Run( async () => await GetImageAsync( mapTile ) ).Result;
+    //}
 
     public async Task<byte[]?> GetImageAsync( MapTile mapTile, CancellationToken ctx = default )
     {

J4JMapLibrary/projections/base/static-projection/StaticProjection.cs

@@ -32,7 +32,7 @@ protected StaticProjection(
 
     // there's only ever one valid tile in a static projection (0,0)
     // so these next two methods are the same for static projections
-    public override async Task<MapTile> GetMapTileByProjectionCoordinatesAsync(
+    public override async Task<MapTile> GetMapTileWraparoundAsync(
         int x,
         int y,
         int scale,
@@ -45,13 +45,13 @@ public override async Task<MapTile> GetMapTileByProjectionCoordinatesAsync(
         return retVal;
     }
 
-    public override async Task<MapTile> GetMapTileByRegionCoordinatesAsync(
+    public override async Task<MapTile> GetMapTileAbsoluteAsync(
         int x,
         int y,
         int scale,
         CancellationToken ctx = default
     ) =>
-        await GetMapTileByProjectionCoordinatesAsync( x, y, scale, ctx );
+        await GetMapTileWraparoundAsync( x, y, scale, ctx );
 
     protected override async Task<bool> LoadRegionInternalAsync(
         MapRegion.MapRegion region,

J4JMapLibrary/projections/base/tiled-projection/TiledProjection.cs

@@ -57,31 +57,31 @@ public float GroundResolution( float latitude, int scale )
     public string ScaleDescription( float latitude, int scale, float dotsPerInch ) =>
         $"1 : {GroundResolution( latitude, scale ) * dotsPerInch / MapConstants.MetersPerInch}";
 
-    public override async Task<MapTile> GetMapTileByProjectionCoordinatesAsync(
-        int x,
-        int y,
+    public override async Task<MapTile> GetMapTileWraparoundAsync(
+        int xTile,
+        int yTile,
         int scale,
         CancellationToken ctx = default
     )
     {
         var region = new MapRegion.MapRegion( this, LoggerFactory ) { Scale = scale };
 
-        var retVal = new MapTile( region, y ).SetXRelative( x );
+        var retVal = new MapTile( region, yTile ).SetXRelative( xTile );
         await LoadImageAsync( retVal, ctx );
 
         return retVal;
     }
 
-    public override async Task<MapTile> GetMapTileByRegionCoordinatesAsync(
-        int x,
-        int y,
+    public override async Task<MapTile> GetMapTileAbsoluteAsync(
+        int xTile,
+        int yTile,
         int scale,
         CancellationToken ctx = default
     )
     {
         var region = new MapRegion.MapRegion( this, LoggerFactory ) { Scale = scale };
 
-        var retVal = new MapTile( region, y ).SetXAbsolute( x );
+        var retVal = new MapTile( region, yTile ).SetXAbsolute( xTile );
         await LoadImageAsync(retVal, ctx);
 
         return retVal;

J4JMapLibrary/projections/bing/BingMapsProjection.cs

@@ -185,7 +185,7 @@ protected override void OnMapStyleChanged( string value )
         return Initialized;
     }
 
-    public override HttpRequestMessage? CreateMessage( MapTile mapTile )
+    protected override HttpRequestMessage? CreateMessage( MapTile mapTile )
     {
         if( !Initialized )
         {

J4JMapLibrary/projections/google/GoogleMapsProjection.cs

@@ -83,7 +83,7 @@ protected override void OnMapStyleChanged( string value )
         return true;
     }
 
-    public override HttpRequestMessage? CreateMessage( MapTile mapTile )
+    protected override HttpRequestMessage? CreateMessage( MapTile mapTile )
     {
         if( !Initialized )
         {

J4JMapLibrary/projections/openmap/street/OpenStreetMapsProjection.cs

@@ -57,7 +57,7 @@ public OpenStreetMapsProjection(
         return Initialized;
     }
 
-    public override HttpRequestMessage? CreateMessage( MapTile mapTile )
+    protected override HttpRequestMessage? CreateMessage( MapTile mapTile )
     {
         if( !Initialized )
         {

J4JMapLibrary/projections/openmap/topo/OpenTopoMapsProjection.cs

@@ -58,7 +58,7 @@ public OpenTopoMapsProjection(
         return Initialized;
     }
 
-    public override HttpRequestMessage? CreateMessage( MapTile mapTile )
+    protected override HttpRequestMessage? CreateMessage( MapTile mapTile )
     {
         if( !Initialized )
         {