Interactive interface for browsing global, full-resolution satellite imagery
WV-4146: Remove Suomi NPP from Event defaults and on load default (#7047)
minniewong4c5988cab69e
diff --git a/config/default/common/config/wv.json/defaults.json b/config/default/common/config/wv.json/defaults.jsonindex 09e0b224d..af0b3e1c8 100644--- a/config/default/common/config/wv.json/defaults.json+++ b/config/default/common/config/wv.json/defaults.json@@ -9,10 +9,6 @@"id": "MODIS_Aqua_CorrectedReflectance_TrueColor","hidden": "true"},- {- "id": "VIIRS_SNPP_CorrectedReflectance_TrueColor",- "hidden": "true"- },{"id": "VIIRS_NOAA20_CorrectedReflectance_TrueColor","hidden": "true"diff --git a/config/default/common/config/wv.json/naturalEvents.json b/config/default/common/config/wv.json/naturalEvents.jsonindex 7eecc0ddf..edb07c361 100644--- a/config/default/common/config/wv.json/naturalEvents.json+++ b/config/default/common/config/wv.json/naturalEvents.json@@ -77,14 +77,6 @@"MODIS_Aqua_CorrectedReflectance_Bands721",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- false- ],- [- "VIIRS_NOAA21_CorrectedReflectance_BandsM11-I2-I1",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",false@@ -94,19 +86,19 @@false],[- "VIIRS_NOAA20_DayNightBand_At_Sensor_Radiance",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[- "VIIRS_NOAA20_DayNightBand_AtSensor_M15",+ "VIIRS_NOAA21_CorrectedReflectance_BandsM11-I2-I1",false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA20_DayNightBand_At_Sensor_Radiance",false],[- "VIIRS_SNPP_CorrectedReflectance_BandsM11-I2-I1",+ "VIIRS_NOAA20_DayNightBand_AtSensor_M15",false],[@@ -125,14 +117,6 @@"MODIS_Aqua_Thermal_Anomalies_Night",false],- [- "VIIRS_NOAA21_Thermal_Anomalies_375m_Day",- false- ],- [- "VIIRS_NOAA21_Thermal_Anomalies_375m_Night",- false- ],["VIIRS_NOAA20_Thermal_Anomalies_375m_Day",false@@ -142,11 +126,11 @@false],[- "VIIRS_SNPP_Thermal_Anomalies_375m_Day",+ "VIIRS_NOAA21_Thermal_Anomalies_375m_Day",false],[- "VIIRS_SNPP_Thermal_Anomalies_375m_Night",+ "VIIRS_NOAA21_Thermal_Anomalies_375m_Night",false],[@@ -183,16 +167,12 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[@@ -211,14 +191,6 @@"MODIS_Aqua_Brightness_Temp_Band31_Night",false],- [- "VIIRS_NOAA21_Brightness_Temp_BandI5_Day",- false- ],- [- "VIIRS_NOAA21_Brightness_Temp_BandI5_Night",- false- ],["VIIRS_NOAA20_Brightness_Temp_BandI5_Day",false@@ -228,11 +200,11 @@false],[- "VIIRS_SNPP_Brightness_Temp_BandI5_Day",+ "VIIRS_NOAA21_Brightness_Temp_BandI5_Day",false],[- "VIIRS_SNPP_Brightness_Temp_BandI5_Night",+ "VIIRS_NOAA21_Brightness_Temp_BandI5_Night",false],[@@ -248,7 +220,7 @@false],[- "VIIRS_SNPP_Sea_Ice",+ "VIIRS_NOAA21_Sea_Ice",false]],@@ -273,16 +245,12 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false]],@@ -307,16 +275,12 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- true- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",- false+ true],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false]],@@ -345,28 +309,20 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- true- ],- [- "VIIRS_NOAA21_CorrectedReflectance_BandsM3-I3-M11",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_BandsM3-I3-M11",false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_CorrectedReflectance_BandsM3-I3-M11",+ "VIIRS_NOAA21_CorrectedReflectance_BandsM3-I3-M11",false],[@@ -382,7 +338,7 @@false],[- "VIIRS_SNPP_NDSI_Snow_Cover",+ "VIIRS_NOAA21_NDSI_Snow_Cover",false]],@@ -395,16 +351,12 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[@@ -423,14 +375,6 @@"MODIS_Aqua_Thermal_Anomalies_Night",false],- [- "VIIRS_NOAA21_Thermal_Anomalies_375m_Day",- false- ],- [- "VIIRS_NOAA21_Thermal_Anomalies_375m_Night",- false- ],["VIIRS_NOAA20_Thermal_Anomalies_375m_Day",false@@ -440,11 +384,11 @@false],[- "VIIRS_SNPP_Thermal_Anomalies_375m_Day",+ "VIIRS_NOAA21_Thermal_Anomalies_375m_Day",false],[- "VIIRS_SNPP_Thermal_Anomalies_375m_Night",+ "VIIRS_NOAA21_Thermal_Anomalies_375m_Night",false],[@@ -479,14 +423,6 @@"MODIS_Aqua_CorrectedReflectance_Bands721",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- false- ],- [- "VIIRS_NOAA21_CorrectedReflectance_BandsM11-I2-I1",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",false@@ -496,19 +432,11 @@false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",- false- ],- [- "VIIRS_SNPP_CorrectedReflectance_BandsM11-I2-I1",- false- ],- [- "VIIRS_SNPP_DayNightBand_AtSensor_M15",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_DayNightBand_At_Sensor_Radiance",+ "VIIRS_NOAA21_CorrectedReflectance_BandsM11-I2-I1",false],[@@ -522,17 +450,17 @@["OMPS_NOAA20_NadirMapper_AerosolIndex_PyroCumuloNimbus_380",false- ],- [+ ],+ ["OMPS_NOAA20_NadirMapper_AerosolIndex_380",false- ],+ ],[- "OMPS_Aerosol_Index_PyroCumuloNimbus",+ "OMPS_NOAA21_NadirMapper_AerosolIndex_PyroCumuloNimbus_380",false],[- "OMPS_Aerosol_Index",+ "OMPS_NOAA21_NadirMapper_AerosolIndex_380",false],[@@ -551,14 +479,6 @@"MODIS_Aqua_Thermal_Anomalies_Night",false],- [- "VIIRS_NOAA21_Thermal_Anomalies_375m_Day",- false- ],- [- "VIIRS_NOAA21_Thermal_Anomalies_375m_Night",- false- ],["VIIRS_NOAA20_Thermal_Anomalies_375m_Day",false@@ -568,13 +488,17 @@false],[- "VIIRS_SNPP_Thermal_Anomalies_375m_Day",+ "VIIRS_NOAA21_Thermal_Anomalies_375m_Day",false],[- "VIIRS_SNPP_Thermal_Anomalies_375m_Night",+ "VIIRS_NOAA21_Thermal_Anomalies_375m_Night",false],+ [+ "Admin_Boundaries",+ true+ ],["DoS_International_Boundaries",true@@ -589,6 +513,10 @@]],"Sea and Lake Ice": [+ [+ "Admin_Boundaries",+ true+ ],["DoS_International_Boundaries",true@@ -609,24 +537,12 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",- false- ],- [- "VIIRS_SNPP_DayNightBand_AtSensor_M15",- false- ],- [- "VIIRS_SNPP_DayNightBand_At_Sensor_Radiance",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[@@ -653,14 +569,6 @@"MODIS_Aqua_Brightness_Temp_Band31_Night",false],- [- "VIIRS_NOAA21_Brightness_Temp_BandI5_Day",- false- ],- [- "VIIRS_NOAA21_Brightness_Temp_BandI5_Night",- false- ],["VIIRS_NOAA20_Brightness_Temp_BandI5_Day",false@@ -670,11 +578,11 @@false],[- "VIIRS_SNPP_Brightness_Temp_BandI5_Day",+ "VIIRS_NOAA21_Brightness_Temp_BandI5_Day",false],[- "VIIRS_SNPP_Brightness_Temp_BandI5_Night",+ "VIIRS_NOAA21_Brightness_Temp_BandI5_Night",false],[@@ -690,11 +598,15 @@false],[- "VIIRS_SNPP_Sea_Ice",+ "VIIRS_NOAA21_Sea_Ice",false]],"Floods": [+ [+ "Admin_Boundaries",+ true+ ],["DoS_International_Boundaries",true@@ -724,23 +636,19 @@false],[- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- false- ],- [- "VIIRS_NOAA21_CorrectedReflectance_BandsM11-I2-I1",+ "VIIRS_NOAA20_CorrectedReflectance_TrueColor",false],[- "VIIRS_NOAA20_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA20_CorrectedReflectance_BandsM11-I2-I1",false],[- "VIIRS_NOAA20_CorrectedReflectance_BandsM11-I2-I1",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_BandsM11-I2-I1",false],[@@ -781,6 +689,10 @@]],"Water Color": [+ [+ "Admin_Boundaries",+ true+ ],["DoS_International_Boundaries",true@@ -801,16 +713,12 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[@@ -821,21 +729,20 @@"MODIS_Aqua_L2_Chlorophyll_A",false],- [- "VIIRS_NOAA21_Chlorophyll_a",- false- ],["VIIRS_NOAA20_Chlorophyll_a",false],[- "VIIRS_SNPP_L2_Chlorophyll_A",+ "VIIRS_NOAA21_Chlorophyll_a",false]],"Severe Storms": [[+ "Admin_Boundaries",+ true+ ],["DoS_International_Boundaries",true],@@ -855,24 +762,12 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- true- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",- false- ],- [- "VIIRS_SNPP_CorrectedReflectance_TrueColor",- false- ],- [- "VIIRS_SNPP_DayNightBand_AtSensor_M15",- false+ true],[- "VIIRS_SNPP_DayNightBand_At_Sensor_Radiance",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[@@ -894,6 +789,9 @@],"Snow": [[+ "Admin_Boundaries",+ true+ ],["DoS_International_Boundaries",true],@@ -917,28 +815,20 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- true- ],- [- "VIIRS_NOAA21_CorrectedReflectance_BandsM3-I3-M11",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_BandsM3-I3-M11",false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_CorrectedReflectance_BandsM3-I3-M11",+ "VIIRS_NOAA21_CorrectedReflectance_BandsM3-I3-M11",false],[@@ -954,7 +844,7 @@false],[- "VIIRS_SNPP_NDSI_Snow_Cover",+ "VIIRS_NOAA21_NDSI_Snow_Cover",false],[@@ -975,16 +865,12 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[@@ -1011,22 +897,6 @@"OMPS_NOAA20_SO2_Planetary_Boundary_Layer",false],- [- "OMPS_SO2_Upper_Troposphere_and_Stratosphere",- false- ],- [- "OMPS_SO2_Middle_Troposphere",- false- ],- [- "OMPS_SO2_Lower_Troposphere",- true- ],- [- "OMPS_SO2_Planetary_Boundary_Layer",- false- ],["MODIS_Terra_Thermal_Anomalies_Day",true@@ -1043,14 +913,6 @@"MODIS_Aqua_Thermal_Anomalies_Night",false],- [- "VIIRS_NOAA21_Thermal_Anomalies_375m_Day",- false- ],- [- "VIIRS_NOAA21_Thermal_Anomalies_375m_Night",- false- ],["VIIRS_NOAA20_Thermal_Anomalies_375m_Day",false@@ -1060,19 +922,11 @@false],[- "VIIRS_SNPP_Thermal_Anomalies_375m_Day",- false- ],- [- "VIIRS_SNPP_Thermal_Anomalies_375m_Night",- false- ],- [- "VIIRS_SNPP_DayNightBand_AtSensor_M15",+ "VIIRS_NOAA21_Thermal_Anomalies_375m_Day",false],[- "VIIRS_SNPP_DayNightBand_At_Sensor_Radiance",+ "VIIRS_NOAA21_Thermal_Anomalies_375m_Night",false],[@@ -1083,6 +937,10 @@"VIIRS_NOAA20_DayNightBand_At_Sensor_Radiance",false],+ [+ "Admin_Boundaries",+ true+ ],["DoS_International_Boundaries",true@@ -1121,24 +979,12 @@"MODIS_Aqua_SurfaceReflectance_Bands121",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- true- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",- false- ],- [- "VIIRS_SNPP_CorrectedReflectance_TrueColor",- false- ],- [- "VIIRS_SNPP_DayNightBand_AtSensor_M15",- false+ true],[- "VIIRS_SNPP_DayNightBand_At_Sensor_Radiance",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[@@ -1159,16 +1005,12 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- true- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",- false+ true],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[@@ -1220,11 +1062,11 @@false],[- "OMPS_Aerosol_Index",+ "OMPS_NOAA20_NadirMapper_AerosolIndex_380",false],[- "OMPS_NOAA20_NadirMapper_AerosolIndex_380",+ "OMPS_NOAA21_NadirMapper_AerosolIndex_380",false]]@@ -1240,11 +1082,11 @@false],[- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",+ "MODIS_Aqua_CorrectedReflectance_TrueColor",false],[- "VIIRS_NOAA21_CorrectedReflectance_BandsM11-I2-I1",+ "MODIS_Aqua_CorrectedReflectance_Bands721",false],[@@ -1256,19 +1098,11 @@false],[- "MODIS_Aqua_CorrectedReflectance_TrueColor",- false- ],- [- "MODIS_Aqua_CorrectedReflectance_Bands721",- false- ],- [- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_CorrectedReflectance_BandsM11-I2-I1",+ "VIIRS_NOAA21_CorrectedReflectance_BandsM11-I2-I1",false],[@@ -1280,11 +1114,11 @@true],[- "VIIRS_NOAA21_Thermal_Anomalies_375m_Day",+ "MODIS_Aqua_Thermal_Anomalies_Day",false],[- "VIIRS_NOAA21_Thermal_Anomalies_375m_Night",+ "MODIS_Aqua_Thermal_Anomalies_Night",false],[@@ -1296,20 +1130,16 @@false],[- "MODIS_Aqua_Thermal_Anomalies_Day",- false- ],- [- "MODIS_Aqua_Thermal_Anomalies_Night",+ "VIIRS_NOAA21_Thermal_Anomalies_375m_Day",false],[- "VIIRS_SNPP_Thermal_Anomalies_375m_Day",+ "VIIRS_NOAA21_Thermal_Anomalies_375m_Night",false],[- "VIIRS_SNPP_Thermal_Anomalies_375m_Night",- false+ "Admin_Boundaries",+ true],["DoS_International_Boundaries",@@ -1326,6 +1156,9 @@],"Sea and Lake Ice": [[+ "Admin_Boundaries",+ true+ ],["DoS_International_Boundaries",true],@@ -1345,16 +1178,12 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[@@ -1373,14 +1202,6 @@"MODIS_Aqua_Brightness_Temp_Band31_Night",false],- [- "VIIRS_NOAA21_Brightness_Temp_BandI5_Day",- false- ],- [- "VIIRS_NOAA21_Brightness_Temp_BandI5_Night",- false- ],["VIIRS_NOAA20_Brightness_Temp_BandI5_Day",false@@ -1390,11 +1211,11 @@false],[- "VIIRS_SNPP_Brightness_Temp_BandI5_Day",+ "VIIRS_NOAA21_Brightness_Temp_BandI5_Day",false],[- "VIIRS_SNPP_Brightness_Temp_BandI5_Night",+ "VIIRS_NOAA21_Brightness_Temp_BandI5_Night",false],[@@ -1410,12 +1231,15 @@false],[- "VIIRS_SNPP_Sea_Ice",+ "VIIRS_NOAA21_Sea_Ice",false]],"Severe Storms": [[+ "Admin_Boundaries",+ true+ ],["DoS_International_Boundaries",true],@@ -1436,10 +1260,6 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_SNPP_CorrectedReflectance_TrueColor",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",false@@ -1474,28 +1294,20 @@"MODIS_Aqua_CorrectedReflectance_TrueColor",false],- [- "VIIRS_NOAA21_CorrectedReflectance_TrueColor",- true- ],- [- "VIIRS_NOAA21_CorrectedReflectance_BandsM3-I3-M11",- false- ],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_BandsM3-I3-M11",false],[- "VIIRS_SNPP_CorrectedReflectance_TrueColor",+ "VIIRS_NOAA21_CorrectedReflectance_TrueColor",false],[- "VIIRS_SNPP_CorrectedReflectance_BandsM3-I3-M11",+ "VIIRS_NOAA21_CorrectedReflectance_BandsM3-I3-M11",false],[@@ -1511,7 +1323,7 @@false],[- "VIIRS_SNPP_NDSI_Snow_Cover",+ "VIIRS_NOAA21_NDSI_Snow_Cover",false]]diff --git a/e2e/features/compare/compare-test.spec.js b/e2e/features/compare/compare-test.spec.jsindex a0ef8b7fb..e2d5db173 100644--- a/e2e/features/compare/compare-test.spec.js+++ b/e2e/features/compare/compare-test.spec.js@@ -105,8 +105,8 @@ test('Collapse layer list with B state and test label shows correct number of latest('If you exit A|B with B selection active, the active state will then be the B state', async () => {const { compareButton } = selectors- const correctedReflectanceSNPP = page.locator('#activeB-VIIRS_SNPP_CorrectedReflectance_TrueColor')- const closeReflectanceSNPP = page.locator('#close-activeBVIIRS_SNPP_CorrectedReflectance_TrueColor')+ const correctedReflectanceNOAA20 = page.locator('#activeB-VIIRS_NOAA20_CorrectedReflectance_TrueColor')+ const closeReflectanceNOAA20 = page.locator('#close-activeBVIIRS_NOAA20_CorrectedReflectance_TrueColor')const correctedReflectanceAqua = page.locator('#activeB-MODIS_Aqua_CorrectedReflectance_TrueColor')const closeReflectanceAqua = page.locator('#close-activeBMODIS_Aqua_CorrectedReflectance_TrueColor')const referenceLabels = page.locator('#activeB-Reference_Labels_15m')@@ -117,7 +117,7 @@ test('If you exit A|B with B selection active, the active state will then be theconst closeRefFeatures2 = page.locator('#close-activeBAdmin_Boundaries')const coastlines = page.locator('#activeB-Coastlines_15m')const correctedReflectanceTerra = page.locator('#activeB-MODIS_Terra_CorrectedReflectance_TrueColor')- await expect(correctedReflectanceSNPP).toBeVisible()+ await expect(correctedReflectanceNOAA20).toBeVisible()await expect(correctedReflectanceAqua).toBeVisible()await referenceLabels.hover()await closeRefLabels.click()@@ -125,13 +125,13 @@ test('If you exit A|B with B selection active, the active state will then be theawait closeRefFeatures.click()await referenceFeatures2.hover()await closeRefFeatures2.click()- await correctedReflectanceSNPP.hover()- await closeReflectanceSNPP.click()+ await correctedReflectanceNOAA20.hover()+ await closeReflectanceNOAA20.click()await correctedReflectanceAqua.hover()await closeReflectanceAqua.click()await compareButton.click()await expect(coastlines).toBeVisible()await expect(correctedReflectanceTerra).toBeVisible()- await expect(correctedReflectanceSNPP).not.toBeVisible()+ await expect(correctedReflectanceNOAA20).not.toBeVisible()await expect(correctedReflectanceAqua).not.toBeVisible()})diff --git a/e2e/features/compare/permalinks-test.spec.js b/e2e/features/compare/permalinks-test.spec.jsindex a2b5938c4..36a638e09 100644--- a/e2e/features/compare/permalinks-test.spec.js+++ b/e2e/features/compare/permalinks-test.spec.js@@ -62,7 +62,7 @@ test('A|B loaded with only one layer in A section -- Corrected Reflectance (Truetest('Click B tab to ensure that loaded layers are correct', async () => {const { bTab } = selectorsconst aquaLayer = page.locator('#activeB-MODIS_Aqua_CorrectedReflectance_TrueColor.layer-hidden')- const snppLayer = page.locator('#activeB-VIIRS_SNPP_CorrectedReflectance_TrueColor.layer-hidden')+ const noaa20Layer = page.locator('#activeB-VIIRS_NOAA20_CorrectedReflectance_TrueColor.layer-hidden')const refLabels = page.locator('#activeB-Reference_Labels_15m.layer-hidden')const refFeatures = page.locator('#activeB-DoS_International_Boundaries.layer-hidden')const refFeatures2 = page.locator('#activeB-Admin_Boundaries.layer-hidden')@@ -70,7 +70,7 @@ test('Click B tab to ensure that loaded layers are correct', async () => {const terraLayer = page.locator('#activeB-MODIS_Terra_CorrectedReflectance_TrueColor.layer-visible')await bTab.click()await expect(aquaLayer).toBeVisible()- await expect(snppLayer).toBeVisible()+ await expect(noaa20Layer).toBeVisible()await expect(refLabels).toBeVisible()await expect(refFeatures).toBeVisible()await expect(refFeatures2).toBeVisible()diff --git a/e2e/features/events/event-test.spec.js b/e2e/features/events/event-test.spec.jsindex b568fe366..e5f21b23b 100644--- a/e2e/features/events/event-test.spec.js+++ b/e2e/features/events/event-test.spec.js@@ -20,27 +20,27 @@ test.afterAll(async () => {})test('Make sure that 4 fire layers are not present in layer list: use mock', async () => {- const { sidebarEvent, thermAnomSNPPday, thermAnomSNPPnight, thermAnomVIIRSday, thermAnomVIIRSnight } = selectors+ const { sidebarEvent, thermAnomNOAA21day, thermAnomNOAA21night, thermAnomVIIRSday, thermAnomVIIRSnight } = selectorsawait page.goto(mockEvents)await closeModal(page)await page.waitForTimeout(500)await expect(sidebarEvent).toBeVisible()- await expect(thermAnomSNPPday).not.toBeVisible()- await expect(thermAnomSNPPnight).not.toBeVisible()+ await expect(thermAnomNOAA21day).not.toBeVisible()+ await expect(thermAnomNOAA21night).not.toBeVisible()await expect(thermAnomVIIRSday).not.toBeVisible()await expect(thermAnomVIIRSnight).not.toBeVisible()})test('Check that 4 fire layers are now present', async ({ browserName }) => {test.skip(browserName === 'firefox', 'firefox cant find iceberg event sometimes')- const { layersTab, sidebarEvent, thermAnomSNPPday, thermAnomSNPPnight, thermAnomVIIRSday, thermAnomVIIRSnight } = selectors+ const { layersTab, sidebarEvent, thermAnomNOAA21day, thermAnomNOAA21night, thermAnomVIIRSday, thermAnomVIIRSnight } = selectorsawait page.goto(mockEvents)await closeModal(page)await page.waitForTimeout(1000)await sidebarEvent.click()await layersTab.click()- await expect(thermAnomSNPPday).toBeVisible({ timeout: 10000 })- await expect(thermAnomSNPPnight).toBeVisible({ timeout: 10000 })+ await expect(thermAnomNOAA21day).toBeVisible({ timeout: 10000 })+ await expect(thermAnomNOAA21night).toBeVisible({ timeout: 10000 })await expect(thermAnomVIIRSday).toBeVisible({ timeout: 10000 })await expect(thermAnomVIIRSnight).toBeVisible({ timeout: 10000 })})diff --git a/e2e/features/global-unit/coordinate-format-test.spec.js b/e2e/features/global-unit/coordinate-format-test.spec.jsindex 016b3440d..08f62d5eb 100644--- a/e2e/features/global-unit/coordinate-format-test.spec.js+++ b/e2e/features/global-unit/coordinate-format-test.spec.js@@ -2,7 +2,7 @@const { test, expect } = require('@playwright/test')const { closeModal } = require('../../test-utils/hooks/wvHooks')-const url = 'http://localhost:3000/?v=-78.52435703125,37.8608744140625,-75.56244296875,39.7483255859375&l=Reference_Features_15m(hidden),Coastlines_15m,VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor&lg=false&s=-77.0434,38.8046&t=2023-02-15-T19%3A53%3A41Z'+const url = 'http://localhost:3000/?v=-78.52435703125,37.8608744140625,-75.56244296875,39.7483255859375&l=Reference_Features_15m(hidden),Coastlines_15m,VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor&lg=false&s=-77.0434,38.8046&t=2023-02-15-T19%3A53%3A41Z'/** @type {import('@playwright/test').Page} */let pagelet dmButtondiff --git a/e2e/features/global-unit/global-unit-test.spec.js b/e2e/features/global-unit/global-unit-test.spec.jsindex 9e7f3405c..ac9b737f7 100644--- a/e2e/features/global-unit/global-unit-test.spec.js+++ b/e2e/features/global-unit/global-unit-test.spec.js@@ -2,7 +2,7 @@const { test, expect } = require('@playwright/test')const { closeModal } = require('../../test-utils/hooks/wvHooks')-const SSTQueryString = 'http://localhost:3000/?l=GHRSST_L4_MUR_Sea_Surface_Temperature,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m,VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor&lg=false&t=2020-09-28-T20%3A40%3A53Z'+const SSTQueryString = 'http://localhost:3000/?l=GHRSST_L4_MUR_Sea_Surface_Temperature,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m,VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor&lg=false&t=2020-09-28-T20%3A40%3A53Z'/** @type {import('@playwright/test').Page} */let pagediff --git a/e2e/features/layers/layer-picker-mobile-test.spec.js b/e2e/features/layers/layer-picker-mobile-test.spec.jsindex 1287a87d5..1b585e92f 100644--- a/e2e/features/layers/layer-picker-mobile-test.spec.js+++ b/e2e/features/layers/layer-picker-mobile-test.spec.js@@ -28,7 +28,7 @@ test('Initial state indicates layer count', async () => {await page.goto(url)await closeModal(page)await expect(layerCount).toBeVisible()- await expect(layerCount).toContainText('10')+ await expect(layerCount).toContainText('9')})test('Expand layer list and show default layers', async () => {@@ -190,5 +190,5 @@ test('Collapse sidebar and confirm layer count updated', async () => {const { layerCount } = selectorsawait page.locator('.layer-btn-close').click()await page.locator('#toggleIconHolder').click()- await expect(layerCount).toContainText('11')+ await expect(layerCount).toContainText('10')})diff --git a/e2e/features/layers/layer-picker-test.spec.js b/e2e/features/layers/layer-picker-test.spec.jsindex 1b8545e5e..c3963a7ed 100644--- a/e2e/features/layers/layer-picker-test.spec.js+++ b/e2e/features/layers/layer-picker-test.spec.js@@ -159,8 +159,8 @@ test('Disabling coverage filter updates list', async () => {} = selectorsawait availableFilterCheckbox.click()await expect(availableFilterCheckboxInput).not.toBeChecked()- await expect(layersSearchRow).toHaveCount(19)- await expect(layerResultsCountText).toContainText('Showing 19 out of')+ await expect(layersSearchRow).toHaveCount(20)+ await expect(layerResultsCountText).toContainText('Showing 20 out of')})test('Finding layer by ID with search', async () => {@@ -260,7 +260,7 @@ test('Collapsed sidebar shows updated layer count', async () => {const { collapsedLayerButton } = selectorsawait page.locator('#toggleIconHolder').click()const layerCount = await page.locator('.layer-count')- await expect(layerCount).toContainText('12 Layers')+ await expect(layerCount).toContainText('11 Layers')await collapsedLayerButton.click()})diff --git a/e2e/features/layers/layers-sidebar-2-test.spec.js b/e2e/features/layers/layers-sidebar-2-test.spec.jsindex b9d1a3f4c..f7962a4a2 100644--- a/e2e/features/layers/layers-sidebar-2-test.spec.js+++ b/e2e/features/layers/layers-sidebar-2-test.spec.js@@ -7,15 +7,15 @@ const { assertLayerOrdering, closeModal } = require('../../test-utils/hooks/wvHolet page/** @type {Record<string, import('@playwright/test').Locator>} */let selectors-const vectorsQueryString = 'http://localhost:3000/?v=-70.43215000968726,28.678203599725197,-59.81569241792232,31.62330063930118&l=GRanD_Dams,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m,VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor'-const twoGroupsQueryString = 'http://localhost:3000/?v=-107.15747724134027,-81.6706340523014,47.81381180183274,89.12472754295932&l=VIIRS_SNPP_Thermal_Anomalies_375m_All,VIIRS_NOAA20_Thermal_Anomalies_375m_All,MODIS_Combined_Value_Added_AOD,MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth,Reference_Features_15m,MODIS_Terra_CorrectedReflectance_TrueColor&lg=true'-const mixedLayersGroupsDisabledQueryString = 'http://localhost:3000/?v=-107.15747724134027,-81.6706340523014,47.81381180183274,89.12472754295932&l=Reference_Features_15m,VIIRS_SNPP_Thermal_Anomalies_375m_All,MODIS_Combined_Value_Added_AOD,VIIRS_NOAA20_Thermal_Anomalies_375m_All,MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth,MODIS_Terra_CorrectedReflectance_TrueColor&lg=false'+const vectorsQueryString = 'http://localhost:3000/?v=-70.43215000968726,28.678203599725197,-59.81569241792232,31.62330063930118&l=GRanD_Dams,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m,MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor'+const twoGroupsQueryString = 'http://localhost:3000/?v=-107.15747724134027,-81.6706340523014,47.81381180183274,89.12472754295932&l=VIIRS_NOAA21_Thermal_Anomalies_375m_All,VIIRS_NOAA20_Thermal_Anomalies_375m_All,MODIS_Combined_Value_Added_AOD,MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth,Reference_Features_15m,MODIS_Terra_CorrectedReflectance_TrueColor&lg=true'+const mixedLayersGroupsDisabledQueryString = 'http://localhost:3000/?v=-107.15747724134027,-81.6706340523014,47.81381180183274,89.12472754295932&l=Reference_Features_15m,VIIRS_NOAA21_Thermal_Anomalies_375m_All,MODIS_Combined_Value_Added_AOD,VIIRS_NOAA20_Thermal_Anomalies_375m_All,MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth,MODIS_Terra_CorrectedReflectance_TrueColor&lg=false'const mixedLayerIdOrder = ['active-Admin_Boundaries','active-DoS_International_Boundaries','active-Coastlines_15m',- 'active-VIIRS_SNPP_Thermal_Anomalies_375m_All',+ 'active-VIIRS_NOAA21_Thermal_Anomalies_375m_All','active-MODIS_Combined_Value_Added_AOD','active-VIIRS_NOAA20_Thermal_Anomalies_375m_All','active-MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth'@@ -24,7 +24,7 @@ const groupedLayerIdOrder = ['active-Admin_Boundaries','active-DoS_International_Boundaries','active-Coastlines_15m',- 'active-VIIRS_SNPP_Thermal_Anomalies_375m_All',+ 'active-VIIRS_NOAA21_Thermal_Anomalies_375m_All','active-VIIRS_NOAA20_Thermal_Anomalies_375m_All','active-MODIS_Combined_Value_Added_AOD','active-MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth',@@ -34,7 +34,7 @@ const ungroupedReorderdLayerIdOrder = ['active-Admin_Boundaries','active-DoS_International_Boundaries','active-Coastlines_15m',- 'active-VIIRS_SNPP_Thermal_Anomalies_375m_All',+ 'active-VIIRS_NOAA21_Thermal_Anomalies_375m_All','active-VIIRS_NOAA20_Thermal_Anomalies_375m_All','active-MODIS_Combined_Value_Added_AOD','active-MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth'diff --git a/e2e/features/layers/layers-sidebar-test.spec.js b/e2e/features/layers/layers-sidebar-test.spec.jsindex 0b973448a..962e43ff4 100644--- a/e2e/features/layers/layers-sidebar-test.spec.js+++ b/e2e/features/layers/layers-sidebar-test.spec.js@@ -8,8 +8,8 @@ let page/** @type {Record<string, import('@playwright/test').Locator>} */let selectorsconst someGroupsQueryString = 'http://localhost:3000/?l=MODIS_Combined_Value_Added_AOD,MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth,Reference_Labels_15m(hidden),Reference_Features_15m,MODIS_Terra_CorrectedReflectance_TrueColor&lg=true'-const twoGroupsQueryString = 'http://localhost:3000/?v=-107.15747724134027,-81.6706340523014,47.81381180183274,89.12472754295932&l=VIIRS_SNPP_Thermal_Anomalies_375m_All,VIIRS_NOAA20_Thermal_Anomalies_375m_All,MODIS_Combined_Value_Added_AOD,MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth,Reference_Features_15m,MODIS_Terra_CorrectedReflectance_TrueColor&lg=true'-const mixedLayersGroupsDisabledQueryString = 'http://localhost:3000/?v=-107.15747724134027,-81.6706340523014,47.81381180183274,89.12472754295932&l=Reference_Features_15m,VIIRS_SNPP_Thermal_Anomalies_375m_All,MODIS_Combined_Value_Added_AOD,VIIRS_NOAA20_Thermal_Anomalies_375m_All,MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth,MODIS_Terra_CorrectedReflectance_TrueColor&lg=false'+const twoGroupsQueryString = 'http://localhost:3000/?v=-107.15747724134027,-81.6706340523014,47.81381180183274,89.12472754295932&l=VIIRS_NOAA20_Thermal_Anomalies_375m_All,MODIS_Combined_Value_Added_AOD,MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth,Reference_Features_15m,MODIS_Terra_CorrectedReflectance_TrueColor&lg=true'+const mixedLayersGroupsDisabledQueryString = 'http://localhost:3000/?v=-107.15747724134027,-81.6706340523014,47.81381180183274,89.12472754295932&l=Reference_Features_15m,MODIS_Combined_Value_Added_AOD,VIIRS_NOAA20_Thermal_Anomalies_375m_All,MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth,MODIS_Terra_CorrectedReflectance_TrueColor&lg=false'test.describe.configure({ mode: 'serial' })@@ -127,5 +127,5 @@ test('Load with groups disabled from permalink', async () => {await expect(aodGroup).not.toBeVisible()await expect(overlaysGroup).toBeVisible()const overlayGroupItems = await page.locator('#active-overlays ul > li')- await expect(overlayGroupItems).toHaveCount(7)+ await expect(overlayGroupItems).toHaveCount(6)})diff --git a/e2e/features/layers/layers-vector-test.spec.js b/e2e/features/layers/layers-vector-test.spec.jsindex 57d9d2f26..c643a215b 100644--- a/e2e/features/layers/layers-vector-test.spec.js+++ b/e2e/features/layers/layers-vector-test.spec.js@@ -7,8 +7,8 @@ const { closeModal } = require('../../test-utils/hooks/wvHooks')let page/** @type {Record<string, import('@playwright/test').Locator>} */let selectors-const damsLayerUrl = 'http://localhost:3000/?v=-70.43215000968726,28.678203599725197,-59.81569241792232,31.62330063930118&l=GRanD_Dams,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m,VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor'-const damsLayerWMSZoomLevelUrl = 'http://localhost:3000/?v=-166.0537832499445,-8.893604135881553,79.78417648048394,59.303969410599414&l=GRanD_Dams,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m,VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor'+const damsLayerUrl = 'http://localhost:3000/?v=-70.43215000968726,28.678203599725197,-59.81569241792232,31.62330063930118&l=GRanD_Dams,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m,MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor'+const damsLayerWMSZoomLevelUrl = 'http://localhost:3000/?v=-166.0537832499445,-8.893604135881553,79.78417648048394,59.303969410599414&l=GRanD_Dams,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m,MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor'test.describe.configure({ mode: 'serial' })diff --git a/e2e/features/layers/options-test.spec.js b/e2e/features/layers/options-test.spec.jsindex e24cf15d7..9f5b3c7f2 100644--- a/e2e/features/layers/options-test.spec.js+++ b/e2e/features/layers/options-test.spec.js@@ -7,7 +7,7 @@ const { closeModal } = require('../../test-utils/hooks/wvHooks')let page/** @type {Record<string, import('@playwright/test').Locator>} */let selectors-const customsSquashedQuerystring = 'http://localhost:3000/?p=geographic&l=VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,MODIS_Combined_Value_Added_AOD(opacity=0.7,palette=blue_2,min=0.1,0.105,max=0.56,0.565),MODIS_Terra_Aerosol,Reference_Labels_15m(opacity=0.94),Reference_Features_15m(hidden),Coastlines_15m&t=2019-01-15-T00%3A00%3A00Z&z=3&v=-271.7031658620978,-216.84375,370.1093341379022,36.84375'+const customsSquashedQuerystring = 'http://localhost:3000/?p=geographic&l=VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,MODIS_Combined_Value_Added_AOD(opacity=0.7,palette=blue_2,min=0.1,0.105,max=0.56,0.565),MODIS_Terra_Aerosol,Reference_Labels_15m(opacity=0.94),Reference_Features_15m(hidden),Coastlines_15m&t=2019-01-15-T00%3A00%3A00Z&z=3&v=-271.7031658620978,-216.84375,370.1093341379022,36.84375'test.describe.configure({ mode: 'serial' })diff --git a/e2e/features/share/share-test.spec.js b/e2e/features/share/share-test.spec.jsindex 73279c97c..a68e9e2f8 100644--- a/e2e/features/share/share-test.spec.js+++ b/e2e/features/share/share-test.spec.js@@ -75,7 +75,7 @@ test('Share link clipboard with no time query string param in the page url willtest('Clicking Shorten link works with links less than 2049 characters', async () => {const { shareToolbarButton } = selectors- const shortQueryString = 'http://localhost:3000/?l=Reference_Labels_15m,Reference_Features_15m,Coastlines_15m,VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor&lg=true&t=2022-08-10-T15%3A15%3A05Z'+ const shortQueryString = 'http://localhost:3000/?l=Reference_Labels_15m,Reference_Features_15m,Coastlines_15m,VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor&lg=true&t=2022-08-10-T15%3A15%3A05Z'await page.goto(shortQueryString)await closeModal(page)const linkShortenCase = await page.locator('#wv-link-shorten')@@ -86,7 +86,7 @@ test('Clicking Shorten link works with links less than 2049 characters', async (test('Clicking Shorten link is refused with links greater than 2048 characters', async () => {const { shareToolbarButton } = selectors- const longQueryString = 'http://localhost:3000/?l=MODIS_Terra_AOD_Deep_Blue_Combined,MODIS_Terra_AOD_Deep_Blue_Land,MODIS_Terra_Angstrom_Exponent_Ocean,MODIS_Terra_Angstrom_Exponent_Land,MODIS_Terra_Aerosol_Optical_Depth_3km,MODIS_Terra_Aerosol,MISR_Aerosol_Optical_Depth_Avg_Green_Monthly,VIIRS_SNPP_Angstrom_Exponent_Dark_Target_Ocean,VIIRS_SNPP_AOD_Dark_Target_Land_Ocean,VIIRS_SNPP_Angstrom_Exponent_Deep_Blue_Land_Ocean,VIIRS_SNPP_AOD_Deep_Blue_Land_Ocean,SWDB_Aerosol_Angstrom_Exponent_Monthly,SWDB_Aerosol_Optical_Thickness_550nm_Monthly,SWDB_Aerosol_Angstrom_Exponent_Daily,SWDB_Aerosol_Optical_Thickness_550nm_Daily,MERRA2_Total_Aerosol_Optical_Thickness_550nm_Extinction_Monthly,MERRA2_Total_Aerosol_Optical_Thickness_550nm_Scattering_Monthly,OMI_Absorbing_Aerosol_Optical_Thickness_MW_388,OMI_Absorbing_Aerosol_Optical_Depth,OMI_Aerosol_Optical_Depth,MODIS_Aqua_AOD_Deep_Blue_Combined,MODIS_Aqua_AOD_Deep_Blue_Land,MODIS_Aqua_Angstrom_Exponent_Ocean,MODIS_Aqua_Angstrom_Exponent_Land,MODIS_Aqua_Aerosol_Optical_Depth_3km,MODIS_Aqua_Aerosol,MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth,MODIS_Combined_Value_Added_AOD,MLS_CO_215hPa_Night,MLS_CO_215hPa_Day,AIRS_L3_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Monthly_Night,AIRS_L3_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Monthly_Day,AIRS_L3_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Daily_Night,AIRS_L3_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Daily_Day,AIRS_L2_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Night,AIRS_L2_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Day,OrbitTracks_Aura_Descending,OrbitTracks_Aura_Ascending,OrbitTracks_Aqua_Ascending,OrbitTracks_Suomi_NPP_Ascending,OrbitTracks_NOAA-20_Ascending,VIIRS_SNPP_Aerosol_Type_Deep_Blue_Land_Ocean,Reference_Labels_15m,Reference_Features_15m,Coastlines_15m,MODIS_Combined_L3_Nadir-BRDF_Daily,MODIS_Combined_MAIAC_L2G_BidirectionalReflectance_Bands143,VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor&lg=true&t=2022-08-10-T15%3A15%3A05Z'+ const longQueryString = 'http://localhost:3000/?l=MODIS_Terra_AOD_Deep_Blue_Combined,MODIS_Terra_AOD_Deep_Blue_Land,MODIS_Terra_Angstrom_Exponent_Ocean,MODIS_Terra_Angstrom_Exponent_Land,MODIS_Terra_Aerosol_Optical_Depth_3km,MODIS_Terra_Aerosol,MISR_Aerosol_Optical_Depth_Avg_Green_Monthly,VIIRS_NOAA20_Angstrom_Exponent_Dark_Target_Ocean,VIIRS_NOAA20_AOD_Dark_Target_Land_Ocean,VIIRS_NOAA20_Angstrom_Exponent_Deep_Blue_Land_Ocean,VIIRS_NOAA20_AOD_Deep_Blue_Land_Ocean,SWDB_Aerosol_Angstrom_Exponent_Monthly,SWDB_Aerosol_Optical_Thickness_550nm_Monthly,SWDB_Aerosol_Angstrom_Exponent_Daily,SWDB_Aerosol_Optical_Thickness_550nm_Daily,MERRA2_Total_Aerosol_Optical_Thickness_550nm_Extinction_Monthly,MERRA2_Total_Aerosol_Optical_Thickness_550nm_Scattering_Monthly,OMI_Absorbing_Aerosol_Optical_Thickness_MW_388,OMI_Absorbing_Aerosol_Optical_Depth,OMI_Aerosol_Optical_Depth,MODIS_Aqua_AOD_Deep_Blue_Combined,MODIS_Aqua_AOD_Deep_Blue_Land,MODIS_Aqua_Angstrom_Exponent_Ocean,MODIS_Aqua_Angstrom_Exponent_Land,MODIS_Aqua_Aerosol_Optical_Depth_3km,MODIS_Aqua_Aerosol,MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth,MODIS_Combined_Value_Added_AOD,MLS_CO_215hPa_Night,MLS_CO_215hPa_Day,AIRS_L3_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Monthly_Night,AIRS_L3_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Monthly_Day,AIRS_L3_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Daily_Night,AIRS_L3_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Daily_Day,AIRS_L2_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Night,AIRS_L2_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Day,OrbitTracks_Aura_Descending,OrbitTracks_Aura_Ascending,OrbitTracks_Aqua_Ascending,OrbitTracks_Suomi_NPP_Ascending,OrbitTracks_NOAA-20_Ascending,VIIRS_NOAA20_Aerosol_Type_Deep_Blue_Land_Ocean,Reference_Labels_15m,Reference_Features_15m,Coastlines_15m,MODIS_Combined_L3_Nadir-BRDF_Daily,MODIS_Combined_MAIAC_L2G_BidirectionalReflectance_Bands143,VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),VIIRS_NOAA21_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor&lg=true&t=2023-08-10-T15%3A15%3A05Z'await page.goto(longQueryString)await closeModal(page)const linkShortenCase = await page.locator('#wv-link-shorten')diff --git a/e2e/features/timeline/date-selector-test.spec.js b/e2e/features/timeline/date-selector-test.spec.jsindex dbc72a97f..454631048 100644--- a/e2e/features/timeline/date-selector-test.spec.js+++ b/e2e/features/timeline/date-selector-test.spec.js@@ -185,7 +185,7 @@ test('Date selector up arrow rolls over from Feb 28 to 1 (non leap year) and the})test('Added future layer and right timeline arrow is not disabled', async () => {- const queryString = 'http://localhost:3000/?mockFutureLayer=VIIRS_SNPP_CorrectedReflectance_TrueColor,3D'+ const queryString = 'http://localhost:3000/?mockFutureLayer=VIIRS_NOAA20_CorrectedReflectance_TrueColor,3D'await page.goto(queryString)await closeModal(page)const rightArrow = await page.locator('#right-arrow-group')diff --git a/e2e/test-utils/global-variables/querystrings.js b/e2e/test-utils/global-variables/querystrings.jsindex d740b5a59..05e432cbf 100644--- a/e2e/test-utils/global-variables/querystrings.js+++ b/e2e/test-utils/global-variables/querystrings.js@@ -1,6 +1,6 @@module.exports = {// animations- activeAnimationWidget: 'http://localhost:3000/?e2e=true&p=geographic&l=VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-04-04&z=3&v=-177.94712426144758,-46.546875,-5.14662573855243,53.015625&ab=on&as=2018-03-28&ae=2018-04-04&av=3&al=false',+ activeAnimationWidget: 'http://localhost:3000/?e2e=true&p=geographic&l=VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-04-04&z=3&v=-177.94712426144758,-46.546875,-5.14662573855243,53.015625&ab=on&as=2018-03-28&ae=2018-04-04&av=3&al=false',activeCustomColormap: 'http://localhost:3000/?e2e=true&p=geographic&l=AIRS_L2_Carbon_Monoxide_500hPa_Volume_Mixing_Ratio_Day(palette=red_1)&t=2016-04-08&z=3&v=-223.875,-91.828125,162.84375,98.296875&ab=on&as=2016-03-25&ae=2016-04-08&av=3&al=false',animationProjectionRotated: 'http://localhost:3000/?e2e=true&p=arctic&l=MODIS_Terra_CorrectedReflectance_TrueColor,Coastlines_15m&t=2016-12-09&z=3&v=-2764195.2298414493,-88762.12734933128,2589496.903095221,3893331.478195751&r=-18.0000&ab=on&as=2016-12-02&ae=2016-12-09&av=3&al=true',animationTooManyFramesGif: 'http://localhost:3000/?e2e=true&p=geographic&v=-52.43799794510461,-36.052394508901145,-33.34815419510461,-12.532863258901145&t=2019-06-24-T10%3A00%3A00Z&as=2018-06-24-T10%3A00%3A00Z&ae=2019-07-01-T10%3A00%3A00Z&ab=on',@@ -9,23 +9,23 @@ module.exports = {// compareswipeAndAIsActive:- 'http://localhost:3000/?e2e=true&ca=true&cm=swipe&cv=51&p=geographic&l=MODIS_Terra_CorrectedReflectance_TrueColor&l1=VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-08-17-T00%3A00%3A00Z&z=3&t1=2018-08-16-T00%3A00%3A00Z&v=-127.6171875,-46.5556640625,31.7109375,53.0244140625',+ 'http://localhost:3000/?e2e=true&ca=true&cm=swipe&cv=51&p=geographic&l=MODIS_Terra_CorrectedReflectance_TrueColor&l1=VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-08-17-T00%3A00%3A00Z&z=3&t1=2018-08-16-T00%3A00%3A00Z&v=-127.6171875,-46.5556640625,31.7109375,53.0244140625',opacityAndBIsActive:- 'http://localhost:3000/?e2e=true&ca=false&cm=opacity&p=geographic&l=MODIS_Terra_CorrectedReflectance_TrueColor&l1=VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-08-17-T00%3A00%3A00Z&z=3&t1=2018-08-16-T00%3A00%3A00Z&v=-127.6171875,-46.5556640625,31.7109375,53.0244140625',+ 'http://localhost:3000/?e2e=true&ca=false&cm=opacity&p=geographic&l=MODIS_Terra_CorrectedReflectance_TrueColor&l1=VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-08-17-T00%3A00%3A00Z&z=3&t1=2018-08-16-T00%3A00%3A00Z&v=-127.6171875,-46.5556640625,31.7109375,53.0244140625',spyAndBIsActive:- 'http://localhost:3000/?e2e=true&ca=false&cm=spy&p=geographic&l=MODIS_Terra_CorrectedReflectance_TrueColor&l1=VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-08-17-T00%3A00%3A00Z&z=3&t1=2018-08-16-T00%3A00%3A00Z&v=-127.6171875,-46.5556640625,31.7109375,53.0244140625',+ 'http://localhost:3000/?e2e=true&ca=false&cm=spy&p=geographic&l=MODIS_Terra_CorrectedReflectance_TrueColor&l1=VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-08-17-T00%3A00%3A00Z&z=3&t1=2018-08-16-T00%3A00%3A00Z&v=-127.6171875,-46.5556640625,31.7109375,53.0244140625',swipeAOD:- 'http://localhost:3000/?e2e=true&ca=true&cm=swipe&cv=51&p=geographic&l=MODIS_Terra_CorrectedReflectance_TrueColor,MODIS_Terra_Aerosol&l1=VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-08-17-T00%3A00%3A00Z&z=3&t1=2018-08-16-T00%3A00%3A00Z&v=-127.6171875,-46.5556640625,31.7109375,53.0244140625',+ 'http://localhost:3000/?e2e=true&ca=true&cm=swipe&cv=51&p=geographic&l=MODIS_Terra_CorrectedReflectance_TrueColor,MODIS_Terra_Aerosol&l1=VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-08-17-T00%3A00%3A00Z&z=3&t1=2018-08-16-T00%3A00%3A00Z&v=-127.6171875,-46.5556640625,31.7109375,53.0244140625',// dateknownDate: 'http://localhost:3000/?e2e=true&t=2019-07-22',// timeline- subdailyLayerIntervalTimescale: 'http://localhost:3000/?e2e=true&t=2019-10-04-T09%3A46%3A32Z&z=4&i=4&l=GOES-East_ABI_Band2_Red_Visible_1km,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m,VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor',+ subdailyLayerIntervalTimescale: 'http://localhost:3000/?e2e=true&t=2019-10-04-T09%3A46%3A32Z&z=4&i=4&l=GOES-East_ABI_Band2_Red_Visible_1km,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m,VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor',// events- mockEvents: 'http://localhost:3000/?e2e=true&p=geographic&l=VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-05-02-T00%3A00%3A00Z&z=3&v=-409.00147812273656,-205.62883007565202,270.5880270080828,219.11461063111003&e=true&mockEvents=20170530',- malformedMockEvents: 'http://localhost:3000/?e2e=true&p=geographic&l=VIIRS_SNPP_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-05-02-T00%3A00%3A00Z&z=3&v=-409.00147812273656,-205.62883007565202,270.5880270080828,219.11461063111003&e=true&mockEvents=malformed',+ mockEvents: 'http://localhost:3000/?e2e=true&p=geographic&l=VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-05-02-T00%3A00%3A00Z&z=3&v=-409.00147812273656,-205.62883007565202,270.5880270080828,219.11461063111003&e=true&mockEvents=20170530',+ malformedMockEvents: 'http://localhost:3000/?e2e=true&p=geographic&l=VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Labels_15m(hidden),Reference_Features_15m(hidden),Coastlines_15m&t=2018-05-02-T00%3A00%3A00Z&z=3&v=-409.00147812273656,-205.62883007565202,270.5880270080828,219.11461063111003&e=true&mockEvents=malformed',stormEventSelected: 'http://localhost:3000/?e2e=true&v=175.65863037109375,10.918751525878907,182.25042724609375,22.643360900878907&e=EONET_2777,2017-05-31&l=IMERG_Precipitation_Rate,VIIRS_SNPP_DayNightBand_ENCC(hidden),VIIRS_SNPP_DayNightBand_At_Sensor_Radiance(hidden),Reference_Labels,Reference_Features,Coastlines(hidden),VIIRS_NOAA20_CorrectedReflectance_TrueColor(hidden),VIIRS_SNPP_CorrectedReflectance_TrueColor,MODIS_Aqua_CorrectedReflectance_TrueColor(hidden),MODIS_Terra_CorrectedReflectance_TrueColor(hidden)&lg=true&t=2017-05-31-T00%3A00%3A00Z&mockEvents=20170530',fixedAppNow: 'http://localhost:3000/?e2e=true&now=2012-01-01T00%3A00%3A00Z',wildfiresWithDates: 'http://localhost:3000/?e2e=true&v=-139.02635001706034,25.660099233568406,-85.27770827186355,43.288373996427595&e=true&efs=false&efd=2020-01-16,2020-06-16&efc=wildfires&t=2020-06-16-T18%3A31%3A28Z',diff --git a/e2e/test-utils/global-variables/selectors.js b/e2e/test-utils/global-variables/selectors.jsindex 522ece2ac..f4f5cff4c 100644--- a/e2e/test-utils/global-variables/selectors.js+++ b/e2e/test-utils/global-variables/selectors.js@@ -249,8 +249,8 @@ module.exports = (page) => ({trackMarker: page.locator('.track-marker'),layersTab: page.locator('#layers-sidebar-tab'),sidebarEvent: page.locator('#sidebar-event-EONET_3931'),- thermAnomSNPPday: page.locator('#active-VIIRS_SNPP_Thermal_Anomalies_375m_Night'),- thermAnomSNPPnight: page.locator('#active-VIIRS_SNPP_Thermal_Anomalies_375m_Day'),+ thermAnomNOAA21day: page.locator('#active-VIIRS_NOAA21_Thermal_Anomalies_375m_Night'),+ thermAnomNOAA21night: page.locator('#active-VIIRS_NOAA21_Thermal_Anomalies_375m_Day'),thermAnomVIIRSday: page.locator('#active-VIIRS_NOAA20_Thermal_Anomalies_375m_Day'),thermAnomVIIRSnight: page.locator('#active-VIIRS_NOAA20_Thermal_Anomalies_375m_Night'),notifyMessage: page.locator('.wv-alert .alert-content'),diff --git a/e2e/test-utils/hooks/wvHooks.js b/e2e/test-utils/hooks/wvHooks.jsindex 4a668c729..59c2b1e7e 100644--- a/e2e/test-utils/hooks/wvHooks.js+++ b/e2e/test-utils/hooks/wvHooks.js@@ -67,17 +67,15 @@ const assertDefaultLayers = async (page) => {const refFeatures2 = page.locator('#active-Admin_Boundaries')const coastlines = page.locator('#active-Coastlines_15m')const trueColorNOAA21 = page.locator('#active-VIIRS_NOAA21_CorrectedReflectance_TrueColor')- const trueColorSNPP = page.locator('#active-VIIRS_SNPP_CorrectedReflectance_TrueColor')const trueColorAqua = page.locator('#active-MODIS_Aqua_CorrectedReflectance_TrueColor')const trueColorMODIS = page.locator('#active-MODIS_Terra_CorrectedReflectance_TrueColor')const trueColorNOAA20 = page.locator('#active-VIIRS_NOAA20_CorrectedReflectance_TrueColor')- await expect(layerItem).toHaveCount(10)+ await expect(layerItem).toHaveCount(9)await expect(refLabels).toBeVisible()await expect(refFeatures).toBeVisible()await expect(refFeatures2).toBeVisible()await expect(coastlines).toBeVisible()await expect(trueColorNOAA21).toBeVisible()- await expect(trueColorSNPP).toBeVisible()await expect(trueColorAqua).toBeVisible()await expect(trueColorMODIS).toBeVisible()await expect(trueColorNOAA20).toBeVisible()