From 925afbcea0d07ff7832d7f5d482e8481bc4fcbfe Mon Sep 17 00:00:00 2001 From: Lubomir Dolezal Date: Fri, 20 Oct 2023 09:27:46 +0200 Subject: [PATCH 1/3] chore: add s1 eodc layers as base --- app/src/config/gtif.js | 18 +++++++++++++++--- app/src/config/layers.js | 16 ++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/app/src/config/gtif.js b/app/src/config/gtif.js index b2f93ee15d..4836a96871 100644 --- a/app/src/config/gtif.js +++ b/app/src/config/gtif.js @@ -209,6 +209,8 @@ export const mapDefaults = Object.freeze({ }); export const baseLayersMap = [ + baseLayers.s1EodcBackscattervv, + baseLayers.s1EodcBackscattervh, baseLayers.S2GLC, baseLayers.ESA_WORLD_COVER, baseLayers.CORINE_LAND_COVER, @@ -487,7 +489,9 @@ export const indicatorsDefinition = Object.freeze({ baseLayers.ESA_WORLD_COVER, baseLayers.CORINE_LAND_COVER, baseLayers.geolandbasemap, - baseLayers.bmaporthofoto30cm], + baseLayers.bmaporthofoto30cm, + baseLayers.s1EodcBackscattervv, + baseLayers.s1EodcBackscattervh], }, REP4_2: { indicator: 'Hydro Power SWE monthly', @@ -505,7 +509,9 @@ export const indicatorsDefinition = Object.freeze({ baseLayers.ESA_WORLD_COVER, baseLayers.CORINE_LAND_COVER, baseLayers.geolandbasemap, - baseLayers.bmaporthofoto30cm], + baseLayers.bmaporthofoto30cm, + baseLayers.s1EodcBackscattervv, + baseLayers.s1EodcBackscattervh], }, REP4_4: { indicator: 'Hydro Power WSE monthly', @@ -535,7 +541,9 @@ export const indicatorsDefinition = Object.freeze({ baseLayers.ESA_WORLD_COVER, baseLayers.CORINE_LAND_COVER, baseLayers.geolandbasemap, - baseLayers.bmapgelaende], + baseLayers.bmapgelaende, + baseLayers.s1EodcBackscattervv, + baseLayers.s1EodcBackscattervh], }, REP5: { indicator: 'Potential Assessment', @@ -545,6 +553,8 @@ export const indicatorsDefinition = Object.freeze({ baseLayers: [{ ...baseLayers.bmapgelaende, visible: true, }, + baseLayers.s1EodcBackscattervv, + baseLayers.s1EodcBackscattervh, baseLayers.S2GLC, baseLayers.ESA_WORLD_COVER, baseLayers.CORINE_LAND_COVER, @@ -566,6 +576,8 @@ export const indicatorsDefinition = Object.freeze({ baseLayers: [{ ...baseLayers.bmapgelaende, visible: true, }, + baseLayers.s1EodcBackscattervv, + baseLayers.s1EodcBackscattervh, baseLayers.terrainLight, baseLayers.eoxosm, baseLayers.S2GLC, diff --git a/app/src/config/layers.js b/app/src/config/layers.js index 2b41016d5f..ee86cc294f 100644 --- a/app/src/config/layers.js +++ b/app/src/config/layers.js @@ -137,6 +137,22 @@ export const baseLayers = Object.freeze({ ], normalize: true, }, + s1EodcBackscattervv: { + name: 'EODC Sentinel 1 VV Polarisation', + url: '//s1map.eodc.eu/vv/{z}/{x}/{y}.png', + attribution: `Bauer-Marschallinger, B., Cao, S., Navacchi, C., Freeman, V., Reuß, F., Geudtner, D., Rommen, B., Vega, F. C., Snoeij, P., Attema, E., Reimer, C., & Wagner, W. (2021). The Sentinel-1 Global Backscatter Model (S1GBM) - Mapping Earth's Land Surface with C-Band Microwaves (1.0) [Data set]. TU Wien. https://doi.org/10.48436/n2d1v-gqb91`, + visible: false, + maxZoom: 17, + protocol: 'xyz', + }, + s1EodcBackscattervh: { + name: 'EODC Sentinel 1 VH Polarisation', + url: '//s1map.eodc.eu/vh/{z}/{x}/{y}.png', + attribution: `Bauer-Marschallinger, B., Cao, S., Navacchi, C., Freeman, V., Reuß, F., Geudtner, D., Rommen, B., Vega, F. C., Snoeij, P., Attema, E., Reimer, C., & Wagner, W. (2021). The Sentinel-1 Global Backscatter Model (S1GBM) - Mapping Earth's Land Surface with C-Band Microwaves (1.0) [Data set]. TU Wien. https://doi.org/10.48436/n2d1v-gqb91`, + visible: false, + maxZoom: 17, + protocol: 'xyz', + }, }); export const overlayLayers = Object.freeze({ From 152590d2308e5b5ada9cdd76fc4e88f83a90e1ba Mon Sep 17 00:00:00 2001 From: Lubomir Dolezal Date: Wed, 25 Oct 2023 18:27:52 +0200 Subject: [PATCH 2/3] fix: use -y for EODC layers --- app/src/config/layers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/config/layers.js b/app/src/config/layers.js index ee86cc294f..cc0c75606d 100644 --- a/app/src/config/layers.js +++ b/app/src/config/layers.js @@ -139,7 +139,7 @@ export const baseLayers = Object.freeze({ }, s1EodcBackscattervv: { name: 'EODC Sentinel 1 VV Polarisation', - url: '//s1map.eodc.eu/vv/{z}/{x}/{y}.png', + url: '//s1map.eodc.eu/vv/{z}/{x}/{-y}.png', attribution: `Bauer-Marschallinger, B., Cao, S., Navacchi, C., Freeman, V., Reuß, F., Geudtner, D., Rommen, B., Vega, F. C., Snoeij, P., Attema, E., Reimer, C., & Wagner, W. (2021). The Sentinel-1 Global Backscatter Model (S1GBM) - Mapping Earth's Land Surface with C-Band Microwaves (1.0) [Data set]. TU Wien. https://doi.org/10.48436/n2d1v-gqb91`, visible: false, maxZoom: 17, @@ -147,7 +147,7 @@ export const baseLayers = Object.freeze({ }, s1EodcBackscattervh: { name: 'EODC Sentinel 1 VH Polarisation', - url: '//s1map.eodc.eu/vh/{z}/{x}/{y}.png', + url: '//s1map.eodc.eu/vh/{z}/{x}/{-y}.png', attribution: `Bauer-Marschallinger, B., Cao, S., Navacchi, C., Freeman, V., Reuß, F., Geudtner, D., Rommen, B., Vega, F. C., Snoeij, P., Attema, E., Reimer, C., & Wagner, W. (2021). The Sentinel-1 Global Backscatter Model (S1GBM) - Mapping Earth's Land Surface with C-Band Microwaves (1.0) [Data set]. TU Wien. https://doi.org/10.48436/n2d1v-gqb91`, visible: false, maxZoom: 17, From a6d2157d87ffcb4accf701c29d68db48b0ebe657 Mon Sep 17 00:00:00 2001 From: Lubomir Dolezal Date: Wed, 25 Oct 2023 18:37:00 +0200 Subject: [PATCH 3/3] chore: set maxZoom for eodc s1 layer --- app/src/config/layers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/config/layers.js b/app/src/config/layers.js index cc0c75606d..4e01017390 100644 --- a/app/src/config/layers.js +++ b/app/src/config/layers.js @@ -142,7 +142,7 @@ export const baseLayers = Object.freeze({ url: '//s1map.eodc.eu/vv/{z}/{x}/{-y}.png', attribution: `Bauer-Marschallinger, B., Cao, S., Navacchi, C., Freeman, V., Reuß, F., Geudtner, D., Rommen, B., Vega, F. C., Snoeij, P., Attema, E., Reimer, C., & Wagner, W. (2021). The Sentinel-1 Global Backscatter Model (S1GBM) - Mapping Earth's Land Surface with C-Band Microwaves (1.0) [Data set]. TU Wien. https://doi.org/10.48436/n2d1v-gqb91`, visible: false, - maxZoom: 17, + maxZoom: 13, protocol: 'xyz', }, s1EodcBackscattervh: { @@ -150,7 +150,7 @@ export const baseLayers = Object.freeze({ url: '//s1map.eodc.eu/vh/{z}/{x}/{-y}.png', attribution: `Bauer-Marschallinger, B., Cao, S., Navacchi, C., Freeman, V., Reuß, F., Geudtner, D., Rommen, B., Vega, F. C., Snoeij, P., Attema, E., Reimer, C., & Wagner, W. (2021). The Sentinel-1 Global Backscatter Model (S1GBM) - Mapping Earth's Land Surface with C-Band Microwaves (1.0) [Data set]. TU Wien. https://doi.org/10.48436/n2d1v-gqb91`, visible: false, - maxZoom: 17, + maxZoom: 13, protocol: 'xyz', }, });