[alcatron]

Map Style renders two Follow link curve checkboxes with the same name and ID, so unchecking one can leave the option enabled. Separately, gentle inward bends can reject curved comments because letter spacing is measured on the arrow spine instead of the offset text baseline. The fallback then draws a straight rotated label that can cross the arrow.

Keep one checkbox and measure curved-comment placement along the offset text path, retaining kerning, endpoint alignment, nudge direction, and fallbacks for tight bends or reversed offset geometry. Reject invalid offset intervals only when the final label placement intersects them, after endpoint alignment and nudging; a remote tight bend or undefined U-turn tangent does not disable an otherwise valid label. Undefined tangents use one-sided normals only to construct locally bounded invalid intervals. Use binary distance lookup to avoid repeatedly scanning the sampled path. Refresh the curve-control gettext entries and the 2.0 issue changelog entry.

Validation:

• Full PHP suite: 331 tests, 6,425 assertions passed.
• Checked and unchecked form regressions reproduce the duplicate-control failure before the fix.
• Regression reproduces the inward-bend failure using the reported link geometry, with both 9pt and 13pt TrueType fonts. A remote tight-bend regression fails before the interval fix and passes afterward, including reverse traversal and atomic fallback when nudged into the invalid tail. An exact remote-U-turn regression also fails before the fix and passes afterward, covering labels on both sides of the turn, reverse traversal and atomic fallback across the turn. Existing kerning, reverse-direction, endpoint, nudge, tight-bend and configuration round-trip checks pass.
• Visually verified the corrected label on the reporting installation after a backed-up local deployment, without changing its map configuration.
• PHP syntax, manifest, gettext-template and whitespace checks passed.

[Copilot]

🟢 Approval recommended

The narrowly scoped removal fixes the duplication and includes focused regression coverage, with no unresolved findings.

No open issues 🎉

What changed in this PR

Fixes the duplicated “Follow link curve” checkbox in Map Style so users can clear the setting without changing curve rendering or defaults.

Changes:

• Removes the duplicate checkbox row.
• Adds regression cases for checked and unchecked states.
• Documents the fix in the 2.0 changelog.

File	Description
tests/​Unit/​MapStyleDefaultsTest.php	Checks control uniqueness and submitted values for both states.
lib/​editor.comment-style.php	Removes the duplicate curve control.
CHANGELOG.md	Records the Map Style fix.

_{Review effort: Balanced}

[Copilot]

🟡 Changes recommended

A distant reversed baseline segment can still force an otherwise valid curved label into straight-text fallback.

1 open issue

• Reject curved labels only for intersecting invalid geometry · New

_{Review effort: Balanced}

[Copilot]

🔵 Needs a closer look

A remote undefined tangent still forces valid labels to fall back to straight rendering.

No open issues 🎉

1 previously missed issue

In code that hasn't changed since last review

Handle zero tangents for comments near remote U-turns

lib/​WeatherMapLink.class.php:403

The reversed-offset interval checks do not cover this earlier unconditional return. For an angled route (0,50) → (1000,50) → (800,50), the samples one pixel before and after the U-turn both lie at (999,50), making $norm zero. A short comment at 10% therefore falls back to straight rendering even though its placement is far from the turn. Handle undefined tangents locally while constructing the baseline, mark their affected intervals invalid, and reject only labels intersecting those intervals after alignment and nudging. Add a remote-U-turn regression and retain atomic fallback for labels crossing the turn.

1 resolved since last review

• Reject curved labels only for intersecting invalid geometry

_{Review effort: Balanced}

[alcatron]

Addressed the previously missed “Handle zero tangents for comments near remote U-turns” finding. The exact (0,50) → (1000,50) → (800,50) route now keeps a short label at 10% curved. Undefined tangent points receive one-sided construction normals, with nearby samples bounding the invalid region; adjacent intervals are marked invalid and checked only after final label alignment and nudging. Labels crossing the turn still fall back before any glyph is drawn.

The new regression failed before the fix and passes afterward. It also covers a label after the turn and reversed traversal. Full suite: 331 tests / 6,425 assertions passed. PHP syntax, manifest, gettext and whitespace checks passed.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[Copilot]

🔵 Needs a closer look

Offset interpolation at sharp angled corners can place accepted comment baselines inside the arrow body.

No open issues 🎉

1 previously missed issue

In code that hasn't changed since last review

Corner normals bleed into straight sections, causing label overlap

lib/​WeatherMapLink.class.php:436

On angled routes, calc_straight() supplies only 12 samples per leg. Interpolating these offset vertices spreads a corner's averaged normal over the adjacent straight section; the extra sampling above handles undefined tangents only, not ordinary sharp corners. For a one-way route (0,0) → (1000,0) → (1000,1000), width 20 and COMMENTPOS 48.5, the baseline starts around (980.9,-19.5) instead of (970,-24), inside the arrow body. A short label can pass all fallback guards there. Keep normal transitions local to sharp joins or construct proper offset joins, and add a regression using calc_straight() that checks clearance before the bend.

_{Review effort: Balanced}