Merge pull request #24 from YuWei-CH/Map-Dev

YuWei-CH · web-flow · commit 3f46f17fa74a · 2026-02-06T10:50:03.000-06:00
Map dev
diff --git a/backend/app/main.py b/backend/app/main.py
@@ -24,7 +24,7 @@
     reverse_geocode,
     rough_location_from_address,
 )
-from .models import Listing, Target, Workspace
+from .models import InterestingTarget, Listing, Target, Workspace
 from .openrouter import (
     extract_housing_post,
     OpenRouterConfigError,
@@ -39,6 +39,8 @@
     ListingSummaryOut,
     ListingUpsert,
     ReverseGeocodeOut,
+    InterestingTargetOut,
+    InterestingTargetUpsert,
     TargetOut,
     TargetUpsert,
     WorkspaceIssueOut,
@@ -497,6 +499,105 @@ def list_targets(db: DbDep, ws: WorkspaceDep) -> list[Target]:
     )
 
 
+@app.post("/api/interesting_targets", response_model=InterestingTargetOut)
+def upsert_interesting_target(
+    payload: InterestingTargetUpsert,
+    db: DbDep,
+    ws: WorkspaceDep,
+) -> InterestingTarget:
+    now = _utcnow()
+
+    lat = payload.lat
+    lng = payload.lng
+    address = payload.address.strip() if isinstance(payload.address, str) else None
+    if address == "":
+        address = None
+
+    if lat is None or lng is None:
+        try:
+            candidates = geocode_address(address or "", limit=1)
+        except HTTPError as e:
+            raise HTTPException(status_code=502, detail=str(e)) from e
+        except GeocodingConfigError as e:
+            raise HTTPException(status_code=500, detail=str(e)) from e
+        except GeocodingProviderError as e:
+            raise HTTPException(status_code=502, detail=str(e)) from e
+        if not candidates:
+            raise HTTPException(status_code=404, detail="Address not found")
+        lat = candidates[0].lat
+        lng = candidates[0].lng
+        if address is None:
+            address = candidates[0].display_name
+    elif address is None:
+        try:
+            rev = reverse_geocode(lat, lng, zoom=14)
+            address = rough_location_from_address(rev.address) or rev.display_name
+        except HTTPError:
+            address = None
+
+    target: InterestingTarget | None = None
+    if payload.id:
+        target = db.scalar(
+            select(InterestingTarget).where(
+                InterestingTarget.workspace_id == ws.id,
+                InterestingTarget.id == payload.id,
+            )
+        )
+
+    if target:
+        target.name = payload.name
+        target.address = address
+        target.lat = lat
+        target.lng = lng
+        target.updated_at = now
+        db.add(target)
+        db.commit()
+        db.refresh(target)
+        return target
+
+    create_kwargs = {
+        "workspace_id": ws.id,
+        "name": payload.name,
+        "address": address,
+        "lat": lat,
+        "lng": lng,
+        "updated_at": now,
+    }
+    if payload.id:
+        create_kwargs["id"] = payload.id
+    target = InterestingTarget(**create_kwargs)
+    db.add(target)
+    db.commit()
+    db.refresh(target)
+    return target
+
+
+@app.get("/api/interesting_targets", response_model=list[InterestingTargetOut])
+def list_interesting_targets(db: DbDep, ws: WorkspaceDep) -> list[InterestingTarget]:
+    return list(
+        db.scalars(
+            select(InterestingTarget)
+            .where(InterestingTarget.workspace_id == ws.id)
+            .order_by(InterestingTarget.updated_at.desc())
+        )
+    )
+
+
+@app.delete("/api/interesting_targets/{target_id}")
+def delete_interesting_target(target_id: str, db: DbDep, ws: WorkspaceDep) -> dict[str, bool]:
+    target = db.scalar(
+        select(InterestingTarget).where(
+            InterestingTarget.workspace_id == ws.id,
+            InterestingTarget.id == target_id,
+        )
+    )
+    if not target:
+        raise HTTPException(status_code=404, detail="Interesting target not found")
+    db.delete(target)
+    db.commit()
+    return {"deleted": True}
+
+
 @app.get("/api/compare", response_model=CompareResponse)
 def compare(
     db: DbDep,
diff --git a/backend/app/models.py b/backend/app/models.py
@@ -76,3 +76,19 @@ class Target(Base):
     updated_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), nullable=False, default=_utcnow
     )
