feat: modify map

2026-03-19 18:07:37 +05:30
parent 32b2c3c6ab
commit 02c5425fce
10 changed files with 341 additions and 158 deletions
--- a/src/app/(modules)/dashboard/page.tsx
+++ b/src/app/(modules)/dashboard/page.tsx
@@ -20,6 +20,7 @@ import {
  PencilLine,
  CheckCircle2,
  Settings2,
+  Droplets,
 } from 'lucide-react';
 import { StatsCard } from '@/components/dashboard/stats-card';
 import { FilterSelector } from '@/components/dashboard/filter-selector';
@@ -74,6 +75,8 @@ interface DetectionStats {
  totalRoadCrack: number;
  totalDamagedRoadMarking: number;
  totalGoodSignboard: number;
+  totalDrainIssue: number;
+  totalDefectiveCulvert: number;
  totalRoadDamage: number;
  chainageData: Array<{
    name: string;
@@ -81,7 +84,9 @@ interface DetectionStats {
    pothole: number;
    road_crack: number;
    damaged_road_marking: number;
-    good_sign_board: number;
+    // good_sign_board: number;
+    drain_issue: number;
+    defective_culvert: number;
    total: number;
  }>;
 }
@@ -94,6 +99,8 @@ function calculateStats(summary: ProjectSummary | null): DetectionStats {
      totalRoadCrack: 0,
      totalDamagedRoadMarking: 0,
      totalGoodSignboard: 0,
+      totalDrainIssue: 0,
+      totalDefectiveCulvert: 0,
      totalRoadDamage: 0,
      chainageData: [],
    };
@@ -104,21 +111,23 @@ function calculateStats(summary: ProjectSummary | null): DetectionStats {
  let total_road_crack = 0;
  let total_damaged_road_marking = 0;
  let total_good_sign_board = 0;
+  let total_drain_issue = 0;
+  let total_defective_culvert = 0;
  let total_road_damage = 0;
  const chainageData: DetectionStats['chainageData'] = [];

  for (const pkg of Object.values(summary.packages || {})) {
    for (const [chnName, chn] of Object.entries(pkg.chainages || {})) {
-      // Changed 'locName, loc' to 'chnName, chn' and 'pkg.locations' to 'pkg.chainages'
-      let chnDefectedSignboard = 0; // Changed 'locDefectedSignboard' to 'chnDefectedSignboard'
-      let chnPothole = 0; // Changed 'locPothole' to 'chnPothole'
-      let chnRoadCrack = 0; // Changed 'locRoadCrack' to 'chnRoadCrack'
-      let chnDamagedRoadMarking = 0; // Changed 'locDamagedRoadMarking' to 'chnDamagedRoadMarking'
-      let chnGoodSignboard = 0; // Changed 'locGoodSignboard' to 'chnGoodSignboard'
+      let chnDefectedSignboard = 0;
+      let chnPothole = 0;
+      let chnRoadCrack = 0;
+      let chnDamagedRoadMarking = 0;
+      let chnGoodSignboard = 0;
+      let chnDrainIssue = 0;
+      let chnDefectiveCulvert = 0;

      for (const detection of chn.detections || []) {
-        // Changed 'loc.detections' to 'chn.detections'
-        const type = detection.type.toLowerCase();
+        const type = (detection.type || '').toLowerCase();
        if (type === 'defected_sign_board') {
          chnDefectedSignboard++;
          total_defected_sign_board++;
@@ -133,42 +142,55 @@ function calculateStats(summary: ProjectSummary | null): DetectionStats {
          total_damaged_road_marking++;
        } else if (type === 'good_sign_board') {
          chnGoodSignboard++;
-          total_good_sign_board++;
+          // total_good_sign_board++;
+        } else if (type === 'drain_issue') {
+          chnDrainIssue++;
+          total_drain_issue++;
+        } else if (type === 'defective_culvert') {
+          chnDefectiveCulvert++;
+          total_defective_culvert++;
        }
      }

-      const chnTotalDamage = // Changed 'locTotalDamage' to 'chnTotalDamage'
-        chnDefectedSignboard + chnPothole + chnRoadCrack + chnDamagedRoadMarking;
-
      if (
        chnDefectedSignboard > 0 ||
        chnPothole > 0 ||
        chnRoadCrack > 0 ||
        chnDamagedRoadMarking > 0 ||
-        chnGoodSignboard > 0
+        chnGoodSignboard > 0 ||
+        chnDrainIssue > 0 ||
+        chnDefectiveCulvert > 0
      ) {
        const shortName = chnName.length > 20 ? chnName.substring(0, 20) + '...' : chnName;
        chainageData.push({
-          // Changed 'locationData.push' to 'chainageData.push'
          name: shortName,
          defected_sign_board: chnDefectedSignboard,
          pothole: chnPothole,
          road_crack: chnRoadCrack,
          damaged_road_marking: chnDamagedRoadMarking,
-          good_sign_board: chnGoodSignboard,
+          // good_sign_board: chnGoodSignboard,
+          drain_issue: chnDrainIssue,
+          defective_culvert: chnDefectiveCulvert,
          total:
            chnDefectedSignboard +
            chnPothole +
            chnRoadCrack +
            chnDamagedRoadMarking +
-            chnGoodSignboard,
+            // chnGoodSignboard +
+            chnDrainIssue +
+            chnDefectiveCulvert,
        });
      }
    }
  }

  total_road_damage =
-    total_defected_sign_board + total_pothole + total_road_crack + total_damaged_road_marking;
+    total_defected_sign_board +
+    total_pothole +
+    total_road_crack +
+    total_damaged_road_marking +
+    total_drain_issue +
+    total_defective_culvert;

  return {
    totalDefectedSignboard: total_defected_sign_board,
@@ -176,6 +198,8 @@ function calculateStats(summary: ProjectSummary | null): DetectionStats {
    totalRoadCrack: total_road_crack,
    totalDamagedRoadMarking: total_damaged_road_marking,
    totalGoodSignboard: total_good_sign_board,
+    totalDrainIssue: total_drain_issue,
+    totalDefectiveCulvert: total_defective_culvert,
    totalRoadDamage: total_road_damage,
    chainageData,
  };
@@ -192,6 +216,8 @@ export default function DashboardPage() {
    totalRoadCrack: 0,
    totalDamagedRoadMarking: 0,
    totalGoodSignboard: 0,
+    totalDrainIssue: 0,
+    totalDefectiveCulvert: 0,
    totalRoadDamage: 0,
    chainageData: [],
  });
@@ -291,6 +317,8 @@ export default function DashboardPage() {
        totalRoadCrack: 0,
        totalDamagedRoadMarking: 0,
        totalGoodSignboard: 0,
+        totalDrainIssue: 0,
+        totalDefectiveCulvert: 0,
        totalRoadDamage: 0,
        chainageData: [], // Changed 'locationData' to 'chainageData'
      });
@@ -302,6 +330,8 @@ export default function DashboardPage() {
    let totalRoadCrack = 0;
    let totalDamagedRoadMarking = 0;
    let totalGoodSignboard = 0;
+    let totalDrainIssue = 0;
+    let totalDefectiveCulvert = 0;
    const chainageData: DetectionStats['chainageData'] = [];

    const packagesToProcess =
@@ -323,9 +353,11 @@ export default function DashboardPage() {
        let chnRoadCrack = 0;
        let chnDamagedRoadMarking = 0;
        let chnGoodSignboard = 0;
+        let chnDrainIssue = 0;
+        let chnDefectiveCulvert = 0;

        for (const detection of chn.detections || []) {
-          const type = detection.type.toLowerCase();
+          const type = (detection.type || '').toLowerCase();
          if (type === 'defected_sign_board') {
            chnDefectedSignboard++;
            totalDefectedSignboard++;
@@ -339,8 +371,14 @@ export default function DashboardPage() {
            chnDamagedRoadMarking++;
            totalDamagedRoadMarking++;
          } else if (type === 'good_sign_board') {
-            chnGoodSignboard++;
-            totalGoodSignboard++;
+            // chnGoodSignboard++;
+            // totalGoodSignboard++;
+          } else if (type === 'drain_issue') {
+            chnDrainIssue++;
+            totalDrainIssue++;
+          } else if (type === 'defective_culvert') {
+            chnDefectiveCulvert++;
+            totalDefectiveCulvert++;
          }
        }

@@ -349,7 +387,9 @@ export default function DashboardPage() {
          chnPothole > 0 ||
          chnRoadCrack > 0 ||
          chnDamagedRoadMarking > 0 ||
-          chnGoodSignboard > 0
+          chnGoodSignboard > 0 ||
+          chnDrainIssue > 0 ||
+          chnDefectiveCulvert > 0
        ) {
          const shortName = chnName.length > 20 ? chnName.substring(0, 20) + '...' : chnName;
          chainageData.push({
@@ -358,13 +398,17 @@ export default function DashboardPage() {
            pothole: chnPothole,
            road_crack: chnRoadCrack,
            damaged_road_marking: chnDamagedRoadMarking,
-            good_sign_board: chnGoodSignboard,
+            // good_sign_board: chnGoodSignboard,
+            drain_issue: chnDrainIssue,
+            defective_culvert: chnDefectiveCulvert,
            total:
              chnDefectedSignboard +
              chnPothole +
              chnRoadCrack +
              chnDamagedRoadMarking +
-              chnGoodSignboard,
+              // chnGoodSignboard +
+              chnDrainIssue +
+              chnDefectiveCulvert,
          });
        }
      }
@@ -376,8 +420,15 @@ export default function DashboardPage() {
      totalRoadCrack,
      totalDamagedRoadMarking,
      totalGoodSignboard,
+      totalDrainIssue,
+      totalDefectiveCulvert,
      totalRoadDamage:
-        totalDefectedSignboard + totalPothole + totalRoadCrack + totalDamagedRoadMarking,
+        totalDefectedSignboard +
+        totalPothole +
+        totalRoadCrack +
+        totalDamagedRoadMarking +
+        totalDrainIssue +
+        totalDefectiveCulvert,
      chainageData,
    });
  }, [projectSummary, selectedPackageId, selectedChainageId]);
@@ -479,13 +530,21 @@ export default function DashboardPage() {
                  />
                </StaggerItem>
                <StaggerItem>
+                  <StatsCard
+                    title="Drain Issues"
+                    subtitle="Clogged or broken drainage"
+                    value={stats.totalDrainIssue}
+                    icon={Droplets}
+                  />
+                </StaggerItem>
+                {/* <StaggerItem>
                  <StatsCard
                    title="Good Signboards"
                    subtitle="Informational markers"
                    value={stats.totalGoodSignboard}
                    icon={CheckCircle2}
                  />
-                </StaggerItem>
+                </StaggerItem> */}
              </StaggerContainer>

              {/* Charts Row - Side by Side */}
@@ -502,12 +561,18 @@ export default function DashboardPage() {
                        pothole={stats.totalPothole}
                        roadCrack={stats.totalRoadCrack}
                        damagedRoadMarking={stats.totalDamagedRoadMarking}
-                        goodSignboard={stats.totalGoodSignboard}
+                        // goodSignboard={stats.totalGoodSignboard}
+                        drainIssue={stats.totalDrainIssue}
+                        defectiveCulvert={stats.totalDefectiveCulvert}
                      />
                    </CardContent>
                    <CardFooter className="flex-col gap-2 text-sm">
                      <div className="leading-none text-muted-foreground">
-                        Total detections: {stats.totalRoadDamage + stats.totalGoodSignboard}
+                        Total detections:{' '}
+                        {stats.totalRoadDamage +
+                          // stats.totalGoodSignboard +
+                          stats.totalDrainIssue +
+                          stats.totalDefectiveCulvert}
                      </div>
                    </CardFooter>
                  </Card>
--- a/src/app/(modules)/upload/page.tsx
+++ b/src/app/(modules)/upload/page.tsx
@@ -30,6 +30,7 @@ const DETECTION_METHODS = [
  { value: 'yoloe', label: 'YOLOE Open-Vocabulary Detection' },
  { value: 'yoloe_trained_vl', label: 'YOLOE With Vision Language Model' },
  { value: 'culvert_detection', label: 'Culvert Detection' },
+  { value: 'combined', label: 'Combined Detection Model' },
 ] as const;

 export default function UploadPage() {