Minor code cleanup

apdevelop · apdevelop · commit f21a5c782d36 · 2025-02-09T12:06:28.000+03:00
diff --git a/README.md b/README.md
@@ -36,11 +36,11 @@ Simple and lightweight implementation of tile server basic features for .NET 5 /
 ### Technologies
 There are two separate solutions and corresponding projects, sharing the same source code files:
 
-| Property           | .NET 5    | .NET 8         |
-| ------------------ |:---------:|:--------------:|
-| SDK                | .NET 5.0  | .NET 8.0       |
-| MS Visual Studio   | 2019      | 2022 (17.8.3)  |
-| Status             | Legacy    | Active         |
+| Property           | .NET 5    | .NET 8      |
+| ------------------ |:---------:|:-----------:|
+| SDK                | .NET 5.0  | .NET 8.0    |
+| MS Visual Studio   | 2019      | 2022        |
+| Status             | Legacy    | Active      |
 
 Using
 * [Microsoft.Data.Sqlite](https://docs.microsoft.com/ru-ru/dotnet/standard/data/sqlite/) for working with SQLite database.
diff --git a/Src/TileMapService/Controllers/TmsController.cs b/Src/TileMapService/Controllers/TmsController.cs
@@ -18,6 +18,8 @@ namespace TileMapService.Controllers
     [Route("tms")]
     public class TmsController : ControllerBase
     {
+        private const string Version = "1.0.0";
+
         private readonly ITileSourceFabric tileSourceFabric;
 
         public TmsController(ITileSourceFabric tileSourceFabric)
@@ -35,7 +37,7 @@ public IActionResult GetRootResource()
             return File(EC.XmlDocumentToUTF8ByteArray(xmlDoc), MediaTypeNames.Text.Xml);
         }
 
-        [HttpGet("1.0.0")]
+        [HttpGet(Version)]
         public IActionResult GetTileMapService()
         {
             // TODO: services/tilemapservice.xml
@@ -45,20 +47,21 @@ public IActionResult GetTileMapService()
             return File(EC.XmlDocumentToUTF8ByteArray(xmlDoc), MediaTypeNames.Text.Xml);
         }
 
-        [HttpGet("1.0.0/{tileset}")]
+        [HttpGet(Version + "/{tileset}")]
         public IActionResult GetTileMap(string tileset)
         {
             // TODO: services/basemap.xml
             var capabilities = this.GetCapabilities();
-            var layer = capabilities.Layers?.SingleOrDefault(l => l.Identifier == tileset);
+            var layer = capabilities.Layers.SingleOrDefault(l => l.Identifier == tileset);
             if (layer == null)
             {
                 return NotFound(); // TODO: errors in XML format
             }
-
-            var xmlDoc = new Tms.CapabilitiesUtility(capabilities).GetTileMap(layer);
-
-            return File(EC.XmlDocumentToUTF8ByteArray(xmlDoc), MediaTypeNames.Text.Xml);
+            else
+            {
+                var xmlDoc = new Tms.CapabilitiesUtility(capabilities).GetTileMap(layer);
+                return File(EC.XmlDocumentToUTF8ByteArray(xmlDoc), MediaTypeNames.Text.Xml);
+            }
         }
 
         /// <summary>
@@ -70,7 +73,7 @@ public IActionResult GetTileMap(string tileset)
         /// <param name="z">Tile Z coordinate (zoom level).</param>
         /// <param name="extension">File extension.</param>
         /// <returns>Response with tile contents.</returns>
-        [HttpGet("1.0.0/{tileset}/{z}/{x}/{y}.{extension}")]
+        [HttpGet(Version + "/{tileset}/{z}/{x}/{y}.{extension}")]
         public async Task<IActionResult> GetTileAsync(string tileset, int x, int y, int z, string extension, CancellationToken cancellationToken)
         {
             // TODO: z can be a string, not integer number
@@ -108,19 +111,18 @@ public async Task<IActionResult> GetTileAsync(string tileset, int x, int y, int
 
         private Tms.Capabilities GetCapabilities()
         {
-            var layers = EC.SourcesToLayers(this.tileSourceFabric.Sources);
             return new Tms.Capabilities
             {
+                BaseUrl = this.BaseUrl,
+                Layers = EC.SourcesToLayers(this.tileSourceFabric.Sources),
                 ServiceTitle = this.tileSourceFabric.ServiceProperties.Title,
                 ServiceAbstract = this.tileSourceFabric.ServiceProperties.Abstract,
-                BaseUrl = this.BaseUrl,
-                Layers = layers.ToArray(),
             };
         }
 
         private string BaseUrl => $"{this.Request.Scheme}://{this.Request.Host}{this.Request.PathBase}";
 
-        private IActionResult ResponseWithNotFoundError(string message)
+        private FileContentResult ResponseWithNotFoundError(string message)
         {
             var xmlDoc = new Tms.TileMapServerError(message).ToXml();
             Response.ContentType = MediaTypeNames.Text.XmlUtf8;
diff --git a/Src/TileMapService/Controllers/WmsController.cs b/Src/TileMapService/Controllers/WmsController.cs
@@ -119,7 +119,7 @@ public async Task<IActionResult> ProcessWmsRequestAsync(
             }
         }
 
-        private IActionResult ProcessGetCapabilitiesRequest(Wms.Version version)
+        private FileContentResult ProcessGetCapabilitiesRequest(Wms.Version version)
         {
             var layers = EC.SourcesToLayers(this.tileSourceFabric.Sources)
                 .Where(l => l.Srs == SrsCodes.EPSG3857) // TODO: sources with EPSG:4326 support
@@ -301,15 +301,15 @@ await WmsHelper.DrawLayerAsync( // TODO: ? pass required format to avoid convers
 
         private static readonly char[] LayersSeparator = new[] { ',' };
 
-        private IActionResult ResponseWithExceptionReport(string exceptionCode, string message, string locator)
+        private FileContentResult ResponseWithExceptionReport(string exceptionCode, string message, string locator)
         {
             var xmlDoc = new ExceptionReport(exceptionCode, message, locator).ToXml();
             Response.ContentType = MediaTypeNames.Application.Xml;
             Response.StatusCode = (int)HttpStatusCode.OK;
             return File(EC.XmlDocumentToUTF8ByteArray(xmlDoc), Response.ContentType);
         }
 
-        private IActionResult ResponseWithServiceExceptionReport(string? code, string message, string version)
+        private FileContentResult ResponseWithServiceExceptionReport(string? code, string message, string version)
         {
             var xmlDoc = new ServiceExceptionReport(code, message, version).ToXml();
             Response.ContentType = MediaTypeNames.Text.XmlUtf8;
diff --git a/Src/TileMapService/Controllers/WmtsController.cs b/Src/TileMapService/Controllers/WmtsController.cs
@@ -180,7 +180,7 @@ public async Task<IActionResult> ProcessGetTileRestfulRequestAsync(
             return await this.GetTileAsync(layer, tileCol, tileRow, Int32.Parse(tileMatrix), EC.TileFormatToContentType(format), this.tileSourceFabric.ServiceProperties.JpegQuality, cancellationToken);
         }
 
-        private IActionResult ProcessGetCapabilitiesRequest()
+        private FileContentResult ProcessGetCapabilitiesRequest()
         {
             var layers = EC.SourcesToLayers(this.tileSourceFabric.Sources)
                 .Where(l => l.Format == ImageFormats.Png || l.Format == ImageFormats.Jpeg) // Only raster formats
@@ -230,7 +230,7 @@ private async Task<IActionResult> GetTileAsync(
 
         private string BaseUrl => $"{this.Request.Scheme}://{this.Request.Host}{this.Request.PathBase}";
 
-        private IActionResult ResponseWithBadRequestError(string exceptionCode, string message)
+        private FileContentResult ResponseWithBadRequestError(string exceptionCode, string message)
         {
             var xmlDoc = new ExceptionReport(exceptionCode, message).ToXml();
             Response.ContentType = MediaTypeNames.Text.XmlUtf8;
@@ -239,7 +239,7 @@ private IActionResult ResponseWithBadRequestError(string exceptionCode, string m
             return File(EC.XmlDocumentToUTF8ByteArray(xmlDoc), Response.ContentType);
         }
 
-        private IActionResult ResponseWithNotFoundError(string exceptionCode, string message)
+        private FileContentResult ResponseWithNotFoundError(string exceptionCode, string message)
         {
             var xmlDoc = new ExceptionReport(exceptionCode, message).ToXml();
             Response.ContentType = MediaTypeNames.Text.XmlUtf8;
diff --git a/Src/TileMapService/TileMapService.NET5.csproj b/Src/TileMapService/TileMapService.NET5.csproj
@@ -12,7 +12,7 @@
 	<ItemGroup>
 		<PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.649" />
 		<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.13" />
-		<PackageReference Include="Npgsql" Version="6.0.7" />
+		<PackageReference Include="Npgsql" Version="6.0.13" />
 		<PackageReference Include="SkiaSharp" Version="2.88.6" />
 		<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
 		<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.7" />
diff --git a/Src/TileMapService/TileSources/HttpTileSource.cs b/Src/TileMapService/TileSources/HttpTileSource.cs
@@ -76,7 +76,7 @@ async Task ITileSource.InitAsync()
             }
 
             // Default is tms=false for simple XYZ tile services
-            var tms = this.configuration.Tms ?? (this.configuration.Type.ToLowerInvariant() == SourceConfiguration.TypeTms);
+            var tms = this.configuration.Tms ?? (String.Compare(this.configuration.Type, SourceConfiguration.TypeTms, StringComparison.InvariantCultureIgnoreCase) == 0);
             var srs = String.IsNullOrWhiteSpace(this.configuration.Srs) ? Utils.SrsCodes.EPSG3857 : this.configuration.Srs.Trim().ToUpper();
 
             // Re-create configuration
@@ -256,7 +256,7 @@ async Task ITileSource.InitAsync()
 
         async Task<byte[]?> ITileSource.GetTileAsync(int x, int y, int z, CancellationToken cancellationToken)
         {
-            if ((z < this.configuration.MinZoom) || (z > this.configuration.MaxZoom))
+            if (z < this.configuration.MinZoom || z > this.configuration.MaxZoom)
             {
                 return null;
             }
@@ -285,13 +285,12 @@ async Task ITileSource.InitAsync()
                 {
                     if (response.Content.Headers.ContentType != null && response.Content.Headers.ContentType.MediaType == MediaTypeNames.Application.OgcServiceExceptionXml)
                     {
-                        var message = await response.Content.ReadAsStringAsync();
+                        var message = await response.Content.ReadAsStringAsync(cancellationToken);
                         this.logger.LogWarning($"Error reading tile: '{message}'.");
                         return null;
                     }
 
                     // TODO: more checks of Content-Type, response size, etc.
-
                     var data = await response.Content.ReadAsByteArrayAsync(cancellationToken);
                     this.cache?.AddTile(x, y, z, data);
 
@@ -329,14 +328,14 @@ async Task ITileSource.InitAsync()
                 if (response.Content.Headers.ContentType != null &&
                     response.Content.Headers.ContentType.MediaType == MediaTypeNames.Application.OgcServiceExceptionXml)
                 {
-                    var message = await response.Content.ReadAsStringAsync();
+                    var message = await response.Content.ReadAsStringAsync(cancellationToken);
                     this.logger.LogWarning($"Error reading tile: '{message}'.");
                     return null;
                 }
 
                 // TODO: more checks of Content-Type, response size, etc.
 
-                var data = await response.Content.ReadAsByteArrayAsync();
+                var data = await response.Content.ReadAsByteArrayAsync(cancellationToken);
 
                 return data;
             }
diff --git a/Src/TileMapService/Tms/Capabilities.cs b/Src/TileMapService/Tms/Capabilities.cs
@@ -10,6 +10,6 @@ class Capabilities
 
         public string? BaseUrl { get; set; }
 
-        public Models.Layer[]? Layers { get; set; }
+        public Models.Layer[] Layers { get; set; } = Array.Empty<Models.Layer>();
     }
 }
diff --git a/Src/TileMapService/Tms/CapabilitiesUtility.cs b/Src/TileMapService/Tms/CapabilitiesUtility.cs
@@ -23,12 +23,7 @@ public CapabilitiesUtility(Capabilities capabilities)
         {
             if (capabilities.BaseUrl == null)
             {
-                throw new ArgumentNullException(nameof(capabilities), "capabilities.BaseUrl is null.");
-            }
-
-            if (capabilities.Layers == null)
-            {
-                throw new ArgumentNullException(nameof(capabilities), "capabilities.Layers is null.");
+                throw new ArgumentNullException("capabilities.BaseUrl", "BaseUrl is null.");
             }
 
             this.serviceTitle = capabilities.ServiceTitle;
@@ -156,7 +151,7 @@ public XmlDocument GetTileMap(Models.Layer layer)
             double unitsWidth, pixelsWidth;
             switch (layer.Srs)
             {
-                case Utils.SrsCodes.EPSG3857:
+                case SrsCodes.EPSG3857:
                     {
                         // Assuming 1x1 tile grid at zoom level 0
                         unitsWidth = 20037508.342789 * 2;
@@ -180,7 +175,7 @@ public XmlDocument GetTileMap(Models.Layer layer)
 
                         break;
                     }
-                case Utils.SrsCodes.EPSG4326:
+                case SrsCodes.EPSG4326:
                     {
                         // Assuming 2x1 tile grid at zoom level 0
                         unitsWidth = 360;
@@ -320,12 +315,12 @@ private static XmlAttribute CreateProfileAttribute(XmlDocument doc, string? srs)
 
             switch (srs)
             {
-                case Utils.SrsCodes.EPSG3857:
+                case SrsCodes.EPSG3857:
                     {
                         profileAttribute.Value = Identifiers.ProfileGlobalMercator;
                         break;
                     }
-                case Utils.SrsCodes.EPSG4326:
+                case SrsCodes.EPSG4326:
                     {
                         profileAttribute.Value = Identifiers.ProfileGlobalGeodetic;
                         break;
diff --git a/Src/TileMapService/Utils/EntitiesConverter.cs b/Src/TileMapService/Utils/EntitiesConverter.cs
@@ -40,10 +40,8 @@ public static string ExtensionToMediaType(string extension) =>
                 _ => extension,
             };
 
-        public static List<Layer> SourcesToLayers(IEnumerable<SourceConfiguration> sources) =>
-            sources
-               .Select(c => SourceConfigurationToLayer(c))
-               .ToList();
+        public static Layer[] SourcesToLayers(IEnumerable<SourceConfiguration> sources) =>
+            sources.Select(SourceConfigurationToLayer).ToArray();
 
         private static Layer SourceConfigurationToLayer(SourceConfiguration c) =>
             new()
diff --git a/Src/TileMapService/Utils/ResponseHelper.cs b/Src/TileMapService/Utils/ResponseHelper.cs
@@ -41,14 +41,9 @@ public static bool IsFormatInList(IList<string> mediaTypes, string mediaType)
                     if (isFormatSupported)
                     {
                         var outputImage = ImageHelper.ConvertImageToFormat(imageContents, mediaType, quality);
-                        if (outputImage != null)
-                        {
-                            return new FileResponse { FileContents = outputImage, ContentType = mediaType };
-                        }
-                        else
-                        {
-                            return null;
-                        }
+                        return outputImage != null
+                            ? new FileResponse { FileContents = outputImage, ContentType = mediaType }
+                            : null;
                     }
                     else
                     {
diff --git a/Src/TileMapService/Utils/WebMercator.cs b/Src/TileMapService/Utils/WebMercator.cs
@@ -157,21 +157,21 @@ public static double TileCoordinateYAtZoom(double latitude, int zoomLevel) =>
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static double LongitudeToPixelXAtZoom(double longitude, int zoomLevel) =>
-            LongitudeToPixelX(longitude, (double)MapSize(zoomLevel, DefaultTileSize));
+            LongitudeToPixelX(longitude, MapSize(zoomLevel, DefaultTileSize));
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static double LatitudeToPixelYAtZoom(double latitude, int zoomLevel) =>
-            LatitudeToPixelY(latitude, (double)MapSize(zoomLevel, DefaultTileSize));
+            LatitudeToPixelY(latitude, MapSize(zoomLevel, DefaultTileSize));
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static double LongitudeToPixelX(double longitude, double mapSize) =>
-            ((longitude + 180.0) / 360.0) * mapSize;
+            ((longitude + 180) / 360) * mapSize;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static double LatitudeToPixelY(double latitude, double mapSize)
         {
             var sinLatitude = Math.Sin(MathHelper.DegreesToRadians(latitude));
-            return (0.5 - Math.Log((1.0 + sinLatitude) / (1.0 - sinLatitude)) / (4.0 * Math.PI)) * mapSize;
+            return (0.5 - Math.Log((1 + sinLatitude) / (1 - sinLatitude)) / (4 * Math.PI)) * mapSize;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -180,16 +180,16 @@ public static double PixelXToLongitude(double pixelX, int zoomLevel)
             var mapSize = (double)MapSize(zoomLevel, DefaultTileSize);
             var x = (MathHelper.Clip(pixelX, 0.0, mapSize) / mapSize) - 0.5;
 
-            return 360.0 * x;
+            return 360 * x;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static double PixelYToLatitude(double pixelY, int zoomLevel)
         {
             var mapSize = (double)MapSize(zoomLevel, DefaultTileSize);
-            var y = 0.5 - (MathHelper.Clip(pixelY, 0.0, mapSize) / mapSize);
+            var y = 0.5 - (MathHelper.Clip(pixelY, 0, mapSize) / mapSize);
 
-            return 90.0 - 360.0 * Math.Atan(Math.Exp(-y * 2.0 * Math.PI)) / Math.PI;
+            return 90 - 360 * Math.Atan(Math.Exp(-y * 2 * Math.PI)) / Math.PI;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ namespace TileMapService.Controllers`
`18`	`18`	`[Route("tms")]`
`19`	`19`	`public class TmsController : ControllerBase`
`20`	`20`	`{`
	`21`	`+ private const string Version = "1.0.0";`
	`22`	`+`
`21`	`23`	`private readonly ITileSourceFabric tileSourceFabric;`
`22`	`24`
`23`	`25`	`public TmsController(ITileSourceFabric tileSourceFabric)`
`@@ -35,7 +37,7 @@ public IActionResult GetRootResource()`
`35`	`37`	`return File(EC.XmlDocumentToUTF8ByteArray(xmlDoc), MediaTypeNames.Text.Xml);`
`36`	`38`	`}`
`37`	`39`
`38`		`- [HttpGet("1.0.0")]`
	`40`	`+ [HttpGet(Version)]`
`39`	`41`	`public IActionResult GetTileMapService()`
`40`	`42`	`{`
`41`	`43`	`// TODO: services/tilemapservice.xml`
`@@ -45,20 +47,21 @@ public IActionResult GetTileMapService()`
`45`	`47`	`return File(EC.XmlDocumentToUTF8ByteArray(xmlDoc), MediaTypeNames.Text.Xml);`
`46`	`48`	`}`
`47`	`49`
`48`		`- [HttpGet("1.0.0/{tileset}")]`
	`50`	`+ [HttpGet(Version + "/{tileset}")]`
`49`	`51`	`public IActionResult GetTileMap(string tileset)`
`50`	`52`	`{`
`51`	`53`	`// TODO: services/basemap.xml`
`52`	`54`	`var capabilities = this.GetCapabilities();`
`53`		`- var layer = capabilities.Layers?.SingleOrDefault(l => l.Identifier == tileset);`
	`55`	`+ var layer = capabilities.Layers.SingleOrDefault(l => l.Identifier == tileset);`
`54`	`56`	`if (layer == null)`
`55`	`57`	`{`
`56`	`58`	`return NotFound(); // TODO: errors in XML format`
`57`	`59`	`}`
`58`		`-`
`59`		`- var xmlDoc = new Tms.CapabilitiesUtility(capabilities).GetTileMap(layer);`
`60`		`-`
`61`		`- return File(EC.XmlDocumentToUTF8ByteArray(xmlDoc), MediaTypeNames.Text.Xml);`
	`60`	`+ else`
	`61`	`+ {`
	`62`	`+ var xmlDoc = new Tms.CapabilitiesUtility(capabilities).GetTileMap(layer);`
	`63`	`+ return File(EC.XmlDocumentToUTF8ByteArray(xmlDoc), MediaTypeNames.Text.Xml);`
	`64`	`+ }`
`62`	`65`	`}`
`63`	`66`
`64`	`67`	`/// <summary>`
`@@ -70,7 +73,7 @@ public IActionResult GetTileMap(string tileset)`
`70`	`73`	`/// <param name="z">Tile Z coordinate (zoom level).</param>`
`71`	`74`	`/// <param name="extension">File extension.</param>`
`72`	`75`	`/// <returns>Response with tile contents.</returns>`
`73`		`- [HttpGet("1.0.0/{tileset}/{z}/{x}/{y}.{extension}")]`
	`76`	`+ [HttpGet(Version + "/{tileset}/{z}/{x}/{y}.{extension}")]`
`74`	`77`	`public async Task<IActionResult> GetTileAsync(string tileset, int x, int y, int z, string extension, CancellationToken cancellationToken)`
`75`	`78`	`{`
`76`	`79`	`// TODO: z can be a string, not integer number`
`@@ -108,19 +111,18 @@ public async Task<IActionResult> GetTileAsync(string tileset, int x, int y, int`
`108`	`111`
`109`	`112`	`private Tms.Capabilities GetCapabilities()`
`110`	`113`	`{`
`111`		`- var layers = EC.SourcesToLayers(this.tileSourceFabric.Sources);`
`112`	`114`	`return new Tms.Capabilities`
`113`	`115`	`{`
	`116`	`+ BaseUrl = this.BaseUrl,`
	`117`	`+ Layers = EC.SourcesToLayers(this.tileSourceFabric.Sources),`
`114`	`118`	`ServiceTitle = this.tileSourceFabric.ServiceProperties.Title,`
`115`	`119`	`ServiceAbstract = this.tileSourceFabric.ServiceProperties.Abstract,`
`116`		`- BaseUrl = this.BaseUrl,`
`117`		`- Layers = layers.ToArray(),`
`118`	`120`	`};`
`119`	`121`	`}`
`120`	`122`
`121`	`123`	`private string BaseUrl => $"{this.Request.Scheme}://{this.Request.Host}{this.Request.PathBase}";`
`122`	`124`
`123`		`- private IActionResult ResponseWithNotFoundError(string message)`
	`125`	`+ private FileContentResult ResponseWithNotFoundError(string message)`
`124`	`126`	`{`
`125`	`127`	`var xmlDoc = new Tms.TileMapServerError(message).ToXml();`
`126`	`128`	`Response.ContentType = MediaTypeNames.Text.XmlUtf8;`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public async Task<IActionResult> ProcessWmsRequestAsync(`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`122`		`- private IActionResult ProcessGetCapabilitiesRequest(Wms.Version version)`
	`122`	`+ private FileContentResult ProcessGetCapabilitiesRequest(Wms.Version version)`
`123`	`123`	`{`
`124`	`124`	`var layers = EC.SourcesToLayers(this.tileSourceFabric.Sources)`
`125`	`125`	`.Where(l => l.Srs == SrsCodes.EPSG3857) // TODO: sources with EPSG:4326 support`
`@@ -301,15 +301,15 @@ await WmsHelper.DrawLayerAsync( // TODO: ? pass required format to avoid convers`
`301`	`301`
`302`	`302`	`private static readonly char[] LayersSeparator = new[] { ',' };`
`303`	`303`
`304`		`- private IActionResult ResponseWithExceptionReport(string exceptionCode, string message, string locator)`
	`304`	`+ private FileContentResult ResponseWithExceptionReport(string exceptionCode, string message, string locator)`
`305`	`305`	`{`
`306`	`306`	`var xmlDoc = new ExceptionReport(exceptionCode, message, locator).ToXml();`
`307`	`307`	`Response.ContentType = MediaTypeNames.Application.Xml;`
`308`	`308`	`Response.StatusCode = (int)HttpStatusCode.OK;`
`309`	`309`	`return File(EC.XmlDocumentToUTF8ByteArray(xmlDoc), Response.ContentType);`
`310`	`310`	`}`
`311`	`311`
`312`		`- private IActionResult ResponseWithServiceExceptionReport(string? code, string message, string version)`
	`312`	`+ private FileContentResult ResponseWithServiceExceptionReport(string? code, string message, string version)`
`313`	`313`	`{`
`314`	`314`	`var xmlDoc = new ServiceExceptionReport(code, message, version).ToXml();`
`315`	`315`	`Response.ContentType = MediaTypeNames.Text.XmlUtf8;`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public async Task<IActionResult> ProcessGetTileRestfulRequestAsync(`
`180`	`180`	`return await this.GetTileAsync(layer, tileCol, tileRow, Int32.Parse(tileMatrix), EC.TileFormatToContentType(format), this.tileSourceFabric.ServiceProperties.JpegQuality, cancellationToken);`
`181`	`181`	`}`
`182`	`182`
`183`		`- private IActionResult ProcessGetCapabilitiesRequest()`
	`183`	`+ private FileContentResult ProcessGetCapabilitiesRequest()`
`184`	`184`	`{`
`185`	`185`	`var layers = EC.SourcesToLayers(this.tileSourceFabric.Sources)`
`186`	`186`	`.Where(l => l.Format == ImageFormats.Png \|\| l.Format == ImageFormats.Jpeg) // Only raster formats`
`@@ -230,7 +230,7 @@ private async Task<IActionResult> GetTileAsync(`
`230`	`230`
`231`	`231`	`private string BaseUrl => $"{this.Request.Scheme}://{this.Request.Host}{this.Request.PathBase}";`
`232`	`232`
`233`		`- private IActionResult ResponseWithBadRequestError(string exceptionCode, string message)`
	`233`	`+ private FileContentResult ResponseWithBadRequestError(string exceptionCode, string message)`
`234`	`234`	`{`
`235`	`235`	`var xmlDoc = new ExceptionReport(exceptionCode, message).ToXml();`
`236`	`236`	`Response.ContentType = MediaTypeNames.Text.XmlUtf8;`
`@@ -239,7 +239,7 @@ private IActionResult ResponseWithBadRequestError(string exceptionCode, string m`
`239`	`239`	`return File(EC.XmlDocumentToUTF8ByteArray(xmlDoc), Response.ContentType);`
`240`	`240`	`}`
`241`	`241`
`242`		`- private IActionResult ResponseWithNotFoundError(string exceptionCode, string message)`
	`242`	`+ private FileContentResult ResponseWithNotFoundError(string exceptionCode, string message)`
`243`	`243`	`{`
`244`	`244`	`var xmlDoc = new ExceptionReport(exceptionCode, message).ToXml();`
`245`	`245`	`Response.ContentType = MediaTypeNames.Text.XmlUtf8;`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ async Task ITileSource.InitAsync()`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`// Default is tms=false for simple XYZ tile services`
`79`		`- var tms = this.configuration.Tms ?? (this.configuration.Type.ToLowerInvariant() == SourceConfiguration.TypeTms);`
	`79`	`+ var tms = this.configuration.Tms ?? (String.Compare(this.configuration.Type, SourceConfiguration.TypeTms, StringComparison.InvariantCultureIgnoreCase) == 0);`
`80`	`80`	`var srs = String.IsNullOrWhiteSpace(this.configuration.Srs) ? Utils.SrsCodes.EPSG3857 : this.configuration.Srs.Trim().ToUpper();`
`81`	`81`
`82`	`82`	`// Re-create configuration`
`@@ -256,7 +256,7 @@ async Task ITileSource.InitAsync()`
`256`	`256`
`257`	`257`	`async Task<byte[]?> ITileSource.GetTileAsync(int x, int y, int z, CancellationToken cancellationToken)`
`258`	`258`	`{`
`259`		`- if ((z < this.configuration.MinZoom) \|\| (z > this.configuration.MaxZoom))`
	`259`	`+ if (z < this.configuration.MinZoom \|\| z > this.configuration.MaxZoom)`
`260`	`260`	`{`
`261`	`261`	`return null;`
`262`	`262`	`}`
`@@ -285,13 +285,12 @@ async Task ITileSource.InitAsync()`
`285`	`285`	`{`
`286`	`286`	`if (response.Content.Headers.ContentType != null && response.Content.Headers.ContentType.MediaType == MediaTypeNames.Application.OgcServiceExceptionXml)`
`287`	`287`	`{`
`288`		`- var message = await response.Content.ReadAsStringAsync();`
	`288`	`+ var message = await response.Content.ReadAsStringAsync(cancellationToken);`
`289`	`289`	`this.logger.LogWarning($"Error reading tile: '{message}'.");`
`290`	`290`	`return null;`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`// TODO: more checks of Content-Type, response size, etc.`
`294`		`-`
`295`	`294`	`var data = await response.Content.ReadAsByteArrayAsync(cancellationToken);`
`296`	`295`	`this.cache?.AddTile(x, y, z, data);`
`297`	`296`
`@@ -329,14 +328,14 @@ async Task ITileSource.InitAsync()`
`329`	`328`	`if (response.Content.Headers.ContentType != null &&`
`330`	`329`	`response.Content.Headers.ContentType.MediaType == MediaTypeNames.Application.OgcServiceExceptionXml)`
`331`	`330`	`{`
`332`		`- var message = await response.Content.ReadAsStringAsync();`
	`331`	`+ var message = await response.Content.ReadAsStringAsync(cancellationToken);`
`333`	`332`	`this.logger.LogWarning($"Error reading tile: '{message}'.");`
`334`	`333`	`return null;`
`335`	`334`	`}`
`336`	`335`
`337`	`336`	`// TODO: more checks of Content-Type, response size, etc.`
`338`	`337`
`339`		`- var data = await response.Content.ReadAsByteArrayAsync();`
	`338`	`+ var data = await response.Content.ReadAsByteArrayAsync(cancellationToken);`
`340`	`339`
`341`	`340`	`return data;`
`342`	`341`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ class Capabilities`
`10`	`10`
`11`	`11`	`public string? BaseUrl { get; set; }`
`12`	`12`
`13`		`- public Models.Layer[]? Layers { get; set; }`
	`13`	`+ public Models.Layer[] Layers { get; set; } = Array.Empty<Models.Layer>();`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,7 @@ public CapabilitiesUtility(Capabilities capabilities)`
`23`	`23`	`{`
`24`	`24`	`if (capabilities.BaseUrl == null)`
`25`	`25`	`{`
`26`		`- throw new ArgumentNullException(nameof(capabilities), "capabilities.BaseUrl is null.");`
`27`		`- }`
`28`		`-`
`29`		`- if (capabilities.Layers == null)`
`30`		`- {`
`31`		`- throw new ArgumentNullException(nameof(capabilities), "capabilities.Layers is null.");`
	`26`	`+ throw new ArgumentNullException("capabilities.BaseUrl", "BaseUrl is null.");`
`32`	`27`	`}`
`33`	`28`
`34`	`29`	`this.serviceTitle = capabilities.ServiceTitle;`
`@@ -156,7 +151,7 @@ public XmlDocument GetTileMap(Models.Layer layer)`
`156`	`151`	`double unitsWidth, pixelsWidth;`
`157`	`152`	`switch (layer.Srs)`
`158`	`153`	`{`
`159`		`- case Utils.SrsCodes.EPSG3857:`
	`154`	`+ case SrsCodes.EPSG3857:`
`160`	`155`	`{`
`161`	`156`	`// Assuming 1x1 tile grid at zoom level 0`
`162`	`157`	`unitsWidth = 20037508.342789 * 2;`
`@@ -180,7 +175,7 @@ public XmlDocument GetTileMap(Models.Layer layer)`
`180`	`175`
`181`	`176`	`break;`
`182`	`177`	`}`
`183`		`- case Utils.SrsCodes.EPSG4326:`
	`178`	`+ case SrsCodes.EPSG4326:`
`184`	`179`	`{`
`185`	`180`	`// Assuming 2x1 tile grid at zoom level 0`
`186`	`181`	`unitsWidth = 360;`
`@@ -320,12 +315,12 @@ private static XmlAttribute CreateProfileAttribute(XmlDocument doc, string? srs)`
`320`	`315`
`321`	`316`	`switch (srs)`
`322`	`317`	`{`
`323`		`- case Utils.SrsCodes.EPSG3857:`
	`318`	`+ case SrsCodes.EPSG3857:`
`324`	`319`	`{`
`325`	`320`	`profileAttribute.Value = Identifiers.ProfileGlobalMercator;`
`326`	`321`	`break;`
`327`	`322`	`}`
`328`		`- case Utils.SrsCodes.EPSG4326:`
	`323`	`+ case SrsCodes.EPSG4326:`
`329`	`324`	`{`
`330`	`325`	`profileAttribute.Value = Identifiers.ProfileGlobalGeodetic;`
`331`	`326`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -41,14 +41,9 @@ public static bool IsFormatInList(IList<string> mediaTypes, string mediaType)`
`41`	`41`	`if (isFormatSupported)`
`42`	`42`	`{`
`43`	`43`	`var outputImage = ImageHelper.ConvertImageToFormat(imageContents, mediaType, quality);`
`44`		`- if (outputImage != null)`
`45`		`- {`
`46`		`- return new FileResponse { FileContents = outputImage, ContentType = mediaType };`
`47`		`- }`
`48`		`- else`
`49`		`- {`
`50`		`- return null;`
`51`		`- }`
	`44`	`+ return outputImage != null`
	`45`	`+ ? new FileResponse { FileContents = outputImage, ContentType = mediaType }`
	`46`	`+ : null;`
`52`	`47`	`}`
`53`	`48`	`else`
`54`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -157,21 +157,21 @@ public static double TileCoordinateYAtZoom(double latitude, int zoomLevel) =>`
`157`	`157`
`158`	`158`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`159`	`159`	`public static double LongitudeToPixelXAtZoom(double longitude, int zoomLevel) =>`
`160`		`- LongitudeToPixelX(longitude, (double)MapSize(zoomLevel, DefaultTileSize));`
	`160`	`+ LongitudeToPixelX(longitude, MapSize(zoomLevel, DefaultTileSize));`
`161`	`161`
`162`	`162`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`163`	`163`	`public static double LatitudeToPixelYAtZoom(double latitude, int zoomLevel) =>`
`164`		`- LatitudeToPixelY(latitude, (double)MapSize(zoomLevel, DefaultTileSize));`
	`164`	`+ LatitudeToPixelY(latitude, MapSize(zoomLevel, DefaultTileSize));`
`165`	`165`
`166`	`166`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`167`	`167`	`public static double LongitudeToPixelX(double longitude, double mapSize) =>`
`168`		`- ((longitude + 180.0) / 360.0) * mapSize;`
	`168`	`+ ((longitude + 180) / 360) * mapSize;`
`169`	`169`
`170`	`170`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`171`	`171`	`public static double LatitudeToPixelY(double latitude, double mapSize)`
`172`	`172`	`{`
`173`	`173`	`var sinLatitude = Math.Sin(MathHelper.DegreesToRadians(latitude));`
`174`		`- return (0.5 - Math.Log((1.0 + sinLatitude) / (1.0 - sinLatitude)) / (4.0 * Math.PI)) * mapSize;`
	`174`	`+ return (0.5 - Math.Log((1 + sinLatitude) / (1 - sinLatitude)) / (4 * Math.PI)) * mapSize;`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`@@ -180,16 +180,16 @@ public static double PixelXToLongitude(double pixelX, int zoomLevel)`
`180`	`180`	`var mapSize = (double)MapSize(zoomLevel, DefaultTileSize);`
`181`	`181`	`var x = (MathHelper.Clip(pixelX, 0.0, mapSize) / mapSize) - 0.5;`
`182`	`182`
`183`		`- return 360.0 * x;`
	`183`	`+ return 360 * x;`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`187`	`187`	`public static double PixelYToLatitude(double pixelY, int zoomLevel)`
`188`	`188`	`{`
`189`	`189`	`var mapSize = (double)MapSize(zoomLevel, DefaultTileSize);`
`190`		`- var y = 0.5 - (MathHelper.Clip(pixelY, 0.0, mapSize) / mapSize);`
	`190`	`+ var y = 0.5 - (MathHelper.Clip(pixelY, 0, mapSize) / mapSize);`
`191`	`191`
`192`		`- return 90.0 - 360.0 * Math.Atan(Math.Exp(-y * 2.0 * Math.PI)) / Math.PI;`
	`192`	`+ return 90 - 360 * Math.Atan(Math.Exp(-y * 2 * Math.PI)) / Math.PI;`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`	`}`