Make it easier to get to the "upload polygon" option #618 WIP refactor

Author: cugarteblair

web-client/src/db/SlideRuleDb.ts

@@ -124,7 +124,7 @@ function getServerParams(request:SrRequestRecord): SrSvrParmsUsed|SrSvrParmsPoly
             return {} as NullReqParams;
         }
     } catch (error) {
-        console.error(`Failed to get svr_parms for req_id ${request.req_id}:`, error);
+        console.error(`Failed to get svr_parms for req_id ${request.req_id}:`, error, ' for request:', request);
         throw error;
     }
 }

web-client/src/sliderule/icesat2.ts

@@ -90,7 +90,7 @@ export async function atlxx(func:string,atlxxReqParams: AtlxxReqParams, callback
     try {
         let sanityCheck = false;
         const hasFilter = (atlxxReqParams.parms.rgt && (atlxxReqParams.parms.cycle || atlxxReqParams.parms.region || (atlxxReqParams.parms.t0 && atlxxReqParams.parms.t1)));
-        const hasPolygon = (atlxxReqParams.parms.poly && atlxxReqParams.parms.poly.length > 0) || (atlxxReqParams.parms.geojson.feature.geometry);
+        const hasPolygon = (atlxxReqParams.parms.poly && atlxxReqParams.parms.poly.length > 0) || (atlxxReqParams.parms.region_mask);
         if(func.includes('atl13')){
             const hasMapPin = atlxxReqParams.parms.atl13?.coord && atlxxReqParams.parms.atl13?.coord?.lon && atlxxReqParams.parms.atl13?.coord?.lat;
             sanityCheck = (hasMapPin || hasPolygon );

web-client/src/stores/reqParamsStore.ts

@@ -491,7 +491,10 @@ const createReqParamsStore = (id: string) =>
           console.log('getAtlReqParams: geojsonStore.getReqGeoJsonData():', geojsonStore.getReqGeoJsonData());
           if(geojsonStore.getReqGeoJsonData() != null){
             if(geojsonStore.reqHasPoly()) {
-              req.geojson = geojsonStore.getReqGeoJsonData();
+              req.region_mask = {
+                  geojson: JSON.stringify(geojsonStore.getReqGeoJsonData()),
+                  cellsize: this.getRasterizePolyCellSize(),
+              };
             }
           }
           if(this.passInvalid) {

web-client/src/utils/SrDuckDb.ts

@@ -402,8 +402,15 @@ async getJsonMetaDataForKey(
                     if (keyString === key) {
                         try {
                             parsedMetadata = JSON.parse(valueString);
-                            formattedMetadata = JSON.stringify(parsedMetadata, null, 2);
                             //console.log(`getJsonMetaDataForKey Formatted ${keyString} Metadata:`, formattedMetadata);
+                          try {
+                              formattedMetadata = JSON.stringify(parsedMetadata, null, 2);
+                              //console.log(`getJsonMetaDataForKey Formatted ${keyString} Metadata:`, formattedMetadata);
+                          } catch (stringifyError) {
+                              console.error(`getJsonMetaDataForKey Error stringifying JSON of ${keyString} valueString:`,valueString);
+                              console.error(`getJsonMetaDataForKey Error stringifying JSON of ${keyString} metadata:`,parsedMetadata);
+                              console.error(`getJsonMetaDataForKey Error stringifying JSON of ${keyString} error:`, stringifyError);
+                          }
                         } catch (parseError) {
                             console.error(`getJsonMetaDataForKey Error parsing JSON of ${keyString} valueString:`,valueString);
                             console.error(`getJsonMetaDataForKey Error parsing JSON of ${keyString} metadata:`,parsedMetadata);
@@ -451,9 +458,9 @@ async getJsonMetaDataForKey(
 
     async getServerReqFromMetaData(parquetFilePath: string): Promise<string | undefined> {
       const thisMetaData = await this.getJsonMetaDataForKey('sliderule', parquetFilePath, true);
-      //console.log('getServerReqFromMetaData thisMetaData:', thisMetaData);
-      //console.log('getServerReqFromMetaData thisMetaData.formattedMetadata:', thisMetaData.formattedMetadata);
-      //console.log('getServerReqFromMetaData thisMetaData.parsedMetadata:', thisMetaData.parsedMetadata);
+      console.log('getServerReqFromMetaData thisMetaData:', thisMetaData);
+      console.log('getServerReqFromMetaData thisMetaData.formattedMetadata:', thisMetaData.formattedMetadata);
+      console.log('getServerReqFromMetaData thisMetaData.parsedMetadata:', thisMetaData.parsedMetadata);
       if (thisMetaData.parsedMetadata) {
         if (thisMetaData.parsedMetadata.recordinfo) {
           console.log('getServerReqFromMetaData thisMetaData.parsedMetadata.recordinfo:', thisMetaData.parsedMetadata.recordinfo);

web-client/src/utils/SrDuckDbUtils.ts

@@ -603,6 +603,7 @@ export async function duckDbLoadOpfsParquetFile(fileName: string): Promise<any>
         const endTime = performance.now(); // End time
         console.log(`duckDbLoadOpfsParquetFile took ${endTime - startTime} milliseconds.`);
     }
+    console.log('duckDbLoadOpfsParquetFile serverReq:', serverReq);
     return serverReq;   
 }