coderuday21 Cursor commited on
Commit
669f7f8
·
1 Parent(s): 7eb5b75

Add Phase 5 viewer modes and Phase 6 region review with dept export.

Browse files

T1/T2/Overlay view tabs, Confirm/False Positive per region, CSV export, and configurable DEPT_API submit on dev Space.

Co-authored-by: Cursor <cursoragent@cursor.com>

.env.example CHANGED
@@ -28,3 +28,7 @@
28
 
29
  # Hugging Face model cache directory
30
  # HF_HOME=./.hf_cache
 
 
 
 
 
28
 
29
  # Hugging Face model cache directory
30
  # HF_HOME=./.hf_cache
31
+
32
+ # Department export API (optional — FR-08)
33
+ # DEPT_API_URL=https://dept.example.gov/api/changes
34
+ # DEPT_API_KEY=your-api-key
DEV_SETUP.md CHANGED
@@ -157,6 +157,7 @@ Expected: `"appMode": "dda"`, `"status": "ok"`.
157
  2. **Change Detection** — pick Base (T1) and Comparison (T2), run detection (async jobs on HF; sync locally).
158
  3. **Reports** — history, PDF download, browser report at `/dda/reports/{id}`.
159
  4. **Bell icon** — in-app notifications for completed jobs.
 
160
 
161
  ---
162
 
 
157
  2. **Change Detection** — pick Base (T1) and Comparison (T2), run detection (async jobs on HF; sync locally).
158
  3. **Reports** — history, PDF download, browser report at `/dda/reports/{id}`.
159
  4. **Bell icon** — in-app notifications for completed jobs.
160
+ 5. **Review (FR-08)** — Confirm / False Positive per region, export confirmed CSV, submit to dept API (`DEPT_API_URL`).
161
 
162
  ---
163
 
Dockerfile CHANGED
@@ -21,7 +21,7 @@ WORKDIR /app
21
 
22
  # Build-time info + cache-bust:
23
  # Changing APP_BUILD forces Docker to re-run subsequent layers (including pip install).
24
- ARG APP_BUILD=34
25
  ENV MAX_GEOTIFF_MB=5120
26
  ENV APP_BUILD=${APP_BUILD}
27
  ENV GDAL_CONFIG=/usr/bin/gdal-config
 
21
 
22
  # Build-time info + cache-bust:
23
  # Changing APP_BUILD forces Docker to re-run subsequent layers (including pip install).
24
+ ARG APP_BUILD=35
25
  ENV MAX_GEOTIFF_MB=5120
26
  ENV APP_BUILD=${APP_BUILD}
27
  ENV GDAL_CONFIG=/usr/bin/gdal-config
app/dda/bootstrap.py CHANGED
@@ -9,6 +9,7 @@ from .jobs_routes import router as jobs_router
9
  from .library_routes import router as library_router
10
  from .local_routes import router as local_router
11
  from .reports_routes import router as reports_router
 
12
  from .seed import seed_delhi_hierarchy
13
 
14
  logger = logging.getLogger(__name__)
@@ -57,5 +58,6 @@ def setup_dda(app: FastAPI) -> None:
57
  app.include_router(library_router, prefix="/api/dda", tags=["dda"])
58
  app.include_router(jobs_router, prefix="/api/dda", tags=["dda-jobs"])
59
  app.include_router(reports_router, prefix="/api/dda", tags=["dda-reports"])
 
60
  app.include_router(local_router, prefix="/api/dda", tags=["dda-local"])
61
- logger.info("APP_MODE=dda — DDA routes enabled (library, jobs, reports, local folder)")
 
9
  from .library_routes import router as library_router
10
  from .local_routes import router as local_router
11
  from .reports_routes import router as reports_router
12
+ from .review_routes import router as review_router
13
  from .seed import seed_delhi_hierarchy
14
 
15
  logger = logging.getLogger(__name__)
 
58
  app.include_router(library_router, prefix="/api/dda", tags=["dda"])
59
  app.include_router(jobs_router, prefix="/api/dda", tags=["dda-jobs"])
60
  app.include_router(reports_router, prefix="/api/dda", tags=["dda-reports"])
61
+ app.include_router(review_router, prefix="/api/dda", tags=["dda-review"])
62
  app.include_router(local_router, prefix="/api/dda", tags=["dda-local"])
63
+ logger.info("APP_MODE=dda — DDA routes enabled (library, jobs, reports, review, local folder)")
app/dda/dept_export.py ADDED
@@ -0,0 +1,152 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ """Department export adapter — API or file fallback (FR-08)."""
2
+ from __future__ import annotations
3
+
4
+ import csv
5
+ import io
6
+ import json
7
+ import logging
8
+ import os
9
+ from dataclasses import dataclass
10
+ from typing import Any, Dict, List, Optional
11
+
12
+ import requests
13
+
14
+ from ..models import DetectionRun
15
+
16
+ logger = logging.getLogger(__name__)
17
+
18
+ DEPT_API_URL = os.environ.get("DEPT_API_URL", "").strip()
19
+ DEPT_API_KEY = os.environ.get("DEPT_API_KEY", "").strip()
20
+
21
+
22
+ @dataclass
23
+ class ExportResult:
24
+ ok: bool
25
+ mode: str # api | file
26
+ message: str
27
+ submitted_count: int = 0
28
+ download_path: Optional[str] = None
29
+ detail: Optional[Dict[str, Any]] = None
30
+
31
+
32
+ def regions_to_csv_rows(run: DetectionRun, regions: List[dict]) -> str:
33
+ """Build CSV string for export."""
34
+ buf = io.StringIO()
35
+ writer = csv.writer(buf)
36
+ writer.writerow([
37
+ "run_id", "run_title", "zone", "village", "region_id",
38
+ "dda_change_type", "internal_type", "confidence", "area_px",
39
+ "latitude", "longitude", "area_sq_m", "review_status", "notes",
40
+ ])
41
+ for r in regions:
42
+ lat = r.get("latitude") or (r.get("latLng") or {}).get("lat")
43
+ lng = r.get("longitude") or (r.get("latLng") or {}).get("lng")
44
+ writer.writerow([
45
+ run.id,
46
+ run.title,
47
+ run.zone or "",
48
+ run.village or "",
49
+ r.get("id", ""),
50
+ r.get("ddaChangeType") or "",
51
+ r.get("internalObjectType") or r.get("objectType") or "",
52
+ f'{(r.get("confidence") or 0):.4f}',
53
+ r.get("area", ""),
54
+ lat if lat is not None else "",
55
+ lng if lng is not None else "",
56
+ r.get("areaSqM") if r.get("areaSqM") is not None else "",
57
+ r.get("reviewStatus") or "pending",
58
+ r.get("reviewNotes") or "",
59
+ ])
60
+ return buf.getvalue()
61
+
62
+
63
+ class FileExporter:
64
+ """Fallback — client downloads CSV via API."""
65
+
66
+ def submit(self, run: DetectionRun, regions: List[dict]) -> ExportResult:
67
+ if not regions:
68
+ return ExportResult(
69
+ ok=False,
70
+ mode="file",
71
+ message="No confirmed regions to export.",
72
+ submitted_count=0,
73
+ )
74
+ return ExportResult(
75
+ ok=True,
76
+ mode="file",
77
+ message=f"{len(regions)} confirmed region(s) ready for CSV download.",
78
+ submitted_count=len(regions),
79
+ download_path=f"/api/dda/reports/{run.id}/export.csv?confirmed=1",
80
+ )
81
+
82
+
83
+ class ApiExporter:
84
+ """POST confirmed changes to departmental API."""
85
+
86
+ def __init__(self, url: str, api_key: str = ""):
87
+ self.url = url.rstrip("/")
88
+ self.api_key = api_key
89
+
90
+ def submit(self, run: DetectionRun, regions: List[dict]) -> ExportResult:
91
+ if not regions:
92
+ return ExportResult(
93
+ ok=False,
94
+ mode="api",
95
+ message="No confirmed regions to submit.",
96
+ )
97
+ payload = {
98
+ "runId": run.id,
99
+ "title": run.title,
100
+ "zone": run.zone or "",
101
+ "village": run.village or "",
102
+ "changePercentage": run.change_percentage,
103
+ "regions": [
104
+ {
105
+ "id": r.get("id"),
106
+ "ddaChangeType": r.get("ddaChangeType"),
107
+ "objectType": r.get("objectType"),
108
+ "confidence": r.get("confidence"),
109
+ "area": r.get("area"),
110
+ "latitude": r.get("latitude") or (r.get("latLng") or {}).get("lat"),
111
+ "longitude": r.get("longitude") or (r.get("latLng") or {}).get("lng"),
112
+ "areaSqM": r.get("areaSqM"),
113
+ }
114
+ for r in regions
115
+ ],
116
+ }
117
+ headers = {"Content-Type": "application/json", "Accept": "application/json"}
118
+ if self.api_key:
119
+ headers["Authorization"] = f"Bearer {self.api_key}"
120
+ try:
121
+ resp = requests.post(self.url, json=payload, headers=headers, timeout=60)
122
+ if 200 <= resp.status_code < 300:
123
+ detail = None
124
+ try:
125
+ detail = resp.json()
126
+ except Exception:
127
+ detail = {"body": resp.text[:500]}
128
+ return ExportResult(
129
+ ok=True,
130
+ mode="api",
131
+ message=f"Submitted {len(regions)} confirmed region(s) to departmental system.",
132
+ submitted_count=len(regions),
133
+ detail=detail,
134
+ )
135
+ return ExportResult(
136
+ ok=False,
137
+ mode="api",
138
+ message=f"Department API returned {resp.status_code}: {resp.text[:200]}",
139
+ )
140
+ except Exception as exc:
141
+ logger.exception("Department API submit failed")
142
+ return ExportResult(
143
+ ok=False,
144
+ mode="api",
145
+ message=f"Department API error: {exc}",
146
+ )
147
+
148
+
149
+ def get_exporter() -> FileExporter | ApiExporter:
150
+ if DEPT_API_URL:
151
+ return ApiExporter(DEPT_API_URL, DEPT_API_KEY)
152
+ return FileExporter()
app/dda/jobs_routes.py CHANGED
@@ -132,6 +132,8 @@ def _run_detail(db: Session, run: DetectionRun, user_id: int) -> dict:
132
  raise HTTPException(status_code=403, detail="Not allowed")
