From 758721177a3da259670bbb3ed8e2bd2271159d66 Mon Sep 17 00:00:00 2001 From: Richard Kettelerij Date: Thu, 2 Nov 2023 16:46:52 +0100 Subject: [PATCH] Support explicit call to layer.json --- ogc/geovolumes/main.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ogc/geovolumes/main.go b/ogc/geovolumes/main.go index a9ab64ad..5b730468 100644 --- a/ogc/geovolumes/main.go +++ b/ogc/geovolumes/main.go @@ -35,6 +35,7 @@ func NewThreeDimensionalGeoVolumes(e *engine.Engine, router *chi.Mux) *ThreeDime // DTM/Quantized Mesh router.Get(geospatial.CollectionsPath+"/{3dContainerId}/quantized-mesh", geoVolumes.CollectionContent("layer.json")) + router.Get(geospatial.CollectionsPath+"/{3dContainerId}/quantized-mesh/{explicitTileSet}.json", geoVolumes.ExplicitTileset()) router.Get(geospatial.CollectionsPath+"/{3dContainerId}/quantized-mesh/{tileMatrix}/{tileRow}/{tileColAndSuffix}", geoVolumes.Tile()) router.Get(geospatial.CollectionsPath+"/{3dContainerId}/quantized-mesh/{tilePathPrefix}/{tileMatrix}/{tileRow}/{tileColAndSuffix}", geoVolumes.Tile()) @@ -46,7 +47,7 @@ func NewThreeDimensionalGeoVolumes(e *engine.Engine, router *chi.Mux) *ThreeDime return geoVolumes } -// CollectionContent reverse proxy to tileserver for tileset.json OGC 3D Tiles manifest, separate +// CollectionContent reverse proxy to tileserver for tileset.json OGC 3D Tiles manifest (separate // spec from OGC 3D GeoVolumes) or the equivalent manifest (layer.json) for a quantized mesh func (t *ThreeDimensionalGeoVolumes) CollectionContent(fileName string) http.HandlerFunc { if !strings.HasSuffix(fileName, ".json") { @@ -57,8 +58,8 @@ func (t *ThreeDimensionalGeoVolumes) CollectionContent(fileName string) http.Han } } -// ExplicitTileset reverse proxy to tileserver for a specific JSON tileset (the latter contains -// data from OGC 3D Tiles, separate spec from OGC 3D GeoVolumes) +// ExplicitTileset reverse proxy to tileserver for specific tileset.json OGC 3D Tiles manifest (separate +// spec from OGC 3D GeoVolumes) or the equivalent manifest (layer.json) for a quantized mesh func (t *ThreeDimensionalGeoVolumes) ExplicitTileset() http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { tileSetName := chi.URLParam(r, "explicitTileSet")