+
+
+class InterestingTarget(Base):
+    __tablename__ = "interesting_targets"
+
+    id: Mapped[str] = mapped_column(String(36), primary_key=True, default=_uuid_str)
+    workspace_id: Mapped[str] = mapped_column(
+        String(36), ForeignKey("workspaces.id", ondelete="CASCADE"), nullable=False, index=True
+    )
+    name: Mapped[str] = mapped_column(String(256), nullable=False)
+    address: Mapped[str | None] = mapped_column(String(512))
+    lat: Mapped[float] = mapped_column(Float, nullable=False)
+    lng: Mapped[float] = mapped_column(Float, nullable=False)
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), nullable=False, default=_utcnow
+    )
diff --git a/backend/app/schemas.py b/backend/app/schemas.py
@@ -109,6 +109,40 @@ class TargetOut(BaseModel):
     updated_at: datetime
 
 
+class InterestingTargetUpsert(BaseModel):
+    id: str | None = None
+    name: str = Field(min_length=1, max_length=256)
+    address: str | None = Field(default=None, max_length=512)
+    lat: float | None = None
+    lng: float | None = None
+
+    @model_validator(mode="after")
+    def _validate_location(self) -> "InterestingTargetUpsert":
+        has_lat = self.lat is not None
+        has_lng = self.lng is not None
+        has_address = self.address is not None and self.address.strip() != ""
+        has_coords = has_lat and has_lng
+
+        if has_lat != has_lng:
+            raise ValueError("lat and lng must be provided together")
+        if has_address and has_coords:
+            raise ValueError("Provide either address, or both lat and lng (not both)")
+        if not (has_address or has_coords):
+            raise ValueError("Provide either address, or both lat and lng")
+        return self
+
+
+class InterestingTargetOut(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: str
+    name: str
+    address: str | None
+    lat: float
+    lng: float
+    updated_at: datetime
+
+
 class Metrics(BaseModel):
     distance_km: float | None = None
 
diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -102,6 +102,47 @@
   color: #0f172a;
 }
 
