Fix circular dependencies

Author: Jan Kumer

src/layer/AbstractLayer.ts

@@ -31,6 +31,7 @@ interface ConstructorParameters {
 }
 
 export class AbstractLayer {
+  public type = 'AbstractLayer';
   public title: string | null = null;
   public description: string | null = null;
   public readonly dataset: Dataset | null = null;

src/layer/AbstractSentinelHubV1OrV2Layer.ts

@@ -38,6 +38,7 @@ interface ConstructorParameters {
 
 // this class provides any SHv1- or SHv2-specific (EO Cloud) functionality to the subclasses:
 export class AbstractSentinelHubV1OrV2Layer extends AbstractLayer {
+  public readonly type = 'AbstractSentinelHubV1OrV2Layer';
   protected instanceId: string;
   protected layerId: string;
   protected evalscript: string | null;

src/layer/AbstractSentinelHubV3Layer.ts

@@ -52,6 +52,7 @@ export class AbstractSentinelHubV3Layer extends AbstractLayer {
   protected evalscript: string | null;
   protected evalscriptUrl: string | null;
   protected dataProduct: DataProductId | null;
+  public readonly type: 'AbstractSentinelHubV3Layer';
   public legend?: any[] | null;
   public mosaickingOrder: MosaickingOrder | null; // public because ProcessingDataFusionLayer needs to read it directly
   public upsampling: Interpolator | null;

src/layer/WmsLayer.ts

@@ -17,6 +17,7 @@ interface ConstructorParameters {
 }
 
 export class WmsLayer extends AbstractLayer {
+  public readonly type = 'WmsLayer';
   // The URL of the WMS service, for example: "https://services.sentinel-hub.com/ogc/wms/<instance-id>/"
   protected baseUrl: string;
   protected layerId: string;

src/layer/WmtsLayer.ts

@@ -27,6 +27,7 @@ interface ConstructorParameters {
 }
 
 export class WmtsLayer extends AbstractLayer {
+  public readonly type = 'WmtsLayer';
   protected baseUrl: string;
   protected layerId: string;
   protected resourceUrl: string;

src/layer/const.ts

@@ -282,3 +282,7 @@ export const PLANET_FALSE_COLOR_TEMPLATES = [
   { description: '', titleSuffix: 'TGI', resourceUrlParams: { proc: 'tgi' } },
   { description: '', titleSuffix: 'CIR', resourceUrlParams: { proc: 'cir' } },
 ];
+
+export const EQUATOR_RADIUS = 6378137.0;
+export const DEGREE_TO_RADIAN = Math.PI / 180;
+export const RADIAN_TO_DEGREE = 180 / Math.PI;

src/layer/utils.ts

@@ -1,11 +1,10 @@
 import axios, { AxiosRequestConfig } from 'axios';
 import { stringify, parseUrl, stringifyUrl } from 'query-string';
 import { parseStringPromise } from 'xml2js';
-
-import { OgcServiceTypes, SH_SERVICE_HOSTNAMES_V3, SH_SERVICE_ROOT_URL } from './const';
+import { EQUATOR_RADIUS, OgcServiceTypes, SH_SERVICE_HOSTNAMES_V3, SH_SERVICE_ROOT_URL } from './const';
 import { getAxiosReqParams, RequestConfiguration } from '../utils/cancelRequests';
 import { CACHE_CONFIG_30MIN, CACHE_CONFIG_30MIN_MEMORY } from '../utils/cacheHandlers';
-import { EQUATOR_RADIUS, GetCapabilitiesWmtsXml } from './wmts.utils';
+import type { GetCapabilitiesWmtsXml } from './wmts.utils';
 import { getAuthToken } from '../auth';
 import { BBox } from '../bbox';
 import { CRS_EPSG3857 } from '../crs';

src/layer/wmts.utils.ts

@@ -1,13 +1,9 @@
 import { RequestConfiguration } from '..';
 import { BBox } from '../bbox';
 import { CRS_EPSG3857, CRS_EPSG4326 } from '../crs';
-import { OgcServiceTypes } from './const';
+import { DEGREE_TO_RADIAN, EQUATOR_RADIUS, OgcServiceTypes, RADIAN_TO_DEGREE } from './const';
 import { fetchGetCapabilitiesXml, GetCapabilitiesXmlLayer } from './utils';
 
-const DEGREE_TO_RADIAN = Math.PI / 180;
-const RADIAN_TO_DEGREE = 180 / Math.PI;
-export const EQUATOR_RADIUS = 6378137.0;
-
 export type GetCapabilitiesWmtsXml = {
   Capabilities: {
     'ows:ServiceIdentification': any[][];

src/statistics/Fis.ts

@@ -3,13 +3,13 @@ import moment from 'moment';
 import WKT from 'terraformer-wkt-parser';
 import { RequestConfiguration } from '../utils/cancelRequests';
 import { CRS_EPSG4326, CRS_WGS84, findCrsFromUrn } from '../crs';
-import { AbstractLayer } from '../layer/AbstractLayer';
-import { AbstractSentinelHubV1OrV2Layer } from '../layer/AbstractSentinelHubV1OrV2Layer';
-import { AbstractSentinelHubV3Layer } from '../layer/AbstractSentinelHubV3Layer';
+import type { AbstractLayer } from '../layer/AbstractLayer';
+import type { AbstractSentinelHubV1OrV2Layer } from '../layer/AbstractSentinelHubV1OrV2Layer';
+import type { AbstractSentinelHubV3Layer } from '../layer/AbstractSentinelHubV3Layer';
 import { FisPayload, FisResponse, GetStatsParams, HistogramType } from '../layer/const';
 import { CACHE_CONFIG_NOCACHE } from '../utils/cacheHandlers';
 import { getAxiosReqParams } from '../utils/cancelRequests';
-import { StatisticsProvider } from './StatisticsProvider';
+import type { StatisticsProvider } from './StatisticsProvider';
 import { StatisticalApiResponse } from './const';
 
 export class Fis implements StatisticsProvider {
@@ -63,8 +63,8 @@ export class Fis implements StatisticsProvider {
       } else {
         payload.evalscript = Buffer.from(layer.getEvalscript(), 'utf8').toString('base64');
       }
-      if (layer instanceof AbstractSentinelHubV1OrV2Layer) {
-        payload.evalsource = layer.getEvalsource();
+      if (layer.type === 'AbstractSentinelHubV1OrV2Layer') {
+        payload.evalsource = (layer as AbstractSentinelHubV1OrV2Layer).getEvalsource();
       }
     }
     return payload;
@@ -86,10 +86,10 @@ export class Fis implements StatisticsProvider {
     params: GetStatsParams,
     reqConfig?: RequestConfiguration,
   ): Promise<FisResponse> {
-    if (layer instanceof AbstractSentinelHubV3Layer) {
-      return this.handleV3(layer, params, reqConfig);
-    } else if (layer instanceof AbstractSentinelHubV1OrV2Layer) {
-      return this.handleV1orV2(layer, params, reqConfig);
+    if (layer.type === 'AbstractSentinelHubV3Layer') {
+      return this.handleV3(layer as AbstractSentinelHubV3Layer, params, reqConfig);
+    } else if (layer.type === 'AbstractSentinelHubV1OrV2Layer') {
+      return this.handleV1orV2(layer as AbstractSentinelHubV1OrV2Layer, params, reqConfig);
     } else {
       throw new Error('Not supported');
     }