Merge branch 'georchestra:master' into master

.github/workflows/cadastrapp.yml

@@ -88,6 +88,16 @@ jobs:
       run: |
         docker push georchestra/cadastrapp:${{ steps.version.outputs.VERSION }}
 
+    - name: "Update Docker Hub Description for Cadastrapp"
+      if: github.ref == 'refs/heads/master' && github.repository == 'georchestra/cadastrapp' && github.actor != 'dependabot[bot]' && github.event_name != 'pull_request'
+      uses: peter-evans/dockerhub-description@v3
+      with:
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+        repository: georchestra/cadastrapp
+        readme-filepath: ./DOCKER_HUB.md
+        short-description: 'Cadastrapp module for the geOrchestra SDI'
+
     - name: "Publish binary in artifactory"
       run: ./mvn deploy
       continue-on-error: true

DOCKER_HUB.md

@@ -0,0 +1,58 @@
+# Quick reference
+
+-    **Maintained by**:  
+      [georchestra.org](https://www.georchestra.org/)
+
+-    **Where to get help**:  
+     the [geOrchestra Github repo](https://github.com/georchestra/georchestra), [IRC chat](https://kiwiirc.com/nextclient/irc.libera.chat/georchestra), Stack Overflow
+
+# Featured tags
+
+- `latest`
+
+# Quick reference
+
+-	**Where to file issues**:  
+     [https://github.com/georchestra/georchestra/issues](https://github.com/georchestra/georchestra/issues)
+
+-	**Supported architectures**:   
+     [`amd64`](https://hub.docker.com/r/amd64/docker/)
+
+-	**Source of this description**:  
+     [docs repo's directory](https://github.com/georchestra/cadastrapp/blob/master/DOCKER_HUB.md)
+
+# What is `georchestra/cadastrapp`
+
+**Cadastrapp** is the tool for consulting cadastral data provided by the French Directorate General of Public Finances (DGFiP) for geOrchestra 
+
+# How to use this image
+
+As for every other geOrchestra webapp, its configuration resides in the data directory ([datadir](https://github.com/georchestra/datadir)), typically something like /etc/georchestra, where it expects to find a cadstrapp/ sub-directory.
+
+It is recommended to use the official docker composition: https://github.com/georchestra/docker.
+
+Example : 
+```
+  cadastrapp:
+    image: georchestra/cadastrapp:latest
+    environment:
+      XMX: 512m
+      JAVA_OPTIONS: -Duser.language=fr -Duser.country=FR
+      CADASTRAPP_JDBC_URL: jdbc:postgresql://database:5432/cadastrapp
+      CADASTRAPP_JDBC_USER: cadastrapp
+      CADASTRAPP_JDBC_PASSWORD: cadastrapp
+```
+
+## Where is it built
+
+This image is built using maven : `mvn package docker:build -pl cadastrapp -Pdocker` in the repo https://github.com/georchestra/cadastrapp/.
+
+# License
+
+View [license information](https://www.georchestra.org/software.html) for the software contained in this image.
+
+As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
+
+[//]: # (Some additional license information which was able to be auto-detected might be found in [the `repo-info` repository's georchestra/ directory]().)
+
+As for any docker image, it is the user's responsibility to ensure that usages of this image comply with any relevant licenses for all software contained within.

README.md

@@ -2,7 +2,7 @@
 
 ## À propos de Cadastrapp
 
-Cadastrapp est l’outil de consultation des données cadastrales fournies par la Direction Générale des Finances Publiques (DGFiP) pour geOrchestra geOrchestra. Il est composé d’un module serveur qui est une API d’accès aux données de la matrice foncière et d'un greffon pour le visualiseur de geOrchestra. L’API peut être utilisée par n’importe quelle application client sous réserve de passer par le système d’authentification de [geOrchestra](https://www.georchestra.org).
+Cadastrapp est l’outil de consultation des données cadastrales fournies par la Direction Générale des Finances Publiques (DGFiP) pour geOrchestra. Il est composé d’un module serveur qui est une API d’accès aux données de la matrice foncière et d'un greffon pour le visualiseur de geOrchestra. L’API peut être utilisée par n’importe quelle application client sous réserve de passer par le système d’authentification de [geOrchestra](https://www.georchestra.org).
 
 ## Organisation
 

cadastrapp/pom.xml

@@ -381,7 +381,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-war-plugin</artifactId>
-            <version>2.2</version>
+            <version>3.4.0</version>
             <configuration>
               <classifier>generic</classifier>
               <warName>${project.artifactId}</warName>

cadastrapp/src/main/java/org/georchestra/cadastrapp/service/ImageParcelleController.java

@@ -80,7 +80,7 @@ public class ImageParcelleController extends CadController {
 	static final Logger logger = LoggerFactory.getLogger(ImageParcelleController.class);
 
 	private final String URL_GET_CAPABILITIES = "?REQUEST=GetCapabilities&version=1.0.0";
-	private final String URL_GET_CAPABILITIES_WMS = "?VERSION=1.1.1&Request=GetCapabilities&Service=WMS";
+	private final String URL_GET_CAPABILITIES_WMS = "?Request=GetCapabilities&Service=WMS";
 
 	// buffer ratio
 	final private double MAX_PERIMETER = 2000;

cadastrapp/src/main/resources/cadastrapp.properties

@@ -68,30 +68,35 @@ pdf.baseMap.image.folder=images
 # pdf.baseMap.0.title.thumbnail=osm.png
 
 # here we set an URL to use a remote png/jpeg file from another web site 
-pdf.baseMap.0.title.thumbnail=http://kartenn.region-bretagne.fr/patrimoine/img/basemap/osm_google.png
+pdf.baseMap.0.title.thumbnail=https://ids.craig.fr/mapstore/ortho.png
 
 # BaseMap Title to be display in user interface
-pdf.baseMap.0.title=OSM Google Style - geobretagne
-pdf.baseMap.0.wms.url=http://osm.geobretagne.fr/service/wms?VERSION=1.1.1&Request=GetCapabilities&Service=WMS
-pdf.baseMap.0.layer.name=osm:google
-pdf.baseMap.0.format=image/png
+pdf.baseMap.0.title=Orthophotographie IGN
+pdf.baseMap.0.wms.url=https://data.geopf.fr/wms-r/wms
+pdf.baseMap.0.layer.name=HR.ORTHOIMAGERY.ORTHOPHOTOS
+pdf.baseMap.0.format=image/jpeg
 pdf.baseMap.0.SRS=EPSG:3857
 # only used when wms service need authentification
 # if empty no authentification is used
 pdf.baseMap.0.wms.username=
 pdf.baseMap.0.wms.password=
 
 # BaseMap Title to be display in user interface
-#pdf.baseMap.1.title=OSM Map Style - geobretagne
-#pdf.basemap.1.title.thumbnail:http://kartenn.region-bretagne.fr/patrimoine/img/basemap/osm.png
-#pdf.baseMap.1.wms.url=http://osm.geobretagne.fr/service/wms?VERSION=1.1.1&Request=GetCapabilities&Service=WMS
-#pdf.baseMap.1.layer.name=osm:map
-#pdf.baseMap.1.format=image/png
-#pdf.baseMap.1.SRS=EPSG:3857
+pdf.baseMap.1.title=Plan IGN
+pdf.baseMap.1.title.thumbnail=https://ids.craig.fr/mapstore/planign.png
+pdf.baseMap.1.wms.url=https://data.geopf.fr/wms-r/wms
+pdf.baseMap.1.layer.name=GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2
+pdf.baseMap.1.format=image/png
+pdf.baseMap.1.SRS=EPSG:3857
 ## only used when wms service need authentification
 ## if empty no authentification is used
 #pdf.baseMap.1.wms.username=
 #pdf.baseMap.1.wms.password=
+
+# empty/no basemap
+pdf.baseMap.2.title=Pas de fond
+pdf.baseMap.2.title.thumbnail=https://ids.craig.fr/mapstore/white.png
+pdf.baseMap.2.wms.url=
 ###########################################################
 
 ## information about WMS and WFS service 
@@ -111,8 +116,8 @@ cadastre.wms.password=
 # Note that it must support SLD_BODY WMS param
 # if using geoserver > 2.16 make sure to use a workspace-specific endpoint and
 # don't put the workspace prefix in the layer name
-parcelle.wms.url=
-parcelle.wms.layer.name=
+parcelle.wms.url=https://georchestra.example.org/geoserver/qgis/wms
+parcelle.wms.layer.name=geo_parcelle
 # The plot identifier field for the service
 parcelle.wms.layer.id=
 # only used when wms service need authentification