From af0a5b55cc6825fb5cc0a6310fd645113f80cb42 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Thu, 14 Nov 2024 15:53:17 +0100 Subject: [PATCH 1/4] allow to use a distinct url/layername for background in BPs sometimes we dont want to use the same layer in the web interface (where the zoom levels are known and the WMS is backed by a cached layer) and in the BP (when the zoom level depends on the plot size and we might want an uncached layer). --- .../service/ImageParcelleController.java | 14 ++++++++++---- .../src/main/resources/cadastrapp.properties | 5 +++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/cadastrapp/src/main/java/org/georchestra/cadastrapp/service/ImageParcelleController.java b/cadastrapp/src/main/java/org/georchestra/cadastrapp/service/ImageParcelleController.java index 3e3c1b91..bea74866 100644 --- a/cadastrapp/src/main/java/org/georchestra/cadastrapp/service/ImageParcelleController.java +++ b/cadastrapp/src/main/java/org/georchestra/cadastrapp/service/ImageParcelleController.java @@ -269,16 +269,22 @@ public ResponseEntity createImageBordereauParcellaire( logger.debug("Call WMS for cadastral background"); // Get cadastral background image with good BBOX - final String cadastralLayerWmsUrl = CadastrappPlaceHolder.getProperty("cadastre.wms.url"); + String cadastralLayerWmsUrl = CadastrappPlaceHolder.getProperty("cadastre.wms.url"); final String cadastralLayerWmsUsername = CadastrappPlaceHolder.getProperty("cadastre.wms.username"); final String cadastralLayerWmsPassword = CadastrappPlaceHolder.getProperty("cadastre.wms.password"); - + // overriden by cadastrebpbg if defined - allows to use a different layer source url for backgrounds in BPs + if (CadastrappPlaceHolder.getProperty("cadastrebpbg.wms.url") != null && !CadastrappPlaceHolder.getProperty("cadastrebpbg.wms.url").isEmpty()) { + cadastralLayerWmsUrl = CadastrappPlaceHolder.getProperty("cadastrebpbg.wms.url"); + } WebMapServer wmsCadastralLayer = createWebMapServer(cadastralLayerWmsUrl,cadastralLayerWmsUsername, cadastralLayerWmsPassword ); - final String cadastralLayerName = CadastrappPlaceHolder.getProperty("cadastre.wms.layer.name"); + String cadastralLayerName = CadastrappPlaceHolder.getProperty("cadastre.wms.layer.name"); final String cadastreSRS = CadastrappPlaceHolder.getProperty("cadastre.SRS"); final String cadastralLayerFormat = CadastrappPlaceHolder.getProperty("cadastre.format"); - + // overriden by cadastrebpbg if defined - allows to use a different layer name for backgrounds in BPs + if (CadastrappPlaceHolder.getProperty("cadastrebpbg.wms.layer.name") != null && !CadastrappPlaceHolder.getProperty("cadastrebpbg.wms.layer.name").isEmpty()) { + cadastralLayerName = CadastrappPlaceHolder.getProperty("cadastrebpbg.wms.layer.name"); + } GetMapRequest requestCadastralLayer = createAndConfigureMapRequest(wmsCadastralLayer, cadastralLayerFormat, cadastralLayerName, pdfImagePixelSize, cadastreSRS, bounds); logger.debug("Create background cadastral image"); diff --git a/cadastrapp/src/main/resources/cadastrapp.properties b/cadastrapp/src/main/resources/cadastrapp.properties index 4d7f3abb..559c5f71 100644 --- a/cadastrapp/src/main/resources/cadastrapp.properties +++ b/cadastrapp/src/main/resources/cadastrapp.properties @@ -111,6 +111,11 @@ cadastre.wms.layer.name=qgis:geo_parcelle cadastre.wms.username= cadastre.wms.password= +#if defined, used instead of cadastre.wms for the background layer in BP +#useful of cadastre.wms points at a cached layer and you want a different layer without resampling for BPs. +#cadastrebpbg.wms.url=https://georchestra.example.org/geoserver/wms +#cadastrebpbg.wms.layer.name=qgis:geo_parcelle + # Here you can configure the layer used to generate the plot selection on BP # let it empty if cadastre.wms.url support SLD_BODY WMS param # Note that it must support SLD_BODY WMS param From 29d9e4c88d03982aff05d256029ca4e501fb1379 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Thu, 14 Nov 2024 16:06:37 +0100 Subject: [PATCH 2/4] workflow: update deprecated cache/upload-artifact actions --- .github/workflows/cadastrapp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cadastrapp.yml b/.github/workflows/cadastrapp.yml index 1f06b5b1..828d9fe1 100644 --- a/.github/workflows/cadastrapp.yml +++ b/.github/workflows/cadastrapp.yml @@ -19,7 +19,7 @@ jobs: java-version: '17' - name: "Maven repository caching" - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.m2/repository key: cadastrapp-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -37,7 +37,7 @@ jobs: run: mkdir -p scratch && cp cadastrapp/target/georchestra-cadastrapp*.deb scratch/ - name: "publish deb as artifact" - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: cadastrapp.deb path: scratch/ From e5cad2cace85a46bbd0c99c4c30397f7c08a5baf Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Thu, 14 Nov 2024 16:20:57 +0100 Subject: [PATCH 3/4] workflow: bump checkout/cache/setup-java actions versions --- .github/workflows/cadastrapp.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cadastrapp.yml b/.github/workflows/cadastrapp.yml index 828d9fe1..c217fd76 100644 --- a/.github/workflows/cadastrapp.yml +++ b/.github/workflows/cadastrapp.yml @@ -11,10 +11,10 @@ jobs: runs-on: ubuntu-latest steps: - name: "Checking out" - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: "Setting up Java" - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: '17' @@ -46,15 +46,15 @@ jobs: runs-on: ubuntu-latest steps: - name: "Checking out" - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: "Setting up Java" - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: '17' - name: "Maven repository caching" - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.m2/repository key: cadastrapp-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From c1f4a56a89eea082c682557288c64cb5ea318790 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Thu, 14 Nov 2024 16:23:12 +0100 Subject: [PATCH 4/4] workflow: distribution is mandatory, use adopt --- .github/workflows/cadastrapp.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cadastrapp.yml b/.github/workflows/cadastrapp.yml index c217fd76..00be072a 100644 --- a/.github/workflows/cadastrapp.yml +++ b/.github/workflows/cadastrapp.yml @@ -16,6 +16,7 @@ jobs: - name: "Setting up Java" uses: actions/setup-java@v4 with: + distribution: 'adopt' java-version: '17' - name: "Maven repository caching" @@ -51,6 +52,7 @@ jobs: - name: "Setting up Java" uses: actions/setup-java@v4 with: + distribution: 'adopt' java-version: '17' - name: "Maven repository caching"