133
 
134
  regions = json.loads(run.regions_json or "[]")
 
 
135
  overlay_b64 = ""
136
  if run.overlay_path:
137
  overlay_file = DATA_DIR / run.overlay_path
 
132
  raise HTTPException(status_code=403, detail="Not allowed")
133
 
134
  regions = json.loads(run.regions_json or "[]")
135
+ from .review_service import merge_reviews
136
+ regions = merge_reviews(db, run.id, regions)
137
  overlay_b64 = ""
138
  if run.overlay_path:
139
  overlay_file = DATA_DIR / run.overlay_path
app/dda/models.py CHANGED
@@ -88,3 +88,18 @@ class DetectionJob(Base):
88
  started_at = Column(DateTime, nullable=True)
89
  completed_at = Column(DateTime, nullable=True)
90
  created_at = Column(DateTime, default=_utcnow)
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
88
  started_at = Column(DateTime, nullable=True)
89
  completed_at = Column(DateTime, nullable=True)
90
  created_at = Column(DateTime, default=_utcnow)
91
+
92
+
93
+ class RegionReview(Base):
94
+ """Per-region human review state (FR-08)."""
95
+ __tablename__ = "dda_region_reviews"
96
+
97
+ id = Column(Integer, primary_key=True, index=True)
98
+ run_id = Column(Integer, ForeignKey("detection_runs.id"), nullable=False, index=True)
99
+ region_id = Column(Integer, nullable=False, index=True)
100
+ status = Column(String(32), default="pending") # pending|confirmed|false_positive|submitted
101
+ reviewer_id = Column(Integer, ForeignKey("users.id"), nullable=True)
102
+ notes = Column(Text, default="")
103
+ reviewed_at = Column(DateTime, nullable=True)
104
+ submitted_at = Column(DateTime, nullable=True)
105
+ created_at = Column(DateTime, default=_utcnow)
app/dda/report_pdf.py CHANGED
@@ -17,8 +17,9 @@ def _safe_filename(title: str, run_id: int) -> str:
17
  return f"DDA_Report_{run_id}_{base}.pdf"
18
 
19
 
20
- def build_report_dict(run: DetectionRun, *, include_overlay_b64: bool = False) -> Dict[str, Any]:
21
- regions: List[dict] = json.loads(run.regions_json or "[]")
 
