[fix]: Show attributionControl on IncidentMap and hide leaflet prefix (…

…#2886) * Show attributionControl on IncidentMap and hide leaflet prefix * Hide attributionControl in location map * Change empty string to false
Amsterdam · Jul 2, 2024 · 3c1bc42 · 3c1bc42
1 parent 5aaf24c
commit 3c1bc42
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/src/components/Map/Map.tsx b/src/components/Map/Map.tsx
@@ -77,14 +77,7 @@ const Map: FC<PropsWithChildren<MapProps>> = ({
   const { mapActive } = useSelector(makeSelectIncidentContainer)
 
   useEffect(() => {
-    /* istanbul ignore next */
-    const timeout = setTimeout(() => {
-      document.querySelector('.leaflet-control-attribution a')?.remove()
-      document.querySelector('.leaflet-control-attribution span')?.remove()
-    }, 0)
-
     return () => {
-      clearTimeout(timeout)
       if (mapActive) {
         dispatch(closeMap())
       }

diff --git a/src/components/MapInput/MapInput.tsx b/src/components/MapInput/MapInput.tsx
@@ -76,7 +76,7 @@ const MapInput = ({
   useEffect(() => {
     if (!map) return
     map.attributionControl.getContainer()?.setAttribute('aria-hidden', 'true')
-    map.attributionControl.setPrefix('')
+    map.attributionControl.setPrefix(false)
   }, [map])
 
   const clickFunc = useCallback(

diff --git a/src/components/OverviewMap/OverviewMap.tsx b/src/components/OverviewMap/OverviewMap.tsx
@@ -108,6 +108,8 @@ const OverviewMap: FC<OverviewMapProps> = ({
   const [incident, setIncident] = useState<IncidentSummary>()
   const [pollingCount, setPollingCount] = useState(0)
 
+  map?.attributionControl.setPrefix(false)
+
   const params = useMemo(
     () => ({
       ...filterParams,

diff --git a/src/signals/IncidentMap/components/IncidentMap/IncidentMap.tsx b/src/signals/IncidentMap/components/IncidentMap/IncidentMap.tsx
@@ -65,6 +65,8 @@ export const IncidentMap = () => {
 
   const { deviceMode, isMobile } = useDeviceMode()
 
+  map?.attributionControl.setPrefix(false)
+
   const closeDrawerOverlay = useCallback(() => {
     setDrawerState(DrawerState.Closed)
   }, [])
@@ -191,7 +193,6 @@ export const IncidentMap = () => {
           dragging: true,
           scrollWheelZoom: true,
           zoom: configuration.map.optionsIncidentMap.zoom,
-          attributionControl: false,
         }}
       >
         {isMobile(deviceMode) && (

diff --git a/src/signals/incident/components/form/MapSelectors/Asset/Selector/Selector.tsx b/src/signals/incident/components/form/MapSelectors/Asset/Selector/Selector.tsx
@@ -122,6 +122,7 @@ const Selector: FC = () => {
   const hasFeatureTypes = meta.featureTypes.length > 0
   const showMarker =
     coordinates && (!selection || selectionIsUndetermined(selection[0]))
+  map?.attributionControl.setPrefix(false)
 
   const mapClick = useCallback(
     ({ latlng }: LeafletMouseEvent) => {