diff --git a/src/app.d.ts b/src/app.d.ts
index 057ee2319..37e9c7b6f 100644
--- a/src/app.d.ts
+++ b/src/app.d.ts
@@ -9,6 +9,11 @@ declare global {
 		interface PageData {
 			geo?: GeoLocation;
 		}
+		// Shallow-routing state. The add-location wizard stores its current step
+		// here so browser back/forward navigates between steps.
+		interface PageState {
+			wizardStep?: "intro" | "online" | "map" | "update" | "new" | "success";
+		}
 		// interface Platform {}
 	}
 
diff --git a/src/components/form/AddressSearch.svelte b/src/components/form/AddressSearch.svelte
index 1c5739c4f..3da272d4b 100644
--- a/src/components/form/AddressSearch.svelte
+++ b/src/components/form/AddressSearch.svelte
@@ -13,7 +13,19 @@ export let disabled = false;
 export let locale = "en";
 
 const dispatch = createEventDispatcher<{
-	select: { lat: number; lng: number; displayName: string };
+	select: {
+		lat: number;
+		lng: number;
+		displayName: string;
+		// Enriched OSM metadata, present when the match is a tagged POI.
+		name?: string;
+		category?: string;
+		website?: string;
+		phone?: string;
+		openingHours?: string;
+		osmType?: string;
+		osmId?: string;
+	};
 }>();
 
 // Per-instance ID prefix so multiple AddressSearch components on the
