Merge pull request #5512 from nasa-gibs/release

Release to Main v4.50.0
nasa-gibs · Oct 17, 2024 · cfdc4d6 · cfdc4d6
2 parents fa9cd09 + 01ce19a
commit cfdc4d6
Show file tree

Hide file tree

Showing 56 changed files with 1,451 additions and 909 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18.16.1
+20.18.0
diff --git a/Dockerfile b/Dockerfile
@@ -19,7 +19,7 @@ RUN dnf install -y epel-release && \
     xz
 RUN mkdir -p /usr/local/nvm
 ENV NVM_DIR=/usr/local/nvm
-ENV NODE_VERSION=20.16.0
+ENV NODE_VERSION=20.18.0
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash && \
     . "$NVM_DIR/nvm.sh" && \
     nvm install v${NODE_VERSION} && \

diff --git a/...fault/common/config/wv.json/layers/tempo/TEMPO_L2_Cloud_Cloud_Fraction_Total_Granule.json b/...fault/common/config/wv.json/layers/tempo/TEMPO_L2_Cloud_Cloud_Fraction_Total_Granule.json
@@ -11,9 +11,10 @@
       "type": "granule",
       "period": "subdaily",
       "count": 1,
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:41:03Z",
-      "disableSnapshot": true
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/...fault/common/config/wv.json/layers/tempo/TEMPO_L2_Cloud_Cloud_Pressure_Total_Granule.json b/...fault/common/config/wv.json/layers/tempo/TEMPO_L2_Cloud_Cloud_Pressure_Total_Granule.json
@@ -11,10 +11,10 @@
       "type": "granule",
       "period": "subdaily",
       "count": 1,
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:41:03Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/...ult/common/config/wv.json/layers/tempo/TEMPO_L2_Formaldehyde_Vertical_Column_Granule.json b/...ult/common/config/wv.json/layers/tempo/TEMPO_L2_Formaldehyde_Vertical_Column_Granule.json
@@ -11,10 +11,10 @@
       "type": "granule",
       "period": "subdaily",
       "count": 1,
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:41:03Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/...common/config/wv.json/layers/tempo/TEMPO_L2_NO2_Vertical_Column_Stratosphere_Granule.json b/...common/config/wv.json/layers/tempo/TEMPO_L2_NO2_Vertical_Column_Stratosphere_Granule.json
@@ -11,10 +11,10 @@
       "type": "granule",
       "period": "subdaily",
       "count": 1,
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:41:03Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/.../common/config/wv.json/layers/tempo/TEMPO_L2_NO2_Vertical_Column_Troposphere_Granule.json b/.../common/config/wv.json/layers/tempo/TEMPO_L2_NO2_Vertical_Column_Troposphere_Granule.json
@@ -11,10 +11,10 @@
       "type": "granule",
       "period": "subdaily",
       "count": 1,
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:41:03Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L2_Ozone_Cloud_Fraction_Granule.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L2_Ozone_Cloud_Fraction_Granule.json
@@ -11,10 +11,10 @@
       "type": "granule",
       "period": "subdaily",
       "count": 1,
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:41:03Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L2_Ozone_Column_Amount_Granule.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L2_Ozone_Column_Amount_Granule.json
@@ -11,10 +11,10 @@
       "type": "granule",
       "period": "subdaily",
       "count": 1,
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:41:03Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/...g/default/common/config/wv.json/layers/tempo/TEMPO_L2_Ozone_UV_Aerosol_Index_Granule.json b/...g/default/common/config/wv.json/layers/tempo/TEMPO_L2_Ozone_UV_Aerosol_Index_Granule.json
@@ -11,10 +11,10 @@
       "type": "granule",
       "period": "subdaily",
       "count": 1,
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:41:03Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Cloud_Cloud_Fraction_Total.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Cloud_Cloud_Fraction_Total.json
@@ -8,9 +8,10 @@
       "tags": "",
       "group": "overlays",
       "layergroup": "Cloud Fraction",
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:30:00Z",
-      "disableSnapshot": true
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Cloud_Cloud_Pressure_Total.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Cloud_Cloud_Pressure_Total.json
@@ -8,10 +8,10 @@
       "tags": "",
       "group": "overlays",
       "layergroup": "Cloud Pressure",
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:30:00Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Formaldehyde_Vertical_Column.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Formaldehyde_Vertical_Column.json
@@ -8,10 +8,10 @@
       "tags": "",
       "group": "overlays",
       "layergroup": "Formaldehyde",
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:30:00Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/...default/common/config/wv.json/layers/tempo/TEMPO_L3_NO2_Vertical_Column_Stratosphere.json b/...default/common/config/wv.json/layers/tempo/TEMPO_L3_NO2_Vertical_Column_Stratosphere.json
@@ -8,10 +8,10 @@
       "tags": "",
       "group": "overlays",
       "layergroup": "Nitrogen Dioxide",
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:30:00Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/.../default/common/config/wv.json/layers/tempo/TEMPO_L3_NO2_Vertical_Column_Troposphere.json b/.../default/common/config/wv.json/layers/tempo/TEMPO_L3_NO2_Vertical_Column_Troposphere.json
@@ -8,10 +8,10 @@
       "tags": "",
       "group": "overlays",
       "layergroup": "Nitrogen Dioxide",
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:30:00Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_Cloud_Fraction.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_Cloud_Fraction.json
@@ -8,10 +8,10 @@
       "tags": "",
       "group": "overlays",
       "layergroup": "Ozone",
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:30:00Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_Column_Amount.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_Column_Amount.json
@@ -8,10 +8,10 @@
       "tags": "",
       "group": "overlays",
       "layergroup": "Ozone",
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:30:00Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_UV_Aerosol_Index.json b/config/default/common/config/wv.json/layers/tempo/TEMPO_L3_Ozone_UV_Aerosol_Index.json
@@ -8,10 +8,10 @@
       "tags": "",
       "group": "overlays",
       "layergroup": "Aerosol Index",
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "startDate": "2024-05-13T10:30:00Z",
-      "disableSnapshot": true
-
+      "disableSnapshot": true,
+      "shiftadjacentdays": false
     }
   }
 }
