feat: show bbox in preview
This commit is contained in:
parent
54c38fa685
commit
090afdaa44
1 changed files with 217 additions and 451 deletions
|
|
@ -1,192 +1,59 @@
|
|||
"use client";
|
||||
|
||||
import { useState, useEffect, useMemo, useRef, useCallback } from "react";
|
||||
import { useState, useEffect, useRef, useCallback } from "react";
|
||||
import type { GeofabrikFeature, GeofabrikIndex } from "@transportationer/shared";
|
||||
import { CityIngestProgress } from "@/components/city-ingest-progress";
|
||||
|
||||
type Step = "browse" | "confirm" | "ingest";
|
||||
// ─── Geofabrik region matching ────────────────────────────────────────────────
|
||||
|
||||
// ─── Step indicator ───────────────────────────────────────────────────────────
|
||||
/** Ray-casting point-in-polygon for a single ring ([lng, lat][] coords). */
|
||||
function pointInRing(point: [number, number], ring: number[][]): boolean {
|
||||
const [px, py] = point;
|
||||
let inside = false;
|
||||
for (let i = 0, j = ring.length - 1; i < ring.length; j = i++) {
|
||||
const xi = ring[i][0], yi = ring[i][1];
|
||||
const xj = ring[j][0], yj = ring[j][1];
|
||||
if ((yi > py) !== (yj > py) && px < ((xj - xi) * (py - yi)) / (yj - yi) + xi) {
|
||||
inside = !inside;
|
||||
}
|
||||
}
|
||||
return inside;
|
||||
}
|
||||
|
||||
function StepIndicator({ current }: { current: Step }) {
|
||||
const steps: { key: Step; label: string }[] = [
|
||||
{ key: "browse", label: "Select Region" },
|
||||
{ key: "confirm", label: "Confirm" },
|
||||
{ key: "ingest", label: "Processing" },
|
||||
];
|
||||
const idx = steps.findIndex((s) => s.key === current);
|
||||
return (
|
||||
<nav className="flex items-center gap-4 mb-8">
|
||||
{steps.map((s, i) => (
|
||||
<div key={s.key} className="flex items-center gap-2">
|
||||
<span
|
||||
className={`w-6 h-6 rounded-full text-xs flex items-center justify-center font-medium ${
|
||||
i < idx
|
||||
? "bg-brand-600 text-white"
|
||||
: i === idx
|
||||
? "bg-brand-600 text-white ring-2 ring-brand-300"
|
||||
: "bg-gray-200 text-gray-500"
|
||||
}`}
|
||||
>
|
||||
{i < idx ? "✓" : i + 1}
|
||||
</span>
|
||||
<span
|
||||
className={`text-sm font-medium ${i === idx ? "text-gray-900" : "text-gray-500"}`}
|
||||
>
|
||||
{s.label}
|
||||
</span>
|
||||
{i < steps.length - 1 && (
|
||||
<span className="text-gray-300 mx-2">→</span>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</nav>
|
||||
function containsPoint(geometry: GeofabrikFeature["geometry"], point: [number, number]): boolean {
|
||||
if (!geometry) return false;
|
||||
if (geometry.type === "Polygon") {
|
||||
return pointInRing(point, geometry.coordinates[0] as number[][]);
|
||||
}
|
||||
return (geometry.coordinates as number[][][][]).some(
|
||||
(poly) => pointInRing(point, poly[0] as number[][]),
|
||||
);
|
||||
}
|
||||
|
||||
// ─── Geofabrik browser ────────────────────────────────────────────────────────
|
||||
|
||||
function GeofabrikBrowser({
|
||||
onSelect,
|
||||
}: {
|
||||
onSelect: (f: GeofabrikFeature) => void;
|
||||
}) {
|
||||
const [index, setIndex] = useState<GeofabrikIndex | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [query, setQuery] = useState("");
|
||||
const [parent, setParent] = useState<string | undefined>(undefined);
|
||||
|
||||
useEffect(() => {
|
||||
fetch("/api/admin/geofabrik")
|
||||
.then((r) => r.json())
|
||||
.then(setIndex)
|
||||
.catch((e) => setError(String(e)))
|
||||
.finally(() => setLoading(false));
|
||||
}, []);
|
||||
|
||||
const features = useMemo(() => {
|
||||
if (!index) return [];
|
||||
return index.features.filter((f) => {
|
||||
const matchesParent = parent
|
||||
? f.properties.parent === parent
|
||||
: !f.properties.parent;
|
||||
const matchesQuery = query
|
||||
? f.properties.name.toLowerCase().includes(query.toLowerCase()) ||
|
||||
f.properties.id.toLowerCase().includes(query.toLowerCase())
|
||||
: true;
|
||||
return matchesParent && matchesQuery && f.properties.urls?.pbf;
|
||||
});
|
||||
}, [index, parent, query]);
|
||||
|
||||
const parentFeature = index?.features.find(
|
||||
(f) => f.properties.id === parent,
|
||||
);
|
||||
const grandParent = parentFeature
|
||||
? index?.features.find(
|
||||
(f) => f.properties.id === parentFeature.properties.parent,
|
||||
)
|
||||
: null;
|
||||
|
||||
if (loading)
|
||||
return (
|
||||
<div className="card py-12 text-center text-gray-500">
|
||||
Loading Geofabrik region index…
|
||||
</div>
|
||||
);
|
||||
if (error)
|
||||
return (
|
||||
<div className="card py-8 text-center text-red-600">
|
||||
Error loading index: {error}
|
||||
</div>
|
||||
);
|
||||
|
||||
return (
|
||||
<div className="card">
|
||||
<h2 className="text-lg font-semibold mb-4">Select a Region</h2>
|
||||
|
||||
<div className="flex items-center gap-2 text-sm mb-4 flex-wrap">
|
||||
<button
|
||||
onClick={() => setParent(undefined)}
|
||||
className="text-brand-600 hover:underline"
|
||||
>
|
||||
All regions
|
||||
</button>
|
||||
{grandParent && (
|
||||
<>
|
||||
<span className="text-gray-400">›</span>
|
||||
<button
|
||||
onClick={() => setParent(grandParent.properties.id)}
|
||||
className="text-brand-600 hover:underline"
|
||||
>
|
||||
{grandParent.properties.name}
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
{parentFeature && (
|
||||
<>
|
||||
<span className="text-gray-400">›</span>
|
||||
<span className="font-medium">{parentFeature.properties.name}</span>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<input
|
||||
type="search"
|
||||
placeholder="Search regions…"
|
||||
value={query}
|
||||
onChange={(e) => setQuery(e.target.value)}
|
||||
className="block w-full rounded-md border border-gray-300 px-3 py-2 text-sm mb-4 focus:border-brand-500 focus:outline-none focus:ring-1 focus:ring-brand-500"
|
||||
/>
|
||||
|
||||
<div className="divide-y divide-gray-100 max-h-80 overflow-y-auto rounded border border-gray-200">
|
||||
{features.length === 0 ? (
|
||||
<p className="text-sm text-gray-500 py-4 px-3">No regions found.</p>
|
||||
) : (
|
||||
features.map((f) => {
|
||||
const hasChildren = index!.features.some(
|
||||
(c) => c.properties.parent === f.properties.id,
|
||||
);
|
||||
return (
|
||||
<div
|
||||
key={f.properties.id}
|
||||
className="flex items-center justify-between px-3 py-2.5 hover:bg-gray-50"
|
||||
>
|
||||
<div>
|
||||
<p className="text-sm font-medium text-gray-900">
|
||||
{f.properties.name}
|
||||
</p>
|
||||
<p className="text-xs text-gray-400">{f.properties.id}</p>
|
||||
</div>
|
||||
<div className="flex gap-2">
|
||||
{hasChildren && (
|
||||
<button
|
||||
onClick={() => {
|
||||
setParent(f.properties.id);
|
||||
setQuery("");
|
||||
}}
|
||||
className="btn-secondary text-xs py-1"
|
||||
>
|
||||
Browse →
|
||||
</button>
|
||||
)}
|
||||
<button
|
||||
onClick={() => onSelect(f)}
|
||||
className="btn-primary text-xs py-1"
|
||||
>
|
||||
Select
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
/** Bounding-box area as a proxy for region size (smaller = more specific). */
|
||||
function bboxArea(geometry: GeofabrikFeature["geometry"]): number {
|
||||
if (!geometry) return Infinity;
|
||||
const coords: number[][] =
|
||||
geometry.type === "Polygon"
|
||||
? (geometry.coordinates as number[][][]).flat()
|
||||
: (geometry.coordinates as number[][][][]).flat(2);
|
||||
const lngs = coords.map((c) => c[0]);
|
||||
const lats = coords.map((c) => c[1]);
|
||||
return (Math.max(...lngs) - Math.min(...lngs)) * (Math.max(...lats) - Math.min(...lats));
|
||||
}
|
||||
|
||||
// ─── Nominatim polygon geocoder + mini map ───────────────────────────────────
|
||||
/** Returns the smallest Geofabrik region whose polygon contains [lon, lat]. */
|
||||
function findBestRegion(lat: number, lon: number, index: GeofabrikIndex): GeofabrikFeature | null {
|
||||
const point: [number, number] = [lon, lat];
|
||||
const candidates = index.features.filter(
|
||||
(f) => f.properties.urls?.pbf && f.geometry && containsPoint(f.geometry, point),
|
||||
);
|
||||
if (candidates.length === 0) return null;
|
||||
candidates.sort((a, b) => bboxArea(a.geometry) - bboxArea(b.geometry));
|
||||
return candidates[0];
|
||||
}
|
||||
|
||||
// ─── Nominatim types + helpers ────────────────────────────────────────────────
|
||||
|
||||
interface NominatimResult {
|
||||
place_id: number;
|
||||
|
|
@ -206,6 +73,12 @@ interface NominatimResult {
|
|||
};
|
||||
}
|
||||
|
||||
const COUNTRIES = [
|
||||
{ code: "DE", label: "🇩🇪 Germany" },
|
||||
{ code: "NL", label: "🇳🇱 Netherlands" },
|
||||
{ code: "DK", label: "🇩🇰 Denmark" },
|
||||
];
|
||||
|
||||
function toSlug(name: string): string {
|
||||
return name
|
||||
.toLowerCase()
|
||||
|
|
@ -215,14 +88,14 @@ function toSlug(name: string): string {
|
|||
.replace(/^-|-$/g, "");
|
||||
}
|
||||
|
||||
// ─── Nominatim geocoder + mini map ────────────────────────────────────────────
|
||||
|
||||
function LocationSelector({
|
||||
regionGeometry,
|
||||
onBoundaryChange,
|
||||
onResultSelect,
|
||||
}: {
|
||||
regionGeometry: GeofabrikFeature["geometry"];
|
||||
onBoundaryChange: (boundary: { type: string; coordinates: unknown } | null) => void;
|
||||
onResultSelect?: (result: { name: string; countryCode: string } | null) => void;
|
||||
onResultSelect?: (result: { name: string; countryCode: string; lat: number; lon: number } | null) => void;
|
||||
}) {
|
||||
const [query, setQuery] = useState("");
|
||||
const [results, setResults] = useState<NominatimResult[]>([]);
|
||||
|
|
@ -238,7 +111,6 @@ function LocationSelector({
|
|||
const onResultSelectRef = useRef(onResultSelect);
|
||||
onResultSelectRef.current = onResultSelect;
|
||||
|
||||
// Notify parent when selection changes.
|
||||
useEffect(() => {
|
||||
onBoundaryChangeRef.current(selected?.geojson ?? null);
|
||||
if (selected) {
|
||||
|
|
@ -249,18 +121,19 @@ function LocationSelector({
|
|||
selected.address?.municipality ??
|
||||
selected.display_name.split(",")[0].trim();
|
||||
const countryCode = (selected.address?.country_code ?? "").toUpperCase();
|
||||
onResultSelectRef.current?.({ name, countryCode });
|
||||
onResultSelectRef.current?.({
|
||||
name,
|
||||
countryCode,
|
||||
lat: parseFloat(selected.lat),
|
||||
lon: parseFloat(selected.lon),
|
||||
});
|
||||
} else {
|
||||
onResultSelectRef.current?.(null);
|
||||
}
|
||||
}, [selected]);
|
||||
|
||||
// Debounced Nominatim search — request polygon_geojson + featuretype=settlement
|
||||
useEffect(() => {
|
||||
if (query.length < 2) {
|
||||
setResults([]);
|
||||
return;
|
||||
}
|
||||
if (query.length < 2) { setResults([]); return; }
|
||||
const timer = setTimeout(async () => {
|
||||
setSearching(true);
|
||||
try {
|
||||
|
|
@ -269,10 +142,8 @@ function LocationSelector({
|
|||
{ headers: { "User-Agent": "Transportationer/1.0 (15-minute city analyzer)" } },
|
||||
);
|
||||
const data: NominatimResult[] = await res.json();
|
||||
// Keep polygon results at municipality level or finer (rank >= 10).
|
||||
setResults(data.filter(
|
||||
(r) => r.place_rank >= 10 &&
|
||||
(r.geojson?.type === "Polygon" || r.geojson?.type === "MultiPolygon"),
|
||||
(r) => r.geojson?.type === "Polygon" || r.geojson?.type === "MultiPolygon",
|
||||
));
|
||||
setShowDropdown(true);
|
||||
} catch {
|
||||
|
|
@ -284,15 +155,15 @@ function LocationSelector({
|
|||
return () => clearTimeout(timer);
|
||||
}, [query]);
|
||||
|
||||
// Apply boundary polygon to mini map
|
||||
const applyBoundaryToMap = useCallback(
|
||||
(map: import("maplibre-gl").Map, geojson: NominatimResult["geojson"] | null) => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const src = map.getSource("area-boundary") as any;
|
||||
if (!src) return;
|
||||
const boundarySrc = map.getSource("area-boundary") as any;
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const bboxSrc = map.getSource("area-bbox") as any;
|
||||
if (!boundarySrc || !bboxSrc) return;
|
||||
if (geojson) {
|
||||
src.setData({ type: "Feature", geometry: geojson, properties: {} });
|
||||
// Fit to boundary bbox — flatten all rings/polygons to get full extent
|
||||
boundarySrc.setData({ type: "Feature", geometry: geojson, properties: {} });
|
||||
try {
|
||||
const coords: number[][] =
|
||||
geojson.type === "Polygon"
|
||||
|
|
@ -300,43 +171,42 @@ function LocationSelector({
|
|||
: (geojson.coordinates as number[][][][]).flat(2);
|
||||
const lngs = coords.map((c) => c[0]);
|
||||
const lats = coords.map((c) => c[1]);
|
||||
map.fitBounds(
|
||||
[Math.min(...lngs), Math.min(...lats), Math.max(...lngs), Math.max(...lats)],
|
||||
{ padding: 40, duration: 500 },
|
||||
);
|
||||
const [minLng, minLat, maxLng, maxLat] = [
|
||||
Math.min(...lngs), Math.min(...lats), Math.max(...lngs), Math.max(...lats),
|
||||
];
|
||||
bboxSrc.setData({
|
||||
type: "Feature",
|
||||
geometry: {
|
||||
type: "Polygon",
|
||||
coordinates: [[
|
||||
[minLng, minLat], [maxLng, minLat], [maxLng, maxLat], [minLng, maxLat], [minLng, minLat],
|
||||
]],
|
||||
},
|
||||
properties: {},
|
||||
});
|
||||
map.fitBounds([minLng, minLat, maxLng, maxLat], { padding: 40, duration: 500 });
|
||||
} catch { /* ignore */ }
|
||||
} else {
|
||||
src.setData({ type: "FeatureCollection", features: [] });
|
||||
boundarySrc.setData({ type: "FeatureCollection", features: [] });
|
||||
bboxSrc.setData({ type: "FeatureCollection", features: [] });
|
||||
}
|
||||
},
|
||||
[],
|
||||
);
|
||||
|
||||
// Update mini map when selection changes
|
||||
useEffect(() => {
|
||||
const map = mapRef.current;
|
||||
if (map && mapReadyRef.current) applyBoundaryToMap(map, selected?.geojson ?? null);
|
||||
}, [selected, applyBoundaryToMap]);
|
||||
|
||||
// Initialize mini map
|
||||
useEffect(() => {
|
||||
if (!mapContainerRef.current) return;
|
||||
let cancelled = false;
|
||||
|
||||
(async () => {
|
||||
const mgl = await import("maplibre-gl");
|
||||
const { Protocol } = await import("pmtiles");
|
||||
|
||||
if (cancelled) return;
|
||||
|
||||
// Register pmtiles protocol (idempotent)
|
||||
try {
|
||||
const p = new Protocol();
|
||||
mgl.addProtocol("pmtiles", p.tile);
|
||||
} catch {
|
||||
// Already registered
|
||||
}
|
||||
|
||||
try { mgl.addProtocol("pmtiles", new Protocol().tile); } catch { /* already registered */ }
|
||||
const map = new mgl.Map({
|
||||
container: mapContainerRef.current!,
|
||||
style: "/tiles/style.json",
|
||||
|
|
@ -344,67 +214,18 @@ function LocationSelector({
|
|||
zoom: 3,
|
||||
});
|
||||
mapRef.current = map;
|
||||
|
||||
map.on("load", () => {
|
||||
if (cancelled) return;
|
||||
mapReadyRef.current = true;
|
||||
map.addSource("area-boundary", { type: "geojson", data: { type: "FeatureCollection", features: [] } });
|
||||
map.addLayer({ id: "area-boundary-fill", type: "fill", source: "area-boundary", paint: { "fill-color": "#2563eb", "fill-opacity": 0.15 } });
|
||||
map.addLayer({ id: "area-boundary-line", type: "line", source: "area-boundary", paint: { "line-color": "#2563eb", "line-width": 2 } });
|
||||
|
||||
// Region outline (Geofabrik polygon)
|
||||
map.addSource("area-region", {
|
||||
type: "geojson",
|
||||
data: regionGeometry
|
||||
? { type: "Feature", geometry: regionGeometry, properties: {} }
|
||||
: { type: "FeatureCollection", features: [] },
|
||||
});
|
||||
map.addLayer({
|
||||
id: "area-region-fill",
|
||||
type: "fill",
|
||||
source: "area-region",
|
||||
paint: { "fill-color": "#64748b", "fill-opacity": 0.1 },
|
||||
});
|
||||
map.addLayer({
|
||||
id: "area-region-line",
|
||||
type: "line",
|
||||
source: "area-region",
|
||||
paint: { "line-color": "#64748b", "line-width": 1.5, "line-dasharray": [3, 2] },
|
||||
});
|
||||
|
||||
// Selected city boundary polygon
|
||||
map.addSource("area-boundary", {
|
||||
type: "geojson",
|
||||
data: { type: "FeatureCollection", features: [] },
|
||||
});
|
||||
map.addLayer({
|
||||
id: "area-boundary-fill",
|
||||
type: "fill",
|
||||
source: "area-boundary",
|
||||
paint: { "fill-color": "#2563eb", "fill-opacity": 0.15 },
|
||||
});
|
||||
map.addLayer({
|
||||
id: "area-boundary-line",
|
||||
type: "line",
|
||||
source: "area-boundary",
|
||||
paint: { "line-color": "#2563eb", "line-width": 2 },
|
||||
});
|
||||
|
||||
// Fit to region if available
|
||||
if (regionGeometry) {
|
||||
try {
|
||||
const coords: number[][] =
|
||||
regionGeometry.type === "Polygon"
|
||||
? regionGeometry.coordinates.flat()
|
||||
: regionGeometry.coordinates.flat(2);
|
||||
const lngs = coords.map((c) => c[0]);
|
||||
const lats = coords.map((c) => c[1]);
|
||||
map.fitBounds(
|
||||
[Math.min(...lngs), Math.min(...lats), Math.max(...lngs), Math.max(...lats)],
|
||||
{ padding: 20 },
|
||||
);
|
||||
} catch { /* ignore */ }
|
||||
}
|
||||
// Bbox rectangle — shown on top of the boundary polygon
|
||||
map.addSource("area-bbox", { type: "geojson", data: { type: "FeatureCollection", features: [] } });
|
||||
map.addLayer({ id: "area-bbox-line", type: "line", source: "area-bbox", paint: { "line-color": "#f59e0b", "line-width": 1.5, "line-dasharray": [4, 3] } });
|
||||
});
|
||||
})();
|
||||
|
||||
return () => {
|
||||
cancelled = true;
|
||||
mapReadyRef.current = false;
|
||||
|
|
@ -415,7 +236,6 @@ function LocationSelector({
|
|||
|
||||
return (
|
||||
<div className="space-y-3">
|
||||
{/* Geocoder */}
|
||||
<div className="relative">
|
||||
<div className="flex gap-2 items-center">
|
||||
<input
|
||||
|
|
@ -429,50 +249,31 @@ function LocationSelector({
|
|||
onFocus={() => results.length > 0 && setShowDropdown(true)}
|
||||
className="block w-full rounded-md border border-gray-300 px-3 py-2 text-sm focus:border-brand-500 focus:outline-none focus:ring-1 focus:ring-brand-500"
|
||||
/>
|
||||
{searching && (
|
||||
<span className="text-xs text-gray-400 whitespace-nowrap">Searching…</span>
|
||||
)}
|
||||
{searching && <span className="text-xs text-gray-400 whitespace-nowrap">Searching…</span>}
|
||||
</div>
|
||||
|
||||
{showDropdown && results.length > 0 && (
|
||||
<div className="absolute z-20 left-0 right-0 top-full mt-1 bg-white border border-gray-200 rounded-md shadow-lg max-h-56 overflow-y-auto">
|
||||
{results.map((r) => (
|
||||
<button
|
||||
key={r.place_id}
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setSelected(r);
|
||||
setQuery(r.display_name.split(",").slice(0, 3).join(", "));
|
||||
setShowDropdown(false);
|
||||
}}
|
||||
onClick={() => { setSelected(r); setQuery(r.display_name.split(",").slice(0, 3).join(", ")); setShowDropdown(false); }}
|
||||
className="w-full text-left px-3 py-2 text-sm hover:bg-gray-50 border-b border-gray-100 last:border-0"
|
||||
>
|
||||
<span className="font-medium text-gray-800">
|
||||
{r.display_name.split(",")[0]}
|
||||
</span>
|
||||
<span className="text-gray-400 ml-1 text-xs">
|
||||
{r.display_name.split(",").slice(1, 3).join(",")}
|
||||
</span>
|
||||
<span className="font-medium text-gray-800">{r.display_name.split(",")[0]}</span>
|
||||
<span className="text-gray-400 ml-1 text-xs">{r.display_name.split(",").slice(1, 3).join(",")}</span>
|
||||
<span className="ml-2 text-xs text-blue-500">{r.geojson?.type}</span>
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Mini map */}
|
||||
<div
|
||||
ref={mapContainerRef}
|
||||
className="w-full rounded-md border border-gray-200 overflow-hidden"
|
||||
style={{ height: 220 }}
|
||||
/>
|
||||
|
||||
{selected?.geojson && (
|
||||
<div ref={mapContainerRef} className="w-full rounded-md border border-gray-200 overflow-hidden" style={{ height: 220 }} />
|
||||
{selected?.geojson ? (
|
||||
<p className="text-xs text-green-700">
|
||||
✓ Boundary: {selected.display_name.split(",").slice(0, 2).join(", ")} ({selected.geojson.type})
|
||||
</p>
|
||||
)}
|
||||
{!selected && (
|
||||
) : (
|
||||
<p className="text-xs text-gray-400">
|
||||
Search for a city to set its administrative boundary and auto-fill the fields below.
|
||||
</p>
|
||||
|
|
@ -481,71 +282,119 @@ function LocationSelector({
|
|||
);
|
||||
}
|
||||
|
||||
// ─── Confirm step ─────────────────────────────────────────────────────────────
|
||||
// ─── Main page ────────────────────────────────────────────────────────────────
|
||||
|
||||
function ConfirmStep({
|
||||
region,
|
||||
onBack,
|
||||
onConfirm,
|
||||
}: {
|
||||
region: GeofabrikFeature;
|
||||
onBack: () => void;
|
||||
onConfirm: (
|
||||
slug: string,
|
||||
name: string,
|
||||
countryCode: string,
|
||||
boundary: { type: string; coordinates: unknown } | null,
|
||||
) => Promise<void>;
|
||||
}) {
|
||||
const defaultSlug = region.properties.id.replace(/\//g, "-");
|
||||
const [slug, setSlug] = useState(defaultSlug);
|
||||
const [name, setName] = useState(region.properties.name);
|
||||
export default function AddCityPage() {
|
||||
const [name, setName] = useState("");
|
||||
const [slug, setSlug] = useState("");
|
||||
const [countryCode, setCountryCode] = useState("");
|
||||
const [boundary, setBoundary] = useState<{ type: string; coordinates: unknown } | null>(null);
|
||||
const [matchedRegion, setMatchedRegion] = useState<GeofabrikFeature | null>(null);
|
||||
const [jobId, setJobId] = useState<string | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const geofabrikIndexRef = useRef<GeofabrikIndex | null>(null);
|
||||
|
||||
// Fetch Geofabrik index eagerly so it's ready when the user picks a city.
|
||||
useEffect(() => {
|
||||
fetch("/api/admin/geofabrik")
|
||||
.then((r) => r.json())
|
||||
.then((data: GeofabrikIndex) => { geofabrikIndexRef.current = data; })
|
||||
.catch(() => {});
|
||||
}, []);
|
||||
|
||||
const geofabrikUrl = matchedRegion?.properties.urls?.pbf ?? undefined;
|
||||
|
||||
const handleBoundaryChange = useCallback(
|
||||
(b: { type: string; coordinates: unknown } | null) => setBoundary(b),
|
||||
[],
|
||||
);
|
||||
|
||||
const KNOWN_COUNTRIES = ["DE", "NL", "DK"];
|
||||
const handleResultSelect = useCallback(
|
||||
(result: { name: string; countryCode: string } | null) => {
|
||||
if (!result) return;
|
||||
(result: { name: string; countryCode: string; lat: number; lon: number } | null) => {
|
||||
if (!result) { setMatchedRegion(null); return; }
|
||||
setName(result.name);
|
||||
setSlug(toSlug(result.name));
|
||||
setCountryCode(KNOWN_COUNTRIES.includes(result.countryCode) ? result.countryCode : "");
|
||||
setCountryCode(COUNTRIES.some((c) => c.code === result.countryCode) ? result.countryCode : "");
|
||||
const best = geofabrikIndexRef.current
|
||||
? findBestRegion(result.lat, result.lon, geofabrikIndexRef.current)
|
||||
: null;
|
||||
setMatchedRegion(best);
|
||||
},
|
||||
[],
|
||||
);
|
||||
|
||||
return (
|
||||
<div className="card max-w-2xl">
|
||||
<h2 className="text-lg font-semibold mb-4">Confirm City Details</h2>
|
||||
const handleSubmit = async () => {
|
||||
if (!slug || !name || !geofabrikUrl) return;
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
try {
|
||||
const res = await fetch("/api/admin/cities", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
slug, name, countryCode, geofabrikUrl,
|
||||
...(boundary ? { boundary } : {}),
|
||||
}),
|
||||
});
|
||||
if (!res.ok) {
|
||||
const data = await res.json();
|
||||
setError(data.error ?? "Failed to start ingestion");
|
||||
return;
|
||||
}
|
||||
const data = await res.json();
|
||||
setJobId(data.jobId);
|
||||
} catch (e) {
|
||||
setError(String(e));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
<div className="space-y-4">
|
||||
{/* City boundary selector — at the top so it can auto-fill the fields below */}
|
||||
if (jobId) {
|
||||
return (
|
||||
<div className="max-w-2xl mx-auto">
|
||||
<div className="flex items-center gap-4 mb-6">
|
||||
<a href="/admin" className="text-sm text-gray-500 hover:text-gray-700">← Back</a>
|
||||
<h1 className="text-2xl font-bold text-gray-900">Adding {name}…</h1>
|
||||
</div>
|
||||
<CityIngestProgress jobId={jobId} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="max-w-2xl mx-auto">
|
||||
<h1 className="text-2xl font-bold text-gray-900 mb-2">Add City</h1>
|
||||
<p className="text-sm text-gray-500 mb-6">
|
||||
Search for a city to configure and start ingestion.
|
||||
</p>
|
||||
|
||||
{error && (
|
||||
<div className="mb-4 p-3 bg-red-50 rounded text-sm text-red-700">{error}</div>
|
||||
)}
|
||||
|
||||
<div className="card space-y-5">
|
||||
{/* Geocoder + map */}
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-2">
|
||||
City Boundary{" "}
|
||||
<span className="text-gray-400 font-normal">(optional — auto-fills name, slug & country)</span>
|
||||
<span className="text-gray-400 font-normal">(optional — auto-fills fields below)</span>
|
||||
</label>
|
||||
<LocationSelector
|
||||
regionGeometry={region.geometry}
|
||||
onBoundaryChange={handleBoundaryChange}
|
||||
onResultSelect={handleResultSelect}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Name + Slug */}
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">
|
||||
Display Name
|
||||
</label>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">Display Name</label>
|
||||
<input
|
||||
value={name}
|
||||
onChange={(e) => setName(e.target.value)}
|
||||
placeholder="Amsterdam"
|
||||
className="block w-full rounded-md border border-gray-300 px-3 py-2 text-sm focus:border-brand-500 focus:outline-none focus:ring-1 focus:ring-brand-500"
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -555,138 +404,55 @@ function ConfirmStep({
|
|||
</label>
|
||||
<input
|
||||
value={slug}
|
||||
onChange={(e) =>
|
||||
setSlug(e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, "-"))
|
||||
}
|
||||
onChange={(e) => setSlug(e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, "-"))}
|
||||
placeholder="amsterdam"
|
||||
className="block w-full rounded-md border border-gray-300 px-3 py-2 text-sm font-mono focus:border-brand-500 focus:outline-none focus:ring-1 focus:ring-brand-500"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="w-40">
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">
|
||||
Country
|
||||
</label>
|
||||
<select
|
||||
value={countryCode}
|
||||
onChange={(e) => setCountryCode(e.target.value)}
|
||||
className="block w-full rounded-md border border-gray-300 px-3 py-2 text-sm focus:border-brand-500 focus:outline-none focus:ring-1 focus:ring-brand-500"
|
||||
{/* Country + derived OSM source */}
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">Country</label>
|
||||
<select
|
||||
value={countryCode}
|
||||
onChange={(e) => setCountryCode(e.target.value)}
|
||||
className="block w-full rounded-md border border-gray-300 px-3 py-2 text-sm focus:border-brand-500 focus:outline-none focus:ring-1 focus:ring-brand-500"
|
||||
>
|
||||
<option value="">— no transit —</option>
|
||||
{COUNTRIES.map((c) => (
|
||||
<option key={c.code} value={c.code}>{c.label}</option>
|
||||
))}
|
||||
</select>
|
||||
{!countryCode && (
|
||||
<p className="mt-1 text-xs text-amber-600">No transit scoring without a country.</p>
|
||||
)}
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-700 mb-1">OSM Source</label>
|
||||
{geofabrikUrl ? (
|
||||
<div className="rounded-md border border-green-200 bg-green-50 px-3 py-2 text-xs text-green-800 break-all leading-relaxed">
|
||||
{geofabrikUrl.replace("https://download.geofabrik.de/", "")}
|
||||
</div>
|
||||
) : (
|
||||
<div className="rounded-md border border-gray-200 bg-gray-50 px-3 py-2 text-xs text-gray-400">
|
||||
{matchedRegion === null && name ? "No Geofabrik region found" : "Select a city above"}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex justify-end pt-1">
|
||||
<button
|
||||
onClick={handleSubmit}
|
||||
disabled={loading || !slug || !name || !geofabrikUrl}
|
||||
className="btn-primary"
|
||||
>
|
||||
<option value="">— no transit —</option>
|
||||
<option value="DE">🇩🇪 Germany</option>
|
||||
<option value="NL">🇳🇱 Netherlands</option>
|
||||
<option value="DK">🇩🇰 Denmark</option>
|
||||
</select>
|
||||
{!countryCode && (
|
||||
<p className="mt-1 text-xs text-amber-600">
|
||||
No transit scoring without a country.
|
||||
</p>
|
||||
)}
|
||||
{loading ? "Starting…" : "Start Ingestion"}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="bg-gray-50 rounded-md p-3">
|
||||
<p className="text-xs text-gray-500 font-medium mb-1">Source URL</p>
|
||||
<p className="text-xs text-gray-700 break-all">
|
||||
{region.properties.urls.pbf}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex gap-3 mt-6">
|
||||
<button onClick={onBack} className="btn-secondary">
|
||||
Back
|
||||
</button>
|
||||
<button
|
||||
onClick={async () => {
|
||||
setLoading(true);
|
||||
await onConfirm(slug, name, countryCode, boundary);
|
||||
setLoading(false);
|
||||
}}
|
||||
disabled={loading || !slug || !name}
|
||||
className="btn-primary"
|
||||
>
|
||||
{loading ? "Starting…" : "Start Ingestion"}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// ─── Progress step ────────────────────────────────────────────────────────────
|
||||
|
||||
|
||||
|
||||
// ─── Main page ────────────────────────────────────────────────────────────────
|
||||
|
||||
export default function AddCityPage() {
|
||||
const [step, setStep] = useState<Step>("browse");
|
||||
const [selected, setSelected] = useState<GeofabrikFeature | null>(null);
|
||||
const [jobId, setJobId] = useState<string | null>(null);
|
||||
const [ingestError, setIngestError] = useState<string | null>(null);
|
||||
|
||||
const handleConfirm = async (
|
||||
slug: string,
|
||||
name: string,
|
||||
countryCode: string,
|
||||
boundary: { type: string; coordinates: unknown } | null,
|
||||
) => {
|
||||
setIngestError(null);
|
||||
try {
|
||||
const res = await fetch("/api/admin/cities", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify({
|
||||
slug,
|
||||
name,
|
||||
countryCode,
|
||||
geofabrikUrl: selected!.properties.urls.pbf,
|
||||
...(boundary ? { boundary } : {}),
|
||||
}),
|
||||
});
|
||||
if (!res.ok) {
|
||||
const data = await res.json();
|
||||
setIngestError(data.error ?? "Failed to start ingestion");
|
||||
return;
|
||||
}
|
||||
const data = await res.json();
|
||||
setJobId(data.jobId);
|
||||
setStep("ingest");
|
||||
} catch (e) {
|
||||
setIngestError(String(e));
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="max-w-3xl mx-auto">
|
||||
<h1 className="text-2xl font-bold text-gray-900 mb-2">Add City</h1>
|
||||
<p className="text-sm text-gray-500 mb-6">
|
||||
Select an OpenStreetMap region to import for 15-minute city analysis.
|
||||
</p>
|
||||
|
||||
<StepIndicator current={step} />
|
||||
|
||||
{ingestError && (
|
||||
<div className="mb-4 p-3 bg-red-50 rounded text-sm text-red-700">
|
||||
{ingestError}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{step === "browse" && (
|
||||
<GeofabrikBrowser
|
||||
onSelect={(f) => {
|
||||
setSelected(f);
|
||||
setStep("confirm");
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{step === "confirm" && selected && (
|
||||
<ConfirmStep
|
||||
region={selected}
|
||||
onBack={() => setStep("browse")}
|
||||
onConfirm={handleConfirm}
|
||||
/>
|
||||
)}
|
||||
{step === "ingest" && <CityIngestProgress jobId={jobId} />}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue