make explicit type for predefinedEffects in Layer classes

sentinel-hub · May 18, 2020 · a372b22 · a372b22
1 parent 69091f5
commit a372b22
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/layer/AbstractLayer.ts b/src/layer/AbstractLayer.ts
@@ -8,6 +8,8 @@ import { CRS_EPSG4326 } from 'src/crs';
 import { GetMapParams, ApiType, PaginatedTiles, FlyoverInterval } from 'src/layer/const';
 import { Dataset } from 'src/layer/dataset';
 import { getAxiosReqParams, RequestConfiguration } from 'src/utils/cancelRequests';
+
+import { PredefinedEffects } from 'src/mapDataManipulation/const';
 import { runPredefinedEffectFunctions } from 'src/mapDataManipulation/runPredefinedEffectFunctions';
 
 interface ConstructorParameters {
@@ -41,13 +43,15 @@ export class AbstractLayer {
         //    were sent to the services in getMapUrl()
         // This is a dirty fix, but gain and gamma need to be removed from the parameters in getMap() so the
         //   errors in getMapUrl() are not triggered.
-        let gain, gamma;
+
+        let predefinedEffects: PredefinedEffects = {};
+
         if (params.gain) {
-          gain = params.gain;
+          predefinedEffects.gain = params.gain;
           params.gain = undefined;
         }
         if (params.gamma) {
-          gamma = params.gamma;
+          predefinedEffects.gamma = params.gamma;
           params.gamma = undefined;
         }
 
@@ -60,7 +64,7 @@ export class AbstractLayer {
         };
         const response = await axios.get(url, requestConfig);
         let blob = response.data;
-        blob = await runPredefinedEffectFunctions(blob, { gain: gain, gamma: gamma });
+        blob = await runPredefinedEffectFunctions(blob, predefinedEffects);
 
         return blob;
       default:

diff --git a/src/layer/AbstractSentinelHubV3Layer.ts b/src/layer/AbstractSentinelHubV3Layer.ts
@@ -22,6 +22,8 @@ import { processingGetMap, createProcessingPayload, ProcessingPayload } from 'sr
 import { AbstractLayer } from 'src/layer/AbstractLayer';
 import { CRS_EPSG4326, findCrsFromUrn } from 'src/crs';
 import { getAxiosReqParams, RequestConfiguration } from '../utils/cancelRequests';
+
+import { PredefinedEffects } from 'src/mapDataManipulation/const';
 import { runPredefinedEffectFunctions } from 'src/mapDataManipulation/runPredefinedEffectFunctions';
 
 interface ConstructorParameters {
@@ -210,7 +212,9 @@ export class AbstractSentinelHubV3Layer extends AbstractLayer {
       const shServiceHostname = this.getShServiceHostname();
 
       let blob = await processingGetMap(shServiceHostname, updatedPayload, reqConfig);
-      blob = await runPredefinedEffectFunctions(blob, { gain: params.gain, gamma: params.gamma });
+
+      let predefinedEffects: PredefinedEffects = { gain: params.gain, gamma: params.gamma };
+      blob = await runPredefinedEffectFunctions(blob, predefinedEffects);
 
       return blob;
     }