@@ -43,7 +55,18 @@ $: if (
 }
 
 function emitSelect(r: GeocodeResult) {
-	dispatch("select", { lat: r.lat, lng: r.lon, displayName: r.displayName });
+	dispatch("select", {
+		lat: r.lat,
+		lng: r.lon,
+		displayName: r.displayName,
+		name: r.name,
+		category: r.category,
+		website: r.website,
+		phone: r.phone,
+		openingHours: r.openingHours,
+		osmType: r.osmType,
+		osmId: r.osmId,
+	});
 }
 
 function closeResults() {
diff --git a/src/components/form/OpeningHoursEditor.svelte b/src/components/form/OpeningHoursEditor.svelte
new file mode 100644
index 000000000..acbe793ec
--- /dev/null
+++ b/src/components/form/OpeningHoursEditor.svelte
@@ -0,0 +1,277 @@
+<script lang="ts">
+import OpeningHours from "opening_hours";
+
+import { _ } from "$lib/i18n";
+
+// Friendly editor that produces an OSM `opening_hours` string (the same syntax
+// OSM editors like iD use), e.g. "Mo-Fr 09:00-12:00,13:00-17:00; Sa 10:00-14:00".
+// Supports multiple time ranges per day (split hours / lunch breaks).
+export let value = "";
+export let disabled = false;
+
+const DAYS = ["Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"] as const;
+
+type TimeRange = { from: string; to: string };
+type DayState = { open: boolean; is24: boolean; ranges: TimeRange[] };
+
+const defaultRange = (): TimeRange => ({ from: "09:00", to: "17:00" });
+const makeDefaultDays = (): DayState[] =>
+	DAYS.map(() => ({ open: false, is24: false, ranges: [defaultRange()] }));
+
+let days: DayState[] = makeDefaultDays();
+let always24 = false;
+// When the incoming value can't be represented by the simple editor, fall back
+// to a raw text field so nothing is lost.
+let rawMode = false;
+
+// Guard so our own emitted value doesn't re-trigger a parse.
+let lastEmitted = "";
+
+// --- string generation -----------------------------------------------------
+function daySpec(d: DayState): string | null {
+	if (!d.open) return null;
+	if (d.is24) return "00:00-24:00";
+	const valid = d.ranges.filter((r) => r.from && r.to);
+	if (valid.length === 0) return null;
+	return valid.map((r) => `${r.from}-${r.to}`).join(",");
+}
+
+function generate(): string {
+	if (always24) return "24/7";
+	const specs = days.map(daySpec);
+	const parts: string[] = [];
+	let i = 0;
+	while (i < DAYS.length) {
+		const spec = specs[i];
+		if (spec === null) {
+			i++;
+			continue;
+		}
+		// Extend a run of consecutive days sharing the same hours.
+		let j = i;
+		while (j + 1 < DAYS.length && specs[j + 1] === spec) j++;
+		const dayPart = i === j ? DAYS[i] : `${DAYS[i]}-${DAYS[j]}`;
+		parts.push(`${dayPart} ${spec}`);
+		i = j + 1;
+	}
+	return parts.join("; ");
+}
+
+function emit() {
+	const next = generate();
+	lastEmitted = next;
+	value = next;
+}
+
+// --- parsing (subset we generate) ------------------------------------------
+const DAY_INDEX: Record<string, number> = Object.fromEntries(
+	DAYS.map((d, i) => [d, i]),
+);
+
+function parse(input: string): DayState[] | "24/7" | null {
+	const str = input.trim();
+	if (str === "") return makeDefaultDays();
+	if (str === "24/7") return "24/7";
+
+	const next = makeDefaultDays();
+	for (const rawToken of str.split(";")) {
+		const token = rawToken.trim();
+		if (token === "") continue;
+		// "<days> <range>[,<range>...]"
+		const m = token.match(
+			/^([A-Za-z][A-Za-z,-]*)\s+((?:\d{2}:\d{2}-\d{2}:\d{2})(?:,\d{2}:\d{2}-\d{2}:\d{2})*)$/,
+		);
+		if (!m) return null;
+		const [, dayPart, timePart] = m;
+		const indices = expandDays(dayPart);
+		if (!indices) return null;
+
+		const ranges: TimeRange[] = timePart.split(",").map((r) => {
+			const [from, to] = r.split("-");
+			return { from, to };
+		});
+		const is24 =
+			ranges.length === 1 &&
+			ranges[0].from === "00:00" &&
+			ranges[0].to === "24:00";
+		for (const idx of indices) {
+			next[idx] = { open: true, is24, ranges: ranges.map((r) => ({ ...r })) };
+		}
+	}
+	return next;
+}
+
+function expandDays(part: string): number[] | null {
+	const out: number[] = [];
+	for (const seg of part.split(",")) {
+		const range = seg.split("-");
+		if (range.length === 1) {
+			const idx = DAY_INDEX[range[0]];
+			if (idx === undefined) return null;
+			out.push(idx);
+		} else if (range.length === 2) {
+			const a = DAY_INDEX[range[0]];
+			const b = DAY_INDEX[range[1]];
+			if (a === undefined || b === undefined || a > b) return null;
+			for (let k = a; k <= b; k++) out.push(k);
+		} else {
+			return null;
+		}
+	}
+	return out;
+}
+
+// Parse an externally-supplied value (initial mount, prefill from OSM data).
+$: if (value !== lastEmitted) {
+	const parsed = parse(value);
+	if (parsed === "24/7") {
+		always24 = true;
+		days = makeDefaultDays();
+		rawMode = false;
+	} else if (parsed) {
+		always24 = false;
+		days = parsed;
+		rawMode = false;
+	} else {
+		// Unrepresentable — keep the raw string editable.
+		rawMode = true;
+	}
+	lastEmitted = value;
+}
+
+// --- validation feedback ---------------------------------------------------
+$: validationError = validate(value);
+function validate(str: string): string {
+	if (!str.trim()) return "";
+	try {
+		// Constructing throws on invalid syntax.
+		new OpeningHours(str);
+		return "";
+	} catch {
+		return $_("openingHours.invalid");
+	}
+}
+
+// --- user actions ----------------------------------------------------------
+function toggleDay(i: number) {
+	days[i].open = !days[i].open;
+	if (days[i].open && days[i].ranges.length === 0) {
+		days[i].ranges = [defaultRange()];
+	}
+	days = days;
+	emit();
+}
+function addRange(i: number) {
+	days[i].ranges = [...days[i].ranges, defaultRange()];
+	days = days;
+	emit();
+}
+function removeRange(i: number, r: number) {
+	days[i].ranges = days[i].ranges.filter((_, idx) => idx !== r);
+	days = days;
+	emit();
+}
+function copyFirstOpenToAll() {
+	const source = days.find((d) => d.open);
+	if (!source) return;
+	days = days.map(() => ({
+		open: true,
+		is24: source.is24,
+		ranges: source.ranges.map((r) => ({ ...r })),
+	}));
+	emit();
+}
+function onFieldChange() {
+	days = days;
+	emit();
+}
+
+const timeClass =
+	"rounded-lg border-2 border-input p-2 text-sm focus:outline-link disabled:cursor-not-allowed disabled:bg-gray-100 dark:bg-white/[0.15]";
+</script>
+
+<div class="space-y-3">
+	{#if rawMode}
+		<div>
+			<p class="mb-1 text-sm text-primary/80 dark:text-white/70">
+				{$_('openingHours.rawHint')}
+			</p>
+			<input
+				type="text"
+				bind:value
+				{disabled}
+				placeholder="Mo-Fr 09:00-17:00; Sa 10:00-14:00"
+				class="w-full rounded-2xl border-2 border-input p-3 focus:outline-link disabled:cursor-not-allowed disabled:bg-gray-100 dark:bg-white/[0.15]"
+			/>
+			<button
+				type="button"
+				class="mt-2 text-sm font-semibold text-link hover:text-hover"
+				on:click={() => {
+					rawMode = false;
+					value = '';
+					lastEmitted = '';
+					days = makeDefaultDays();
+					always24 = false;
+				}}
+			>
+				{$_('openingHours.useSimpleEditor')}
+			</button>
+		</div>
+	{:else}
+		<label class="flex items-center gap-2">
+			<input type="checkbox" class="h-4 w-4 accent-link" bind:checked={always24} on:change={onFieldChange} {disabled} />
+			<span class="font-semibold">{$_('openingHours.open247')}</span>
+		</label>
+
+		{#if !always24}
+			<div class="space-y-3">
+				{#each days as day, i (DAYS[i])}
+					<div class="flex flex-wrap items-start gap-2">
+						<label class="flex w-28 items-center gap-2 pt-2">
+							<input type="checkbox" class="h-4 w-4 accent-link" checked={day.open} on:change={() => toggleDay(i)} {disabled} />
+							<span>{$_(`openingHours.days.${DAYS[i]}`)}</span>
+						</label>
+						{#if day.open}
+							<div class="flex flex-col gap-2">
+								<label class="flex items-center gap-1 text-sm">
+									<input type="checkbox" class="h-4 w-4 accent-link" bind:checked={day.is24} on:change={onFieldChange} {disabled} />
+									{$_('openingHours.allDay')}
+								</label>
+								{#if !day.is24}
+									{#each day.ranges as range, r (r)}
+										<div class="flex items-center gap-2">
+											<input type="time" class={timeClass} bind:value={range.from} on:change={onFieldChange} {disabled} aria-label={$_('openingHours.from')} />
+											<span>–</span>
+											<input type="time" class={timeClass} bind:value={range.to} on:change={onFieldChange} {disabled} aria-label={$_('openingHours.to')} />
+											{#if day.ranges.length > 1}
+												<button type="button" class="px-2 text-lg text-error hover:opacity-70" on:click={() => removeRange(i, r)} {disabled} aria-label={$_('openingHours.removeRange')}>×</button>
+											{/if}
+										</div>
+									{/each}
+									<button type="button" class="self-start text-sm font-semibold text-link hover:text-hover" on:click={() => addRange(i)} {disabled}>
+										+ {$_('openingHours.addRange')}
+									</button>
+								{/if}
+							</div>
+						{:else}
+							<span class="pt-2 text-sm text-primary/60 dark:text-white/50">{$_('openingHours.closed')}</span>
+						{/if}
+					</div>
+				{/each}
+			</div>
+
+			<button type="button" class="text-sm font-semibold text-link hover:text-hover" on:click={copyFirstOpenToAll} {disabled}>
+				{$_('openingHours.copyToAll')}
+			</button>
+		{/if}
+
+		<div class="rounded-lg bg-link/5 px-3 py-2 text-sm">
+			<span class="text-primary/70 dark:text-white/60">{$_('openingHours.preview')}:</span>
+			<code class="font-mono">{value || $_('openingHours.none')}</code>
+		</div>
+	{/if}
+
+	{#if validationError}
+		<p class="text-sm font-semibold text-error">{validationError}</p>
+	{/if}
+</div>
diff --git a/src/lib/btcmapApi.ts b/src/lib/btcmapApi.ts
new file mode 100644
index 000000000..dbcc4fea4
--- /dev/null
+++ b/src/lib/btcmapApi.ts
@@ -0,0 +1,105 @@
+// Server-only client for the btcmap-api JSON-RPC endpoint (/rpc).
+//
+// Currently exposes submit_place, the sanctioned import pipeline: it puts a
+// place on BTC Map instantly (in btcmap-api's own database) and lets editors
+// merge it into OSM later. We call it on maintainer approval, never on raw
+// public submission, so it doesn't bypass spam review.
+//
+// Requires a trusted bearer token with the places_source role, provisioned by
+// the btcmap-api maintainers. Everything is gated behind btcmapApiConfigured()
+// so the site runs without the token — the submit simply stays disabled.
+
+import { API_BASE } from "$lib/api-base";
+import type { OsmPayload } from "$lib/osmPayload";
+
+import { env } from "$env/dynamic/private";
+
+const DEFAULT_ORIGIN = "btcmap-org";
+
+export function btcmapApiConfigured(): boolean {
+	return Boolean(env.BTCMAP_API_RPC_TOKEN);
+}
+
+function importOrigin(): string {
+	return env.BTCMAP_PLACE_IMPORT_ORIGIN || DEFAULT_ORIGIN;
+}
+
+type SubmitPlaceResult = {
+	id: number;
+	origin: string;
+	external_id: string;
+};
+
+async function rpc<T>(
+	method: string,
+	params: Record<string, unknown>,
+): Promise<T> {
+	const res = await fetch(`${API_BASE}/rpc`, {
+		method: "POST",
+		headers: {
+			"Content-Type": "application/json",
+			Authorization: `Bearer ${env.BTCMAP_API_RPC_TOKEN}`,
+		},
+		body: JSON.stringify({ jsonrpc: "2.0", method, params, id: 1 }),
+	});
+	const text = await res.text();
+	if (!res.ok) {
+		throw new Error(`btcmap-api ${method} failed (${res.status}): ${text}`);
+	}
+	const parsed = JSON.parse(text);
+	if (parsed.error) {
+		throw new Error(
+			`btcmap-api ${method} error: ${JSON.stringify(parsed.error)}`,
+		);
+	}
+	return parsed.result as T;
+}
+
+// Map an OSM create-payload to submit_place params. external_id is derived from
+// the Gitea issue so a re-approval patches the same record instead of
+// duplicating it (submit_place is idempotent on (origin, external_id)).
+export async function submitPlaceFromPayload(
+	payload: OsmPayload,
+	externalId: string,
+): Promise<SubmitPlaceResult> {
+	if (!btcmapApiConfigured()) {
+		throw new Error(
+			"submit_place not configured (missing BTCMAP_API_RPC_TOKEN)",
+		);
+	}
+	const name = payload.tags.name;
+	const category = payload.category;
+	if (!name) throw new Error("submit_place payload missing name");
+	if (!category) throw new Error("submit_place payload missing category");
+	if (!Number.isFinite(payload.lat) || !Number.isFinite(payload.lon)) {
+		throw new Error("submit_place payload missing coordinates");
+	}
+
+	// Carry the human-relevant tags across as extra_fields for editor review.
+	const extraFields: Record<string, string> = {};
+	const carry: Array<[string, string]> = [
+		["website", "contact:website"],
+		["phone", "contact:phone"],
+		["opening_hours", "opening_hours"],
+		["twitter", "contact:twitter"],
+		["facebook", "contact:facebook"],
+		["instagram", "contact:instagram"],
+	];
+	for (const [field, tag] of carry) {
+		if (payload.tags[tag]) extraFields[field] = payload.tags[tag];
+	}
+	if (payload.tags["payment:onchain"]) extraFields.payment_onchain = "yes";
+	if (payload.tags["payment:lightning"]) extraFields.payment_lightning = "yes";
+	if (payload.tags["payment:lightning_contactless"])
+		extraFields.payment_lightning_contactless = "yes";
+
+	return rpc<SubmitPlaceResult>("submit_place", {
+		origin: importOrigin(),
+		external_id: externalId,
+		lat: payload.lat,
+		lon: payload.lon,
+		category,
+		name,
+		extra_fields: extraFields,
+	});
+}
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 6cc4098b1..112599968 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -12,6 +12,21 @@ export const GITEA_LABELS = {
 	},
 } as const;
 
+// Name-based labels resolved/created at issue-creation time via createLabel().
+// Using names (instead of hardcoded numeric ids) means these labels do not need
+// to be pre-created in Gitea with a known id — the first submission creates them.
+export const GITEA_LABEL_NAMES = {
+	// Wizard: business with no physical location visitors can go to — online
+	// shops/webshops and services delivered at the customer's place (e.g. a mobile
+	// window cleaner). Stored for a future listing, not shown on the map yet.
+	ONLINE_OR_MOBILE: "online-or-mobile",
+	// Wizard: user reports updated data for a merchant already present on OSM.
+	UPDATE_LOCATION: "update-location",
+	// Applied by a maintainer to green-light an automated OSM push (see
+	// src/routes/api/gitea/webhook). The webhook only acts on issues carrying this label.
+	APPROVED: "osm-approved",
+} as const;
+
 export const POLLING_INTERVAL = 2500;
 export const QR_CODE_SIZE = { mobile: 200, desktop: 275 };
 
diff --git a/src/lib/geocoding.test.ts b/src/lib/geocoding.test.ts
index aefd81e1d..4f9a903f7 100644
--- a/src/lib/geocoding.test.ts
+++ b/src/lib/geocoding.test.ts
@@ -24,6 +24,8 @@ describe("searchAddress", () => {
 			format: "jsonv2",
 			limit: 5,
 			addressdetails: 0,
+			extratags: 1,
+			namedetails: 1,
 			"accept-language": "de",
 		});
 	});
@@ -54,6 +56,51 @@ describe("searchAddress", () => {
 		]);
 	});
 
+	it("enriches results with OSM POI metadata when present", async () => {
+		mockedAxios.get.mockResolvedValueOnce({
+			data: [
+				{
+					lat: "53.0318",
+					lon: "5.6580",
+					display_name: "Kreta, Sneek, Netherlands",
+					name: "Kreta",
+					type: "restaurant",
+					osm_type: "node",
+					osm_id: 42,
+					namedetails: { name: "Kreta" },
+					extratags: {
+						website: "https://kreta.example",
+						phone: "+31 515 123456",
+						opening_hours: "Mo-Su 12:00-22:00",
+					},
+				},
+			],
+		});
+
+		const results = await searchAddress("kreta sneek", "en");
+
+		expect(results[0]).toEqual({
+			lat: 53.0318,
+			lon: 5.658,
+			displayName: "Kreta, Sneek, Netherlands",
+			name: "Kreta",
+			category: "restaurant",
+			website: "https://kreta.example",
+			phone: "+31 515 123456",
+			openingHours: "Mo-Su 12:00-22:00",
+			osmType: "node",
+			osmId: "42",
+		});
+	});
+
+	it("ignores an uninformative type ('yes') for category", async () => {
+		mockedAxios.get.mockResolvedValueOnce({
+			data: [{ lat: "1", lon: "2", display_name: "x", type: "yes" }],
+		});
+		const results = await searchAddress("x", "en");
+		expect(results[0].category).toBeUndefined();
+	});
+
 	it("returns an empty array on empty response", async () => {
 		mockedAxios.get.mockResolvedValueOnce({ data: [] });
 
diff --git a/src/lib/geocoding.ts b/src/lib/geocoding.ts
index abf34999a..2b6ea37bc 100644
--- a/src/lib/geocoding.ts
+++ b/src/lib/geocoding.ts
@@ -4,17 +4,42 @@ export type GeocodeResult = {
 	lat: number;
 	lon: number;
 	displayName: string;
+	// Enriched OSM metadata (when the matched result is a tagged POI). Used by
+	// the add-location wizard to prefill a new merchant from an existing OSM place.
+	name?: string;
+	category?: string;
+	website?: string;
+	phone?: string;
+	openingHours?: string;
+	osmType?: string;
+	osmId?: string;
 };
 
 type NominatimResult = {
 	lat: string;
 	lon: string;
 	display_name: string;
+	name?: string;
+	category?: string;
+	type?: string;
+	osm_type?: string;
+	osm_id?: number;
+	extratags?: Record<string, string> | null;
+	namedetails?: Record<string, string> | null;
 };
 
 const NOMINATIM_URL = "https://nominatim.openstreetmap.org/search";
 const REQUEST_TIMEOUT_MS = 8000;
 
+const firstNonEmpty = (
+	...vals: Array<string | undefined | null>
+): string | undefined => {
+	for (const v of vals) {
+		if (v && v.trim()) return v.trim();
+	}
+	return undefined;
+};
+
 export const searchAddress = async (
 	query: string,
 	locale: string,
@@ -25,6 +50,9 @@ export const searchAddress = async (
 			format: "jsonv2",
 			limit: 5,
 			addressdetails: 0,
+			// Request POI metadata so the wizard can prefill name/category/contact.
+			extratags: 1,
+			namedetails: 1,
 			"accept-language": locale,
 		},
 		timeout: REQUEST_TIMEOUT_MS,
@@ -34,9 +62,23 @@ export const searchAddress = async (
 	for (const entry of response.data) {
 		const lat = Number(entry.lat);
 		const lon = Number(entry.lon);
-		if (Number.isFinite(lat) && Number.isFinite(lon)) {
-			results.push({ lat, lon, displayName: entry.display_name });
-		}
+		if (!Number.isFinite(lat) || !Number.isFinite(lon)) continue;
+
+		const extra = entry.extratags ?? {};
+		results.push({
+			lat,
+			lon,
+			displayName: entry.display_name,
+			name: firstNonEmpty(entry.namedetails?.name, entry.name),
+			// `type` is the specific OSM tag value (restaurant, cafe, ...); it maps
+			// well to a single-word merchant category. Skip uninformative values.
+			category: entry.type && entry.type !== "yes" ? entry.type : undefined,
+			website: firstNonEmpty(extra.website, extra["contact:website"]),
+			phone: firstNonEmpty(extra.phone, extra["contact:phone"]),
+			openingHours: firstNonEmpty(extra.opening_hours),
+			osmType: entry.osm_type,
+			osmId: entry.osm_id != null ? String(entry.osm_id) : undefined,
+		});
 	}
 	return results;
 };
diff --git a/src/lib/i18n/locales/en.json b/src/lib/i18n/locales/en.json
index ac3d495df..6a79c015c 100644
--- a/src/lib/i18n/locales/en.json
+++ b/src/lib/i18n/locales/en.json
@@ -503,6 +503,65 @@
 		"address": "Address",
 		"captchaPlaceholder": "Please enter the captcha text."
 	},
+	"addLocationWizard": {
+		"title": "Add a Location",
+		"physicalQuestion": "Does the business have a physical location visitors can go to?",
+		"physicalHint": "A physical location is a place customers can visit in person (a shop, café, office, market stall, etc.).",
+		"yes": "Yes",
+		"no": "No",
+		"back": "Back",
+		"onlineHeading": "Online or mobile business",
+		"onlineIntro": "Thanks! This is for businesses without a location customers visit — online shops and webshops, and services delivered at the customer's place (for example a mobile window cleaner). We can't show these on the map yet, but we're building that. Share your details and we'll store them for the upcoming listing.",
+		"socialLabel": "Social media",
+		"socialPlaceholder": "Links to X, Instagram, Nostr, etc.",
+		"onlineSuccessType": "online or mobile business",
+		"onlineSuccessText": "Thanks for your submission! The map currently shows only businesses with a visitable location, but we'll list online and mobile bitcoin-accepting businesses in the future and your data will be used for that.",
+		"mapHeading": "Is your business already on the map?",
+		"mapIntro": "Search for your business or browse the map. If you find it, select it to view and update its details.",
+		"mapClickHint": "Tap an orange dot to select an existing location.",
+		"searchedResultLabel": "Search result",
+		"useSearchedLocation": "This is my business — add it",
+		"notOnMap": "It's not on the map yet",
+		"loadingPlace": "Loading location…",
+		"updateHeading": "Update this location",
+		"updateIntro": "Review the details below and correct anything that's outdated or missing.",
+		"updatePaymentLegend": "Accepted payment methods (update if changed)",
+		"newHeading": "Add a new physical location",
+		"newIntro": "Tell us where the business is and how it accepts bitcoin. Place a pin on the map, then give an address or a description of the location — whichever fits best.",
+		"locationDescriptionLabel": "Location description",
+		"locationDescriptionHint": "Describe how to find the place if it has no street address — landmarks, directions, floor, etc.",
+		"locationDescriptionPlaceholder": "e.g. 200m north of the temple gate, second stall on the left",
+		"addressOrDescriptionHint": "Provide a street address or a location description below — at least one is required.",
+		"locationTextError": "Please provide either an address or a location description.",
+		"newSuccessType": "location",
+		"newSuccessText": "Thanks! Your location has been submitted for review. Once a BTC Map editor approves it, it will appear on the map and be merged into OpenStreetMap.",
+		"updateSuccessType": "update",
+		"updateSuccessText": "Thanks! Your update has been submitted for review by a BTC Map editor."
+	},
+	"openingHours": {
+		"open247": "Open 24/7",
+		"allDay": "All day",
+		"from": "Opening time",
+		"to": "Closing time",
+		"closed": "Closed",
+		"addRange": "Add hours",
+		"removeRange": "Remove this time range",
+		"copyToAll": "Copy first open day to all days",
+		"preview": "Result",
+		"none": "Not set",
+		"invalid": "This doesn't look like valid opening hours.",
+		"rawHint": "Editing opening hours in raw OSM format:",
+		"useSimpleEditor": "Switch back to the simple editor (clears current value)",
+		"days": {
+			"Mo": "Monday",
+			"Tu": "Tuesday",
+			"We": "Wednesday",
+			"Th": "Thursday",
+			"Fr": "Friday",
+			"Sa": "Saturday",
+			"Su": "Sunday"
+		}
+	},
 	"addLocation": {
 		"title": "Add Location",
 		"subheading": "Accept bitcoin? Get found",
diff --git a/src/lib/osm.ts b/src/lib/osm.ts
new file mode 100644
index 000000000..4a0a235ce
--- /dev/null
+++ b/src/lib/osm.ts
@@ -0,0 +1,211 @@
+// Minimal OSM API 0.6 client for the approve-and-push flow.
+//
+// Server-only. Authenticates with an OAuth 2.0 bearer token belonging to a
+// dedicated BTC Map bot account. Everything is gated behind osmConfigured() so
+// the site runs fine without OSM credentials — the push simply stays disabled.
+
+import type { OsmPayload } from "$lib/osmPayload";
+
+import { env } from "$env/dynamic/private";
+
+const DEFAULT_API_BASE = "https://api.openstreetmap.org";
+
+export function osmConfigured(): boolean {
+	return Boolean(env.OSM_OAUTH_TOKEN);
+}
+
+function apiBase(): string {
+	return (env.OSM_API_BASE || DEFAULT_API_BASE).replace(/\/$/, "");
+}
+
+function authHeaders(
+	extra: Record<string, string> = {},
+): Record<string, string> {
+	return {
+		Authorization: `Bearer ${env.OSM_OAUTH_TOKEN}`,
+		...extra,
+	};
+}
+
+function xmlEscape(value: string): string {
+	return value
+		.replace(/&/g, "&amp;")
+		.replace(/</g, "&lt;")
+		.replace(/>/g, "&gt;")
+		.replace(/"/g, "&quot;")
+		.replace(/'/g, "&apos;");
+}
+
+function tagsToXml(tags: Record<string, string>): string {
+	return Object.entries(tags)
+		.filter(([, v]) => v !== undefined && v !== null && String(v) !== "")
+		.map(
+			([k, v]) => `    <tag k="${xmlEscape(k)}" v="${xmlEscape(String(v))}"/>`,
+		)
+		.join("\n");
+}
+
+async function osmRequest(
+	method: string,
+	path: string,
+	body?: string,
+): Promise<string> {
+	const response = await fetch(`${apiBase()}${path}`, {
+		method,
+		headers: authHeaders(body ? { "Content-Type": "text/xml" } : {}),
+		body,
+	});
+	const text = await response.text();
+	if (!response.ok) {
+		throw new Error(
+			`OSM ${method} ${path} failed (${response.status}): ${text}`,
+		);
+	}
+	return text;
+}
+
+async function createChangeset(comment: string): Promise<string> {
+	const xml = `<osm>
+  <changeset>
+    <tag k="created_by" v="BTC Map wizard"/>
+    <tag k="comment" v="${xmlEscape(comment)}"/>
+    <tag k="source" v="survey"/>
+  </changeset>
+</osm>`;
+	const id = await osmRequest("PUT", "/api/0.6/changeset/create", xml);
+	return id.trim();
+}
+
+async function closeChangeset(id: string): Promise<void> {
+	await osmRequest("PUT", `/api/0.6/changeset/${id}/close`);
+}
+
+// Parse the bits we need out of a node's XML representation. Deliberately small:
+// we only read version, coordinates and existing tags so an update can merge
+// without dropping data (a full-element upload replaces all tags).
+type ParsedNode = {
+	version: string;
+	lat: string;
+	lon: string;
+	tags: Record<string, string>;
+};
+
+function parseNodeXml(xml: string): ParsedNode {
+	const nodeMatch = xml.match(/<node\b[^>]*>/);
+	const attrs = nodeMatch ? nodeMatch[0] : "";
+	const attr = (name: string): string => {
+		const m = attrs.match(new RegExp(`${name}="([^"]*)"`));
+		return m ? m[1] : "";
+	};
+	const tags: Record<string, string> = {};
+	const tagRe = /<tag\s+k="([^"]*)"\s+v="([^"]*)"\s*\/>/g;
+	let m: RegExpExecArray | null;
+	// biome-ignore lint/suspicious/noAssignInExpressions: standard regex loop
+	while ((m = tagRe.exec(xml)) !== null) {
+		tags[decodeXml(m[1])] = decodeXml(m[2]);
+	}
+	return {
+		version: attr("version"),
+		lat: attr("lat"),
+		lon: attr("lon"),
+		tags,
+	};
+}
+
+function decodeXml(value: string): string {
+	return value
+		.replace(/&lt;/g, "<")
+		.replace(/&gt;/g, ">")
+		.replace(/&quot;/g, '"')
+		.replace(/&apos;/g, "'")
+		.replace(/&amp;/g, "&");
+}
+
+async function fetchNode(osmId: string): Promise<ParsedNode> {
+	const xml = await osmRequest("GET", `/api/0.6/node/${osmId}`);
+	return parseNodeXml(xml);
+}
+
+export type OsmPushResult = {
+	changesetId: string;
+	osmType: "node";
+	osmId: string;
+	url: string;
+};
+
+// Create a new node or merge tags into an existing one, then close the changeset.
+export async function pushToOsm(payload: OsmPayload): Promise<OsmPushResult> {
+	if (!osmConfigured()) {
+		throw new Error("OSM push not configured (missing OSM_OAUTH_TOKEN)");
+	}
+
+	if (payload.action === "update") {
+		if (payload.osmType && payload.osmType !== "node") {
+			// Ways/relations need geometry handling we intentionally don't do here.
+			throw new Error(
+				`Unsupported OSM element type for push: ${payload.osmType}`,
+			);
+		}
+		if (!payload.osmId) throw new Error("Update payload missing osmId");
+	}
+	if (payload.action === "create") {
+		if (!Number.isFinite(payload.lat) || !Number.isFinite(payload.lon)) {
+			throw new Error("Create payload missing coordinates");
+		}
+	}
+
+	const name = payload.tags.name || "merchant";
+	const changesetId = await createChangeset(
+		payload.action === "create"
+			? `Add bitcoin-accepting merchant "${name}" (via BTC Map)`
+			: `Update bitcoin-accepting merchant "${name}" (via BTC Map)`,
+	);
+
+	try {
+		if (payload.action === "create") {
+			const xml = `<osm>
+  <node changeset="${changesetId}" lat="${payload.lat}" lon="${payload.lon}">
+${tagsToXml(payload.tags)}
+  </node>
+</osm>`;
+			const newId = (
+				await osmRequest("PUT", "/api/0.6/node/create", xml)
+			).trim();
+			await closeChangeset(changesetId);
+			return {
+				changesetId,
+				osmType: "node",
+				osmId: newId,
+				url: `${apiBase()}/node/${newId}`,
+			};
+		}
+
+		// update: fetch current node, merge tags, upload with same version.
+		const osmId = payload.osmId as string;
+		const existing = await fetchNode(osmId);
+		const mergedTags = { ...existing.tags, ...payload.tags };
+		const lat = Number.isFinite(payload.lat) ? payload.lat : existing.lat;
+		const lon = Number.isFinite(payload.lon) ? payload.lon : existing.lon;
+		const xml = `<osm>
+  <node id="${osmId}" changeset="${changesetId}" version="${existing.version}" lat="${lat}" lon="${lon}">
+${tagsToXml(mergedTags)}
+  </node>
+</osm>`;
+		await osmRequest("PUT", `/api/0.6/node/${osmId}`, xml);
+		await closeChangeset(changesetId);
+		return {
+			changesetId,
+			osmType: "node",
+			osmId,
+			url: `${apiBase()}/node/${osmId}`,
+		};
+	} catch (err) {
+		// Best-effort cleanup so we don't leave an open changeset dangling.
+		try {
+			await closeChangeset(changesetId);
+		} catch {
+			// ignore
+		}
+		throw err;
+	}
+}
diff --git a/src/lib/osmPayload.test.ts b/src/lib/osmPayload.test.ts
new file mode 100644
index 000000000..01e48cb35
--- /dev/null
+++ b/src/lib/osmPayload.test.ts
@@ -0,0 +1,146 @@
+import { describe, expect, it } from "vitest";
+
+import {
+	buildOsmPayload,
+	buildOsmPayloadBlock,
+	parseOsmPayloadBlock,
+} from "./osmPayload";
+
+describe("buildOsmPayload", () => {
+	it("maps wizard fields to OSM tags for a create", () => {
+		const payload = buildOsmPayload("create", {
+			name: "Satoshi Cafe",
+			nameEn: "Satoshi Cafe",
+			address: "1 Main St",
+			locationDescription: "next to the gate",
+			website: "https://example.com",
+			phone: "+123",
+			hours: "Mo-Fr 09:00-17:00",
+			methods: "onchain,lightning,nfc",
+			category: "cafe",
+			lat: "18.2649",
+			long: "98.5013",
+		});
+
+		expect(payload.action).toBe("create");
+		expect(payload.category).toBe("cafe");
+		expect(payload.lat).toBe(18.2649);
+		expect(payload.lon).toBe(98.5013);
+		expect(payload.tags).toMatchObject({
+			name: "Satoshi Cafe",
+			"name:en": "Satoshi Cafe",
+			"addr:full": "1 Main St",
+			description: "next to the gate",
+			"contact:website": "https://example.com",
+			"contact:phone": "+123",
+			opening_hours: "Mo-Fr 09:00-17:00",
+			"currency:XBT": "yes",
+			"payment:onchain": "yes",
+			"payment:lightning": "yes",
+			"payment:lightning_contactless": "yes",
+		});
+		// check_date is set to today (YYYY-MM-DD).
+		expect(payload.tags.check_date).toMatch(/^\d{4}-\d{2}-\d{2}$/);
+	});
+
+	it("omits empty fields instead of writing blank tags", () => {
+		const payload = buildOsmPayload("create", {
+			name: "Bar",
+			category: "bar",
+			website: "",
+			phone: "   ",
+			lat: "1",
+			long: "2",
+		});
+		expect(payload.tags).not.toHaveProperty("contact:website");
+		expect(payload.tags).not.toHaveProperty("contact:phone");
+		expect(payload.tags).not.toHaveProperty("name:en");
+	});
+
+	it("does not set payment tags when no methods are given", () => {
+		const payload = buildOsmPayload("create", {
+			name: "Bar",
+			category: "bar",
+			methods: "",
+			lat: "1",
+			long: "2",
+		});
+		expect(payload.tags).not.toHaveProperty("currency:XBT");
+		expect(payload.tags).not.toHaveProperty("payment:onchain");
+	});
+
+	it("captures osm element identity for an update", () => {
+		const payload = buildOsmPayload("update", {
+			name: "Shop",
+			osmType: "node",
+			osmId: "12345",
+			website: "https://shop.example",
+			lat: "10",
+			long: "20",
+		});
+		expect(payload.action).toBe("update");
+		expect(payload.osmType).toBe("node");
+		expect(payload.osmId).toBe("12345");
+	});
+
+	it("defaults a missing update osmType to node and drops invalid types", () => {
+		// No osmType given -> defaults to node.
+		expect(buildOsmPayload("update", { osmId: "1" }).osmType).toBe("node");
+		// A valid non-node type is preserved.
+		expect(
+			buildOsmPayload("update", { osmType: "way", osmId: "1" }).osmType,
+		).toBe("way");
+		// An unrecognized type is dropped (undefined); the OSM push treats an
+		// absent osmType as a node.
+		expect(
+			buildOsmPayload("update", { osmType: "bogus", osmId: "1" }).osmType,
+		).toBeUndefined();
+	});
+
+	it("omits coordinates when not numeric", () => {
+		const payload = buildOsmPayload("create", {
+			name: "X",
+			category: "c",
+			lat: "",
+			long: "abc",
+		});
+		expect(payload.lat).toBeUndefined();
+		expect(payload.lon).toBeUndefined();
+	});
+});
+
+describe("payload block round-trip", () => {
+	it("wraps a payload in delimited fences and parses it back", () => {
+		const block = buildOsmPayloadBlock("create", {
+			name: "Satoshi Cafe",
+			category: "cafe",
+			lat: "18.2649",
+			long: "98.5013",
+		});
+		expect(block).toContain("<!--BTCMAP_OSM_PAYLOAD_START-->");
+		expect(block).toContain("<!--BTCMAP_OSM_PAYLOAD_END-->");
+		expect(block).toContain("```json");
+
+		const parsed = parseOsmPayloadBlock(`Some issue text\n\n${block}\n\nmore`);
+		expect(parsed).not.toBeNull();
+		expect(parsed?.action).toBe("create");
+		expect(parsed?.tags.name).toBe("Satoshi Cafe");
+		expect(parsed?.category).toBe("cafe");
+	});
+
+	it("returns null when no block is present", () => {
+		expect(parseOsmPayloadBlock("just a plain issue body")).toBeNull();
+	});
+
+	it("returns null for a malformed block", () => {
+		const broken =
+			"<!--BTCMAP_OSM_PAYLOAD_START-->\n```json\n{ not json }\n```\n<!--BTCMAP_OSM_PAYLOAD_END-->";
+		expect(parseOsmPayloadBlock(broken)).toBeNull();
+	});
+
+	it("returns null when the action is invalid", () => {
+		const bad =
+			'<!--BTCMAP_OSM_PAYLOAD_START-->\n```json\n{"action":"delete","tags":{}}\n```\n<!--BTCMAP_OSM_PAYLOAD_END-->';
+		expect(parseOsmPayloadBlock(bad)).toBeNull();
+	});
+});
diff --git a/src/lib/osmPayload.ts b/src/lib/osmPayload.ts
new file mode 100644
index 000000000..3330e86ab
--- /dev/null
+++ b/src/lib/osmPayload.ts
@@ -0,0 +1,147 @@
+// Machine-readable OSM payload embedded in Gitea issue bodies.
+//
+// The add-location wizard emits this block so a maintainer can approve an issue
+// and have api/gitea/webhook push it to OSM automatically — no manual copy/paste.
+// The block is delimited by HTML comments so it stays invisible in Gitea's
+// rendered markdown while remaining trivially parseable.
+
+export const OSM_PAYLOAD_START = "<!--BTCMAP_OSM_PAYLOAD_START-->";
+export const OSM_PAYLOAD_END = "<!--BTCMAP_OSM_PAYLOAD_END-->";
+
+export type OsmPayloadAction = "create" | "update";
+
+export type OsmPayload = {
+	action: OsmPayloadAction;
+	// Present for updates: the existing OSM element to edit.
+	osmType?: "node" | "way" | "relation";
+	osmId?: string;
+	lat?: number;
+	lon?: number;
+	// Free-text merchant category (used by btcmap-api submit_place, which
+	// requires it; not written to OSM as-is).
+	category?: string;
+	// OSM tags to set (create) or merge (update).
+	tags: Record<string, string>;
+};
+
+const str = (v: unknown): string =>
+	(v === undefined || v === null ? "" : String(v)).trim();
+
+// Only assign a tag when the source value is non-empty, so we never write blank
+// tags to OSM.
+function setIf(
+	tags: Record<string, string>,
+	key: string,
+	value: unknown,
+): void {
+	const v = str(value);
+	if (v) tags[key] = v;
+}
+
+// Translate wizard form fields (loosely typed request body) into OSM tags.
+function tagsFromData(data: Record<string, unknown>): Record<string, string> {
+	const tags: Record<string, string> = {};
+
+	setIf(tags, "name", data.name);
+	setIf(tags, "name:en", data.nameEn);
+
+	// Address: prefer a structured full address; fall back to a free-text
+	// location description as a note so the maintainer keeps the context.
+	setIf(tags, "addr:full", data.address);
+	setIf(tags, "description", data.locationDescription);
+
+	setIf(tags, "contact:website", data.website);
+	setIf(tags, "contact:phone", data.phone);
+	setIf(tags, "opening_hours", data.hours);
+	setIf(tags, "contact:twitter", data.twitter);
+	setIf(tags, "contact:facebook", data.facebook);
+	setIf(tags, "contact:instagram", data.instagram);
+
+	// Payment methods arrive as a comma-separated string ("onchain,lightning,nfc").
+	const methods = str(data.methods)
+		.split(",")
+		.map((m) => m.trim())
+		.filter(Boolean);
+	if (methods.length) {
+		tags["currency:XBT"] = "yes";
+		if (methods.includes("onchain")) tags["payment:onchain"] = "yes";
+		if (methods.includes("lightning")) tags["payment:lightning"] = "yes";
+		if (methods.includes("nfc")) tags["payment:lightning_contactless"] = "yes";
+	}
+
+	// Record the survey date so downstream tooling sees a fresh check.
+	tags["check_date"] = new Date().toISOString().slice(0, 10);
+
+	return tags;
+}
+
+export function buildOsmPayload(
+	action: OsmPayloadAction,
+	data: Record<string, unknown>,
+): OsmPayload {
+	const payload: OsmPayload = {
+		action,
+		tags: tagsFromData(data),
+	};
+
+	const category = str(data.category);
+	if (category) payload.category = category;
+
+	// Guard against Number("") === 0, which would silently place a merchant at
+	// 0,0 (the Gulf of Guinea) instead of treating coordinates as missing.
+	const latText = str(data.lat);
+	const lonText = str(data.long);
+	const lat = latText === "" ? Number.NaN : Number(latText);
+	const lon = lonText === "" ? Number.NaN : Number(lonText);
+	if (Number.isFinite(lat)) payload.lat = lat;
+	if (Number.isFinite(lon)) payload.lon = lon;
+
+	if (action === "update") {
+		const osmType = str(data.osmType) || "node";
+		if (osmType === "node" || osmType === "way" || osmType === "relation") {
+			payload.osmType = osmType;
+		}
+		const osmId = str(data.osmId);
+		if (osmId) payload.osmId = osmId;
+	}
+
+	return payload;
+}
+
+export function buildOsmPayloadBlock(
+	action: OsmPayloadAction,
+	data: Record<string, unknown>,
+): string {
+	const payload = buildOsmPayload(action, data);
+	const json = JSON.stringify(payload, null, 2);
+	return `${OSM_PAYLOAD_START}\n\`\`\`json\n${json}\n\`\`\`\n${OSM_PAYLOAD_END}`;
+}
+
+// Extract and parse the payload block from a Gitea issue body. Returns null when
+// no valid block is present.
+export function parseOsmPayloadBlock(body: string): OsmPayload | null {
+	const start = body.indexOf(OSM_PAYLOAD_START);
+	const end = body.indexOf(OSM_PAYLOAD_END);
+	if (start === -1 || end === -1 || end < start) return null;
+
+	const between = body.slice(start + OSM_PAYLOAD_START.length, end);
+	// Strip the ```json fences if present.
+	const jsonText = between
+		.replace(/```json/gi, "")
+		.replace(/```/g, "")
+		.trim();
+
+	try {
+		const parsed = JSON.parse(jsonText) as OsmPayload;
+		if (
+			!parsed ||
+			(parsed.action !== "create" && parsed.action !== "update") ||
+			typeof parsed.tags !== "object"
+		) {
+			return null;
+		}
+		return parsed;
+	} catch {
+		return null;
+	}
+}
diff --git a/src/routes/add-location/wizard/+page.svelte b/src/routes/add-location/wizard/+page.svelte
new file mode 100644
index 000000000..4962fed9d
--- /dev/null
+++ b/src/routes/add-location/wizard/+page.svelte
@@ -0,0 +1,996 @@
+<script lang="ts">
+import axios from "axios";
+import DOMPurify from "dompurify";
+import type {
+	GeoJSONSource,
+	MapGeoJSONFeature,
+	Map as MapLibreMap,
+	Marker as MapLibreMarker,
+	MapMouseEvent,
+} from "maplibre-gl";
+import "maplibre-gl/dist/maplibre-gl.css";
+import { onDestroy, onMount } from "svelte";
+import { get } from "svelte/store";
+
+import FormHelperText from "$components/FormHelperText.svelte";
+import FormSuccess from "$components/FormSuccess.svelte";
+import AddressSearch from "$components/form/AddressSearch.svelte";
+import FormSelect from "$components/form/FormSelect.svelte";
+import OpeningHoursEditor from "$components/form/OpeningHoursEditor.svelte";
+import Icon from "$components/Icon.svelte";
+import HeaderPlaceholder from "$components/layout/HeaderPlaceholder.svelte";
+import MapLoadingEmbed from "$components/MapLoadingEmbed.svelte";
+import MapUnsupportedFallback from "$components/MapUnsupportedFallback.svelte";
+import PrimaryButton from "$components/PrimaryButton.svelte";
+import TextLink from "$components/TextLink.svelte";
+import { API_BASE } from "$lib/api-base";
+import { _, locale } from "$lib/i18n";
+import { ensureRtlTextPlugin } from "$lib/map/rtl";
+import { hasWebGL } from "$lib/map/webgl";
+import { places } from "$lib/store";
+import { theme } from "$lib/theme";
+import { errToast } from "$lib/utils";
+
+import { browser } from "$app/environment";
+import { pushState } from "$app/navigation";
+import { page } from "$app/stores";
+
+const STYLE_LIGHT = "https://tiles.openfreemap.org/styles/liberty";
+const STYLE_DARK = "https://static.btcmap.org/map-styles/dark.json";
+
+const styleUrlForTheme = (t: "light" | "dark" | undefined): string =>
+	t === "dark" ? STYLE_DARK : STYLE_LIGHT;
+
+type Step = "intro" | "online" | "map" | "update" | "new" | "success";
+type WizardPageState = { wizardStep?: Step };
+
+// The current step lives in the browser history via SvelteKit shallow routing,
+// so the back/forward buttons move between wizard steps instead of leaving the
+// page. Absent state (first load, SSR) means the intro step.
+$: step = (($page.state as WizardPageState).wizardStep ?? "intro") as Step;
+
+function goStep(next: Step) {
+	pushState("", { wizardStep: next } satisfies WizardPageState);
+}
+
+// Each step is a fresh screen; start it at the top instead of inheriting the
+// previous step's scroll position (e.g. the map's select button sits low).
+$: if (browser) scrollToTop(step);
+function scrollToTop(_step: Step) {
+	window.scrollTo({ top: 0, behavior: "auto" });
+}
+
+// ---------------------------------------------------------------------------
+// Captcha (shared across all forms)
+// ---------------------------------------------------------------------------
+let captchaContent = "";
+let isCaptchaLoading = true;
+let captchaSecret: string;
+
+const fetchCaptcha = () => {
+	isCaptchaLoading = true;
+	axios
+		.get("/captcha")
+		.then((response) => {
+			captchaSecret = response.data.captchaSecret;
+			captchaContent = DOMPurify.sanitize(response.data.captcha);
+		})
+		.catch((error) => {
+			errToast(get(_)("errors.captchaFetch"));
+			console.error(error);
+		})
+		.finally(() => {
+			isCaptchaLoading = false;
+		});
+};
+
+// ---------------------------------------------------------------------------
+// Submission plumbing
+// ---------------------------------------------------------------------------
+let submitting = false;
+let submissionIssueNumber: number;
+let successType = "";
+let successText = "";
+
+function collectMethods(
+	refs: Partial<Record<"onchain" | "lightning" | "nfc", HTMLInputElement>>,
+): string[] {
+	const methods: string[] = [];
+	if (refs.onchain?.checked) methods.push("onchain");
+	if (refs.lightning?.checked) methods.push("lightning");
+	if (refs.nfc?.checked) methods.push("nfc");
+	return methods;
+}
+
+async function submitIssue(payload: Record<string, unknown>): Promise<void> {
+	submitting = true;
+	try {
+		const response = await axios.post("/api/gitea/issue", {
+			captchaSecret,
+			...payload,
+		});
+		submissionIssueNumber = response.data.number;
+		goStep("success");
+	} catch (error) {
+		const message =
+			axios.isAxiosError(error) && error.response?.data?.message
+				? String(error.response.data.message)
+				: "";
+		if (message.includes("Captcha")) {
+			errToast(message);
+		} else {
+			errToast(get(_)("errors.formSubmission"));
+		}
+		console.error(error);
+	} finally {
+		submitting = false;
+	}
+}
+
+// ===========================================================================
+// STEP: intro (physical location yes/no)
+// ===========================================================================
+function answerPhysical(hasPhysical: boolean) {
+	goStep(hasPhysical ? "map" : "online");
+}
+
+// ===========================================================================
+// STEP: online or mobile (no visitable location)
+// ===========================================================================
+let onlineName: HTMLInputElement;
+let onlineWebsite: HTMLInputElement;
+let onlineSocial: HTMLInputElement;
+let onlineCategory: HTMLInputElement;
+let onlineNotes: HTMLTextAreaElement;
+let onlineContact: HTMLInputElement;
+let onlineCaptcha: HTMLInputElement;
+let onlineHoney: HTMLInputElement;
+let onlineOnchain: HTMLInputElement;
+let onlineLightning: HTMLInputElement;
+let onlineNfc: HTMLInputElement;
+
+function submitOnline(event: SubmitEvent) {
+	event.preventDefault();
+	const methods = collectMethods({
+		onchain: onlineOnchain,
+		lightning: onlineLightning,
+		nfc: onlineNfc,
+	});
+	successType = get(_)("addLocationWizard.onlineSuccessType");
+	successText = get(_)("addLocationWizard.onlineSuccessText");
+	submitIssue({
+		type: "online-or-mobile",
+		captchaTest: onlineCaptcha.value,
+		honey: onlineHoney.value,
+		name: onlineName.value,
+		website: onlineWebsite.value,
+		socialLinks: onlineSocial.value,
+		category: onlineCategory.value,
+		methods: methods.toString(),
+		notes: onlineNotes.value,
+		contact: onlineContact.value,
+	});
+}
+
+// ===========================================================================
+// STEP: map (is the business already on the map?)
+// ===========================================================================
+type ExistingPlace = {
+	id: number;
+	name: string;
+	address: string;
+	lat: number;
+	lon: number;
+	osmType: string;
+	osmId: string;
+	osmUrl: string;
+	website: string;
+	phone: string;
+	hours: string;
+	twitter: string;
+	facebook: string;
+	instagram: string;
+};
+
+let existing: ExistingPlace | undefined;
+let loadingExisting = false;
+
+function osmTypeAndId(osmUrl: string, fallbackId: string): [string, string] {
+	const m = osmUrl.match(/openstreetmap\.org\/([^/]+)\/(\d+)/);
+	if (m) return [m[1], m[2]];
+	return ["node", fallbackId];
+}
+
+async function selectExisting(placeId: number) {
+	loadingExisting = true;
+	try {
+		const fields =
+			"id,name,address,lat,lon,osm_id,osm_url,phone,website,opening_hours,twitter,facebook,instagram";
+		const res = await axios.get(
+			`${API_BASE}/v4/places/${placeId}?fields=${fields}`,
+		);
+		const p = res.data;
+		const [osmType, osmId] = osmTypeAndId(
+			p.osm_url ?? "",
+			String(p.osm_id ?? placeId),
+		);
+		existing = {
+			id: p.id,
+			name: p.name ?? "",
+			address: p.address ?? "",
+			lat: p.lat,
+			lon: p.lon,
+			osmType,
+			osmId,
+			osmUrl: p.osm_url ?? "",
+			website: p.website ?? "",
+			phone: p.phone ?? "",
+			hours: p.opening_hours ?? "",
+			twitter: p.twitter ?? "",
+			facebook: p.facebook ?? "",
+			instagram: p.instagram ?? "",
+		};
+		updateHoursValue = existing.hours;
+		goStep("update");
+	} catch (error) {
+		errToast(get(_)("errors.formSubmission"));
+		console.error(error);
+	} finally {
+		loadingExisting = false;
+	}
+}
+
+// ===========================================================================
+// STEP: update (edit an existing OSM merchant)
+// ===========================================================================
+let updateWebsite: HTMLInputElement;
+let updatePhone: HTMLInputElement;
+let updateHoursValue = "";
+let updateSocial: HTMLInputElement;
+let updateNotes: HTMLTextAreaElement;
+let updateContact: HTMLInputElement;
+let updateCaptcha: HTMLInputElement;
+let updateHoney: HTMLInputElement;
+let updateOnchain: HTMLInputElement;
+let updateLightning: HTMLInputElement;
+let updateNfc: HTMLInputElement;
+
+function submitUpdate(event: SubmitEvent) {
+	event.preventDefault();
+	if (!existing) return;
+	const methods = collectMethods({
+		onchain: updateOnchain,
+		lightning: updateLightning,
+		nfc: updateNfc,
+	});
+	successType = get(_)("addLocationWizard.updateSuccessType");
+	successText = get(_)("addLocationWizard.updateSuccessText");
+	submitIssue({
+		type: "update-location",
+		captchaTest: updateCaptcha.value,
+		honey: updateHoney.value,
+		name: existing.name,
+		osmType: existing.osmType,
+		osmId: existing.osmId,
+		osm: existing.osmUrl,
+		lat: String(existing.lat),
+		long: String(existing.lon),
+		website: updateWebsite.value,
+		phone: updatePhone.value,
+		hours: updateHoursValue,
+		socialLinks: updateSocial.value,
+		methods: methods.toString(),
+		notes: updateNotes.value,
+		contact: updateContact.value,
+	});
+}
+
+// ===========================================================================
+// STEP: new (new physical merchant)
+// ===========================================================================
+let newName: HTMLInputElement;
+let newNameEn: HTMLInputElement;
+let newAddress: HTMLInputElement;
+let newLocationDescription: HTMLTextAreaElement;
+let newCategory: HTMLInputElement;
+let newWebsite: HTMLInputElement;
+let newPhone: HTMLInputElement;
+let newHoursValue = "";
+let newNotes: HTMLTextAreaElement;
+let newContact: HTMLInputElement;
+let newCaptcha: HTMLInputElement;
+let newHoney: HTMLInputElement;
+let newOnchain: HTMLInputElement;
+let newLightning: HTMLInputElement;
+let newNfc: HTMLInputElement;
+let newSource: "Business Owner" | "Customer" | "Other" | undefined;
+let newSourceOther: string | undefined;
+let addressFilledBySearch = false;
+
+// A location description is the norm in regions that don't use street
+// addresses; default the input order to the user's locale but keep both fields
+// always available.
+$: descriptionFirst = ["ja", "zh", "ko", "th", "vi", "hi"].includes(
+	($locale ?? "en").split("-")[0],
+);
+
+let pickLat: number | undefined;
+let pickLong: number | undefined;
+let pinSelected = false;
+let noPinError = false;
+let noLocationTextError = false;
+let noMethodError = false;
+
+// "It's not on the map yet" — start a blank new-location form (no prefill).
+function goToNew() {
+	pinSelected = false;
+	pickLat = undefined;
+	pickLong = undefined;
+	pickMarker = undefined;
+	prefill = undefined;
+	goStep("new");
+}
+
+// "This is my business" from a search result — carry the location and any OSM
+// POI metadata into the new-location form and drop the pin there automatically.
+function useSearchedLocation() {
+	if (!searchedLocation) return;
+	pickLat = Number(searchedLocation.lat.toFixed(5));
+	pickLong = Number(searchedLocation.lng.toFixed(5));
+	pinSelected = true;
+	prefill = searchedLocation;
+	pickMarker = undefined;
+	goStep("new");
+}
+
+// Fill empty new-location form fields from a selected place. Never overwrites
+// what the user has already typed.
+function applyPlaceToForm(d: PlaceSelect) {
+	const set = (
+		el: HTMLInputElement | HTMLTextAreaElement | undefined,
+		value: string | undefined,
+	) => {
+		if (el && value && !el.value) el.value = value;
+	};
+	if (newAddress && d.displayName && !newAddress.value) {
+		newAddress.value = d.displayName;
+		addressFilledBySearch = true;
+	}
+	set(newName, d.name);
+	set(newCategory, d.category);
+	set(newWebsite, d.website);
+	set(newPhone, d.phone);
+	if (d.openingHours && !newHoursValue) newHoursValue = d.openingHours;
+}
+
+function submitNew(event: SubmitEvent) {
+	event.preventDefault();
+	noPinError = false;
+	noLocationTextError = false;
+	noMethodError = false;
+
+	if (!pinSelected) {
+		noPinError = true;
+		errToast(get(_)("errors.noLocationSelected"));
+		return;
+	}
+	// Address OR description is required — one is enough.
+	if (!newAddress.value.trim() && !newLocationDescription.value.trim()) {
+		noLocationTextError = true;
+		errToast(get(_)("addLocationWizard.locationTextError"));
+		return;
+	}
+	const methods = collectMethods({
+		onchain: newOnchain,
+		lightning: newLightning,
+		nfc: newNfc,
+	});
+	if (methods.length === 0) {
+		noMethodError = true;
+		errToast(get(_)("errors.noPaymentMethod"));
+		return;
+	}
+
+	successType = get(_)("addLocationWizard.newSuccessType");
+	successText = get(_)("addLocationWizard.newSuccessText");
+	submitIssue({
+		type: "add-location-wizard",
+		captchaTest: newCaptcha.value,
+		honey: newHoney.value,
+		name: newName.value,
+		nameEn: newNameEn.value,
+		address: newAddress.value,
+		locationDescription: newLocationDescription.value,
+		lat: pickLat ? pickLat.toString() : "",
+		long: pickLong ? pickLong.toString() : "",
+		osm:
+			pickLat && pickLong
+				? `https://www.openstreetmap.org/edit#map=21/${pickLat}/${pickLong}`
+				: "",
+		category: newCategory.value,
+		methods: methods.toString(),
+		website: newWebsite.value,
+		phone: newPhone.value,
+		hours: newHoursValue,
+		notes: newNotes.value,
+		source: newSource,
+		sourceOther: newSourceOther ?? "",
+		contact: newContact.value,
+	});
+}
+
+// ---------------------------------------------------------------------------
+// Maps
+// ---------------------------------------------------------------------------
+let maplibreRef: typeof import("maplibre-gl") | undefined;
+let webglUnsupported = false;
+let destroyed = false;
+
+// Discover map (step "map")
+let discoverMap: MapLibreMap | undefined;
+let discoverMapLoaded = false;
+
+// Pick map (step "new")
+let pickMap: MapLibreMap | undefined;
+let pickMapLoaded = false;
+let pickMarker: MapLibreMarker | undefined;
+
+// A geocoded search result (with any OSM POI metadata). Dropping a marker for it
+// makes the searched place selectable even when it isn't yet a BTC Map merchant
+// (no orange dot), so the user can confirm "this is my business" and add it.
+type PlaceSelect = {
+	lat: number;
+	lng: number;
+	displayName: string;
+	name?: string;
+	category?: string;
+	website?: string;
+	phone?: string;
+	openingHours?: string;
+	osmType?: string;
+	osmId?: string;
+};
+let searchMarker: MapLibreMarker | undefined;
+let searchedLocation: PlaceSelect | undefined;
+// Data carried from a search into the new-location form, applied once mounted.
+let prefill: PlaceSelect | undefined;
+
+async function ensureMaplibre(): Promise<
+	typeof import("maplibre-gl") | undefined
+> {
+	if (!hasWebGL()) {
+		webglUnsupported = true;
+		return undefined;
+	}
+	if (!maplibreRef) {
+		const maplibre = await import("maplibre-gl");
+		ensureRtlTextPlugin(maplibre);
+		maplibreRef = maplibre;
+	}
+	return maplibreRef;
+}
+
+function placesGeoJson() {
+	const all = get(places);
+	return {
+		type: "FeatureCollection" as const,
+		features: all
+			.filter((p) => p.lat != null && p.lon != null)
+			.map((p) => ({
+				type: "Feature" as const,
+				geometry: { type: "Point" as const, coordinates: [p.lon, p.lat] },
+				properties: { id: p.id, name: p.name ?? "" },
+			})),
+	};
+}
+
+async function initDiscoverMap(node: HTMLDivElement) {
+	const maplibre = await ensureMaplibre();
+	if (!maplibre || destroyed) return;
+
+	discoverMap = new maplibre.Map({
+		container: node,
+		style: styleUrlForTheme($theme),
+		center: [0, 20],
+		zoom: 1.5,
+		maxZoom: 21,
+		attributionControl: { compact: true },
+	});
+	discoverMap.addControl(new maplibre.NavigationControl({}), "top-right");
+	discoverMap.addControl(
+		new maplibre.GeolocateControl({
+			positionOptions: { enableHighAccuracy: true },
+			trackUserLocation: true,
+			fitBoundsOptions: { maxZoom: 15 },
+		}),
+		"top-right",
+	);
+
+	discoverMap.on("load", () => {
+		if (!discoverMap) return;
+		discoverMap.addSource("places", {
+			type: "geojson",
+			data: placesGeoJson(),
+		});
+		discoverMap.addLayer({
+			id: "places-layer",
+			type: "circle",
+			source: "places",
+			paint: {
+				"circle-radius": 6,
+				"circle-color": "#f7931a",
+				"circle-stroke-width": 2,
+				"circle-stroke-color": "#ffffff",
+			},
+		});
+		discoverMap.on("click", "places-layer", (e) => {
+			const feature = e.features?.[0] as MapGeoJSONFeature | undefined;
+			const id = feature?.properties?.id;
+			if (id != null) selectExisting(Number(id));
+		});
+		discoverMap.on("mouseenter", "places-layer", () => {
+			if (discoverMap) discoverMap.getCanvas().style.cursor = "pointer";
+		});
+		discoverMap.on("mouseleave", "places-layer", () => {
+			if (discoverMap) discoverMap.getCanvas().style.cursor = "";
+		});
+		discoverMapLoaded = true;
+	});
+}
+
+function handleDiscoverSearch(e: CustomEvent<PlaceSelect>) {
+	if (!discoverMap) return;
+	searchedLocation = e.detail;
+	// Drop / move a distinct (blue) marker at the search result so it's visible
+	// and selectable, separate from the orange BTC Map dots.
+	if (maplibreRef) {
+		if (searchMarker) {
+			searchMarker.setLngLat([e.detail.lng, e.detail.lat]);
+		} else {
+			searchMarker = new maplibreRef.Marker({ color: "#2563eb" })
+				.setLngLat([e.detail.lng, e.detail.lat])
+				.addTo(discoverMap);
+		}
+	}
+	discoverMap.flyTo({
+		center: [e.detail.lng, e.detail.lat],
+		zoom: 16,
+		duration: 800,
+	});
+}
+
+async function initPickMap(node: HTMLDivElement) {
+	const maplibre = await ensureMaplibre();
+	if (!maplibre || destroyed) return;
+
+	pickMap = new maplibre.Map({
+		container: node,
+		style: styleUrlForTheme($theme),
+		center: [0, 20],
+		zoom: 1.5,
+		maxZoom: 21,
+		attributionControl: { compact: true },
+	});
+	pickMap.addControl(new maplibre.NavigationControl({}), "top-right");
+	pickMap.addControl(
+		new maplibre.GeolocateControl({
+			positionOptions: { enableHighAccuracy: true },
+			trackUserLocation: true,
+			fitBoundsOptions: { maxZoom: 15 },
+		}),
+		"top-right",
+	);
+	pickMap.on("click", (e: MapMouseEvent) => {
+		placePin(e.lngLat.lat, e.lngLat.lng, false);
+	});
+	pickMap.on("load", () => {
+		pickMapLoaded = true;
+		// Re-drop a pin carried over from a search result / previous step.
+		if (pinSelected && pickLat != null && pickLong != null) {
+			placePin(pickLat, pickLong, true);
+		}
+	});
+}
+
+function placePin(lat: number, lng: number, fly: boolean) {
+	pickLat = Number(lat.toFixed(5));
+	pickLong = Number(lng.toFixed(5));
+	pinSelected = true;
+	noPinError = false;
+	if (!maplibreRef || !pickMap) return;
+	if (pickMarker) {
+		pickMarker.setLngLat([pickLong, pickLat]);
+	} else {
+		pickMarker = new maplibreRef.Marker()
+			.setLngLat([pickLong, pickLat])
+			.addTo(pickMap);
+	}
+	if (fly) {
+		pickMap.flyTo({ center: [pickLong, pickLat], zoom: 17, duration: 800 });
+	}
+}
+
+function handlePickSearch(e: CustomEvent<PlaceSelect>) {
+	placePin(e.detail.lat, e.detail.lng, true);
+	// Refresh the address if untouched or previously search-filled, then fill any
+	// other empty fields (name/category/contact) from the OSM POI.
+	if (newAddress && (newAddress.value.trim() === "" || addressFilledBySearch)) {
+		newAddress.value = e.detail.displayName;
+		addressFilledBySearch = true;
+	}
+	applyPlaceToForm(e.detail);
+}
+
+// Svelte actions bind map init to the step container's lifecycle.
+function discoverMapPortal(node: HTMLDivElement) {
+	initDiscoverMap(node);
+	return {
+		destroy() {
+			discoverMap?.remove();
+			discoverMap = undefined;
+			discoverMapLoaded = false;
+			searchMarker = undefined;
+		},
+	};
+}
+
+function pickMapPortal(node: HTMLDivElement) {
+	initPickMap(node);
+	return {
+		destroy() {
+			pickMap?.remove();
+			pickMap = undefined;
+			pickMapLoaded = false;
+			pickMarker = undefined;
+		},
+	};
+}
+
+// Refresh the places overlay if the store finishes loading after the map.
+$: if (discoverMapLoaded && $places.length) {
+	const src = discoverMap?.getSource("places") as GeoJSONSource | undefined;
+	src?.setData(placesGeoJson());
+}
+
+// Theme sync for whichever map is mounted.
+$: if (discoverMap && discoverMapLoaded)
+	discoverMap.setStyle(styleUrlForTheme($theme));
+$: if (pickMap && pickMapLoaded) pickMap.setStyle(styleUrlForTheme($theme));
+
+// Apply search-derived place data once the new-location form is mounted
+// (newName is bound only after the step renders).
+$: if (step === "new" && prefill && newName) {
+	applyPlaceToForm(prefill);
+	prefill = undefined;
+}
+
+onMount(() => {
+	if (browser) fetchCaptcha();
+});
+
+onDestroy(() => {
+	destroyed = true;
+	discoverMap?.remove();
+	pickMap?.remove();
+});
+
+function restart() {
+	existing = undefined;
+	pinSelected = false;
+	pickLat = undefined;
+	pickLong = undefined;
+	pickMarker = undefined;
+	searchMarker = undefined;
+	searchedLocation = undefined;
+	prefill = undefined;
+	newHoursValue = "";
+	updateHoursValue = "";
+	fetchCaptcha();
+	goStep("intro");
+}
+
+const inputClass =
+	"w-full rounded-2xl border-2 border-input p-3 transition-all focus:outline-link disabled:cursor-not-allowed disabled:bg-gray-100 disabled:text-gray-500 dark:bg-white/[0.15] dark:disabled:bg-gray-700 dark:disabled:text-gray-400";
+</script>
+
+<svelte:head>
+	<title>BTC Map - {$_('addLocationWizard.title')}</title>
+	<meta property="og:image" content="https://btcmap.org/images/og/add.png" />
+	<meta property="og:title" content="BTC Map - {$_('addLocationWizard.title')}" />
+</svelte:head>
+
+{#if typeof window !== 'undefined'}
+	<h1
+		class="{$theme === 'dark'
+			? 'text-white'
+			: 'gradient'} mt-10 text-center text-4xl font-semibold md:text-5xl"
+	>
+		{$_('addLocationWizard.title')}
+	</h1>
+{:else}
+	<HeaderPlaceholder />
+{/if}
+
+<div class="mx-auto mt-12 max-w-2xl pb-20 text-primary md:pb-32 dark:text-white">
+	{#if step === 'intro'}
+		<!-- STEP 1: physical location? -->
+		<h2 class="mb-6 text-center text-2xl font-semibold md:text-3xl">
+			{$_('addLocationWizard.physicalQuestion')}
+		</h2>
+		<p class="mb-10 text-center text-lg">{$_('addLocationWizard.physicalHint')}</p>
+		<div class="mx-auto flex max-w-md flex-col gap-4 sm:flex-row">
+			<PrimaryButton style="w-full py-3 rounded-xl" type="button" on:click={() => answerPhysical(true)}>
+				{$_('addLocationWizard.yes')}
+			</PrimaryButton>
+			<PrimaryButton style="w-full py-3 rounded-xl" type="button" on:click={() => answerPhysical(false)}>
+				{$_('addLocationWizard.no')}
+			</PrimaryButton>
+		</div>
+
+	{:else if step === 'online'}
+		<!-- STEP: online or mobile business -->
+		<h2 class="mb-4 text-2xl font-semibold md:text-3xl">
+			{$_('addLocationWizard.onlineHeading')}
+		</h2>
+		<p class="mb-8">{$_('addLocationWizard.onlineIntro')}</p>
+		<form on:submit={submitOnline} class="w-full space-y-5">
+			<div>
+				<label for="online-name" class="mb-2 block font-semibold">{$_('forms.merchantName')}</label>
+				<input id="online-name" required class={inputClass} bind:this={onlineName} disabled={!captchaSecret} />
+			</div>
+			<div>
+				<label for="online-website" class="mb-2 block font-semibold">{$_('forms.website')}</label>
+				<input id="online-website" type="url" required class={inputClass} bind:this={onlineWebsite} disabled={!captchaSecret} />
+			</div>
+			<div>
+				<label for="online-social" class="mb-2 block font-semibold">
+					{$_('addLocationWizard.socialLabel')}
+					<span class="font-normal">{$_('forms.optional')}</span>
+				</label>
+				<input id="online-social" class={inputClass} bind:this={onlineSocial} disabled={!captchaSecret} placeholder={$_('addLocationWizard.socialPlaceholder')} />
+			</div>
+			<div>
+				<label for="online-category" class="mb-2 block font-semibold">{$_('forms.category')}</label>
+				<input id="online-category" class={inputClass} bind:this={onlineCategory} disabled={!captchaSecret} />
+			</div>
+			<fieldset>
+				<legend class="mb-2 block font-semibold">{$_('addLocation.paymentMethodsLegend')}</legend>
+				<div class="space-y-3">
+					<label class="block"><input type="checkbox" class="mr-2 h-4 w-4 accent-link" bind:this={onlineOnchain} />{$_('addLocation.onchainLabel')}</label>
+					<label class="block"><input type="checkbox" class="mr-2 h-4 w-4 accent-link" bind:this={onlineLightning} />{$_('addLocation.lightningLabel')}</label>
+					<label class="block"><input type="checkbox" class="mr-2 h-4 w-4 accent-link" bind:this={onlineNfc} />{$_('addLocation.nfcLabel')}</label>
+				</div>
+			</fieldset>
+			<div>
+				<label for="online-notes" class="mb-2 block font-semibold">
+					{$_('forms.notes')} <span class="font-normal">{$_('forms.optional')}</span>
+				</label>
+				<textarea id="online-notes" rows="3" class={inputClass} bind:this={onlineNotes} disabled={!captchaSecret} />
+			</div>
+			<div>
+				<label for="online-contact" class="mb-2 block font-semibold">{$_('forms.contact')}</label>
+				<p class="mb-2 text-sm">{$_('addLocation.contactDescription')}</p>
+				<input id="online-contact" type="email" required class={inputClass} bind:this={onlineContact} disabled={!captchaSecret} />
+			</div>
+			<div class="hidden"><input bind:this={onlineHoney} name="honey" placeholder="A nice pot of honey." /></div>
+			<div>
+				<div class="mb-2 flex items-center space-x-2">
+					<label for="online-captcha" class="font-semibold">{$_('forms.captcha')} <span class="font-normal">({$_('forms.captchaCaseSensitive')})</span></label>
+					{#if captchaSecret}<button type="button" on:click={fetchCaptcha}><Icon type="fa" icon="arrows-rotate" w="16" h="16" /></button>{/if}
+				</div>
+				<div class="flex items-center justify-center rounded-2xl border-2 border-input py-1">
+					{#if isCaptchaLoading}<div class="h-[100px] w-[275px] animate-pulse bg-link/50" />{:else}{@html captchaContent}{/if}
+				</div>
+				<input id="online-captcha" required class="{inputClass} mt-2" bind:this={onlineCaptcha} disabled={!captchaSecret} />
+			</div>
+			<PrimaryButton loading={submitting} disabled={submitting || !captchaSecret} style="w-full py-3 rounded-xl">{$_('forms.submit')}</PrimaryButton>
+		</form>
+
+	{:else if step === 'map'}
+		<!-- STEP: already on the map? -->
+		<h2 class="mb-4 text-2xl font-semibold md:text-3xl">{$_('addLocationWizard.mapHeading')}</h2>
+		<p class="mb-4">{$_('addLocationWizard.mapIntro')}</p>
+		<div class="mb-3">
+			<AddressSearch disabled={!discoverMapLoaded} locale={$locale ?? 'en'} on:select={handleDiscoverSearch} />
+		</div>
+		<div class="relative mb-4">
+			<div use:discoverMapPortal class="z-10 h-[350px] w-full rounded-2xl border-2 border-input md:h-[450px]" />
+			{#if webglUnsupported}
+				<MapUnsupportedFallback />
+			{:else if !discoverMapLoaded}
+				<MapLoadingEmbed style="h-[350px] md:h-[450px] border-2 border-input rounded-2xl" />
+			{/if}
+			{#if loadingExisting}
+				<div class="absolute inset-0 z-20 flex items-center justify-center rounded-2xl bg-black/30">
+					<span class="rounded-lg bg-white px-4 py-2 font-semibold text-primary">{$_('addLocationWizard.loadingPlace')}</span>
+				</div>
+			{/if}
+		</div>
+		<p class="mb-4 text-center text-sm text-primary/80 dark:text-white/70">{$_('addLocationWizard.mapClickHint')}</p>
+		{#if searchedLocation}
+			<div class="mb-6 rounded-2xl border-2 border-link/40 bg-link/5 p-4">
+				<p class="mb-1 text-sm text-primary/80 dark:text-white/70">{$_('addLocationWizard.searchedResultLabel')}</p>
+				<p class="mb-3 font-semibold">{searchedLocation.displayName}</p>
+				<PrimaryButton style="w-full py-2 rounded-xl" type="button" on:click={useSearchedLocation}>{$_('addLocationWizard.useSearchedLocation')}</PrimaryButton>
+			</div>
+		{/if}
+		<div class="flex flex-col gap-4 sm:flex-row">
+			<button type="button" class="font-semibold text-link hover:text-hover" on:click={() => history.back()}>← {$_('addLocationWizard.back')}</button>
+			<PrimaryButton style="w-full py-3 rounded-xl" type="button" on:click={goToNew}>{$_('addLocationWizard.notOnMap')}</PrimaryButton>
+		</div>
+
+	{:else if step === 'update' && existing}
+		<!-- STEP: update existing merchant -->
+		<h2 class="mb-2 text-2xl font-semibold md:text-3xl">{existing.name || $_('addLocationWizard.updateHeading')}</h2>
+		<p class="mb-2 text-sm text-primary/80 dark:text-white/70">{existing.address}</p>
+		<p class="mb-6">
+			{$_('addLocationWizard.updateIntro')}
+			{#if existing.osmUrl}<TextLink link={existing.osmUrl} external>OSM {existing.osmType}/{existing.osmId}</TextLink>{/if}
+		</p>
+		<form on:submit={submitUpdate} class="w-full space-y-5">
+			<div>
+				<label for="update-website" class="mb-2 block font-semibold">{$_('forms.website')}</label>
+				<input id="update-website" type="url" class={inputClass} bind:this={updateWebsite} value={existing.website} disabled={!captchaSecret} />
+			</div>
+			<div>
+				<label for="update-phone" class="mb-2 block font-semibold">{$_('forms.phone')}</label>
+				<input id="update-phone" type="tel" class={inputClass} bind:this={updatePhone} value={existing.phone} disabled={!captchaSecret} />
+			</div>
+			<div>
+				<p class="mb-2 block font-semibold">{$_('forms.openingHours')}</p>
+				<OpeningHoursEditor bind:value={updateHoursValue} disabled={!captchaSecret} />
+			</div>
+			<div>
+				<label for="update-social" class="mb-2 block font-semibold">
+					{$_('addLocationWizard.socialLabel')} <span class="font-normal">{$_('forms.optional')}</span>
+				</label>
+				<input id="update-social" class={inputClass} bind:this={updateSocial} placeholder={$_('addLocationWizard.socialPlaceholder')} disabled={!captchaSecret} />
+			</div>
+			<fieldset>
+				<legend class="mb-2 block font-semibold">{$_('addLocationWizard.updatePaymentLegend')}</legend>
+				<div class="space-y-3">
+					<label class="block"><input type="checkbox" class="mr-2 h-4 w-4 accent-link" bind:this={updateOnchain} />{$_('addLocation.onchainLabel')}</label>
+					<label class="block"><input type="checkbox" class="mr-2 h-4 w-4 accent-link" bind:this={updateLightning} />{$_('addLocation.lightningLabel')}</label>
+					<label class="block"><input type="checkbox" class="mr-2 h-4 w-4 accent-link" bind:this={updateNfc} />{$_('addLocation.nfcLabel')}</label>
+				</div>
+			</fieldset>
+			<div>
+				<label for="update-notes" class="mb-2 block font-semibold">
+					{$_('forms.notes')} <span class="font-normal">{$_('forms.optional')}</span>
+				</label>
+				<textarea id="update-notes" rows="3" class={inputClass} bind:this={updateNotes} disabled={!captchaSecret} />
+			</div>
+			<div>
+				<label for="update-contact" class="mb-2 block font-semibold">{$_('forms.contact')}</label>
+				<input id="update-contact" type="email" required class={inputClass} bind:this={updateContact} disabled={!captchaSecret} />
+			</div>
+			<div class="hidden"><input bind:this={updateHoney} name="honey" placeholder="A nice pot of honey." /></div>
+			<div>
+				<div class="mb-2 flex items-center space-x-2">
+					<label for="update-captcha" class="font-semibold">{$_('forms.captcha')} <span class="font-normal">({$_('forms.captchaCaseSensitive')})</span></label>
+					{#if captchaSecret}<button type="button" on:click={fetchCaptcha}><Icon type="fa" icon="arrows-rotate" w="16" h="16" /></button>{/if}
+				</div>
+				<div class="flex items-center justify-center rounded-2xl border-2 border-input py-1">
+					{#if isCaptchaLoading}<div class="h-[100px] w-[275px] animate-pulse bg-link/50" />{:else}{@html captchaContent}{/if}
+				</div>
+				<input id="update-captcha" required class="{inputClass} mt-2" bind:this={updateCaptcha} disabled={!captchaSecret} />
+			</div>
+			<PrimaryButton loading={submitting} disabled={submitting || !captchaSecret} style="w-full py-3 rounded-xl">{$_('forms.submit')}</PrimaryButton>
+		</form>
+
+	{:else if step === 'new'}
+		<!-- STEP: new physical merchant -->
+		<h2 class="mb-4 text-2xl font-semibold md:text-3xl">{$_('addLocationWizard.newHeading')}</h2>
+		<p class="mb-8">{$_('addLocationWizard.newIntro')}</p>
+		<form on:submit={submitNew} class="w-full space-y-5">
+			<div>
+				<label for="new-name" class="mb-2 block font-semibold">{$_('forms.merchantName')}</label>
+				<input id="new-name" required class={inputClass} bind:this={newName} disabled={!captchaSecret} />
+			</div>
+			<div>
+				<label for="new-name-en" class="mb-2 block font-semibold">
+					{$_('addLocation.nameEnLabel')} <span class="font-normal">{$_('forms.optional')}</span>
+				</label>
+				<input id="new-name-en" class={inputClass} bind:this={newNameEn} disabled={!captchaSecret} />
+			</div>
+
+			<div>
+				<label class="mb-2 block font-semibold" for="new-map">{$_('forms.selectLocation')}</label>
+				{#if noPinError}<span class="mb-2 block font-semibold text-error">{$_('addLocation.noLocationError')}</span>{/if}
+				<div class="mb-3">
+					<AddressSearch disabled={!pickMapLoaded} locale={$locale ?? 'en'} on:select={handlePickSearch} />
+				</div>
+				<div class="relative mb-2">
+					<div id="new-map" use:pickMapPortal class="z-10 h-[300px] w-full !cursor-crosshair rounded-2xl border-2 border-input md:h-[400px]" />
+					{#if webglUnsupported}
+						<MapUnsupportedFallback />
+					{:else if !pickMapLoaded}
+						<MapLoadingEmbed style="h-[300px] md:h-[400px] border-2 border-input rounded-2xl" />
+					{/if}
+				</div>
+				{#if pinSelected}
+					<p class="text-sm text-primary/80 dark:text-white/70">{pickLat}, {pickLong}</p>
+				{/if}
+			</div>
+
+			<!-- Address OR description: one required. Order adapts to locale. -->
+			<div class="flex flex-col gap-5" class:flex-col-reverse={descriptionFirst}>
+				<div>
+					<div class="mb-2">
+						<label for="new-address" class="block font-semibold">{$_('addLocation.addressLabel')}</label>
+						<FormHelperText text={$_('addLocationWizard.addressOrDescriptionHint')} />
+					</div>
+					<input id="new-address" class={inputClass} bind:this={newAddress} on:input={() => (addressFilledBySearch = false)} disabled={!captchaSecret} placeholder={$_('addLocation.addressPlaceholder')} />
+				</div>
+				<div>
+					<label for="new-location-desc" class="mb-2 block font-semibold">{$_('addLocationWizard.locationDescriptionLabel')}</label>
+					<FormHelperText text={$_('addLocationWizard.locationDescriptionHint')} />
+					<textarea id="new-location-desc" rows="2" class={inputClass} bind:this={newLocationDescription} disabled={!captchaSecret} placeholder={$_('addLocationWizard.locationDescriptionPlaceholder')} />
+				</div>
+			</div>
+			{#if noLocationTextError}<span class="block font-semibold text-error">{$_('addLocationWizard.locationTextError')}</span>{/if}
+
+			<div>
+				<label for="new-category" class="mb-2 block font-semibold">{$_('forms.category')}</label>
+				<input id="new-category" class={inputClass} bind:this={newCategory} disabled={!captchaSecret} />
+			</div>
+			<fieldset>
+				<legend class="mb-2 block font-semibold">{$_('addLocation.paymentMethodsLegend')}</legend>
+				{#if noMethodError}<span class="mb-2 block font-semibold text-error">{$_('addLocation.paymentMethodError')}</span>{/if}
+				<div class="space-y-3">
+					<label class="block"><input type="checkbox" class="mr-2 h-4 w-4 accent-link" bind:this={newOnchain} on:click={() => (noMethodError = false)} />{$_('addLocation.onchainLabel')}</label>
+					<label class="block"><input type="checkbox" class="mr-2 h-4 w-4 accent-link" bind:this={newLightning} on:click={() => (noMethodError = false)} />{$_('addLocation.lightningLabel')}</label>
+					<label class="block"><input type="checkbox" class="mr-2 h-4 w-4 accent-link" bind:this={newNfc} on:click={() => (noMethodError = false)} />{$_('addLocation.nfcLabel')}</label>
+				</div>
+			</fieldset>
+			<div>
+				<label for="new-website" class="mb-2 block font-semibold">{$_('forms.website')} <span class="font-normal">{$_('forms.optional')}</span></label>
+				<input id="new-website" type="url" class={inputClass} bind:this={newWebsite} disabled={!captchaSecret} />
+			</div>
+			<div>
+				<label for="new-phone" class="mb-2 block font-semibold">{$_('forms.phone')} <span class="font-normal">{$_('forms.optional')}</span></label>
+				<input id="new-phone" type="tel" class={inputClass} bind:this={newPhone} disabled={!captchaSecret} />
+			</div>
+			<div>
+				<p class="mb-2 block font-semibold">{$_('forms.openingHours')} <span class="font-normal">{$_('forms.optional')}</span></p>
+				<OpeningHoursEditor bind:value={newHoursValue} disabled={!captchaSecret} />
+			</div>
+			<div>
+				<label for="new-notes" class="mb-2 block font-semibold">{$_('forms.notes')} <span class="font-normal">{$_('forms.optional')}</span></label>
+				<textarea id="new-notes" rows="3" class={inputClass} bind:this={newNotes} disabled={!captchaSecret} />
+			</div>
+			<div>
+				<label for="new-source" class="mb-2 block font-semibold">{$_('addLocation.dataSourceLabel')}</label>
+				<FormSelect id="new-source" name="source" required bind:value={newSource} disabled={!captchaSecret}>
+					<option value="">{$_('addLocation.dataSourcePlaceholder')}</option>
+					<option value="Business Owner">{$_('addLocation.dataSourceOwner')}</option>
+					<option value="Customer">{$_('addLocation.dataSourceCustomer')}</option>
+					<option value="Other">{$_('addLocation.dataSourceOther')}</option>
+				</FormSelect>
+				{#if newSource === 'Other'}
+					<textarea class="{inputClass} mt-2" required bind:value={newSourceOther} placeholder={$_('addLocation.dataSourceOtherPlaceholder')} />
+				{/if}
+			</div>
+			<div>
+				<label for="new-contact" class="mb-2 block font-semibold">{$_('forms.contact')}</label>
+				<p class="mb-2 text-sm">{$_('addLocation.contactDescription')}</p>
+				<input id="new-contact" type="email" required class={inputClass} bind:this={newContact} disabled={!captchaSecret} />
+			</div>
+			<div class="hidden"><input bind:this={newHoney} name="honey" placeholder="A nice pot of honey." /></div>
+			<div>
+				<div class="mb-2 flex items-center space-x-2">
+					<label for="new-captcha" class="font-semibold">{$_('forms.captcha')} <span class="font-normal">({$_('forms.captchaCaseSensitive')})</span></label>
+					{#if captchaSecret}<button type="button" on:click={fetchCaptcha}><Icon type="fa" icon="arrows-rotate" w="16" h="16" /></button>{/if}
+				</div>
+				<div class="flex items-center justify-center rounded-2xl border-2 border-input py-1">
+					{#if isCaptchaLoading}<div class="h-[100px] w-[275px] animate-pulse bg-link/50" />{:else}{@html captchaContent}{/if}
+				</div>
+				<input id="new-captcha" required class="{inputClass} mt-2" bind:this={newCaptcha} disabled={!captchaSecret} />
+			</div>
+			<PrimaryButton loading={submitting} disabled={submitting || !captchaSecret} style="w-full py-3 rounded-xl">{$_('forms.submitLocation')}</PrimaryButton>
+		</form>
+
+	{:else if step === 'success'}
+		<FormSuccess type={successType} text={successText} issue={submissionIssueNumber} on:click={restart} />
+	{/if}
+</div>
diff --git a/src/routes/api/gitea/issue/+server.ts b/src/routes/api/gitea/issue/+server.ts
index 6c5a50369..5fd6734d1 100644
--- a/src/routes/api/gitea/issue/+server.ts
+++ b/src/routes/api/gitea/issue/+server.ts
@@ -3,8 +3,9 @@ import crypto from "node:crypto";
 import { error } from "@sveltejs/kit";
 import { get } from "svelte/store";
 
-import { GITEA_LABELS } from "$lib/constants";
+import { GITEA_LABEL_NAMES, GITEA_LABELS } from "$lib/constants";
 import { createIssueWithLabels, type GiteaRepo } from "$lib/gitea";
+import { buildOsmPayloadBlock } from "$lib/osmPayload";
 import { areas } from "$lib/store";
 import { getAreaIdsByCoordinates } from "$lib/utils";
 
@@ -43,6 +44,11 @@ type IssueConfig = {
 	repo: GiteaRepo;
 	labelId: number;
 	hasAreaLabels: boolean;
+	// Extra name-based labels resolved/created at submission time.
+	extraLabels?: readonly string[];
+	// When true, append a machine-readable OSM payload block so an approved
+	// issue can be pushed to OSM automatically (see api/gitea/webhook).
+	osmPayload?: "create" | "update";
 };
 
 const CONFIG = {
@@ -51,6 +57,30 @@ const CONFIG = {
 		labelId: GITEA_LABELS.DATA.ADD_LOCATION,
 		hasAreaLabels: true,
 	},
+	// Wizard: new physical merchant. Same triage label as add-location, but
+	// carries a structured payload for the approve-and-push-to-OSM flow.
+	"add-location-wizard": {
+		repo: "btcmap-data",
+		labelId: GITEA_LABELS.DATA.ADD_LOCATION,
+		hasAreaLabels: true,
+		osmPayload: "create",
+	},
+	// Wizard: user updates a merchant that already exists on OSM.
+	"update-location": {
+		repo: "btcmap-data",
+		labelId: GITEA_LABELS.DATA.VERIFY_LOCATION,
+		hasAreaLabels: true,
+		extraLabels: [GITEA_LABEL_NAMES.UPDATE_LOCATION],
+		osmPayload: "update",
+	},
+	// Wizard: business with no physical location visitors can go to (online shops
+	// and mobile/on-site services). Stored for a future listing; not on the map.
+	"online-or-mobile": {
+		repo: "btcmap-data",
+		labelId: GITEA_LABELS.DATA.ADD_LOCATION,
+		hasAreaLabels: false,
+		extraLabels: [GITEA_LABEL_NAMES.ONLINE_OR_MOBILE],
+	},
 	"verify-location": {
 		repo: "btcmap-data",
 		labelId: GITEA_LABELS.DATA.VERIFY_LOCATION,
@@ -157,6 +187,59 @@ Created at: ${timestamp}
 
 ${taggingInstructions}`;
 
+		case "add-location-wizard":
+			return `Merchant name: ${data.name}
+English name (name:en): ${data.nameEn || ""}
+Physical location: yes (submitted via wizard)
+Address: ${data.address || ""}
+Location description: ${data.locationDescription || ""}
+Lat: ${data.lat}
+Long: ${data.long}
+Associated areas: ${areasText}
+OSM: ${data.osm}
+Category: ${data.category}
+Payment methods: ${data.methods}
+Website: ${data.website}
+Phone: ${data.phone}
+Opening hours: ${data.hours}
+Notes: ${data.notes}
+Data Source: ${data.source}
+Details (if applicable): ${data.sourceOther}
+Contact: ${data.contact}
+Created at: ${timestamp}
+
+${taggingInstructions}`;
+
+		case "update-location":
+			return `Merchant name: ${data.name}
+Existing merchant: ${data.osmType || "node"}/${data.osmId}
+OSM: ${data.osm}
+Coordinates: ${data.lat}, ${data.long}
+Associated areas: ${areasText}
+Updated website: ${data.website}
+Updated phone: ${data.phone}
+Updated opening hours: ${data.hours}
+Updated social links: ${data.socialLinks}
+Updated payment methods: ${data.methods}
+Notes: ${data.notes}
+Contact: ${data.contact}
+Created at: ${timestamp}
+
+${taggingInstructions}`;
+
+		case "online-or-mobile":
+			return `Business name: ${data.name}
+Physical location: no (online shop or mobile/on-site service)
+Website: ${data.website}
+Social links: ${data.socialLinks}
+Category: ${data.category}
+Payment methods: ${data.methods}
+Notes: ${data.notes}
+Contact: ${data.contact}
+Created at: ${timestamp}
+
+Online-or-mobile submission. Not shown on the map yet; stored for a future listing of businesses without a visitable location.`;
+
 		case "verify-location":
 			return `Merchant name: ${data.name}
 Merchant location: ${data.location}
@@ -222,8 +305,10 @@ export const POST: RequestHandler = async ({ request }) => {
 
 	validateCaptcha(captchaSecret, captchaTest);
 
-	// type is now narrowed to IssueType after validation
-	const config = CONFIG[type];
+	// type is now narrowed to IssueType after validation. Widen to IssueConfig so
+	// optional fields (osmPayload, extraLabels) present on only some entries are
+	// accessible without the `satisfies` union narrowing them away.
+	const config: IssueConfig = CONFIG[type];
 	let areaLabels: string[] = [];
 	let areasText = "";
 
@@ -240,9 +325,20 @@ export const POST: RequestHandler = async ({ request }) => {
 		});
 	}
 
-	const body = generateBody(type, data, areasText);
+	let body = generateBody(type, data, areasText);
+
+	// For wizard flows that support automated OSM pushes, append a
+	// machine-readable payload block that api/gitea/webhook parses on approval.
+	if (config.osmPayload) {
+		body += `\n\n${buildOsmPayloadBlock(config.osmPayload, data)}`;
+	}
+
 	const title = String(data.name);
 
+	// Merge config-level name labels (e.g. online-only, update-location) with
+	// the coordinate-derived area labels; both are resolved/created by name.
+	const nameLabels = [...(config.extraLabels ?? []), ...areaLabels];
+
 	console.debug("[gitea/issue] Creating issue", {
 		type,
 		repo: config.repo,
@@ -254,7 +350,7 @@ export const POST: RequestHandler = async ({ request }) => {
 		body,
 		[config.labelId],
 		config.repo,
-		areaLabels,
+		nameLabels,
 	);
 
 	console.debug("[gitea/issue] Issue created", {
diff --git a/src/routes/api/gitea/webhook/+server.ts b/src/routes/api/gitea/webhook/+server.ts
new file mode 100644
index 000000000..2e0d16875
--- /dev/null
+++ b/src/routes/api/gitea/webhook/+server.ts
@@ -0,0 +1,159 @@
+import crypto from "node:crypto";
+import { error, json } from "@sveltejs/kit";
+
+import { btcmapApiConfigured, submitPlaceFromPayload } from "$lib/btcmapApi";
+import { GITEA_LABEL_NAMES } from "$lib/constants";
+import { osmConfigured, pushToOsm } from "$lib/osm";
+import { parseOsmPayloadBlock } from "$lib/osmPayload";
+
+import type { RequestHandler } from "./$types";
+import { env } from "$env/dynamic/private";
+
+// Marker written into a comment after a successful push so re-delivered webhook
+// events (or repeated label toggles) don't create duplicate OSM edits.
+const PUSHED_MARKER = "<!--BTCMAP_OSM_PUSHED-->";
+
+type GiteaLabel = { name: string };
+type GiteaWebhookBody = {
+	action?: string;
+	issue?: {
+		number: number;
+		body: string;
+		labels?: GiteaLabel[];
+	};
+	repository?: { full_name?: string; name?: string };
+};
+
+function verifySignature(rawBody: string, signature: string | null): boolean {
+	if (!env.GITEA_WEBHOOK_SECRET) return false;
+	if (!signature) return false;
+	const expected = crypto
+		.createHmac("sha256", env.GITEA_WEBHOOK_SECRET)
+		.update(rawBody)
+		.digest("hex");
+	const a = Buffer.from(expected, "hex");
+	const b = Buffer.from(signature, "hex");
+	if (a.length !== b.length) return false;
+	return crypto.timingSafeEqual(a, b);
+}
+
+function giteaHeaders(): Record<string, string> {
+	return {
+		Authorization: `token ${env.GITEA_API_KEY}`,
+		"Content-Type": "application/json",
+	};
+}
+
+async function issueHasPushedMarker(
+	repoFullName: string,
+	issueNumber: number,
+): Promise<boolean> {
+	const res = await fetch(
+		`${env.GITEA_API_URL}/api/v1/repos/${repoFullName}/issues/${issueNumber}/comments`,
+		{ headers: giteaHeaders() },
+	);
+	if (!res.ok) return false;
+	const comments = (await res.json()) as Array<{ body?: string }>;
+	return comments.some((c) => c.body?.includes(PUSHED_MARKER));
+}
+
+async function postComment(
+	repoFullName: string,
+	issueNumber: number,
+	body: string,
+): Promise<void> {
+	await fetch(
+		`${env.GITEA_API_URL}/api/v1/repos/${repoFullName}/issues/${issueNumber}/comments`,
+		{ method: "POST", headers: giteaHeaders(), body: JSON.stringify({ body }) },
+	);
+}
+
+export const POST: RequestHandler = async ({ request }) => {
+	if (!env.GITEA_WEBHOOK_SECRET || !env.GITEA_API_URL || !env.GITEA_API_KEY) {
+		error(503, "Webhook not configured");
+	}
+
+	const rawBody = await request.text();
+	const signature = request.headers.get("X-Gitea-Signature");
+	if (!verifySignature(rawBody, signature)) {
+		error(401, "Invalid signature");
+	}
+
+	let payload: GiteaWebhookBody;
+	try {
+		payload = JSON.parse(rawBody);
+	} catch {
+		error(400, "Invalid JSON");
+	}
+
+	const issue = payload.issue;
+	const repoFullName = payload.repository?.full_name;
+	if (!issue || !repoFullName) {
+		return json({ ok: true, skipped: "no issue" });
+	}
+
+	// Only act once the maintainer approval label is present.
+	const labels = (issue.labels ?? []).map((l) => l.name);
+	if (!labels.includes(GITEA_LABEL_NAMES.APPROVED)) {
+		return json({ ok: true, skipped: "not approved" });
+	}
+
+	const osmPayload = parseOsmPayloadBlock(issue.body ?? "");
+	if (!osmPayload) {
+		return json({ ok: true, skipped: "no osm payload" });
+	}
+
+	if (!btcmapApiConfigured() && !osmConfigured()) {
+		error(503, "No push target configured");
+	}
+
+	// Guard against duplicate pushes from re-delivered events.
+	if (await issueHasPushedMarker(repoFullName, issue.number)) {
+		return json({ ok: true, skipped: "already pushed" });
+	}
+
+	const lines: string[] = [];
+	try {
+		// 1. Instant BTC Map draft via submit_place (create only; the import
+		//    pipeline is not an OSM-node editor, so updates skip it).
+		if (osmPayload.action === "create" && btcmapApiConfigured()) {
+			const sp = await submitPlaceFromPayload(
+				osmPayload,
+				`gitea-${issue.number}`,
+			);
+			lines.push(
+				`🗺️ Added to BTC Map instantly via submit_place (id \`${sp.id}\`, \`${sp.origin}:${sp.external_id}\`).`,
+			);
+		}
+
+		// 2. Automated OSM changeset (create or update) via the bot account.
+		if (osmConfigured()) {
+			const result = await pushToOsm(osmPayload);
+			const changesetUrl = result.url.replace(
+				`/node/${result.osmId}`,
+				`/changeset/${result.changesetId}`,
+			);
+			lines.push(
+				`✅ Pushed to OSM: [${result.osmType}/${result.osmId}](${result.url}) in changeset [${result.changesetId}](${changesetUrl}).`,
+			);
+		}
+
+		await postComment(
+			repoFullName,
+			issue.number,
+			`${PUSHED_MARKER}\n${lines.join("\n")}`,
+		);
+		return json({ ok: true, results: lines });
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		console.error("[gitea/webhook] push failed", message);
+		await postComment(
+			repoFullName,
+			issue.number,
+			`❌ Approval push failed: ${message}\n\n${
+				lines.length ? `Completed before failure:\n${lines.join("\n")}\n\n` : ""
+			}Please fix the payload and re-approve, or apply the change manually.`,
+		);
+		error(500, "Approval push failed");
+	}
+};