From 8a5bb6d1879d8e72333019f2195788ae5a16989e Mon Sep 17 00:00:00 2001
From: Mitja Kuscer <mitja.kuscer@sinergise.com>
Date: Mon, 23 Sep 2024 14:07:19 +0200
Subject: [PATCH] Update data products

---
 .../__tests__/fixtures.makeLayersSHv3.ts      | 32 +++++++------------
 src/layer/const.ts                            |  2 +-
 src/layer/utils.ts                            |  4 ++-
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/layer/__tests__/fixtures.makeLayersSHv3.ts b/src/layer/__tests__/fixtures.makeLayersSHv3.ts
index 346fe2a4..3c92283c 100644
--- a/src/layer/__tests__/fixtures.makeLayersSHv3.ts
+++ b/src/layer/__tests__/fixtures.makeLayersSHv3.ts
@@ -2,7 +2,6 @@ import { DATASET_S2L2A } from '../dataset';
 
 export const getLayersFromConfigurationService = [
   {
-    '@id': 'https://services.sentinel-hub.com/api/v2/configuration/instances/instanceId/layers/1_TRUE_COLOR',
     id: '1_TRUE_COLOR',
     title: 'True color',
     description: 'Based on bands 4,3,2',
@@ -14,11 +13,9 @@ export const getLayersFromConfigurationService = [
       },
     ],
     orderHint: 0,
-    instance: {
-      '@id': 'https://services.sentinel-hub.com/api/v2/configuration/instances/instanceId',
-    },
-    dataset: { '@id': 'https://services.sentinel-hub.com/configuration/v1/datasets/S2L2A' },
-    datasetSource: { '@id': 'https://services.sentinel-hub.com/configuration/v1/datasets/S2L2A/sources/2' },
+    instanceId: 'instanceId',
+    collectionType: 'S2L2A',
+    datasetSourceIdId: '2',
     defaultStyleName: 'default',
     datasourceDefaults: {
       temporal: false,
@@ -27,7 +24,6 @@ export const getLayersFromConfigurationService = [
     },
   },
   {
-    '@id': 'https://services.sentinel-hub.com/api/v2/configuration/instances/instanceId/layers/8-NDSI',
     id: '8-NDSI',
     title: 'NDSI',
     description: 'Based on combination of bands (B3 - B11)/(B3 + B11)',
@@ -40,11 +36,9 @@ export const getLayersFromConfigurationService = [
       },
     ],
     orderHint: 70,
-    instance: {
-      '@id': 'https://services.sentinel-hub.com/api/v2/configuration/instances/instanceId',
-    },
-    dataset: { '@id': 'https://services.sentinel-hub.com/configuration/v1/datasets/S2L2A' },
-    datasetSource: { '@id': 'https://services.sentinel-hub.com/configuration/v1/datasets/S2L2A/sources/2' },
+    instanceId: 'instanceId',
+    collectionType: 'S2L2A',
+    datasetSourceId: '2',
     defaultStyleName: 'default',
     datasourceDefaults: {
       upsampling: 'NEAREST',
@@ -56,7 +50,6 @@ export const getLayersFromConfigurationService = [
     },
   },
   {
-    '@id': 'https://services.sentinel-hub.com/api/v2/configuration/instances/instanceId',
     id: 'B8A',
     title: 'B8A',
     description: 'Band 8A - Vegetation Red Edge - 865 nm|#bc0e10',
@@ -65,17 +58,14 @@ export const getLayersFromConfigurationService = [
         name: 'default',
         description: 'Default layer style',
         dataProduct: {
-          '@id':
-            'https://services.sentinel-hub.com/configuration/v1/datasets/S2L2A/dataproducts/dataProductId',
+          id: 'dataProductId',
         },
       },
     ],
     orderHint: 0,
-    instance: {
-      '@id': 'https://services.sentinel-hub.com/api/v2/configuration/instances/instanceId',
-    },
-    dataset: { '@id': 'https://services.sentinel-hub.com/configuration/v1/datasets/S2L2A' },
-    datasetSource: { '@id': 'https://services.sentinel-hub.com/configuration/v1/datasets/S2L2A/sources/2' },
+    instanceId: 'instanceId',
+    collectionType: 'S2L2A',
+    datasetSourceId: '2',
     defaultStyleName: 'default',
     datasourceDefaults: {
       mosaickingOrder: 'mostRecent',
@@ -215,7 +205,7 @@ export const expectedResultConfigurationService = (
     evalscript: null as string,
     evalscriptUrl: null as string,
     dataProduct:
-      'https://services.sentinel-hub.com/configuration/v1/datasets/S2L2A/dataproducts/dataProductId',
+      'https://services.sentinel-hub.com/api/v2/configuration/datasets/S2L2A/dataproducts/dataProductId',
     upsampling: null as string,
     downsampling: null as string,
     mosaickingOrder: 'mostRecent',
diff --git a/src/layer/const.ts b/src/layer/const.ts
index 44c70f12..25577d01 100644
--- a/src/layer/const.ts
+++ b/src/layer/const.ts
@@ -235,7 +235,7 @@ export const DEFAULT_FIND_TILES_MAX_COUNT_PARAMETER = 50;
 export type DataProductId = string;
 
 export const SUPPORTED_DATA_PRODUCTS_PROCESSING: DataProductId[] = [
-  'https://services.sentinel-hub.com/configuration/v1/datasets/S2L1C/dataproducts/643',
+  'https://services.sentinel-hub.com/api/v2/configuration/datasets/S2L1C/dataproducts/643',
 ];
 
 export type BYOCBand = {
diff --git a/src/layer/utils.ts b/src/layer/utils.ts
index 47447eec..1ff67c08 100644
--- a/src/layer/utils.ts
+++ b/src/layer/utils.ts
@@ -229,7 +229,9 @@ export async function fetchLayerParamsFromConfigurationService(
       maxCloudCoverPercent: l.datasourceDefaults.maxCloudCoverage,
     }),
     evalscript: l.styles[0].evalScript,
-    dataProduct: l.styles[0].dataProduct ? l.styles[0].dataProduct['@id'] : undefined,
+    dataProduct: l.styles[0].dataProduct
+      ? `${configurationServiceHostName}api/v2/configuration/datasets/${l.collectionType}/dataproducts/${l.styles[0].dataProduct['id']}`
+      : undefined,
     legend: l.styles.find((s: any) => s.name === l.defaultStyleName)
       ? l.styles.find((s: any) => s.name === l.defaultStyleName).legend
       : null,