feat: tilejson metadata endpoints and tests (#20) (#255)

* feat: tilejson metadata endpoints and tests

include ongoing refactor adjustments and test fixes

* chore: format code

---------

Co-authored-by: Mike McDougall <[email protected]>

Author: mikemcdougall

README.md

@@ -28,6 +28,8 @@ Current entrypoints:
 - `/ogc/tiles`
 - `/odata`
 - `/tiles/{layerId}/{z}/{x}/{y}.mvt`
+- `/tiles/{layerId}/tile.json`
+- `/api/styles/{layerId}.json`
 - `/openapi.json`
 
 ## Quick Start
@@ -61,14 +63,15 @@ Implemented (server + admin API):
 - OGC API Tiles: tilesets metadata + vector tiles.
 - OData v4: CRUD with spatial functions (`geo.distance`, `geo.intersects`); $batch/$apply/$search endpoints exist with limited coverage.
 - Vector tiles (MVT): PostGIS `ST_AsMVT` via `/tiles/{layerId}/{z}/{x}/{y}.mvt`.
+- TileJSON metadata: `/tiles/{layerId}/tile.json` with MapLibre style discovery.
+- Public MapLibre styles: `/api/styles/{layerId}.json`.
 - File import: GeoJSON, Shapefile, GeoPackage, CSV (lat/lon or WKT), KML/KMZ — no GDAL required.
 - CRS support: PostGIS-based reprojection, EPSG via `spatial_ref_sys`, auto-detect from source files.
 - Admin APIs: connections, services/layers/relationships/styles, import jobs, operations progress.
 - OIDC authentication (server-side plumbing) and optional Redis metadata cache.
 - .NET Aspire local dev orchestration with dashboard (traces, logs, metrics, health).
 
 Pending MVP items (open issues):
-- TileJSON metadata endpoint (#20).
 - Service enable/disable controls (#58).
 - Admin UI (project setup, connections, publishing, health dashboard, map preview) (#25, #26, #27, #42, #43).
 - Embedded Maputnik style editor (#30).

docs/API_EXAMPLES.md

@@ -389,7 +389,11 @@ curl "http://localhost:8080/rest/services/1/FeatureServer/0/tiles/10/163/395.pbf
 
 ```bash
 # Get TileJSON metadata for the layer
-curl "http://localhost:8080/rest/services/1/FeatureServer/0/tiles/metadata" \
+curl "http://localhost:8080/tiles/0/tile.json" \
+  -H "Accept: application/json"
+
+# Get MapLibre style JSON for the layer
+curl "http://localhost:8080/api/styles/0.json" \
   -H "Accept: application/json"
 ```
 

src/Honua.Core/Features/Import/Domain/EsriImportRequest.cs

@@ -27,6 +27,11 @@ public sealed record EsriDiscoveryRequest
 /// </summary>
 public sealed record EsriImportRequest
 {
+    /// <summary>
+    /// Optional job identifier for progress tracking.
+    /// </summary>
+    public string? JobId { get; init; }
+
     /// <summary>
     /// The base URL of the ArcGIS Server service.
     /// </summary>

src/Honua.Core/Features/Import/Domain/ImportRequest.cs

@@ -49,12 +49,14 @@ public sealed record ImportRequest
     /// <exception cref="InvalidOperationException">Thrown when neither FileStream nor CloudFileId is provided</exception>
     public void Validate()
     {
-        if (FileStream == null && string.IsNullOrEmpty(CloudFileId))
+        var cloudFileId = string.IsNullOrWhiteSpace(CloudFileId) ? null : CloudFileId;
+
+        if (FileStream == null && cloudFileId == null)
         {
             throw new InvalidOperationException("Either FileStream or CloudFileId must be provided.");
         }
 
-        if (FileStream != null && !string.IsNullOrEmpty(CloudFileId))
+        if (FileStream != null && cloudFileId != null)
         {
             throw new InvalidOperationException("Only one of FileStream or CloudFileId should be provided, not both.");
         }
@@ -63,5 +65,5 @@ public void Validate()
     /// <summary>
     /// Gets a value indicating whether this request uses cloud storage
     /// </summary>
-    public bool UsesCloudStorage => !string.IsNullOrEmpty(CloudFileId);
+    public bool UsesCloudStorage => !string.IsNullOrWhiteSpace(CloudFileId);
 }

src/Honua.Core/Features/Infrastructure/IO/DelegatingStream.cs

@@ -0,0 +1,80 @@
+// Copyright (c) Honua. All rights reserved.
+// Licensed under the Elastic License 2.0. See LICENSE in the project root.
+
+namespace Honua.Core.Features.Infrastructure.IO;
+
+/// <summary>
+/// Stream wrapper that forwards operations to an inner stream.
+/// </summary>
+public abstract class DelegatingStream : Stream
+{
+    /// <inheritdoc/>
+    protected DelegatingStream(Stream inner)
+    {
+        Inner = inner ?? throw new ArgumentNullException(nameof(inner));
+    }
+
+    /// <summary>
+    /// The wrapped stream.
+    /// </summary>
+    protected Stream Inner { get; }
+
+    /// <inheritdoc/>
+    public override bool CanRead => Inner.CanRead;
+
+    /// <inheritdoc/>
+    public override bool CanSeek => Inner.CanSeek;
+
+    /// <inheritdoc/>
+    public override bool CanWrite => Inner.CanWrite;
+
+    /// <inheritdoc/>
+    public override long Length => Inner.Length;
+
+    /// <inheritdoc/>
+    public override long Position
+    {
+        get => Inner.Position;
+        set => Inner.Position = value;
+    }
+
+    /// <inheritdoc/>
+    public override void Flush() => Inner.Flush();
+
+    /// <inheritdoc/>
+    public override Task FlushAsync(CancellationToken cancellationToken) => Inner.FlushAsync(cancellationToken);
+
+    /// <inheritdoc/>
+    public override int Read(byte[] buffer, int offset, int count) => Inner.Read(buffer, offset, count);
+
+    /// <inheritdoc/>
+    public override int Read(Span<byte> buffer) => Inner.Read(buffer);
+
+    /// <inheritdoc/>
+    public override Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) =>
+        Inner.ReadAsync(buffer, offset, count, cancellationToken);
+
+    /// <inheritdoc/>
+    public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default) =>
+        Inner.ReadAsync(buffer, cancellationToken);
+
+    /// <inheritdoc/>
+    public override long Seek(long offset, SeekOrigin origin) => Inner.Seek(offset, origin);
+
+    /// <inheritdoc/>
+    public override void SetLength(long value) => Inner.SetLength(value);
+
+    /// <inheritdoc/>
+    public override void Write(byte[] buffer, int offset, int count) => Inner.Write(buffer, offset, count);
+
+    /// <inheritdoc/>
+    public override void Write(ReadOnlySpan<byte> buffer) => Inner.Write(buffer);
+
+    /// <inheritdoc/>
+    public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) =>
+        Inner.WriteAsync(buffer, offset, count, cancellationToken);
+
+    /// <inheritdoc/>
+    public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default) =>
+        Inner.WriteAsync(buffer, cancellationToken);
+}

src/Honua.Core/Features/Infrastructure/Memory/PooledGeometryProcessor.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Honua. All rights reserved.
 // Licensed under the Elastic License 2.0. See LICENSE in the project root.
 
+using Honua.Core.Features.Infrastructure.IO;
 using NetTopologySuite.Geometries;
 using NetTopologySuite.IO;
 
@@ -113,40 +114,13 @@ public static byte[] WriteWkbWithPooling(NetTopologySuite.Geometries.Geometry ge
         return new WKBWriter().Write(geometry);
     }
 
-    private sealed class NonClosingStream : Stream
+    private sealed class NonClosingStream : DelegatingStream
     {
-        private readonly Stream _inner;
-
         public NonClosingStream(Stream inner)
+            : base(inner)
         {
-            _inner = inner ?? throw new ArgumentNullException(nameof(inner));
-        }
-
-        public override bool CanRead => _inner.CanRead;
-        public override bool CanSeek => _inner.CanSeek;
-        public override bool CanWrite => _inner.CanWrite;
-        public override long Length => _inner.Length;
-
-        public override long Position
-        {
-            get => _inner.Position;
-            set => _inner.Position = value;
         }
 
-        public override void Flush() => _inner.Flush();
-
-        public override int Read(byte[] buffer, int offset, int count)
-            => _inner.Read(buffer, offset, count);
-
-        public override long Seek(long offset, SeekOrigin origin)
-            => _inner.Seek(offset, origin);
-
-        public override void SetLength(long value)
-            => _inner.SetLength(value);
-
-        public override void Write(byte[] buffer, int offset, int count)
-            => _inner.Write(buffer, offset, count);
-
         protected override void Dispose(bool disposing)
         {
             // Suppress disposing the inner stream; base.Dispose is a no-op.

src/Honua.Core/Features/Shared/Models/JsonElementConverter.cs

@@ -0,0 +1,52 @@
+// Copyright (c) Honua. All rights reserved.
+// Licensed under the Elastic License 2.0. See LICENSE in the project root.
+
+using System.Text.Json;
+
+namespace Honua.Core.Features.Shared.Models;
+
+/// <summary>
+/// Helpers for converting <see cref="JsonElement"/> values into CLR objects.
+/// </summary>
+public static class JsonElementConverter
+{
+    /// <summary>
+    /// Converts a <see cref="JsonElement"/> into a CLR object, expanding arrays and objects recursively.
+    /// </summary>
+    public static object? ConvertToObject(JsonElement element)
+    {
+        return element.ValueKind switch
+        {
+            JsonValueKind.String => element.GetString(),
+            JsonValueKind.Number => element.TryGetInt64(out var longVal) ? longVal :
+                element.TryGetDouble(out var doubleVal) ? doubleVal :
+                element.GetDecimal(),
+            JsonValueKind.True => true,
+            JsonValueKind.False => false,
+            JsonValueKind.Null => null,
+            JsonValueKind.Object => element.EnumerateObject()
+                .ToDictionary(prop => prop.Name, prop => ConvertToObject(prop.Value)),
+            JsonValueKind.Array => element.EnumerateArray().Select(ConvertToObject).ToArray(),
+            _ => element.GetRawText()
+        };
+    }
+
+    /// <summary>
+    /// Converts a <see cref="JsonElement"/> into a CLR scalar when possible.
+    /// Non-scalar values are returned as the original element.
+    /// </summary>
+    public static object? ConvertToScalar(JsonElement element)
+    {
+        return element.ValueKind switch
+        {
+            JsonValueKind.String => element.GetString(),
+            JsonValueKind.Number => element.TryGetInt64(out var longVal) ? longVal :
+                element.TryGetDouble(out var doubleVal) ? doubleVal :
+                element.GetDecimal(),
+            JsonValueKind.True => true,
+            JsonValueKind.False => false,
+            JsonValueKind.Null => null,
+            _ => element
+        };
+    }
+}

src/Honua.Core/Queries/Filters/Cql2/Cql2JsonParser.cs

@@ -190,7 +190,7 @@ private FilterExpression ParseOperation(string opValue, JsonElement argsElement)
             }
 
             var negate = normalizedLower.StartsWith("not", StringComparison.Ordinal);
-            return BuildBetweenExpression(expressions[0], expressions[1], expressions[2], negate);
+            return FilterExpressionHelpers.BuildBetweenExpression(expressions[0], expressions[1], expressions[2], negate);
         }
 
         if (normalizedLower is "=" or "==" or "!=" or "<>" or "<" or "<=" or ">" or ">=")
@@ -354,22 +354,6 @@ private List<FilterExpression> ParseArguments(JsonElement argsElement)
         return expressions;
     }
 
-    private static BinaryExpression BuildBetweenExpression(FilterExpression target, FilterExpression lower, FilterExpression upper, bool negate)
-    {
-        var lowerExpr = new BinaryExpression(target, BinaryOperator.GreaterThanOrEqual, lower);
-        var upperExpr = new BinaryExpression(target, BinaryOperator.LessThanOrEqual, upper);
-        var combined = new BinaryExpression(lowerExpr, BinaryOperator.And, upperExpr);
-
-        if (!negate)
-        {
-            return combined;
-        }
-
-        var lowerNot = new BinaryExpression(target, BinaryOperator.LessThan, lower);
-        var upperNot = new BinaryExpression(target, BinaryOperator.GreaterThan, upper);
-        return new BinaryExpression(lowerNot, BinaryOperator.Or, upperNot);
-    }
-
     private ArrayLiteral ParseArrayLiteral(JsonElement element)
     {
         var values = new List<FilterExpression>();

src/Honua.Core/Queries/Filters/Cql2/Cql2Parser.cs

@@ -180,7 +180,7 @@ private FilterExpression ParseComparisonPredicate()
             var lower = ParseScalarExpression();
             Consume(Cql2TokenType.And, "Expected AND in BETWEEN predicate");
             var upper = ParseScalarExpression();
-            return BuildBetweenExpression(left, lower, upper, negate: true);
+            return FilterExpressionHelpers.BuildBetweenExpression(left, lower, upper, negate: true);
         }
 
         // BETWEEN
@@ -189,7 +189,7 @@ private FilterExpression ParseComparisonPredicate()
             var lower = ParseScalarExpression();
             Consume(Cql2TokenType.And, "Expected AND in BETWEEN predicate");
             var upper = ParseScalarExpression();
-            return BuildBetweenExpression(left, lower, upper, negate: false);
+            return FilterExpressionHelpers.BuildBetweenExpression(left, lower, upper, negate: false);
         }
 
         // NOT IN
