fix: allows custom request params

terrestris · Jul 1, 2022 · f1bebd0 · f1bebd0
1 parent 8ea34b5
commit f1bebd0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/src/model/Layer.ts b/src/model/Layer.ts
@@ -3,7 +3,7 @@ import BaseEntity, { BaseEntityArgs } from './BaseEntity';
 import LayerType from './enum/LayerType';
 
 export interface DefaultRequestParams {
-  transparent?: boolean;
+  [key: string]: string | number | boolean;
 }
 
 export interface DefaultLayerSourceConfig {

diff --git a/src/parser/SHOGunApplicationUtil.ts b/src/parser/SHOGunApplicationUtil.ts
@@ -202,7 +202,7 @@ class SHOGunApplicationUtil<T extends Application, S extends Layer> {
       attribution,
       url,
       layerNames,
-      requestParams
+      requestParams = {'TRANSPARENT': true}
     } = layer.sourceConfig || {};
 
     const {
@@ -216,10 +216,7 @@ class SHOGunApplicationUtil<T extends Application, S extends Layer> {
       attributions: attribution,
       params: {
         'LAYERS': layerNames,
-        'TRANSPARENT':
-          requestParams?.transparent !== undefined
-            ? requestParams?.transparent
-            : true
+        ...requestParams
       },
       crossOrigin,
       imageLoadFunction: this.bearerTokenLoadFunction
@@ -244,7 +241,7 @@ class SHOGunApplicationUtil<T extends Application, S extends Layer> {
       tileSize = 256,
       tileOrigin,
       resolutions,
-      requestParams
+      requestParams = {'TRANSPARENT': true}
     } = layer.sourceConfig || {};
 
     const {
@@ -269,10 +266,7 @@ class SHOGunApplicationUtil<T extends Application, S extends Layer> {
       projection,
       params: {
         'LAYERS': layerNames,
-        'TRANSPARENT':
-          requestParams?.transparent !== undefined
-            ? requestParams?.transparent
-            : true
+        ...requestParams
       },
       crossOrigin,
       tileLoadFunction: this.bearerTokenLoadFunction
@@ -402,7 +396,6 @@ class SHOGunApplicationUtil<T extends Application, S extends Layer> {
     olLayer.set('propertyConfig', layer.clientConfig?.propertyConfig);
     olLayer.set('legendUrl', layer.sourceConfig.legendUrl);
     olLayer.set('hoverable', layer.clientConfig?.hoverable);
-    olLayer.set('transparent', layer.sourceConfig?.requestParams?.transparent);
   }
 
   private async bearerTokenLoadFunctionVector(opts: {