diff --git a/...wv.json/layers/viirs/noaa20/VIIRS_NOAA20_CorrectedReflectance_BandsM11-I2-I1_Granule.json b/...wv.json/layers/viirs/noaa20/VIIRS_NOAA20_CorrectedReflectance_BandsM11-I2-I1_Granule.json
@@ -7,7 +7,7 @@
           "group":    "overlays",
           "layergroup": "Granules",
           "type": "granule",
-          "cmrAvailability": true,
+          "dataAvailability": "dd",
           "period": "subdaily",
           "associatedLayers": ["VIIRS_NOAA20_CorrectedReflectance_BandsM11-I2-I1"],
           "availability": {

diff --git a/...wv.json/layers/viirs/noaa20/VIIRS_NOAA20_CorrectedReflectance_BandsM3-I3-M11_Granule.json b/...wv.json/layers/viirs/noaa20/VIIRS_NOAA20_CorrectedReflectance_BandsM3-I3-M11_Granule.json
@@ -7,7 +7,7 @@
           "group":    "overlays",
           "layergroup": "Granules",
           "type": "granule",
-          "cmrAvailability": true,
+          "dataAvailability": "dd",
           "period": "subdaily",
           "associatedLayers": ["VIIRS_NOAA20_CorrectedReflectance_BandsM3-I3-M11"],
           "availability": {

diff --git a/...nfig/wv.json/layers/viirs/noaa20/VIIRS_NOAA20_CorrectedReflectance_TrueColor_Granule.json b/...nfig/wv.json/layers/viirs/noaa20/VIIRS_NOAA20_CorrectedReflectance_TrueColor_Granule.json
@@ -7,7 +7,7 @@
           "group":    "overlays",
           "layergroup": "Granules",
           "type": "granule",
-          "cmrAvailability": true,
+          "dataAvailability": "dd",
           "period": "subdaily",
           "associatedLayers": ["VIIRS_NOAA20_CorrectedReflectance_TrueColor"],
           "availability": {

diff --git a/...fig/wv.json/layers/viirs/snpp/VIIRS_SNPP_CorrectedReflectance_BandsM11-I2-I1_Granule.json b/...fig/wv.json/layers/viirs/snpp/VIIRS_SNPP_CorrectedReflectance_BandsM11-I2-I1_Granule.json
@@ -7,7 +7,7 @@
           "group":    "overlays",
           "layergroup": "Granules",
           "type": "granule",
-          "cmrAvailability": true,
+          "dataAvailability": "dd",
           "period": "subdaily",
           "associatedLayers": ["VIIRS_SNPP_CorrectedReflectance_BandsM11-I2-I1"],
           "availability": {

diff --git a/...fig/wv.json/layers/viirs/snpp/VIIRS_SNPP_CorrectedReflectance_BandsM3-I3-M11_Granule.json b/...fig/wv.json/layers/viirs/snpp/VIIRS_SNPP_CorrectedReflectance_BandsM3-I3-M11_Granule.json
@@ -7,7 +7,7 @@
           "group":    "overlays",
           "layergroup": "Granules",
           "type": "granule",
-          "cmrAvailability": true,
+          "dataAvailability": "dd",
           "period": "subdaily",
           "associatedLayers": ["VIIRS_SNPP_CorrectedReflectance_BandsM3-I3-M11"],
           "availability": {

diff --git a/...n/config/wv.json/layers/viirs/snpp/VIIRS_SNPP_CorrectedReflectance_TrueColor_Granule.json b/...n/config/wv.json/layers/viirs/snpp/VIIRS_SNPP_CorrectedReflectance_TrueColor_Granule.json
@@ -7,7 +7,7 @@
           "group":    "overlays",
           "layergroup": "Granules",
           "type": "granule",
-          "cmrAvailability": true,
+          "dataAvailability": "dd",
           "period": "subdaily",
           "associatedLayers": ["VIIRS_SNPP_CorrectedReflectance_TrueColor"],
           "availability": {

diff --git a/doc/config/layers.md b/doc/config/layers.md
@@ -112,7 +112,8 @@ Example:
     * dateInterval - Number of days (or minutes for subdaily layers)
 * **temporal**: Used to override the layer temporal availability declared in the capabilities document. Note: Changing the temporal availability can cause missing layer coverage within the interface for layers tiles that aren't available from the source at the revised temporal range. This option can be added as a string with the new availability range. For example, `"1981-10-13/2019-10-11/P1M"`.
 * **count**: Used to override the default number of granules displayed on the map and in the granule count slider component for granule layers.
-* **cmrAvailability**: Boolean - Whether or not to use the CMR API for data availability.
+* **dataAvailability**: String - `cmr` or `dd`. Get the layer's data availability from either the CMR API or GIBS DescribeDomains request.
+* **shiftadjacentdays**: Boolean - Whether or not to shift granules across the dateline when they're for an adjacent day. Defaults to `true` when `null` or `undefined`.
 
 ## Full Example
 
@@ -136,7 +137,7 @@ Example:
         "id": "AIRS_RH400_A"
       },
       "temporal": "1981-10-13/2019-10-11/P1M",
-      "cmrAvailability": false
+      "dataAvailability": "dd"
     }
   }
 }
@@ -164,7 +165,7 @@ Granule layers will require specific configuration options within the `config/wv
       ],
       "ongoing": true,
       "type": "granule",
-      "cmrAvailability": true,
+      "dataAvailability": "dd",
       "period": "subdaily",
       "count": 1
     }

diff --git a/e2e/features/charting/charting-test.spec.js b/e2e/features/charting/charting-test.spec.js
@@ -73,12 +73,10 @@ test('Select an Area of Interest works appropriately', async () => {
   const isChartingEnabled = await page.$('#chart-toggle-button')
   if (isChartingEnabled) {
     await page.locator('#chart-toggle-button').click()
-    const aoiIcon = page.locator('#wv-charting-mode-container > div.charting-aoi-container > h3')
-    await expect(aoiIcon).toHaveText('Select Area of Interest')
-    await page.locator('#wv-charting-mode-container > div.charting-aoi-container > svg').click()
-    await page.mouse.click(300, 300)
-    await page.mouse.click(400, 400)
-    await expect(aoiIcon).toHaveText('Area of Interest Selected')
+    const aoiBtn = page.locator('#wv-charting-mode-container > div.charting-aoi-container > .edit-coordinates')
+    await expect(aoiBtn).toHaveText('Entire Screen')
+    await aoiBtn.click()
+    await expect(aoiBtn).toHaveText('Area Selected')
   }
 })
 
@@ -96,12 +94,12 @@ test('Confirm defaults for time span selection', async () => {
   }
 })
 
-test('Calendar icon opens datepicker modal', async () => {
+test('Date selector opens datepicker modal', async () => {
   await page.goto(multipleDataLayers)
   const isChartingEnabled = await page.$('#chart-toggle-button')
   if (isChartingEnabled) {
     await page.locator('#chart-toggle-button').click()
-    await page.locator('#charting-calendar-container > svg').click()
+    await page.locator('#charting-date-button').click()
     const chartingDateModal = page.locator('#charting_date_modal > div > div > div.modal-header > h5')
     await expect(chartingDateModal).toHaveText('Charting Mode Date Selection')
   }
@@ -116,7 +114,7 @@ test('Info modal opens on mode start & on icon click', async () => {
     await expect(infoModal).toHaveText('Charting Tool')
     await page.locator('#charting_info_modal > div > div > div.modal-header > button').click()
     await expect(infoModal).toHaveCount(0)
-    await page.locator('#charting-info-container > svg').click()
+    await page.locator('#charting-info-container svg').click()
     await expect(infoModal).toHaveText('Charting Tool')
   }
 })