fix: remove extra spacing between 2 activity markers #3052

tbouffard · 2024-03-06T15:30:29Z

When there are 2 markers, the center was translated/shifted too much. We assume that the width value of markers is SHAPE_ACTIVITY_MARKER_ICON_SIZE. We want to have a spacing value between the 2 markers of SHAPE_ACTIVITY_MARKER_ICON_MARGIN.

To have 2 markers horizontally centered and closed to each other, we need to translate the first marker to the left and the second to the right by half the value of the marker width. To add a space between the 2 markers, we need to translate both markers by half the value of the global "spacing value". Previously, the translation value included the full marker width which is too much.

Also include refactoring:

Use more accurate name for the parameters of getMarkerIconOriginFunction.

Notes

Covers #992
Detected as part of #2724

Additional information

The implementation to generalize markers positioning for 3 and more markers experimented in #2724 uses the same logic as the fix proposed here.

Here are explanations taken from #2724:

Previously, the translation includes SHAPE_ACTIVITY_MARKER_ICON_SIZE instead of SHAPE_ACTIVITY_MARKER_ICON_SIZE/2. The following schema explains why the value has to be divided by 2 👇🏿
⚠️ In the following schema

MARKER_WIDTH = SHAPE_ACTIVITY_MARKER_ICON_SIZE

MARKER_SPACING = SHAPE_ACTIVITY_MARKER_ICON_MARGIN

When there are 2 markers, the center was translated/shifted too much. We assume that the width value of markers is `SHAPE_ACTIVITY_MARKER_ICON_SIZE`. We want to have a spacing value between the 2 markers of `SHAPE_ACTIVITY_MARKER_ICON_MARGIN`. To have 2 markers horizontally centered and closed to each other, we need to translate the first marker to the left and the second to the right by half the value of the marker width. To add a space between the 2 markers, we need to translate both markers by half the value of the global "spacing value". Previously, the translation value included the full marker width which is too much. Also include refactoring: - Use more accurate name for the parameters of `getMarkerIconOriginFunction`.