@@ -237,22 +237,6 @@ private ValueList ParseInList()
         return new ValueList(values);
     }
 
-    private BinaryExpression BuildBetweenExpression(FilterExpression target, FilterExpression lower, FilterExpression upper, bool negate)
-    {
-        var lowerExpr = new BinaryExpression(target, BinaryOperator.GreaterThanOrEqual, lower);
-        var upperExpr = new BinaryExpression(target, BinaryOperator.LessThanOrEqual, upper);
-        var combined = new BinaryExpression(lowerExpr, BinaryOperator.And, upperExpr);
-
-        if (!negate)
-        {
-            return combined;
-        }
-
-        var lowerNot = new BinaryExpression(target, BinaryOperator.LessThan, lower);
-        var upperNot = new BinaryExpression(target, BinaryOperator.GreaterThan, upper);
-        return new BinaryExpression(lowerNot, BinaryOperator.Or, upperNot);
-    }
-
     private FilterExpression ParseScalarExpression()
     {
         if (IsTemporalLiteralStart())

src/Honua.Core/Queries/Filters/FilterExpressionHelpers.cs

@@ -0,0 +1,27 @@
+// Copyright (c) Honua. All rights reserved.
+// Licensed under the Elastic License 2.0. See LICENSE in the project root.
+
+namespace Honua.Core.Queries.Filters;
+
+internal static class FilterExpressionHelpers
+{
+    internal static BinaryExpression BuildBetweenExpression(
+        FilterExpression target,
+        FilterExpression lower,
+        FilterExpression upper,
+        bool negate)
+    {
+        var lowerExpr = new BinaryExpression(target, BinaryOperator.GreaterThanOrEqual, lower);
+        var upperExpr = new BinaryExpression(target, BinaryOperator.LessThanOrEqual, upper);
+        var combined = new BinaryExpression(lowerExpr, BinaryOperator.And, upperExpr);
+
+        if (!negate)
+        {
+            return combined;
+        }
+
+        var lowerNot = new BinaryExpression(target, BinaryOperator.LessThan, lower);
+        var upperNot = new BinaryExpression(target, BinaryOperator.GreaterThan, upper);
+        return new BinaryExpression(lowerNot, BinaryOperator.Or, upperNot);
+    }
+}