Interactive interface for browsing global, full-resolution satellite imagery
WV-2448: Change default Corrected Reflectance layer & initial map position (#3983)
Tomd37705c37434
diff --git a/config/default/common/config/wv.json/defaults.json b/config/default/common/config/wv.json/defaults.jsonindex 4f692aa4e..f431f2760 100644--- a/config/default/common/config/wv.json/defaults.json+++ b/config/default/common/config/wv.json/defaults.json@@ -3,11 +3,11 @@"projection": "geographic","startingLayers": [{- "id": "MODIS_Terra_CorrectedReflectance_TrueColor"+ "id": "MODIS_Terra_CorrectedReflectance_TrueColor",+ "hidden": "true"},{- "id": "MODIS_Aqua_CorrectedReflectance_TrueColor",- "hidden": "true"+ "id": "MODIS_Aqua_CorrectedReflectance_TrueColor"},{"id": "VIIRS_SNPP_CorrectedReflectance_TrueColor",diff --git a/config/default/common/config/wv.json/naturalEvents.json b/config/default/common/config/wv.json/naturalEvents.jsonindex 8ae731ff4..4c2bd7698 100644--- a/config/default/common/config/wv.json/naturalEvents.json+++ b/config/default/common/config/wv.json/naturalEvents.json@@ -56,7 +56,7 @@"Wildfires": [["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Terra_CorrectedReflectance_Bands721",@@ -64,7 +64,7 @@],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["MODIS_Aqua_CorrectedReflectance_Bands721",@@ -142,11 +142,11 @@],["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",@@ -212,11 +212,11 @@],["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",@@ -238,11 +238,11 @@],["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",@@ -268,7 +268,7 @@],["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Terra_CorrectedReflectance_Bands367",@@ -276,7 +276,7 @@],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",@@ -316,11 +316,11 @@"Volcanoes": [["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",@@ -376,7 +376,7 @@"Wildfires": [["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Terra_CorrectedReflectance_Bands721",@@ -384,7 +384,7 @@],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["MODIS_Aqua_CorrectedReflectance_Bands721",@@ -478,11 +478,11 @@],["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",@@ -556,11 +556,11 @@],["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",@@ -590,11 +590,11 @@],["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",@@ -632,7 +632,7 @@],["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Terra_CorrectedReflectance_Bands367",@@ -640,7 +640,7 @@],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",@@ -674,11 +674,11 @@"Volcanoes": [["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",@@ -768,7 +768,7 @@"Manmade": [["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Terra_CorrectedReflectance_Bands721",@@ -784,7 +784,7 @@],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["MODIS_Aqua_SurfaceReflectance_Bands121",@@ -814,11 +814,11 @@"Dust and Haze": [["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",@@ -890,7 +890,7 @@"Wildfires": [["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Terra_CorrectedReflectance_Bands721",@@ -906,7 +906,7 @@],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["MODIS_Aqua_CorrectedReflectance_Bands721",@@ -980,11 +980,11 @@],["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_NOAA20_CorrectedReflectance_TrueColor",@@ -1054,12 +1054,11 @@],["MODIS_Terra_CorrectedReflectance_TrueColor",- true+ false],-["MODIS_Aqua_CorrectedReflectance_TrueColor",- false+ true],["VIIRS_SNPP_CorrectedReflectance_TrueColor",diff --git a/web/js/modules/map/util.js b/web/js/modules/map/util.jsindex 97f492649..f58cbc600 100644--- a/web/js/modules/map/util.js+++ b/web/js/modules/map/util.js@@ -112,12 +112,6 @@ export function mapIsExtentValid(extent) {/** Set default extent according to time of day:*- * at 00:00 UTC, start at far eastern edge of- * map: "20.6015625,-46.546875,179.9296875,53.015625"- *- * at 23:00 UTC, start at far western edge of map:- * "-179.9296875,-46.546875,-20.6015625,53.015625"- ** @method getLeadingExtent* @static* @param {Object} Time@@ -125,21 +119,18 @@ export function mapIsExtentValid(extent) {* @returns {object} Extent Array*/export function getLeadingExtent(loadtime) {- let curHour = loadtime.getUTCHours();-- // For earlier hours when data is still being filled in, force a far eastern perspective- if (curHour < 3) {- curHour = 23;- } else if (curHour < 9) {- curHour = 0;- }+ const curHour = loadtime.getUTCHours();- // Compute east/west bounds- const minLon = 20.6015625 + curHour * (-200.53125 / 23.0);- const maxLon = minLon + 159.328125;+ // These values are specifically tuned for the Aqua/MODIS default Corrected Reflectance Layer+ const eastWestOffset = curHour * 0.6;+ const minLonConst = 10;+ const maxLongConst = 170;+ const minLonMultiplier = -200 / 23;+ const minLon = minLonConst + (curHour - eastWestOffset) * minLonMultiplier;+ const maxLon = minLon + maxLongConst;- const minLat = -46.546875;- const maxLat = 53.015625;+ const minLat = -47;+ const maxLat = 53;return [minLon, minLat, maxLon, maxLat];}