From c1ed6b815210d96f80aa6451c4f87c3d0f0039b8 Mon Sep 17 00:00:00 2001
From: Hanbyul Jo <hanbyul@nyu.edu>
Date: Wed, 11 Sep 2024 09:10:44 -0500
Subject: [PATCH 1/3] Use sourceparams as it is when it is there

---
 .../exploration/data-utils-no-faux-module.ts  | 33 ++++++-------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/app/scripts/components/exploration/data-utils-no-faux-module.ts b/app/scripts/components/exploration/data-utils-no-faux-module.ts
index 3bf0d5c66..f85245b26 100644
--- a/app/scripts/components/exploration/data-utils-no-faux-module.ts
+++ b/app/scripts/components/exploration/data-utils-no-faux-module.ts
@@ -174,35 +174,22 @@ export function resolveRenderParams(
   datasetSourceParams: Record<string, any> | undefined,
   queryDataRenders: Record<string, any> | undefined
 ): Record<string, any> | undefined {
-  let renderParams: Record<string, any> | undefined;
   // Start with sourceParams from the dataset.
+  // Return the source param as it is if exists
   if (hasValidSourceParams(datasetSourceParams)) {
-    renderParams = datasetSourceParams;
+    return datasetSourceParams;
   }
 
   // Check for the dashboard render configuration in queryData if not defined.
-  if (!renderParams && queryDataRenders?.dashboard) {
-    renderParams = queryDataRenders.dashboard;
-
-    if (renderParams?.rescale) {
-      renderParams.rescale = flattenAndCalculateMinMax([renderParams.rescale]);
-    }
-  }
-
-  // Check for asset-specific renders using the sourceParams' assets property.
-  if (!renderParams && queryDataRenders?.[datasetSourceParams?.assets]) {
-    renderParams = queryDataRenders[datasetSourceParams?.assets];
-
-    if (renderParams?.rescale) {
-      renderParams.rescale = flattenAndCalculateMinMax(renderParams.rescale);
-    }
-  }
-
-  if (renderParams?.rescale) {
-    renderParams.rescale = flattenAndCalculateMinMax(renderParams.rescale);
+  const renderKey = queryDataRenders?.dashboard? 'dashboard' : datasetSourceParams?.assets;
+  if (!queryDataRenders?.[renderKey]) throw new Error ('No proper render parameter exists.');
+  if (queryDataRenders[renderKey] && hasValidSourceParams(queryDataRenders[renderKey])) {
+    const renderParams = queryDataRenders.dashboard;
+    return {
+      ...renderParams,
+      rescale: flattenAndCalculateMinMax([renderParams.rescale])
+    };
   }
-
-  return renderParams;
 }
 
 export function getTimeDensityStartDate(date: Date, timeDensity: TimeDensity) {

From c4d137b2d38097329af1aebbcb58b1da404a355d Mon Sep 17 00:00:00 2001
From: Hanbyul Jo <hanbyul@nyu.edu>
Date: Thu, 12 Sep 2024 14:48:02 -0400
Subject: [PATCH 2/3] Reflect comments

---
 .../exploration/data-utils-no-faux-module.ts        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/scripts/components/exploration/data-utils-no-faux-module.ts b/app/scripts/components/exploration/data-utils-no-faux-module.ts
index f85245b26..2708a5352 100644
--- a/app/scripts/components/exploration/data-utils-no-faux-module.ts
+++ b/app/scripts/components/exploration/data-utils-no-faux-module.ts
@@ -180,11 +180,16 @@ export function resolveRenderParams(
     return datasetSourceParams;
   }
 
-  // Check for the dashboard render configuration in queryData if not defined.
-  const renderKey = queryDataRenders?.dashboard? 'dashboard' : datasetSourceParams?.assets;
-  if (!queryDataRenders?.[renderKey]) throw new Error ('No proper render parameter exists.');
+  // Check for the dashboard render configuration in queryData
+  if (!queryDataRenders) throw new Error ('No proper render parameter exists.');
+
+  // Check the namespace from render extension
+  const renderKey = queryDataRenders.dashboard? 'dashboard' : datasetSourceParams?.assets;
+  if (!queryDataRenders[renderKey]) throw new Error ('No proper render parameter exists.');
+
+  // Return the render extension parameter
   if (queryDataRenders[renderKey] && hasValidSourceParams(queryDataRenders[renderKey])) {
-    const renderParams = queryDataRenders.dashboard;
+    const renderParams = queryDataRenders[renderKey];
     return {
       ...renderParams,
       rescale: flattenAndCalculateMinMax([renderParams.rescale])

From 778d327c873010bb472f40cdd5efaeb9bd952368 Mon Sep 17 00:00:00 2001
From: Hanbyul Jo <hanbyul@nyu.edu>
Date: Fri, 13 Sep 2024 13:15:57 -0400
Subject: [PATCH 3/3] Change error message per case

---
 .../components/exploration/data-utils-no-faux-module.ts       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/scripts/components/exploration/data-utils-no-faux-module.ts b/app/scripts/components/exploration/data-utils-no-faux-module.ts
index 2708a5352..79bda5f3f 100644
--- a/app/scripts/components/exploration/data-utils-no-faux-module.ts
+++ b/app/scripts/components/exploration/data-utils-no-faux-module.ts
@@ -181,11 +181,11 @@ export function resolveRenderParams(
   }
 
   // Check for the dashboard render configuration in queryData
-  if (!queryDataRenders) throw new Error ('No proper render parameter exists.');
+  if (!queryDataRenders) throw new Error ('No render parameter exists from stac endpoint.');
 
   // Check the namespace from render extension
   const renderKey = queryDataRenders.dashboard? 'dashboard' : datasetSourceParams?.assets;
-  if (!queryDataRenders[renderKey]) throw new Error ('No proper render parameter exists.');
+  if (!queryDataRenders[renderKey]) throw new Error ('No proper render parameter for dashboard namespace exists.');
 
   // Return the render extension parameter
   if (queryDataRenders[renderKey] && hasValidSourceParams(queryDataRenders[renderKey])) {