ogcopenapis 1.0.2 → 1.1.0

package/src/OgcOpenApiStyleTools.ts

@@ -173,7 +173,7 @@ class OgcOpenApiStyleTools {
         if (link) return link.href;
         const self = collection.links.find(l => l.rel === "self");
         const collectionHref = self ? self.href : capabilities.baseUrl + "collections/" + collection.id;
-        return OgcOpenApiFetchTools.cleanUrl(collectionHref) + "styles";
+        return OgcOpenApiFetchTools.appendPath(collectionHref, "styles");
     }
 
     private static withJsonFormat(href: string) {

package/src/OgcOpenApiTileMatrixTools.ts

@@ -74,6 +74,19 @@ class OgcOpenApiTileMatrixTools {
         return {level, x: tileCol, y};
     }
 
+    /**
+     * The tiles of the dataset limited to some of its collections (OGC API Tiles, collections selection):
+     * collections=a,b. A comma inside an id is encoded, the commas between ids are not. A collections parameter
+     * that the URL already has is replaced. Without collections, the URL is returned as is.
+     */
+    public static setCollections(url: string, collections?: string[]): string {
+        if (!collections || collections.length === 0) return url;
+        const [base, query] = url.split(/\?(.*)/s);
+        const kept = query ? query.split("&").filter(p => p !== "" && decodeURIComponent(p.split("=")[0]) !== "collections") : [];
+        kept.push("collections=" + collections.map(c => encodeURIComponent(c)).join(","));
+        return base + "?" + kept.join("&");
+    }
+
     public static appendQueryParameters(url: string, parameters: { [key: string]: string | number | boolean | undefined }): string {
         const query = Object.keys(parameters)
             .filter(k => parameters[k] !== undefined && parameters[k] !== null)

package/src/OgcOpenApiTilesModel.ts

@@ -19,6 +19,9 @@ export interface OgcOpenApiTilesModelOptions {
     requestHeaders?: { [p: string]: string };
     transparent?: boolean;
     bgcolor?: string;
+    // For a tileset of the dataset: only these collections in each tile. The server must support collections
+    // selection, see OgcOpenApiGetCapabilities.supportsCollectionSelection
+    collections?: string[];
 
     proxify?: ProxifyFunction
 }
@@ -43,6 +46,7 @@ export class OgcOpenApiTilesModel extends WMTSTileSetModel {
     private transparent: boolean;
     private bgcolor: string | undefined;
     private proxy: ProxifyFunction;
+    private collections: string[] | undefined;
     private tileMatrixSetLimits: TileMatrixLimits[] | undefined;
     // Not tileMatrices: WMTSTileSetModel keeps the tile matrix ids in that property
     private ogcTileMatrices: { id: string, matrixHeight: number }[];
@@ -109,6 +113,7 @@ export class OgcOpenApiTilesModel extends WMTSTileSetModel {
         this.tileMatrixSetLimits = options.tileMatrixSetLimits;
         this.transparent = typeof options.transparent !== "undefined" ? options.transparent : true;
         this.bgcolor = options.bgcolor;
+        this.collections = options.collections;
 
         this.proxy = options.proxify;
 
@@ -127,10 +132,10 @@ export class OgcOpenApiTilesModel extends WMTSTileSetModel {
             OgcOpenApiTileMatrixTools.resolveTileTemplate(this.ogcTemplate, this.tileGrid, tile) :
             super.getTileURL(baseURL, tile);
         if (targetUrl === null) return null;
-        let tileUrl = OgcOpenApiTileMatrixTools.appendQueryParameters(targetUrl, {
+        let tileUrl = OgcOpenApiTileMatrixTools.setCollections(OgcOpenApiTileMatrixTools.appendQueryParameters(targetUrl, {
             transparent: this.transparent,
             bgcolor: this.transparent ? undefined : this.bgcolor
-        });
+        }), this.collections);
         if (typeof this.proxy === "function") {
             const proxyfied = this.proxy(tileUrl, {});
             tileUrl = proxyfied.url;

package/src/OgcOpenApiVectorTilesModel.ts

@@ -19,6 +19,9 @@ export interface OgcOpenApiVectorTilesModelOptions {
     tileMatrixSetLimits?: TileMatrixLimits[];
     // The data extent, defaults to the extent of the tile matrix set
     bounds?: Bounds;
+    // For a tileset of the dataset: only these collections in each tile. The server must support collections
+    // selection, see OgcOpenApiGetCapabilities.supportsCollectionSelection
+    collections?: string[];
     styleUrl?: string;
 
     proxify?: ProxifyFunction
@@ -51,7 +54,7 @@ export class OgcOpenApiVectorTilesModel extends MapboxVectorTileSetModel {
             requestHeaders: options.requestHeaders ? options.requestHeaders : {},
         });
         this.tileGrid = tileGrid;
-        this.tileTemplate = options.baseURL;
+        this.tileTemplate = OgcOpenApiTileMatrixTools.setCollections(options.baseURL, options.collections);
         this.serverOptions = OgcOpenApiFetchTools.createFetchOptions({originalUrl: options.baseURL, proxify: options.proxify});
         this.tileMatrixSetLimits = options.tileMatrixSetLimits;
     }