Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

front: remove map feature from simulation report sheet #10237

Merged
merged 1 commit into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { useEffect, useState } from 'react';

import { Table, TR, TH, TD } from '@ag-media/react-pdf-table';
import { Page, Text, Image, Document, View, Link } from '@react-pdf/renderer';
import type { TFunction } from 'i18next';
Expand All @@ -14,7 +12,7 @@ import { capitalizeFirstLetter } from 'utils/strings';

import styles from './SimulationReportStyleSheet';
import type { SimulationReportSheetProps } from '../../types';
import { base64ToJpeg, getStopDurationTime } from '../../utils/formatSimulationReportSheet';
import { getStopDurationTime } from '../../utils/formatSimulationReportSheet';
clarani marked this conversation as resolved.
Show resolved Hide resolved

const getSecondaryCode = ({ location }: StdcmPathStep) => location!.secondary_code;

Expand All @@ -40,7 +38,6 @@ const SimulationReportSheet = ({
stdcmData,
consist,
simulationReportSheetNumber,
mapCanvas,
operationalPointsList,
}: SimulationReportSheetProps) => {
const { t } = useTranslation(['stdcm-simulation-report-sheet', 'stdcm']);
Expand All @@ -63,28 +60,6 @@ const SimulationReportSheet = ({
path_number2: 'n°YYYYYY',
};

const [mapImageUrl, setMapImageUrl] = useState<string | null>(null);

// Convert image to JPEG
useEffect(() => {
if (mapCanvas) {
base64ToJpeg(mapCanvas, 0.8).then((blob) => {
const objectUrl = URL.createObjectURL(blob);
setMapImageUrl(objectUrl);
});
}
}, [mapCanvas]);

// Cleanup the object URL when the component is unmounted or before a new one is created
useEffect(
() => () => {
if (mapImageUrl) {
URL.revokeObjectURL(mapImageUrl);
}
},
[mapImageUrl]
);

return (
<Document>
<Page wrap={false} style={styles.main.page} size={[1344]}>
Expand Down Expand Up @@ -414,14 +389,8 @@ const SimulationReportSheet = ({
);
})}
</Table>
<View style={styles.simulation.horizontalBar} />
</View>
</View>
{mapCanvas && (
<View style={styles.map.map} id="simulationMap">
{mapImageUrl && <Image src={mapImageUrl} />}
</View>
)}
<View style={styles.footer.warrantyBox}>
<Text style={styles.footer.warrantyMessage}>{t('withoutWarranty')}</Text>
</View>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,6 @@ const styles = {
warrantyBox: {
height: '64',
marginTop: '16',
borderTop: '1 solid #D3D1CF',
display: 'flex',
alignItems: 'center',
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useMemo, useState } from 'react';
import { useMemo } from 'react';

import { Button } from '@osrd-project/ui-core';
import { PDFDownloadLink } from '@react-pdf/renderer';
Expand Down Expand Up @@ -46,7 +46,6 @@ const StcdmResults = ({
pathTrackRanges,
}: StcdmResultsProps) => {
const { t } = useTranslation('stdcm', { keyPrefix: 'simulation.results' });
const [mapCanvas, setMapCanvas] = useState<string>();

const selectedSimulation = simulationsList[selectedSimulationIndex];
const { outputs } = selectedSimulation || {};
Expand Down Expand Up @@ -105,7 +104,6 @@ const StcdmResults = ({
stdcmData={outputs.results}
consist={selectedSimulation.inputs.consist}
simulationReportSheetNumber={simulationReportSheetNumber}
mapCanvas={mapCanvas}
operationalPointsList={operationalPointsList}
/>
}
Expand Down Expand Up @@ -172,7 +170,6 @@ const StcdmResults = ({
hideAttribution
showStdcmAssets
isFeasible={!hasConflictResults}
setMapCanvas={setMapCanvas}
pathGeometry={outputs?.pathProperties?.geometry}
simulationPathSteps={markersInfo}
/>
Expand Down
1 change: 0 additions & 1 deletion front/src/applications/stdcm/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ export type SimulationReportSheetProps = {
stdcmData: StdcmSuccessResponse;
consist: StdcmSimulationInputs['consist'];
simulationReportSheetNumber: string;
mapCanvas?: string;
operationalPointsList: StdcmResultsOperationalPoint[];
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,41 +143,3 @@ export function getOperationalPointsWithTimes(

return opResults;
}

/**
* Converts a base64 image into a JPEG blob while reducing quality.
* @param base64Image - Image in base64
* @param quality - Image quality (between 0 and 1, where 1 is the best quality)
* @returns {Promise<Blob>} - Return an optimised JPEG Blob
*/
export const base64ToJpeg = (base64Image: string, quality: number): Promise<Blob> =>
new Promise((resolve, reject) => {
const img = new Image();
img.src = base64Image;
img.onload = () => {
const canvas = document.createElement('canvas');
const ctx = canvas.getContext('2d');
if (!ctx) {
reject(new Error('Could not get canvas context'));
return;
}
canvas.width = img.width;
canvas.height = img.height;

ctx.drawImage(img, 0, 0);

canvas.toBlob(
(blob) => {
if (blob) {
resolve(blob);
}
},
'image/jpeg',
quality
);
};

img.onerror = (error) => {
reject(error);
};
});
Loading