Merge branch 'feature/map_fix' into 'dev'

map fix

See merge request spatial/postamates_frontend!28

src/Map/Layers/OnApprovalPoints.jsx

@@ -25,7 +25,7 @@ export const OnApprovalPoints = () => {
         {...approvePointLayer}
         id={LAYER_IDS.approve}
         source={"points"}
-        source-layer={"public.service_points_with_dist"}
+        source-layer={"public.points_with_dist"}
         layout={{
           visibility: isVisible[LAYER_IDS.approve] ? "visible" : "none",
         }}

src/modules/Sidebar/PendingPointsFilters/PendingPointsFilters.jsx

@@ -10,7 +10,7 @@ import {
   useHasManualEdits,
   usePointSelection,
 } from "../../../stores/usePointSelection";
-import { usePendingPointsFilters } from "../../../stores/usePendingPointsFilters";
+import {RANGE_FILTERS_KEYS, usePendingPointsFilters} from "../../../stores/usePendingPointsFilters";
 import { ClearFiltersButton } from "../../../components/ClearFiltersButton";
 import { getDynamicActiveFilters } from "../utils";
 import { useCanEdit } from "../../../api";
@@ -19,7 +19,7 @@ import { AdvancedFiltersWrapper } from "./AdvancedFilters/AdvancedFiltersWrapper
 export const PendingPointsFilters = () => {
   const hasManualEdits = useHasManualEdits();
   const { reset: resetPointSelection } = usePointSelection();
-  const { ranges, filters, setRegion, clear } = usePendingPointsFilters();
+  const { ranges, filters, setRegion, setFilterWithKey, setPrediction, setCategories } = usePendingPointsFilters();
 
   const [isSelectionEmpty, setIsSelectionEmpty] = useState(false);
 
@@ -51,7 +51,14 @@ export const PendingPointsFilters = () => {
     "prediction",
   ]);
 
-  const clearFilters = () => clear(ranges);
+  const clearFilters = () => {
+    RANGE_FILTERS_KEYS.map((key) => {
+      setFilterWithKey(ranges[key], key);
+    });
+    setPrediction(ranges.prediction);
+    setCategories([]);
+    setRegion(null);
+  };
 
   const hasActiveFilters =
     filters.region ||

src/stores/useLayersVisibility.js

@@ -5,14 +5,12 @@ import { persist } from "zustand/middleware";
 
 const INITIAL_STATE = {
   [LAYER_IDS.initial]: true,
-  [LAYER_IDS.approve]: false,
-  [LAYER_IDS.working]: false,
+  [LAYER_IDS.approve]: true,
+  [LAYER_IDS.working]: true,
   [LAYER_IDS.filteredWorking]: false,
-  [LAYER_IDS.cancelled]: false,
+  [LAYER_IDS.cancelled]: true,
   [LAYER_IDS.pvz]: true,
   [LAYER_IDS.other]: true,
-  [`${LAYER_IDS.pvz_category}1`]: true,
-  [`${LAYER_IDS.pvz_category}2`]: true,
 };
 
 const STATIC_LAYERS = [LAYER_IDS.pvz, LAYER_IDS.other];