+.typeaheadHint {
+  margin-top: 4px;
+  font-size: 12px;
+  color: #64748b;
+}
+
+.typeaheadMenu {
+  margin-top: 4px;
+  max-height: 180px;
+  overflow: auto;
+  border: 1px solid #cbd5e1;
+  border-radius: 8px;
+  background: #ffffff;
+}
+
+.typeaheadItem {
+  width: 100%;
+  border: 0;
+  border-bottom: 1px solid #f1f5f9;
+  background: #ffffff;
+  padding: 8px 10px;
+  text-align: left;
+  font-size: 12px;
+  color: #0f172a;
+  cursor: pointer;
+}
+
+.typeaheadItem:last-child {
+  border-bottom: 0;
+}
+
+.typeaheadItem:hover {
+  background: #f8fafc;
+}
+
+.typeaheadEmpty {
+  margin-top: 4px;
+  font-size: 12px;
+  color: #64748b;
+}
+
 .actions {
   display: flex;
   gap: 8px;
diff --git a/frontend/src/MapView.tsx b/frontend/src/MapView.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
 
-import type { CompareItem, Target } from './api'
+import type { CompareItem, InterestingTarget, Target } from './api'
 import { DISABLE_GOOGLE_MAPS } from './config'
 import { loadGoogleMaps } from './googleMaps'
 
@@ -17,6 +17,7 @@ type Props = {
   target: Target | null
   initialCenter: { lat: number; lng: number } | null
   items: CompareItem[]
+  interestingTargets: InterestingTarget[]
   selectedListingId: string | null
   onSelectListingId: (id: string) => void
   isPickingTarget: boolean
@@ -56,7 +57,14 @@ const LAPTOP_PIN_SVG = `
 </svg>
 `.trim()
 
-function markerIcon(kind: 'target' | 'listing', opts?: { selected?: boolean }) {
+const INTERESTING_PIN_SVG = `
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <circle cx="12" cy="12" r="10" fill="#16a34a" stroke="rgba(255,255,255,0.95)" stroke-width="2" />
+  <path d="M12 6.8l1.6 3.2 3.5.5-2.5 2.4.6 3.4L12 14.7l-3.2 1.7.6-3.4-2.5-2.4 3.5-.5L12 6.8Z" fill="none" stroke="#ffffff" stroke-width="1.5" stroke-linejoin="round" />
+</svg>
+`.trim()
+
+function markerIcon(kind: 'target' | 'listing' | 'interesting', opts?: { selected?: boolean }) {
   const selected = opts?.selected ?? false
   if (kind === 'target') {
     return {
@@ -65,6 +73,13 @@ function markerIcon(kind: 'target' | 'listing', opts?: { selected?: boolean }) {
       anchor: new google.maps.Point(20, 20),
     }
   }
+  if (kind === 'interesting') {
+    return {
+      url: svgUrl(INTERESTING_PIN_SVG),
+      scaledSize: new google.maps.Size(30, 30),
+      anchor: new google.maps.Point(15, 15),
+    }
+  }
   const size = selected ? 34 : 30
   return {
     url: svgUrl(selected ? HOUSE_PIN_SVG_SELECTED : HOUSE_PIN_SVG),
@@ -77,6 +92,7 @@ export default function MapView({
   target,
   initialCenter,
   items,
+  interestingTargets,
   selectedListingId,
   onSelectListingId,
   isPickingTarget,
@@ -118,8 +134,14 @@ export default function MapView({
               lat: target.lat,
             },
           ]
-    return [...targetPoint, ...listingPoints]
-  }, [items, target])
+    const interestingPoints = interestingTargets.map((it) => ({
+      id: it.id,
+      kind: 'interesting' as const,
+      lng: it.lng,
+      lat: it.lat,
+    }))
+    return [...targetPoint, ...interestingPoints, ...listingPoints]
+  }, [interestingTargets, items, target])
 
   useEffect(() => {
     if (!containerRef.current) return
@@ -191,7 +213,7 @@ export default function MapView({
         position: { lat: p.lat, lng: p.lng },
         icon: markerIcon(p.kind, { selected: isSelected }),
         clickable: p.kind === 'listing' && !isPickingTarget,
-        zIndex: p.kind === 'target' ? 3 : isSelected ? 2 : 1,
+        zIndex: p.kind === 'target' ? 3 : p.kind === 'interesting' ? 2 : isSelected ? 2 : 1,
       })
       if (p.kind === 'listing' && !isPickingTarget) {
         marker.addListener('click', () => onSelectListingId(p.id))
diff --git a/frontend/src/api.ts b/frontend/src/api.ts
@@ -70,6 +70,15 @@ export type Target = {
   updated_at: string
 }
 
+export type InterestingTarget = {
+  id: string
+  name: string
+  address: string | null
+  lat: number
+  lng: number
+  updated_at: string
+}
+
 export type CompareItem = {
   listing: Listing
   metrics: { distance_km: number | null }
@@ -147,6 +156,40 @@ export async function upsertTarget(payload: {
   return (await parseJsonOrThrow(res)) as Target
 }
 
+export async function upsertInterestingTarget(payload: {
+  id?: string
+  name: string
+  address?: string
+  lat?: number
+  lng?: number
+}): Promise<InterestingTarget> {
+  const res = await fetchWithTimeout(apiUrl('/api/interesting_targets'), {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json', ...authHeaders() },
+    body: JSON.stringify(payload),
+  })
+  return (await parseJsonOrThrow(res)) as InterestingTarget
+}
+
+export async function listInterestingTargets(): Promise<InterestingTarget[]> {
+  const res = await fetchWithTimeout(apiUrl('/api/interesting_targets'), {
+    method: 'GET',
+    headers: authHeaders(),
+  })
+  return (await parseJsonOrThrow(res)) as InterestingTarget[]
+}
+
+export async function deleteInterestingTarget(id: string): Promise<void> {
+  const res = await fetchWithTimeout(
+    apiUrl(`/api/interesting_targets/${encodeURIComponent(id)}`),
+    {
+      method: 'DELETE',
+      headers: authHeaders(),
+    },
+  )
+  await parseJsonOrThrow(res)
+}
+
 export async function fetchCompare(targetId?: string): Promise<CompareResponse> {
   const url = new URL(apiUrl('/api/compare'))
   if (targetId) url.searchParams.set('target_id', targetId)
diff --git a/frontend/src/pages/ComparePage.tsx b/frontend/src/pages/ComparePage.tsx
