Конфликты в: - backend/app/api/v1/parcels.py — keep both _polygon_suitability (P1) И _neighbors_summary (P2 из main); response dict содержит оба geometry_suitability + neighbors_summary полей. - frontend/src/components/site-finder/LandTab.tsx — рендерим оба блока: NeighborsBlock (P2, hard warn на overlap) выше GeometrySuitabilityBlock (P1). - frontend/src/types/site-finder.ts — оба поля в ParcelAnalysis: geometry_suitability?, neighbors_summary? + сохранены X2 confidence_*. ruff + tsc + lint — clean. |
||
|---|---|---|
| .. | ||
| public | ||
| src | ||
| .dockerignore | ||
| .env.example | ||
| .eslintrc.json | ||
| Dockerfile | ||
| next-env.d.ts | ||
| next.config.ts | ||
| package-lock.json | ||
| package.json | ||
| tsconfig.json | ||