Skip to content

feat(lagekarte): Kreis-Mittelpunkt + Radius editierbar (#186) #190

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

Merged
gergernaut merged 1 commit into from
Sep 3, 2026
Merged

feat(lagekarte): Kreis-Mittelpunkt + Radius editierbar (#186) #190

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
87 changes: 65 additions & 22 deletions packages/web/src/lagekarte/Lagekarte.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,29 +253,53 @@ function createLayer(
});
}

// Zusatz-Layer (Mittelpunkt-Punkt, Beschriftung) — dem Kreis/der Fläche
// beigelegt, ohne sie selbst zu mutieren (Invariante #1: reiner Render-Pfad).
const extras: L.Layer[] = [];

// Mittelpunkt bei Kreisen (#186): kleiner, gleichfarbiger, nicht-interaktiver
// Punkt am Zentrum — macht das exakte Zentrum sichtbar (radius in Pixeln).
if (feature.shape === "circle" && feature.geometry[0]) {
extras.push(
L.circleMarker(feature.geometry[0], {
radius: 3,
color: feature.color,
fillColor: feature.color,
fillOpacity: 1,
weight: 1,
interactive: false,
}),
);
}

const label = feature.label?.trim();
if (!labelsVisible || !label) return shape;

const labelElement = document.createElement("div");
labelElement.className = "lagekarte-area-label__text";
labelElement.textContent = label;
labelElement.style.backgroundColor = `color-mix(in srgb, ${feature.color} 14%, transparent)`;
labelElement.style.color = `color-mix(in srgb, ${feature.color} 72%, black)`;
labelElement.style.borderColor = feature.color;
const center =
feature.shape === "circle" ? feature.geometry[0] : shape.getBounds().getCenter();
if (!center) return shape;
const labelMarker = L.marker(center, {
icon: L.divIcon({
className: "lagekarte-area-label",
html: labelElement,
iconAnchor: [0, 0],
iconSize: [0, 0],
}),
interactive: false,
keyboard: false,
});
return L.featureGroup([shape, labelMarker]);
if (labelsVisible && label) {
const labelElement = document.createElement("div");
labelElement.className = "lagekarte-area-label__text";
labelElement.textContent = label;
labelElement.style.backgroundColor = `color-mix(in srgb, ${feature.color} 14%, transparent)`;
labelElement.style.color = `color-mix(in srgb, ${feature.color} 72%, black)`;
labelElement.style.borderColor = feature.color;
const center =
feature.shape === "circle" ? feature.geometry[0] : shape.getBounds().getCenter();
if (center) {
extras.push(
L.marker(center, {
icon: L.divIcon({
className: "lagekarte-area-label",
html: labelElement,
iconAnchor: [0, 0],
iconSize: [0, 0],
}),
interactive: false,
keyboard: false,
}),
);
}
}

if (extras.length === 0) return shape;
return L.featureGroup([shape, ...extras]);
}

const tip = buildTooltip(feature);
Expand Down Expand Up @@ -328,6 +352,8 @@ export function Lagekarte({
const [areaColor, setAreaColor] = useState("#d5372b");
const [areaOpacity, setAreaOpacity] = useState(0.3);
const [areaDash, setAreaDash] = useState("");
// Radius des ausgewählten Kreises in Metern, im Editor bearbeitbar (#186).
const [areaRadius, setAreaRadius] = useState(0);
const [label, setLabel] = useState("");
const [description, setDescription] = useState("");
// Ausrichtung des ausgewählten Symbols (0–359°, 0 = Norden). Pro Symbol, nicht global
Expand Down Expand Up @@ -563,6 +589,7 @@ export function Lagekarte({
setAreaColor(selectedFeature.color);
setAreaOpacity(selectedFeature.opacity);
setAreaDash(selectedFeature.dashArray ?? "");
setAreaRadius(Math.round(selectedFeature.radiusM ?? 0));
} else {
setRotation(selectedFeature.rotation ?? 0);
}
Expand Down Expand Up @@ -668,6 +695,9 @@ export function Lagekarte({
color: areaColor,
opacity: areaOpacity,
dashArray: areaDash || "",
// Radius nur bei Kreisen mitschreiben (#186); >0 erzwingen, damit ein
// versehentlich geleertes Feld den Kreis nicht kollabieren lässt.
...(current.shape === "circle" ? { radiusM: Math.max(1, areaRadius) } : {}),
label,
description,
updatedAt,
Expand Down Expand Up @@ -1715,6 +1745,19 @@ export function Lagekarte({
<button type="button" title="Gestrichelt" aria-pressed={areaDash === "5,5"} onClick={() => setAreaDash("5,5")}>╌</button>
<button type="button" title="Gepunktet" aria-pressed={areaDash === "2,4"} onClick={() => setAreaDash("2,4")}>┄</button>
</fieldset>
{selectedFeature.shape === "circle" && (
<label className="lagekarte-field">
<span>Radius {formatDistance(Math.max(1, areaRadius))}</span>
<input
type="number"
min="1"
step="10"
value={areaRadius}
aria-label="Radius in Metern"
onChange={(event) => setAreaRadius(Math.max(0, Number(event.target.value)))}
/>
</label>
)}
</>
)}
{selectedFeature.kind === "symbol" && (
Expand Down