-
- Tee
-
-
+ {/* Midtbane -- eneste bane med green/tee/spiller, alltid faste ankre her */}
+
+
+
+
+ Green
+
+
+
+
+
+ Tee
+
+
+
+
+
+
+ Deg
+
+
+
+
+ {centerHazards.map((h) => (
+
+ ))}
- {/* Hazard markers + always-visible distance labels */}
- {placed.map((p) => {
- const labelTop = labelTopByKey.get(p.key) ?? p.topPct
- const labelOnLeft = p.leftPct > 55
- return (
-
- {/* marker dot */}
-
-
-
- {/* distance label (nudged vertically on collision) */}
-
- {formatMeters(p.distanceMeters)}
-
-
- )
- })}
-
- {/* Player position ("you are here") — a pin, shape-distinct from hazards */}
-
-
- Deg
-
-
+ {/* Høyre bane */}
+
+ {rightHazards.map((h) => (
+
+ ))}
- {/* Accessible, screen-reader-friendly text list — the same info as the diagram. */}
{hazards.length > 0 && (
Hindringer
- {hazards.map((h, i) => (
- -
-
-
- {h.label}
-
-
- {formatMeters(h.distanceMeters)}
-
-
- ))}
+ {hazards.flatMap((h) =>
+ h.above !== null
+ ? [
+ ,
+ ,
+ ]
+ : [],
+ )}
)}
@@ -238,15 +223,17 @@ export function HoleDiagram({
)
}
-function BigNumber({
- label,
- value,
- emphasized,
-}: {
- label: string
- value: number
- emphasized?: boolean
-}) {
+function HazardRow({ label, value }: { label: string; value: number }) {
+ return (
+
+
+ {label}
+ {formatMeters(value)}
+
+ )
+}
+
+function BigNumber({ label, value, emphasized }: { label: string; value: number; emphasized?: boolean }) {
return (
{Math.round(value)}
-
- {label}
-
+ {label}
)
}
@@ -300,10 +277,15 @@ function buildDiagramAria(
hazards: DiagramHazard[],
player: Props["playerPosition"],
) {
+ void player
const base = `Baneskisse. Senter ${Math.round(distances.middle)} meter til green. Din posisjon markert.`
if (hazards.length === 0) return `${base} Ingen hindringer.`
const list = hazards
- .map((h) => `${h.label} ${Math.round(h.distanceMeters)} meter`)
+ .map((h) =>
+ h.above !== null
+ ? `${h.label} forkant ${Math.round(h.below)} meter, bakkant ${Math.round(h.above)} meter`
+ : `${h.label} ${Math.round(h.below)} meter`,
+ )
.join(", ")
return `${base} Hindringer: ${list}.`
}
diff --git a/frontend/components/hole-target-distance.tsx b/frontend/components/hole-target-distance.tsx
index 1362dfb..a68f077 100644
--- a/frontend/components/hole-target-distance.tsx
+++ b/frontend/components/hole-target-distance.tsx
@@ -43,6 +43,10 @@ type ApiTargetPoint = {
side_fairway: "left" | "center" | "right" | null
latitude: number
longitude: number
+ // Eksplisitt, menneske-satt paring av forkant/bakkant til SAMME
+ // fysiske hindring (migrasjon 080/ADR-084). `null` = enkeltstående
+ // punkt, ALDRI slått sammen med noe -- se groupDiagramHazards().
+ hazard_group: string | null
}
const _HAZARD_LABELS: Record
= {
@@ -52,6 +56,92 @@ const _HAZARD_LABELS: Record = {
rock: "Fjellknaus",
}
+// ADR-084: hvilket ikon en hindringstype får i diagrammet. "generic"
+// (typer uten dedikert ikon, i dag kun rock) faller tilbake til
+// lucide sin TriangleAlert -- se hole-diagram-view.tsx.
+type HazardKind = "sand" | "water" | "generic"
+const _HAZARD_KIND: Record = {
+ green_bunker: "sand",
+ fairway_bunker: "sand",
+ water: "water",
+ rock: "generic",
+}
+
+// Grupperer rå hindringspunkter til hindrings-ENTITETER for diagrammet.
+// VIKTIG (bruker-rettelse, ADR-084): to punkter er KUN samme fysiske
+// hindring hvis de deler samme, ikke-null hazard_group -- ALDRI basert
+// på poi_type+side_fairway alene (ville feilaktig slått sammen to
+// atskilte hindringer av samme type på samme side). Punkter med
+// hazard_group=null forblir alltid enkeltstående.
+function groupDiagramHazards(
+ hazardPoints: ApiTargetPoint[],
+ livePosition: LatLng,
+ teeRef: LatLng,
+ greenRef: LatLng,
+) {
+ const grouped = new Map()
+ const standalone: ApiTargetPoint[] = []
+ for (const p of hazardPoints) {
+ if (p.hazard_group) {
+ const list = grouped.get(p.hazard_group) ?? []
+ list.push(p)
+ grouped.set(p.hazard_group, list)
+ } else {
+ standalone.push(p)
+ }
+ }
+
+ type Entity = {
+ key: string
+ kind: HazardKind
+ label: string
+ lane: "left" | "center" | "right"
+ alongPercent: number
+ below: number
+ above: number | null
+ }
+ const entities: Entity[] = []
+
+ function distanceTo(p: ApiTargetPoint) {
+ return Math.round(haversineMeters(livePosition, { lat: p.latitude, lng: p.longitude }))
+ }
+ function along(p: ApiTargetPoint) {
+ return projectOntoAxis(teeRef, greenRef, { lat: p.latitude, lng: p.longitude }).alongPercent
+ }
+
+ for (const [groupKey, pts] of grouped) {
+ const front = pts.find((p) => p.location === "front")
+ const back = pts.find((p) => p.location === "back")
+ const primary = front ?? back ?? pts[0]
+ const kind = _HAZARD_KIND[primary.poi_type]
+ if (!kind) continue
+ const alongValues = [front, back].filter((p): p is ApiTargetPoint => !!p).map(along)
+ entities.push({
+ key: `group-${groupKey}`,
+ kind,
+ label: _HAZARD_LABELS[primary.poi_type],
+ lane: primary.side_fairway ?? "center",
+ alongPercent: alongValues.reduce((a, b) => a + b, 0) / alongValues.length,
+ below: front ? distanceTo(front) : distanceTo(primary),
+ above: front && back ? distanceTo(back) : null,
+ })
+ }
+ for (const p of standalone) {
+ const kind = _HAZARD_KIND[p.poi_type]
+ if (!kind) continue
+ entities.push({
+ key: `point-${p.latitude}-${p.longitude}-${p.poi_type}`,
+ kind,
+ label: _HAZARD_LABELS[p.poi_type],
+ lane: p.side_fairway ?? "center",
+ alongPercent: along(p),
+ below: distanceTo(p),
+ above: null,
+ })
+ }
+ return entities
+}
+
export function HoleTargetDistance({
baseUrl,
holeNumber,
@@ -189,10 +279,7 @@ export function HoleTargetDistance({
if (teeRef) {
const greenRef = { lat: middle.latitude, lng: middle.longitude }
const player = projectOntoAxis(teeRef, greenRef, livePosition)
- const diagramHazards = hazards.map((h) => ({
- ...h,
- ...projectOntoAxis(teeRef, greenRef, { lat: h.lat, lng: h.lng }),
- }))
+ const diagramHazards = groupDiagramHazards(hazardPoints, livePosition, teeRef, greenRef)
return (
+ }
+ if (kind === "water") {
+ return 
+ }
+ return