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.

Sign up for GitHub

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

Jump to bottom

Improve map annotation style for HDViewpoints #1260

Merged
merged 1 commit into from
Sep 24, 2024
Merged

Improve map annotation style for HDViewpoints #1260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 26 additions & 7 deletions frontend/src/components/Map/components/ViewPointHD/AnnotationItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Circle, CircleMarker, Marker, Polygon, Polyline, Tooltip, useMap } from
import Image from 'next/image';
import { TrekMarker } from 'components/Map/Markers/TrekMarker';
import { optimizeAndDefineColor } from 'stylesheet';
import { cn } from 'services/utils/cn';

type Props = {
geometry: Geometry;
Expand Down Expand Up @@ -39,12 +40,12 @@ const MetaData = ({ properties }: { properties: GeoJsonProperties }) => {

return (
<Tooltip>
<span className="flex flex-wrap items-center gap-2">
<span className="flex flex-wrap items-center gap-1 px-1">
{Boolean(properties.category?.label) && (
<>
<span className="flex gap-2 font-bold">
<Icon pictogramUri={pictogramUri} />
<span>{properties.category.label}</span>
</>
</span>
)}

<span>{properties.name}</span>
Expand All @@ -70,6 +71,8 @@ export const AnnotationItem = ({ geometry, properties, id }: Props) => {
);
}

const annotationType = properties?.category?.id as string;

if (geometry.type === 'Point' || geometry.type === 'MultiPoint') {
const coordinatesAsMultiPoint =
geometry.type === 'Point' ? [geometry.coordinates] : geometry.coordinates;
Expand All @@ -93,7 +96,10 @@ export const AnnotationItem = ({ geometry, properties, id }: Props) => {
}
return (
<CircleMarker
className="annotation annotation-point"
className={cn(
'annotation annotation-point',
annotationType && `annotation-type-${annotationType}`,
)}
key={`point-${id}-${index}`}
center={[lng, lat]}
radius={6}
Expand All @@ -116,7 +122,10 @@ export const AnnotationItem = ({ geometry, properties, id }: Props) => {
return (
<Polyline
key={`linestring-${id}-${index}`}
className="annotation annotation-line"
className={cn(
'annotation annotation-line',
annotationType && `annotation-type-${annotationType}`,
)}
positions={group.map(([lat, lng]) => [lng, lat])}
>
<MetaData properties={properties} />
Expand All @@ -140,7 +149,14 @@ export const AnnotationItem = ({ geometry, properties, id }: Props) => {
const radius = Math.sqrt(Math.pow(diagonal, 2) / 2);

return (
<Circle className="annotation annotation-circle" center={L.latLng(center)} radius={radius}>
<Circle
className={cn(
'annotation annotation-circle',
annotationType && `annotation-type-${annotationType}`,
)}
center={L.latLng(center)}
radius={radius}
>
<MetaData properties={properties} />
</Circle>
);
Expand All @@ -152,7 +168,10 @@ export const AnnotationItem = ({ geometry, properties, id }: Props) => {
{coordinatesAsMultiPolygon.map((group, index) => (
<Polygon
key={`polygon-${id}-${index}`}
className="annotation annotation-polygone"
className={cn(
'annotation annotation-polygon',
annotationType && `annotation-type-${annotationType}`,
)}
positions={group.map(line => line.map<[number, number]>(([lat, lng]) => [lng, lat]))}
>
<MetaData properties={properties} />
Expand Down
Loading