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

Feature/add linestrings into roadworks #242

Merged
merged 3 commits into from
May 22, 2024
Merged
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
75 changes: 60 additions & 15 deletions src/components/MobilityPlatform/Roadworks/Roadworks.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,22 @@ const Roadworks = () => {
return acc;
}, []);

/** Separate roadworks that contain Point type geometry from the rest */
const roadworksPoints = roadworksFiltered.reduce((acc, curr) => {
if (curr?.announcements[0]?.location?.geometry?.includes('POINT')) {
/**
* Separate roadworks from the rest by geometry type (eg. POINT or LINESTRING)
* @param {array} data
* @param {string} geomType
* @returns array
*/
const filterRoadworksByGeometry = (data, geomType) => data.reduce((acc, curr) => {
if (curr?.announcements[0]?.location?.geometry?.includes(geomType)) {
acc.push(curr);
}
return acc;
}, []);

/** Separate roadworks that contain MultiLineString type geometry from the rest */
const roadworksMultiLines = roadworksFiltered.reduce((acc, curr) => {
if (curr?.announcements[0]?.location?.geometry?.includes('MULTILINESTRING')) {
acc.push(curr);
}
return acc;
}, []);
const roadworksPoints = filterRoadworksByGeometry(roadworksFiltered, 'POINT');
const roadworksLines = filterRoadworksByGeometry(roadworksFiltered, ';LINESTRING');
const roadworksMultiLines = filterRoadworksByGeometry(roadworksFiltered, 'MULTILINESTRING');

/**
* Gets coordinates from string, for example 'SRID=4326;POINT (22.37835 60.40831)'.
Expand All @@ -95,6 +96,19 @@ const Roadworks = () => {
return [];
};

/**
* Get coordinates from string that includes geometry in linestring format.
* Remove letters and special characters and return nested array from numbers.
* @param {string} lineString
* @returns array
*/
const getLineCoordinates = lineString => {
const coordinatesString = lineString.replace(/^SRID=\d+;LINESTRING \((.*)\)$/, '$1');
const coordinatePairs = coordinatesString.split(', ').map(pair => pair.split(' '));
const coordinates = coordinatePairs.map(pair => [parseFloat(pair[1]), parseFloat(pair[0])]);
return coordinates;
};

/**
* Get coordinates from string that includes geometry in multilinestring format.
* Remove letters and special characters and return nested array from numbers.
Expand All @@ -111,17 +125,29 @@ const Roadworks = () => {
return nestedCoordinates;
};

const getSingleCoordinates = data => {
const coords = data[0][0];
/**
* Get single pair of coordinates from nested arrays (2 or 3 levels).
* @param {array} data
* @param {boolean} isMulti
* @returns array
*/
const getSingleCoordinates = (data, isMulti) => {
const coords = isMulti ? data[0][0] : data[0];
return [coords[0], coords[1]];
};

const parseAndGetSingleCoordinates = multilineStr => {
const parseMultiAndGetSingleCoordinates = multilineStr => {
const coordinates = getMultiLineCoordinates(multilineStr);
return getSingleCoordinates(coordinates);
return getSingleCoordinates(coordinates, true);
};

const parseLineAndGetSingleCoordinates = lineStr => {
const coordinates = getLineCoordinates(lineStr);
return getSingleCoordinates(coordinates, false);
};

const areMarkersValid = isDataValid(showRoadworks, roadworksPoints);
const areLinesValid = isDataValid(showRoadworks, roadworksLines);
const areMultiLinesValid = isDataValid(showRoadworks, roadworksMultiLines);

useEffect(() => {
Expand Down Expand Up @@ -156,6 +182,24 @@ const Roadworks = () => {
))
: null);

const renderLines = () => (areLinesValid ? (
roadworksLines.map(item => (
<React.Fragment key={item.id}>
<Polyline
weight={useContrast ? 10 : 8}
pathOptions={useContrast ? whiteOptions : grayOptions}
positions={getLineCoordinates(item?.announcements[0]?.location?.geometry)}
/>
<Marker
icon={customIcon}
position={parseLineAndGetSingleCoordinates(item?.announcements[0]?.location?.geometry)}
>
{renderContent(item)}
</Marker>
</React.Fragment>
))
) : null);

const renderMultiLines = () => (areMultiLinesValid ? (
roadworksMultiLines.map(item => (
<React.Fragment key={item.id}>
Expand All @@ -166,7 +210,7 @@ const Roadworks = () => {
/>
<Marker
icon={customIcon}
position={parseAndGetSingleCoordinates(item?.announcements[0]?.location?.geometry)}
position={parseMultiAndGetSingleCoordinates(item?.announcements[0]?.location?.geometry)}
>
{renderContent(item)}
</Marker>
Expand All @@ -177,6 +221,7 @@ const Roadworks = () => {
return (
<>
{renderMarkers()}
{renderLines()}
{renderMultiLines()}
</>
);
Expand Down
Loading