Interactive interface for browsing global, full-resolution satellite imagery
WV-3594 Implented New TiTiler Endpoint (#5858)
christof-wittreich69bf6b11637a
diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Customizable_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Customizable_Landsat.jsonindex eb8952d2a..5241cfdb1 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Customizable_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Customizable_Landsat.json@@ -18,7 +18,9 @@"bandCombo": {"r": "B07","g": "B05",- "b": "B04"+ "b": "B04",+ "color_formula": "Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35",+ "bands_regex": "B[0-9][0-9]"},"disableSnapshot": true,"wrapX": false,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Customizable_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Customizable_Sentinel.jsonindex 16f8d3a32..c60285301 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Customizable_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Customizable_Sentinel.json@@ -18,7 +18,9 @@"bandCombo": {"r": "B12","g": "B8A",- "b": "B04"+ "b": "B04",+ "color_formula": "Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"wrapX": false,"disableSnapshot": true,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_EVI_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_EVI_Landsat.jsonindex 693d294c3..b8cc67251 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_EVI_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_EVI_Landsat.json@@ -19,7 +19,8 @@"assets": ["B05", "B04", "B02"],"expression": "(2.5*(B05-B04))/(B05+6*B04-7.5*B02+1)","rescale": "-1,1",- "colormap_name": "brbg"+ "colormap_name": "brbg",+ "bands_regex": "B[0-9][0-9]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_EVI_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_EVI_Sentinel.jsonindex 94d7d7715..5ec2a8414 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_EVI_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_EVI_Sentinel.json@@ -19,7 +19,8 @@"assets": ["B05", "B04", "B02"],"expression": "(2.5*(B05-B04))/(B05+6*B04-7.5*B02+1)","rescale": "-1,1",- "colormap_name": "brbg"+ "colormap_name": "brbg",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Landsat.jsonindex 8c2e5d475..1a82c8451 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Landsat.json@@ -18,7 +18,9 @@"bandCombo": {"r": "B05","g": "B04",- "b": "B03"+ "b": "B03",+ "color_formula": "Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35",+ "bands_regex": "B[0-9][0-9]"},"wrapX": false,"disableSnapshot": true,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Sentinel.jsonindex 6cd001fd8..da5dd9a0e 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Sentinel.json@@ -18,7 +18,9 @@"bandCombo": {"r": "B08","g": "B04",- "b": "B03"+ "b": "B03",+ "color_formula": "Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"wrapX": false,"disableSnapshot": true,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Urban_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Urban_Landsat.jsonindex f5b2ce91c..4b82e6ac7 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Urban_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Urban_Landsat.json@@ -18,7 +18,9 @@"bandCombo": {"r": "B07","g": "B06",- "b": "B04"+ "b": "B04",+ "color_formula": "Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35",+ "bands_regex": "B[0-9][0-9]"},"wrapX": false,"disableSnapshot": true,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Urban_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Urban_Sentinel.jsonindex ced8f0609..57e36f85f 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Urban_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Urban_Sentinel.json@@ -18,7 +18,9 @@"bandCombo": {"r": "B12","g": "B11",- "b": "B04"+ "b": "B04",+ "color_formula": "Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"wrapX": false,"disableSnapshot": true,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Vegetation_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Vegetation_Landsat.jsonindex ab1eb860e..07c0d33b7 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Vegetation_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Vegetation_Landsat.json@@ -18,7 +18,9 @@"bandCombo": {"r": "B06","g": "B05",- "b": "B04"+ "b": "B04",+ "color_formula": "Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35",+ "bands_regex": "B[0-9][0-9]"},"wrapX": false,"disableSnapshot": true,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Vegetation_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Vegetation_Sentinel.jsonindex 0f5bab705..44d715857 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Vegetation_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_False_Color_Vegetation_Sentinel.json@@ -18,7 +18,9 @@"bandCombo": {"r": "B11","g": "B8A",- "b": "B04"+ "b": "B04",+ "color_formula": "Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"wrapX": false,"disableSnapshot": true,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_MSAVI_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_MSAVI_Landsat.jsonindex 0e9698c37..cdb752447 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_MSAVI_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_MSAVI_Landsat.json@@ -19,7 +19,8 @@"assets": ["B05", "B04"],"expression": "(2*B05+1-sqrt((2*B05+1)**2-8*(B05-B04)))/2","rescale": "-1,1",- "colormap_name": "brbg"+ "colormap_name": "brbg",+ "bands_regex": "B[0-9][0-9]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_MSAVI_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_MSAVI_Sentinel.jsonindex 60e4e623c..953cfafb9 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_MSAVI_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_MSAVI_Sentinel.json@@ -19,7 +19,8 @@"assets": ["B05", "B04"],"expression": "(2*B05+1-sqrt((2*B05+1)**2-8*(B05-B04)))/2","rescale": "-1,1",- "colormap_name": "brbg"+ "colormap_name": "brbg",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Moisture_Index_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Moisture_Index_Landsat.jsonindex 646d704b2..86dd2b3e8 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Moisture_Index_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Moisture_Index_Landsat.json@@ -19,7 +19,8 @@"assets": ["B05", "B06"],"expression": "(B05-B06)/(B05+B06)","rescale": "-1,1",- "colormap_name": "bwr_r"+ "colormap_name": "bwr_r",+ "bands_regex": "B[0-9][0-9]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Moisture_Index_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Moisture_Index_Sentinel.jsonindex 2bbe28132..89c38c17e 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Moisture_Index_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Moisture_Index_Sentinel.json@@ -19,7 +19,8 @@"assets": ["B8A", "B11"],"expression": "(B8A-B11)/(B8A+B11)","rescale": "-1,1",- "colormap_name": "bwr_r"+ "colormap_name": "bwr_r",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR2_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR2_Landsat.jsonindex d18a87280..17935322b 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR2_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR2_Landsat.json@@ -19,7 +19,8 @@"assets": ["B06", "B07"],"expression": "(B06-B07)/(B06+B07)","rescale": "-1,1",- "colormap_name": "puor"+ "colormap_name": "puor",+ "bands_regex": "B[0-9][0-9]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR2_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR2_Sentinel.jsonindex 98a963e1d..fcd7ddbb4 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR2_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR2_Sentinel.json@@ -19,7 +19,8 @@"assets": ["B06", "B07"],"expression": "(B06-B07)/(B06+B07)","rescale": "-1,1",- "colormap_name": "puor"+ "colormap_name": "puor",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR_Landsat.jsonindex 50bc46c51..0b0825c6d 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR_Landsat.json@@ -19,7 +19,8 @@"assets": ["B05", "B07"],"expression": "(B05-B07)/(B05+B07)","rescale": "-1,1",- "colormap_name": "puor"+ "colormap_name": "puor",+ "bands_regex": "B[0-9][0-9]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR_Sentinel.jsonindex 1ff46b819..80355dfb1 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NBR_Sentinel.json@@ -19,7 +19,8 @@"assets": ["B05", "B07"],"expression": "(B05-B07)/(B05+B07)","rescale": "-1,1",- "colormap_name": "puor"+ "colormap_name": "puor",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDSI_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDSI_Landsat.jsonindex abc8f982b..3311ab9b6 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDSI_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDSI_Landsat.json@@ -19,7 +19,8 @@"assets": ["B06", "B03"],"expression": "(B03-B06)/(B03+B06)","rescale": "-1,1",- "colormap_name": "winter_r"+ "colormap_name": "winter_r",+ "bands_regex": "B[0-9][0-9]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDSI_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDSI_Sentinel.jsonindex a914e1e97..627e524eb 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDSI_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDSI_Sentinel.json@@ -19,7 +19,8 @@"assets": ["B03", "B11"],"expression": "(B03-B11)/(B03+B11)","rescale": "-1,1",- "colormap_name": "winter_r"+ "colormap_name": "winter_r",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDVI_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDVI_Landsat.jsonindex 323367154..c460263d7 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDVI_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDVI_Landsat.json@@ -19,7 +19,8 @@"assets": ["B05", "B04"],"expression": "(B05-B04)/(B05+B04)","rescale": "-1,1",- "colormap_name": "brbg"+ "colormap_name": "brbg",+ "bands_regex": "B[0-9][0-9]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDVI_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDVI_Sentinel.jsonindex d70577f6f..46c51fe26 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDVI_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDVI_Sentinel.json@@ -19,7 +19,8 @@"assets": ["B08", "B04"],"expression": "(B08-B04)/(B08+B04)","rescale": "-1,1",- "colormap_name": "brbg"+ "colormap_name": "brbg",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDWI_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDWI_Landsat.jsonindex 97c5b2711..0f5b1adfa 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDWI_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDWI_Landsat.json@@ -19,7 +19,8 @@"assets": ["B05", "B03"],"expression": "(B03-B05)/(B03+B05)","rescale": "-1,1",- "colormap_name": "gnbu"+ "colormap_name": "gnbu",+ "bands_regex": "B[0-9][0-9]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDWI_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDWI_Sentinel.jsonindex b296b5270..7d18fe657 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDWI_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_NDWI_Sentinel.json@@ -19,7 +19,8 @@"assets": ["B08", "B03"],"expression": "(B03-B08)/(B03+B08)","rescale": "-1,1",- "colormap_name": "gnbu"+ "colormap_name": "gnbu",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_SAVI_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_SAVI_Landsat.jsonindex b11ce33c1..7b60cb00c 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_SAVI_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_SAVI_Landsat.json@@ -19,7 +19,8 @@"assets": ["B05", "B04"],"expression": "1.5*((B05-B04)/(B05+B04+0.5))","rescale": "-1,1",- "colormap_name": "brbg"+ "colormap_name": "brbg",+ "bands_regex": "B[0-9][0-9]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_SAVI_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_SAVI_Sentinel.jsonindex 21684f25f..d13d1eddc 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_SAVI_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_SAVI_Sentinel.json@@ -19,7 +19,8 @@"assets": ["B05", "B04"],"expression": "1.5*((B05-B04)/(B05+B04+0.5))","rescale": "-1,1",- "colormap_name": "brbg"+ "colormap_name": "brbg",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Shortwave_Infrared_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Shortwave_Infrared_Landsat.jsonindex ba225eae7..b0ab302fb 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Shortwave_Infrared_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Shortwave_Infrared_Landsat.json@@ -18,7 +18,9 @@"bandCombo": {"r": "B07","g": "B05",- "b": "B04"+ "b": "B04",+ "color_formula": "Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35",+ "bands_regex": "B[0-9][0-9]"},"wrapX": false,"disableSnapshot": true,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Shortwave_Infrared_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Shortwave_Infrared_Sentinel.jsonindex fe570ee3e..00d7a0f7f 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Shortwave_Infrared_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_Shortwave_Infrared_Sentinel.json@@ -18,7 +18,9 @@"bandCombo": {"r": "B12","g": "B8A",- "b": "B04"+ "b": "B04",+ "color_formula": "Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"wrapX": false,"disableSnapshot": true,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_TVI_Landsat.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_TVI_Landsat.jsonindex a42a6aa21..7347f1655 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_TVI_Landsat.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_TVI_Landsat.json@@ -19,7 +19,8 @@"assets": ["B03", "B04", "B05"],"expression": "(120*(B05-B03)-200*(B04-B03))/2","rescale": "-1,1",- "colormap_name": "brbg"+ "colormap_name": "brbg",+ "bands_regex": "B[0-9][0-9]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_TVI_Sentinel.json b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_TVI_Sentinel.jsonindex 7c1b9ced1..9edd54461 100644--- a/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_TVI_Sentinel.json+++ b/config/default/common/config/wv.json/layers/multi-mission/hls/HLS_TVI_Sentinel.json@@ -19,7 +19,8 @@"assets": ["B03", "B04", "B05"],"expression": "(120*(B05-B03)-200*(B04-B03))/2","rescale": "-1,1",- "colormap_name": "brbg"+ "colormap_name": "brbg",+ "bands_regex": "B[0-9][0-9A-Za-z]"},"disableSnapshot": true,"minZoom": 7,diff --git a/config/default/release/config/wv.json/sources.json b/config/default/release/config/wv.json/sources.jsonindex 47254375e..edbad63ee 100644--- a/config/default/release/config/wv.json/sources.json+++ b/config/default/release/config/wv.json/sources.json@@ -144,7 +144,7 @@}},"DDV": {- "url": "https://kv9drwgv6l.execute-api.us-west-2.amazonaws.com/",+ "url": "https://staging.openveda.cloud/api/titiler-cmr/","matrixSets": {"31.25m": {"id": "31.25m",diff --git a/package-lock.json b/package-lock.jsonindex cf1e92686..9d2526f6e 100644--- a/package-lock.json+++ b/package-lock.json@@ -47,7 +47,6 @@"p-queue": "^8.1.0","proj4": "^2.17.0","prop-types": "^15.8.1",- "qs": "^6.13.1","react": "^18.3.1","react-beautiful-dnd": "^13.1.1","react-device-detect": "^2.2.3",diff --git a/package.json b/package.jsonindex e3cf7279e..331a8505a 100644--- a/package.json+++ b/package.json@@ -182,7 +182,6 @@"p-queue": "^8.1.0","proj4": "^2.17.0","prop-types": "^15.8.1",- "qs": "^6.13.1","react": "^18.3.1","react-beautiful-dnd": "^13.1.1","react-device-detect": "^2.2.3",diff --git a/web/js/components/layer/settings/band-selection/band-selection-menu.js b/web/js/components/layer/settings/band-selection/band-selection-menu.jsindex 4795967a5..77db0c984 100644--- a/web/js/components/layer/settings/band-selection/band-selection-menu.js+++ b/web/js/components/layer/settings/band-selection/band-selection-menu.js@@ -32,6 +32,8 @@ export default function BandSelection({ layer }) {r: layer.bandCombo.r,g: layer.bandCombo.g,b: layer.bandCombo.b,+ color_formula: layer.bandCombo.color_formula,+ bands_regex: layer.bandCombo.bands_regex,});const confirmSelection = () => {diff --git a/web/js/components/layer/settings/band-selection/menu-components/preset-options.js b/web/js/components/layer/settings/band-selection/menu-components/preset-options.jsindex 65197576d..da3c24ce5 100644--- a/web/js/components/layer/settings/band-selection/menu-components/preset-options.js+++ b/web/js/components/layer/settings/band-selection/menu-components/preset-options.js@@ -12,6 +12,8 @@ const landsatPresets = [r: 'B05',g: 'B04',b: 'B03',+ color_formula: 'Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_False_Color_Landsat_th.jpg',},{@@ -20,6 +22,8 @@ const landsatPresets = [r: 'B07',g: 'B06',b: 'B04',+ color_formula: 'Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_False_Color_Urban_Landsat_th.jpg',},{@@ -28,6 +32,8 @@ const landsatPresets = [r: 'B06',g: 'B05',b: 'B04',+ color_formula: 'Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_False_Color_Vegetation_Landsat_th.jpg',},{@@ -36,6 +42,8 @@ const landsatPresets = [r: 'B07',g: 'B05',b: 'B04',+ color_formula: 'Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_SWIR_Landsat_th.jpg',},{@@ -45,6 +53,7 @@ const landsatPresets = [expression: '(B05-B04)/(B05+B04)',rescale: '-1,1',colormap_name: 'brbg',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_NDVI_Landsat_th.jpg',},{@@ -54,6 +63,7 @@ const landsatPresets = [expression: '(B03-B05)/(B03+B05)',rescale: '-1,1',colormap_name: 'gnbu',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_NDWI_Landsat_th.jpg',},{@@ -63,6 +73,7 @@ const landsatPresets = [expression: '(B03-B06)/(B03+B06)',rescale: '-1,1',colormap_name: 'winter_r',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_NDSI_Landsat_th.jpg',},{@@ -72,6 +83,7 @@ const landsatPresets = [expression: '(B05-B06)/(B05+B06)',rescale: '-1,1',colormap_name: 'bwr_r',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_NDMI_Landsat_th.jpg',},{@@ -81,6 +93,7 @@ const landsatPresets = [expression: '(2.5*(B05-B04))/(B05+6*B04-7.5*B02+1)',rescale: '-1,1',colormap_name: 'brbg',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_EVI_Landsat_th.jpg',},{@@ -90,6 +103,7 @@ const landsatPresets = [expression: '1.5*((B05-B04)/(B05+B04+0.5))',rescale: '-1,1',colormap_name: 'brbg',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_SAVI_Landsat_th.jpg',},{@@ -99,6 +113,7 @@ const landsatPresets = [expression: '(2*B05+1-sqrt((2*B05+1)**2-8*(B05-B04)))/2',rescale: '-1,1',colormap_name: 'brbg',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_MSAVI_Landsat_th.jpg',},{@@ -108,6 +123,7 @@ const landsatPresets = [expression: '(B05-B07)/(B05+B07)',rescale: '-1,1',colormap_name: 'puor',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_NBR_Landsat_th.jpg',},{@@ -117,6 +133,7 @@ const landsatPresets = [expression: '(B06-B07)/(B06+B07)',rescale: '-1,1',colormap_name: 'puor',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_NBR2_Landsat_th.jpg',},{@@ -126,6 +143,7 @@ const landsatPresets = [expression: '(120*(B05-B03)-200*(B04-B03))/2',rescale: '-1,1',colormap_name: 'brbg',+ bands_regex: 'B[0-9][0-9]',img: 'HLS_TVI_Landsat_th.jpg',},];@@ -137,6 +155,8 @@ const sentinelPresets = [r: 'B08',g: 'B04',b: 'B03',+ color_formula: 'Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35',+ bands_regex: 'B[0-9][0-9A-Za-z]',img: 'HLS_False_Color_Sentinel_th.jpg',},{@@ -145,6 +165,8 @@ const sentinelPresets = [r: 'B12',g: 'B11',b: 'B04',+ color_formula: 'Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35',+ bands_regex: 'B[0-9][0-9A-Za-z]',img: 'HLS_False_Color_Urban_Sentinel_th.jpg',},{@@ -153,6 +175,8 @@ const sentinelPresets = [r: 'B11',g: 'B8A',b: 'B04',+ color_formula: 'Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35',+ bands_regex: 'B[0-9][0-9A-Za-z]',img: 'HLS_False_Color_Vegetation_Sentinel_th.jpg',},{@@ -161,6 +185,8 @@ const sentinelPresets = [r: 'B12',g: 'B8A',b: 'B04',+ color_formula: 'Gamma RGB 2.5 Saturation 1.2 Sigmoidal RGB 10 0.35',+ bands_regex: 'B[0-9][0-9A-Za-z]',img: 'HLS_SWIR_Sentinel_th.jpg',},{@@ -170,6 +196,7 @@ const sentinelPresets = [expression: '(B08-B04)/(B08+B04)',rescale: '-1,1',colormap_name: 'brbg',+ bands_regex: 'B[0-9][0-9A-Za-z]',asset_as_band: true,img: 'HLS_NDVI_Sentinel_th.jpg',},@@ -180,6 +207,7 @@ const sentinelPresets = [expression: '(B03-B08)/(B03+B08)',rescale: '-1,1',colormap_name: 'gnbu',+ bands_regex: 'B[0-9][0-9A-Za-z]',asset_as_band: true,img: 'HLS_NDWI_Sentinel_th.jpg',},@@ -190,6 +218,7 @@ const sentinelPresets = [expression: '(B03-B11)/(B03+B11)',rescale: '-1,1',colormap_name: 'winter_r',+ bands_regex: 'B[0-9][0-9A-Za-z]',asset_as_band: true,img: 'HLS_NDSI_Sentinel_th.jpg',},@@ -200,6 +229,7 @@ const sentinelPresets = [expression: '(B8A-B11)/(B8A+B11)',rescale: '-1,1',colormap_name: 'bwr_r',+ bands_regex: 'B[0-9][0-9A-Za-z]',asset_as_band: true,img: 'HLS_NDMI_Sentinel_th.jpg',},@@ -210,6 +240,7 @@ const sentinelPresets = [expression: '(2.5*(B8A-B04))/(B8A+6*B04-7.5*B02+1)',rescale: '-1,1',colormap_name: 'brbg',+ bands_regex: 'B[0-9][0-9A-Za-z]',img: 'HLS_EVI_Sentinel_th.jpg',},{@@ -219,6 +250,7 @@ const sentinelPresets = [expression: '1.428*((B8A-B04)/(B8A+B04+0.428))',rescale: '-1,1',colormap_name: 'brbg',+ bands_regex: 'B[0-9][0-9A-Za-z]',img: 'HLS_SAVI_Sentinel_th.jpg',},{@@ -228,6 +260,7 @@ const sentinelPresets = [expression: '(2*B8A+1-sqrt((2*B8A+1)**2-8*(B8A-B04)))/2',rescale: '-1,1',colormap_name: 'brbg',+ bands_regex: 'B[0-9][0-9A-Za-z]',img: 'HLS_MSAVI_Sentinel_th.jpg',},{@@ -237,6 +270,7 @@ const sentinelPresets = [expression: '(B8A-B12)/(B8A+B12)',rescale: '-1,1',colormap_name: 'puor',+ bands_regex: 'B[0-9][0-9A-Za-z]',img: 'HLS_NBR_Sentinel_th.jpg',},{@@ -246,6 +280,7 @@ const sentinelPresets = [expression: '(B11-B12)/(B11+B12)',rescale: '-1,1',colormap_name: 'puor',+ bands_regex: 'B[0-9][0-9A-Za-z]',img: 'HLS_NBR2_Sentinel_th.jpg',},{@@ -255,6 +290,7 @@ const sentinelPresets = [expression: '(120*(B8A-B03)-200*(B04-B03))/2',rescale: '-1,1',colormap_name: 'brbg',+ bands_regex: 'B[0-9][0-9A-Za-z]',img: 'HLS_TVI_Sentinel_th.jpg',},];@@ -273,6 +309,8 @@ export default function PresetOptions(props) {expression: preset.expression,rescale: preset.rescale,colormap_name: preset.colormap_name,+ color_formula: preset.color_formula,+ bands_regex: preset.bands_regex,asset_as_band: preset.asset_as_band,});};diff --git a/web/js/map/layerbuilder.js b/web/js/map/layerbuilder.jsindex 21a20d440..6fe594674 100644--- a/web/js/map/layerbuilder.js+++ b/web/js/map/layerbuilder.js@@ -10,8 +10,6 @@ import { get } from 'ol/proj';import { TileGrid as OlTileGridTileGrid, createXYZ } from 'ol/tilegrid';import MVT from 'ol/format/MVT';import GeoJSON from 'ol/format/GeoJSON';-import axios from 'axios';-import qs from 'qs';import SourceVectorTile from 'ol/source/VectorTile';import OlLayerVector from 'ol/layer/Vector';import OlSourceVector from 'ol/source/Vector';@@ -867,98 +865,6 @@ export default function mapLayerBuilder(config, cache, store) {return layer;};- const registerSearch = async (def, options, state) => {- const { date } = state;- let requestDate;- if (options.group === 'activeB') {- requestDate = date.selectedB;- } else {- requestDate = date.selected;- }-- const formattedDate = util.toISOStringSeconds(requestDate).slice(0, 10);- const layerID = def.id;- const BASE_URL = 'https://d1nzvsko7rbono.cloudfront.net';- const {- r,- g,- b,- expression,- assets = [],- } = def.bandCombo;- const bandCombo = [r, g, b, ...assets].filter((band) => band);-- const landsatLayers = [- 'HLS_Customizable_Landsat',- 'HLS_False_Color_Landsat',- 'HLS_False_Color_Urban_Landsat',- 'HLS_False_Color_Vegetation_Landsat',- 'HLS_Shortwave_Infrared_Landsat',- 'HLS_NDVI_Landsat',- 'HLS_NDWI_Landsat',- 'HLS_NDSI_Landsat',- 'HLS_Moisture_Index_Landsat',- 'HLS_EVI_Landsat',- 'HLS_SAVI_Landsat',- 'HLS_MSAVI_Landsat',- 'HLS_NBR2_Landsat',- 'HLS_NBR_Landsat',- 'HLS_TVI_Landsat',- ];-- const collectionID = landsatLayers.includes(layerID) ? 'HLSL30' : 'HLSS30';-- const temporalRange = [`${formattedDate}T00:00:00Z`, `${formattedDate}T23:59:59Z`];-- const collectionsFilter = {- op: '=',- args: [{ property: 'collection' }, collectionID],- };-- const temporalFilter = {- op: 't_intersects',- args: [{ property: 'datetime' }, { interval: temporalRange }],- };-- const searchBody = {- 'filter-lang': 'cql2-json',- context: 'on',- filter: {- op: 'and',- args: [- collectionsFilter,- temporalFilter,- ],- },- };-- const mosaicResponse = await axios- .post(`${BASE_URL}/mosaic/register`, searchBody)- .then((res) => res.data);-- const tilesHref = mosaicResponse.links.find(- (link) => link.rel === 'tilejson',- ).href;-- const params = {- post_process: 'swir',- assets: bandCombo,- expression,- };-- const queryString = qs.stringify(params, { arrayFormat: 'repeat' });-- const tilejsonResponse = await axios- .get(tilesHref, {- params: new URLSearchParams(queryString),- })- .then((res) => res.data);-- const { name } = tilejsonResponse;-- return name;- };-const createTitilerLayer = async (def, options, day, state) => {const { proj: { selected }, date } = state;const { maxExtent, crs } = selected;@@ -1042,22 +948,30 @@ export default function mapLayerBuilder(config, cache, store) {const source = config.sources[def.source];- const searchID = await registerSearch(def, options, state);-const tileUrlFunction = (tileCoord) => {const z = tileCoord[0] - 1;const x = tileCoord[1];const y = tileCoord[2];+ const dateTimeTile = state.date.selected?.toISOString().split('T');+ dateTimeTile.pop();+ dateTimeTile.push('00:00:00Z');+ const zeroedDateTile = dateTimeTile.join('T');+ dateTimeTile.pop();+ dateTimeTile.push('23:59:59Z');+ const lastDateTile = dateTimeTile.join('T');+const assets = [r, g, b, ...def.bandCombo.assets || []].filter((b) => b);- const params = assets.map((asset) => `assets=${asset}`);+ const params = assets.map((asset) => `bands=${asset}`);params.push(`expression=${encodeURIComponent(def?.bandCombo?.expression)}`);params.push(`rescale=${encodeURIComponent(def?.bandCombo?.rescale)}`);params.push(`colormap_name=${def?.bandCombo?.colormap_name}`);params.push(`asset_as_band=${def?.bandCombo?.asset_as_band}`);+ params.push(`bands_regex=${def?.bandCombo?.bands_regex}`);+ params.push(`color_formula=${def?.bandCombo?.color_formula}`);- const urlParams = `mosaic/tiles/${searchID}/WGS1984Quad/${z}/${x}/${y}@1x?post_process=swir&${params.filter((p) => !p.split('=').includes('undefined')).join('&')}`;+ const urlParams = `tiles/WGS1984Quad/${z}/${x}/${y}@1x?concept_id=${def.collectionConceptID}&datetime=${zeroedDateTile}/${lastDateTile}&post_process=swir&backend=rasterio&${params.filter((p) => !p.split('=').includes('undefined')).join('&')}`;return source.url + urlParams;};