refactor: cleanup confusing unused code, swap frontend map legend order

Author: spwoodcock

src/backend/app/db/db_models.py

@@ -21,7 +21,6 @@
 from sqlalchemy.dialects.postgresql import JSONB, UUID
 from sqlalchemy.orm import (
     declarative_base,
-    object_session,
     relationship,
 )
 
@@ -35,7 +34,6 @@
     RegulatorApprovalStatus,
     State,
     TaskSplitType,
-    TaskStatus,
     UserRole,
 )
 from app.utils import timestamp
@@ -127,7 +125,6 @@ class DbProject(Base):
     side_overlap = cast(float, Column(Float, nullable=True))
     gsd_cm_px = cast(float, Column(Float, nullable=True))  # in cm_px
     altitude_from_ground = cast(float, Column(Float, nullable=True))
-    gsd_cm_px = cast(float, Column(Float, nullable=True))
     camera_bearings = cast(list[int], Column(ARRAY(SmallInteger), nullable=True))
     gimble_angles_degrees = cast(list, Column(ARRAY(SmallInteger), nullable=True))
     is_terrain_follow = cast(bool, Column(Boolean, default=False))
@@ -201,39 +198,6 @@ class DbProject(Base):
         {},
     )
 
-    @property
-    def tasks_mapped(self):
-        """Get the number of tasks mapped for a project."""
-        return (
-            object_session(self)
-            .query(DbTask)
-            .filter(DbTask.task_status == TaskStatus.MAPPED)
-            .with_parent(self)
-            .count()
-        )
-
-    @property
-    def tasks_validated(self):
-        """Get the number of tasks validated for a project."""
-        return (
-            object_session(self)
-            .query(DbTask)
-            .filter(DbTask.task_status == TaskStatus.VALIDATED)
-            .with_parent(self)
-            .count()
-        )
-
-    @property
-    def tasks_bad(self):
-        """Get the number of tasks marked bad for a project."""
-        return (
-            object_session(self)
-            .query(DbTask)
-            .filter(DbTask.task_status == TaskStatus.BAD)
-            .with_parent(self)
-            .count()
-        )
-
 
 class DbProjectImage(Base):
     """Describes an uploaded image for a project."""

src/backend/app/models/enums.py

@@ -22,34 +22,6 @@ class FinalOutput(StrEnum):
     DIGITAL_SURFACE_MODEL = "DIGITAL_SURFACE_MODEL"
 
 
-class TaskStatus(IntEnum):
-    """Enum describing available Task Statuses."""
-
-    READY = 0
-    LOCKED_FOR_MAPPING = 1
-    MAPPED = 2
-    LOCKED_FOR_VALIDATION = 3
-    VALIDATED = 4
-    INVALIDATED = 5
-    BAD = 6  # Task cannot be mapped
-    SPLIT = 7  # Task has been split
-
-
-class TaskAction(IntEnum):
-    """All possible task actions, recorded in task history."""
-
-    RELEASED_FOR_MAPPING = 0
-    LOCKED_FOR_MAPPING = 1
-    MARKED_MAPPED = 2
-    LOCKED_FOR_VALIDATION = 3
-    VALIDATED = 4
-    MARKED_INVALID = 5
-    MARKED_BAD = 6  # Task cannot be mapped
-    SPLIT_NEEDED = 7  # Task needs split
-    RECREATED = 8
-    COMMENT = 9
-
-
 class TaskSplitType(IntEnum):
     """Enum describing task splitting type."""
 
@@ -139,17 +111,21 @@ class UserRole(IntEnum):
 class State(IntEnum):
     """The state of a task.
 
+    This is determined from the most recent entry in `task_events`
+    for a given task.
+
     The state can be:
-    - ``request for mapping``
-    - ``unlocked to map``
-    - ``locked for mapping``
-    - ``unlocked to validate``
-    - ``locked for validation``
-    - ``unlocked done``
-    - ``Unflyable task``
-    - ``image uploaded``
-    - ``image processed``
-    - ``image processing failed``
+    - REQUEST_FOR_MAPPING: someone was request to map the task.
+    - UNLOCKED_TO_MAP: default status, ready to fly.
+    - LOCKED_FOR_MAPPING: locked by a user that is about to fly the task.
+    - ~UNLOCKED_TO_VALIDATE~: flying complete, requires validation (not used yet).
+    - ~LOCKED_FOR_VALIDATION~: currently being validated (not used yet).
+    - ~UNLOCKED_DONE~: task is complete and validated (currently not used).
+    - UNFLYABLE_TASK: not possibly to fly - marked bad.
+    - IMAGE_UPLOADED: imagery has been uploaded for the task.
+    - IMAGE_PROCESSING_FAILED: failed processing in ODM.
+    - IMAGE_PROCESSING_STARTED: started processing in ODM.
+    - IMAGE_PROCESSING_FINISHED: successful processing in ODM.
     """
 
     REQUEST_FOR_MAPPING = -1

