Filter only initial points in the initial mode

src/Map/Layers/CancelledPoints.jsx

@@ -1,19 +1,27 @@
 import { Layer } from "react-map-gl";
 import { cancelledPointLayer } from "./layers-config";
 import { useLayersVisibility } from "../../stores/useLayersVisibility";
-import { STATUSES } from "../../config";
+import { MODES, STATUSES } from "../../config";
 import { useRegionFilterExpression } from "./useRegionFilterExpression";
 import { LAYER_IDS } from "./constants";
+import { useMode } from "../../stores/useMode";
 
 const statusExpression = ["==", ["get", "status"], STATUSES.cancelled];
 
 export const CancelledPoints = () => {
   const { isVisible } = useLayersVisibility();
   const regionFilterExpression = useRegionFilterExpression();
+  const { mode } = useMode();
 
-  const filter = regionFilterExpression
+  const getFilter = () => {
-    ? ["all", statusExpression, regionFilterExpression]
+    if (mode === MODES.APPROVE_WORKING) {
-    : statusExpression;
+      return regionFilterExpression
+        ? ["all", statusExpression, regionFilterExpression]
+        : statusExpression;
+    }
+
+    return statusExpression;
+  };
 
   return (
     <>
@@ -25,7 +33,7 @@ export const CancelledPoints = () => {
         layout={{
           visibility: isVisible[LAYER_IDS.cancelled] ? "visible" : "none",
         }}
-        filter={filter}
+        filter={getFilter()}
       />
     </>
   );

src/Map/Layers/WorkingPoints.jsx

@@ -1,19 +1,27 @@
 import { Layer } from "react-map-gl";
 import { workingPointLayer } from "./layers-config";
 import { useLayersVisibility } from "../../stores/useLayersVisibility";
-import { STATUSES } from "../../config";
+import { MODES, STATUSES } from "../../config";
 import { useRegionFilterExpression } from "./useRegionFilterExpression";
 import { LAYER_IDS } from "./constants";
+import { useMode } from "../../stores/useMode";
 
 const statusExpression = ["==", ["get", "status"], STATUSES.working];
 
 export const WorkingPoints = () => {
   const { isVisible } = useLayersVisibility();
   const regionFilterExpression = useRegionFilterExpression();
+  const { mode } = useMode();
 
-  const filter = regionFilterExpression
+  const getFilter = () => {
-    ? ["all", statusExpression, regionFilterExpression]
+    if (mode === MODES.APPROVE_WORKING) {
-    : ["all", statusExpression];
+      return regionFilterExpression
+        ? ["all", statusExpression, regionFilterExpression]
+        : statusExpression;
+    }
+
+    return statusExpression;
+  };
 
   return (
     <>
@@ -25,7 +33,7 @@ export const WorkingPoints = () => {
         layout={{
           visibility: isVisible[LAYER_IDS.working] ? "visible" : "none",
         }}
-        filter={filter}
+        filter={getFilter()}
       />
     </>
   );

src/Map/MapComponent.jsx

@@ -140,6 +140,7 @@ export const MapComponent = () => {
                 LAYER_IDS["initial-unmatch"],
                 LAYER_IDS.approve,
                 LAYER_IDS.working,
+                LAYER_IDS.filteredWorking,
                 LAYER_IDS.cancelled,
                 LAYER_IDS.pvz,
               ]}