diff --git a/frontend/src/features/Dashboard/components/Layers/ExportLayer.tsx b/frontend/src/features/Dashboard/components/Layers/ExportLayer.tsx index bad2c8386..882925c35 100644 --- a/frontend/src/features/Dashboard/components/Layers/ExportLayer.tsx +++ b/frontend/src/features/Dashboard/components/Layers/ExportLayer.tsx @@ -97,7 +97,7 @@ export function ExportLayer({ onImagesReady, shouldLoadImages }: ExportLayerProp const view = inMemoryMap.getView() - view.fit(extent, { padding: [10, 10, 10, 10] }) + view.fit(extent, { padding: [10, 10, 10, 150] }) // admission of weakness... setTimeout(() => { diff --git a/frontend/src/features/Dashboard/components/Pdf/Amps/index.tsx b/frontend/src/features/Dashboard/components/Pdf/Amps/index.tsx index 29e3185c3..9965021ad 100644 --- a/frontend/src/features/Dashboard/components/Pdf/Amps/index.tsx +++ b/frontend/src/features/Dashboard/components/Pdf/Amps/index.tsx @@ -22,6 +22,15 @@ export function Amps({ amps, images }: { amps: AMPFromAPI[]; images: ExportImage return ( + {image && ( + + )} {getTitle(amp.name)} @@ -54,7 +63,6 @@ export function Amps({ amps, images }: { amps: AMPFromAPI[]; images: ExportImage )} - {image && } ) })} diff --git a/frontend/src/features/Dashboard/components/Pdf/RegulatoryAreas/index.tsx b/frontend/src/features/Dashboard/components/Pdf/RegulatoryAreas/index.tsx index e4f4a2c98..1e3e6fa4b 100644 --- a/frontend/src/features/Dashboard/components/Pdf/RegulatoryAreas/index.tsx +++ b/frontend/src/features/Dashboard/components/Pdf/RegulatoryAreas/index.tsx @@ -28,6 +28,15 @@ export function RegulatoryAreas({ return ( + {image && ( + + )} {getTitle(regulatoryArea.layer_name)} @@ -80,7 +89,6 @@ export function RegulatoryAreas({ - {image && } ) })} diff --git a/frontend/src/features/Dashboard/components/Pdf/VigilanceAreas/index.tsx b/frontend/src/features/Dashboard/components/Pdf/VigilanceAreas/index.tsx index 4c706ab73..c6543d3a0 100644 --- a/frontend/src/features/Dashboard/components/Pdf/VigilanceAreas/index.tsx +++ b/frontend/src/features/Dashboard/components/Pdf/VigilanceAreas/index.tsx @@ -47,6 +47,15 @@ export function VigilanceAreas({ return ( + {image && ( + + )} {vigilanceArea.name} @@ -128,7 +137,6 @@ export function VigilanceAreas({ )} - {image && } ) })} diff --git a/frontend/src/features/Dashboard/components/Pdf/style.ts b/frontend/src/features/Dashboard/components/Pdf/style.ts index 8006d65f6..bdc968df7 100644 --- a/frontend/src/features/Dashboard/components/Pdf/style.ts +++ b/frontend/src/features/Dashboard/components/Pdf/style.ts @@ -102,6 +102,9 @@ export const areaStyle = StyleSheet.create({ borderStyle: 'solid', borderWidth: 1, fontSize: 5.5, + left: 10, + position: 'absolute', + top: 10, width: '30%' }, content: { @@ -125,6 +128,7 @@ export const areaStyle = StyleSheet.create({ display: 'flex', flexDirection: 'row', gap: 6, + position: 'relative', width: '100%' } }) diff --git a/frontend/src/features/Dashboard/components/Pdf/utils.ts b/frontend/src/features/Dashboard/components/Pdf/utils.ts index 0f0f39cd3..f52c23f31 100644 --- a/frontend/src/features/Dashboard/components/Pdf/utils.ts +++ b/frontend/src/features/Dashboard/components/Pdf/utils.ts @@ -12,5 +12,3 @@ export function getImage(images: ExportImageType[], type: Dashboard.Layer, id: n return imageType === Dashboard.featuresCode[type] && imageId && id === +imageId })?.image } - -// Dashboard.featuresCode[Dashboard.Layer.DASHBOARD_VIGILANCE_AREAS]