src/frontend/src/components/IndividualProject/MapSection/Legend.tsx

@@ -20,35 +20,42 @@ const Legend = () => {
         </div>
         {showLegendItems && (
           <div className="naxatw-flex naxatw-flex-col naxatw-gap-1">
+            {/* REQUEST_FOR_MAPPING */}
             <div className="naxatw-flex naxatw-gap-2">
-              <div className="naxatw-h-5 naxatw-w-5 naxatw-bg-[#ACD2C4]" />
-              <p className="naxatw-text-sm">Finished Tasks</p>
+              <div className="naxatw-h-5 naxatw-w-5 naxatw-bg-[#F3C5C5]" />
+              <p className="naxatw-text-sm">Flight Requested</p>
+            </div>
+            {/* LOCKED_FOR_MAPPING */}
+            <div className="naxatw-flex naxatw-gap-2">
+              <div className="naxatw-h-5 naxatw-w-5 naxatw-bg-[#98BBC8]">
+                <img src={lock} alt="area-icon" className="naxatw-p-0.5" />
+              </div>
+              <p className="naxatw-text-sm">Locked Tasks</p>
             </div>
+            {/* IMAGE_UPLOADED */}
             <div className="naxatw-flex naxatw-gap-2">
               <div className="naxatw-h-5 naxatw-w-5 naxatw-bg-[#9ec7ff]" />
-              <p className="naxatw-text-sm">Image Uploaded</p>
+              <p className="naxatw-text-sm">Ready To Process</p>
             </div>
+            {/* IMAGE_PROCESSING_STARTED */}
             <div className="naxatw-flex naxatw-gap-2">
               <div className="naxatw-h-5 naxatw-w-5 naxatw-bg-[#9C77B2] naxatw-opacity-60" />
               <p className="naxatw-text-sm">Image Processing Started</p>
             </div>
+            {/* IMAGE_PROCESSING_FAILED */}
             <div className="naxatw-flex naxatw-gap-2">
               <div className="naxatw-h-5 naxatw-w-5 naxatw-bg-[#D73F3F] naxatw-opacity-60" />
               <p className="naxatw-text-sm">Image Processing Failed</p>
             </div>
+            {/* IMAGE_PROCESSING_FINISHED */}
             <div className="naxatw-flex naxatw-gap-2">
-              <div className="naxatw-h-5 naxatw-w-5 naxatw-bg-[#F3C5C5]" />
-              <p className="naxatw-text-sm">Requested Tasks</p>
-            </div>
-            <div className="naxatw-flex naxatw-gap-2">
-              <div className="naxatw-h-5 naxatw-w-5 naxatw-bg-[#98BBC8]">
-                <img src={lock} alt="area-icon" className="naxatw-p-0.5" />
-              </div>
-              <p className="naxatw-text-sm">Locked Tasks</p>
+              <div className="naxatw-h-5 naxatw-w-5 naxatw-bg-[#ACD2C4]" />
+              <p className="naxatw-text-sm">Finished Tasks</p>
             </div>
+            {/* UNLOCKED_TO_MAP */}
             <div className="naxatw-flex naxatw-gap-2">
               <div className="naxatw-h-5 naxatw-w-5 naxatw-border naxatw-border-[#68707F]" />
-              <p className="naxatw-text-sm">Remaining Task</p>
+              <p className="naxatw-text-sm">Not Started</p>
             </div>
             <div className="naxatw-flex naxatw-gap-2">
               <div className="naxatw-h-5 naxatw-w-5">