fix(sf-fe): /site-finder — adapt B1 response shape (markers invisible) + restore CadInput #349
2 changed files with 35 additions and 3 deletions
|
|
@ -2,8 +2,10 @@
|
||||||
|
|
||||||
import dynamic from "next/dynamic";
|
import dynamic from "next/dynamic";
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { CadInput } from "@/components/site-finder/CadInput";
|
||||||
import { MapFilterBar } from "@/components/site-finder/entry/MapFilterBar";
|
import { MapFilterBar } from "@/components/site-finder/entry/MapFilterBar";
|
||||||
import { ParcelDrawer } from "@/components/site-finder/entry/ParcelDrawer";
|
import { ParcelDrawer } from "@/components/site-finder/entry/ParcelDrawer";
|
||||||
import { ParcelLegend } from "@/components/site-finder/entry/ParcelLegend";
|
import { ParcelLegend } from "@/components/site-finder/entry/ParcelLegend";
|
||||||
|
|
@ -68,6 +70,7 @@ function FilterBarBridge({ filters, onChange, bbox }: FilterBarBridgeProps) {
|
||||||
// ── Page ──────────────────────────────────────────────────────────────────────
|
// ── Page ──────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
export default function SiteFinderPage() {
|
export default function SiteFinderPage() {
|
||||||
|
const router = useRouter();
|
||||||
const [filters, setFilters] = useState<ParcelBboxFilters>({});
|
const [filters, setFilters] = useState<ParcelBboxFilters>({});
|
||||||
const [selectedParcel, setSelectedParcel] = useState<ParcelBboxItem | null>(
|
const [selectedParcel, setSelectedParcel] = useState<ParcelBboxItem | null>(
|
||||||
null,
|
null,
|
||||||
|
|
@ -82,6 +85,10 @@ export default function SiteFinderPage() {
|
||||||
setSelectedParcel(null);
|
setSelectedParcel(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleCadSubmit(cad: string) {
|
||||||
|
router.push(`/site-finder/analysis/${encodeURIComponent(cad)}`);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<main
|
<main
|
||||||
style={{
|
style={{
|
||||||
|
|
@ -172,6 +179,7 @@ export default function SiteFinderPage() {
|
||||||
overflowY: "auto",
|
overflowY: "auto",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
|
<CadInput onSubmit={handleCadSubmit} loading={false} />
|
||||||
<RecentParcels />
|
<RecentParcels />
|
||||||
<ParcelLegend />
|
<ParcelLegend />
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -173,9 +173,33 @@ export function useParcelsBboxQuery(
|
||||||
if (filters.district) params.set("district", filters.district);
|
if (filters.district) params.set("district", filters.district);
|
||||||
if (filters.vri) params.set("vri", filters.vri);
|
if (filters.vri) params.set("vri", filters.vri);
|
||||||
|
|
||||||
return apiFetch<ParcelBboxItem[]>(
|
// Backend returns { parcels, count, limit, bbox_area_km2 } with field
|
||||||
`/api/v1/parcels/by-bbox?${params.toString()}`,
|
// names centroid_lat/centroid_lon/area_m2 and nullable status. Adapt to
|
||||||
);
|
// the flat ParcelBboxItem[] shape the map components consume. district /
|
||||||
|
// vri / address are not in B1 yet — defaulted until enrichment lands.
|
||||||
|
const raw = await apiFetch<{
|
||||||
|
parcels: Array<{
|
||||||
|
cad_num: string;
|
||||||
|
centroid_lat: number;
|
||||||
|
centroid_lon: number;
|
||||||
|
area_m2: number | null;
|
||||||
|
land_category: string | null;
|
||||||
|
status: ParcelStatus | null;
|
||||||
|
}>;
|
||||||
|
}>(`/api/v1/parcels/by-bbox?${params.toString()}`);
|
||||||
|
|
||||||
|
const adapted: ParcelBboxItem[] = raw.parcels.map((p) => ({
|
||||||
|
cad_num: p.cad_num,
|
||||||
|
lat: p.centroid_lat,
|
||||||
|
lon: p.centroid_lon,
|
||||||
|
area_ha: p.area_m2 != null ? p.area_m2 / 10000 : 0,
|
||||||
|
status: p.status ?? "free",
|
||||||
|
district: "—",
|
||||||
|
vri: "other",
|
||||||
|
address: "",
|
||||||
|
}));
|
||||||
|
// Apply filters client-side until backend supports them (B1 follow-up)
|
||||||
|
return applyFilters(adapted, filters);
|
||||||
},
|
},
|
||||||
enabled: MOCK_PARCELS_BBOX || bbox != null,
|
enabled: MOCK_PARCELS_BBOX || bbox != null,
|
||||||
staleTime: 30_000,
|
staleTime: 30_000,
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue