Add wms endpoint for FAO zones

Author: louptheron

.github/workflows/cicd.yml

@@ -304,7 +304,7 @@ jobs:
     name: Push to registry
     needs: [version, e2e_test, e2e_multi_windows_test]
     runs-on: ubuntu-22.04
-    if: needs.version.outputs.IS_RELEASE && !contains(github.ref, 'dependabot')
+    if: !contains(github.ref, 'dependabot')
     env:
       IS_RELEASE: ${{ needs.version.outputs.IS_RELEASE }}
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true

frontend/src/features/AdministrativeZone/layers/AdministrativeLayers.tsx

@@ -1,3 +1,4 @@
+import { FAO_LAYER } from '@features/AdministrativeZone/layers/constants'
 import React, { useEffect } from 'react'
 
 import {
@@ -7,6 +8,7 @@ import {
   layersNotInCurrentOLMap,
   layersNotInShowedLayers
 } from '../../../domain/entities/layers'
+import { LayerProperties } from '../../../domain/entities/layers/constants'
 import { useMainAppSelector } from '../../../hooks/useMainAppSelector'
 import { monitorfishMap } from '../../map/monitorfishMap'
 import { getVectorOLLayer } from '../useCases/showAdministrativeZone'
@@ -30,6 +32,13 @@ function UnmemoizedAdministrativeLayers() {
         if (!layerToInsert) {
           return
         }
+
+        if (layerToInsert.type === LayerProperties.FAO.code) {
+          olLayers.push(FAO_LAYER)
+
+          return
+        }
+
         const VectorLayer = getVectorOLLayer(layerToInsert.type, layerToInsert.zone, isBackoffice)
         olLayers.push(VectorLayer)
       })

frontend/src/features/AdministrativeZone/layers/constants.ts

@@ -0,0 +1,13 @@
+import TileLayer from 'ol/layer/Tile'
+import { TileWMS } from 'ol/source'
+
+export const FAO_LAYER = new TileLayer({
+  source: new TileWMS({
+    params: { FORMAT: 'image/png', LAYERS: 'monitorfish:fao_areas', STYLES: 'monitorfish:FAO style', TILED: true },
+    serverType: 'geoserver',
+    // Countries have transparency, so do not fade tiles:
+    transition: 0,
+
+    url: `${import.meta.env.FRONTEND_GEOSERVER_REMOTE_URL}/geoserver/monitorfish/wms`
+  })
+})

frontend/src/features/AdministrativeZone/layers/styles/administrativeLayer.style.ts

@@ -29,23 +29,6 @@ export function getAdministrativeLayerStyle(type: string) {
             }`
           })
         })
-    case LayerProperties.FAO.code:
-      return (feature: Feature | undefined) =>
-        new Style({
-          stroke: new Stroke({
-            color: '#767AB2',
-            width: 1
-          }),
-          text: new Text({
-            fill: new Fill({ color: THEME.color.gunMetal }),
-            font: '12px Marianne',
-            overflow: true,
-            stroke: new Stroke({ color: 'rgba(255,255,255,0.4)', width: 2 }),
-            text: `${
-              (LayerProperties.FAO.zoneNamePropertyKey && feature?.get(LayerProperties.FAO.zoneNamePropertyKey)) || ''
-            }`
-          })
-        })
     case LayerProperties.AEM.code:
       return (feature: Feature | undefined) =>
         new Style({