Add popup for other layers

src/Map/Layers/OtherPostamates.jsx

@@ -3,6 +3,8 @@ import { otherPostamatesLayer } from "./layers-config";
 import { useLayersVisibility } from "../../stores/useLayersVisibility";
 import { LAYER_IDS } from "./constants";
 
+const typeFilter = ["==", ["get", "type"], "Постамат"];
+
 export const OtherPostamates = () => {
   const { isVisible } = useLayersVisibility();
 
@@ -16,6 +18,7 @@ export const OtherPostamates = () => {
         layout={{
           visibility: isVisible[LAYER_IDS.other] ? "visible" : "none",
         }}
+        filter={typeFilter}
       />
     </>
   );

src/Map/Layers/PVZ.jsx

@@ -3,6 +3,8 @@ import { pvzPointLayer } from "./layers-config";
 import { useLayersVisibility } from "../../stores/useLayersVisibility";
 import { LAYER_IDS } from "./constants";
 
+const typeFilter = ["==", ["get", "type"], "пвз"];
+
 export const PVZ = () => {
   const { isVisible } = useLayersVisibility();
 
@@ -16,6 +18,7 @@ export const PVZ = () => {
         layout={{
           visibility: isVisible[LAYER_IDS.pvz] ? "visible" : "none",
         }}
+        filter={typeFilter}
       />
     </>
   );

src/Map/MapComponent.jsx

@@ -143,6 +143,7 @@ export const MapComponent = () => {
                 LAYER_IDS.filteredWorking,
                 LAYER_IDS.cancelled,
                 LAYER_IDS.pvz,
+                LAYER_IDS.other,
               ]}
               onClick={handleClick}
               onMouseEnter={handleMouseEnter}

src/Map/Popup/mode-popup/FeatureProperties.jsx

@@ -2,22 +2,31 @@ import { CATEGORIES, STATUSES } from "../../../config";
 import {
   popupConfig,
   residentialPointConfig,
+  rivalsConfig,
   workingPointFields,
 } from "./config";
 import { Col, Row } from "antd";
 import { twMerge } from "tailwind-merge";
+import { LAYER_IDS } from "../../Layers/constants";
 
 export const FeatureProperties = ({ feature, dynamicStatus }) => {
   const isResidential = feature.properties.category === CATEGORIES.residential;
   const isWorking = feature.properties.status === STATUSES.working;
+  const isRivals =
+    feature.layer.id === LAYER_IDS.pvz || feature.layer.id === LAYER_IDS.other;
 
-  const config = isResidential ? residentialPointConfig : popupConfig;
+  const getConfig = () => {
+    if (isRivals) {
+      return rivalsConfig;
+    }
 
-  const finalConfig = isWorking ? [...config, ...workingPointFields] : config;
+    const config = isResidential ? residentialPointConfig : popupConfig;
+    return isWorking ? [...config, ...workingPointFields] : config;
+  };
 
   return (
     <div>
-      {finalConfig.map(({ field, name, render }) => {
+      {getConfig().map(({ field, name, render }) => {
         const value =
           dynamicStatus && field === "status"
             ? dynamicStatus

src/Map/Popup/mode-popup/config.js

@@ -93,3 +93,8 @@ export const workingPointFields = [
   { name: "Расхождение с прогнозом", field: "delta_current" },
   { name: "Зрелость", field: "age_day" },
 ];
+
+export const rivalsConfig = [
+  { name: "Инфо", field: "info" },
+  { name: "Категория", field: "type" },
+];