[Tech] update imports

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBDepartmentAreaRepository.kt

@@ -8,7 +8,7 @@ import org.springframework.data.repository.CrudRepository
 interface IDBDepartmentAreaRepository : CrudRepository<DepartmentAreaModel, Int> {
     @Query(
         value =
-        """
+            """
         SELECT *
         FROM departments_areas
         WHERE insee_dep = :inseeCode

backend/src/main/kotlin/fr/gouv/cacem/monitorenv/infrastructure/database/repositories/interfaces/IDBReportingRepository.kt

@@ -18,7 +18,7 @@ interface IDBReportingRepository : JpaRepository<ReportingModel, Int> {
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query(
         value =
-        """
+            """
         UPDATE reportings
         SET is_archived = TRUE
         WHERE (created_at + make_interval(hours => validity_time)) < NOW() AND is_archived IS FALSE
@@ -30,7 +30,7 @@ interface IDBReportingRepository : JpaRepository<ReportingModel, Int> {
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query(
         value =
-        """
+            """
         UPDATE reportings
         SET is_archived = TRUE
         WHERE id in (:ids)
@@ -42,7 +42,7 @@ interface IDBReportingRepository : JpaRepository<ReportingModel, Int> {
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query(
         value =
-        """
+            """
         UPDATE reportings
         SET
             mission_id = :missionId,
@@ -60,7 +60,7 @@ interface IDBReportingRepository : JpaRepository<ReportingModel, Int> {
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query(
         value =
-        """
+            """
         UPDATE reportings
             SET attached_env_action_id = CASE WHEN id in (:reportingIds) THEN :envActionId ELSE NULL END
             WHERE id in (:reportingIds) or attached_env_action_id = :envActionId
@@ -75,7 +75,7 @@ interface IDBReportingRepository : JpaRepository<ReportingModel, Int> {
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query(
         value =
-        """
+            """
         UPDATE reportings
         SET is_deleted = TRUE
         WHERE id = :id
@@ -87,7 +87,7 @@ interface IDBReportingRepository : JpaRepository<ReportingModel, Int> {
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query(
         value =
-        """
+            """
         UPDATE reportings
         SET is_deleted = TRUE
         WHERE id in (:ids)
@@ -99,7 +99,7 @@ interface IDBReportingRepository : JpaRepository<ReportingModel, Int> {
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query(
         value =
-        """
+            """
         UPDATE reportings
         SET attached_env_action_id = NULL
         WHERE mission_id = :missionId AND (:envActionIds IS NULL OR attached_env_action_id NOT IN (:envActionIds))
@@ -176,7 +176,7 @@ interface IDBReportingRepository : JpaRepository<ReportingModel, Int> {
     @EntityGraph(value = "ReportingModel.fullLoad", type = EntityGraph.EntityGraphType.LOAD)
     @Query(
         value =
-        """
+            """
         SELECT reporting
         FROM ReportingModelJpa reporting
         INNER JOIN ReportingSourceModel rs ON reporting.id = rs.reporting.id
@@ -187,7 +187,7 @@ interface IDBReportingRepository : JpaRepository<ReportingModel, Int> {
 
     @Query(
         value =
-        """
+            """
         SELECT reporting
         FROM ReportingModelJpa reporting
         WHERE reporting.mission.id = :missionId
@@ -197,7 +197,7 @@ interface IDBReportingRepository : JpaRepository<ReportingModel, Int> {
 
     @Query(
         value =
-        """
+            """
         SELECT r.id FROM ReportingModel r
         WHERE ST_INTERSECTS(st_setsrid(r.geom, 4326), st_buffer(st_setsrid(:geometry, 4326), 0))
         """,

frontend/src/api/administrativeLayersAPI.ts

@@ -1,4 +1,4 @@
-import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../domain/entities/map/constants'
+import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 
 const OK = 200
 

frontend/src/domain/entities/layers/index.ts

@@ -1,6 +1,7 @@
+import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import { GeoJSON } from 'ol/format'
 
-import { OLGeometryType, OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../map/constants'
+import { OLGeometryType } from '../map/constants'
 
 import type { GeoJSON as GeoJSONType } from '../../types/GeoJSON'
 import type { MultiPoint, Point, MultiPolygon, Polygon } from 'ol/geom'

frontend/src/domain/entities/map/constants.ts

@@ -1,6 +1,3 @@
-export const WSG84_PROJECTION = 'EPSG:4326'
-export const OPENLAYERS_PROJECTION = 'EPSG:3857'
-
 export enum InteractionType {
   CIRCLE = 'CIRCLE',
   POINT = 'POINT',

frontend/src/domain/types/map.ts

@@ -1,7 +1,8 @@
+import { OPENLAYERS_PROJECTION } from '@mtes-mct/monitor-ui'
 import Feature, { type FeatureLike } from 'ol/Feature'
 import { GeoJSON } from 'ol/format'
 
-import { OPENLAYERS_PROJECTION, type InteractionListener, type InteractionType } from '../entities/map/constants'
+import { type InteractionListener, type InteractionType } from '../entities/map/constants'
 
 import type { Coordinate } from 'ol/coordinate'
 import type { Geometry } from 'ol/geom'

frontend/src/domain/use_cases/administrative/showAdministrativeLayer.ts

@@ -1,3 +1,4 @@
+import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import _ from 'lodash'
 import GeoJSON from 'ol/format/GeoJSON'
 import VectorImageLayer from 'ol/layer/VectorImage'
@@ -8,7 +9,6 @@ import { getAdministrativeZoneFromAPI } from '../../../api/administrativeLayersA
 import { getAdministrativeLayersStyle } from '../../../features/map/layers/styles/administrativeAndRegulatoryLayers.style'
 import { administrativeLayers } from '../../entities/administrativeLayers'
 import { LayerType } from '../../entities/layers/constants'
-import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../../entities/map/constants'
 
 const IRRETRIEVABLE_FEATURES_EVENT = 'IRRETRIEVABLE_FEATURES'
 

frontend/src/domain/use_cases/measurement/saveMeasurement.ts

@@ -1,9 +1,10 @@
+import { OPENLAYERS_PROJECTION } from '@mtes-mct/monitor-ui'
 import GeoJSON from 'ol/format/GeoJSON'
 import Circle from 'ol/geom/Circle'
 import { fromCircle } from 'ol/geom/Polygon'
 import { batch } from 'react-redux'
 
-import { DistanceUnit, OPENLAYERS_PROJECTION } from '../../entities/map/constants'
+import { DistanceUnit } from '../../entities/map/constants'
 import { addMeasurementDrawed, resetCircleMeasurementInDrawing } from '../../shared_slices/Measurement'
 
 export const saveMeasurement = (feature, measurement) => (dispatch, getState) => {

frontend/src/features/Dashboard/components/DashboardForm/RegulatoryAreas/Layer.tsx

@@ -3,15 +3,14 @@ import { Dashboard } from '@features/Dashboard/types'
 import { LayerLegend } from '@features/layersSelector/utils/LayerLegend.style'
 import { LayerSelector } from '@features/layersSelector/utils/LayerSelector.style'
 import { useAppSelector } from '@hooks/useAppSelector'
-import { Accent, Icon, IconButton, THEME, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
+import { Accent, Icon, IconButton, THEME, WSG84_PROJECTION, OPENLAYERS_PROJECTION } from '@mtes-mct/monitor-ui'
 import { transformExtent } from 'ol/proj'
 import Projection from 'ol/proj/Projection'
 import { createRef } from 'react'
 import styled from 'styled-components'
 
 import { useGetRegulatoryLayersQuery } from '../../../../../api/regulatoryLayersAPI'
 import { MonitorEnvLayers } from '../../../../../domain/entities/layers/constants'
-import { OPENLAYERS_PROJECTION } from '../../../../../domain/entities/map/constants'
 import { setFitToExtent } from '../../../../../domain/shared_slices/Map'
 import { useAppDispatch } from '../../../../../hooks/useAppDispatch'
 

frontend/src/features/InterestPoint/components/EditInterestPoint.tsx

@@ -9,11 +9,11 @@ import {
   Icon,
   MapMenuDialog,
   OPENLAYERS_PROJECTION,
+  WSG84_PROJECTION,
   TextInput,
   Textarea,
   getCoordinates
 } from '@mtes-mct/monitor-ui'
-import { WSG84_PROJECTION } from 'domain/entities/map/constants'
 import { setDisplayedItems } from 'domain/shared_slices/Global'
 import { setFitToExtent } from 'domain/shared_slices/Map'
 import { boundingExtent } from 'ol/extent'

frontend/src/features/InterestPoint/components/InterestPointOverlay.tsx

@@ -1,12 +1,11 @@
-import { Accent, Icon, IconButton, Size, usePrevious } from '@mtes-mct/monitor-ui'
+import { Accent, Icon, IconButton, Size, usePrevious, OPENLAYERS_PROJECTION } from '@mtes-mct/monitor-ui'
 import { noop } from 'lodash/fp'
 import LineString from 'ol/geom/LineString'
 import Overlay from 'ol/Overlay'
 import { getLength } from 'ol/sphere'
 import { createRef, useCallback, useEffect, useRef, useState } from 'react'
 import styled from 'styled-components'
 
-import { OPENLAYERS_PROJECTION } from '../../../domain/entities/map/constants'
 import { useAppSelector } from '../../../hooks/useAppSelector'
 import { useMoveOverlayWhenDragging } from '../../../hooks/useMoveOverlayWhenDragging'
 import { getCoordinates } from '../../../utils/coordinates'

frontend/src/features/LocateOnMap/index.tsx

@@ -1,11 +1,10 @@
-import { Accent, Icon, IconButton, Search, Size } from '@mtes-mct/monitor-ui'
+import { Accent, Icon, IconButton, Search, Size, OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import { getColorWithAlpha } from '@utils/utils'
 import { transformExtent } from 'ol/proj'
 import { useState } from 'react'
 import styled from 'styled-components'
 
 import { getPlaceCoordinates, useGooglePlacesAPI } from '../../api/googlePlacesAPI/googlePlacesAPI'
-import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../../domain/entities/map/constants'
 import { setFitToExtent } from '../../domain/shared_slices/Map'
 import { useAppDispatch } from '../../hooks/useAppDispatch'
 import { useAppSelector } from '../../hooks/useAppSelector'

frontend/src/features/Reportings/components/ReportingForm/FormComponents/Position/PointPicker.tsx

@@ -1,14 +1,9 @@
 import { useAppDispatch } from '@hooks/useAppDispatch'
 import { useAppSelector } from '@hooks/useAppSelector'
 import { useListenForDrawedGeometry } from '@hooks/useListenForDrawing'
-import { Accent, Icon, IconButton } from '@mtes-mct/monitor-ui'
+import { Accent, Icon, IconButton, OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import { formatCoordinates } from '@utils/coordinates'
-import {
-  InteractionListener,
-  OLGeometryType,
-  OPENLAYERS_PROJECTION,
-  WSG84_PROJECTION
-} from 'domain/entities/map/constants'
+import { InteractionListener, OLGeometryType } from 'domain/entities/map/constants'
 import { setFitToExtent } from 'domain/shared_slices/Map'
 import { drawPoint } from 'domain/use_cases/draw/drawGeometry'
 import { useField } from 'formik'

frontend/src/features/Reportings/components/ReportingForm/FormComponents/Position/ZonePicker.tsx

@@ -1,13 +1,8 @@
 import { useAppDispatch } from '@hooks/useAppDispatch'
 import { useAppSelector } from '@hooks/useAppSelector'
 import { useListenForDrawedGeometry } from '@hooks/useListenForDrawing'
-import { Accent, Icon, IconButton } from '@mtes-mct/monitor-ui'
-import {
-  InteractionListener,
-  OLGeometryType,
-  OPENLAYERS_PROJECTION,
-  WSG84_PROJECTION
-} from 'domain/entities/map/constants'
+import { Accent, Icon, IconButton, OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
+import { InteractionListener, OLGeometryType } from 'domain/entities/map/constants'
 import { setFitToExtent } from 'domain/shared_slices/Map'
 import { drawPolygon } from 'domain/use_cases/draw/drawGeometry'
 import { useField } from 'formik'

frontend/src/features/Reportings/components/ReportingLayer/Reporting/reportingsGeometryHelpers.ts

@@ -1,8 +1,7 @@
+import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import { Feature } from 'ol'
 import { GeoJSON } from 'ol/format'
 
-import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../../../../../domain/entities/map/constants'
-
 import type { AtLeast } from '../../../../../types'
 import type { Reporting } from 'domain/entities/reporting'
 

frontend/src/features/Semaphore/components/Layer/semaphoresGeometryHelpers.ts

@@ -1,8 +1,7 @@
+import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import { Feature } from 'ol'
 import { GeoJSON } from 'ol/format'
 
-import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../../../../domain/entities/map/constants'
-
 import type { Semaphore } from '../../../../domain/entities/semaphore'
 
 export const getSemaphoreZoneFeature = (semaphore: Semaphore, layername: string) => {

frontend/src/features/Station/components/StationLayer/utils.ts

@@ -1,13 +1,12 @@
 import { overlayStroke } from '@features/map/overlays/style'
-import { THEME } from '@mtes-mct/monitor-ui'
+import { OPENLAYERS_PROJECTION, THEME, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import { uniq } from 'lodash/fp'
 import { Feature } from 'ol'
 import { GeoJSON } from 'ol/format'
 import { Fill, Icon, Style, Text } from 'ol/style'
 import CircleStyle from 'ol/style/Circle'
 
 import { Layers } from '../../../../domain/entities/layers/constants'
-import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../../../../domain/entities/map/constants'
 
 import type { Station } from '../../../../domain/entities/station'
 import type { StyleFunction } from 'ol/style/Style'

frontend/src/features/coordinates/DMDCoordinatesInput.tsx

@@ -1,9 +1,10 @@
+import { WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import { useEffect, useState } from 'react'
 import { dmsToDecimal } from 'react-coordinate-input'
 import { IMaskInput } from 'react-imask'
 import styled from 'styled-components'
 
-import { CoordinatesFormat, WSG84_PROJECTION } from '../../domain/entities/map/constants'
+import { CoordinatesFormat } from '../../domain/entities/map/constants'
 import { getCoordinates } from '../../utils/coordinates'
 import { isNumeric } from '../../utils/isNumeric'
 

frontend/src/features/layersSelector/myVigilanceAreas/MyVigilanceAreaLayerZone.tsx

@@ -1,13 +1,12 @@
 import { useGetVigilanceAreasQuery } from '@api/vigilanceAreasAPI'
 import { vigilanceAreaActions } from '@features/VigilanceArea/slice'
 import { useAppSelector } from '@hooks/useAppSelector'
-import { IconButton, Accent, Size, Icon, THEME } from '@mtes-mct/monitor-ui'
+import { IconButton, Accent, Size, Icon, THEME, WSG84_PROJECTION, OPENLAYERS_PROJECTION } from '@mtes-mct/monitor-ui'
 import { transformExtent } from 'ol/proj'
 import Projection from 'ol/proj/Projection'
 import styled from 'styled-components'
 
 import { MonitorEnvLayers } from '../../../domain/entities/layers/constants'
-import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../../../domain/entities/map/constants'
 import { setFitToExtent } from '../../../domain/shared_slices/Map'
 import { useAppDispatch } from '../../../hooks/useAppDispatch'
 import { LayerLegend } from '../utils/LayerLegend.style'

frontend/src/features/layersSelector/search/ResultsList/AMPLayerGroup/AMPLayer.tsx

@@ -5,15 +5,14 @@ import {
   openAMPMetadataPanel
 } from '@features/layersSelector/metadataPanel/slice'
 import { getIsLinkingAMPToVigilanceArea, vigilanceAreaActions } from '@features/VigilanceArea/slice'
-import { Accent, Icon, IconButton, THEME } from '@mtes-mct/monitor-ui'
+import { Accent, Icon, IconButton, THEME, OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import { transformExtent } from 'ol/proj'
 import Projection from 'ol/proj/Projection'
 import { createRef, useEffect } from 'react'
 import Highlighter from 'react-highlight-words'
 
 import { useGetAMPsQuery } from '../../../../../api/ampsAPI'
 import { MonitorEnvLayers } from '../../../../../domain/entities/layers/constants'
-import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../../../../../domain/entities/map/constants'
 import { addAmpZonesToMyLayers, removeAmpZonesFromMyLayers } from '../../../../../domain/shared_slices/Amp'
 import { setFitToExtent } from '../../../../../domain/shared_slices/Map'
 import { useAppDispatch } from '../../../../../hooks/useAppDispatch'

frontend/src/features/layersSelector/search/ResultsList/RegulatoryLayerGroup/RegulatoryLayer.tsx

@@ -1,13 +1,12 @@
 import { getIsLinkingRegulatoryToVigilanceArea, vigilanceAreaActions } from '@features/VigilanceArea/slice'
-import { Accent, Icon, IconButton, THEME } from '@mtes-mct/monitor-ui'
+import { Accent, Icon, IconButton, THEME, OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import { transformExtent } from 'ol/proj'
 import Projection from 'ol/proj/Projection'
 import { createRef, useEffect } from 'react'
 import Highlighter from 'react-highlight-words'
 
 import { useGetRegulatoryLayersQuery } from '../../../../../api/regulatoryLayersAPI'
 import { MonitorEnvLayers } from '../../../../../domain/entities/layers/constants'
-import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../../../../../domain/entities/map/constants'
 import { setFitToExtent } from '../../../../../domain/shared_slices/Map'
 import {
   addRegulatoryZonesToMyLayers,

frontend/src/features/layersSelector/search/ResultsList/VigilanceAreaLayer/index.tsx

@@ -1,13 +1,12 @@
 import { useGetVigilanceAreasQuery } from '@api/vigilanceAreasAPI'
 import { vigilanceAreaActions } from '@features/VigilanceArea/slice'
-import { Accent, Icon, IconButton, THEME } from '@mtes-mct/monitor-ui'
+import { Accent, Icon, IconButton, THEME, OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import { transformExtent } from 'ol/proj'
 import Projection from 'ol/proj/Projection'
 import { createRef, useEffect } from 'react'
 import Highlighter from 'react-highlight-words'
 
 import { MonitorEnvLayers } from '../../../../../domain/entities/layers/constants'
-import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../../../../../domain/entities/map/constants'
 import { setFitToExtent } from '../../../../../domain/shared_slices/Map'
 import { useAppDispatch } from '../../../../../hooks/useAppDispatch'
 import { useAppSelector } from '../../../../../hooks/useAppSelector'

frontend/src/features/layersSelector/utils/MyLayerZone.tsx

@@ -4,15 +4,14 @@ import {
   vigilanceAreaActions
 } from '@features/VigilanceArea/slice'
 import { useAppSelector } from '@hooks/useAppSelector'
-import { IconButton, Accent, Size, Icon, THEME } from '@mtes-mct/monitor-ui'
+import { IconButton, Accent, Size, Icon, THEME, OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import { transformExtent } from 'ol/proj'
 import Projection from 'ol/proj/Projection'
 import styled from 'styled-components'
 
 import { LayerLegend } from './LayerLegend.style'
 import { LayerSelector } from './LayerSelector.style'
 import { MonitorEnvLayers } from '../../../domain/entities/layers/constants'
-import { OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../../../domain/entities/map/constants'
 import { setFitToExtent } from '../../../domain/shared_slices/Map'
 import { useAppDispatch } from '../../../hooks/useAppDispatch'
 

frontend/src/features/map/BaseMap.tsx

@@ -1,4 +1,4 @@
-import { MultiRadio } from '@mtes-mct/monitor-ui'
+import { MultiRadio, OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '@mtes-mct/monitor-ui'
 import {
   getGeoJSONFromFeature,
   getGeoJSONFromFeatureList,
@@ -33,7 +33,7 @@ import {
   SelectableLayers0To7,
   SelectableLayers7To26
 } from '../../domain/entities/layers/constants'
-import { DistanceUnit, OPENLAYERS_PROJECTION, WSG84_PROJECTION } from '../../domain/entities/map/constants'
+import { DistanceUnit } from '../../domain/entities/map/constants'
 import { setDistanceUnit } from '../../domain/shared_slices/Map'
 import { updateMeasurementsWithNewDistanceUnit } from '../../domain/use_cases/map/updateMeasurementsWithNewDistanceUnit'
 import { useAppDispatch } from '../../hooks/useAppDispatch'