22
  payload: Dict[str, Any] = {
23
  "id": run.id,
24
  "title": run.title,
 
17
  return f"DDA_Report_{run_id}_{base}.pdf"
18
 
19
 
20
+ def build_report_dict(run: DetectionRun, *, include_overlay_b64: bool = False, regions: Optional[List[dict]] = None) -> Dict[str, Any]:
21
+ if regions is None:
22
+ regions = json.loads(run.regions_json or "[]")
23
  payload: Dict[str, Any] = {
24
  "id": run.id,
25
  "title": run.title,
app/dda/reports_routes.py CHANGED
@@ -15,6 +15,7 @@ from ..models import DetectionRun
15
  from ..notifier import send_notification
16
  from .config import get_public_base_url
17
  from .report_pdf import build_report_dict, generate_report_pdf
 
18
 
19
  logger = logging.getLogger(__name__)
20
  router = APIRouter()
@@ -42,7 +43,8 @@ def get_report(run_id: int, db: Session = Depends(get_db)):
42
  _require_dda()
43
  user = get_or_create_guest_user(db)
44
  run = _get_user_run(db, run_id, user.id)
45
- data = build_report_dict(run, include_overlay_b64=True)
 
46
  data["reportUrl"] = f"{get_public_base_url()}/dda/reports/{run.id}"
47
  return data
48
 
 
15
  from ..notifier import send_notification
16
  from .config import get_public_base_url
17
  from .report_pdf import build_report_dict, generate_report_pdf
18
+ from .review_service import load_regions, merge_reviews
19
 
20
  logger = logging.getLogger(__name__)
21
  router = APIRouter()
 
43
  _require_dda()
44
  user = get_or_create_guest_user(db)
45
  run = _get_user_run(db, run_id, user.id)
46
+ regions = merge_reviews(db, run.id, load_regions(run))
47
+ data = build_report_dict(run, include_overlay_b64=True, regions=regions)
48
  data["reportUrl"] = f"{get_public_base_url()}/dda/reports/{run.id}"
49
  return data
50
 
app/dda/review_routes.py ADDED
@@ -0,0 +1,139 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ """Region review and departmental export API (FR-08)."""
2
+ from __future__ import annotations
3
+
4
+ import logging
5
+ from typing import Optional
6
+
7
+ from fastapi import APIRouter, Depends, HTTPException, Query
8
+ from fastapi.responses import Response
9
+ from pydantic import BaseModel
10
+ from sqlalchemy.orm import Session
11
+
12
+ from ..auth import get_or_create_guest_user
13
+ from ..database import get_db
14
+ from ..models import DetectionRun
15
+ from .dept_export import ExportResult, get_exporter, regions_to_csv_rows
16
+ from .review_service import (
17
+ filter_regions_by_review,
18
+ load_regions,
19
+ mark_confirmed_submitted,
20
+ merge_reviews,
21
+ review_summary,
22
+ set_region_review,
23
+ )
24
+
25
+ logger = logging.getLogger(__name__)
26
+ router = APIRouter()
27
+
28
+
29
+ def _require_dda():
30
+ from .config import IS_DDA_MODE
31
+ if not IS_DDA_MODE:
32
+ raise HTTPException(status_code=404, detail="DDA mode is not enabled")
33
+
34
+
35
+ def _get_user_run(db: Session, run_id: int, user_id: int) -> DetectionRun:
36
+ run = db.query(DetectionRun).filter(
37
+ DetectionRun.id == run_id,
38
+ DetectionRun.user_id == user_id,
39
+ ).first()
40
+ if not run:
41
+ raise HTTPException(status_code=404, detail="Report not found")
42
+ return run
43
+
44
+
45
+ class RegionReviewBody(BaseModel):
46
+ reviewStatus: str
47
+ notes: Optional[str] = ""
48
+
49
+
50
+ @router.patch("/reports/{run_id}/regions/{region_id}")
51
+ def patch_region_review(
52
+ run_id: int,
53
+ region_id: int,
54
+ body: RegionReviewBody,
55
+ db: Session = Depends(get_db),
56
+ ):
57
+ """Mark a region as confirmed or false positive."""
58
+ _require_dda()
59
+ user = get_or_create_guest_user(db)
60
+ run = _get_user_run(db, run_id, user.id)
61
+ if body.reviewStatus not in ("confirmed", "false_positive", "pending"):
62
+ raise HTTPException(status_code=400, detail="reviewStatus must be confirmed, false_positive, or pending")
63
+ try:
64
+ updated = set_region_review(
65
+ db, run, region_id, body.reviewStatus, user.id, body.notes or ""
66
+ )
67
+ except LookupError:
68
+ raise HTTPException(status_code=404, detail="Region not found")
69
+ except PermissionError as exc:
70
+ raise HTTPException(status_code=409, detail=str(exc))
71
+ except ValueError as exc:
72
+ raise HTTPException(status_code=400, detail=str(exc))
73
+ return {"ok": True, "region": updated, "summary": review_summary(merge_reviews(db, run.id, load_regions(run)))}
74
+
75
+
76
+ @router.get("/reports/{run_id}/review-summary")
77
+ def get_review_summary(run_id: int, db: Session = Depends(get_db)):
78
+ _require_dda()
79
+ user = get_or_create_guest_user(db)
80
+ run = _get_user_run(db, run_id, user.id)
81
+ regions = merge_reviews(db, run.id, load_regions(run))
82
+ return {"runId": run.id, "summary": review_summary(regions)}
83
+
84
+
85
+ @router.get("/reports/{run_id}/export.csv")
86
+ def export_csv(
87
+ run_id: int,
88
+ confirmed: int = Query(0, ge=0, le=1),
89
+ db: Session = Depends(get_db),
90
+ ):
91
+ """Export regions as CSV. Use ?confirmed=1 for confirmed-only."""
92
+ _require_dda()
93
+ user = get_or_create_guest_user(db)
94
+ run = _get_user_run(db, run_id, user.id)
95
+ regions = merge_reviews(db, run.id, load_regions(run))
96
+ if confirmed:
97
+ regions = filter_regions_by_review(regions, "confirmed")
98
+ if not regions:
99
+ raise HTTPException(status_code=404, detail="No regions to export")
100
+ csv_text = regions_to_csv_rows(run, regions)
101
+ suffix = "confirmed" if confirmed else "all"
102
+ filename = f"dda_run_{run_id}_{suffix}.csv"
103
+ return Response(
104
+ content=csv_text,
105
+ media_type="text/csv",
106
+ headers={"Content-Disposition": f'attachment; filename="{filename}"'},
107
+ )
108
+
109
+
110
+ @router.post("/reports/{run_id}/submit")
111
+ def submit_confirmed(run_id: int, db: Session = Depends(get_db)):
112
+ """Submit confirmed regions to departmental API (or file fallback)."""
113
+ _require_dda()
114
+ user = get_or_create_guest_user(db)
115
+ run = _get_user_run(db, run_id, user.id)
116
+ regions = merge_reviews(db, run.id, load_regions(run))
117
+ confirmed = filter_regions_by_review(regions, "confirmed")
118
+ if not confirmed:
119
+ raise HTTPException(status_code=400, detail="No confirmed regions to submit. Review regions first.")
120
+
121
+ exporter = get_exporter()
122
+ result: ExportResult = exporter.submit(run, confirmed)
123
+ if not result.ok:
124
+ raise HTTPException(status_code=502, detail=result.message)
125
+
126
+ submitted_ids = [int(r["id"]) for r in confirmed if r.get("id") is not None]
127
+ if result.mode == "api":
128
+ mark_confirmed_submitted(db, run.id, submitted_ids)
129
+ for r in confirmed:
130
+ r["reviewStatus"] = "submitted"
131
+
132
+ return {
133
+ "ok": True,
134
+ "mode": result.mode,
135
+ "message": result.message,
136
+ "submittedCount": result.submitted_count,
137
+ "downloadUrl": result.download_path,
138
+ "detail": result.detail,
139
+ }
app/dda/review_service.py ADDED
@@ -0,0 +1,127 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ """Merge and persist region review state (FR-08)."""
2
+ from __future__ import annotations
3
+
4
+ import json
5
+ from datetime import datetime, timezone
6
+ from typing import Any, Dict, List, Optional
7
+
8
+ from sqlalchemy.orm import Session
9
+
10
+ from ..models import DetectionRun
11
+ from .models import RegionReview
12
+
13
+ VALID_REVIEW_STATUSES = {"pending", "confirmed", "false_positive", "submitted"}
14
+
15
+
16
+ def _utcnow() -> datetime:
17
+ return datetime.now(timezone.utc)
18
+
19
+
20
+ def load_regions(run: DetectionRun) -> List[dict]:
21
+ try:
22
+ return json.loads(run.regions_json or "[]")
23
+ except json.JSONDecodeError:
24
+ return []
25
+
26
+
27
+ def save_regions(db: Session, run: DetectionRun, regions: List[dict]) -> None:
28
+ run.regions_json = json.dumps(regions)
29
+ run.regions_count = len(regions)
30
+ db.commit()
31
+
32
+
33
+ def merge_reviews(db: Session, run_id: int, regions: List[dict]) -> List[dict]:
34
+ """Attach reviewStatus / notes from RegionReview rows onto region dicts."""
35
+ reviews = {
36
+ r.region_id: r
37
+ for r in db.query(RegionReview).filter(RegionReview.run_id == run_id).all()
38
+ }
39
+ out = []
40
+ for region in regions:
41
+ rid = int(region.get("id", 0))
42
+ rev = reviews.get(rid)
43
+ merged = dict(region)
44
+ if rev:
45
+ merged["reviewStatus"] = rev.status
46
+ merged["reviewNotes"] = rev.notes or ""
47
+ merged["reviewedAt"] = rev.reviewed_at.isoformat() if rev.reviewed_at else None
48
+ else:
49
+ merged.setdefault("reviewStatus", region.get("reviewStatus", "pending"))
50
+ out.append(merged)
51
+ return out
52
+
53
+
54
+ def get_or_create_review(db: Session, run_id: int, region_id: int) -> RegionReview:
55
+ row = (
56
+ db.query(RegionReview)
57
+ .filter(RegionReview.run_id == run_id, RegionReview.region_id == region_id)
58
+ .first()
59
+ )
60
+ if row:
61
+ return row
62
+ row = RegionReview(run_id=run_id, region_id=region_id, status="pending")
63
+ db.add(row)
64
+ db.commit()
65
+ db.refresh(row)
66
+ return row
67
+
68
+
69
+ def set_region_review(
70
+ db: Session,
71
+ run: DetectionRun,
72
+ region_id: int,
73
+ review_status: str,
74
+ reviewer_id: int,
75
+ notes: str = "",
76
+ ) -> dict:
77
+ if review_status not in ("confirmed", "false_positive", "pending"):
78
+ raise ValueError(f"Invalid reviewStatus: {review_status}")
79
+
80
+ regions = load_regions(run)
81
+ region = next((r for r in regions if int(r.get("id", -1)) == region_id), None)
82
+ if not region:
83
+ raise LookupError("Region not found in run")
84
+
85
+ row = get_or_create_review(db, run.id, region_id)
86
+ if row.status == "submitted":
87
+ raise PermissionError("Region already submitted — cannot change review")
88
+
89
+ row.status = review_status
90
+ row.reviewer_id = reviewer_id
91
+ row.notes = (notes or "").strip()
92
+ row.reviewed_at = _utcnow()
93
+ db.commit()
94
+
95
+ region["reviewStatus"] = review_status
96
+ if notes:
97
+ region["reviewNotes"] = notes
98
+ save_regions(db, run, regions)
99
+ return merge_reviews(db, run.id, [region])[0]
100
+
101
+
102
+ def filter_regions_by_review(regions: List[dict], status: str) -> List[dict]:
103
+ return [r for r in regions if (r.get("reviewStatus") or "pending") == status]
104
+
105
+
106
+ def mark_confirmed_submitted(db: Session, run_id: int, region_ids: List[int]) -> int:
107
+ q = db.query(RegionReview).filter(
108
+ RegionReview.run_id == run_id,
109
+ RegionReview.region_id.in_(region_ids),
110
+ RegionReview.status == "confirmed",
111
+ )
112
+ now = _utcnow()
113
+ count = 0
114
+ for row in q.all():
115
+ row.status = "submitted"
116
+ row.submitted_at = now
117
+ count += 1
118
+ db.commit()
119
+ return count
120
+
121
+
122
+ def review_summary(regions: List[dict]) -> Dict[str, int]:
123
+ summary = {"pending": 0, "confirmed": 0, "false_positive": 0, "submitted": 0}
124
+ for r in regions:
125
+ st = r.get("reviewStatus") or "pending"
126
+ summary[st] = summary.get(st, 0) + 1
127
+ return summary
app/main.py CHANGED
@@ -28,7 +28,7 @@ from .auth import (
28
  from .database import Base, engine, get_db, DATA_DIR
29
  from .models import User, DetectionRun
30
  from . import dda as _dda_pkg # noqa: F401 — register DDA tables
31
- from .dda.models import DdaZone, DdaVillage, ImageAsset, DetectionJob # noqa: F401
32
  from .dda.config import IS_DDA_MODE
33
  from .dda.bootstrap import init_dda_database, setup_dda
34
  from .notifier import send_notification, send_test_email
@@ -483,6 +483,9 @@ def get_run(
483
  if not run:
484
  raise HTTPException(status_code=404, detail="Run not found")
485
  regions = _load_regions_json(run.regions_json)
 
 
 
486
  return {
487
  "id": run.id,
488
  "title": run.title,
 
28
  from .database import Base, engine, get_db, DATA_DIR
29
  from .models import User, DetectionRun
30
  from . import dda as _dda_pkg # noqa: F401 — register DDA tables
31
+ from .dda.models import DdaZone, DdaVillage, ImageAsset, DetectionJob, RegionReview # noqa: F401
32
  from .dda.config import IS_DDA_MODE
33
  from .dda.bootstrap import init_dda_database, setup_dda
34
  from .notifier import send_notification, send_test_email
 
483
  if not run:
484
  raise HTTPException(status_code=404, detail="Run not found")
485
  regions = _load_regions_json(run.regions_json)
486
+ if IS_DDA_MODE:
487
+ from .dda.review_service import merge_reviews
488
+ regions = merge_reviews(db, run.id, regions)
489
  return {
490
  "id": run.id,
491
  "title": run.title,
static/css/dda.css CHANGED
@@ -419,3 +419,62 @@
419
  .dda-report-overlay { max-width: 100%; height: auto; border-radius: 8px; border: 1px solid var(--border); }
420
  .dda-report-email-row { display: flex; flex-wrap: wrap; gap: 0.5rem; margin-top: 0.5rem; }
421
  .dda-report-email-row input { flex: 1; min-width: 200px; }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
419
  .dda-report-overlay { max-width: 100%; height: auto; border-radius: 8px; border: 1px solid var(--border); }
420
  .dda-report-email-row { display: flex; flex-wrap: wrap; gap: 0.5rem; margin-top: 0.5rem; }
421
  .dda-report-email-row input { flex: 1; min-width: 200px; }
422
+
423
+ .dda-view-toolbar {
424
+ display: flex;
425
+ flex-wrap: wrap;
426
+ align-items: center;
427
+ gap: 0.35rem;
428
+ margin: 0.5rem 0 0.75rem;
429
+ }
430
+ .dda-view-label { font-size: 0.8rem; color: var(--text-muted, #888); margin-right: 0.25rem; }
431
+ .dda-view-btn {
432
+ font-size: 0.78rem;
433
+ padding: 0.25rem 0.55rem;
434
+ border: 1px solid var(--border);
435
+ border-radius: 6px;
436
+ background: transparent;
437
+ cursor: pointer;
438
+ color: inherit;
439
+ }
440
+ .dda-view-btn.active {
441
+ background: var(--grad-start, #2e33c5);
442
+ color: #fff;
443
+ border-color: transparent;
444
+ }
445
+ .dda-mode-slider .compare-handle { display: block; }
446
+ .dda-mode-t1 .compare-handle,
447
+ .dda-mode-t2 .compare-handle,
448
+ .dda-mode-overlay .compare-handle { pointer-events: none; }
449
+
450
+ .dda-review-bar {
451
+ display: flex;
452
+ flex-wrap: wrap;
453
+ align-items: center;
454
+ justify-content: space-between;
455
+ gap: 0.5rem;
456
+ margin: 0.75rem 0;
457
+ padding: 0.5rem 0;
458
+ border-top: 1px solid var(--border);
459
+ }
460
+ .dda-review-actions { display: flex; flex-wrap: wrap; gap: 0.35rem; }
461
+ .dda-review-btns { white-space: nowrap; }
462
+ .dda-review-btns .btn { padding: 0.15rem 0.4rem; margin-right: 0.15rem; }
463
+
464
+ .review-badge {
465
+ font-size: 0.72rem;
466
+ font-weight: 600;
467
+ text-transform: capitalize;
468
+ padding: 0.1rem 0.35rem;
469
+ border-radius: 4px;
470
+ }
471
+ .review-pending { background: rgba(0,0,0,0.06); color: #666; }
472
+ .review-confirmed { background: rgba(22, 163, 74, 0.15); color: #15803d; }
473
+ .review-false-positive { background: rgba(220, 38, 38, 0.12); color: #b91c1c; }
474
+ .review-submitted { background: rgba(46, 51, 197, 0.12); color: #2e33c5; }
475
+
476
+ .highlight-pulse { animation: dda-pulse 1.2s ease-in-out 2; }
477
+ @keyframes dda-pulse {
478
+ 0%, 100% { box-shadow: 0 0 0 0 rgba(16, 185, 129, 0.5); }
479
+ 50% { box-shadow: 0 0 0 6px rgba(16, 185, 129, 0); }
480
+ }
static/js/dda/result.js CHANGED
@@ -1,9 +1,12 @@
1
- /** DDA result modal — before/after compare slider (same as production). */
2
 
3
  let ddaCurrentResult = null;
4
  let ddaRegionRows = [];
5
  let ddaRegionList = [];
6
  let ddaRegionPage = 0;
 
 
 
7
  const DDA_REGIONS_PER_PAGE = 10;
8
  let ddaZoom = 1;
9
  const DDA_ZOOM_MIN = 0.5;
@@ -16,6 +19,95 @@ function formatCompact(n) {
16
  return n.toLocaleString();
17
  }
18
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
19
  function showDdaResult(data) {
20
  const modal = document.getElementById('result-modal');
21
  const statsEl = document.getElementById('result-stats');
@@ -23,6 +115,9 @@ function showDdaResult(data) {
23
  if (!modal || !statsEl) return;
24
 
25
  ddaCurrentResult = data;
 
 
 
26
  if (titleEl) titleEl.textContent = data.title || 'Detection Result';
27
 
28
  const stats = data.statistics || {};
@@ -57,17 +152,19 @@ function showDdaResult(data) {
57
  <div class="stat-box"><div class="value value-sm">${regOk === true ? 'OK' : regOk === false ? 'Weak' : '—'}</div><div class="label">Alignment</div></div>
58
  `;
59
 
 
 
 
 
 
 
 
 
 
60
  const beforeImg = document.getElementById('compare-before-img');
61
  const afterImg = document.getElementById('compare-after-img');
62
  if (!beforeImg || !afterImg) return;
63
 
64
- if (data.overlayBase64Png) {
65
- afterImg.src = 'data:image/png;base64,' + data.overlayBase64Png;
66
- } else {
67
- afterImg.src = data.overlayUrl || '';
68
- }
69
- beforeImg.src = data.beforeFullUrl || data.beforeThumbUrl || '';
70
-
71
  let loaded = 0;
72
  const onReady = () => {
73
  if (++loaded >= 2) {
@@ -91,6 +188,8 @@ function showDdaResult(data) {
91
  const stories = r.estimatedStories != null ? r.estimatedStories : '—';
92
  const height = r.estimatedHeightM != null ? r.estimatedHeightM + ' m' : '—';
93
  const stage = r.constructionStage && r.constructionStage !== 'Unknown' ? r.constructionStage : '—';
 
 
94
  tr.innerHTML = `
95
  <td>${r.id}</td>
96
  <td>${r.objectType}</td>
@@ -104,12 +203,19 @@ function showDdaResult(data) {
104
  <td>${stories}</td>
105
  <td>${height}</td>
106
  <td>${stage}</td>
 
 
 
 
 
 
107
  `;
108
  return tr;
109
  });
110
 
111
  ddaRegionPage = 0;
112
  renderDdaRegionPage();
 
113
  openDdaResultModal();
114
  }
115
 
@@ -127,6 +233,7 @@ function renderDdaRegionPage() {
127
  tbody.innerHTML = '';
128
  pageRows.forEach((tr) => tbody.appendChild(tr));
129
  setupDdaRegionHover(tbody, pageData);
 
130
 
131
  if (!pag) return;
132
  pag.innerHTML = '';
@@ -153,48 +260,123 @@ function renderDdaRegionPage() {
153
  pag.appendChild(next);
154
  }
155
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
156
  function setupDdaRegionHover(tbody, regions) {
157
  const overlay = document.getElementById('region-highlight-overlay');
158
  if (!overlay) return;
159
 
160
  function showRegionHighlight(r, zoomTo) {
161
  if (!r || !r.bbox) return;
162
- overlay.innerHTML = '';
163
- const box = document.createElement('div');
164
- box.className = 'highlight-box';
165
- const imgEl = document.getElementById('compare-after-img');
166
- const slider = document.getElementById('compare-slider');
167
- const wrapper = document.getElementById('zoom-wrapper');
168
- if (!imgEl || !slider || !imgEl.naturalWidth) return;
169
- const rw = slider.offsetWidth;
170
- const rh = slider.offsetHeight;
171
- const imgW = imgEl.naturalWidth || 1;
172
- const imgH = imgEl.naturalHeight || 1;
173
- const scale = Math.min(rw / imgW, rh / imgH);
174
- const drawW = imgW * scale;
175
- const drawH = imgH * scale;
176
- const offsetX = (rw - drawW) / 2;
177
- const offsetY = (rh - drawH) / 2;
178
- box.style.left = (offsetX + r.bbox.x * scale) + 'px';
179
- box.style.top = (offsetY + r.bbox.y * scale) + 'px';
180
- box.style.width = (r.bbox.w * scale) + 'px';
181
- box.style.height = (r.bbox.h * scale) + 'px';
182
- overlay.appendChild(box);
183
-
184
- if (zoomTo && wrapper && r.bbox.w > 0 && r.bbox.h > 0) {
185
- const cx = r.bbox.x + r.bbox.w / 2;
186
- const cy = r.bbox.y + r.bbox.h / 2;
187
- const targetZoom = Math.min(DDA_ZOOM_MAX, Math.max(1.5, Math.min(drawW / (r.bbox.w * scale * 2.5), drawH / (r.bbox.h * scale * 2.5))));
188
- ddaZoom = targetZoom;
189
- applyDdaZoom();
190
- wrapper.scrollLeft = Math.max(0, (offsetX + cx * scale) * ddaZoom - wrapper.clientWidth / 2);
191
- wrapper.scrollTop = Math.max(0, (offsetY + cy * scale) * ddaZoom - wrapper.clientHeight / 2);
192
  }
193
  }
194
 
195
  tbody.querySelectorAll('tr[data-region-id]').forEach((tr) => {
196
  tr.style.cursor = 'pointer';
197
- tr.title = 'Click to locate on map';
198
  tr.addEventListener('mouseenter', () => {
199
  const id = parseInt(tr.dataset.regionId, 10);
200
  const r = regions.find((x) => x.id === id);
@@ -204,15 +386,9 @@ function setupDdaRegionHover(tbody, regions) {
204
  });
205
  tr.addEventListener('mouseleave', () => {
206
  tr.classList.remove('region-hover');
207
- overlay.innerHTML = '';
208
- });
209
- tr.addEventListener('click', () => {
210
- const id = parseInt(tr.dataset.regionId, 10);
211
- const r = regions.find((x) => x.id === id);
212
- tbody.querySelectorAll('tr').forEach((row) => row.classList.remove('region-selected'));
213
- tr.classList.add('region-selected');
214
- showRegionHighlight(r, true);
215
  });
 
216
  });
217
  }
218
 
@@ -234,6 +410,7 @@ function closeDdaResultModal() {
234
  }
235
 
236
  function resetDdaCompareSlider() {
 
237
  const ac = document.getElementById('compare-after-clip');
238
  const h = document.getElementById('compare-handle');
239
  if (ac) ac.style.clipPath = 'inset(0 0 0 50%)';
@@ -260,20 +437,31 @@ function initDdaCompareSlider() {
260
  let isDragging = false;
261
 
262
  function updatePosition(clientX) {
 
263
  const rect = slider.getBoundingClientRect();
264
  const pct = Math.max(0, Math.min(100, ((clientX - rect.left) / rect.width) * 100));
265
  document.getElementById('compare-after-clip').style.clipPath = `inset(0 0 0 ${pct}%)`;
266
  document.getElementById('compare-handle').style.left = pct + '%';
267
  }
268
 
269
- slider.addEventListener('mousedown', (e) => { e.preventDefault(); isDragging = true; updatePosition(e.clientX); });
270
  document.addEventListener('mousemove', (e) => { if (isDragging) updatePosition(e.clientX); });
271
  document.addEventListener('mouseup', () => { isDragging = false; });
272
- slider.addEventListener('touchstart', (e) => { isDragging = true; updatePosition(e.touches[0].clientX); }, { passive: true });
273
  document.addEventListener('touchmove', (e) => { if (isDragging) updatePosition(e.touches[0].clientX); }, { passive: true });
274
  document.addEventListener('touchend', () => { isDragging = false; });
275
  }
276
 
 
 
 
 
 
 
 
 
 
 
277
  function initDdaZoom() {
278
  document.getElementById('zoom-in')?.addEventListener('click', () => {
279
  ddaZoom = Math.min(DDA_ZOOM_MAX, ddaZoom + DDA_ZOOM_STEP);
@@ -305,3 +493,4 @@ document.addEventListener('keydown', (e) => {
305
 
306
  initDdaCompareSlider();
307
  initDdaZoom();
 
 
1
+ /** DDA result modal — compare slider, view modes, region review (FR-07, FR-08). */
2
 
3
  let ddaCurrentResult = null;
4
  let ddaRegionRows = [];
5
  let ddaRegionList = [];
6
  let ddaRegionPage = 0;
7
+ let ddaSelectedRegionId = null;
8
+ let ddaViewMode = 'slider';
9
+ let ddaViewUrls = { before: '', after: '', overlay: '' };
10
  const DDA_REGIONS_PER_PAGE = 10;
11
  let ddaZoom = 1;
12
  const DDA_ZOOM_MIN = 0.5;
 
19
  return n.toLocaleString();
20
  }
21
 
22
+ function reviewBadgeClass(status) {
23
+ const s = (status || 'pending').toLowerCase();
24
+ return `review-badge review-${s.replace('_', '-')}`;
25
+ }
26
+
27
+ function setDdaViewMode(mode) {
28
+ ddaViewMode = mode;
29
+ document.querySelectorAll('.dda-view-btn').forEach((btn) => {
30
+ btn.classList.toggle('active', btn.dataset.view === mode);
31
+ });
32
+ const slider = document.getElementById('compare-slider');
33
+ const handle = document.getElementById('compare-handle');
34
+ const beforeImg = document.getElementById('compare-before-img');
35
+ const afterImg = document.getElementById('compare-after-img');
36
+ const afterClip = document.getElementById('compare-after-clip');
37
+ if (!slider || !beforeImg || !afterImg) return;
38
+
39
+ slider.classList.remove('dda-mode-t1', 'dda-mode-t2', 'dda-mode-overlay', 'dda-mode-slider');
40
+ slider.classList.add(`dda-mode-${mode}`);
41
+
42
+ const overlaySrc = ddaViewUrls.overlay;
43
+ const beforeSrc = ddaViewUrls.before;
44
+ const afterSrc = ddaViewUrls.after || overlaySrc;
45
+
46
+ if (mode === 'slider') {
47
+ beforeImg.src = beforeSrc;
48
+ afterImg.src = overlaySrc;
49
+ if (afterClip) afterClip.style.clipPath = 'inset(0 0 0 50%)';
50
+ if (handle) { handle.style.display = ''; handle.style.left = '50%'; }
51
+ } else if (mode === 't1') {
52
+ beforeImg.src = beforeSrc;
53
+ afterImg.src = overlaySrc;
54
+ if (afterClip) afterClip.style.clipPath = 'inset(0 0 0 100%)';
55
+ if (handle) handle.style.display = 'none';
56
+ } else if (mode === 't2') {
57
+ beforeImg.src = beforeSrc;
58
+ afterImg.src = afterSrc;
59
+ if (afterClip) afterClip.style.clipPath = 'inset(0 0 0 0%)';
60
+ if (handle) handle.style.display = 'none';
61
+ } else if (mode === 'overlay') {
62
+ beforeImg.src = beforeSrc;
63
+ afterImg.src = overlaySrc;
64
+ if (afterClip) afterClip.style.clipPath = 'inset(0 0 0 0%)';
65
+ if (handle) handle.style.display = 'none';
66
+ }
67
+ }
68
+
69
+ function updateDdaReviewSummary(regions) {
70
+ const el = document.getElementById('dda-review-summary');
71
+ if (!el) return;
72
+ const counts = { pending: 0, confirmed: 0, false_positive: 0, submitted: 0 };
73
+ (regions || []).forEach((r) => {
74
+ const s = r.reviewStatus || 'pending';
75
+ counts[s] = (counts[s] || 0) + 1;
76
+ });
77
+ el.textContent = `Review: ${counts.confirmed} confirmed · ${counts.false_positive} false positive · ${counts.pending} pending`;
78
+ }
79
+
80
+ function setupDdaReviewBar(runId, regions) {
81
+ const exportAll = document.getElementById('dda-export-csv');
82
+ const exportConfirmed = document.getElementById('dda-export-confirmed');
83
+ const submitBtn = document.getElementById('dda-submit-dept');
84
+ if (exportAll) exportAll.href = `/api/dda/reports/${runId}/export.csv`;
85
+ if (exportConfirmed) exportConfirmed.href = `/api/dda/reports/${runId}/export.csv?confirmed=1`;
86
+ updateDdaReviewSummary(regions);
87
+
88
+ submitBtn?.replaceWith(submitBtn.cloneNode(true));
89
+ document.getElementById('dda-submit-dept')?.addEventListener('click', async () => {
90
+ try {
91
+ const res = await ddaApi('POST', `/api/dda/reports/${runId}/submit`);
92
+ if (typeof showDdaSuccess === 'function') showDdaSuccess(res.message || 'Submitted.');
93
+ if (res.downloadUrl && res.mode === 'file') {
94
+ window.open(res.downloadUrl, '_blank');
95
+ }
96
+ const data = await ddaApi('GET', `/api/history/${runId}`);
97
+ showDdaResult(data);
98
+ } catch (err) {
99
+ if (typeof showDdaError === 'function') showDdaError(err.message || 'Submit failed');
100
+ }
101
+ });
102
+ }
103
+
104
+ async function patchRegionReview(runId, regionId, reviewStatus) {
105
+ const res = await ddaApi('PATCH', `/api/dda/reports/${runId}/regions/${regionId}`, {
106
+ body: JSON.stringify({ reviewStatus }),
107
+ });
108
+ return res.region;
109
+ }
110
+
111
  function showDdaResult(data) {
112
  const modal = document.getElementById('result-modal');
113
  const statsEl = document.getElementById('result-stats');
 
115
  if (!modal || !statsEl) return;
116
 
117
  ddaCurrentResult = data;
118
+ ddaSelectedRegionId = null;
119
+ document.getElementById('dda-locate-btn')?.setAttribute('disabled', 'disabled');
120
+
121
  if (titleEl) titleEl.textContent = data.title || 'Detection Result';
122
 
123
  const stats = data.statistics || {};
 
152
  <div class="stat-box"><div class="value value-sm">${regOk === true ? 'OK' : regOk === false ? 'Weak' : '—'}</div><div class="label">Alignment</div></div>
153
  `;
154
 
155
+ const overlaySrc = data.overlayBase64Png
156
+ ? 'data:image/png;base64,' + data.overlayBase64Png
157
+ : (data.overlayUrl || '');
158
+ const beforeSrc = data.beforeFullUrl || data.beforeThumbUrl || '';
159
+ const afterSrc = data.afterThumbUrl || data.afterFullUrl || beforeSrc;
160
+
161
+ ddaViewUrls = { before: beforeSrc, after: afterSrc, overlay: overlaySrc };
162
+ setDdaViewMode('slider');
163
+
164
  const beforeImg = document.getElementById('compare-before-img');
165
  const afterImg = document.getElementById('compare-after-img');
166
  if (!beforeImg || !afterImg) return;
167
 
 
 
 
 
 
 
 
168
  let loaded = 0;
169
  const onReady = () => {
170
  if (++loaded >= 2) {
 
188
  const stories = r.estimatedStories != null ? r.estimatedStories : '—';
189
  const height = r.estimatedHeightM != null ? r.estimatedHeightM + ' m' : '—';
190
  const stage = r.constructionStage && r.constructionStage !== 'Unknown' ? r.constructionStage : '—';
191
+ const reviewStatus = r.reviewStatus || 'pending';
192
+ const locked = reviewStatus === 'submitted';
193
  tr.innerHTML = `
194
  <td>${r.id}</td>
195
  <td>${r.objectType}</td>
 
203
  <td>${stories}</td>
204
  <td>${height}</td>
205
  <td>${stage}</td>
206
+ <td><span class="${reviewBadgeClass(reviewStatus)}">${reviewStatus.replace('_', ' ')}</span></td>
207
+ <td class="dda-review-btns">
208
+ <button type="button" class="btn btn-secondary btn-sm btn-review-ok" data-action="confirmed" ${locked ? 'disabled' : ''} title="Confirm">✓</button>
209
+ <button type="button" class="btn btn-secondary btn-sm btn-review-fp" data-action="false_positive" ${locked ? 'disabled' : ''} title="False positive">✗</button>
210
+ <button type="button" class="btn btn-secondary btn-sm btn-review-locate" title="Locate">◎</button>
211
+ </td>
212
  `;
213
  return tr;
214
  });
215
 
216
  ddaRegionPage = 0;
217
  renderDdaRegionPage();
218
+ if (data.id) setupDdaReviewBar(data.id, regions);
219
  openDdaResultModal();
220
  }
221
 
 
233
  tbody.innerHTML = '';
234
  pageRows.forEach((tr) => tbody.appendChild(tr));
235
  setupDdaRegionHover(tbody, pageData);
236
+ setupDdaReviewButtons(tbody, pageData);
237
 
238
  if (!pag) return;
239
  pag.innerHTML = '';
 
260
  pag.appendChild(next);
261
  }
262
 
263
+ function setupDdaReviewButtons(tbody, regions) {
264
+ const runId = ddaCurrentResult?.id;
265
+ if (!runId) return;
266
+
267
+ tbody.querySelectorAll('tr[data-region-id]').forEach((tr) => {
268
+ tr.querySelector('.btn-review-ok')?.addEventListener('click', async (e) => {
269
+ e.stopPropagation();
270
+ const id = parseInt(tr.dataset.regionId, 10);
271
+ try {
272
+ const updated = await patchRegionReview(runId, id, 'confirmed');
273
+ const idx = ddaRegionList.findIndex((x) => x.id === id);
274
+ if (idx >= 0) ddaRegionList[idx] = { ...ddaRegionList[idx], ...updated };
275
+ renderDdaRegionPage();
276
+ updateDdaReviewSummary(ddaRegionList);
277
+ } catch (err) {
278
+ if (typeof showDdaError === 'function') showDdaError(err.message);
279
+ }
280
+ });
281
+ tr.querySelector('.btn-review-fp')?.addEventListener('click', async (e) => {
282
+ e.stopPropagation();
283
+ const id = parseInt(tr.dataset.regionId, 10);
284
+ try {
285
+ const updated = await patchRegionReview(runId, id, 'false_positive');
286
+ const idx = ddaRegionList.findIndex((x) => x.id === id);
287
+ if (idx >= 0) ddaRegionList[idx] = { ...ddaRegionList[idx], ...updated };
288
+ renderDdaRegionPage();
289
+ updateDdaReviewSummary(ddaRegionList);
290
+ } catch (err) {
291
+ if (typeof showDdaError === 'function') showDdaError(err.message);
292
+ }
293
+ });
294
+ tr.querySelector('.btn-review-locate')?.addEventListener('click', (e) => {
295
+ e.stopPropagation();
296
+ selectAndLocateRegion(tr, regions);
297
+ });
298
+ });
299
+ }
300
+
301
+ function selectAndLocateRegion(tr, regions) {
302
+ const id = parseInt(tr.dataset.regionId, 10);
303
+ const r = regions.find((x) => x.id === id);
304
+ ddaSelectedRegionId = id;
305
+ document.getElementById('dda-locate-btn')?.removeAttribute('disabled');
306
+ tr.closest('tbody')?.querySelectorAll('tr').forEach((row) => row.classList.remove('region-selected'));
307
+ tr.classList.add('region-selected');
308
+ locateRegionOnViewer(r);
309
+ }
310
+
311
+ function locateRegionOnViewer(r) {
312
+ const overlay = document.getElementById('region-highlight-overlay');
313
+ if (!r || !r.bbox || !overlay) return;
314
+ overlay.innerHTML = '';
315
+ const box = document.createElement('div');
316
+ box.className = 'highlight-box highlight-pulse';
317
+ const imgEl = document.getElementById('compare-after-img');
318
+ const slider = document.getElementById('compare-slider');
319
+ const wrapper = document.getElementById('zoom-wrapper');
320
+ if (!imgEl || !slider || !imgEl.naturalWidth) return;
321
+ const rw = slider.offsetWidth;
322
+ const rh = slider.offsetHeight;
323
+ const imgW = imgEl.naturalWidth || 1;
324
+ const imgH = imgEl.naturalHeight || 1;
325
+ const scale = Math.min(rw / imgW, rh / imgH);
326
+ const drawW = imgW * scale;
327
+ const drawH = imgH * scale;
328
+ const offsetX = (rw - drawW) / 2;
329
+ const offsetY = (rh - drawH) / 2;
330
+ box.style.left = (offsetX + r.bbox.x * scale) + 'px';
331
+ box.style.top = (offsetY + r.bbox.y * scale) + 'px';
332
+ box.style.width = (r.bbox.w * scale) + 'px';
333
+ box.style.height = (r.bbox.h * scale) + 'px';
334
+ overlay.appendChild(box);
335
+
336
+ if (wrapper && r.bbox.w > 0 && r.bbox.h > 0) {
337
+ const cx = r.bbox.x + r.bbox.w / 2;
338
+ const cy = r.bbox.y + r.bbox.h / 2;
339
+ ddaZoom = Math.min(DDA_ZOOM_MAX, Math.max(1.5, Math.min(drawW / (r.bbox.w * scale * 2.5), drawH / (r.bbox.h * scale * 2.5))));
340
+ applyDdaZoom();
341
+ wrapper.scrollLeft = Math.max(0, (offsetX + cx * scale) * ddaZoom - wrapper.clientWidth / 2);
342
+ wrapper.scrollTop = Math.max(0, (offsetY + cy * scale) * ddaZoom - wrapper.clientHeight / 2);
343
+ }
344
+ }
345
+
346
  function setupDdaRegionHover(tbody, regions) {
347
  const overlay = document.getElementById('region-highlight-overlay');
348
  if (!overlay) return;
349
 
350
  function showRegionHighlight(r, zoomTo) {
351
  if (!r || !r.bbox) return;
352
+ if (zoomTo) locateRegionOnViewer(r);
353
+ else {
354
+ overlay.innerHTML = '';
355
+ const box = document.createElement('div');
356
+ box.className = 'highlight-box';
357
+ const imgEl = document.getElementById('compare-after-img');
358
+ const slider = document.getElementById('compare-slider');
359
+ if (!imgEl || !slider || !imgEl.naturalWidth) return;
360
+ const rw = slider.offsetWidth;
361
+ const rh = slider.offsetHeight;
362
+ const imgW = imgEl.naturalWidth || 1;
363
+ const imgH = imgEl.naturalHeight || 1;
364
+ const scale = Math.min(rw / imgW, rh / imgH);
365
+ const drawW = imgW * scale;
366
+ const drawH = imgH * scale;
367
+ const offsetX = (rw - drawW) / 2;
368
+ const offsetY = (rh - drawH) / 2;
369
+ box.style.left = (offsetX + r.bbox.x * scale) + 'px';
370
+ box.style.top = (offsetY + r.bbox.y * scale) + 'px';
371
+ box.style.width = (r.bbox.w * scale) + 'px';
372
+ box.style.height = (r.bbox.h * scale) + 'px';
373
+ overlay.appendChild(box);
 
 
 
 
 
 
 
 
374
  }
375
  }
376
 
377
  tbody.querySelectorAll('tr[data-region-id]').forEach((tr) => {
378
  tr.style.cursor = 'pointer';
379
+ tr.title = 'Click to select and locate';
380
  tr.addEventListener('mouseenter', () => {
381
  const id = parseInt(tr.dataset.regionId, 10);
382
  const r = regions.find((x) => x.id === id);
 
386
  });
387
  tr.addEventListener('mouseleave', () => {
388
  tr.classList.remove('region-hover');
389
+ if (!tr.classList.contains('region-selected')) overlay.innerHTML = '';
 
 
 
 
 
 
 
390
  });
391
+ tr.addEventListener('click', () => selectAndLocateRegion(tr, regions));
392
  });
393
  }
394
 
 
410
  }
411
 
412
  function resetDdaCompareSlider() {
413
+ if (ddaViewMode !== 'slider') return;
414
  const ac = document.getElementById('compare-after-clip');
415
  const h = document.getElementById('compare-handle');
416
  if (ac) ac.style.clipPath = 'inset(0 0 0 50%)';
 
437
  let isDragging = false;
438
 
439
  function updatePosition(clientX) {
440
+ if (ddaViewMode !== 'slider') return;
441
  const rect = slider.getBoundingClientRect();
442
  const pct = Math.max(0, Math.min(100, ((clientX - rect.left) / rect.width) * 100));
443
  document.getElementById('compare-after-clip').style.clipPath = `inset(0 0 0 ${pct}%)`;
444
  document.getElementById('compare-handle').style.left = pct + '%';
445
  }
446
 
447
+ slider.addEventListener('mousedown', (e) => { if (ddaViewMode !== 'slider') return; e.preventDefault(); isDragging = true; updatePosition(e.clientX); });
448
  document.addEventListener('mousemove', (e) => { if (isDragging) updatePosition(e.clientX); });
449
  document.addEventListener('mouseup', () => { isDragging = false; });
450
+ slider.addEventListener('touchstart', (e) => { if (ddaViewMode !== 'slider') return; isDragging = true; updatePosition(e.touches[0].clientX); }, { passive: true });
451
  document.addEventListener('touchmove', (e) => { if (isDragging) updatePosition(e.touches[0].clientX); }, { passive: true });
452
  document.addEventListener('touchend', () => { isDragging = false; });
453
  }
454
 
455
+ function initDdaViewToolbar() {
456
+ document.querySelectorAll('.dda-view-btn').forEach((btn) => {
457
+ btn.addEventListener('click', () => setDdaViewMode(btn.dataset.view));
458
+ });
459
+ document.getElementById('dda-locate-btn')?.addEventListener('click', () => {
460
+ const r = ddaRegionList.find((x) => x.id === ddaSelectedRegionId);
461
+ if (r) locateRegionOnViewer(r);
462
+ });
463
+ }
464
+
465
  function initDdaZoom() {
466
  document.getElementById('zoom-in')?.addEventListener('click', () => {
467
  ddaZoom = Math.min(DDA_ZOOM_MAX, ddaZoom + DDA_ZOOM_STEP);
 
493
 
494
  initDdaCompareSlider();
495
  initDdaZoom();
496
+ initDdaViewToolbar();
templates/index_dda.html CHANGED
@@ -5,7 +5,7 @@
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
6
  <title>DDA Change Detection</title>
7
  <link rel="stylesheet" href="/static/css/style.css?v=30" />
8
- <link rel="stylesheet" href="/static/css/dda.css?v=9" />
9
  </head>
10
  <body>
11
  <div class="app dda-app">
@@ -189,6 +189,14 @@
189
  </button>
190
  </div>
191
  <div class="result-stats" id="result-stats"></div>
 
 
 
 
 
 
 
 
192
  <div class="zoom-slider-section">
193
  <div class="zoom-controls">
194
  <button type="button" class="btn btn-zoom" id="zoom-out" title="Zoom out" aria-label="Zoom out">−</button>
@@ -216,6 +224,14 @@
216
  </div>
217
  </div>
218
  </div>
 
 
 
 
 
 
 
 
219
  <div class="regions-table-wrap">
220
  <table class="regions-table" id="regions-table">
221
  <thead>
@@ -232,6 +248,8 @@
232
  <th>Stories</th>
233
  <th>Height</th>
234
  <th>Stage</th>
 
 
235
  </tr>
236
  </thead>
237
  <tbody id="regions-tbody"></tbody>
@@ -243,7 +261,7 @@
243
 
244
  <script src="/static/js/dda/app.js?v=11"></script>
245
  <script src="/static/js/dda/library.js?v=6"></script>
246
- <script src="/static/js/dda/result.js?v=4"></script>
247
  <script src="/static/js/dda/compare.js?v=8"></script>
248
  <script src="/static/js/dda/reports.js?v=3"></script>
249
  <script src="/static/js/dda/notifications.js?v=1"></script>
 
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
6
  <title>DDA Change Detection</title>
7
  <link rel="stylesheet" href="/static/css/style.css?v=30" />
8
+ <link rel="stylesheet" href="/static/css/dda.css?v=10" />
9
  </head>
10
  <body>
11
  <div class="app dda-app">
 
189
  </button>
190
  </div>
191
  <div class="result-stats" id="result-stats"></div>
192
+ <div class="dda-view-toolbar">
193
+ <span class="dda-view-label">View:</span>
194
+ <button type="button" class="dda-view-btn active" data-view="slider">Slider</button>
195
+ <button type="button" class="dda-view-btn" data-view="t1">Base (T1)</button>
196
+ <button type="button" class="dda-view-btn" data-view="t2">Comparison (T2)</button>
197
+ <button type="button" class="dda-view-btn" data-view="overlay">Overlay</button>
198
+ <button type="button" class="btn btn-secondary btn-sm" id="dda-locate-btn" title="Locate selected region" disabled>Locate</button>
199
+ </div>
200
  <div class="zoom-slider-section">
201
  <div class="zoom-controls">
202
  <button type="button" class="btn btn-zoom" id="zoom-out" title="Zoom out" aria-label="Zoom out">−</button>
 
224
  </div>
225
  </div>
226
  </div>
227
+ <div class="dda-review-bar" id="dda-review-bar">
228
+ <span class="dda-review-summary dim" id="dda-review-summary"></span>
229
+ <div class="dda-review-actions">
230
+ <a class="btn btn-secondary btn-sm" id="dda-export-csv" href="#" download>Export CSV</a>
231
+ <a class="btn btn-secondary btn-sm" id="dda-export-confirmed" href="#" download>Export confirmed</a>
232
+ <button type="button" class="btn btn-primary btn-sm" id="dda-submit-dept">Submit confirmed</button>
233
+ </div>
234
+ </div>
235
  <div class="regions-table-wrap">
236
  <table class="regions-table" id="regions-table">
237
  <thead>
 
248
  <th>Stories</th>
249
  <th>Height</th>
250
  <th>Stage</th>
251
+ <th>Review</th>
252
+ <th>Actions</th>
253
  </tr>
254
  </thead>
255
  <tbody id="regions-tbody"></tbody>
 
261
 
262
  <script src="/static/js/dda/app.js?v=11"></script>
263
  <script src="/static/js/dda/library.js?v=6"></script>
264
+ <script src="/static/js/dda/result.js?v=5"></script>
265
  <script src="/static/js/dda/compare.js?v=8"></script>
266
  <script src="/static/js/dda/reports.js?v=3"></script>
267
  <script src="/static/js/dda/notifications.js?v=1"></script>