feat: update colors and home icon

Co-authored-by: Микаэл Оганесян <mikaeloganesan@MacBook-Pro-Mikael.local>
Reviewed-on: #17
Reviewed-by: Илья Куприец <kkzemeow@gmail.com>

.gitignore

@@ -1,7 +1,14 @@
 # Logs
+<<<<<<< HEAD
+
+logs
+_.log
+npm-debug.log_
+=======
 logs
 *.log
 npm-debug.log*
+>>>>>>> 6b9aa78 (init: Init React Application)
 yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
@@ -10,10 +17,22 @@ lerna-debug.log*
 node_modules
 dist
 dist-ssr
-*.local
+<<<<<<< HEAD
+\*.local
 
-# Build artifacts
+# Editor directories and files
-*.tsbuildinfo
+
+.vscode/_
+!.vscode/extensions.json
+.idea
+.DS_Store
+_.suo
+_.ntvs_
+_.njsproj
+_.sln
+\*.sw?
+=======
+*.local
 
 # Editor directories and files
 .vscode/*
@@ -25,3 +44,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+>>>>>>> 6b9aa78 (init: Init React Application)

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "white-nights",
-  "version": "1.0.8",
+  "version": "1.0.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "white-nights",
-      "version": "1.0.8",
+      "version": "1.0.6",
       "license": "UNLICENSED",
       "dependencies": {
         "@emotion/react": "^11.14.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "white-nights",
   "private": true,
-  "version": "1.0.8",
+  "version": "1.0.6",
   "type": "module",
   "license": "UNLICENSED",
   "scripts": {
@@ -18,6 +18,7 @@
     "@mui/material": "^7.1.0",
     "@mui/x-data-grid": "^8.5.1",
     "@photo-sphere-viewer/core": "^5.13.2",
+    "@pixi/react": "^8.0.2",
     "@react-three/drei": "^10.1.2",
     "@react-three/fiber": "^9.1.2",
     "@tailwindcss/vite": "^4.1.8",
@@ -32,6 +33,7 @@
     "overlayscrollbars": "^2.15.1",
     "overlayscrollbars-react": "^0.5.6",
     "path": "^0.12.7",
+    "pixi.js": "^8.10.1",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "react-markdown": "^10.1.0",

src/app/index.tsx

@@ -1,19 +1,13 @@
 import * as React from "react";
 
 import { Router } from "./router";
-import { CustomTheme, languageStore } from "@shared";
+import { CustomTheme } from "@shared";
 import { ThemeProvider } from "@mui/material/styles";
 import { ToastContainer } from "react-toastify";
 import { GlobalErrorBoundary } from "./GlobalErrorBoundary";
 import { TestingModeBanner } from "@widgets";
-import { observer } from "mobx-react-lite";
 
-export const App: React.FC = observer(() => {
+export const App: React.FC = () => (
-  React.useEffect(() => {
-    document.documentElement.lang = languageStore.language;
-  }, [languageStore.language]);
-
-  return (
   <GlobalErrorBoundary>
     <ThemeProvider theme={CustomTheme.Light}>
       <TestingModeBanner />
@@ -22,4 +16,3 @@ export const App: React.FC = observer(() => {
     </ThemeProvider>
   </GlobalErrorBoundary>
 );
-});

src/app/router/index.tsx

@@ -92,9 +92,6 @@ const ProtectedRoute = ({ children }: { children: React.ReactNode }) => {
     requiredPermissions.length > 0 &&
     !requiredPermissions.every((permission) => authStore.canAccess(permission))
   ) {
-    if (location.pathname === "/devices" && authStore.hasRole("devices_maintenance_rw")) {
-      return <>{children}</>;
-    }
     return <Navigate to="/" replace />;
   }
 

src/client/src/App.jsx

@@ -23,7 +23,6 @@ const App = observer(() => {
     loadingStatus,
     loadingProgress,
     context,
-    carrier,
     setIsLoading,
     setLoadingStatus,
     setLoadingProgress,
@@ -173,7 +172,6 @@ const App = observer(() => {
           loadingStatus={loadingStatus}
           loadingProgress={loadingProgress}
           onToggleDebug={() => setIsDebugVisible((prev) => !prev)}
-          videoId={carrier?.video_preview}
         />
       ) : (
         <div>

src/client/src/api/ApiStore/store.ts

@@ -24,54 +24,6 @@ import {
 // @ts-ignore
 import { orderStationsByRoute } from "../../utils/routeStationsUtils";
 import { resamplePath } from "../../utils/animationUtils";
-import { colorStore } from "../../stores/ColorStore";
-
-function hexToRgbString(hex: string): string | null {
-  const clean = hex.trim().replace(/^#/, "");
-  const full = clean.length === 3 ? clean.split("").map((c) => c + c).join("") : clean;
-  if (full.length !== 6) return null;
-  const r = parseInt(full.slice(0, 2), 16);
-  const g = parseInt(full.slice(2, 4), 16);
-  const b = parseInt(full.slice(4, 6), 16);
-  return `${r}, ${g}, ${b}`;
-}
-
-function darkenHex(hex: string, amount: number): string {
-  const rgb = hexToRgbString(hex);
-  if (!rgb) return hex;
-  const [r, g, b] = rgb.split(",").map(Number);
-  const factor = 1 - amount;
-  const dr = Math.round(r * factor);
-  const dg = Math.round(g * factor);
-  const db = Math.round(b * factor);
-  return `#${dr.toString(16).padStart(2, "0")}${dg.toString(16).padStart(2, "0")}${db.toString(16).padStart(2, "0")}`;
-}
-
-function lightenRgbString(hex: string, amount: number): string | null {
-  const rgb = hexToRgbString(hex);
-  if (!rgb) return null;
-  const [r, g, b] = rgb.split(",").map(Number);
-  const lr = Math.round(r + (255 - r) * amount);
-  const lg = Math.round(g + (255 - g) * amount);
-  const lb = Math.round(b + (255 - b) * amount);
-  return `${lr}, ${lg}, ${lb}`;
-}
-
-function applyCarrierColors(carrier: { main_color?: string; left_color?: string; right_color?: string }) {
-  const mainColor = carrier.main_color || "#006f3a";
-  const leftColor = carrier.left_color || "#006f3a";
-  const rightColor = carrier.right_color || "#006f3a";
-  const mainDark = darkenHex(mainColor, 0.3);
-
-  document.documentElement.style.setProperty("--carrier-main", mainColor);
-  document.documentElement.style.setProperty("--carrier-main-rgb", hexToRgbString(mainColor) ?? "0, 111, 58");
-  document.documentElement.style.setProperty("--carrier-main-dark", mainDark);
-  document.documentElement.style.setProperty("--carrier-left", leftColor);
-  document.documentElement.style.setProperty("--carrier-left-rgb", hexToRgbString(leftColor) ?? "0, 111, 58");
-  document.documentElement.style.setProperty("--carrier-right", rightColor);
-  document.documentElement.style.setProperty("--carrier-right-rgb", hexToRgbString(rightColor) ?? "0, 111, 58");
-  document.documentElement.style.setProperty("--carrier-right-menu-rgb", lightenRgbString(rightColor, 0.38) ?? "179, 165, 152");
-}
 
 class ApiStore {
   isLoading = true;
@@ -163,10 +115,6 @@ class ApiStore {
 
   getCarrier = async () => {
     this.carrier = await getCarrier(this.route!.carrier_id!);
-    applyCarrierColors(this.carrier);
-    if (this.carrier.main_color) {
-      colorStore.setMainColor(this.carrier.main_color);
-    }
   };
 
   getCity = async () => {

src/client/src/api/ApiStore/types.ts

@@ -55,7 +55,6 @@ export type GetRouteResponse = {
   center_latitude: number;
   center_longitude: number;
   governor_appeal: number;
-  button_text?: string;
   id: number;
   path: [number, number][];
   rotate: number;
@@ -77,13 +76,8 @@ export type GetCarrierResponse = {
   full_name: string;
   id: number;
   logo: string;
-  preview_media?: string;
-  video_preview?: string;
   short_name: string;
   slogan: string;
-  main_color?: string;
-  left_color?: string;
-  right_color?: string;
 };
 
 export type GetCityResponse = {

src/client/src/components/Fullscreen3DModal.jsx

@@ -37,14 +37,14 @@ const Fullscreen3DModal = ({ isOpen, onClose, fileUrl }) => {
         </div>
       </div>
       <div className="fullscreen-3d-actions">
-        <button disabled={scale >= 1}>
+        <button title="Увеличить масштаб" disabled={scale >= 1}>
           <img src={scale_plus} alt="Увеличить" />
         </button>
-        <button disabled={scale <= 0.1}>
+        <button title="Уменьшить масштаб" disabled={scale <= 0.1}>
           <img src={scale_minus} alt="Уменьшить" />
         </button>
 
-        <button onPointerUp={onClose}>
+        <button onPointerUp={onClose} title="Закрыть">
           <img src={closeIcon} alt="Закрыть" />
         </button>
       </div>

src/client/src/components/ListOfSights.jsx

@@ -95,10 +95,9 @@ const ListOfSights = observer(() => {
 
         // Находим все достопримечательности, начинающиеся с выбранной буквы
         const sightsForLetter = sightData.filter((sight) => {
-          const name = sight.name;
+          if (!sight.name) return false;
-          if (!name) return false;
 
-          let sightFirstChar = name.trim().charAt(0);
+          let sightFirstChar = sight.name.trim().charAt(0);
 
           // Для китайского языка используем пиньинь или иероглиф
           if (selectedLanguageRight === "zh") {
@@ -106,7 +105,7 @@ const ListOfSights = observer(() => {
               sightFirstChar = sight.name_pinyin.trim().toUpperCase().charAt(0);
             } else {
               // Если пиньинь нет, используем первый иероглиф
-              sightFirstChar = name.trim().charAt(0);
+              sightFirstChar = sight.name.trim().charAt(0);
             }
           } else {
             sightFirstChar = sightFirstChar.toUpperCase();
@@ -412,13 +411,13 @@ const ListOfSights = observer(() => {
   }, [currentSelectedSight]);
 
   return (
-    <div className="right-widget" lang={selectedLanguageRight}>
+    <div className="right-widget">
       {currentSelectedSight && (
         <SightFrame
           key={currentSelectedSight.id}
           media={sightFrameMedia}
           sight_id={currentSelectedSight.id}
-          sight_name={currentSelectedSight.name}
+          sight_name={currentSelectedSight.short_name || currentSelectedSight.name}
           selectedLanguageRight={selectedLanguageRight}
         />
       )}
@@ -441,6 +440,11 @@ const ListOfSights = observer(() => {
           isLangOpen={isLangMenuOpen}
         />
 
+        <TransferWidget
+          isOpen={isTransferWidgetOpen}
+          selectedLanguageRight={selectedLanguage}
+        />
+
         <LanguageSelector
           selectedLanguageRight={selectedLanguageRight}
           onLanguageChange={handleLanguageChange}
@@ -472,12 +476,6 @@ const ListOfSights = observer(() => {
             isDisabled={isAlphabetDisabled}
           />
         </div>
-      </div>
-
-      <TransferWidget
-        isOpen={isTransferWidgetOpen}
-        selectedLanguageRight={selectedLanguage}
-      />
 
         <div
           className="transfer-button-container"
@@ -515,6 +513,7 @@ const ListOfSights = observer(() => {
           </div>
         </div>
       </div>
+    </div>
   );
 });
 

src/client/src/components/ListOfSights/AlphabetNavigator.jsx

@@ -14,9 +14,8 @@ const AlphabetNavigator = forwardRef(function AlphabetNavigator(
     const letters = new Set();
 
     sightData.forEach((sight) => {
-      const name = sight.short_name || sight.name;
+      if (sight.name && sight.name.trim()) {
-      if (name && name.trim()) {
+        let firstChar = sight.name.trim().charAt(0);
-        let firstChar = name.trim().charAt(0);
 
         // Для китайского языка используем пиньинь (если доступен) или иероглиф
         if (selectedLanguage === "zh") {
@@ -24,7 +23,7 @@ const AlphabetNavigator = forwardRef(function AlphabetNavigator(
             firstChar = sight.name_pinyin.trim().toUpperCase().charAt(0);
           } else {
             // Если пиньинь нет, используем первый иероглиф
-            firstChar = name.trim().charAt(0);
+            firstChar = sight.name.trim().charAt(0);
           }
         } else {
           firstChar = firstChar.toUpperCase();

src/client/src/components/ListOfSights/ListHeader.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from "react";
+import React from "react";
 
 const LANGUAGES = {
   EN: "en",
@@ -18,26 +18,6 @@ const ListHeader = function ListHeader({
   isTransferWidgetOpen,
   onBackToNearest,
 }) {
-  const [isIdle, setIsIdle] = useState(false);
-  const timerRef = useRef(null);
-
-  useEffect(() => {
-    const resetTimer = () => {
-      setIsIdle(false);
-      clearTimeout(timerRef.current);
-      timerRef.current = setTimeout(() => setIsIdle(true), 15000);
-    };
-
-    const events = ["pointermove", "pointerdown", "touchstart", "keydown"];
-    events.forEach((e) => window.addEventListener(e, resetTimer));
-    resetTimer();
-
-    return () => {
-      clearTimeout(timerRef.current);
-      events.forEach((e) => window.removeEventListener(e, resetTimer));
-    };
-  }, []);
-
   const getTitle = () => {
     return selectedLanguageRight === LANGUAGES.RU
       ? "Достопримечательности"
@@ -61,11 +41,14 @@ const ListHeader = function ListHeader({
       >
         <svg
           xmlns="http://www.w3.org/2000/svg"
-          width="20"
+          width="21"
-          height="20"
+          height="12"
           viewBox="0 0 21 12"
           fill="none"
-          className={`chevron-svg${isOpen ? " is-open" : ""}${isIdle ? " is-idle" : ""}`}
+          style={{
+            transform: isOpen ? "rotate(180deg)" : "rotate(0deg)",
+            transition: "transform 0.15s ease-in-out",
+          }}
         >
           <g clipPath="url(#clip0_658_91932)">
             <path

src/client/src/components/ListOfSights/SightComponent.jsx

@@ -36,7 +36,7 @@ const SightComponent = function SightComponent({
       aria-label={`Выбрать достопримечательность ${title}`}
     >
       <div className="sight-image">{renderThumbnail()}</div>
-      <div className="sight-title">
+      <div className="sight-title" title={title}>
         {title}
       </div>
     </div>

src/client/src/components/ListOfSights/SightFrame.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef, useMemo, useLayoutEffect, useCallback } from "react";
+import React, { useState, useEffect, useRef, useMemo } from "react";
 import axios from "axios";
 import { observer } from "mobx-react-lite";
 import { useGeolocationStore } from "../../stores";
@@ -41,68 +41,10 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
   const [isFullscreen3D, setIsFullscreen3D] = useState(false);
   const [fullscreenFileUrl, setFullscreenFileUrl] = useState("");
   const [threeViewResetKey, setThreeViewResetKey] = useState(0);
-  const [isSwitching, setIsSwitching] = useState(false);
   const threeViewControlRef = useRef(null);
   const mediaCache = useRef({});
-  const prevSightIdRef = useRef(null);
 
   const textWrapperRef = useRef(null);
-  const mediaStackRef = useRef(null);
-  const titleRef = useRef(null);
-  const switchTimerRef = useRef(null);
-  const homeButtonRef = useRef(null);
-  const menuRef = useRef(null);
-  const [menuNeedsScroll, setMenuNeedsScroll] = useState(false);
-  const [canScrollLeft, setCanScrollLeft] = useState(false);
-  const [canScrollRight, setCanScrollRight] = useState(false);
-
-  const currentSection = articleSections?.[selectedSection] ?? null;
-
-  const requestSection = (target) => {
-    setIsFullscreen3D(false);
-    if (target === selectedSection) return;
-    if (switchTimerRef.current) clearTimeout(switchTimerRef.current);
-    setIsSwitching(true);
-    switchTimerRef.current = setTimeout(() => {
-      setSelectedSection(target);
-      setIsSwitching(false);
-      switchTimerRef.current = null;
-    }, 180);
-  };
-
-  const updateScrollState = useCallback(() => {
-    const menu = menuRef.current;
-    if (!menu) return;
-    setCanScrollLeft(menu.scrollLeft > 2);
-    setCanScrollRight(menu.scrollLeft + menu.clientWidth < menu.scrollWidth - 2);
-  }, []);
-
-  useEffect(() => {
-    const menu = menuRef.current;
-    if (!menu || !menuNeedsScroll) {
-      setCanScrollLeft(false);
-      setCanScrollRight(false);
-      return;
-    }
-    updateScrollState();
-    menu.addEventListener('scroll', updateScrollState);
-    return () => menu.removeEventListener('scroll', updateScrollState);
-  }, [menuNeedsScroll, updateScrollState]);
-
-  useLayoutEffect(() => {
-    const menu = menuRef.current;
-    if (!menu) return;
-    const children = Array.from(menu.querySelectorAll('.sight-frame-menu-point'));
-    if (children.length < 2) {
-      setMenuNeedsScroll(false);
-      return;
-    }
-    const style = getComputedStyle(menu);
-    const availableWidth = menu.clientWidth - parseFloat(style.paddingLeft) - parseFloat(style.paddingRight);
-    const totalChildrenWidth = children.reduce((sum, el) => sum + el.offsetWidth, 0);
-    const evenGap = (availableWidth - totalChildrenWidth) / (children.length + 1);
-    setMenuNeedsScroll(evenGap < 10);
-  }, [articleSections]);
 
   const {
     routeSights,
@@ -142,16 +84,11 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
     const controller = new AbortController();
     const { signal } = controller;
 
-    const isSameSight = prevSightIdRef.current === sight_id;
-    prevSightIdRef.current = sight_id;
-
-    if (!isSameSight) {
     setIsLoadingContent(true);
     setContentError(null);
     setModelAspectRatio(null);
     setIsVisible(false);
     setMediaData({});
-    }
 
     if (!sight_id) {
       setContentError("Не указан ID статьи.");
@@ -229,18 +166,12 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
         const introSection = {
           id: media?.id || "intro-title",
           heading:
-            sight?.name || sight_name || "Название достопримечательности",
+            sight?.short_name || sight?.name || sight_name || "Название достопримечательности",
           body: "",
         };
         const allSections = [introSection, ...rightArticles];
         setArticleSections(allSections);
 
-        if (isSameSight) {
-          setIsLoadingContent(false);
-          setIsVisible(true);
-          return;
-        }
-
         const cacheKey = `${sight_id}_${selectedLanguageRight}`;
         if (mediaCache.current[cacheKey]) {
           setMediaData(mediaCache.current[cacheKey]);
@@ -281,43 +212,9 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
 
   useEffect(() => {
     setSelectedSection(0);
-    setIsSwitching(false);
-    if (switchTimerRef.current) {
-      clearTimeout(switchTimerRef.current);
-      switchTimerRef.current = null;
-    }
   }, [sight_id]);
 
-  useLayoutEffect(() => {
+  const currentSection = articleSections?.[selectedSection] ?? null;
-    const scrollable = textWrapperRef.current?.querySelector(".scrollable");
-    if (scrollable) scrollable.scrollTop = 0;
-  }, [selectedSection]);
-
-  useEffect(() => {
-    if (!isFullscreen3D) return;
-
-    let idleSeconds = 0;
-    const intervalId = setInterval(() => {
-      idleSeconds += 1;
-
-      if (idleSeconds >= 60) {
-        setIsFullscreen3D(false);
-      }
-    }, 1000);
-
-    const resetIdle = () => {
-      idleSeconds = 0;
-    };
-
-    const events = ["pointerdown", "pointermove", "touchstart", "keydown"];
-    events.forEach((e) => window.addEventListener(e, resetIdle, { passive: true }));
-
-    return () => {
-      clearInterval(intervalId);
-      events.forEach((e) => window.removeEventListener(e, resetIdle));
-    };
-  }, [isFullscreen3D]);
-
 
   const renderCurrentMedia = () => {
     if (!articleSections || Object.keys(mediaData).length === 0) {
@@ -347,7 +244,9 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
               alt=""
               className={className}
               onError={(e) => {
-                console.warn(`Failed to load image: ${currentMediaData.path}`);
+                console.warn(
+                  `Failed to load image: ${currentMediaData.path}`,
+                );
                 e.target.style.display = "none";
               }}
             />
@@ -362,7 +261,9 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
               playsInline
               className={className}
               onError={(e) => {
-                console.warn(`Failed to load video: ${currentMediaData.path}`);
+                console.warn(
+                  `Failed to load video: ${currentMediaData.path}`,
+                );
                 e.target.style.display = "none";
               }}
             >
@@ -412,20 +313,27 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
                 <button
                   type="button"
                   className="three-d-control-btn"
-                  onPointerUp={() => threeViewControlRef.current?.zoomOut?.()}
+                  title="Уменьшить"
+                  onPointerUp={() =>
+                    threeViewControlRef.current?.zoomOut?.()
+                  }
                 >
                   <MinusIcon />
                 </button>
                 <button
                   type="button"
                   className="three-d-control-btn"
-                  onPointerUp={() => threeViewControlRef.current?.zoomIn?.()}
+                  title="Увеличить"
+                  onPointerUp={() =>
+                    threeViewControlRef.current?.zoomIn?.()
+                  }
                 >
                   <PlusIcon />
                 </button>
                 <button
                   type="button"
                   className="three-d-control-btn"
+                  title={isFullscreen3D ? "Свернуть" : "Развернуть"}
                   onPointerUp={() => {
                     if (isFullscreen3D) {
                       setIsFullscreen3D(false);
@@ -440,6 +348,11 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
               </div>
               <button
                 className={"fullscreen-3d-button"}
+                title={
+                  isFullscreen3D
+                    ? "Закрыть полноэкранный режим"
+                    : "Открыть в полноэкранном режиме"
+                }
                 aria-hidden="true"
               >
                 <svg
@@ -455,8 +368,7 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
                   />
                 </svg>
               </button>
-              {isFullscreen3D && (
+              {isFullscreen3D && <div
-                <div
                 style={{
                   position: "absolute",
                   top: 94,
@@ -468,7 +380,7 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
                 <div
                   className="cluster-sights-list"
                   style={{
-                      background: `linear-gradient(to bottom right, rgba(255, 255, 255, 0.2) 0%, rgba(255, 255, 255, 0) 100%), rgba(var(--carrier-right-rgb, 0, 111, 58), 0.4)`,
+                    background: `linear-gradient(to bottom right, rgba(255, 255, 255, 0.2) 0%, rgba(255, 255, 255, 0) 100%), rgba(0, 111, 58, 0.4)`,
                     backdropFilter: "blur(10px)",
                     borderRadius: "8px",
                     width: 200,
@@ -482,26 +394,15 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
                   {[
                     {
                       label: "Вращать",
-                        icon: (
+                      icon: <img src={rotate3DIcon} alt="" width="14" height="14" />,
-                          <img
-                            src={rotate3DIcon}
-                            alt=""
-                            width="14"
-                            height="14"
-                          />
-                        ),
                     },
                     {
                       label: "Приблизить / Отдалить",
-                        icon: (
+                      icon: <img src={zoom3DIcon} alt="" width="14" height="14" />,
-                          <img src={zoom3DIcon} alt="" width="14" height="14" />
-                        ),
                     },
                     {
                       label: "Переместить",
-                        icon: (
+                      icon: <img src={pan3DIcon} alt="" width="14" height="14" />,
-                          <img src={pan3DIcon} alt="" width="14" height="14" />
-                        ),
                     },
                   ].map((item, index, arr) => (
                     <div
@@ -547,8 +448,7 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
                     </div>
                   ))}
                 </div>
-                </div>
+              </div>}
-              )}
             </div>
           );
         default:
@@ -613,6 +513,7 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
   const processedSightName = useMemo(() => {
     if (!sight_name) return sight_name;
 
+    // Handle \n line breaks (только в правом виджете)
     if (sight_name.includes("\n")) {
       return sight_name.split("\n").map((line, i) => (
         <React.Fragment key={i}>
@@ -657,7 +558,6 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
   }, [sight_name]);
 
   return (
-    <>
     <div
       className={`sight-frame ${isVisible ? "is-visible" : ""} ${
         isFullscreen3D && isCurrentMedia3D ? "three-d-fullscreen" : ""
@@ -667,7 +567,6 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
         <Watermark path={ContentAPI.getMediaPath(sightData.watermark_lu)} />
       )}
       <div
-          ref={mediaStackRef}
         className={`sight-frame-media-stack ${
           isCurrentMedia3D ? "three-d-view" : ""
         }`}
@@ -685,68 +584,64 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
           renderCurrentMedia()
         )}
       </div>
-        <div className={`sight-frame-content ${isSwitching ? "is-switching" : ""}`}>
+      <div className="sight-frame-content">
         {contentError ? (
           <p className="error-message">{contentError}</p>
+        ) : !currentSection ? (
+          <p>Информация отсутствует.</p>
         ) : (
           <>
             {!isFullscreen3D && (
               <div
-                  ref={titleRef}
                 className={`sight-frame-title ${
                   selectedSection === 0 ? "intro-title" : ""
                 }`}
                 style={{ lineHeight: titleLineHeight }}
               >
                 <p
-                    key={selectedSection}
-                    className="fade-in-text"
                   style={{
                     whiteSpace: "normal",
                     wordBreak: "break-word",
                     overflowWrap: "break-word",
                   }}
                 >
-                    {selectedSection === 0
+                  {selectedSection === 0 ? processedSightName : (sightData?.short_name || sight_name)}
-                      ? processedSightName || sightData?.name
-                      : sightData?.short_name || sightData?.name}
                 </p>
               </div>
             )}
+            {selectedSection !== 0 && (
               <TouchableLayout
-                key={selectedSection}
+                className="sight-frame-text-wrapper"
-                className={`sight-frame-text-wrapper ${selectedSection === 0 ? "is-intro" : ""}`}
                 ref={textWrapperRef}
+                maxHeight="calc(80vh - 354px)"
               >
-                <div className="sight-frame-text fade-in-text">
+                <div className="sight-frame-text">
-                  {isLoadingContent || !currentSection ? (
-                    <div className="sight-frame-loading-placeholder" />
-                  ) : (
-                    selectedSection !== 0 && (
                   <ReactMarkdownComponent value={currentSection.body} />
-                    )
-                  )}
                 </div>
               </TouchableLayout>
+            )}
           </>
         )}
       </div>
-      </div>
+      <div className="sight-frame-menu">
+        {selectedSection !== 0 && (
           <div
-        className="sight-frame-menu-wrapper"
             style={{
-          opacity: isVisible ? 1 : 0,
+              position: "absolute",
-          transition: "opacity 0.9s cubic-bezier(0.16, 1, 0.3, 1) 0.08s",
+              left: "10px",
-          pointerEvents: isVisible ? "auto" : "none",
+              marginTop: "-4.5px",
+              zIndex: 1,
+              paddingLeft: "15px",
+              paddingRight: "7.5px",
+              paddingTop: "4.5px",
+              paddingBottom: "4.5px",
+              cursor: "pointer",
             }}
+            onPointerUp={() => { setSelectedSection(0); setIsFullscreen3D(false); }}
           >
-        <div className="sight-frame-menu-fade left" style={{ opacity: canScrollLeft ? 1 : 0 }} />
+            <img src={subtractHomeIcon} alt="" width="24" height="21" style={{ display: "block" }} />
-        <div className="sight-frame-menu-fade right" style={{ opacity: canScrollRight ? 1 : 0 }} />
+          </div>
-        <div
+        )}
-          className="sight-frame-menu"
-          ref={menuRef}
-          style={menuNeedsScroll ? { justifyContent: 'flex-start' } : undefined}
-        >
         {contentError ? (
           <p className="error-message">{contentError}</p>
         ) : (
@@ -754,9 +649,8 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
           articleSections.length > 1 &&
           articleSections.slice(1).map((section, index) => (
             <div
-                onPointerUp={() => requestSection(index + 1)}
+              onPointerUp={() => { setSelectedSection(index + 1); setIsFullscreen3D(false); }}
               key={section.id || section.heading || index}
-                data-label={section.heading}
               className={`sight-frame-menu-point ${
                 index + 1 === selectedSection ? "active" : ""
               }`}
@@ -769,33 +663,6 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
         )}
       </div>
     </div>
-      <div
-        ref={homeButtonRef}
-        style={{
-          position: "absolute",
-          left: "10px",
-          bottom: "115px",
-          zIndex: 3,
-          paddingLeft: "15px",
-          paddingRight: "7.5px",
-          paddingTop: "4.5px",
-          paddingBottom: "4.5px",
-          cursor: "pointer",
-          opacity: selectedSection !== 0 ? 1 : 0,
-          transition: "opacity 0.3s ease",
-          pointerEvents: selectedSection !== 0 ? "auto" : "none",
-        }}
-        onPointerUp={() => requestSection(0)}
-      >
-        <img
-          src={subtractHomeIcon}
-          alt=""
-          width="24"
-          height="21"
-          style={{ display: "block" }}
-        />
-      </div>
-    </>
   );
 });
 

src/client/src/components/ListOfSights/TransferWidget.jsx

@@ -96,35 +96,20 @@ const TransferWidget = observer(function TransferWidget({
 
   const getTransferLabel = () => {
     if (selectedLanguageRight === "ru") {
-      return stationName ? (
+      return stationName
-        <>
+        ? `Пересадки остановки ${stationName}:`
-          <div>Пересадка на остановке</div>
+        : "Ближайшая остановка не обнаружена";
-          <div>«{stationName}»:</div>
-        </>
-      ) : (
-        "Ближайшая остановка не обнаружена"
-      );
     }
 
     if (selectedLanguageRight === "en") {
-      return stationName ? (
+      return stationName
-        <>
+        ? `Available transfers at station ${stationName}`
-          <div>Transfer at stop</div>
+        : "Nearest station not found";
-          <div>«{stationName}»:</div>
-        </>
-      ) : (
-        "Nearest station not found"
-      );
     }
 
-    return stationName ? (
+    return stationName
-      <>
+      ? `在车站可用的换乘：${stationName}`
-        <div>在站点换乘</div>
+      : "最近的站点未找到";
-        <div>«{stationName}»:</div>
-      </>
-    ) : (
-      "最近的站点未找到"
-    );
   };
 
   const getNoTransfersMessage = () => {

src/client/src/components/Loader.jsx

@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { createPortal } from "react-dom";
 import "../styles/Loader.css";
-import { getMediaUrl } from "../api/apiConfig";
 
 const loaderVideoPath = new URL("../assets/video/taganai.mp4", import.meta.url)
   .href;
@@ -10,14 +9,8 @@ const Loader = ({
   loadingStatus = null,
   loadingProgress = null,
   onToggleDebug,
-  videoId = null,
 }) => {
   const [showLoadingInfo, setShowLoadingInfo] = useState(false);
-  const [isCustomVideoError, setIsCustomVideoError] = useState(false);
-
-  useEffect(() => {
-    setIsCustomVideoError(false);
-  }, [videoId]);
 
   useEffect(() => {
     const handleKeyDown = (event) => {
@@ -62,12 +55,7 @@ const Loader = ({
         loop
         muted
         playsInline
-        src={
+        src={loaderVideoPath}
-          videoId && !isCustomVideoError
-            ? getMediaUrl(videoId)
-            : loaderVideoPath
-        }
-        onError={() => setIsCustomVideoError(true)}
         alt="Loading"
         className="error-gif"
         style={{ width: "100%", height: "100%", objectFit: "cover" }}

src/client/src/components/ReactMarkdown/ReactMarkdown.css

@@ -71,7 +71,7 @@
 }
 
 .react-markdown-container blockquote {
-  border-left: 4px solid var(--carrier-main, #006F3A);
+  border-left: 4px solid #006F3A;
   padding-left: 16px;
   margin-top: 16px;
   margin-bottom: 16px;

src/client/src/components/ThreeViewErrorBoundary.css

@@ -17,7 +17,7 @@
     114deg,
     rgba(255, 255, 255, 0.1) 8.71%,
     rgba(255, 255, 255, 0.05) 69.69%
-  ), var(--carrier-main, #006F3A);
+  ), #006F3A;
   border-radius: 12px;
   box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1);
   color: white;

src/client/src/components/TouchableLayout/index.tsx

@@ -12,7 +12,6 @@ interface TouchableLayoutProps {
   children?: ReactNode;
   className?: string;
   maxHeight?: string | number;
-  style?: React.CSSProperties;
 }
 
 function useThumbSync(scrollableRef: React.RefObject<HTMLDivElement | null>) {
@@ -20,30 +19,20 @@ function useThumbSync(scrollableRef: React.RefObject<HTMLDivElement | null>) {
     height: 60,
     top: 0,
     hasScroll: false,
-    isAtTop: true,
-    isAtBottom: false,
   });
-  const [visible, setVisible] = useState(false);
   const rafRef = useRef<number | null>(null);
 
   const update = useCallback(() => {
     const el = scrollableRef.current;
     if (!el) return;
 
-    if (el.closest('[data-height-animating="true"]')) {
-      return;
-    }
-
     const sh = el.scrollHeight;
     const ch = el.clientHeight;
     const st = el.scrollTop;
     const th = ch;
 
-    const isAtTop = st <= 0;
+    if (sh <= ch) {
-    const isAtBottom = st + ch >= sh - 1;
+      setState({ height: th, top: 0, hasScroll: false });
-
-    if (sh <= ch + 2) {
-      setState((prev) => ({ ...prev, hasScroll: false, isAtTop: true, isAtBottom: true }));
       return;
     }
 
@@ -52,7 +41,7 @@ function useThumbSync(scrollableRef: React.RefObject<HTMLDivElement | null>) {
     const scrollRange = sh - ch;
     const top = range <= 0 ? 0 : (st / scrollRange) * range;
 
-    setState({ height: thumbHeight, top, hasScroll: true, isAtTop, isAtBottom });
+    setState({ height: thumbHeight, top, hasScroll: true });
   }, []);
 
   useEffect(() => {
@@ -68,36 +57,22 @@ function useThumbSync(scrollableRef: React.RefObject<HTMLDivElement | null>) {
     };
 
     el.addEventListener("scroll", schedule, { passive: true });
-    el.addEventListener("layoutchange", schedule);
     const ro = new ResizeObserver(schedule);
     ro.observe(el);
-    const mo = new MutationObserver(schedule);
-    mo.observe(el, { childList: true, subtree: true, characterData: true });
     schedule();
 
     return () => {
       el.removeEventListener("scroll", schedule);
-      el.removeEventListener("layoutchange", schedule);
       ro.disconnect();
-      mo.disconnect();
       if (rafRef.current != null) cancelAnimationFrame(rafRef.current);
     };
   }, [update]);
 
-  useEffect(() => {
+  return state;
-    if (!state.hasScroll) {
-      setVisible(false);
-      return;
-    }
-    const t = setTimeout(() => setVisible(true), 250);
-    return () => clearTimeout(t);
-  }, [state.hasScroll]);
-
-  return { ...state, visible };
 }
 
 export const TouchableLayout = forwardRef<HTMLDivElement, TouchableLayoutProps>(
-  ({ children, className, maxHeight, style }, ref) => {
+  ({ children, className, maxHeight }, ref) => {
     const containerRef = useRef<HTMLDivElement>(null);
     const scrollableRef = useRef<HTMLDivElement>(null);
     const trackRef = useRef<HTMLDivElement>(null);
@@ -259,12 +234,9 @@ export const TouchableLayout = forwardRef<HTMLDivElement, TouchableLayoutProps>(
       };
     }, [thumb.hasScroll]);
 
-    const containerClassName = [
+    const containerClassName = className
-      "scrollable-container",
+      ? `scrollable-container ${className}`
-      className,
+      : "scrollable-container";
-      thumb.isAtTop ? "is-at-top" : "",
-      thumb.isAtBottom ? "is-at-bottom" : "",
-    ].filter(Boolean).join(" ");
 
     const viewportStyle: React.CSSProperties = maxHeight
       ? {
@@ -274,27 +246,20 @@ export const TouchableLayout = forwardRef<HTMLDivElement, TouchableLayoutProps>(
       : {};
 
     return (
-      <div ref={setRefs} className={containerClassName} style={style}>
+      <div ref={setRefs} className={containerClassName}>
         <div className="scrollable-viewport" style={viewportStyle}>
           <div ref={scrollableRef} className="scrollable">
             {children}
           </div>
-          <div
+          {thumb.hasScroll && (
-            ref={trackRef}
+            <div ref={trackRef} className="custom-scrollbar-track">
-            className="custom-scrollbar-track"
-            style={{ opacity: thumb.visible ? 1 : 0 }}
-          >
               <div
                 ref={thumbRef}
                 className="custom-scrollbar-thumb"
-              style={{
+                style={{ height: thumb.height, top: thumb.top }}
-                height: thumb.height,
-                top: thumb.top,
-                opacity: thumb.visible ? 1 : 0,
-                pointerEvents: thumb.visible ? "auto" : "none",
-              }}
               />
             </div>
+          )}
         </div>
       </div>
     );

src/client/src/components/WeatherWidget.jsx

@@ -8,7 +8,6 @@ import windIcon from "../assets/weather-icons/wind.png";
 import humidityIcon from "../assets/weather-icons/humidity.png";
 import { useGeolocationStore } from "../stores";
 import { translateWeatherStatus } from "../utils/translateWeatherStatus";
-import { apiStore } from "../api/ApiStore";
 
 function WeatherDataLine({ icon, value, unit }) {
   return (
@@ -44,11 +43,7 @@ const WeatherWidget = observer(() => {
 
   const fetchWeather = async () => {
     try {
-      const data = await weatherApi.getFormattedWeather({
+      const data = await weatherApi.getFormattedWeather();
-        lat: apiStore.context?.currentCoordinates?.latitude,
-        lng: apiStore.context?.currentCoordinates?.longitude,
-        cityCode: apiStore.city?.weather_city_code,
-      });
       setWeather(data);
       setError(null);
       setHasLoadedOnce(true);

src/client/src/components/map/InfiniteCanvas.tsx

@@ -0,0 +1,349 @@
+import { FederatedPointerEvent, FederatedWheelEvent } from "pixi.js";
+import { ReactNode, useEffect, useState, useRef } from "react";
+import { useTransform } from "./transformContext";
+import { BACKGROUND_COLOR, SCALE_FACTOR } from "../../assets/Constants";
+import { useApplication } from "@pixi/react";
+import { useCameraAnimationStore } from "../../stores";
+import { observer } from "mobx-react-lite";
+import debounce from "lodash/debounce";
+import { apiStore } from "../../api/ApiStore/store";
+
+export const InfiniteCanvas = observer(
+  ({ children }: Readonly<{ children?: ReactNode }>) => {
+    const { route } = apiStore;
+    const {
+      position,
+      setPosition,
+      scale,
+      setScale,
+      setScreenCenter,
+      isAutoMode,
+      setIsAutoMode,
+      userActivityTimestamp,
+      updateUserActivity,
+      setAutoModeStartTimestamp,
+    } = useTransform();
+    const [loaded, setLoaded] = useState(false);
+
+    const applicationRef = useApplication();
+
+    const [isDragging, setIsDragging] = useState(false);
+    const [startMousePosition, setStartMousePosition] = useState({
+      x: 0,
+      y: 0,
+    });
+    const [startPosition, setStartPosition] = useState({ x: 0, y: 0 });
+
+    const activePointers = useRef(new Map<number, { x: number; y: number }>());
+    const [isPinching, setIsPinching] = useState(false);
+    // Add new useRef for storing initial pinch gesture data
+    const pinchStartData = useRef<{
+      distance: number;
+      midpoint: { x: number; y: number };
+      scale: number;
+      position: { x: number; y: number };
+    } | null>(null);
+    // Keep these for backward compatibility, but we'll use pinchStartData for calculations
+    const [, setInitialPinchDistance] = useState<number | null>(null);
+    const [, setInitialPinchMidpoint] = useState<{
+      x: number;
+      y: number;
+    } | null>(null);
+
+    const [scaleMin, setScaleMin] = useState(0.1); // Default min scale
+    const [scaleMax, setScaleMax] = useState(3); // Default max scale
+    const cameraAnimationStore = useCameraAnimationStore();
+
+    // Add debounced version of syncState to reduce jittering
+    const syncStateDebounced = useRef(
+      debounce((pos, zoom) => {
+        cameraAnimationStore.syncState(pos, zoom);
+      }, 16) // ~60fps
+    ).current;
+
+    // Функция для плавного ограничения масштаба
+    const getSmoothScale = (targetScale: number, currentScale: number) => {
+      if (isAutoMode) return targetScale; // В авто режиме без ограничений
+
+      // Плавное ограничение с затуханием
+      const damping = 0.3; // Коэффициент затухания (0-1)
+
+      if (targetScale < scaleMin) {
+        // Плавное замедление при приближении к минимальному масштабу
+        const distance = scaleMin - targetScale;
+        const dampedDistance = distance * damping;
+        return Math.max(scaleMin, targetScale + dampedDistance);
+      }
+
+      if (targetScale > scaleMax) {
+        // Плавное замедление при приближении к максимальному масштабу
+        const distance = targetScale - scaleMax;
+        const dampedDistance = distance * damping;
+        return Math.min(scaleMax, targetScale - dampedDistance);
+      }
+
+      // Плавное возвращение к границам, если текущий масштаб за пределами
+      if (currentScale < scaleMin) {
+        // Плавно возвращаемся к минимальному масштабу
+        const distance = scaleMin - currentScale;
+        const dampedDistance = distance * damping;
+        return Math.min(targetScale, currentScale + dampedDistance);
+      }
+
+      if (currentScale > scaleMax) {
+        // Плавно возвращаемся к максимальному масштабу
+        const distance = currentScale - scaleMax;
+        const dampedDistance = distance * damping;
+        return Math.max(targetScale, currentScale - dampedDistance);
+      }
+
+      return targetScale;
+    };
+
+    const handleUserActivity = () => {
+      updateUserActivity();
+      if (isAutoMode) {
+        setIsAutoMode(false);
+      }
+      // При любом действии пользователя останавливаем анимацию
+      cameraAnimationStore.stopAnimation();
+    };
+
+    // Автоматический режим - таймер для включения и управление масштабом
+    useEffect(() => {
+      const interval = setInterval(() => {
+        const timeSinceActivity = Date.now() - userActivityTimestamp;
+        if (timeSinceActivity >= 5000 && !isAutoMode) {
+          // 5 секунд бездействия - включаем авто режим
+          if (loaded) {
+            setIsAutoMode(true);
+            setAutoModeStartTimestamp(Date.now()); // Записываем время включения автопреследования
+            // Убираем мгновенную установку масштаба - теперь это делает CameraAnimationStore плавно
+          }
+        }
+      }, 1000); // Проверяем каждую секунду
+
+      return () => clearInterval(interval);
+    }, [
+      userActivityTimestamp,
+      isAutoMode,
+      setIsAutoMode,
+      setScale,
+      setAutoModeStartTimestamp,
+    ]);
+
+    useEffect(() => {
+      async function fetchRouteData() {
+        try {
+          const newScaleMin = route?.scale_min! / SCALE_FACTOR;
+          const newScaleMax = route?.scale_max! / SCALE_FACTOR;
+
+          setScaleMin(newScaleMin);
+          setScaleMax(newScaleMax);
+          setLoaded(true);
+        } catch (error) {
+          console.error(
+            "Ошибка загрузки данных маршрута для scaleMin/Max:",
+            error
+          );
+        }
+      }
+      fetchRouteData();
+    }, [route]);
+
+    // Убираем жесткое ограничение масштаба - теперь используется плавное ограничение
+
+    useEffect(() => {
+      const canvas = applicationRef?.app.canvas;
+      if (!canvas) return;
+      const canvasRect = canvas.getBoundingClientRect();
+      const canvasLeft = canvasRect.left;
+      const canvasTop = canvasRect.top;
+      const centerX = window.innerWidth / 2 - canvasLeft;
+      const centerY = window.innerHeight / 2 - canvasTop;
+      setScreenCenter({ x: centerX, y: centerY });
+    }, [applicationRef?.app.canvas, setScreenCenter]);
+
+    const handlePointerDown = (e: FederatedPointerEvent) => {
+      handleUserActivity();
+
+      activePointers.current.set(e.pointerId, { x: e.globalX, y: e.globalY });
+
+      if (activePointers.current.size === 1) {
+        setIsPinching(false);
+        setInitialPinchDistance(null);
+        setInitialPinchMidpoint(null);
+        pinchStartData.current = null;
+        setIsDragging(true);
+        setStartPosition({ x: position.x, y: position.y });
+        setStartMousePosition({ x: e.globalX, y: e.globalY });
+      } else if (activePointers.current.size === 2) {
+        setIsDragging(false); // Останавливаем перетаскивание, начинаем пинч
+        const pointersArray = Array.from(activePointers.current.values());
+        const p1 = pointersArray[0];
+        const p2 = pointersArray[1];
+
+        // Calculate initial values
+        const initialDistance = Math.hypot(p2.x - p1.x, p2.y - p1.y);
+        const initialMidpoint = { x: (p1.x + p2.x) / 2, y: (p1.y + p2.y) / 2 };
+
+        // Save initial gesture data in pinchStartData
+        pinchStartData.current = {
+          distance: initialDistance,
+          midpoint: initialMidpoint,
+          scale: scale,
+          position: { ...position },
+        };
+
+        // Keep these for backward compatibility
+        setInitialPinchDistance(initialDistance);
+        setInitialPinchMidpoint(initialMidpoint);
+
+        setIsPinching(true);
+      }
+      e.stopPropagation();
+    };
+
+    const handlePointerMove = (e: FederatedPointerEvent) => {
+      if (!activePointers.current.has(e.pointerId)) return;
+
+      updateUserActivity();
+      activePointers.current.set(e.pointerId, { x: e.globalX, y: e.globalY });
+
+      if (
+        isPinching &&
+        activePointers.current.size === 2 &&
+        pinchStartData.current
+      ) {
+        const pointersArray = Array.from(activePointers.current.values());
+        const p1 = pointersArray[0];
+        const p2 = pointersArray[1];
+        const currentDistance = Math.hypot(p2.x - p1.x, p2.y - p1.y);
+        const currentMidpoint = {
+          x: (p1.x + p2.x) / 2,
+          y: (p1.y + p2.y) / 2,
+        };
+
+        // 1. Calculate zoomFactor relative to the INITIAL distance
+        const zoomFactor = currentDistance / pinchStartData.current.distance;
+
+        // 2. Calculate new scale relative to the INITIAL scale
+        const targetScale = pinchStartData.current.scale * zoomFactor;
+        const newScale = getSmoothScale(targetScale, scale);
+
+        // 3. Calculate new position relative to the INITIAL position
+        // This is the standard formula for "zoom to point" (in our case, to the midpoint between fingers)
+        const newPosition = {
+          x:
+            pinchStartData.current.midpoint.x +
+            (pinchStartData.current.position.x -
+              pinchStartData.current.midpoint.x) *
+              (newScale / pinchStartData.current.scale),
+          y:
+            pinchStartData.current.midpoint.y +
+            (pinchStartData.current.position.y -
+              pinchStartData.current.midpoint.y) *
+              (newScale / pinchStartData.current.scale),
+        };
+
+        setPosition(newPosition);
+        setScale(newScale);
+        syncStateDebounced(newPosition, newScale);
+
+        // We do NOT update pinchStartData here - it remains fixed for the entire gesture
+
+        // Update these for backward compatibility, but they're not used for calculations
+        setInitialPinchDistance(currentDistance);
+        setInitialPinchMidpoint(currentMidpoint);
+      } else if (activePointers.current.size === 1) {
+        setIsPinching(false);
+        setInitialPinchDistance(null);
+        setInitialPinchMidpoint(null);
+        pinchStartData.current = null;
+        
+          if (isDragging) {
+          const newPosition = {
+            x: startPosition.x - startMousePosition.x + e.globalX,
+            y: startPosition.y - startMousePosition.y + e.globalY,
+          };
+          setPosition(newPosition);
+          syncStateDebounced(newPosition, scale);
+        }
+      }
+      e.stopPropagation();
+    };
+
+    const handlePointerUp = (e: FederatedPointerEvent) => {
+      handleUserActivity();
+
+      activePointers.current.delete(e.pointerId);
+
+      if (activePointers.current.size < 2) {
+        setIsPinching(false);
+        setInitialPinchDistance(null);
+        setInitialPinchMidpoint(null);
+        pinchStartData.current = null; // Clear pinch gesture data
+      }
+
+      if (activePointers.current.size === 0) {
+        setIsDragging(false);
+      } else if (activePointers.current.size === 1) {
+        // If one finger remains after pinch, start dragging from the new position
+        const remainingPointer = Array.from(activePointers.current.values())[0];
+        setStartPosition({ x: position.x, y: position.y });
+        setStartMousePosition({ x: remainingPointer.x, y: remainingPointer.y });
+        setIsDragging(true);
+      }
+      e.stopPropagation();
+    };
+
+    const handleWheel = (e: FederatedWheelEvent) => {
+      e.stopPropagation();
+      handleUserActivity(); // Используем новую функцию
+
+      const mouseX = e.globalX - position.x;
+      const mouseY = e.globalY - position.y;
+      const zoomFactor = e.deltaY > 0 ? 0.9 : 1.1;
+
+      // Используем плавное ограничение масштаба
+      const targetScale = scale * zoomFactor;
+      const newScale = getSmoothScale(targetScale, scale);
+      const actualZoomFactor = newScale / scale;
+
+      if (scale !== newScale && newScale >= scaleMin && newScale <= scaleMax) {
+        // Убираем из условия && newScale >= scaleMin && newScale <= scaleMax
+        const newPosition = {
+          x: position.x + mouseX * (1 - actualZoomFactor),
+          y: position.y + mouseY * (1 - actualZoomFactor),
+        };
+        setPosition(newPosition);
+        setScale(newScale);
+        // Используем дебаунсированную функцию для синхронизации стора после зума
+        syncStateDebounced(newPosition, newScale);
+      }
+    };
+
+    return (
+      <>
+        <pixiGraphics
+          draw={(g) => {
+            const canvas = applicationRef.app.canvas;
+            g.clear();
+            g.rect(0, 0, canvas?.width ?? 0, canvas?.height ?? 0);
+            g.fill(BACKGROUND_COLOR);
+          }}
+          eventMode="static"
+          interactive
+          onPointerDown={handlePointerDown}
+          onGlobalPointerMove={handlePointerMove}
+          onPointerUp={handlePointerUp}
+          onPointerLeave={handlePointerUp}
+          onWheel={handleWheel}
+        />
+        <pixiContainer position={position} scale={scale}>
+          {children}
+        </pixiContainer>
+      </>
+    );
+  }
+);

src/client/src/components/map/Map.tsx

@@ -5,6 +5,8 @@ import {
   useMemo,
 } from "react";
 import { observer } from "mobx-react-lite";
+import { extend } from "@pixi/react";
+import { Container, Graphics, Sprite, Text } from "pixi.js";
 import { MapDataProvider, useMapData } from "./MapDataContext";
 import { TransformProvider, useTransform } from "./transformContext";
 // @ts-ignore
@@ -17,6 +19,8 @@ import { SCALE_FACTOR } from "../../assets/Constants";
 import { apiStore } from "../../api/ApiStore/store";
 import WebGLMap from "./WebGLMap";
 
+extend({ Container, Graphics, Text, Sprite });
+
 export function Map() {
   return (
     <MapDataProvider>

src/client/src/components/map/Sight.tsx

@@ -0,0 +1,393 @@
+// SightsLayer.tsx
+import { Graphics, Assets, Texture, TextStyle } from "pixi.js";
+import { useCallback, useEffect, useState, useMemo } from "react";
+import { useTransform } from "./transformContext";
+import { SightData } from "./types";
+import sightIcon from "../../assets/images/sight.svg";
+import { useGeolocationStore } from "../../stores"; // Импортируем useGeolocationStore
+
+const BASE_ICON_SIZE = 30;
+const CLUSTER_RADIUS_BASE = 10;
+
+type Cluster = {
+  id: string;
+  longitude: number;
+  latitude: number;
+  count: number;
+  sights: SightData[];
+};
+
+type PointItem = { type: "point"; id: string; data: SightData };
+type ClusterItem = { type: "cluster"; id: string; data: Cluster };
+type ClusteredItem = PointItem | ClusterItem;
+
+const getDistance = (
+  p1: { longitude: number; latitude: number },
+  p2: { longitude: number; latitude: number }
+) => {
+  return Math.sqrt(
+    Math.pow(p1.longitude - p2.longitude, 2) +
+      Math.pow(p1.latitude - p2.latitude, 2)
+  );
+};
+
+const getDistanceFromPointToPath = (
+  point: { longitude: number; latitude: number },
+  pathPoints: { x: number; y: number }[]
+): number => {
+  if (!pathPoints || pathPoints.length < 2) {
+    return Infinity;
+  }
+
+  let minDistance = Infinity;
+
+  for (let i = 0; i < pathPoints.length - 1; i++) {
+    const p1 = pathPoints[i];
+    const p2 = pathPoints[i + 1];
+
+    const lineLengthSq = (p2.x - p1.x) ** 2 + (p2.y - p1.y) ** 2;
+    if (lineLengthSq === 0) continue;
+
+    const t =
+      ((point.longitude - p1.x) * (p2.x - p1.x) +
+        (point.latitude - p1.y) * (p2.y - p1.y)) /
+      lineLengthSq;
+    const projectionT = Math.max(0, Math.min(1, t));
+
+    const projectedX = p1.x + projectionT * (p2.x - p1.x);
+    const projectedY = p1.y + projectionT * (p2.y - p1.y);
+
+    const dist = Math.sqrt(
+      (point.longitude - projectedX) ** 2 + (point.latitude - projectedY) ** 2
+    );
+    minDistance = Math.min(minDistance, dist);
+  }
+  return minDistance;
+};
+
+const useSightClustering = (
+  sights: SightData[],
+  distanceThreshold: number,
+  pathPoints: { x: number; y: number }[]
+): ClusteredItem[] => {
+  return useMemo(() => {
+    const unclusteredSights: (SightData & { visited?: boolean })[] = sights.map(
+      (s) => ({ ...s })
+    );
+    const clusteredResult: ClusteredItem[] = [];
+
+    for (const sight of unclusteredSights) {
+      if (sight.visited) {
+        continue;
+      }
+
+      const clusterSights: SightData[] = [];
+      const queue = [sight];
+      sight.visited = true;
+
+      while (queue.length > 0 && clusterSights.length < 4) {
+        const current = queue.shift()!;
+        clusterSights.push(current);
+
+        for (const potentialNeighbor of unclusteredSights) {
+          if (
+            !potentialNeighbor.visited &&
+            clusterSights.length < 4 &&
+            getDistance(current, potentialNeighbor) < distanceThreshold
+          ) {
+            potentialNeighbor.visited = true;
+            queue.push(potentialNeighbor);
+          }
+        }
+      }
+
+      if (clusterSights.length > 1) {
+        let furthestSight: SightData | null = null;
+        let maxDistanceToPath = -1;
+
+        for (const s of clusterSights) {
+          const dist = getDistanceFromPointToPath(s, pathPoints);
+          if (dist > maxDistanceToPath) {
+            maxDistanceToPath = dist;
+            furthestSight = s;
+          }
+        }
+
+        const count = clusterSights.length;
+        const longitude = furthestSight
+          ? furthestSight.longitude
+          : clusterSights.reduce((sum, s) => sum + s.longitude, 0) / count;
+        const latitude = furthestSight
+          ? furthestSight.latitude
+          : clusterSights.reduce((sum, s) => sum + s.latitude, 0) / count;
+
+        const id = `cluster-${clusterSights[0].id}`;
+        clusteredResult.push({
+          type: "cluster",
+          id,
+          data: { id, count, longitude, latitude, sights: clusterSights },
+        });
+      } else {
+        const singleSight = clusterSights[0];
+        clusteredResult.push({
+          type: "point",
+          id: String(singleSight.id),
+          data: singleSight,
+        });
+      }
+    }
+    return clusteredResult;
+  }, [sights, distanceThreshold, pathPoints]);
+};
+
+// Изменяем пропсы для SingleSight, чтобы он мог передавать ID при тапе
+function SingleSight({
+  sight,
+  onSightClick,
+}: {
+  readonly sight: SightData;
+  onSightClick: (sightId: string) => void;
+}) {
+  useTransform();
+  const [texture, setTexture] = useState<Texture>(Texture.EMPTY);
+  const store = useGeolocationStore();
+  const { setIsGovernorWidgetOpen } = store;
+  useEffect(() => {
+    Assets.load(sightIcon).then(setTexture).catch(console.error);
+  }, []);
+
+  const handlePointerTap = useCallback(() => {
+    setIsGovernorWidgetOpen(false);
+    onSightClick(String(sight.id)); // Передаем ID выбранной достопримечательности
+  }, [sight.id, onSightClick]);
+
+  if (texture === Texture.EMPTY) {
+    return null;
+  }
+
+  const dynamicSize = BASE_ICON_SIZE;
+
+  return (
+    <pixiSprite
+      texture={texture}
+      x={sight.longitude}
+      y={sight.latitude}
+      width={dynamicSize}
+      height={dynamicSize}
+      anchor={0.5}
+      eventMode="static"
+      onPointerTap={handlePointerTap}
+    />
+  );
+}
+
+// Добавляем onSightSelectedInCluster в пропсы
+function SightCluster({
+  cluster,
+  onClusterToggle,
+  isExpanded,
+  onSightSelectedInCluster,
+}: {
+  readonly cluster: Cluster;
+  onClusterToggle: (clusterId: string | null) => void;
+  isExpanded: boolean;
+  onSightSelectedInCluster: (sightId: string) => void;
+}) {
+  const store = useGeolocationStore();
+  const { setIsGovernorWidgetOpen } = store;
+  useTransform();
+  const radius = CLUSTER_RADIUS_BASE;
+  const [texture, setTexture] = useState<Texture>(Texture.EMPTY);
+  const fontSize = 14;
+
+  useEffect(() => {
+    Assets.load(sightIcon).then(setTexture).catch(console.error);
+  }, []);
+
+  const clusterTextStyle = useMemo(
+    () =>
+      new TextStyle({
+        fill: "white",
+        fontSize: fontSize,
+        fontWeight: "bold",
+      }),
+    [fontSize]
+  );
+
+  const handleClusterTap = useCallback(() => {
+    onClusterToggle(isExpanded ? null : cluster.id);
+  }, [cluster.id, cluster.count, isExpanded, onClusterToggle]);
+
+  const handleSightSelect = useCallback(
+    (sightId: string) => {
+      setIsGovernorWidgetOpen(false);
+      onSightSelectedInCluster(sightId); // Передаем выбранный ID наверх
+      onClusterToggle(null); // Закрываем кластер после выбора достопримечательности
+    },
+    [onClusterToggle, onSightSelectedInCluster, setIsGovernorWidgetOpen]
+  ); // Добавляем onSightSelectedInCluster в зависимости
+
+  const drawClusterGraphics = useCallback(
+    (g: Graphics) => {
+      g.clear();
+      g.beginFill(0x896f58);
+      g.drawCircle(0, 0, radius);
+      g.endFill();
+    },
+    [radius]
+  );
+
+  const drawExpandedClusterBackground = useCallback((g: Graphics) => {
+    g.clear();
+    const expandedRadius = BASE_ICON_SIZE * 2;
+    g.beginFill(0x896f58, 0.3);
+    g.lineStyle(2, 0x896f58, 1);
+    g.drawCircle(0, 0, expandedRadius);
+    g.endFill();
+  }, []);
+
+  const handleBackgroundTap = useCallback(() => {
+    onClusterToggle(null); // Закрываем кластер при клике по фону
+  }, [cluster.id, onClusterToggle]);
+
+  if (texture === Texture.EMPTY) {
+    return null;
+  }
+
+  const dynamicSize = BASE_ICON_SIZE;
+  const offsetX = dynamicSize / 2;
+  const offsetY = -dynamicSize / 2;
+
+  const getPositionForSight = (index: number, total: number) => {
+    const angle = (index / total) * Math.PI * 2;
+    const distance = BASE_ICON_SIZE * 1.2;
+    return {
+      x: distance * Math.cos(angle),
+      y: distance * Math.sin(angle),
+    };
+  };
+
+  return (
+    <pixiContainer x={cluster.longitude} y={cluster.latitude}>
+      {isExpanded && (
+        <pixiGraphics
+          draw={drawExpandedClusterBackground}
+          eventMode="static"
+          onPointerTap={handleBackgroundTap}
+        />
+      )}
+
+      {!isExpanded ? (
+        <>
+          <pixiSprite
+            texture={texture}
+            x={0}
+            y={0}
+            width={dynamicSize}
+            height={dynamicSize}
+            anchor={0.5}
+            eventMode="static"
+            onPointerTap={handleClusterTap}
+          />
+          <pixiGraphics draw={drawClusterGraphics} x={offsetX} y={offsetY} />
+          <pixiText
+            text={String(cluster.count)}
+            x={offsetX}
+            y={offsetY}
+            anchor={0.5}
+            style={clusterTextStyle}
+            resolution={4}
+          />
+        </>
+      ) : (
+        <>
+          {cluster.sights.map((sight, index) => {
+            const pos = getPositionForSight(index, cluster.sights.length);
+            return (
+              <pixiSprite
+                key={sight.id}
+                texture={texture}
+                x={pos.x}
+                y={pos.y}
+                width={dynamicSize}
+                height={dynamicSize}
+                anchor={0.5}
+                eventMode="static"
+                onPointerTap={() => handleSightSelect(String(sight.id))}
+              />
+            );
+          })}
+        </>
+      )}
+    </pixiContainer>
+  );
+}
+
+interface SightsLayerProps {
+  sights: SightData[];
+  pathPoints: { x: number; y: number }[];
+}
+
+export function SightsLayer({
+  sights,
+  pathPoints,
+}: Readonly<SightsLayerProps>) {
+  useTransform();
+  const distanceThreshold = BASE_ICON_SIZE * 3;
+
+  const store = useGeolocationStore(); // Получаем доступ к MobX хранилищу
+  const {
+    setSelectedSightId,
+    setIsManualSelection,
+    setIsRightWidgetSelectorOpen,
+  } = store; // Получаем нужные экшены
+
+  const items = useSightClustering(sights, distanceThreshold, pathPoints);
+
+  const [activeClusterId, setActiveClusterId] = useState<string | null>(null);
+
+  const handleClusterToggle = useCallback((clusterId: string | null) => {
+    setActiveClusterId(clusterId);
+  }, []);
+
+  const handleSightSelected = useCallback(
+    (sightId: string) => {
+      setSelectedSightId(sightId);
+      setIsManualSelection(true);
+      setIsRightWidgetSelectorOpen(false); // Закрываем селектор правого виджета при клике по достопримечательности
+      // Закрываем виджет губернатора при выборе достопримечательности
+      store.closeGovernorModal();
+    },
+    [
+      setSelectedSightId,
+      setIsManualSelection,
+      setIsRightWidgetSelectorOpen,
+      store,
+    ]
+  );
+
+  return (
+    <>
+      {items.map((item) => {
+        if (item.type === "cluster") {
+          return (
+            <SightCluster
+              key={item.id}
+              cluster={item.data}
+              onClusterToggle={handleClusterToggle}
+              isExpanded={activeClusterId === item.id}
+              onSightSelectedInCluster={handleSightSelected}
+            />
+          );
+        }
+        return (
+          <SingleSight
+            key={item.id}
+            sight={item.data}
+            onSightClick={handleSightSelected}
+          />
+        );
+      })}
+    </>
+  );
+}

src/client/src/components/map/Station.tsx

@@ -0,0 +1,174 @@
+import { Graphics } from "pixi.js";
+import { useCallback, useMemo } from "react";
+import {
+  BACKGROUND_COLOR,
+  PATH_COLOR,
+  STATION_RADIUS,
+  STATION_OUTLINE_WIDTH,
+  UNPASSED_STATION_COLOR,
+} from "./Constants";
+import { StationData } from "./types";
+import { useTransform } from "./transformContext";
+import { observer } from "mobx-react-lite";
+import { useGeolocationStore } from "../../stores/hooks/useGeolocationStore";
+import { apiStore } from "../../api/ApiStore/store";
+
+interface StationProps {
+  station: StationData;
+  stationEn?: StationData | null;
+  stationZh?: StationData | null;
+  isPassed: boolean;
+}
+
+const BASE_FONT_SIZE = 16;
+const POINT_LABEL_FONT_SIZE = 13;
+const DEFAULT_LABEL_OFFSET_X = 25;
+const DEFAULT_LABEL_OFFSET_Y = 0;
+
+const getAnchorFromOffset = (
+  offsetX: number,
+  offsetY: number
+): { x: number; y: number } => {
+  if (offsetX === 0 && offsetY === 0) {
+    return { x: 0, y: 0.5 };
+  }
+
+  const length = Math.hypot(offsetX, offsetY);
+  const nx = offsetX / length;
+  const ny = offsetY / length;
+
+  return { x: (1 - nx) / 2, y: (1 - ny) / 2 };
+};
+
+export const Station = observer(
+  ({ station, stationEn, stationZh, isPassed }: Readonly<StationProps>) => {
+    const { scale } = useTransform();
+    const { context } = apiStore;
+
+    const { selectedLanguage } = useGeolocationStore();
+
+    const ZOOM_THRESHOLD_FOR_HIGH_RESOLUTION = 2; // Порог масштаба (в 2 раза)
+    const HIGH_RESOLUTION_VALUE = 4;
+    const LOW_RESOLUTION_VALUE = 2;
+
+    const dynamicResolution =
+      scale > ZOOM_THRESHOLD_FOR_HIGH_RESOLUTION
+        ? HIGH_RESOLUTION_VALUE
+        : LOW_RESOLUTION_VALUE;
+
+    const draw = useCallback(
+      (g: Graphics) => {
+        g.clear();
+
+        // Проверяем, является ли станция начальной или конечной
+        const isTerminalStation =
+          context &&
+          (station.id.toString() === (context as any)?.startStopId ||
+            station.id.toString() === (context as any)?.endStopId);
+
+        // Определяем радиус станции
+        const stationRadius = isTerminalStation
+          ? STATION_RADIUS * 1.5
+          : STATION_RADIUS;
+
+        // Рисуем основной круг станции
+        g.circle(station.longitude, station.latitude, stationRadius);
+        g.fill({ color: isPassed ? PATH_COLOR : UNPASSED_STATION_COLOR });
+        g.stroke({ color: BACKGROUND_COLOR, width: STATION_OUTLINE_WIDTH });
+
+        // Если это терминальная станция, рисуем дополнительный круг по центру
+        if (isTerminalStation) {
+          const centerCircleRadius = stationRadius * 0.5; // 50% от радиуса станции
+          g.circle(station.longitude, station.latitude, centerCircleRadius);
+          g.fill({ color: BACKGROUND_COLOR });
+        }
+      },
+      [station.latitude, station.longitude, station.id, context, isPassed]
+    );
+
+    const dynamicFontSize = BASE_FONT_SIZE;
+    const dynamicPointLabelFontSize = POINT_LABEL_FONT_SIZE;
+
+    // Определяем фактические смещения. Если station.offset_x и station.offset_y оба равны 0,
+    // используем дефолтный отступ для обеспечения видимости.
+    const labelOffsetX =
+      station.offset_x === 0 && station.offset_y === 0
+        ? DEFAULT_LABEL_OFFSET_X
+        : station.offset_x / 3;
+    const labelOffsetY =
+      station.offset_x === 0 && station.offset_y === 0
+        ? DEFAULT_LABEL_OFFSET_Y
+        : station.offset_y / 3;
+
+    // Вычисляем позицию текстового блока. Это прямые координаты карты.
+    const textBlockPositionX = station.longitude + labelOffsetX / 3;
+    const textBlockPositionY = station.latitude + labelOffsetY;
+
+    // Используем useMemo для запоминания dynamicAnchor на основе *фактически используемого* отступа.
+    const dynamicAnchor = useMemo(
+      () => getAnchorFromOffset(labelOffsetX, labelOffsetY),
+      [labelOffsetX, labelOffsetY]
+    );
+
+    return (
+      <pixiContainer>
+        <pixiGraphics draw={draw} zIndex={0} />
+
+        <pixiText
+          anchor={dynamicAnchor} // Используем динамический якорь
+          text={station.name}
+          position={{
+            x: textBlockPositionX,
+            y: textBlockPositionY,
+          }}
+          style={{
+            fontSize: dynamicFontSize,
+            fontFamily: "Roboto",
+            fontWeight: "bold",
+            fill: "#fff",
+          }}
+          resolution={dynamicResolution}
+          zIndex={100}
+        />
+
+        {(selectedLanguage === "en" || selectedLanguage === "ru") && (
+          <pixiText
+            anchor={dynamicAnchor} // Используем динамический якорь
+            text={stationEn?.name}
+            position={{
+              x: textBlockPositionX,
+              y: textBlockPositionY + 14, // Это смещение второй надписи относительно первой
+            }}
+            style={{
+              fontSize: dynamicPointLabelFontSize,
+              fontFamily: "Roboto",
+              fontWeight: "normal",
+              fill: "#CBCBCB",
+            }}
+            resolution={dynamicResolution}
+            zIndex={100}
+          />
+        )}
+
+        {selectedLanguage === "zh" && (
+          <pixiText
+            anchor={dynamicAnchor} // Используем динамический якорь
+            text={stationZh?.name}
+            position={{
+              x: textBlockPositionX,
+              y: textBlockPositionY + 14, // Это смещение второй надписи относительно первой
+            }}
+            style={{
+              fontSize: dynamicPointLabelFontSize,
+              fontFamily: "Roboto",
+              fontWeight: "normal",
+              fill: "#CBCBCB",
+            }}
+            resolution={dynamicResolution}
+            zIndex={100}
+          />
+        )}
+      </pixiContainer>
+    );
+  }
+);

src/client/src/components/map/TramIcon.tsx

@@ -0,0 +1,375 @@
+import { Texture, Assets } from "pixi.js";
+import { useEffect, useState, useMemo, useRef } from "react";
+import { useTransform } from "./transformContext";
+import { lerp, lerpAngle } from "../../utils/animationUtils";
+
+const basePath = new URL(
+  "../../assets/tramPosition/Tram Base.svg",
+  import.meta.url
+).href;
+const tramPath = new URL("../../assets/tramPosition/Tram.svg", import.meta.url)
+  .href;
+
+const LERP_SPEED = 0.1; // Скорость интерполяции (10% каждый кадр)
+
+// Функция для проверки расстояния до ближайшей точки маршрута
+const getDistanceToPath = (
+  point: { x: number; y: number },
+  pathPoints: { x: number; y: number }[]
+) => {
+  if (!pathPoints || pathPoints.length < 2) return Infinity;
+
+  let minDistance = Infinity;
+
+  for (let i = 0; i < pathPoints.length - 1; i++) {
+    const p1 = pathPoints[i];
+    const p2 = pathPoints[i + 1];
+
+    const lineLengthSq = (p2.x - p1.x) ** 2 + (p2.y - p1.y) ** 2;
+    if (lineLengthSq === 0) continue;
+
+    const t =
+      ((point.x - p1.x) * (p2.x - p1.x) + (point.y - p1.y) * (p2.y - p1.y)) /
+      lineLengthSq;
+    const projectionT = Math.max(0, Math.min(1, t));
+
+    const projectedX = p1.x + projectionT * (p2.x - p1.x);
+    const projectedY = p1.y + projectionT * (p2.y - p1.y);
+
+    const dist = Math.sqrt(
+      (point.x - projectedX) ** 2 + (point.y - projectedY) ** 2
+    );
+    if (dist < minDistance) {
+      minDistance = dist;
+    }
+  }
+
+  return minDistance;
+};
+
+// Функция для проверки расстояния до пройденной части маршрута
+const getDistanceToPassedPath = (
+  point: { x: number; y: number },
+  pathPoints: { x: number; y: number }[],
+  passedSegmentIndex: number
+) => {
+  if (!pathPoints || pathPoints.length < 2 || passedSegmentIndex < 0)
+    return Infinity;
+
+  let minDistance = Infinity;
+
+  // Проверяем только пройденную часть (до passedSegmentIndex включительно)
+  for (
+    let i = 0;
+    i <= Math.min(passedSegmentIndex, pathPoints.length - 2);
+    i++
+  ) {
+    const p1 = pathPoints[i];
+    const p2 = pathPoints[i + 1];
+
+    const lineLengthSq = (p2.x - p1.x) ** 2 + (p2.y - p1.y) ** 2;
+    if (lineLengthSq === 0) continue;
+
+    const t =
+      ((point.x - p1.x) * (p2.x - p1.x) + (point.y - p1.y) * (p2.y - p1.y)) /
+      lineLengthSq;
+    const projectionT = Math.max(0, Math.min(1, t));
+
+    const projectedX = p1.x + projectionT * (p2.x - p1.x);
+    const projectedY = p1.y + projectionT * (p2.y - p1.y);
+
+    const dist = Math.sqrt(
+      (point.x - projectedX) ** 2 + (point.y - projectedY) ** 2
+    );
+    if (dist < minDistance) {
+      minDistance = dist;
+    }
+  }
+
+  return minDistance;
+};
+
+// Функция для проверки расстояния до ближайшей станции
+const getDistanceToStations = (
+  point: { x: number; y: number },
+  stations: {
+    longitude: number;
+    latitude: number;
+    offset_x?: number;
+    offset_y?: number;
+  }[],
+  _debug: boolean = false
+) => {
+  if (!stations || stations.length === 0) {
+    return Infinity;
+  }
+
+  let minDistance = Infinity;
+
+  for (const station of stations) {
+    // Рассчитываем позицию текста станции с учетом смещений (как в Station.tsx)
+    const DEFAULT_LABEL_OFFSET_X = 25;
+    const DEFAULT_LABEL_OFFSET_Y = 0;
+
+    const labelOffsetX =
+      station.offset_x === 0 && station.offset_y === 0
+        ? DEFAULT_LABEL_OFFSET_X
+        : (station.offset_x || 0) / 3;
+    const labelOffsetY =
+      station.offset_x === 0 && station.offset_y === 0
+        ? DEFAULT_LABEL_OFFSET_Y
+        : (station.offset_y || 0) / 3;
+
+    const textBlockPositionX = station.longitude + labelOffsetX;
+    const textBlockPositionY = station.latitude + labelOffsetY;
+
+    // Вычисляем расстояние до позиции текста станции (не до центра станции)
+    const dist = Math.sqrt(
+      (point.x - textBlockPositionX) ** 2 + (point.y - textBlockPositionY) ** 2
+    );
+
+    if (dist < minDistance) {
+      minDistance = dist;
+    }
+  }
+
+  return minDistance;
+};
+
+// Функция для поиска оптимального угла поворота метки относительно трамвая
+const findOptimalAngle = (
+  tramX: number,
+  tramY: number,
+  pathPoints: { x: number; y: number }[],
+  stations: {
+    longitude: number;
+    latitude: number;
+    offset_x?: number;
+    offset_y?: number;
+  }[],
+  passedSegmentIndex: number,
+  scale: number
+) => {
+  const testRadiusInMapCoords = 100 / scale; // Радиус в координатах карты
+  const minSafeDistanceToPath = 60; // Минимальное безопасное расстояние до пути в пикселях
+  const minSafeDistanceToPassedPath = 60; // Минимальное безопасное расстояние до пройденной части в пикселях
+  const minSafeDistanceToStation = 50; // Минимальное безопасное расстояние до станции в пикселях
+
+  let bestAngle = 0;
+  let bestScore = Infinity; // Ищем минимальный вес
+  const segmentWeights: { angle: number; weight: number; distances: any }[] =
+    [];
+
+  // Проверяем 12 углов (каждые 30 градусов)
+  for (let i = 0; i < 12; i++) {
+    const testAngle = (i * Math.PI * 2) / 12;
+    const testX = tramX + Math.cos(testAngle) * testRadiusInMapCoords;
+    const testY = tramY + Math.sin(testAngle) * testRadiusInMapCoords;
+
+    const distanceToPath =
+      getDistanceToPath({ x: testX, y: testY }, pathPoints) * scale; // В пикселях
+    const distanceToPassedPath =
+      getDistanceToPassedPath(
+        { x: testX, y: testY },
+        pathPoints,
+        passedSegmentIndex
+      ) * scale; // В пикселях
+    const distanceToStation =
+      getDistanceToStations({ x: testX, y: testY }, stations, false) * scale; // В пикселях с отладкой
+
+    // Вычисляем вес для этого угла (чем меньше расстояние, тем больше вес)
+    let weight = 0;
+
+    // Путь - вес 100
+    if (distanceToPath < minSafeDistanceToPath) {
+      weight += 100 * (1 - distanceToPath / minSafeDistanceToPath);
+    }
+
+    // Текст прошедшей станции - вес 10
+    if (distanceToPassedPath < minSafeDistanceToPassedPath) {
+      weight += 10 * (1 - distanceToPassedPath / minSafeDistanceToPassedPath);
+    }
+
+    // Текст следующей станции - вес 1000
+    if (distanceToStation < minSafeDistanceToStation) {
+      weight += 1000 * (1 - distanceToStation / minSafeDistanceToStation);
+    }
+
+    segmentWeights.push({
+      angle: testAngle,
+      weight: Math.round(weight * 10) / 10, // Округляем для читаемости
+      distances: {
+        path: Math.round(distanceToPath),
+        passedPath: Math.round(distanceToPassedPath),
+        station: Math.round(distanceToStation),
+      },
+    });
+
+    if (weight < bestScore) {
+      bestScore = weight;
+      bestAngle = testAngle;
+    }
+  }
+
+  // Если несколько сегментов имеют одинаковый минимальный вес,
+  // выбираем тот, который максимально удален от препятствий
+  const minWeightSegments = segmentWeights.filter(
+    (s) => s.weight === bestScore
+  );
+  if (minWeightSegments.length > 1) {
+    // Из сегментов с минимальным весом выбираем тот, который максимально удален от препятствий
+    let bestDistanceSum = -1;
+    for (const segment of minWeightSegments) {
+      const distanceSum =
+        segment.distances.path +
+        segment.distances.passedPath +
+        segment.distances.station;
+      if (distanceSum > bestDistanceSum) {
+        bestDistanceSum = distanceSum;
+        bestAngle = segment.angle;
+      }
+    }
+  }
+
+  return { bestAngle, segmentWeights };
+};
+
+export function TramIcon({
+  x,
+  y,
+  angle,
+  pathPoints = [],
+  stations = [],
+  passedSegmentIndex = -1,
+}: {
+  x: number;
+  y: number;
+  angle: number;
+  pathPoints?: { x: number; y: number }[];
+  stations?: {
+    longitude: number;
+    latitude: number;
+    offset_x?: number;
+    offset_y?: number;
+  }[];
+  passedSegmentIndex?: number;
+}) {
+  const { scale } = useTransform();
+
+  // Находим оптимальный угол поворота метки относительно трамвая
+  const optimalAngle = useMemo(
+    () =>
+      findOptimalAngle(x, y, pathPoints, stations, passedSegmentIndex, scale)
+        .bestAngle,
+    [x, y, pathPoints, stations, passedSegmentIndex, scale]
+  );
+
+  // Состояние для плавной анимации позиции и углов (как в HTML файле)
+  const [smoothPosition, setSmoothPosition] = useState({ x, y });
+  const [smoothOptimalAngle, setSmoothOptimalAngle] = useState(optimalAngle);
+  const [smoothTramAngle, setSmoothTramAngle] = useState(angle);
+  const animationRef = useRef<number | undefined>(undefined);
+
+  // Плавная анимация позиции и углов (логика из HTML файла)
+  useEffect(() => {
+    const animate = () => {
+      // Анимируем позицию (как в HTML файле)
+      setSmoothPosition((prev) => {
+        const newX = lerp(prev.x, x, LERP_SPEED);
+        const newY = lerp(prev.y, y, LERP_SPEED);
+        return {
+          x: Math.abs(newX - x) < 0.1 ? x : newX,
+          y: Math.abs(newY - y) < 0.1 ? y : newY,
+        };
+      });
+
+      // Анимируем оптимальный угол
+      setSmoothOptimalAngle((prev) => {
+        const newAngle = lerpAngle(prev, optimalAngle, LERP_SPEED);
+        return Math.abs(newAngle - optimalAngle) < 0.01
+          ? optimalAngle
+          : newAngle;
+      });
+
+      // Анимируем угол трамвая
+      setSmoothTramAngle((prev) => {
+        const newAngle = lerpAngle(prev, angle, LERP_SPEED);
+        return Math.abs(newAngle - angle) < 0.01 ? angle : newAngle;
+      });
+
+      // Продолжаем анимацию, если что-то еще не достигло цели
+      if (
+        Math.abs(smoothPosition.x - x) > 0.1 ||
+        Math.abs(smoothPosition.y - y) > 0.1 ||
+        Math.abs(smoothOptimalAngle - optimalAngle) > 0.01 ||
+        Math.abs(smoothTramAngle - angle) > 0.01
+      ) {
+        animationRef.current = requestAnimationFrame(animate);
+      }
+    };
+
+    animationRef.current = requestAnimationFrame(animate);
+
+    return () => {
+      if (animationRef.current !== undefined) {
+        cancelAnimationFrame(animationRef.current);
+      }
+    };
+  }, [
+    x,
+    y,
+    optimalAngle,
+    angle,
+    smoothPosition,
+    smoothOptimalAngle,
+    smoothTramAngle,
+  ]);
+
+  // Обычные размеры без увеличения
+  const backgroundWidth = 111 / scale;
+  const backgroundHeight = 82 / scale;
+  const tramWidth = 31 / scale;
+  const tramHeight = 52 / scale;
+
+  const [baseTexture, setBaseTexture] = useState<Texture | null>(null);
+  const [tramTexture, setTramTexture] = useState<Texture | null>(null);
+
+  useEffect(() => {
+    Assets.load(basePath).then(setBaseTexture).catch(console.error);
+    Assets.load(tramPath).then(setTramTexture).catch(console.error);
+  }, []);
+
+  if (!baseTexture || !tramTexture) return null;
+
+  return (
+    <pixiContainer x={smoothPosition.x} y={smoothPosition.y}>
+      {/* вращающийся контейнер с плавным оптимальным углом */}
+      <pixiContainer rotation={smoothOptimalAngle + Math.PI}>
+        <pixiSprite
+          texture={baseTexture}
+          anchor={{ x: 1, y: 0.5 }}
+          width={backgroundWidth > 53.7 ? backgroundWidth : 53.7}
+          height={backgroundHeight > 39.68 ? backgroundHeight : 39.68}
+        />
+
+        {/* контейнер иконки трамвая с плавным поворотом направления движения */}
+        <pixiContainer
+          x={
+            backgroundWidth > 53.7
+              ? -backgroundWidth / 1.42
+              : -backgroundWidth / 0.98
+          }
+          y={0}
+        >
+          <pixiSprite
+            texture={tramTexture}
+            anchor={0.5}
+            rotation={-smoothOptimalAngle - Math.PI}
+            width={tramWidth}
+            height={tramHeight}
+          />
+        </pixiContainer>
+      </pixiContainer>
+    </pixiContainer>
+  );
+}

src/client/src/components/map/TravelPath.tsx

@@ -0,0 +1,92 @@
+import { Graphics } from "pixi.js";
+import { useCallback } from "react";
+import { PATH_COLOR, PATH_WIDTH, UNPASSED_STATION_COLOR } from "./Constants";
+
+interface TravelPathProps {
+  points: { x: number; y: number }[];
+  busCoordinates?: { x: number; y: number };
+}
+
+const PASSED_PATH_COLOR = PATH_COLOR;
+const UNPASSED_PATH_COLOR = UNPASSED_STATION_COLOR;
+
+export function TravelPath({
+  points,
+  busCoordinates,
+}: Readonly<TravelPathProps>) {
+  const draw = useCallback(
+    (g: Graphics) => {
+      g.clear();
+
+      if (points.length < 2) {
+        return;
+      }
+
+      g.moveTo(points[0].x, points[0].y);
+      for (let i = 1; i < points.length; i++) {
+        g.lineTo(points[i].x, points[i].y);
+      }
+      g.stroke({
+        color: UNPASSED_PATH_COLOR,
+        width: PATH_WIDTH,
+      });
+
+      if (!busCoordinates) {
+        return;
+      }
+
+      let minDistance = Infinity;
+      let closestSegmentIndex = -1;
+      let busSegmentStartPoint: { x: number; y: number } | null = null;
+
+      for (let i = 0; i < points.length - 1; i++) {
+        const p1 = points[i];
+        const p2 = points[i + 1];
+
+        const lineLengthSq = (p2.x - p1.x) ** 2 + (p2.y - p1.y) ** 2;
+        if (lineLengthSq === 0) continue;
+
+        const t =
+          ((busCoordinates.x - p1.x) * (p2.x - p1.x) +
+            (busCoordinates.y - p1.y) * (p2.y - p1.y)) /
+          lineLengthSq;
+        const projectionT = Math.max(0, Math.min(1, t));
+
+        const projectedX = p1.x + projectionT * (p2.x - p1.x);
+        const projectedY = p1.y + projectionT * (p2.y - p1.y);
+
+        const dist = Math.sqrt(
+          (busCoordinates.x - projectedX) ** 2 +
+            (busCoordinates.y - projectedY) ** 2
+        );
+
+        if (dist < minDistance) {
+          minDistance = dist;
+          closestSegmentIndex = i;
+          busSegmentStartPoint = { x: projectedX, y: projectedY };
+        }
+      }
+
+      if (closestSegmentIndex !== -1 && busSegmentStartPoint) {
+        g.moveTo(points[0].x, points[0].y);
+        for (let i = 1; i <= closestSegmentIndex; i++) {
+          g.lineTo(points[i].x, points[i].y);
+        }
+        g.lineTo(busSegmentStartPoint.x, busSegmentStartPoint.y);
+
+        g.stroke({
+          color: PASSED_PATH_COLOR,
+          width: PATH_WIDTH,
+        });
+      }
+    },
+    [points, busCoordinates]
+  );
+
+  if (points.length === 0) {
+    console.error("points is empty");
+    return null;
+  }
+
+  return <pixiGraphics draw={draw} />;
+}

src/client/src/components/map/WebGLMap.tsx

@@ -17,6 +17,7 @@ import {
   UNPASSED_STATION_COLOR,
   BUS_COLOR,
   BASE_ICON_SIZE,
+  CLUSTER_RADIUS_BASE,
 } from "./Constants";
 import { SCALE_FACTOR } from "../../assets/Constants";
 import { apiStore } from "../../api/ApiStore/store";
@@ -155,19 +156,6 @@ const useSightClustering = (
         continue;
       }
 
-      const hasCustomIcon =
-        sight.is_default_icon === false && !isMediaIdEmpty(sight.icon ?? null);
-
-      if (hasCustomIcon) {
-        sight.visited = true;
-        clusteredResult.push({
-          type: "point",
-          id: String(sight.id),
-          data: sight,
-        });
-        continue;
-      }
-
       const clusterSights: SightData[] = [];
       const queue = [sight];
       sight.visited = true;
@@ -177,12 +165,8 @@ const useSightClustering = (
         clusterSights.push(current);
 
         for (const potentialNeighbor of unclusteredSights) {
-          const neighborHasCustomIcon =
-            potentialNeighbor.is_default_icon === false &&
-            !isMediaIdEmpty(potentialNeighbor.icon ?? null);
           if (
             !potentialNeighbor.visited &&
-            !neighborHasCustomIcon &&
             clusterSights.length < 4 &&
             getDistance(current, potentialNeighbor) < distanceThreshold
           ) {
@@ -192,10 +176,6 @@ const useSightClustering = (
         }
       }
 
-      for (const leftover of queue) {
-        leftover.visited = false;
-      }
-
       if (clusterSights.length > 1) {
         let furthestSight: SightData | null = null;
         let maxDistanceToPath = -1;
@@ -402,15 +382,13 @@ export const WebGLMap = observer(() => {
         return livePercent;
       }
 
-      if (sight?.is_default_icon === false) {
       if (
+        sight != null &&
         typeof sight.icon_size === "number" &&
         Number.isFinite(sight.icon_size)
       ) {
         return sight.icon_size;
       }
-        return 100;
-      }
 
       if (
         typeof routeData?.icon_size === "number" &&
@@ -903,36 +881,25 @@ export const WebGLMap = observer(() => {
 
   // Сегментный индекс каждой упорядоченной станции на routePath (canvas-пространство)
   const orderedStationSegs = useMemo(() => {
-    if (!orderedRouteStations || !stationData || routePath.length < 4)
+    if (!orderedRouteStations || !stationData || routePath.length < 4) return [] as number[];
-      return [] as number[];
     return (orderedRouteStations as any[]).map((ordStation) => {
-      const stIdx = stationData.findIndex(
+      const stIdx = stationData.findIndex((s: any) => String(s.id) === String(ordStation.id));
-        (s: any) => String(s.id) === String(ordStation.id),
-      );
       if (stIdx < 0) return -1;
       const sx = stationPoints[stIdx * 2];
       const sy = stationPoints[stIdx * 2 + 1];
       if (sx === undefined || sy === undefined) return -1;
-      let best = -1,
+      let best = -1, bestD = Infinity;
-        bestD = Infinity;
       for (let i = 0; i < routePath.length - 2; i += 2) {
-        const p1x = routePath[i],
+        const p1x = routePath[i], p1y = routePath[i + 1];
-          p1y = routePath[i + 1];
+        const p2x = routePath[i + 2], p2y = routePath[i + 3];
-        const p2x = routePath[i + 2],
+        const dx = p2x - p1x, dy = p2y - p1y;
-          p2y = routePath[i + 3];
-        const dx = p2x - p1x,
-          dy = p2y - p1y;
         const len2 = dx * dx + dy * dy;
         if (!len2) continue;
         const t = ((sx - p1x) * dx + (sy - p1y) * dy) / len2;
         const cl = Math.max(0, Math.min(1, t));
-        const px = p1x + cl * dx,
+        const px = p1x + cl * dx, py = p1y + cl * dy;
-          py = p1y + cl * dy;
         const d = Math.hypot(sx - px, sy - py);
-        if (d < bestD) {
+        if (d < bestD) { bestD = d; best = i / 2; }
-          bestD = d;
-          best = i / 2;
-        }
       }
       return best;
     });
@@ -1177,9 +1144,7 @@ export const WebGLMap = observer(() => {
         const curIdx = apiStore.positionIndex;
         const prevIdx = prevPositionIndexRef.current;
         const pathLen = apiStore.route?.path?.length ?? 0;
-        const isWrap =
+        const isWrap = prevIdx >= 0 && pathLen > 0 &&
-          prevIdx >= 0 &&
-          pathLen > 0 &&
           Math.abs(curIdx - prevIdx) > pathLen / 4;
         prevPositionIndexRef.current = curIdx;
 
@@ -1449,72 +1414,32 @@ export const WebGLMap = observer(() => {
 
       gl.uniform1f(u_pointSize, pointInnerSizePx);
 
-      if (
+      if (tramSegIndex >= 0 && orderedRouteStations && stationData && orderedStationSegs.length > 0) {
-        tramSegIndex >= 0 &&
-        orderedRouteStations &&
-        stationData &&
-        orderedStationSegs.length > 0
-      ) {
         const passedPts1: number[] = [];
         const unpassedPts1: number[] = [];
         for (let i = 0; i < orderedRouteStations.length; i++) {
           const orderedStation = (orderedRouteStations as any[])[i];
           const stationSeg = orderedStationSegs[i] ?? -1;
           if (!orderedStation || stationSeg < 0) continue;
-          const isPassed =
+          const isPassed = simulationDirection === 1 ? stationSeg < tramSegIndex : stationSeg > tramSegIndex;
-            simulationDirection === 1
+          const stIdx = stationData.findIndex((s: any) => String(s.id) === String(orderedStation.id));
-              ? stationSeg < tramSegIndex
-              : stationSeg > tramSegIndex;
-          const stIdx = stationData.findIndex(
-            (s: any) => String(s.id) === String(orderedStation.id),
-          );
           if (stIdx < 0) continue;
           const sx = stationPoints[stIdx * 2] as number;
           const sy = stationPoints[stIdx * 2 + 1] as number;
-          if (isPassed) {
+          if (isPassed) { passedPts1.push(sx, sy); } else { unpassedPts1.push(sx, sy); }
-            passedPts1.push(sx, sy);
-          } else {
-            unpassedPts1.push(sx, sy);
-          }
         }
         if (passedPts1.length > 0) {
-          gl.uniform4f(
+          gl.uniform4f(u_color_pts, ((PATH_COLOR >> 16) & 0xff) / 255, ((PATH_COLOR >> 8) & 0xff) / 255, (PATH_COLOR & 0xff) / 255, 1);
-            u_color_pts,
+          gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(passedPts1), gl.STATIC_DRAW);
-            ((PATH_COLOR >> 16) & 0xff) / 255,
-            ((PATH_COLOR >> 8) & 0xff) / 255,
-            (PATH_COLOR & 0xff) / 255,
-            1,
-          );
-          gl.bufferData(
-            gl.ARRAY_BUFFER,
-            new Float32Array(passedPts1),
-            gl.STATIC_DRAW,
-          );
           gl.drawArrays(gl.POINTS, 0, passedPts1.length / 2);
         }
         if (unpassedPts1.length > 0) {
-          gl.uniform4f(
+          gl.uniform4f(u_color_pts, ((UNPASSED_STATION_COLOR >> 16) & 0xff) / 255, ((UNPASSED_STATION_COLOR >> 8) & 0xff) / 255, (UNPASSED_STATION_COLOR & 0xff) / 255, 1);
-            u_color_pts,
+          gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(unpassedPts1), gl.STATIC_DRAW);
-            ((UNPASSED_STATION_COLOR >> 16) & 0xff) / 255,
-            ((UNPASSED_STATION_COLOR >> 8) & 0xff) / 255,
-            (UNPASSED_STATION_COLOR & 0xff) / 255,
-            1,
-          );
-          gl.bufferData(
-            gl.ARRAY_BUFFER,
-            new Float32Array(unpassedPts1),
-            gl.STATIC_DRAW,
-          );
           gl.drawArrays(gl.POINTS, 0, unpassedPts1.length / 2);
         }
       } else {
-        gl.uniform4f(
+        gl.uniform4f(u_color_pts, ((UNPASSED_STATION_COLOR >> 16) & 0xff) / 255, ((UNPASSED_STATION_COLOR >> 8) & 0xff) / 255, (UNPASSED_STATION_COLOR & 0xff) / 255, 1);
-          u_color_pts,
-          ((UNPASSED_STATION_COLOR >> 16) & 0xff) / 255,
-          ((UNPASSED_STATION_COLOR >> 8) & 0xff) / 255,
-          (UNPASSED_STATION_COLOR & 0xff) / 255,
-          1,
-        );
         gl.bufferData(gl.ARRAY_BUFFER, stationPoints, gl.STATIC_DRAW);
         gl.drawArrays(gl.POINTS, 0, stationPoints.length / 2);
       }
@@ -1588,17 +1513,12 @@ export const WebGLMap = observer(() => {
     const passedStationIds = new Set<string>();
     const unpassedStationIds = new Set<string>();
 
-    if (
+    if (tramSegIndex >= 0 && orderedRouteStations && orderedStationSegs.length === orderedRouteStations.length) {
-      tramSegIndex >= 0 &&
-      orderedRouteStations &&
-      orderedStationSegs.length === orderedRouteStations.length
-    ) {
       for (let i = 0; i < orderedRouteStations.length; i++) {
         const station = (orderedRouteStations as any[])[i];
         const seg = orderedStationSegs[i] ?? -1;
         if (!station || seg < 0) continue;
-        const isPassed =
+        const isPassed = simulationDirection === 1 ? seg < tramSegIndex : seg > tramSegIndex;
-          simulationDirection === 1 ? seg < tramSegIndex : seg > tramSegIndex;
         if (isPassed) passedStationIds.add(String(station.id));
         else unpassedStationIds.add(String(station.id));
       }
@@ -1742,26 +1662,11 @@ export const WebGLMap = observer(() => {
         const sin = Math.sin(rotationAngle);
 
         const startStationData = orderedRouteStations?.[0]
-          ? stationData.find(
+          ? stationData.find((station: any) => station.id.toString() === String(orderedRouteStations[0].id))
-              (station: any) =>
+          : stationData.find((station: any) => station.id.toString() === apiStore.context?.startStopId);
-                station.id.toString() === String(orderedRouteStations[0].id),
-            )
-          : stationData.find(
-              (station: any) =>
-                station.id.toString() === apiStore.context?.startStopId,
-            );
         const endStationData = orderedRouteStations?.length
-          ? stationData.find(
+          ? stationData.find((station: any) => station.id.toString() === String(orderedRouteStations[orderedRouteStations.length - 1].id))
-              (station: any) =>
+          : stationData.find((station: any) => station.id.toString() === apiStore.context?.endStopId);
-                station.id.toString() ===
-                String(
-                  orderedRouteStations[orderedRouteStations.length - 1].id,
-                ),
-            )
-          : stationData.find(
-              (station: any) =>
-                station.id.toString() === apiStore.context?.endStopId,
-            );
 
         const terminalStations: number[] = [];
 
@@ -1861,13 +1766,7 @@ export const WebGLMap = observer(() => {
                   }
                   return best;
                 })();
-                return (
+                return tramSegIndex !== -1 && seg !== -1 && (simulationDirection === 1 ? seg < tramSegIndex : seg > tramSegIndex);
-                  tramSegIndex !== -1 &&
-                  seg !== -1 &&
-                  (simulationDirection === 1
-                    ? seg < tramSegIndex
-                    : seg > tramSegIndex)
-                );
               })()
             : false;
 
@@ -1900,13 +1799,7 @@ export const WebGLMap = observer(() => {
                   }
                   return best;
                 })();
-                return (
+                return tramSegIndex !== -1 && seg !== -1 && (simulationDirection === 1 ? seg < tramSegIndex : seg > tramSegIndex);
-                  tramSegIndex !== -1 &&
-                  seg !== -1 &&
-                  (simulationDirection === 1
-                    ? seg < tramSegIndex
-                    : seg > tramSegIndex)
-                );
               })()
             : false;
 
@@ -1932,24 +1825,11 @@ export const WebGLMap = observer(() => {
           const b_unpassed = (UNPASSED_STATION_COLOR & 0xff) / 255;
 
           if (startStationData && endStationData) {
-            const startIsPassed =
+            const startIsPassed = simulationDirection === 1 ? true : isStartPassed;
-              simulationDirection === 1 ? true : isStartPassed;
             const endIsPassed = simulationDirection === -1 ? true : isEndPassed;
-            gl.uniform4f(
+            gl.uniform4f(u_color_pts, startIsPassed ? r_passed : r_unpassed, startIsPassed ? g_passed : g_unpassed, startIsPassed ? b_passed : b_unpassed, 1.0);
-              u_color_pts,
-              startIsPassed ? r_passed : r_unpassed,
-              startIsPassed ? g_passed : g_unpassed,
-              startIsPassed ? b_passed : b_unpassed,
-              1.0,
-            );
             gl.drawArrays(gl.POINTS, 0, 1);
-            gl.uniform4f(
+            gl.uniform4f(u_color_pts, endIsPassed ? r_passed : r_unpassed, endIsPassed ? g_passed : g_unpassed, endIsPassed ? b_passed : b_unpassed, 1.0);
-              u_color_pts,
-              endIsPassed ? r_passed : r_unpassed,
-              endIsPassed ? g_passed : g_unpassed,
-              endIsPassed ? b_passed : b_unpassed,
-              1.0,
-            );
             gl.drawArrays(gl.POINTS, 1, 1);
           } else {
             const isStartStation = startStationData !== undefined;
@@ -2573,8 +2453,14 @@ export const WebGLMap = observer(() => {
             const rx = cluster.longitude;
             const ry = cluster.latitude;
 
+            const iconSizePercent = resolveSightIconSizePercent();
+            const iconSize =
+              SIGHT_ICON_BASE_SIZE * clamp(iconSizePercent / 100, 0.1, 10);
+
             const screenX = (rx * scale + position.x) / dpr;
             const screenY = (ry * scale + position.y) / dpr;
+            const iconLeft = screenX - iconSize / 2;
+            const iconTop = screenY - iconSize / 2;
 
             const isExpanded = activeClusterId === cluster.id;
             const selectedSightInCluster = cluster.sights.find(
@@ -2586,20 +2472,6 @@ export const WebGLMap = observer(() => {
             const selectedIsCustomInCluster =
               selectedSightInCluster?.is_default_icon === false &&
               selectedHasIconInCluster;
-
-            const iconSizePercent = resolveSightIconSizePercent(
-              cluster.sights[0],
-            );
-            const clusterCustomScaleFactor = selectedIsCustomInCluster
-              ? scale / Math.max(customSightIconBaseScaleRef.current ?? 1, 1e-6)
-              : 1;
-            const iconSize =
-              SIGHT_ICON_BASE_SIZE *
-              clamp(iconSizePercent / 100, 0.1, 10) *
-              clusterCustomScaleFactor;
-
-            const iconLeft = screenX - iconSize;
-            const iconTop = screenY - iconSize;
             const hasSelectedAltIconInCluster =
               selectedSightInCluster != null &&
               selectedIsCustomInCluster &&
@@ -2657,7 +2529,7 @@ export const WebGLMap = observer(() => {
                 )
               : false;
 
-            const badgeColor = "var(--carrier-main, #006F3A)";
+            const badgeColor = "#006F3A";
             const listPanelWidth = 200;
             const listItemHeight = 30;
             const listMaxHeight = 250;
@@ -2673,10 +2545,13 @@ export const WebGLMap = observer(() => {
                     onTouchEnd={handleClusterClick}
                     style={{
                       position: "absolute",
-                      left: iconLeft,
+                      left: iconLeft - CLUSTER_RADIUS_BASE - 10,
-                      top: iconTop,
+                      top: iconTop - CLUSTER_RADIUS_BASE - 10,
-                      width: iconSize,
+                      width: iconSize + CLUSTER_RADIUS_BASE * 2 + 20,
-                      height: iconSize,
+                      height: iconSize + CLUSTER_RADIUS_BASE * 2 + 20,
+                      display: "flex",
+                      alignItems: "center",
+                      justifyContent: "center",
                       pointerEvents: "auto",
                       cursor: "pointer",
                       userSelect: "none",
@@ -2689,22 +2564,15 @@ export const WebGLMap = observer(() => {
                       }),
                     }}
                   >
-                    <div
+                    <div style={{ position: "relative" }}>
-                      style={{
-                        position: "absolute",
-                        width: iconSize,
-                        height: iconSize,
-                        flexShrink: 0,
-                      }}
-                    >
                       <img
                         src={clusterIconUrl}
                         alt=""
+                        width={iconSize}
+                        height={iconSize}
                         style={{
                           display: "block",
                           pointerEvents: "none",
-                          width: "100%",
-                          height: "100%",
                           filter: hasSelectedSight
                             ? hasSelectedAltIconInCluster
                               ? "none"
@@ -2717,7 +2585,6 @@ export const WebGLMap = observer(() => {
                           position: "absolute",
                           top: -6,
                           right: -6,
-                          zIndex: 1,
                           width: 15,
                           height: 15,
                           borderRadius: "10px",
@@ -2740,11 +2607,12 @@ export const WebGLMap = observer(() => {
                   <div
                     data-expanded-cluster={cluster.id}
                     onTouchStart={handleCircleInteraction}
+                    onTouchMove={handleCircleInteraction}
                     onMouseMove={handleCircleInteraction}
                     style={{
                       position: "absolute",
-                      left: screenX - iconSize,
+                      left: screenX - iconSize / 2,
-                      top: screenY - iconSize,
+                      top: screenY - iconSize / 2,
                       display: "flex",
                       alignItems: "flex-start",
                       pointerEvents: "auto",
@@ -2805,14 +2673,15 @@ export const WebGLMap = observer(() => {
                     <div
                       className="cluster-sights-list"
                       style={{
-                        background: `linear-gradient(to bottom right, rgba(255, 255, 255, 0.2) 0%, rgba(255, 255, 255, 0) 100%), rgba(var(--carrier-main-rgb, 0, 111, 58), 0.4)`,
+                        background: `linear-gradient(to bottom right, rgba(255, 255, 255, 0.2) 0%, rgba(255, 255, 255, 0) 100%), rgba(0, 111, 58, 0.4)`,
                         backdropFilter: "blur(10px)",
                         borderRadius: "8px",
                         width: listPanelWidth,
                         maxHeight: hasMoreThanTwo ? listMaxHeight : undefined,
                         boxShadow:
-                          "inset 0 0 0 1px rgba(255, 255, 255, 0.3), inset 4px 4px 12px 0 rgba(255, 255, 255, 0.12)",
+                          "0 0 0 1px rgba(255, 255, 255, 0.3) inset, 4px 4px 12px 0 rgba(255, 255, 255, 0.12) inset",
                         display: "flex",
+
                         flexDirection: "column",
                       }}
                       onClick={(e) => e.stopPropagation()}
@@ -2955,6 +2824,7 @@ export const WebGLMap = observer(() => {
                                   whiteSpace: "nowrap",
                                   flex: 1,
                                 }}
+                                title={sightName}
                               >
                                 {sightName}
                               </span>

src/client/src/components/side-menu/Collapsible.jsx

@@ -1,39 +0,0 @@
-import { useRef, useEffect } from "react";
-
-const Collapsible = ({ open, className = "", children }) => {
-  const ref = useRef(null);
-  const isFirst = useRef(true);
-
-  useEffect(() => {
-    const el = ref.current;
-    if (!el) return;
-
-    if (isFirst.current) {
-      isFirst.current = false;
-      el.style.height = open ? "auto" : "0px";
-      return;
-    }
-
-    if (open) {
-      el.style.height = `${el.scrollHeight}px`;
-      const onEnd = (e) => {
-        if (e.target !== el || e.propertyName !== "height") return;
-        el.style.height = "auto";
-        el.removeEventListener("transitionend", onEnd);
-      };
-      el.addEventListener("transitionend", onEnd);
-    } else {
-      el.style.height = `${el.scrollHeight}px`;
-      void el.offsetHeight;
-      el.style.height = "0px";
-    }
-  }, [open]);
-
-  return (
-    <div ref={ref} className={`${className} ${open ? "open" : ""}`}>
-      {children}
-    </div>
-  );
-};
-
-export default Collapsible;

src/client/src/components/side-menu/LeftWidget.jsx

@@ -5,8 +5,6 @@ import { useGeolocationStore } from "../../stores";
 import "../../styles/LeftWidget.css";
 import { apiStore } from "../../api/ApiStore/store";
 import { apiBaseURL } from "../../api/apiConfig";
-import { ReactMarkdownComponent } from "../ReactMarkdown";
-import { TouchableLayout } from "../TouchableLayout";
 
 const LeftWidget = observer(
   ({ selectedSightId, onClose, isVisible, sightTop }) => {
@@ -17,7 +15,8 @@ const LeftWidget = observer(
     const [isImageLoaded, setIsImageLoaded] = useState(false);
     const [widgetHeight, setWidgetHeight] = useState(0);
 
-    const layoutRef = useRef(null);
+    const textRef = useRef(null);
+    const activeTouch = useRef(null);
     const widgetRef = useRef(null);
 
     const store = useGeolocationStore();
@@ -38,10 +37,64 @@ const LeftWidget = observer(
     }, [selectedSightData, isImageLoaded, isVisible, isLoading, error]);
 
     useEffect(() => {
-      if (layoutRef.current) {
+      const scrollContainer = textRef.current;
-        const scrollable = layoutRef.current.querySelector(".scrollable");
+      if (!scrollContainer) return;
-        if (scrollable) scrollable.scrollTop = 0;
+
+      const handleTouchStart = (e) => {
+        e.stopPropagation();
+        if (e.touches.length === 1) {
+          activeTouch.current = {
+            identifier: e.touches[0].identifier,
+            lastY: e.touches[0].clientY,
+          };
         }
+      };
+
+      const handleTouchMove = (e) => {
+        e.preventDefault();
+        if (activeTouch.current) {
+          for (const touch of e.changedTouches) {
+            if (touch.identifier === activeTouch.current.identifier) {
+              const deltaY = touch.clientY - activeTouch.current.lastY;
+              scrollContainer.scrollTop -= deltaY;
+              activeTouch.current.lastY = touch.clientY;
+              break;
+            }
+          }
+        }
+      };
+
+      const handleTouchEnd = (e) => {
+        for (const touch of e.changedTouches) {
+          if (
+            activeTouch.current &&
+            touch.identifier === activeTouch.current.identifier
+          ) {
+            activeTouch.current = null;
+            break;
+          }
+        }
+      };
+
+      scrollContainer.addEventListener("touchstart", handleTouchStart, {
+        passive: true,
+      });
+      scrollContainer.addEventListener("touchmove", handleTouchMove, {
+        passive: false,
+      });
+      scrollContainer.addEventListener("touchend", handleTouchEnd, {
+        passive: true,
+      });
+      scrollContainer.addEventListener("touchcancel", handleTouchEnd, {
+        passive: true,
+      });
+
+      return () => {
+        scrollContainer.removeEventListener("touchstart", handleTouchStart);
+        scrollContainer.removeEventListener("touchmove", handleTouchMove);
+        scrollContainer.removeEventListener("touchend", handleTouchEnd);
+        scrollContainer.removeEventListener("touchcancel", handleTouchEnd);
+      };
     }, [selectedSightData]);
 
     useEffect(() => {
@@ -70,8 +123,6 @@ const LeftWidget = observer(
               ? routeSightsEn.find((sight) => sight.id === selectedSightId)
               : routeSightsZh.find((sight) => sight.id === selectedSightId);
 
-          if (!sight) return;
-
           const leftArticle = sight.left_article;
 
           const leftArticleData =
@@ -81,17 +132,15 @@ const LeftWidget = observer(
               ? sightArticlesEn.get(leftArticle + "_" + selectedLanguage)
               : sightArticlesZh.get(leftArticle + "_" + selectedLanguage);
 
-          if (!leftArticleData?.media?.length) return;
-
           const media = await ContentAPI.getMediaPreview(
             leftArticleData.media[0].id,
-            selectedLanguage,
+            selectedLanguage
           );
 
           const response = {
             mediaPath: media.path,
             mediaType: media.type,
-            title: leftArticleData.heading,
+            title: sight.short_name || sight.name || leftArticleData.heading,
             text: leftArticleData.body,
             address: sight.address,
           };
@@ -129,7 +178,7 @@ const LeftWidget = observer(
       setIsImageLoaded(false);
       console.error(
         "Ошибка загрузки изображения для достопримечательности:",
-        selectedSightId,
+        selectedSightId
       );
       if (isVisible) {
         setTimeout(() => {
@@ -159,7 +208,7 @@ const LeftWidget = observer(
     };
 
     return (
-      <div ref={widgetRef} style={widgetTransformStyle} className="left-widget" lang={selectedLanguage}>
+      <div ref={widgetRef} style={widgetTransformStyle} className="left-widget">
         {isLoading ? (
           <div>Загрузка информации...</div>
         ) : error ? (
@@ -185,11 +234,9 @@ const LeftWidget = observer(
               <div className="left-widget-address">
                 {selectedSightData.address}
               </div>
-              <TouchableLayout ref={layoutRef} className="left-widget-text-scroll">
+              <div ref={textRef} className="left-widget-text">
-                <div className="left-widget-text">
+                {selectedSightData.text}
-                  <ReactMarkdownComponent value={selectedSightData.text} />
               </div>
-              </TouchableLayout>
             </div>
           </>
         ) : (isVisible || selectedSightData) && !isLoading ? (
@@ -203,7 +250,7 @@ const LeftWidget = observer(
         ) : null}
       </div>
     );
-  },
+  }
 );
 
 export default LeftWidget;

src/client/src/components/side-menu/SideMenu.jsx

@@ -2,9 +2,9 @@ import "../../styles/SideMenu.css";
 import AppealWidget from "../widgets/AppealWidget";
 import { useEffect, useState, useCallback, useRef } from "react";
 import { observer } from "mobx-react-lite";
+import gouvermentImage from "../../assets/images/test-image.png";
 import sideMenuPhoto from "/side-menu-photo.png";
 import RouteWidget from "../widgets/RouteWidget";
-import WeatherWidget from "../WeatherWidget";
 import ContentAPI from "../../api/content/content.api";
 import { useGeolocationStore, useColorStore } from "../../stores";
 import "../../styles/LeftWidget.css";
@@ -17,6 +17,7 @@ import { getMediaUrl } from "../../api/apiConfig";
 const SideMenu = observer(({ onMenuToggle }) => {
   const {
     carrier,
+    city,
     route,
     getArticle,
     sightArticles,
@@ -31,7 +32,6 @@ const SideMenu = observer(({ onMenuToggle }) => {
   const [isStationOpen, openStation] = useState(false);
   const [isWidgetOpen, openWidget] = useState(false);
   const [isWeatherVisible, setIsWeatherVisible] = useState(true);
-  const [isPreviewMediaError, setIsPreviewMediaError] = useState(false);
   const [isLeftWidgetVisible, setIsLeftWidgetVisible] = useState(false);
   const [localSelectedSightId, setLocalSelectedSightId] = useState(null);
   const [isSightsAnimating, setIsSightsAnimating] = useState(false);
@@ -85,7 +85,7 @@ const SideMenu = observer(({ onMenuToggle }) => {
         let scrollTarget = null;
         const targetElement = document.elementFromPoint(
           touch.clientX,
-          touch.clientY,
+          touch.clientY
         );
 
         // Определяем, над каким из скролл-контейнеров находится палец
@@ -185,12 +185,27 @@ const SideMenu = observer(({ onMenuToggle }) => {
     }
   }, [isLeftWidgetVisible]);
 
+  const [designData, setDesignData] = useState(null);
   const [routeData, setRouteData] = useState(null);
   const [isLangMenuOpen, setIsLangMenuOpen] = useState(false);
 
   useEffect(() => {
-    setIsPreviewMediaError(false);
+    async function fetchCarrierAndCrest() {
-  }, [carrier?.preview_media]);
+      try {
+        const carrierPath = carrier.logo ? getMediaUrl(carrier.logo) : null;
+        const cityPath = city.arms ? getMediaUrl(city.arms) : null;
+
+        const response = {
+          carrierPath: carrierPath,
+          creastPath: cityPath,
+        };
+        setDesignData(response);
+      } catch (err) {
+        console.error("Ошибка в получении данных герба и перевозчика:", err);
+      }
+    }
+    fetchCarrierAndCrest();
+  }, [contextData?.routeId, isGeolocationLoading, selectedLanguage]);
 
   useEffect(() => {
     if (isGeolocationLoading || !contextData?.routeId) {
@@ -248,19 +263,15 @@ const SideMenu = observer(({ onMenuToggle }) => {
     }
   };
 
-  const handleMenuToggleRef = useRef(handleMenuToggle);
-  handleMenuToggleRef.current = handleMenuToggle;
-
-  const isMenuOpenRef = useRef(isMenuOpen);
-  isMenuOpenRef.current = isMenuOpen;
-
   useEffect(() => {
+    // Автоматическое закрытие сайд-меню после 45 секунд бездействия
     let idleSeconds = 0;
 
     const checkIdle = () => {
       idleSeconds += 1;
-      if (idleSeconds >= 60 && isMenuOpenRef.current) {
+
-        handleMenuToggleRef.current(false);
+      if (idleSeconds >= 45 && isMenuOpen) {
+        handleMenuToggle(false);
       }
     };
 
@@ -289,48 +300,7 @@ const SideMenu = observer(({ onMenuToggle }) => {
         window.removeEventListener(event, resetIdle);
       });
     };
-  }, []);
+  }, [isMenuOpen, handleMenuToggle]);
-
-  // Автоматическое скрытие левого виджета через 60 секунд бездействия
-  useEffect(() => {
-    if (!isLeftWidgetVisible) return;
-
-    let idleSeconds = 0;
-
-    const checkIdle = () => {
-      idleSeconds += 1;
-      if (idleSeconds >= 60) {
-        setIsLeftWidgetVisible(false);
-        setTimeout(() => {
-          setIsLeftWidgetOpen(false);
-        }, 1000);
-      }
-    };
-
-    const intervalId = setInterval(checkIdle, 1000);
-
-    const resetIdle = () => {
-      idleSeconds = 0;
-    };
-
-    const events = [
-      "mousedown",
-      "mousemove",
-      "keypress",
-      "scroll",
-      "touchstart",
-      "click",
-    ];
-
-    events.forEach((event) =>
-      window.addEventListener(event, resetIdle, { passive: true }),
-    );
-
-    return () => {
-      clearInterval(intervalId);
-      events.forEach((event) => window.removeEventListener(event, resetIdle));
-    };
-  }, [isLeftWidgetVisible, setIsLeftWidgetOpen]);
 
   // Закрываем и открываем список достопримечательностей при изменении сортировки
   const prevSortingByRef = useRef(sortingBy);
@@ -387,7 +357,7 @@ const SideMenu = observer(({ onMenuToggle }) => {
           pointerEvents: "auto",
           background:
             isSightsOpen || isStationOpen
-              ? `linear-gradient(to bottom right, rgba(255, 255, 255, 0.2) 0%, rgba(255, 255, 255, 0) 100%), rgba(var(--carrier-left-rgb, 76, 175, 75), 0.4)`
+              ? `linear-gradient(to bottom right, rgba(255, 255, 255, 0.2) 0%, rgba(255, 255, 255, 0) 100%), rgba(76, 175, 75, 0.4)`
               : undefined,
           backdropFilter:
             isSightsOpen || isStationOpen ? "blur(10px)" : undefined,
@@ -399,6 +369,16 @@ const SideMenu = observer(({ onMenuToggle }) => {
             "background 0.3s ease, backdrop-filter 0.3s ease, box-shadow 0.3s ease",
         }}
       >
+        {designData?.creastPath && (
+          <img
+            className="side-menu-crest"
+            src={designData?.creastPath}
+            alt="Герб"
+          />
+        )}
+        {carrier?.slogan && (
+          <div className="side-menu-label">{carrier.slogan}</div>
+        )}
         {shouldRenderSights && (
           <SightsList
             ref={sightsListRef}
@@ -464,16 +444,14 @@ const SideMenu = observer(({ onMenuToggle }) => {
             }}
             className="appeal-button"
           >
-            {route?.button_text
+            {selectedLanguage == "ru"
-              ? route.button_text
-              : selectedLanguage == "ru"
               ? "Обращение губернатора"
               : selectedLanguage == "zh"
               ? "州长致辞"
               : "Governor's appeal"}
           </div>
         )}
-        <div className="side-menu-buttons" style={{ marginTop: route?.governor_appeal > 0 ? '40px' : '260px' }}>
+        <div className="side-menu-buttons">
           <div
             onPointerUp={() => {
               if (!isSightsOpen) {
@@ -582,48 +560,30 @@ const SideMenu = observer(({ onMenuToggle }) => {
             : "#EveryoneOnTheWay"} */}
         </div>
         <div className="side-menu-bottom-section">
+          <div className="side-menu-carrier-block">
+            {designData?.carrierPath && (
               <img
-            className="side-menu-bottom-photo"
+                className="carrier-logo"
-            src={
+                src={designData?.carrierPath}
-              carrier?.preview_media && !isPreviewMediaError
+                alt="ГЭТ - Электротранспорт Санкт-Петербурга"
-                ? getMediaUrl(carrier.preview_media)
-                : sideMenuPhoto
-            }
-            onError={() => setIsPreviewMediaError(true)}
-            alt=""
               />
+            )}
+            {carrier?.full_name && (
+              <div className="side-menu-slogan">{carrier.short_name}</div>
+            )}
+          </div>
+          <img className="side-menu-bottom-photo" src={sideMenuPhoto} alt="" />
         </div>
       </div>
       <div className="side-menu-control-panel">
         <RouteWidget />
 
-        <div
-          style={{
-            transform:
-              isWeatherVisible && !isGovernorWidgetOpen
-                ? "translateX(0)"
-                : "translateX(-200%)",
-            transition: "transform 1s ease",
-            opacity: isWeatherVisible && !isGovernorWidgetOpen ? 1 : 0,
-            pointerEvents:
-              isWeatherVisible && !isGovernorWidgetOpen ? "auto" : "none",
-          }}
-        >
-          <WeatherWidget />
-        </div>
-
         <AppealWidget
-          widgetImgPath={(() => {
+          widgetImgPath={gouvermentImage}
-            const m = sightArticles.get(route?.governor_appeal + "_ru")?.media;
-            const mediaId = Array.isArray(m) ? m[0]?.id : m?.id;
-            return mediaId ? ContentAPI.getMediaPath(mediaId) : undefined;
-          })()}
-          isOpen={isWidgetOpen}
           style={{
             transform: isWidgetOpen ? "translateX(0)" : "translateX(-200%)",
             transition: "transform 0.5s ease",
             zIndex: -1,
-            pointerEvents: isWidgetOpen ? "auto" : "none",
           }}
           widgetLabel={
             selectedLanguage == "ru"

src/client/src/components/side-menu/SightStationsList.jsx

@@ -64,6 +64,7 @@ const StationItem = ({
         className="side-menu-sight"
         onPointerDown={(e) => handlePointerDown(e, station.id)}
         onPointerUp={(e) => handlePointerUp(e, station.id, handleStationClick)}
+        title={station.name}
       >
         <span ref={textRef} className={shouldAnimate ? "marquee-text" : ""}>
           {station.name}

src/client/src/components/side-menu/SightsList.jsx

@@ -10,7 +10,6 @@ import { useGeolocationStore } from "../../stores";
 import { apiStore } from "../../api/ApiStore/store";
 import { useClickDetection } from "../../hooks/useClickDetection";
 import { TouchableLayout } from "../TouchableLayout";
-import Collapsible from "./Collapsible";
 import { getMediaUrl } from "../../api/apiConfig";
 import stationIcon from "../../assets/transport-icons/station.svg";
 
@@ -39,8 +38,25 @@ const SightItem = ({
   const [shouldAnimate, setShouldAnimate] = useState(false);
   const [isExpanded, setIsExpanded] = useState(false);
 
+  // Получаем название для отображения
   const getSightName = () => {
-    return sight.short_name || sight.name;
+    // Если есть короткое название, используем его
+    if (sight.short_name) {
+      return sight.short_name;
+    }
+
+    if (!sight.left_article) {
+      return sight.name;
+    }
+
+    const leftArticleData =
+      selectedLanguage === "ru"
+        ? sightArticles.get(sight.left_article + "_ru")
+        : selectedLanguage === "en"
+          ? sightArticlesEn.get(sight.left_article + "_en")
+          : sightArticlesZh.get(sight.left_article + "_zh");
+
+    return leftArticleData?.heading || sight.name;
   };
 
   const sightName = getSightName();
@@ -79,48 +95,28 @@ const SightItem = ({
   const cacheKey = `${sight.id}_${selectedLanguage}`;
   const stations = sightStationsCache.get(cacheKey) || [];
 
-  useEffect(() => {
-    if (localSelectedSightId !== sight.id) {
-      setIsExpanded(false);
-    }
-  }, [localSelectedSightId, sight.id]);
-
-  // Логирование при открытии списка станций для достопримечательности (только один раз)
-  const wasExpandedRef = useRef(false);
-  useEffect(() => {
-    // Выводим логи только когда список открывается (переход из закрытого в открытое состояние)
-    if (isExpanded && !wasExpandedRef.current && stations.length > 0) {
-      wasExpandedRef.current = true;
-    }
-
-    // Сбрасываем флаг когда список закрывается
-    if (!isExpanded) {
-      wasExpandedRef.current = false;
-    }
-  }, [isExpanded, sight.id, selectedLanguage, stations.length]);
-
   return (
-    <div
+    <div>
-      className={`side-menu-sight-wrapper ${
-        localSelectedSightId === sight.id ? "side-menu-sight-selected-wrapper" : ""
-      }`}
-    >
       <div
         ref={containerRef}
         id={`sight-${sight.id}`}
         onPointerDown={(e) => handlePointerDown(e, sight.id)}
         onPointerUp={(e) => handlePointerUp(e, sight.id, handleClick)}
-        className="side-menu-sight pointer"
+        className={`side-menu-sight pointer ${
+          localSelectedSightId === sight.id ? "selected" : ""
+        }`}
+        title={sightName}
       >
         <span ref={textRef} className={shouldAnimate ? "marquee-text" : ""}>
           {sightName}
         </span>
       </div>
-      <Collapsible className="side-menu-sight-transfer-list" open={isExpanded}>
+      <div
+        className={`side-menu-sight-transfer-list ${isExpanded ? "open" : ""}`}
+      >
         {stations.length > 0 ? (
           stations.map((station, index) => {
-            let isMediaIdEmptyResult = isMediaIdEmpty(station.icon);
+            const iconSrc = isMediaIdEmpty(station.icon)
-            const iconSrc = isMediaIdEmptyResult
               ? stationIcon
               : getMediaUrl(station.icon);
 
@@ -161,7 +157,7 @@ const SightItem = ({
                 : "No stations"}
           </div>
         )}
-      </Collapsible>
+      </div>
     </div>
   );
 };
@@ -237,8 +233,24 @@ const SightsList = observer(
                 : selectedLanguage === "en"
                   ? routeSightsEn
                   : routeSightsZh;
+            // Функция для получения названия для сортировки
             const getSightNameForSort = (sight) => {
-              return (sight.short_name || sight.name).trim();
+              if (sight.short_name) {
+                return sight.short_name.trim();
+              }
+
+              if (!sight.left_article) {
+                return sight.name.trim();
+              }
+
+              const leftArticleData =
+                selectedLanguage === "ru"
+                  ? sightArticles.get(sight.left_article + "_ru")
+                  : selectedLanguage === "en"
+                    ? sightArticlesEn.get(sight.left_article + "_en")
+                    : sightArticlesZh.get(sight.left_article + "_zh");
+
+              return (leftArticleData?.heading || sight.name).trim();
             };
 
             const sortedSights = [...(sights || [])].sort((a, b) => {
@@ -337,18 +349,25 @@ const SightsList = observer(
       }, [localSelectedSightId, sightList, className]);
 
       const handleSightClick = (sightId) => {
-        // Если кликнули на уже выбранную достопримечательность — закрываем виджет и сбрасываем цвет
-        if (isLeftWidgetOpen && localSelectedSightId === sightId) {
-          setLocalSelectedSightId(null);
-          setIsLeftWidgetOpen(false);
-          return;
-        }
         // Открываем левый виджет
+        if (isLeftWidgetOpen && localSelectedSightId !== sightId) {
           setLocalSelectedSightId(sightId);
           setIsLeftWidgetOpen(true);
           if (onSightSelected) {
             onSightSelected(sightId);
           }
+        } else if (!isLeftWidgetOpen) {
+          setLocalSelectedSightId(sightId);
+          setIsLeftWidgetOpen(true);
+          if (onSightSelected) {
+            onSightSelected(sightId);
+          }
+        } else {
+          // Если виджет уже открыт для этой достопримечательности, просто обновляем список остановок
+          if (onSightSelected) {
+            onSightSelected(sightId);
+          }
+        }
       };
 
       const handleClose = () => {

src/client/src/components/side-menu/StationSightsList.jsx

@@ -28,10 +28,10 @@ const SightItem = ({
   const textRef = useRef(null);
   const [shouldAnimate, setShouldAnimate] = useState(false);
 
-  // Получаем название из left_article или используем short_name/name
+  // Получаем название из left_article
   const getSightName = () => {
     if (!sight.left_article) {
-      return sight.short_name || sight.name;
+      return sight.name;
     }
 
     const leftArticleData =
@@ -41,7 +41,7 @@ const SightItem = ({
         ? sightArticlesEn.get(sight.left_article + "_en")
         : sightArticlesZh.get(sight.left_article + "_zh");
 
-    return leftArticleData?.heading || sight.short_name || sight.name;
+    return leftArticleData?.heading || sight.name;
   };
 
   const sightName = getSightName();
@@ -70,6 +70,7 @@ const SightItem = ({
       className={`side-menu-sight pointer ${
         localSelectedSightId === sight.id ? "selected" : ""
       }`}
+      title={sightName}
     >
       <span ref={textRef} className={shouldAnimate ? "marquee-text" : ""}>
         {sightName}
@@ -119,9 +120,10 @@ const StationSightsList = observer(
               selectedLanguage
             );
 
+            // Функция для получения названия из left_article
             const getSightNameForSort = (sight) => {
               if (!sight.left_article) {
-                return (sight.short_name || sight.name).trim();
+                return sight.name.trim();
               }
 
               const leftArticleData =
@@ -131,7 +133,7 @@ const StationSightsList = observer(
                   ? sightArticlesEn.get(sight.left_article + "_en")
                   : sightArticlesZh.get(sight.left_article + "_zh");
 
-              return (leftArticleData?.heading || sight.short_name || sight.name).trim();
+              return (leftArticleData?.heading || sight.name).trim();
             };
 
             const sortedSights = [...(response || [])].sort((a, b) => {
@@ -309,4 +311,3 @@ const StationSightsList = observer(
 );
 
 export default StationSightsList;
-nSightsList;

src/client/src/components/side-menu/StationsList.jsx

@@ -10,43 +10,6 @@ import { useGeolocationStore } from "../../stores";
 import { apiStore } from "../../api/ApiStore/store";
 import { useClickDetection } from "../../hooks/useClickDetection";
 import { TouchableLayout } from "../TouchableLayout";
-import Collapsible from "./Collapsible";
-
-const SightTransferItem = ({ name, style, onPointerUp }) => {
-  const containerRef = useRef(null);
-  const textRef = useRef(null);
-  const [shouldAnimate, setShouldAnimate] = useState(false);
-
-  useLayoutEffect(() => {
-    const checkWidth = () => {
-      if (containerRef.current && textRef.current) {
-        const containerWidth = containerRef.current.offsetWidth;
-        const textWidth = textRef.current.scrollWidth;
-        const shouldAnimateValue = textWidth > containerWidth;
-        setShouldAnimate(shouldAnimateValue);
-        if (shouldAnimateValue) {
-          containerRef.current.style.setProperty("--container-width", `${containerWidth}px`);
-        }
-      }
-    };
-    checkWidth();
-    window.addEventListener("resize", checkWidth);
-    return () => window.removeEventListener("resize", checkWidth);
-  }, [name]);
-
-  return (
-    <div
-      ref={containerRef}
-      className="side-menu-sight-transfer pointer"
-      style={style}
-      onPointerUp={onPointerUp}
-    >
-      <span ref={textRef} className={shouldAnimate ? "marquee-text" : ""}>
-        {name}
-      </span>
-    </div>
-  );
-};
 
 const StationItem = ({
   station,
@@ -93,15 +56,26 @@ const StationItem = ({
   const sights = stationSightsCache.get(cacheKey) || [];
 
   const getSightName = (sight) => {
-    return sight.short_name || sight.name;
+    if (sight.short_name) {
+      return sight.short_name;
+    }
+
+    if (!sight.left_article) {
+      return sight.name;
+    }
+
+    const leftArticleData =
+      selectedLanguage === "ru"
+        ? sightArticles.get(sight.left_article + "_ru")
+        : selectedLanguage === "en"
+          ? sightArticlesEn.get(sight.left_article + "_en")
+          : sightArticlesZh.get(sight.left_article + "_zh");
+
+    return leftArticleData?.heading || sight.name;
   };
 
   return (
-    <div
+    <div>
-      className={`side-menu-sight-wrapper ${
-        selectedStationId === station.id ? "side-menu-sight-selected-wrapper" : ""
-      }`}
-    >
       <div
         ref={containerRef}
         className="side-menu-sight"
@@ -114,20 +88,22 @@ const StationItem = ({
             );
           }
         }}
+        title={station.name}
       >
         <span ref={textRef} className={shouldAnimate ? "marquee-text" : ""}>
           {station.name}
         </span>
       </div>
-      <Collapsible
+      <div
-        className="side-menu-sight-transfer-list"
+        className={`side-menu-sight-transfer-list ${
-        open={selectedStationId === station.id}
+          selectedStationId === station.id ? "open" : ""
+        }`}
       >
         {sights.length > 0 ? (
           sights.map((sight, index) => (
-            <SightTransferItem
+            <div
               key={sight.id}
-              name={getSightName(sight)}
+              className="side-menu-sight-transfer pointer"
               style={{
                 borderBottom:
                   index < sights.length - 1
@@ -139,11 +115,19 @@ const StationItem = ({
               onPointerUp={(e) => {
                 e.stopPropagation();
                 if (onSightClick) {
-                  const elementRect = e.currentTarget.getBoundingClientRect();
+                  // Вычисляем позицию элемента для правильного позиционирования левого виджета
-                  onSightClick(sight.id, elementRect.top);
+                  const element = e.currentTarget;
+                  const elementRect = element.getBoundingClientRect();
+
+                  // Используем позицию элемента относительно viewport (elementRect.top)
+                  // чтобы верхняя граница виджета совпадала с верхней границей элемента
+                  const elementTop = elementRect.top;
+                  onSightClick(sight.id, elementTop);
                 }
               }}
-            />
+            >
+              {getSightName(sight)}
+            </div>
           ))
         ) : (
           <div className="side-menu-sight-transfer-empty">
@@ -154,7 +138,7 @@ const StationItem = ({
                 : "No sights"}
           </div>
         )}
-      </Collapsible>
+      </div>
     </div>
   );
 };

src/client/src/components/widgets/AppealWidget.jsx

@@ -1,50 +1,13 @@
-import { useRef, useEffect } from "react";
+import '../../styles/AppealWidget.css'
-import "../../styles/AppealWidget.css";
-import { TouchableLayout } from "../TouchableLayout";
-import { ReactMarkdownComponent } from "../ReactMarkdown";
-
-function AppealWidget({
-  widgetImgPath,
-  widgetLabel,
-  widgetText,
-  style,
-  isOpen,
-}) {
-  const stopProp = (e) => {
-    e.stopPropagation();
-    e.preventDefault();
-  };
-  const layoutRef = useRef(null);
-
-  useEffect(() => {
-    if (isOpen && layoutRef.current) {
-      const scrollable = layoutRef.current.querySelector(".scrollable");
-      if (scrollable) scrollable.scrollTop = 0;
-    }
-  }, [isOpen]);
 
+function AppealWidget({widgetImgPath, widgetLabel, widgetText, style}) {
     return (
-    <div
+        <div style={style} className='dynamic-widget'>
-      style={style}
+            <img className='dynamic-widget-image' src={widgetImgPath} />
-      className="dynamic-widget"
+            <div className='dynamic-widget-label'>{widgetLabel}</div>
-      onPointerDown={stopProp}
+            <div className='dynamic-widget-text'>{widgetText}</div>
-      onPointerMove={stopProp}
-      onPointerUp={stopProp}
-    >
-      {widgetImgPath && (
-        <img className="dynamic-widget-image" src={widgetImgPath} />
-      )}
-      <div className="dynamic-widget-label">{widgetLabel}</div>
-      <TouchableLayout
-        ref={layoutRef}
-        className="dynamic-widget-text-scroll"
-      >
-        <div className="dynamic-widget-text">
-          <ReactMarkdownComponent value={widgetText} />
-        </div>
-      </TouchableLayout>
         </div>
     );
 }
 
-export default AppealWidget;
+export default AppealWidget

src/client/src/components/widgets/RouteWidget.jsx

@@ -8,7 +8,7 @@ import { apiStore } from "../../api/ApiStore/store";
 const RouteWidget = observer(() => {
   const store = useGeolocationStore();
   const { contextData, isLoading, error, selectedLanguage } = store;
-  const { routeStations, routeStationsEn, routeStationsZh, context } = apiStore;
+  const { routeStations, routeStationsEn, routeStationsZh, context, route } = apiStore;
   const [startStation, setStartStation] = useState(null);
   const [startStationEn, setStartStationEn] = useState(null);
   const [endStation, setEndStation] = useState(null);
@@ -84,14 +84,15 @@ const RouteWidget = observer(() => {
   const routeZhSubtitle = `${startStationZh?.name} - ${endStationZh?.name}`;
   return (
     <div className="route-widget">
-      <div className={`route-widget-number ${getNumberSizeClass(context?.routeNumber)}`}>
+      <div className={`route-widget-number ${getNumberSizeClass(route?.route_sys_number || context?.routeNumber)}`}>
-        {context?.routeNumber || "No number"}
+        {route?.route_sys_number || context?.routeNumber || ""}
       </div>
       <div className="route-widget-content">
         <div
           className={`route-widget-label ${
             shouldAnimate(startStation?.name, 18) ? "marquee" : ""
           } ${getLabelSizeClass(startStation?.name)}`}
+          title={startStation?.name}
         >
           {startStation?.name}
         </div>
@@ -99,6 +100,7 @@ const RouteWidget = observer(() => {
           className={`route-widget-label ${
             shouldAnimate(endStation?.name, 18) ? "marquee" : ""
           } ${getLabelSizeClass(endStation?.name)}`}
+          title={endStation?.name}
         >
           {endStation?.name}
         </div>
@@ -107,6 +109,7 @@ const RouteWidget = observer(() => {
             className={`route-widget-subtitle ${
               shouldAnimate(routeEnSubtitle, 50) ? "marquee" : ""
             }`}
+            title={routeEnSubtitle}
           >
             {routeEnSubtitle}
           </div>
@@ -116,6 +119,7 @@ const RouteWidget = observer(() => {
             className={`route-widget-subtitle ${
               shouldAnimate(routeZhSubtitle, 50) ? "marquee" : ""
             }`}
+            title={routeZhSubtitle}
           >
             {routeZhSubtitle}
           </div>

src/client/src/components/widgets/ThreeView.tsx

@@ -1,6 +1,6 @@
-import { Canvas, useThree, useFrame } from "@react-three/fiber";
+import { Canvas, useThree } from "@react-three/fiber";
-import { OrbitControls, Center, useGLTF } from "@react-three/drei";
+import { OrbitControls, Stage, useGLTF } from "@react-three/drei";
-import React, { useEffect, useRef, Suspense, useCallback } from "react";
+import React, { useEffect, Suspense } from "react";
 import { BACKGROUND_COLOR } from "../../assets/Constants";
 import * as THREE from "three";
 import type { OrbitControls as OrbitControlsImpl } from "three-stdlib";
@@ -23,7 +23,6 @@ interface ThreeViewProps {
 const ZOOM_FACTOR = 1.2;
 const MIN_DISTANCE = 1;
 const MAX_DISTANCE = 100;
-const CAMERA_FOV = 40;
 
 const TouchController = () => {
   const { camera, controls, gl } = useThree();
@@ -198,47 +197,6 @@ const AutoResize = () => {
   return null;
 };
 
-const FitCamera = ({
-  groupRef,
-  onReady,
-}: {
-  groupRef: React.RefObject<THREE.Group>;
-  onReady: () => void;
-}) => {
-  const { camera, controls } = useThree();
-  const fitted = useRef(false);
-
-  useFrame(() => {
-    if (fitted.current) return;
-    const group = groupRef.current;
-    if (!group || group.children.length === 0) return;
-
-    const box = new THREE.Box3().setFromObject(group);
-    const sphere = new THREE.Sphere();
-    box.getBoundingSphere(sphere);
-
-    if (sphere.radius === 0) return;
-
-    const fov = THREE.MathUtils.degToRad(CAMERA_FOV);
-    const dist = sphere.radius / Math.sin(fov / 2);
-
-    camera.position.set(0, 0, dist);
-    camera.lookAt(0, 0, 0);
-    camera.updateProjectionMatrix();
-
-    if (controls) {
-      const orbit = controls as unknown as OrbitControlsImpl;
-      orbit.target.set(0, 0, 0);
-      orbit.update();
-    }
-
-    fitted.current = true;
-    onReady();
-  });
-
-  return null;
-};
-
 const Model = ({
   fileUrl,
   onLoad,
@@ -275,37 +233,21 @@ export const ThreeView: React.FC<ThreeViewProps> = ({
   onError,
   controlRef,
 }) => {
-  const [isReady, setIsReady] = React.useState(false);
-  const groupRef = useRef<THREE.Group>(null!);
-
-  const handleReady = useCallback(() => {
-    setIsReady(true);
-    onLoad?.();
-  }, [onLoad]);
-
   return (
     <div style={{ width, height, position: "relative", overflow: "hidden" }}>
-      {!isReady && (
-        <div style={{
-          position: "absolute", inset: 0,
-          backgroundColor: `#${BACKGROUND_COLOR.toString(16).padStart(6, "0")}`,
-          zIndex: 1,
-        }} />
-      )}
       <Canvas
         gl={{
           antialias: true,
           toneMappingExposure: 1.5,
           outputColorSpace: THREE.SRGBColorSpace,
         }}
-        camera={{ position: [0, 0, 50], fov: CAMERA_FOV }}
+        camera={{ position: [0, 0, 5], fov: 40 }}
         style={{ width: "100%", height: "100%" }}
         onError={(e: any) => onError?.(e.message)}
       >
         <AutoResize />
         <TouchController />
         {controlRef && <ZoomController controlRef={controlRef} />}
-        <FitCamera groupRef={groupRef} onReady={handleReady} />
         <color attach="background" args={[BACKGROUND_COLOR]} />
         <ambientLight intensity={0.8} />
         <directionalLight position={[30, 30, 30]} intensity={1.2} />
@@ -323,18 +265,23 @@ export const ThreeView: React.FC<ThreeViewProps> = ({
         <pointLight position={[0, 30, 0]} intensity={0.6} />
 
         <Suspense fallback={null}>
-          <Center precise>
+          <Stage
-            <group ref={groupRef}>
+            environment={null}
-              <Model fileUrl={fileUrl} />
+            intensity={1}
-            </group>
+            castShadow={false}
-          </Center>
+            shadows={false}
+            adjustCamera={true}
+            center={{ precise: true }}
+          >
+            <Model fileUrl={fileUrl} onLoad={onLoad} />
+          </Stage>
         </Suspense>
 
         <OrbitControls
           makeDefault
           enableZoom={true}
           enablePan={true}
-          target={[0, 0, 0]}
+          target={[50, 50, 50]}
           minDistance={1}
           maxDistance={100}
           enableDamping={true}

src/client/src/index.css

@@ -14,9 +14,9 @@
 .side-menu-sights-block {
   height: calc(60%);
   overflow-y: scroll;
-  margin-left: 0;
+  margin-left: 20px;
   margin-top: 8px;
-  padding-right: 5px;
+  margin-right: 5px;
   touch-action: none; /* Отключаем стандартные действия */
   overscroll-behavior: contain; /* Предотвращаем прокрутку родительских элементов */
 }

src/client/src/stores/ColorStore.ts

@@ -1,45 +1,21 @@
 import { makeAutoObservable, runInAction } from "mobx";
 
+const COLOR_WHITE = { h: 151, s: 0, l: 100 };
+const COLOR_GREEN = { h: 151, s: 100, l: 22 };
+
 const TRANSITION_DURATION = 60000;
 const TICK_INTERVAL = 100;
 const TICK_STEP = TICK_INTERVAL / TRANSITION_DURATION;
 
-function hexToRgb(hex: string): { r: number; g: number; b: number } | null {
-  const clean = hex.trim().replace(/^#/, "");
-  const full = clean.length === 3 ? clean.split("").map((c) => c + c).join("") : clean;
-  if (full.length !== 6) return null;
-  return {
-    r: parseInt(full.slice(0, 2), 16),
-    g: parseInt(full.slice(2, 4), 16),
-    b: parseInt(full.slice(4, 6), 16),
-  };
-}
-
-function interpolateRgb(
-  from: { r: number; g: number; b: number },
-  to: { r: number; g: number; b: number },
-  t: number
-): string {
-  const r = Math.round(from.r + (to.r - from.r) * t);
-  const g = Math.round(from.g + (to.g - from.g) * t);
-  const b = Math.round(from.b + (to.b - from.b) * t);
-  return `rgb(${r}, ${g}, ${b})`;
-}
-
-const WHITE = { r: 255, g: 255, b: 255 };
-const DEFAULT_MAIN = { r: 0, g: 111, b: 58 };
-
 interface ColorStore {
   currentColor: string;
   setCurrentColor: (color: string) => void;
-  setMainColor: (hex: string) => void;
   startColorAnimation: () => void;
   stopColorAnimation: () => void;
 }
 
 class ColorStore implements ColorStore {
   currentColor: string = "#fff";
-  private mainColor: { r: number; g: number; b: number } = DEFAULT_MAIN;
   private progress: number = 0;
   private direction: number = 1;
   private tickInterval: ReturnType<typeof setInterval> | null = null;
@@ -52,12 +28,12 @@ class ColorStore implements ColorStore {
     this.currentColor = color;
   };
 
-  setMainColor = (hex: string) => {
+  private interpolateColor(progress: number): string {
-    const parsed = hexToRgb(hex);
+    const h = Math.round(COLOR_WHITE.h + (COLOR_GREEN.h - COLOR_WHITE.h) * progress);
-    if (parsed) {
+    const s = Math.round(COLOR_WHITE.s + (COLOR_GREEN.s - COLOR_WHITE.s) * progress);
-      this.mainColor = parsed;
+    const l = Math.round(COLOR_WHITE.l + (COLOR_GREEN.l - COLOR_WHITE.l) * progress);
+    return `hsl(${h}, ${s}%, ${l}%)`;
   }
-  };
 
   startColorAnimation = () => {
     if (this.tickInterval) return;
@@ -74,7 +50,7 @@ class ColorStore implements ColorStore {
           this.direction = 1;
         }
 
-        this.currentColor = interpolateRgb(WHITE, this.mainColor, this.progress);
+        this.currentColor = this.interpolateColor(this.progress);
       });
     }, TICK_INTERVAL);
   };

src/client/src/styles/AppealWidget.css

@@ -5,124 +5,37 @@
   flex-direction: column;
   align-items: center;
   width: 420px;
-  max-height: calc(100vh - 150px - 98px);
   border-radius: 10px;
-  background:
+  background: linear-gradient(
-    linear-gradient(
       114deg,
       rgba(255, 255, 255, 0) 8.71%,
       rgba(255, 255, 255, 0.16) 69.69%
     ),
-    var(--carrier-left, #006f3a);
+    #006F3A;
   box-sizing: border-box;
-  overflow: hidden;
-  touch-action: none;
 }
 
 .dynamic-widget-image {
-  padding-top: 2px;
+  border-radius-top-left: 10px;
-  margin-left: 2px;
+  border-radius-top-right: 10px;
-  margin-right: 2px;
+  padding-top: 4px;
-  width: 416px;
+  margin-left: 4px;
-  border-radius: 10px 10px 0 0;
+  margin-right: 4px;
-  object-fit: cover;
+  width: 412px;
 }
 
 .dynamic-widget-label {
-  width: 100%;
+  width: 380px;
-  padding: 10px 20px;
+  margin-top: 29px;
-  box-sizing: border-box;
   font-size: 20px;
   font-weight: 500;
-  color: #fff;
-  border-bottom: 1px solid var(--Glass-stroke, rgba(255, 255, 255, 0.8));
-  background:
-    linear-gradient(
-      180deg,
-      rgba(255, 255, 255, 0.2) 0%,
-      rgba(255, 255, 255, 0) 100%
-    ),
-    rgba(var(--carrier-right-menu-rgb, 179, 165, 152), 0.4);
 }
 
-.dynamic-widget-text-scroll.scrollable-container {
-  flex: 1;
-  min-height: 0;
-  align-self: stretch;
-  margin: 15px 20px;
-  overflow: hidden;
-}
-
-.dynamic-widget-text-scroll .scrollable-viewport {
-  flex: 1;
-  min-height: 0;
-  overflow: hidden;
-}
-
-.dynamic-widget-text-scroll .scrollable {
-  flex: 1;
-  min-height: 0;
-}
-
-
 .dynamic-widget-text {
+  margin-top: 16px;
+  margin-bottom: 25px;
+  width: 380px;
   font-size: 16px;
   font-weight: 300;
-  line-height: 135%;
+  line-height: 150%;
-  padding-right: 5px;
-}
-
-.dynamic-widget-text .react-markdown-container {
-  font-size: 16px;
-  line-height: 135%;
-  font-weight: 300;
-}
-
-.dynamic-widget-text .react-markdown-container p {
-  font-size: 16px;
-  line-height: 135%;
-  margin-bottom: 8px;
-}
-
-.dynamic-widget-text .react-markdown-container p:last-child {
-  margin-bottom: 0;
-}
-
-.dynamic-widget-text .react-markdown-container h1,
-.dynamic-widget-text .react-markdown-container h2,
-.dynamic-widget-text .react-markdown-container h3,
-.dynamic-widget-text .react-markdown-container h4,
-.dynamic-widget-text .react-markdown-container h5,
-.dynamic-widget-text .react-markdown-container h6 {
-  font-size: 18px;
-  margin-top: 10px;
-  margin-bottom: 4px;
-  font-weight: 600;
-}
-
-.dynamic-widget-text .react-markdown-container ul,
-.dynamic-widget-text .react-markdown-container ol {
-  margin-bottom: 8px;
-  padding-left: 20px;
-}
-
-.dynamic-widget-text .react-markdown-container li {
-  margin-bottom: 4px;
-}
-
-.dynamic-widget-text .react-markdown-container blockquote {
-  margin-top: 8px;
-  margin-bottom: 8px;
-  padding-left: 12px;
-  border-left: 3px solid rgba(255, 255, 255, 0.4);
-}
-
-.dynamic-widget-text .react-markdown-container img {
-  max-width: 100%;
-  border-radius: 6px;
-}
-
-.dynamic-widget-text .react-markdown-container a {
-  color: rgba(255, 255, 255, 0.9);
-  text-decoration: underline;
 }

src/client/src/styles/LeftWidget.css

@@ -14,7 +14,7 @@
       rgba(255, 255, 255, 0) 8.71%,
       rgba(255, 255, 255, 0.16) 69.69%
     ),
-    var(--carrier-left, #006F3A);
+    #006F3A;
   will-change: transform, opacity;
   backface-visibility: hidden;
 }
@@ -67,78 +67,17 @@
   line-height: 150%;
 }
 
-.left-widget-text-scroll.scrollable-container {
-  margin-top: 15px;
-  overflow: hidden;
-  width: 100%;
-}
-
-.left-widget-text-scroll .scrollable-viewport {
-  max-height: 200px;
-}
-
 .left-widget-text {
+  margin-top: 15px;
   color: #fff;
   font-family: "Roboto";
   font-size: 16px;
   font-weight: 300;
   line-height: 135%;
-  padding-right: 3px;
+  max-height: 200px; /* Пример ограничения высоты */
-}
+  overflow-y: auto;
-
+  touch-action: none;
-.left-widget-text .react-markdown-container {
+  overscroll-behavior: contain;
-  font-size: 16px;
-  line-height: 135%;
-  font-weight: 300;
-}
-
-.left-widget-text .react-markdown-container p {
-  font-size: 16px;
-  line-height: 135%;
-  margin-bottom: 8px;
-}
-
-.left-widget-text .react-markdown-container p:last-child {
-  margin-bottom: 0;
-}
-
-.left-widget-text .react-markdown-container h1,
-.left-widget-text .react-markdown-container h2,
-.left-widget-text .react-markdown-container h3,
-.left-widget-text .react-markdown-container h4,
-.left-widget-text .react-markdown-container h5,
-.left-widget-text .react-markdown-container h6 {
-  font-size: 18px;
-  margin-top: 10px;
-  margin-bottom: 4px;
-  font-weight: 600;
-}
-
-.left-widget-text .react-markdown-container ul,
-.left-widget-text .react-markdown-container ol {
-  margin-bottom: 8px;
-  padding-left: 20px;
-}
-
-.left-widget-text .react-markdown-container li {
-  margin-bottom: 4px;
-}
-
-.left-widget-text .react-markdown-container blockquote {
-  margin-top: 8px;
-  margin-bottom: 8px;
-  padding-left: 12px;
-  border-left: 3px solid rgba(255, 255, 255, 0.4);
-}
-
-.left-widget-text .react-markdown-container img {
-  max-width: 100%;
-  border-radius: 6px;
-}
-
-.left-widget-text .react-markdown-container a {
-  color: rgba(255, 255, 255, 0.9);
-  text-decoration: underline;
 }
 
 .left-widget-image {
@@ -154,27 +93,26 @@
   padding-left: 10px;
   padding-bottom: 6px;
   width: 100%;
+}
+
+/* Анимация для списка пересадок */
+.side-menu-sight-transfer-list.entering,
+.side-menu-sight-transfer-list.entered {
+  max-height: 500px; /* Достаточно большое значение, чтобы вместить все пересадки */
+  opacity: 1;
+  transition: max-height 0.3s ease-out, opacity 0.3s ease-out;
   overflow: hidden;
 }
 
-.side-menu-sight-transfer span {
-  display: inline-block;
-  white-space: nowrap;
-}
-
-.side-menu-sight-transfer span.marquee-text {
-  animation: side-menu-marquee 14s linear infinite;
-}
-
 .side-menu-sight-transfer-list {
-  height: 0;
+  max-height: 0;
   opacity: 0;
   overflow: hidden;
-  transition:
+  transition: max-height 0.3s ease-out, opacity 0.3s ease-out; /* Анимация при открытии/закрытии */
-    height 0.3s cubic-bezier(0.16, 1, 0.3, 1),
-    opacity 0.3s ease;
 }
 
+/* Активное состояние - когда список открыт */
 .side-menu-sight-transfer-list.open {
+  max-height: 500px; /* Достаточно большое значение, чтобы вместить все пересадки */
   opacity: 1;
 }

src/client/src/styles/ListOfSights.css

@@ -1,45 +1,3 @@
-@property --fade-top {
-  syntax: "<length>";
-  inherits: false;
-  initial-value: 0px;
-}
-
-@property --fade-bottom {
-  syntax: "<length>";
-  inherits: false;
-  initial-value: 45px;
-}
-
-@keyframes pulse-chevron {
-  0% {
-    transform: rotate(var(--r, 0deg)) translateY(0px) scale(1);
-  }
-  40% {
-    transform: rotate(var(--r, 0deg)) translateY(-4px) scale(1.12);
-  }
-  60% {
-    transform: rotate(var(--r, 0deg)) translateY(-5px) scale(1.14);
-  }
-  100% {
-    transform: rotate(var(--r, 0deg)) translateY(0px) scale(1);
-  }
-}
-
-.chevron-svg {
-  font-size: 20px;
-  animation: pulse-chevron 1.2s ease-in-out infinite;
-  animation-play-state: paused;
-  will-change: transform;
-}
-
-.chevron-svg.is-idle {
-  animation-play-state: running;
-}
-
-.chevron-svg.is-open {
-  --r: 180deg;
-}
-
 .right-widget {
   position: fixed;
   right: 32px;
@@ -48,8 +6,6 @@
 }
 
 .list-of-sights {
-  position: relative;
-  z-index: 10;
   -webkit-box-shadow: 0px -8px 17px 2px rgba(34, 60, 80, 0.2);
   -moz-box-shadow: 0px -8px 17px 2px rgba(34, 60, 80, 0.2);
   box-shadow: 0px -8px 17px 2px rgba(34, 60, 80, 0.2);
@@ -61,11 +17,11 @@
       rgba(255, 255, 255, 0) 8.71%,
       rgba(255, 255, 255, 0.16) 69.69%
     ),
-    var(--carrier-right, #806c59);
+    #006f3a;
   color: white;
 
   max-height: 68px;
-  transition: max-height 0.35s cubic-bezier(0.16, 1, 0.3, 1);
+  transition: max-height 0.15s ease;
   overflow: hidden;
 }
 
@@ -107,7 +63,7 @@
   border-radius: 10px;
   width: 128px;
 
-  background-color: var(--carrier-right-dark, #005a2f);
+  background-color: #0e8953;
 }
 
 .list-of-sights-title {
@@ -125,7 +81,7 @@
 
   opacity: 0;
   pointer-events: none;
-  transition: opacity 0.25s cubic-bezier(0.16, 1, 0.3, 1) 0.1s;
+  transition: opacity 0.15s ease-in-out 0.15s;
 
   overscroll-behavior: contain;
   touch-action: pan-y;
@@ -134,29 +90,6 @@
   backface-visibility: hidden;
 }
 
-.list-of-sights-content .scrollable {
-  --fade-top: 0px;
-  --fade-bottom: 45px;
-  mask-image: linear-gradient(
-    to bottom,
-    transparent 0px,
-    black var(--fade-top),
-    black calc(100% - var(--fade-bottom)),
-    transparent 100%
-  );
-  transition:
-    --fade-top 0.5s ease,
-    --fade-bottom 0.5s ease;
-}
-
-.list-of-sights-content:not(.is-at-top) .scrollable {
-  --fade-top: 15px;
-}
-
-.list-of-sights-content.is-at-bottom .scrollable {
-  --fade-bottom: 0px;
-}
-
 .list-of-sights-grid {
   display: grid;
   grid-template-columns: repeat(3, 1fr);
@@ -170,12 +103,6 @@
   pointer-events: auto;
 }
 
-.list-of-sights-content .custom-scrollbar-track {
-  margin-top: 14px;
-  margin-bottom: 10px;
-  overflow: hidden;
-}
-
 .sight-component {
   display: flex;
   flex-direction: column;
@@ -248,18 +175,18 @@
   height: 1px;
   width: 100%;
   background-color: rgba(255, 255, 255, 0.3);
-  margin-bottom: 0;
+  margin-bottom: 14px;
 }
 
 .sight-frame {
   z-index: -1;
   position: absolute;
-  bottom: 100px;
+  bottom: 66px;
-  left: 0;
   display: flex;
   flex-direction: column;
   align-items: center;
-  width: 100%;
+  margin-bottom: 32px;
+  width: 550px;
   border-radius: 10px;
   background:
     linear-gradient(
@@ -267,14 +194,8 @@
       rgba(255, 255, 255, 0) 8.71%,
       rgba(255, 255, 255, 0.16) 69.69%
     ),
-    var(--carrier-right, #806c59);
+    #006f3a;
   max-height: calc(100vh - 128px);
-  transform: translate3d(0, 0, 0);
-  overflow: hidden;
-}
-
-.sight-frame.three-d-fullscreen {
-  overflow: visible;
 }
 
 .sight-frame-image {
@@ -291,11 +212,6 @@
   flex-direction: column;
   flex-grow: 1;
   width: 100%;
-  transition: opacity 0.18s ease;
-}
-
-.sight-frame-content.is-switching {
-  opacity: 0;
 }
 
 .sight-frame-get-back-wrapper {
@@ -321,37 +237,15 @@
       rgba(255, 255, 255, 0.22) 0%,
       rgba(255, 255, 255, 0.04) 100%
     ),
-    rgba(var(--carrier-right-rgb, 128, 108, 89), 0.72);
+    rgba(0, 111, 58, 0.72);
   box-shadow: 4px 4px 12px 0px rgba(255, 255, 255, 0.12) inset;
   box-sizing: border-box;
   color: white;
   word-wrap: break-word;
+  overflow-wrap: break-word;
   min-width: 0;
 }
 
-.fade-in-text {
-  animation: fadeInText 0.35s cubic-bezier(0.16, 1, 0.3, 1) forwards;
-}
-
-@keyframes fadeInText {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-
-.sight-frame-title:not(.intro-title) {
-  background:
-    linear-gradient(
-      180deg,
-      rgba(255, 255, 255, 0.2) 0%,
-      rgba(255, 255, 255, 0) 100%
-    ),
-    rgba(var(--carrier-right-menu-rgb, 179, 165, 152), 0.4);
-}
-
 .sight-frame-title p {
   word-wrap: break-word;
   overflow-wrap: break-word;
@@ -369,40 +263,18 @@
 }
 
 .sight-frame-text-wrapper {
+  flex-grow: 1;
+  padding: 16px;
+  box-sizing: border-box;
   max-height: calc(80vh - 354px);
   min-height: 0;
-  flex-shrink: 0;
-  padding: 16px 16px 76px 16px;
-  box-sizing: border-box;
   overflow: hidden;
   display: flex;
   flex-direction: column;
-  transition: opacity 0.3s ease;
 }
 
 .sight-frame-text-wrapper.scrollable-container {
-  padding: 16px 16px 76px 16px;
+  padding: 16px;
-  transition: opacity 0.3s ease;
-}
-
-.sight-frame-text-wrapper.is-intro {
-  height: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-  border: none;
-  opacity: 0;
-  pointer-events: none;
-  overflow: hidden;
-}
-
-.sight-frame-loading-placeholder {
-  flex-shrink: 0;
-}
-
-
-.sight-frame-text-wrapper[data-scrollbar-no-transition="true"] .custom-scrollbar-track,
-.sight-frame-text-wrapper[data-scrollbar-no-transition="true"] .custom-scrollbar-thumb {
-  transition: opacity 0.3s ease !important;
 }
 .sight-frame-text-wrapper .scrollable-viewport {
   flex: 1;
@@ -413,12 +285,11 @@
 }
 
 .sight-frame-text {
-  display: flow-root; /* BFC prevents margin collapsing for correct scrollHeight measurement */
   padding-right: 10px;
   text-align: left;
   color: #fff;
   font-family: "Roboto";
-  font-size: 20px;
+  font-size: 18px;
   font-style: normal;
   font-weight: 400;
   line-height: 150%;
@@ -455,57 +326,13 @@
   margin-bottom: 0;
 }
 
-.sight-frame-menu-wrapper {
-  position: absolute;
-  bottom: 100px;
-  left: 0;
-  width: 100%;
-  height: 60px;
-  z-index: 2;
-  border-radius: 0 0 10px 10px;
-  overflow: hidden;
-  flex-shrink: 0;
-}
-
-.sight-frame-menu-fade {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  width: 120px;
-  z-index: 100001;
-  pointer-events: none;
-  transition: opacity 0.4s ease;
-}
-
-.sight-frame-menu-fade.left {
-  left: 0;
-  background: linear-gradient(
-    to right,
-    rgba(var(--carrier-right-menu-rgb, 179, 165, 152), 0.95),
-    transparent
-  );
-  border-radius: 0 0 0 10px;
-}
-
-.sight-frame-menu-fade.right {
-  right: 0;
-  background: linear-gradient(
-    to left,
-    rgba(var(--carrier-right-menu-rgb, 179, 165, 152), 0.95),
-    transparent
-  );
-  border-radius: 0 0 10px 0;
-}
-
 .sight-frame-menu {
-  z-index: 100000;
   position: relative;
-  padding: 7px 60px;
+  padding: 7px;
   width: 100%;
-  height: 60px;
   display: flex;
   align-items: center;
-  justify-content: space-evenly;
+  justify-content: space-around;
   border-radius: 0px 0px 10px 10px;
   border-top: 1px solid rgba(255, 255, 255, 0.8);
   background:
@@ -514,22 +341,11 @@
       rgba(255, 255, 255, 0.2) 0%,
       rgba(255, 255, 255, 0) 100%
     ),
-    rgba(var(--carrier-right-menu-rgb, 179, 165, 152), 0.4);
+    rgba(0, 111, 58, 0.4);
   box-shadow: 4px 4px 12px 0px rgba(255, 255, 255, 0.12) inset;
   backdrop-filter: blur(10px);
   box-sizing: border-box;
   flex-shrink: 0;
-  overflow-x: auto;
-  overflow-y: hidden;
-}
-
-.sight-frame-menu::-webkit-scrollbar {
-  display: none;
-}
-
-.sight-frame-menu {
-  -ms-overflow-style: none;
-  scrollbar-width: none;
 }
 
 .sight-frame-menu-point {
@@ -540,17 +356,16 @@
   font-style: normal;
   font-weight: 400;
   padding: 8px 12px;
+
   white-space: nowrap;
-  flex-shrink: 0;
-  border-bottom: 2px solid transparent;
   transition:
     background-color 0.1s ease,
     color 0.1s ease;
 }
 
 .sight-frame-menu-point.active {
-  text-shadow: 0 0 0.4px #fff, 0 0 0.4px #fff;
+  border-bottom: 2px solid #fff;
-  border-bottom-color: #fff;
+  font-weight: 600;
 }
 
 .sight-frame-text-wrapper::-webkit-scrollbar-track {
@@ -575,20 +390,30 @@
 }
 .sight-frame {
   opacity: 0;
-  transition: opacity 0.9s ease-out;
+  transform: translateY(20px);
+  transition:
+    opacity 0.2s ease-out,
+    transform 0.2s ease-out;
 }
 
 .sight-frame.is-visible {
   opacity: 1;
-  animation: fadeInScale 0.9s cubic-bezier(0.16, 1, 0.3, 1) forwards;
+  transform: translateY(0);
+  animation: fadeInScale 0.6s ease-out forwards;
 }
 
 @keyframes fadeInScale {
-  from {
+  0% {
     opacity: 0;
+    transform: translateY(20px) scale(0.95);
   }
-  to {
+  50% {
+    opacity: 0.7;
+    transform: translateY(-5px) scale(1.02);
+  }
+  100% {
     opacity: 1;
+    transform: translateY(0) scale(1);
   }
 }
 
@@ -640,7 +465,6 @@
   font-size: 40px;
   font-weight: 600;
   line-height: 150%;
-  padding-bottom: 60px;
 }
 
 .svg-container {
@@ -695,20 +519,17 @@
 }
 
 .alphabet {
-  width: 40px;
+  width: 100px;
-  flex-shrink: 0;
   margin-right: 10px;
-  margin-top: 14px;
+  padding-top: 24px;
-  margin-bottom: 10px;
-  padding-top: 10px;
-  padding-bottom: 10px;
   display: flex;
   align-items: center;
   flex-direction: column;
-  gap: 20px;
+  gap: 16px;
   overflow-y: auto;
   overflow-x: hidden;
-  height: 676px;
+  height: 650px;
+  padding-bottom: 30px;
   touch-action: pan-y;
   overscroll-behavior: contain;
   scrollbar-width: none;
@@ -758,9 +579,8 @@
 }
 
 .alphabet-position {
-  display: flex;
+  display: inline-flex;
   justify-content: space-between;
-  width: 100%;
 }
 
 .transfer-button-container {
@@ -787,14 +607,14 @@
 
   position: absolute;
   border-radius: 10px;
-  border: 1px solid var(--carrier-main, #006f3a);
+  border: 1px solid #006f3a;
   background:
     linear-gradient(
       180deg,
       rgba(255, 255, 255, 0.2) 0%,
       rgba(255, 255, 255, 0) 100%
     ),
-    rgba(var(--carrier-main-rgb, 0, 111, 58), 0.4);
+    rgba(0, 111, 58, 0.4);
 
   box-shadow: 4px 4px 12px 0px rgba(255, 255, 255, 0.12) inset;
   backdrop-filter: blur(10px);
@@ -927,7 +747,7 @@
   border-radius: 32px;
   right: 20px;
   bottom: 20px;
-  background: var(--carrier-main, #006f3a);
+  background: #006f3a;
   z-index: 9999;
   display: flex;
 }

src/client/src/styles/RouteWidget.css

@@ -26,17 +26,15 @@
   position: fixed;
   display: inline-flex;
   border-radius: 10px;
-  box-shadow:
+  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.3) inset,
-    0 0 0 1px rgba(255, 255, 255, 0.3) inset,
     /* Внутренняя рамка */ 4px 4px 12px 0 rgba(255, 255, 255, 0.12) inset; /* Ваш существующий внутренний shadow */
   padding: 1px; /* Чтобы контент не прилипал к рамке */
-  background:
+  background: linear-gradient(
-    linear-gradient(
       to bottom right,
       rgba(255, 255, 255, 0.2) 0%,
       rgba(255, 255, 255, 0) 100%
     ),
-    rgba(179, 165, 152, 0.4);
+    rgba(0, 111, 58, 0.4);
   backdrop-filter: blur(10px);
   pointer-events: auto;
   z-index: 10000001;
@@ -52,7 +50,7 @@
   height: 96px;
   background-color: #fcd500;
   color: black;
-  border-radius: 10px 0 0 10px;
+  border-radius: 10px;
   display: flex;
   justify-content: center;
   align-items: center;

src/client/src/styles/SideMenu.css

@@ -13,7 +13,18 @@
       rgba(255, 255, 255, 0.2) 0%,
       rgba(255, 255, 255, 0) 100%
     ),
-    var(--carrier-left, #006f3a);
+    #006f3a;
+}
+
+.side-menu-label {
+  margin-top: 10px;
+  text-align: left;
+  font-size: 15px;
+  padding: 0 20px;
+  align-self: flex-start;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 150%;
 }
 
 .appeal-button {
@@ -24,12 +35,11 @@
   font-size: 16px;
   margin-top: 120px;
   font-weight: 500;
-  width: 220px;
-  text-align: center;
 }
 
 .side-menu-buttons {
   width: 220px;
+  margin-top: 260px;
 }
 
 .side-menu-button {
@@ -41,6 +51,10 @@
   border-radius: 10px;
 }
 
+.side-menu-button--sights {
+  background-color: #fcd500;
+}
+
 .side-menu-button--active {
   background-color: #fcd500;
   color: #000;
@@ -55,6 +69,24 @@
   flex-direction: column;
 }
 
+.side-menu-carrier-block {
+  padding: 0 20px;
+}
+
+.carrier-logo {
+  width: 170px;
+}
+
+.side-menu-slogan {
+  margin-top: 4px;
+  text-align: left;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 700;
+  line-height: 150%;
+  color: #fff;
+}
+
 .side-menu-bottom-photo {
   width: 100%;
   margin-top: 32px;
@@ -106,10 +138,10 @@
   }
 
   3.33% {
-    fill: var(--carrier-left, rgb(76, 175, 75));
+    fill: rgb(76, 175, 75);
   }
   50% {
-    fill: var(--carrier-left, rgb(76, 175, 75));
+    fill: rgb(76, 175, 75);
   }
   53.33% {
     fill: #ffffff;
@@ -159,7 +191,7 @@
   top: -2px;
   width: 100px;
   height: 7px;
-  background-color: color-mix(in srgb, var(--carrier-left, #006f3a) 80%, black);
+  background-color: #0e8953;
   border-radius: 10px;
 }
 
@@ -168,8 +200,6 @@
   overflow: hidden;
   top: 250px;
   bottom: 0;
-  display: flex;
-  flex-direction: column;
   border-radius: 10px 10px 0px 0px;
   background:
     linear-gradient(
@@ -177,7 +207,7 @@
       rgba(255, 255, 255, 0) 8.71%,
       rgba(255, 255, 255, 0.16) 69.69%
     ),
-    var(--carrier-left, #006f3a);
+    #006f3a;
   position: absolute;
   width: 288px;
   transform: translateY(100%);
@@ -185,6 +215,8 @@
   transition:
     transform 0.3s ease-out,
     opacity 0.3s ease-out;
+  display: flex;
+  flex-direction: column;
 }
 
 .side-menu-sights.slide-in {
@@ -199,10 +231,12 @@
 .side-menu-sights-block {
   flex: 1;
   min-height: 0;
+  margin-left: 20px;
   margin-top: 8px;
   touch-action: none;
   overscroll-behavior: contain;
-  width: 100%;
+  width: auto;
+  max-width: calc(100% - 20px);
   box-sizing: border-box;
   overflow-x: hidden;
   overflow-y: auto;
@@ -210,10 +244,10 @@
 
 .side-menu-sight {
   padding-bottom: 2px;
+  margin-right: 20px;
   margin-bottom: 6px;
   margin-top: 6px;
-  border-bottom: 1px solid
+  border-bottom: 1px solid #0e8953;
-    color-mix(in srgb, var(--carrier-left, #006f3a) 80%, black);
   font-family: "Roboto";
   font-size: 16px;
   font-weight: 300;
@@ -223,17 +257,6 @@
   position: relative;
 }
 
-.side-menu-sight-wrapper {
-  margin-left: -20px;
-  padding-left: 20px;
-  background-color: transparent;
-  transition: background-color 0.3s ease;
-}
-
-.side-menu-sight-selected-wrapper {
-  background-color: rgba(0, 0, 0, 0.2);
-}
-
 .side-menu-sight > span {
   display: inline-block;
   white-space: nowrap;
@@ -255,6 +278,12 @@
   }
 }
 
+.side-menu-crest {
+  width: 170px;
+  align-self: flex-start;
+  margin-left: 20px;
+}
+
 .side-menu-control-lang-open {
   gap: 10px;
   display: inline-flex;

src/client/src/styles/TouchableLayout.css

@@ -43,8 +43,6 @@
   position: relative;
   background: rgba(255, 255, 255, 0.2);
   border-radius: 3px;
-  overflow: hidden;
-  transition: opacity 0.5s ease;
 }
 
 .custom-scrollbar-thumb {
@@ -57,7 +55,6 @@
   pointer-events: auto;
   cursor: grab;
   touch-action: none;
-  transition: opacity 0.5s ease, height 0.5s ease;
 }
 
 .custom-scrollbar-thumb:active {
@@ -65,12 +62,11 @@
 }
 
 .side-menu-sights-block .scrollable-viewport {
-  height: calc(98%);
+  height: calc(92%);
 }
 
 .side-menu-sights-block .scrollable {
   height: 100%;
-  padding-left: 20px;
 }
 
 .list-of-sights-content .scrollable-viewport {

src/client/src/styles/WeatherWidget.css

@@ -19,7 +19,7 @@
       rgba(255, 255, 255, 0.2) 0%,
       rgba(255, 255, 255, 0) 100%
     ),
-    rgba(179, 165, 152, 0.4);
+    rgba(0, 111, 58, 0.4);
 }
 
 .weather-widget-time {

src/features/navigation/ui/index.tsx

@@ -17,11 +17,6 @@ const isItemVisible = (item: (typeof NAVIGATION_ITEMS.primary)[number]): boolean
     );
   }
 
-  // Пользователь с ролью ТО всегда видит раздел устройств
-  if (item.path === "/devices" && authStore.hasRole("devices_maintenance_rw")) {
-    return true;
-  }
-
   const routePermissions = item.path ? ROUTE_REQUIRED_RESOURCES[item.path] ?? [] : [];
   const canAccessRoute = routePermissions.every((permission) =>
     authStore.canAccess(permission),

src/index.css

@@ -1,15 +1,6 @@
 @import "tailwindcss";
 @plugin "@tailwindcss/typography";
 
-html,
-body,
-#root {
-  margin: 0;
-  height: 100%;
-  min-height: 100%;
-  overflow: hidden;
-}
-
 button {
   cursor: pointer;
 }

src/pages/Article/ArticleCreatePage/index.tsx

@@ -1,17 +1,12 @@
-import React, { useEffect } from "react";
+import React from "react";
 import { useNavigate } from "react-router-dom";
 import { ArrowLeft } from "lucide-react";
 import { LanguageSwitcher } from "@widgets";
-import { articlesStore, selectedCityStore } from "@shared";
+import { articlesStore } from "@shared";
 
 const ArticleCreatePage: React.FC = () => {
   const navigate = useNavigate();
 
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const { articleData } = articlesStore;
 
   return (

src/pages/Article/ArticleEditPage/index.tsx

@@ -2,7 +2,7 @@ import React, { useEffect } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 import { ArrowLeft } from "lucide-react";
 import { LanguageSwitcher } from "@widgets";
-import { articlesStore, languageStore, selectedCityStore } from "@shared";
+import { articlesStore, languageStore } from "@shared";
 import { observer } from "mobx-react-lite";
 
 const ArticleEditPage: React.FC = observer(() => {
@@ -11,11 +11,6 @@ const ArticleEditPage: React.FC = observer(() => {
 
   const { articleData, getArticle } = articlesStore;
 
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   useEffect(() => {
     // Устанавливаем русский язык при загрузке страницы
     languageStore.setLanguage("ru");

src/pages/Article/ArticleListPage/index.tsx

@@ -31,7 +31,7 @@ export const ArticleListPage = observer(() => {
       setIsLoading(false);
     };
     fetchArticles();
-  }, [language, selectedCityStore.cityVersion]);
+  }, [language]);
 
   const columns: GridColDef[] = [
     {
@@ -55,12 +55,11 @@ export const ArticleListPage = observer(() => {
       sortable: false,
       renderCell: (params: GridRenderCellParams) => (
         <div className="flex h-full gap-7 justify-center items-center">
-          <button title="Просмотр" onClick={() => navigate(`/article/${params.row.id}`)}>
+          <button onClick={() => navigate(`/article/${params.row.id}`)}>
             <Eye size={20} className="text-green-500" />
           </button>
           {canWriteArticles && (
             <button
-              title="Удалить"
               onClick={() => {
                 setIsDeleteModalOpen(true);
                 setRowId(params.row.id);
@@ -108,9 +107,7 @@ export const ArticleListPage = observer(() => {
           </div>
         )}
 
-        {(rows.length > 0 || searchQuery) && (
         <SearchInput value={searchQuery} onChange={setSearchQuery} />
-        )}
 
         <div className="w-full">
           <DataGrid

src/pages/Carrier/CarrierCreatePage/index.tsx

@@ -1,5 +1,6 @@
 import {
   Button,
+  Paper,
   TextField,
   Select,
   MenuItem,
@@ -19,97 +20,29 @@ import {
   languageStore,
   isMediaIdEmpty,
   useSelectedCity,
-  selectedCityStore,
   SelectMediaDialog,
   UploadMediaDialog,
   PreviewMediaDialog,
-  editSightStore,
 } from "@shared";
 import { useState, useEffect } from "react";
-import { ImageUploadCard, LanguageSwitcher, VideoPreviewCard } from "@widgets";
+import { ImageUploadCard, LanguageSwitcher } from "@widgets";
-
-type ColorFields = { main_color: string; left_color: string; right_color: string };
-
-const colorFields = (data: ColorFields) => ({
-  main_color: data.main_color,
-  left_color: data.left_color,
-  right_color: data.right_color,
-});
-
-const ColorPickerField = ({
-  label,
-  value,
-  onChange,
-}: {
-  label: string;
-  value: string;
-  onChange: (val: string) => void;
-}) => (
-  <div className="flex items-center gap-3 w-full">
-    <div
-      className="w-10 h-10 rounded border border-gray-300 flex-shrink-0 cursor-pointer overflow-hidden relative"
-      style={{ backgroundColor: value || "#ffffff" }}
-    >
-      <input
-        type="color"
-        value={value || "#ffffff"}
-        onChange={(e) => onChange(e.target.value)}
-        className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
-      />
-    </div>
-    <TextField
-      fullWidth
-      label={label}
-      value={value}
-      placeholder="#000000"
-      onChange={(e) => onChange(e.target.value)}
-      InputProps={{
-        endAdornment: value ? (
-          <button
-            type="button"
-            onClick={() => onChange("")}
-            className="text-gray-400 hover:text-gray-600 text-xs px-1"
-          >
-            ✕
-          </button>
-        ) : undefined,
-      }}
-    />
-  </div>
-);
 
 export const CarrierCreatePage = observer(() => {
   const navigate = useNavigate();
-  const {
+  const { createCarrierData, setCreateCarrierData } = carrierStore;
-    createCarrierData,
-    setCreateCarrierData,
-    setCreateCarrierMedia,
-  } = carrierStore;
   const { language } = languageStore;
   const canReadCities = authStore.canRead("cities");
   const { selectedCityId, selectedCity } = useSelectedCity();
+  const [selectedMediaId, setSelectedMediaId] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState(false);
   const [isSelectMediaOpen, setIsSelectMediaOpen] = useState(false);
   const [isUploadMediaOpen, setIsUploadMediaOpen] = useState(false);
   const [isPreviewMediaOpen, setIsPreviewMediaOpen] = useState(false);
   const [mediaId, setMediaId] = useState("");
-  const [activeMediaField, setActiveMediaField] = useState<
-    "preview_media" | "video_preview"
-  >("preview_media");
   const [activeMenuType, setActiveMenuType] = useState<
-    | "thumbnail"
+    "thumbnail" | "watermark_lu" | "watermark_rd" | "image" | null
-    | "watermark_lu"
-    | "watermark_rd"
-    | "image"
-    | "video_preview"
-    | null
   >(null);
 
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   useEffect(() => {
     const fetchCities = async () => {
       if (!authStore.me) {
@@ -148,16 +81,12 @@ export const CarrierCreatePage = observer(() => {
         createCarrierData[language].full_name,
         createCarrierData[language].short_name,
         selectedCityId,
+        createCarrierData[language].slogan,
+        selectedMediaId || "",
         language,
       );
     }
-  }, [
+  }, [selectedCityId, createCarrierData.city_id]);
-    selectedCityId,
-    createCarrierData,
-    createCarrierData.city_id,
-    language,
-    setCreateCarrierData,
-  ]);
 
   const handleCreate = async () => {
     try {
@@ -166,7 +95,7 @@ export const CarrierCreatePage = observer(() => {
 
       toast.success("Перевозчик успешно создан");
       navigate("/carrier");
-    } catch {
+    } catch (error) {
       toast.error("Ошибка при создании перевозчика");
     } finally {
       setIsLoading(false);
@@ -179,22 +108,27 @@ export const CarrierCreatePage = observer(() => {
     media_name?: string;
     media_type: number;
   }) => {
-    setCreateCarrierMedia(activeMediaField, media.id);
+    setSelectedMediaId(media.id);
+    setCreateCarrierData(
+      createCarrierData[language].full_name,
+      createCarrierData[language].short_name,
+      createCarrierData.city_id,
+      createCarrierData[language].slogan,
+      media.id,
+      language,
+    );
   };
 
-  const effectivePreviewMediaUrl = isMediaIdEmpty(
+  const selectedMedia =
-    createCarrierData.preview_media,
+    selectedMediaId && !isMediaIdEmpty(selectedMediaId)
-  )
+      ? mediaStore.media.find((m) => m.id === selectedMediaId)
+      : null;
+  const effectiveLogoUrl = isMediaIdEmpty(selectedMediaId)
     ? null
-    : createCarrierData.preview_media;
+    : selectedMedia?.id ?? selectedMediaId ?? null;
-  const effectiveVideoPreviewId = isMediaIdEmpty(
-    createCarrierData.video_preview,
-  )
-    ? null
-    : createCarrierData.video_preview;
 
   return (
-    <div className="w-full h-full p-3 flex flex-col gap-10">
+    <Paper className="w-full h-full p-3 flex flex-col gap-10">
       <LanguageSwitcher />
       <div className="flex items-center gap-4">
         <button
@@ -222,6 +156,8 @@ export const CarrierCreatePage = observer(() => {
                 createCarrierData[language].full_name,
                 createCarrierData[language].short_name,
                 e.target.value as number,
+                createCarrierData[language].slogan,
+                selectedMediaId || "",
                 language,
               )
             }
@@ -244,6 +180,8 @@ export const CarrierCreatePage = observer(() => {
               e.target.value,
               createCarrierData[language].short_name,
               createCarrierData.city_id,
+              createCarrierData[language].slogan,
+              selectedMediaId || "",
               language,
             )
           }
@@ -259,120 +197,60 @@ export const CarrierCreatePage = observer(() => {
               createCarrierData[language].full_name,
               e.target.value,
               createCarrierData.city_id,
+              createCarrierData[language].slogan,
+              selectedMediaId || "",
               language,
             )
           }
         />
 
-        <div className="w-full flex flex-col gap-6">
+        <TextField
-          <div className="flex flex-col gap-1">
+          fullWidth
-            <ColorPickerField
+          label="Слоган"
-              label="Основной цвет"
+          value={createCarrierData[language].slogan}
-              value={createCarrierData.main_color}
+          onChange={(e) =>
-              onChange={(val) =>
             setCreateCarrierData(
               createCarrierData[language].full_name,
               createCarrierData[language].short_name,
               createCarrierData.city_id,
+              e.target.value,
+              selectedMediaId || "",
               language,
-                  { ...colorFields(createCarrierData), main_color: val }
             )
           }
         />
-            <p className="text-xs text-gray-500 pl-1">
-              Используется в: виджет обращений, значки на карте, скопление достопримечательностей на карте, информационный виджет
-            </p>
-          </div>
-          <div className="flex flex-col gap-1">
-            <ColorPickerField
-              label="Левый цвет"
-              value={createCarrierData.left_color}
-              onChange={(val) =>
-                setCreateCarrierData(
-                  createCarrierData[language].full_name,
-                  createCarrierData[language].short_name,
-                  createCarrierData.city_id,
-                  language,
-                  { ...colorFields(createCarrierData), left_color: val }
-                )
-              }
-            />
-            <p className="text-xs text-gray-500 pl-1">
-              Используется в: боковое меню, левый виджет достопримечательности
-            </p>
-          </div>
-          <div className="flex flex-col gap-1">
-            <ColorPickerField
-              label="Правый цвет"
-              value={createCarrierData.right_color}
-              onChange={(val) =>
-                setCreateCarrierData(
-                  createCarrierData[language].full_name,
-                  createCarrierData[language].short_name,
-                  createCarrierData.city_id,
-                  language,
-                  { ...colorFields(createCarrierData), right_color: val }
-                )
-              }
-            />
-            <p className="text-xs text-gray-500 pl-1">
-              Используется в: список достопримечательностей, страница достопримечательности
-            </p>
-          </div>
-        </div>
 
-        <div className="w-full flex justify-center items-start gap-10 flex-wrap">
+        <div className="w-full flex flex-col gap-4 max-w-[300px] mx-auto">
-          <div className="w-full max-w-[300px]">
           <ImageUploadCard
-              title="Изображение сайд-меню"
+            title="Логотип перевозчика"
-              imageKey="image"
+            imageKey="thumbnail"
-              imageUrl={effectivePreviewMediaUrl}
+            imageUrl={effectiveLogoUrl}
             onImageClick={() => {
               setIsPreviewMediaOpen(true);
-                setMediaId(effectivePreviewMediaUrl ?? "");
+              setMediaId(effectiveLogoUrl ?? "");
+            }}
+            onDeleteImageClick={() => {
+              setSelectedMediaId(null);
+              setActiveMenuType(null);
+              setCreateCarrierData(
+                createCarrierData[language].full_name,
+                createCarrierData[language].short_name,
+                createCarrierData.city_id,
+                createCarrierData[language].slogan,
+                "",
+                language,
+              );
             }}
-              onDeleteImageClick={() =>
-                setCreateCarrierMedia("preview_media", "")
-              }
             onSelectFileClick={() => {
-                setActiveMediaField("preview_media");
               setActiveMenuType("image");
               setIsSelectMediaOpen(true);
             }}
             setUploadMediaOpen={() => {
-                setActiveMediaField("preview_media");
+              setIsUploadMediaOpen(true);
               setActiveMenuType("image");
-                setIsUploadMediaOpen(true);
             }}
           />
         </div>
-          <div className="w-full max-w-[300px]">
-            <VideoPreviewCard
-              title="Видео загрузки"
-              videoId={effectiveVideoPreviewId}
-              onVideoClick={() => {
-                if (effectiveVideoPreviewId) {
-                  setMediaId(effectiveVideoPreviewId);
-                  setIsPreviewMediaOpen(true);
-                }
-              }}
-              onDeleteVideoClick={() =>
-                setCreateCarrierMedia("video_preview", "")
-              }
-              onSelectVideoClick={(file) => {
-                setActiveMediaField("video_preview");
-                setActiveMenuType("video_preview");
-                if (file) {
-                  editSightStore.setFileToUpload(file);
-                  setIsUploadMediaOpen(true);
-                } else {
-                  setIsSelectMediaOpen(true);
-                }
-              }}
-              className="w-full"
-            />
-          </div>
-        </div>
 
         <Button
           variant="contained"
@@ -398,7 +276,7 @@ export const CarrierCreatePage = observer(() => {
         open={isSelectMediaOpen}
         onClose={() => setIsSelectMediaOpen(false)}
         onSelectMedia={handleMediaSelect}
-        mediaType={activeMediaField === "video_preview" ? 2 : 1}
+        mediaType={1}
       />
 
       <UploadMediaDialog
@@ -415,6 +293,6 @@ export const CarrierCreatePage = observer(() => {
         onClose={() => setIsPreviewMediaOpen(false)}
         mediaId={mediaId}
       />
-    </div>
+    </Paper>
   );
 });

src/pages/Carrier/CarrierEditPage/index.tsx

@@ -1,5 +1,6 @@
 import {
   Button,
+  Paper,
   TextField,
   Select,
   MenuItem,
@@ -20,84 +21,19 @@ import {
   languageStore,
   isMediaIdEmpty,
   LoadingSpinner,
-  selectedCityStore,
-  editSightStore,
 } from "@shared";
 import { useState, useEffect } from "react";
-import {
+import { ImageUploadCard, LanguageSwitcher, DeleteModal } from "@widgets";
-  ImageUploadCard,
-  LanguageSwitcher,
-  VideoPreviewCard,
-} from "@widgets";
 import {
   SelectMediaDialog,
   PreviewMediaDialog,
   UploadMediaDialog,
 } from "@shared";
 
-type ColorFields = {
-  main_color: string;
-  left_color: string;
-  right_color: string;
-};
-
-const colorFields = (data: ColorFields) => ({
-  main_color: data.main_color,
-  left_color: data.left_color,
-  right_color: data.right_color,
-});
-
-const ColorPickerField = ({
-  label,
-  value,
-  onChange,
-}: {
-  label: string;
-  value: string;
-  onChange: (val: string) => void;
-}) => (
-  <div className="flex items-center gap-3 w-full">
-    <div
-      className="w-10 h-10 rounded border border-gray-300 flex-shrink-0 cursor-pointer overflow-hidden relative"
-      style={{ backgroundColor: value || "#ffffff" }}
-    >
-      <input
-        type="color"
-        value={value || "#ffffff"}
-        onChange={(e) => onChange(e.target.value)}
-        className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
-      />
-    </div>
-    <TextField
-      fullWidth
-      label={label}
-      value={value}
-      placeholder="#000000"
-      onChange={(e) => onChange(e.target.value)}
-      InputProps={{
-        endAdornment: value ? (
-          <button
-            type="button"
-            onClick={() => onChange("")}
-            className="text-gray-400 hover:text-gray-600 text-xs px-1"
-          >
-            ✕
-          </button>
-        ) : undefined,
-      }}
-    />
-  </div>
-);
-
 export const CarrierEditPage = observer(() => {
   const navigate = useNavigate();
   const { id } = useParams();
-  const {
+  const { getCarrier, setEditCarrierData, editCarrierData } = carrierStore;
-    getCarrier,
-    setEditCarrierData,
-    setEditCarrierMedia,
-    editCarrierData,
-  } = carrierStore;
   const { language } = languageStore;
   const canReadCities = authStore.canRead("cities");
 
@@ -107,24 +43,12 @@ export const CarrierEditPage = observer(() => {
   const [isUploadMediaOpen, setIsUploadMediaOpen] = useState(false);
   const [isPreviewMediaOpen, setIsPreviewMediaOpen] = useState(false);
   const [mediaId, setMediaId] = useState("");
+  const [isDeleteLogoModalOpen, setIsDeleteLogoModalOpen] = useState(false);
   const [initialCityName, setInitialCityName] = useState("");
-  const [activeMediaField, setActiveMediaField] = useState<
-    "preview_media" | "video_preview"
-  >("preview_media");
   const [activeMenuType, setActiveMenuType] = useState<
-    | "thumbnail"
+    "thumbnail" | "watermark_lu" | "watermark_rd" | "image" | null
-    | "watermark_lu"
-    | "watermark_rd"
-    | "image"
-    | "video_preview"
-    | null
   >(null);
 
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   useEffect(() => {
     (async () => {
       if (!id) {
@@ -144,37 +68,29 @@ export const CarrierEditPage = observer(() => {
         const carrierData = await getCarrier(Number(id));
 
         if (carrierData) {
-          const colors = {
-            main_color: carrierData.ru?.main_color || "",
-            left_color: carrierData.ru?.left_color || "",
-            right_color: carrierData.ru?.right_color || "",
-          };
           setEditCarrierData(
             carrierData.ru?.full_name || "",
             carrierData.ru?.short_name || "",
             carrierData.ru?.city_id || 0,
-            "ru",
+            carrierData.ru?.slogan || "",
-            colors,
+            carrierData.ru?.logo || "",
+            "ru"
           );
           setEditCarrierData(
             carrierData.en?.full_name || "",
             carrierData.en?.short_name || "",
             carrierData.en?.city_id || 0,
-            "en",
+            carrierData.en?.slogan || "",
+            carrierData.en?.logo || "",
+            "en"
           );
           setEditCarrierData(
             carrierData.zh?.full_name || "",
             carrierData.zh?.short_name || "",
             carrierData.zh?.city_id || 0,
-            "zh",
+            carrierData.zh?.slogan || "",
-          );
+            carrierData.zh?.logo || "",
-          setEditCarrierMedia(
+            "zh"
-            "video_preview",
-            carrierData.ru?.video_preview || "",
-          );
-          setEditCarrierMedia(
-            "preview_media",
-            carrierData.ru?.preview_media || "",
           );
           setInitialCityName(carrierData.ru?.city || "");
         }
@@ -186,7 +102,7 @@ export const CarrierEditPage = observer(() => {
     })();
 
     languageStore.setLanguage("ru");
-  }, [id, getCarrier, setEditCarrierData, setEditCarrierMedia]);
+  }, [id]);
 
   const handleEdit = async () => {
     try {
@@ -194,7 +110,7 @@ export const CarrierEditPage = observer(() => {
       await carrierStore.editCarrier(Number(id));
       toast.success("Перевозчик успешно обновлен");
       navigate("/carrier");
-    } catch {
+    } catch (error) {
       toast.error("Ошибка при обновлении перевозчика");
     } finally {
       setIsLoading(false);
@@ -207,19 +123,23 @@ export const CarrierEditPage = observer(() => {
     media_name?: string;
     media_type: number;
   }) => {
-    setEditCarrierMedia(activeMediaField, media.id);
+    setEditCarrierData(
+      editCarrierData[language].full_name,
+      editCarrierData[language].short_name,
+      editCarrierData.city_id,
+      editCarrierData[language].slogan,
+      media.id,
+      language
+    );
   };
 
-  const effectivePreviewMediaUrl = isMediaIdEmpty(
+  const selectedMedia =
-    editCarrierData.preview_media,
+    editCarrierData.logo && !isMediaIdEmpty(editCarrierData.logo)
-  )
+      ? mediaStore.media.find((m) => m.id === editCarrierData.logo)
+      : null;
+  const effectiveLogoUrl = isMediaIdEmpty(editCarrierData.logo)
     ? null
-    : editCarrierData.preview_media;
+    : (selectedMedia?.id ?? editCarrierData.logo);
-  const effectiveVideoPreviewId = isMediaIdEmpty(
-    editCarrierData.video_preview,
-  )
-    ? null
-    : editCarrierData.video_preview;
 
   const baseCities = canReadCities
     ? cityStore.cities["ru"].data
@@ -262,7 +182,7 @@ export const CarrierEditPage = observer(() => {
   }
 
   return (
-    <div className="w-full h-full p-3 flex flex-col gap-10">
+    <Paper className="w-full h-full p-3 flex flex-col gap-10">
       <LanguageSwitcher />
       <div className="flex items-center gap-4">
         <button
@@ -289,7 +209,9 @@ export const CarrierEditPage = observer(() => {
                 editCarrierData[language].full_name,
                 editCarrierData[language].short_name,
                 Number(e.target.value),
-                language,
+                editCarrierData[language].slogan,
+                editCarrierData.logo,
+                language
               )
             }
           >
@@ -311,7 +233,9 @@ export const CarrierEditPage = observer(() => {
               e.target.value,
               editCarrierData[language].short_name,
               editCarrierData.city_id,
-              language,
+              editCarrierData[language].slogan,
+              editCarrierData.logo,
+              language
             )
           }
         />
@@ -326,123 +250,51 @@ export const CarrierEditPage = observer(() => {
               editCarrierData[language].full_name,
               e.target.value,
               editCarrierData.city_id,
-              language,
+              editCarrierData[language].slogan,
+              editCarrierData.logo,
+              language
             )
           }
         />
 
-        <div className="w-full flex flex-col gap-6">
+        <TextField
-          <div className="flex flex-col gap-1">
+          fullWidth
-            <ColorPickerField
+          label="Слоган"
-              label="Основной цвет"
+          value={editCarrierData[language].slogan}
-              value={editCarrierData.main_color}
+          onChange={(e) =>
-              onChange={(val) =>
             setEditCarrierData(
               editCarrierData[language].full_name,
               editCarrierData[language].short_name,
               editCarrierData.city_id,
-                  language,
+              e.target.value,
-                  { ...colorFields(editCarrierData), main_color: val },
+              editCarrierData.logo,
+              language
             )
           }
         />
-            <p className="text-xs text-gray-500 pl-1">
-              Используется в: значки на карте, скопление достопримечательностей
-              на карте, информационный виджет
-            </p>
-          </div>
-          <div className="flex flex-col gap-1">
-            <ColorPickerField
-              label="Левый цвет"
-              value={editCarrierData.left_color}
-              onChange={(val) =>
-                setEditCarrierData(
-                  editCarrierData[language].full_name,
-                  editCarrierData[language].short_name,
-                  editCarrierData.city_id,
-                  language,
-                  { ...colorFields(editCarrierData), left_color: val },
-                )
-              }
-            />
-            <p className="text-xs text-gray-500 pl-1">
-              Используется в: виджет обращений, боковое меню (фон, список
-              остановок), левый виджет достопримечательности
-            </p>
-          </div>
-          <div className="flex flex-col gap-1">
-            <ColorPickerField
-              label="Правый цвет"
-              value={editCarrierData.right_color}
-              onChange={(val) =>
-                setEditCarrierData(
-                  editCarrierData[language].full_name,
-                  editCarrierData[language].short_name,
-                  editCarrierData.city_id,
-                  language,
-                  { ...colorFields(editCarrierData), right_color: val },
-                )
-              }
-            />
-            <p className="text-xs text-gray-500 pl-1">
-              Используется в: список достопримечательностей (фон, карточки),
-              правый виджет достопримечательности
-            </p>
-          </div>
-        </div>
 
-        <div className="w-full flex justify-center items-start gap-10 flex-wrap">
+        <div className="w-full flex flex-col gap-4 max-w-[300px] mx-auto">
-          <div className="w-full max-w-[300px]">
           <ImageUploadCard
-              title="Изображение сайд-меню"
+            title="Логотип перевозчика"
-              imageKey="image"
+            imageKey="thumbnail"
-              imageUrl={effectivePreviewMediaUrl}
+            imageUrl={effectiveLogoUrl}
             onImageClick={() => {
               setIsPreviewMediaOpen(true);
-                setMediaId(effectivePreviewMediaUrl ?? "");
+              setMediaId(effectiveLogoUrl ?? "");
+            }}
+            onDeleteImageClick={() => {
+              setIsDeleteLogoModalOpen(true);
             }}
-              onDeleteImageClick={() =>
-                setEditCarrierMedia("preview_media", "")
-              }
             onSelectFileClick={() => {
-                setActiveMediaField("preview_media");
               setActiveMenuType("image");
               setIsSelectMediaOpen(true);
             }}
             setUploadMediaOpen={() => {
-                setActiveMediaField("preview_media");
+              setIsUploadMediaOpen(true);
               setActiveMenuType("image");
-                setIsUploadMediaOpen(true);
             }}
           />
         </div>
-          <div className="w-full max-w-[300px]">
-            <VideoPreviewCard
-              title="Видео загрузки"
-              videoId={effectiveVideoPreviewId}
-              onVideoClick={() => {
-                if (effectiveVideoPreviewId) {
-                  setMediaId(effectiveVideoPreviewId);
-                  setIsPreviewMediaOpen(true);
-                }
-              }}
-              onDeleteVideoClick={() =>
-                setEditCarrierMedia("video_preview", "")
-              }
-              onSelectVideoClick={(file) => {
-                setActiveMediaField("video_preview");
-                setActiveMenuType("video_preview");
-                if (file) {
-                  editSightStore.setFileToUpload(file);
-                  setIsUploadMediaOpen(true);
-                } else {
-                  setIsSelectMediaOpen(true);
-                }
-              }}
-              className="w-full"
-            />
-          </div>
-        </div>
 
         <Button
           variant="contained"
@@ -467,7 +319,7 @@ export const CarrierEditPage = observer(() => {
         open={isSelectMediaOpen}
         onClose={() => setIsSelectMediaOpen(false)}
         onSelectMedia={handleMediaSelect}
-        mediaType={activeMediaField === "video_preview" ? 2 : 1}
+        mediaType={1}
       />
 
       <UploadMediaDialog
@@ -485,6 +337,22 @@ export const CarrierEditPage = observer(() => {
         mediaId={mediaId}
       />
 
-    </div>
+      <DeleteModal
+        open={isDeleteLogoModalOpen}
+        onDelete={() => {
+          setEditCarrierData(
+            editCarrierData[language].full_name,
+            editCarrierData[language].short_name,
+            editCarrierData.city_id,
+            editCarrierData[language].slogan,
+            "",
+            language
+          );
+          setIsDeleteLogoModalOpen(false);
+        }}
+        onCancel={() => setIsDeleteLogoModalOpen(false)}
+        edit
+      />
+    </Paper>
   );
 });

src/pages/Carrier/CarrierListPage/index.tsx

@@ -1,6 +1,6 @@
 import { DataGrid, GridColDef, GridRenderCellParams } from "@mui/x-data-grid";
 import { ruRU } from "@mui/x-data-grid/locales";
-import { authStore, carrierStore, cityStore, languageStore, selectedCityStore, SearchInput } from "@shared";
+import { authStore, carrierStore, cityStore, languageStore, SearchInput } from "@shared";
 import { useEffect, useState, useMemo } from "react";
 import { observer } from "mobx-react-lite";
 import { Pencil, Trash2, Minus } from "lucide-react";
@@ -39,7 +39,7 @@ export const CarrierListPage = observer(() => {
       setIsLoading(false);
     };
     fetchData();
-  }, [language, selectedCityStore.cityVersion]);
+  }, [language]);
 
   const columns: GridColDef[] = [
     {
@@ -98,11 +98,10 @@ export const CarrierListPage = observer(() => {
       sortable: false,
       renderCell: (params: GridRenderCellParams) => (
         <div className="flex h-full gap-7 justify-center items-center">
-          <button title="Редактировать" onClick={() => navigate(`/carrier/${params.row.id}/edit`)}>
+          <button onClick={() => navigate(`/carrier/${params.row.id}/edit`)}>
             <Pencil size={20} className="text-blue-500" />
           </button>
           <button
-            title="Удалить"
             onClick={() => {
               setIsDeleteModalOpen(true);
               setRowId(params.row.id);
@@ -162,9 +161,7 @@ export const CarrierListPage = observer(() => {
           </div>
         )}
 
-        {(rows.length > 0 || searchQuery) && (
         <SearchInput value={searchQuery} onChange={setSearchQuery} />
-        )}
 
         <DataGrid
           rows={rows}
@@ -172,11 +169,6 @@ export const CarrierListPage = observer(() => {
           checkboxSelection={canWriteCarriers}
           disableRowSelectionExcludeModel
           disableRowSelectionOnClick
-          onRowDoubleClick={(params) => {
-            if (canWriteCarriers) {
-              navigate(`/carrier/${params.id}/edit`);
-            }
-          }}
           loading={isLoading}
           paginationModel={paginationModel}
           onPaginationModelChange={setPaginationModel}

src/pages/City/CityCreatePage/index.tsx

@@ -17,24 +17,16 @@ import {
   countryStore,
   languageStore,
   mediaStore,
-  snapshotStore,
   isMediaIdEmpty,
   SelectMediaDialog,
   UploadMediaDialog,
   PreviewMediaDialog,
-  selectedCityStore,
 } from "@shared";
 import { useState, useEffect } from "react";
 import { LanguageSwitcher, ImageUploadCard } from "@widgets";
 
 export const CityCreatePage = observer(() => {
   const navigate = useNavigate();
-
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const { language } = languageStore;
   const { createCityData, setCreateCityData, setCreateCityWeatherCode } =
     cityStore;
@@ -61,13 +53,7 @@ export const CityCreatePage = observer(() => {
   const handleCreate = async () => {
     try {
       setIsLoading(true);
-      const ruCityName = createCityData.ru.name.trim();
       await cityStore.createCity();
-      try {
-        await snapshotStore.createEmptySnapshot(`${ruCityName}_Пустой_Экспорт`);
-      } catch (e) {
-        console.warn("Failed to create empty snapshot for city:", e);
-      }
       toast.success("Город успешно создан");
       navigate("/city");
     } catch (error) {

src/pages/City/CityEditPage/index.tsx

@@ -23,19 +23,12 @@ import {
   SelectMediaDialog,
   UploadMediaDialog,
   PreviewMediaDialog,
-  selectedCityStore,
 } from "@shared";
 import { useEffect, useState } from "react";
 import { LanguageSwitcher, ImageUploadCard } from "@widgets";
 
 export const CityEditPage = observer(() => {
   const navigate = useNavigate();
-
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const [isLoading, setIsLoading] = useState(false);
   const [isLoadingData, setIsLoadingData] = useState(true);
   const [isSelectMediaOpen, setIsSelectMediaOpen] = useState(false);

src/pages/City/CityListPage/index.tsx

@@ -114,11 +114,10 @@ export const CityListPage = observer(() => {
       sortable: false,
       renderCell: (params: GridRenderCellParams) => (
         <div className="flex h-full gap-7 justify-center items-center">
-          <button title="Редактировать" onClick={() => navigate(`/city/${params.row.id}/edit`)}>
+          <button onClick={() => navigate(`/city/${params.row.id}/edit`)}>
             <Pencil size={20} className="text-blue-500" />
           </button>
           <button
-            title="Удалить"
             onClick={(e) => {
               e.stopPropagation();
               setIsDeleteModalOpen(true);
@@ -140,10 +139,7 @@ export const CityListPage = observer(() => {
         <div className="flex justify-between items-center mb-10">
           <h1 className="text-2xl">Города</h1>
           {canWriteCities && (
-            <CreateButton
+            <CreateButton label="Создать город" path="/city/create" />
-              label="Создать город"
-              path="/city/create"
-            />
           )}
         </div>
 
@@ -159,9 +155,7 @@ export const CityListPage = observer(() => {
           </div>
         )}
 
-        {(rows.length > 0 || searchQuery) && (
         <SearchInput value={searchQuery} onChange={setSearchQuery} />
-        )}
 
         <DataGrid
           rows={filteredRows}
@@ -169,11 +163,6 @@ export const CityListPage = observer(() => {
           checkboxSelection={canWriteCities}
           disableRowSelectionExcludeModel
           disableRowSelectionOnClick
-          onRowDoubleClick={(params) => {
-            if (canWriteCities) {
-              navigate(`/city/${params.id}/edit`);
-            }
-          }}
           loading={isLoading}
           paginationModel={paginationModel}
           onPaginationModelChange={setPaginationModel}
@@ -206,11 +195,7 @@ export const CityListPage = observer(() => {
           slots={{
             noRowsOverlay: () => (
               <Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
-                {isLoading ? (
+                {isLoading ? <CircularProgress size={20} /> : "Нет городов"}
-                  <CircularProgress size={20} />
-                ) : (
-                  "Нет городов"
-                )}
               </Box>
             ),
           }}

src/pages/Country/CountryAddPage/index.tsx

@@ -15,18 +15,11 @@ import {
   RU_COUNTRIES,
   EN_COUNTRIES,
   ZH_COUNTRIES,
-  selectedCityStore,
 } from "@shared";
-import { useState, useEffect } from "react";
+import { useState } from "react";
 
 export const CountryAddPage = observer(() => {
   const navigate = useNavigate();
-
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const [isLoading, setIsLoading] = useState(false);
   const { createCountryData, setCountryData, createCountry } = countryStore;
 

src/pages/Country/CountryCreatePage/index.tsx

@@ -4,18 +4,12 @@ import { ArrowLeft, Save } from "lucide-react";
 import { Loader2 } from "lucide-react";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
-import { countryStore, languageStore, selectedCityStore } from "@shared";
+import { countryStore, languageStore } from "@shared";
-import { useState, useEffect } from "react";
+import { useState } from "react";
 import { LanguageSwitcher } from "@widgets";
 
 export const CountryCreatePage = observer(() => {
   const navigate = useNavigate();
-
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const [isLoading, setIsLoading] = useState(false);
   const { language } = languageStore;
   const { createCountryData, setCountryData, createCountry } = countryStore;

src/pages/Country/CountryEditPage/index.tsx

@@ -4,18 +4,12 @@ import { ArrowLeft, Save } from "lucide-react";
 import { Loader2 } from "lucide-react";
 import { useNavigate, useParams } from "react-router-dom";
 import { toast } from "react-toastify";
-import { countryStore, languageStore, LoadingSpinner, selectedCityStore } from "@shared";
+import { countryStore, languageStore, LoadingSpinner } from "@shared";
 import { useEffect, useState } from "react";
 import { LanguageSwitcher } from "@widgets";
 
 export const CountryEditPage = observer(() => {
   const navigate = useNavigate();
-
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const [isLoading, setIsLoading] = useState(false);
   const [isLoadingData, setIsLoadingData] = useState(true);
   const { language } = languageStore;

src/pages/Country/CountryListPage/index.tsx

@@ -92,10 +92,7 @@ export const CountryListPage = observer(() => {
         <div className="flex justify-between items-center mb-10">
           <h1 className="text-2xl">Страны</h1>
           {canWriteCountries && (
-            <CreateButton
+            <CreateButton label="Добавить страну" path="/country/add" />
-              label="Добавить страну"
-              path="/country/add"
-            />
           )}
         </div>
 
@@ -111,9 +108,7 @@ export const CountryListPage = observer(() => {
           </div>
         )}
 
-        {(rows.length > 0 || searchQuery) && (
         <SearchInput value={searchQuery} onChange={setSearchQuery} />
-        )}
 
         <DataGrid
           rows={rows}
@@ -153,11 +148,7 @@ export const CountryListPage = observer(() => {
           slots={{
             noRowsOverlay: () => (
               <Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
-                {isLoading ? (
+                {isLoading ? <CircularProgress size={20} /> : "Нет стран"}
-                  <CircularProgress size={20} />
-                ) : (
-                  "Нет стран"
-                )}
               </Box>
             ),
           }}

src/pages/CreateSightPage/index.tsx

@@ -5,7 +5,6 @@ import {
   cityStore,
   createSightStore,
   languageStore,
-  selectedCityStore,
 } from "@shared";
 import {
   CreateInformationTab,
@@ -15,7 +14,6 @@ import {
 } from "@widgets";
 import { useEffect, useState } from "react";
 import { observer } from "mobx-react-lite";
-import { runInAction } from "mobx";
 
 function a11yProps(index: number) {
   return {
@@ -32,11 +30,6 @@ export const CreateSightPage = observer(() => {
   const { getArticles } = articlesStore;
   const needLeave = createSightStore.needLeaveAgree;
 
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const handleChange = (_: React.SyntheticEvent, newValue: number) => {
     setValue(newValue);
   };
@@ -63,14 +56,6 @@ export const CreateSightPage = observer(() => {
         await authStore.fetchMeCities().catch(() => undefined);
       }
       await getArticles(languageStore.language);
-
-      const { selectedCityId, selectedCity } = selectedCityStore;
-      if (selectedCityId && selectedCity && !createSightStore.sight.city_id) {
-        runInAction(() => {
-          createSightStore.sight.city_id = selectedCityId;
-          createSightStore.sight.city = selectedCity.name;
-        });
-      }
     };
     fetchData();
   }, []);

src/pages/EditSightPage/index.tsx

@@ -9,7 +9,6 @@ import {
   cityStore,
   editSightStore,
   LoadingSpinner,
-  selectedCityStore,
 } from "@shared";
 import { useBlocker, useParams } from "react-router-dom";
 
@@ -26,11 +25,6 @@ export const EditSightPage = observer(() => {
   const { sight, getSightInfo, needLeaveAgree, getRightArticles } = editSightStore;
   const { getArticles } = articlesStore;
 
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const { id } = useParams();
   const { getCities } = cityStore;
 

src/pages/Media/MediaCreatePage/index.tsx

@@ -10,7 +10,7 @@ import {
 import { mediaStore, MEDIA_TYPE_LABELS, selectedCityStore } from "@shared";
 import { observer } from "mobx-react-lite";
 import { ArrowLeft, Loader2, Save } from "lucide-react";
-import { useState, useEffect } from "react";
+import { useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 
@@ -20,11 +20,6 @@ export const MediaCreatePage = observer(() => {
   const [type, setType] = useState("");
   const [isLoading, setIsLoading] = useState(false);
 
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const handleCreate = async () => {
     try {
       setIsLoading(true);

src/pages/Media/MediaEditPage/index.tsx

@@ -22,7 +22,6 @@ import {
   MEDIA_TYPE_LABELS,
   languageStore,
   LoadingSpinner,
-  selectedCityStore,
 } from "@shared";
 import { MediaViewer } from "@widgets";
 
@@ -43,11 +42,6 @@ export const MediaEditPage = observer(() => {
   const [mediaType, setMediaType] = useState(media?.media_type ?? 1);
   const [availableMediaTypes, setAvailableMediaTypes] = useState<number[]>([]);
 
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   useEffect(() => {
     if (id) {
       mediaStore.getOneMedia(id);

src/pages/Media/MediaListPage/index.tsx

@@ -78,12 +78,11 @@ export const MediaListPage = observer(() => {
       sortable: false,
       renderCell: (params: GridRenderCellParams) => (
         <div className="flex h-full gap-7 justify-center items-center">
-          <button title="Просмотр" onClick={() => navigate(`/media/${params.row.id}`)}>
+          <button onClick={() => navigate(`/media/${params.row.id}`)}>
             <Eye size={20} className="text-green-500" />
           </button>
           {canWriteMedia && (
             <button
-              title="Удалить"
               onClick={() => {
                 setIsDeleteModalOpen(true);
                 setRowId(params.row.id);
@@ -113,9 +112,7 @@ export const MediaListPage = observer(() => {
   return (
     <>
       <div className="w-full">
-        {(rows.length > 0 || searchQuery) && (
         <SearchInput value={searchQuery} onChange={setSearchQuery} />
-        )}
 
         {canWriteMedia && ids.length > 0 && (
           <div className="flex justify-end mb-5 duration-300">

src/pages/Route/RouteCreatePage/index.tsx

@@ -12,7 +12,11 @@ import {
   DialogContent,
   DialogActions,
 } from "@mui/material";
-import { MediaViewer, VideoPreviewCard, ImageUploadCard } from "@widgets";
+import {
+  MediaViewer,
+  VideoPreviewCard,
+  ImageUploadCard,
+} from "@widgets";
 import { observer } from "mobx-react-lite";
 import { ArrowLeft, Loader2, Save, Plus, X } from "lucide-react";
 import { useEffect, useState, useMemo } from "react";
@@ -35,18 +39,11 @@ import type { Route } from "@shared";
 
 export const RouteCreatePage = observer(() => {
   const navigate = useNavigate();
-
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const [carrier, setCarrier] = useState<string>("");
   const [routeNumber, setRouteNumber] = useState("");
   const [routeCoords, setRouteCoords] = useState("");
   const [govRouteNumber, setGovRouteNumber] = useState("");
   const [governorAppeal, setGovernorAppeal] = useState<string>("");
-  const [buttonText, setButtonText] = useState("");
   const [direction, setDirection] = useState("backward");
   const [scaleMin, setScaleMin] = useState("10");
   const [scaleMax, setScaleMax] = useState("100");
@@ -54,7 +51,7 @@ export const RouteCreatePage = observer(() => {
   const [turn, setTurn] = useState("");
   const [centerLat, setCenterLat] = useState("");
   const [centerLng, setCenterLng] = useState("");
-  const [videoTimer, setVideoTimer] = useState(420);
+  const [videoTimer, setVideoTimer] = useState(60);
   const [videoPreview, setVideoPreview] = useState<string>("");
   const [icon, setIcon] = useState<string>("");
   const [isLoading, setIsLoading] = useState(false);
@@ -136,16 +133,6 @@ export const RouteCreatePage = observer(() => {
     articlesStore.getArticleList();
   };
 
-  const handleIconSelect = (media: {
-    id: string;
-    filename: string;
-    media_name?: string;
-    media_type: number;
-  }) => {
-    setIcon(media.id);
-    setIsSelectIconDialogOpen(false);
-  };
-
   const handleVideoSelect = (media: {
     id: string;
     filename: string;
@@ -176,6 +163,20 @@ export const RouteCreatePage = observer(() => {
     setFileToUpload(null);
   };
 
+  const handleVideoPreviewClick = () => {
+    setIsVideoPreviewOpen(true);
+  };
+
+  const handleIconSelect = (media: {
+    id: string;
+    filename: string;
+    media_name?: string;
+    media_type: number;
+  }) => {
+    setIcon(media.id);
+    setIsSelectIconDialogOpen(false);
+  };
+
   const selectedIconMedia =
     icon && !isMediaIdEmpty(icon)
       ? mediaStore.media.find((m) => m.id === icon)
@@ -285,10 +286,6 @@ export const RouteCreatePage = observer(() => {
         newRoute.governor_appeal = governor_appeal;
       }
 
-      if (buttonText.trim()) {
-        newRoute.button_text = buttonText.trim();
-      }
-
       const newId = await routeStore.createRoute(newRoute);
       toast.success("Маршрут успешно создан");
       navigate(`/route/${newId}/edit`);
@@ -404,18 +401,6 @@ export const RouteCreatePage = observer(() => {
             onChange={(e) => setGovRouteNumber(e.target.value)}
           />
 
-          <Typography variant="subtitle1" sx={{ fontWeight: 600 }}>
-            Текст кнопки обращения
-          </Typography>
-          <TextField
-            value={buttonText}
-            onChange={(e) => setButtonText(e.target.value)}
-            placeholder="Обращение губернатора"
-            fullWidth
-            size="small"
-            helperText="Если пусто, будет использован текст по умолчанию"
-          />
-
           <Typography variant="subtitle1" sx={{ fontWeight: 600 }}>
             Обращение к пассажирам
           </Typography>
@@ -481,7 +466,7 @@ export const RouteCreatePage = observer(() => {
               <VideoPreviewCard
                 title="Видеозаставка"
                 videoId={effectiveVideoId}
-                onVideoClick={() => setIsVideoPreviewOpen(true)}
+                onVideoClick={handleVideoPreviewClick}
                 onDeleteVideoClick={() => setVideoPreview("")}
                 onSelectVideoClick={handleVideoFileSelect}
                 className="w-full"
@@ -570,7 +555,7 @@ export const RouteCreatePage = observer(() => {
           />
           <TextField
             className="w-full"
-            label="Таймер показа видео при бездействии (сек)"
+            label="Таймер видео (сек)"
             type="number"
             value={videoTimer}
             onChange={(e) => {
@@ -643,10 +628,11 @@ export const RouteCreatePage = observer(() => {
         }}
         hardcodeType="video_preview"
         contextObjectName={routeName || "Маршрут"}
-        contextType="route"
+        contextType="sight"
         initialFile={fileToUpload || undefined}
         afterUpload={handleVideoUpload}
       />
+
       <SelectMediaDialog
         open={isSelectIconDialogOpen}
         onClose={() => setIsSelectIconDialogOpen(false)}

src/pages/Route/RouteEditPage/index.tsx

@@ -36,18 +36,11 @@ import {
   UploadMediaDialog,
   PreviewMediaDialog,
   LoadingSpinner,
-  selectedCityStore,
 } from "@shared";
 import { LinkedItems } from "../LinekedStations";
 
 export const RouteEditPage = observer(() => {
   const navigate = useNavigate();
-
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const { id } = useParams();
   const { editRouteData, copyRouteAction } = routeStore;
   const [isLoading, setIsLoading] = useState(false);
@@ -244,7 +237,9 @@ export const RouteEditPage = observer(() => {
     media_name?: string;
     media_type: number;
   }) => {
-    routeStore.setEditRouteData({ video_preview: media.id });
+    routeStore.setEditRouteData({
+      video_preview: media.id,
+    });
     setIsSelectVideoDialogOpen(false);
   };
 
@@ -263,11 +258,19 @@ export const RouteEditPage = observer(() => {
     media_name?: string;
     media_type: number;
   }) => {
-    routeStore.setEditRouteData({ video_preview: media.id });
+    routeStore.setEditRouteData({
+      video_preview: media.id,
+    });
     setIsUploadVideoDialogOpen(false);
     setFileToUpload(null);
   };
 
+  const handleVideoPreviewClick = () => {
+    if (editRouteData.video_preview && editRouteData.video_preview !== "") {
+      setIsVideoPreviewOpen(true);
+    }
+  };
+
   // Получаем название выбранной статьи для отображения
   const selectedArticle = articlesStore.articleList.ru.data.find(
     (article) => article.id === editRouteData.governor_appeal
@@ -545,9 +548,9 @@ export const RouteEditPage = observer(() => {
           />
           <TextField
             className="w-full"
-            label="Таймер показа видео при бездействии (сек)"
+            label="Таймер видео (сек)"
             type="number"
-            value={editRouteData.video_timer ?? 420}
+            value={editRouteData.video_timer ?? 60}
             onChange={(e) => {
               const val = Math.max(1, Math.round(Number(e.target.value)));
               if (Number.isFinite(val)) {
@@ -556,22 +559,6 @@ export const RouteEditPage = observer(() => {
             }}
           />
 
-          <Typography variant="subtitle1" sx={{ fontWeight: 600 }}>
-            Текст кнопки обращения
-          </Typography>
-          <TextField
-            value={editRouteData.button_text || ""}
-            onChange={(e) =>
-              routeStore.setEditRouteData({
-                button_text: e.target.value,
-              })
-            }
-            placeholder="Обращение губернатора"
-            fullWidth
-            size="small"
-            helperText="Если пусто, будет использован текст по умолчанию"
-          />
-
           <Typography variant="subtitle1" sx={{ fontWeight: 600 }}>
             Обращение к пассажирам
           </Typography>
@@ -640,10 +627,10 @@ export const RouteEditPage = observer(() => {
               <VideoPreviewCard
                 title="Видеозаставка"
                 videoId={effectiveVideoId}
-                onVideoClick={() => setIsVideoPreviewOpen(true)}
+                onVideoClick={handleVideoPreviewClick}
-                onDeleteVideoClick={() =>
+                onDeleteVideoClick={() => {
-                  routeStore.setEditRouteData({ video_preview: "" })
+                  routeStore.setEditRouteData({ video_preview: "" });
-                }
+                }}
                 onSelectVideoClick={handleVideoFileSelect}
                 className="w-full"
               />
@@ -731,10 +718,11 @@ export const RouteEditPage = observer(() => {
         }}
         hardcodeType="video_preview"
         contextObjectName={editRouteData.route_name || "Маршрут"}
-        contextType="route"
+        contextType="sight"
         initialFile={fileToUpload || undefined}
         afterUpload={handleVideoUpload}
       />
+
       <SelectMediaDialog
         open={isSelectIconDialogOpen}
         onClose={() => setIsSelectIconDialogOpen(false)}

src/pages/Route/RouteListPage/index.tsx

@@ -43,7 +43,7 @@ export const RouteListPage = observer(() => {
       loadCounts(routeIds);
     };
     fetchData();
-  }, [language, selectedCityStore.cityVersion]);
+  }, [language]);
 
   const columns: GridColDef[] = [
     {
@@ -139,7 +139,7 @@ export const RouteListPage = observer(() => {
       headerAlign: "center" as const,
       sortable: true,
       renderHeader: (params: any) => (
-        <Tooltip title="Отображает количество привязанных достопримечательностей">
+        <Tooltip title="Количество привязанных достопримечательностей">
           <span>{params.colDef.headerName}</span>
         </Tooltip>
       ),
@@ -157,7 +157,7 @@ export const RouteListPage = observer(() => {
       headerAlign: "center" as const,
       sortable: true,
       renderHeader: (params: any) => (
-        <Tooltip title="Отображает количество привязанных остановок">
+        <Tooltip title="Количество привязанных остановок">
           <span>{params.colDef.headerName}</span>
         </Tooltip>
       ),
@@ -178,23 +178,22 @@ export const RouteListPage = observer(() => {
         return (
           <div className="flex h-full gap-7 justify-center items-center">
             {canWriteRoutes && (
-              <button title="Редактировать" onClick={() => navigate(`/route/${params.row.id}/edit`)}>
+              <button onClick={() => navigate(`/route/${params.row.id}/edit`)}>
                 <Pencil size={20} className="text-blue-500" />
               </button>
             )}
             {canShowRoutePreview && (
-              <button title="Предпросмотр на карте" onClick={() => navigate(`/route-preview/${params.row.id}`)}>
+              <button onClick={() => navigate(`/route-preview/${params.row.id}`)}>
                 <Map size={20} className="text-purple-500" />
               </button>
             )}
             {canShowRoutePreview && (
-              <button title="Демо" onClick={() => window.open(`/demo/${params.row.id}`, "_blank")}>
+              <button onClick={() => window.open(`/demo/${params.row.id}`, "_blank")}>
                 <Monitor size={20} className="text-green-500" />
               </button>
             )}
             {canWriteRoutes && (
               <button
-                title="Удалить"
                 onClick={() => {
                   setIsDeleteModalOpen(true);
                   setRowId(params.row.id);
@@ -211,9 +210,6 @@ export const RouteListPage = observer(() => {
 
   const rows = useMemo(() => {
     const { selectedCityId } = selectedCityStore;
-    if (!selectedCityId) {
-      return [];
-    }
     const query = searchQuery.trim().toLowerCase();
     let filtered = routes.data;
     if (selectedCityId) {
@@ -251,10 +247,7 @@ export const RouteListPage = observer(() => {
         <div className="flex justify-between items-center mb-10">
           <h1 className="text-2xl">Маршруты</h1>
           {canWriteRoutes && (
-            <CreateButton
+            <CreateButton label="Создать маршрут" path="/route/create" />
-              label="Создать маршрут"
-              path="/route/create"
-            />
           )}
         </div>
 
@@ -270,9 +263,7 @@ export const RouteListPage = observer(() => {
           </div>
         )}
 
-        {(rows.length > 0 || searchQuery) && (
         <SearchInput value={searchQuery} onChange={setSearchQuery} />
-        )}
 
         <DataGrid
           rows={rows}
@@ -313,13 +304,7 @@ export const RouteListPage = observer(() => {
           slots={{
             noRowsOverlay: () => (
               <Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
-                {isLoading ? (
+                {isLoading ? <CircularProgress size={20} /> : "Нет маршрутов"}
-                  <CircularProgress size={20} />
-                ) : !selectedCityStore.selectedCityId ? (
-                  "Выберите город"
-                ) : (
-                  "Нет маршрутов"
-                )}
               </Box>
             ),
           }}

src/pages/Route/route-preview/InfiniteCanvas.tsx

@@ -0,0 +1,232 @@
+import { FederatedMouseEvent, FederatedWheelEvent } from "pixi.js";
+import { Component, ReactNode, useEffect, useState, useRef } from "react";
+import { useTransform } from "./TransformContext";
+import { useMapData } from "./MapDataContext";
+import { SCALE_FACTOR } from "./Constants";
+import { useApplication } from "@pixi/react";
+
+class ErrorBoundary extends Component<
+  { children: ReactNode },
+  { hasError: boolean }
+> {
+  state = { hasError: false };
+
+  static getDerivedStateFromError() {
+    return { hasError: true };
+  }
+
+  componentDidCatch(error: Error, info: React.ErrorInfo) {
+    console.error("Error caught:", error, info);
+  }
+
+  render() {
+    return this.state.hasError ? <p>Whoopsie Daisy!</p> : this.props.children;
+  }
+}
+
+export function InfiniteCanvas({
+  children,
+}: Readonly<{ children?: ReactNode }>) {
+  const {
+    position,
+    setPosition,
+    scale,
+    setScale,
+    rotation,
+    setRotation,
+    setScreenCenter,
+    screenCenter,
+  } = useTransform();
+  const { routeData, originalRouteData, setSelectedSight } = useMapData();
+
+  const applicationRef = useApplication();
+
+  const [isDragging, setIsDragging] = useState(false);
+  const [startMousePosition, setStartMousePosition] = useState({ x: 0, y: 0 });
+  const [startRotation, setStartRotation] = useState(0);
+  const [startPosition, setStartPosition] = useState({ x: 0, y: 0 });
+  const [isPointerDown, setIsPointerDown] = useState(false);
+
+  const [isUserInteracting, setIsUserInteracting] = useState(false);
+
+  const lastOriginalRotation = useRef<number | undefined>(undefined);
+
+  useEffect(() => {
+    if (!applicationRef?.app?.canvas) return;
+
+    const canvas = applicationRef.app.canvas;
+    const canvasRect = canvas.getBoundingClientRect();
+    const canvasLeft = canvasRect.left;
+    const canvasTop = canvasRect.top;
+    const centerX = window.innerWidth / 2 - canvasLeft;
+    const centerY = window.innerHeight / 2 - canvasTop;
+    setScreenCenter({ x: centerX, y: centerY });
+  }, [applicationRef?.app, setScreenCenter]);
+
+  const handlePointerDown = (e: FederatedMouseEvent) => {
+    setIsPointerDown(true);
+    setIsDragging(false);
+    setIsUserInteracting(true);
+    setStartPosition({
+      x: position.x,
+      y: position.y,
+    });
+    setStartMousePosition({
+      x: e.globalX,
+      y: e.globalY,
+    });
+    setStartRotation(rotation);
+    e.stopPropagation();
+  };
+
+  useEffect(() => {
+    const newRotation = originalRouteData?.rotate ?? 0;
+
+    if (!isUserInteracting && lastOriginalRotation.current !== newRotation) {
+      setRotation((newRotation * Math.PI) / 180);
+      lastOriginalRotation.current = newRotation;
+    }
+  }, [originalRouteData?.rotate, isUserInteracting, setRotation]);
+
+  const handlePointerMove = (e: FederatedMouseEvent) => {
+    if (!isPointerDown) return;
+
+    if (!isDragging) {
+      const dx = e.globalX - startMousePosition.x;
+      const dy = e.globalY - startMousePosition.y;
+      if (Math.abs(dx) > 5 || Math.abs(dy) > 5) {
+        setIsDragging(true);
+      } else {
+        return;
+      }
+    }
+
+    if (e.shiftKey) {
+      const center = screenCenter ?? { x: 0, y: 0 };
+      const startAngle = Math.atan2(
+        startMousePosition.y - center.y,
+        startMousePosition.x - center.x
+      );
+      const currentAngle = Math.atan2(
+        e.globalY - center.y,
+        e.globalX - center.x
+      );
+
+      const rotationDiff = currentAngle - startAngle;
+
+      setRotation(startRotation + rotationDiff);
+
+      const cosDelta = Math.cos(rotationDiff);
+      const sinDelta = Math.sin(rotationDiff);
+
+      setPosition({
+        x:
+          center.x * (1 - cosDelta) +
+          startPosition.x * cosDelta +
+          (center.y - startPosition.y) * sinDelta,
+        y:
+          center.y * (1 - cosDelta) +
+          startPosition.y * cosDelta +
+          (startPosition.x - center.x) * sinDelta,
+      });
+    } else {
+      setRotation(startRotation);
+      setPosition({
+        x: startPosition.x - startMousePosition.x + e.globalX,
+        y: startPosition.y - startMousePosition.y + e.globalY,
+      });
+    }
+    e.stopPropagation();
+  };
+
+  const handlePointerUp = (e: FederatedMouseEvent) => {
+    if (!isDragging) {
+      setSelectedSight(undefined);
+    }
+
+    setIsPointerDown(false);
+    setIsDragging(false);
+
+    setTimeout(() => {
+      setIsUserInteracting(false);
+    }, 100);
+    e.stopPropagation();
+  };
+
+  const handleWheel = (e: FederatedWheelEvent) => {
+    e.stopPropagation();
+    setIsUserInteracting(true);
+
+    const mouseX = e.globalX - position.x;
+    const mouseY = e.globalY - position.y;
+
+    const scaleMin = (routeData?.scale_min ?? 10) / SCALE_FACTOR;
+    const scaleMax = (routeData?.scale_max ?? 20) / SCALE_FACTOR;
+
+    const zoomFactor = e.deltaY > 0 ? 0.9 : 1.1;
+    const newScale = Math.max(scaleMin, Math.min(scaleMax, scale * zoomFactor));
+    const actualZoomFactor = newScale / scale;
+
+    if (scale === newScale) {
+      setTimeout(() => {
+        setIsUserInteracting(false);
+      }, 100);
+      return;
+    }
+
+    setPosition({
+      x: position.x + mouseX * (1 - actualZoomFactor),
+      y: position.y + mouseY * (1 - actualZoomFactor),
+    });
+
+    setScale(newScale);
+
+    setTimeout(() => {
+      setIsUserInteracting(false);
+    }, 100);
+  };
+
+  useEffect(() => {
+    applicationRef?.app.render();
+  }, [position, scale, rotation]);
+
+  return (
+    <ErrorBoundary>
+      {applicationRef?.app && (
+        <pixiGraphics
+          draw={(g) => {
+            const canvas = applicationRef.app.canvas;
+            g.clear();
+            g.rect(0, 0, canvas?.width ?? 0, canvas?.height ?? 0);
+            g.fill("#111");
+          }}
+          eventMode={"static"}
+          interactive
+          onPointerDown={handlePointerDown}
+          onGlobalPointerMove={handlePointerMove}
+          onPointerUp={handlePointerUp}
+          onPointerUpOutside={handlePointerUp}
+          onWheel={handleWheel}
+        />
+      )}
+      <pixiContainer
+        x={position.x}
+        y={position.y}
+        scale={scale}
+        rotation={rotation}
+      >
+        {children}
+      </pixiContainer>
+      {/* Show center of the screen.
+      <pixiGraphics
+        eventMode="none"
+        draw={(g) => {
+          g.clear();
+          const center = screenCenter ?? {x: 0, y: 0};
+          g.circle(center.x, center.y, 1);
+          g.fill("#fff");
+        }}
+      /> */}
+    </ErrorBoundary>
+  );
+}

src/pages/Route/route-preview/LeftSidebar.tsx

@@ -1,9 +1,10 @@
-import { Button } from "@mui/material";
+import { Box, Stack, Typography, Button } from "@mui/material";
 import { useNavigate, useNavigationType } from "react-router";
+import { MediaViewer } from "@widgets";
 import { useMapData } from "./MapDataContext";
 import { observer } from "mobx-react-lite";
 import { useEffect, useState } from "react";
-import { authInstance } from "@shared";
+import { authInstance, isMediaIdEmpty } from "@shared";
 import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import LanguageSelector from "./web-gl/LanguageSelector";
 
@@ -14,22 +15,22 @@ type LeftSidebarProps = {
 
 export const LeftSidebar = observer(({ open, onToggle }: LeftSidebarProps) => {
   const navigate = useNavigate();
-  const navigationType = useNavigationType();
+  const navigationType = useNavigationType(); // PUSH, POP, REPLACE
   const { routeData } = useMapData();
-  const [previewMedia, setPreviewMedia] = useState<string | null>(null);
+  const [carrierThumbnail, setCarrierThumbnail] = useState<string | null>(null);
-  const [isPreviewMediaError, setIsPreviewMediaError] = useState(false);
+  const [carrierLogo, setCarrierLogo] = useState<string | null>(null);
-
   useEffect(() => {
-    async function fetchCarrierData() {
+    async function fetchCarrierThumbnail() {
       if (routeData?.carrier_id) {
-        const carrier = (
+        const { city_id, logo } = (
           await authInstance.get(`/carrier/${routeData.carrier_id}`)
         ).data;
-        setPreviewMedia(carrier.preview_media ?? null);
+        const { arms } = (await authInstance.get(`/city/${city_id}`)).data;
-        setIsPreviewMediaError(false);
+        setCarrierThumbnail(arms);
+        setCarrierLogo(logo);
       }
     }
-    fetchCarrierData();
+    fetchCarrierThumbnail();
   }, [routeData?.carrier_id]);
 
   const handleBack = () => {
@@ -41,128 +42,131 @@ export const LeftSidebar = observer(({ open, onToggle }: LeftSidebarProps) => {
   };
 
   return (
-    <div
+    <Box
-      style={{
+      sx={{
         position: "relative",
-        width: 288,
         height: "100%",
         color: "#fff",
+        transition: "padding 0.3s ease",
+        p: open ? 2 : 0,
+        display: "flex",
+        flexDirection: "column",
+        alignItems: "stretch",
+        justifyContent: "flex-start",
       }}
     >
-      {/* Кнопка назад — вне основного меню */}
+      <Stack
-      <div
+        direction="column"
-        style={{
+        height="100%"
-          padding: "12px 12px 0",
+        width="100%"
+        spacing={4}
+        alignItems="stretch"
+        justifyContent="space-between"
+        sx={{
           opacity: open ? 1 : 0,
-          pointerEvents: open ? "auto" : "none",
           transition: "opacity 0.25s ease",
+          pointerEvents: open ? "auto" : "none",
+          display: open ? "flex" : "none",
         }}
       >
+        <div>
           <Button
             onClick={handleBack}
             variant="contained"
+            color="primary"
             sx={{
               backgroundColor: "#222",
               color: "#fff",
               borderRadius: 1.5,
               px: 2,
               py: 1,
-            "&:hover": { backgroundColor: "#2d2d2d" },
+              marginBottom: 10,
+              "&:hover": {
+                backgroundColor: "#2d2d2d",
+              },
             }}
             fullWidth
             startIcon={<ArrowBackIcon />}
           >
             Назад
           </Button>
-      </div>
 
-      {/* Основное меню — повторяет .side-menu */}
+          <Stack
+            direction="column"
+            alignItems="center"
+            justifyContent="center"
+            spacing={3}
+          >
             <div
               style={{
-          boxSizing: "border-box",
+                maxWidth: 150,
-          paddingTop: 46,
                 display: "flex",
                 flexDirection: "column",
                 alignItems: "center",
-          height: "calc(100% - 56px)",
+                gap: 10,
-          position: "relative",
-          opacity: open ? 1 : 0,
-          transition: "opacity 0.25s ease",
-          pointerEvents: open ? "auto" : "none",
               }}
             >
-        {/* Кнопки — .side-menu-buttons */}
+              {carrierThumbnail && !isMediaIdEmpty(carrierThumbnail) && (
-        <div
+                <MediaViewer
-          style={{
+                  media={{
-            width: 220,
+                    id: carrierThumbnail,
-            marginTop: routeData?.governor_appeal || 0 > 0 ? 40 : 260,
+                    media_type: 1, // Тип "Фото" для логотипа
-          }}
+                    filename: "route_thumbnail",
-        >
-          <div
-            style={{
-              backgroundColor: "#fff",
-              color: "#000",
-              textAlign: "center",
-              padding: "8px 16px",
-              marginBottom: 16,
-              borderRadius: 10,
-            }}
-          >
-            Достопримечательности
-          </div>
-          <div
-            style={{
-              backgroundColor: "#fff",
-              color: "#000",
-              textAlign: "center",
-              padding: "8px 16px",
-              marginBottom: 16,
-              borderRadius: 10,
-            }}
-          >
-            Остановки
-          </div>
-        </div>
-
-        {/* Нижняя секция — .side-menu-bottom-section */}
-        <div
-          style={{
-            position: "absolute",
-            bottom: 0,
-            left: 0,
-            width: "100%",
-            display: "flex",
-            flexDirection: "column",
-          }}
-        >
-          {/* .side-menu-bottom-photo */}
-          <img
-            src={
-              previewMedia && !isPreviewMediaError
-                ? `${import.meta.env.VITE_KRBL_MEDIA}${previewMedia}/download?token=${localStorage.getItem("token") ?? ""}`
-                : "/side-menu-photo.png"
-            }
-            onError={() => setIsPreviewMediaError(true)}
-            alt=""
-            style={{
-              width: "288px",
-              marginTop: 32,
-              display: "block",
-              pointerEvents: "none",
                   }}
+                  fullWidth
+                  fullHeight
                 />
+              )}
+              <Typography sx={{ color: "#fff" }} textAlign="center">
+                При поддержке Правительства
+              </Typography>
+            </div>
+          </Stack>
+
+          <div className="flex flex-col items-center justify-center gap-2 mt-10">
+            <button className="bg-[#fcd500] text-black px-4 py-2 rounded-md w-full font-medium my-10">
+              Обращение губернатора
+            </button>
+            <button className="bg-white text-black px-4 py-2 rounded-md w-full font-medium mx-5">
+              Достопримечательности
+            </button>
+            <button className="bg-white text-black px-4 py-2 rounded-md w-full font-medium mx-5">
+              Остановки
+            </button>
           </div>
         </div>
 
-      <div
+        <Stack
-        className="absolute bottom-[20px] z-10"
+          direction="column"
-        style={{
+          alignItems="center"
-          right: open ? -520 : -312,
+          maxHeight={150}
-          transition: "right 0.3s ease",
+          justifyContent="center"
-        }}
+          flexGrow={1}
         >
+          {carrierLogo && !isMediaIdEmpty(carrierLogo) && (
+            <MediaViewer
+              media={{
+                id: carrierLogo,
+                media_type: 1, // Тип "Фото" для логотипа
+                filename: "route_thumbnail_logo",
+              }}
+              fullHeight
+            />
+          )}
+        </Stack>
+
+        <Typography
+          variant="h6"
+          textAlign="center"
+          sx={{ color: "#fff", marginTop: "auto" }}
+        >
+          #ВсемПоПути
+        </Typography>
+      </Stack>
+
+      <div className="absolute bottom-[20px] -right-[520px] z-10">
         <LanguageSelector onBack={onToggle} isSidebarOpen={open} />
       </div>
-    </div>
+    </Box>
   );
 });

src/pages/Route/route-preview/Sight.tsx

@@ -0,0 +1,137 @@
+import { useEffect, useState } from "react";
+import { useTransform } from "./TransformContext";
+import { SightData } from "./types";
+import { Assets, FederatedMouseEvent, Texture } from "pixi.js";
+
+import { SIGHT_SIZE, UP_SCALE } from "./Constants";
+import { coordinatesToLocal, localToCoordinates } from "./utils";
+import { useMapData } from "./MapDataContext";
+
+interface SightProps {
+  sight: SightData;
+  id: number;
+}
+
+export const Sight = ({ sight, id }: Readonly<SightProps>) => {
+  const { rotation, scale } = useTransform();
+  const { setSightCoordinates, setSelectedSight } = useMapData();
+
+  const [position, setPosition] = useState(
+    coordinatesToLocal(sight.latitude, sight.longitude)
+  );
+  const [isDragging, setIsDragging] = useState(false);
+  const [isPointerDown, setIsPointerDown] = useState(false);
+  const [startPosition, setStartPosition] = useState({ x: 0, y: 0 });
+  const [startMousePosition, setStartMousePosition] = useState({ x: 0, y: 0 });
+
+  const handlePointerDown = (e: FederatedMouseEvent) => {
+    setIsPointerDown(true);
+    setIsDragging(false);
+    setStartPosition({
+      x: position.x,
+      y: position.y,
+    });
+    setStartMousePosition({
+      x: e.globalX,
+      y: e.globalY,
+    });
+
+    e.stopPropagation();
+  };
+  const handlePointerMove = (e: FederatedMouseEvent) => {
+    if (!isPointerDown) return;
+
+    if (!isDragging) {
+      const dx = e.globalX - startMousePosition.x;
+      const dy = e.globalY - startMousePosition.y;
+      if (Math.abs(dx) > 2 || Math.abs(dy) > 2) {
+        setIsDragging(true);
+      } else {
+        return;
+      }
+    }
+
+    const dx = (e.globalX - startMousePosition.x) / scale / UP_SCALE;
+    const dy = (e.globalY - startMousePosition.y) / scale / UP_SCALE;
+    const cos = Math.cos(rotation);
+    const sin = Math.sin(rotation);
+    const newPosition = {
+      x: startPosition.x + dx * cos + dy * sin,
+      y: startPosition.y - dx * sin + dy * cos,
+    };
+    setPosition(newPosition);
+    const coordinates = localToCoordinates(newPosition.x, newPosition.y);
+    setSightCoordinates(sight.id, coordinates.latitude, coordinates.longitude);
+    e.stopPropagation();
+  };
+
+  const handlePointerUp = (e: FederatedMouseEvent) => {
+    setIsPointerDown(false);
+
+    // Если не было перетаскивания, то это клик
+    if (!isDragging) {
+      setSelectedSight(sight);
+    }
+
+    setIsDragging(false);
+    e.stopPropagation();
+  };
+
+  const [texture, setTexture] = useState(Texture.EMPTY);
+  useEffect(() => {
+    Assets.load("/sight_icon.svg").then(setTexture);
+  }, []);
+
+  useEffect(() => {}, [id, sight.latitude, sight.longitude]);
+
+  if (!sight) {
+    console.error("sight is null");
+    return null;
+  }
+
+  // Компенсируем масштаб, но при зуме текст немного увеличивается
+  const clampedScale = Math.min(Math.max(scale, 1), 3);
+  const textScaleFactor = 1 + (clampedScale - 1) * 0.4;
+  const compensatedSize = SIGHT_SIZE / scale;
+  const compensatedFontSize = (24 / scale) * textScaleFactor;
+
+  return (
+    <pixiContainer
+      rotation={-rotation}
+      eventMode="static"
+      interactive
+      onPointerDown={handlePointerDown}
+      onGlobalPointerMove={handlePointerMove}
+      onPointerUp={handlePointerUp}
+      onPointerUpOutside={handlePointerUp}
+      x={position.x * UP_SCALE - SIGHT_SIZE / 2}
+      y={position.y * UP_SCALE - SIGHT_SIZE / 2}
+    >
+      <pixiSprite
+        texture={texture}
+        width={compensatedSize}
+        height={compensatedSize}
+      />
+      <pixiGraphics
+        draw={(g) => {
+          g.clear();
+          g.circle(0, 0, 20 / scale);
+          g.fill({ color: "#000" });
+        }}
+        x={compensatedSize}
+        y={0}
+      />
+      <pixiText
+        text={`${id + 1}`}
+        x={compensatedSize + 1 / scale}
+        y={0}
+        anchor={0.5}
+        style={{
+          fontSize: compensatedFontSize,
+          fontWeight: "bold",
+          fill: "#ffffff",
+        }}
+      />
+    </pixiContainer>
+  );
+};

src/pages/Route/route-preview/Station.tsx

@@ -0,0 +1,541 @@
+import { FederatedMouseEvent, Graphics } from "pixi.js";
+import { useCallback, useState, useEffect, useRef, FC, useMemo } from "react";
+import { observer } from "mobx-react-lite";
+
+import {
+  BACKGROUND_COLOR,
+  PATH_COLOR,
+  STATION_RADIUS,
+  STATION_OUTLINE_WIDTH,
+  UP_SCALE,
+} from "./Constants";
+import { useTransform } from "./TransformContext";
+import { StationData } from "./types";
+import { useMapData } from "./MapDataContext";
+import { coordinatesToLocal } from "./utils";
+import { languageStore } from "@shared";
+
+declare const pixiContainer: any;
+declare const pixiGraphics: any;
+declare const pixiText: any;
+
+type HorizontalAlign = "left" | "center" | "right";
+type VerticalAlign = "top" | "center" | "bottom";
+type TextAlign = HorizontalAlign | `${HorizontalAlign} ${VerticalAlign}`;
+type LabelAlign = "left" | "center" | "right";
+
+/**
+ * Преобразует текстовое позиционирование в anchor координаты.
+ */
+
+/**
+ * Получает координату anchor.x из типа выравнивания.
+ */
+
+interface StationProps {
+  station: StationData;
+  ruLabel: string | null;
+  anchorPoint?: { x: number; y: number };
+  /** Anchor для всего блока с текстом. По умолчанию: `"right center"` */
+  labelBlockAnchor?: TextAlign | { x: number; y: number };
+  /** Внутреннее выравнивание текста в блоке. По умолчанию: `"left"` */
+  labelAlign?: LabelAlign;
+  /** Callback для изменения внутреннего выравнивания */
+  onLabelAlignChange?: (align: LabelAlign) => void;
+  /** Callback для отслеживания наведения на текст */
+  onTextHover?: (isHovered: boolean) => void;
+}
+
+interface LabelAlignmentControlProps {
+  scale: number;
+  currentAlign: LabelAlign;
+  onAlignChange: (align: LabelAlign) => void;
+  onPointerOver: () => void;
+  onPointerOut: () => void;
+  onControlPointerEnter: () => void;
+  onControlPointerLeave: () => void;
+}
+
+interface StationLabelProps
+  extends Omit<StationProps, "ruLabelAnchor" | "nameLabelAnchor"> {}
+
+const getAnchorFromOffset = (
+  offsetX: number,
+  offsetY: number
+): { x: number; y: number } => {
+  if (offsetX === 0 && offsetY === 0) {
+    return { x: 0.5, y: 0.5 };
+  }
+
+  const length = Math.hypot(offsetX, offsetY);
+  const nx = offsetX / length;
+  const ny = offsetY / length;
+
+  return { x: (1 - nx) / 2, y: (1 - ny) / 2 };
+};
+
+const LabelAlignmentControl: FC<LabelAlignmentControlProps> = ({
+  scale,
+  currentAlign,
+  onAlignChange,
+
+  onControlPointerEnter,
+  onControlPointerLeave,
+}) => {
+  const controlHeight = 50 / scale;
+  const controlWidth = 200 / scale;
+  const fontSize = 18 / scale;
+  const borderRadius = 8 / scale;
+  const compensatedRuFontSize = (26 * 0.75) / scale;
+  const buttonWidth = controlWidth / 3;
+  const strokeWidth = 2 / scale;
+
+  const drawBg = useCallback(
+    (g: Graphics) => {
+      g.clear();
+
+      g.roundRect(
+        -controlWidth / 2,
+        0,
+        controlWidth,
+        controlHeight,
+        borderRadius
+      );
+      g.fill({ color: "#1a1a1a" });
+
+      g.roundRect(
+        -controlWidth / 2,
+        0,
+        controlWidth,
+        controlHeight,
+        borderRadius
+      );
+      g.stroke({ color: "#333333", width: strokeWidth });
+
+      for (let i = 1; i < 3; i++) {
+        const x = -controlWidth / 2 + buttonWidth * i;
+        g.moveTo(x, strokeWidth);
+        g.lineTo(x, controlHeight - strokeWidth);
+        g.stroke({ color: "#333333", width: strokeWidth });
+      }
+    },
+    [controlWidth, controlHeight, borderRadius, buttonWidth, strokeWidth]
+  );
+
+  const drawButtonHighlight = useCallback(
+    (g: Graphics, index: number, isActive: boolean) => {
+      g.clear();
+
+      if (isActive) {
+        const x = -controlWidth / 2 + buttonWidth * index;
+        g.roundRect(
+          x + strokeWidth,
+          strokeWidth,
+          buttonWidth - strokeWidth * 2,
+          controlHeight - strokeWidth * 2,
+          borderRadius / 2
+        );
+        g.fill({ color: "#0066cc", alpha: 0.8 });
+      }
+    },
+    [controlWidth, controlHeight, buttonWidth, strokeWidth, borderRadius]
+  );
+
+  const getTextStyle = (isActive: boolean) => ({
+    fontSize,
+    fontWeight: isActive ? ("bold" as const) : ("normal" as const),
+    fill: isActive ? "#ffffff" : "#cccccc",
+    fontFamily: "Arial, sans-serif",
+  });
+
+  const alignOptions = [
+    { key: "left" as const, label: "Left" },
+    { key: "center" as const, label: "Center" },
+    { key: "right" as const, label: "Right" },
+  ];
+
+  return (
+    <pixiContainer
+      position={{ x: 0, y: compensatedRuFontSize * 1.1 + 15 / scale }}
+      zIndex={999999999999999999}
+      eventMode="static"
+      onPointerOver={(e: FederatedMouseEvent) => {
+        e.stopPropagation();
+        onControlPointerEnter();
+      }}
+      onPointerOut={(e: FederatedMouseEvent) => {
+        e.stopPropagation();
+        onControlPointerLeave();
+      }}
+      onPointerDown={(e: FederatedMouseEvent) => {
+        e.stopPropagation();
+      }}
+    >
+      {/* Основной фон */}
+      <pixiGraphics draw={drawBg} />
+
+      {/* Кнопки с подсветкой */}
+      {alignOptions.map((option, index) => (
+        <pixiContainer key={option.key}>
+          {/* Подсветка активной кнопки */}
+          <pixiGraphics
+            draw={(g: Graphics) =>
+              drawButtonHighlight(g, index, option.key === currentAlign)
+            }
+          />
+
+          {/* Текст кнопки */}
+          <pixiText
+            text={option.label}
+            anchor={{ x: 0.5, y: 0.5 }}
+            position={{
+              x: -controlWidth / 2 + buttonWidth * (index + 0.5),
+              y: controlHeight / 2,
+            }}
+            style={getTextStyle(option.key === currentAlign)}
+            eventMode="static"
+            cursor="pointer"
+            onClick={(e: FederatedMouseEvent) => {
+              e.stopPropagation();
+              onAlignChange(option.key);
+            }}
+            onPointerDown={(e: FederatedMouseEvent) => {
+              e.stopPropagation();
+              onAlignChange(option.key);
+            }}
+            onPointerOver={(e: FederatedMouseEvent) => {
+              e.stopPropagation();
+              onControlPointerEnter();
+            }}
+          />
+        </pixiContainer>
+      ))}
+    </pixiContainer>
+  );
+};
+
+const StationLabel = observer(
+  ({
+    station,
+    ruLabel,
+
+    labelAlign: labelAlignProp = "center",
+    onLabelAlignChange,
+    onTextHover,
+  }: Readonly<StationLabelProps>) => {
+    const { language } = languageStore;
+    const { rotation, scale } = useTransform();
+    const { setStationOffset, setStationAlign } = useMapData();
+
+    const [position, setPosition] = useState({ x: 0, y: 0 });
+    const [isDragging, setIsDragging] = useState(false);
+    const [isPointerDown, setIsPointerDown] = useState(false);
+    const [isHovered, setIsHovered] = useState(false);
+    const [isControlHovered, setIsControlHovered] = useState(false);
+    const [currentLabelAlign, setCurrentLabelAlign] = useState(labelAlignProp);
+    const [ruLabelWidth, setRuLabelWidth] = useState(0);
+
+    const dragStartPos = useRef({ x: 0, y: 0 });
+    const mouseStartPos = useRef({ x: 0, y: 0 });
+    const hideTimer = useRef<NodeJS.Timeout | null>(null);
+    const ruLabelRef = useRef<any>(null);
+
+    useEffect(() => {
+      return () => {
+        if (hideTimer.current) {
+          clearTimeout(hideTimer.current);
+        }
+      };
+    }, []);
+
+    const handlePointerEnter = () => {
+      if (hideTimer.current) {
+        clearTimeout(hideTimer.current);
+        hideTimer.current = null;
+      }
+      setIsHovered(true);
+      onTextHover?.(true);
+    };
+
+    const handleControlPointerEnter = () => {
+      if (hideTimer.current) {
+        clearTimeout(hideTimer.current);
+        hideTimer.current = null;
+      }
+      setIsControlHovered(true);
+      setIsHovered(true);
+      onTextHover?.(true);
+    };
+
+    const handleControlPointerLeave = () => {
+      setIsControlHovered(false);
+
+      if (!isHovered) {
+        hideTimer.current = setTimeout(() => {
+          setIsHovered(false);
+          onTextHover?.(false);
+        }, 0);
+      }
+    };
+
+    const handlePointerLeave = () => {
+      hideTimer.current = setTimeout(() => {
+        setIsHovered(false);
+
+        if (!isControlHovered) {
+          setIsControlHovered(false);
+        }
+        onTextHover?.(false);
+      }, 100);
+    };
+
+    useEffect(() => {
+      setPosition({ x: station.offset_x ?? 0, y: station.offset_y ?? 0 });
+    }, [station.offset_x, station.offset_y, station.id]);
+
+    const convertNumericAlign = (align: number): LabelAlign => {
+      switch (align) {
+        case 0:
+          return "left";
+        case 1:
+          return "center";
+        case 2:
+          return "right";
+        default:
+          return "center";
+      }
+    };
+
+    const convertStringAlign = (align: LabelAlign): number => {
+      switch (align) {
+        case "left":
+          return 0;
+        case "center":
+          return 1;
+        case "right":
+          return 2;
+        default:
+          return 1;
+      }
+    };
+
+    useEffect(() => {
+      setCurrentLabelAlign(convertNumericAlign(station.align ?? 1));
+    }, [station.align]);
+
+    if (!station) return null;
+
+    const coordinates = coordinatesToLocal(station.latitude, station.longitude);
+    const clampedScale = Math.min(Math.max(scale, 1), 3);
+    const textScaleFactor = 1 + (clampedScale - 1) * 0.4;
+    const compensatedRuFontSize = ((26 * 0.75) / scale) * textScaleFactor;
+    const compensatedNameFontSize = ((16 * 0.75) / scale) * textScaleFactor;
+
+    useEffect(() => {
+      if (ruLabelRef.current && ruLabel) {
+        setRuLabelWidth(ruLabelRef.current.width);
+      }
+    }, [ruLabel, compensatedRuFontSize]);
+
+    const handlePointerDown = (e: FederatedMouseEvent) => {
+      setIsPointerDown(true);
+      setIsDragging(false);
+      dragStartPos.current = { ...position };
+      mouseStartPos.current = { x: e.global.x, y: e.global.y };
+      e.stopPropagation();
+    };
+
+    const handlePointerMove = (e: FederatedMouseEvent) => {
+      if (!isPointerDown) return;
+
+      if (!isDragging) {
+        const dx = e.global.x - mouseStartPos.current.x;
+        const dy = e.global.y - mouseStartPos.current.y;
+        if (Math.hypot(dx, dy) > 3) setIsDragging(true);
+        else return;
+      }
+
+      const dx_screen = e.global.x - mouseStartPos.current.x;
+      const dy_screen = e.global.y - mouseStartPos.current.y;
+
+      const newPosition = {
+        x: dragStartPos.current.x + dx_screen,
+        y: dragStartPos.current.y + dy_screen,
+      };
+
+      if (
+        Math.abs(newPosition.x - position.x) > 0.01 ||
+        Math.abs(newPosition.y - position.y) > 0.01
+      ) {
+        setPosition(newPosition);
+        setStationOffset(station.id, newPosition.x, newPosition.y);
+      }
+      e.stopPropagation();
+    };
+
+    const handlePointerUp = (e: FederatedMouseEvent) => {
+      setIsPointerDown(false);
+      setTimeout(() => setIsDragging(false), 50);
+      e.stopPropagation();
+    };
+
+    const handleAlignChange = async (align: LabelAlign) => {
+      setCurrentLabelAlign(align);
+      onLabelAlignChange?.(align);
+
+      const numericAlign = convertStringAlign(align);
+      setStationAlign(station.id, numericAlign);
+    };
+
+    const dynamicAnchor = useMemo(
+      () => getAnchorFromOffset(position.x, position.y),
+      [position.x, position.y]
+    );
+
+    const getSecondLabelPosition = (): number => {
+      if (!ruLabelWidth) return 0;
+
+      switch (currentLabelAlign) {
+        case "left":
+          return -ruLabelWidth / 2;
+        case "center":
+          return 0;
+        case "right":
+          return ruLabelWidth / 2;
+        default:
+          return 0;
+      }
+    };
+
+    const getSecondLabelAnchor = (): number => {
+      switch (currentLabelAlign) {
+        case "left":
+          return 0;
+        case "center":
+          return 0.5;
+        case "right":
+          return 1;
+        default:
+          return 0.5;
+      }
+    };
+
+    return (
+      <pixiContainer
+        x={coordinates.x * UP_SCALE}
+        y={coordinates.y * UP_SCALE}
+        rotation={-rotation}
+        zIndex={isHovered || isControlHovered ? 1000 : 0}
+        eventMode="static"
+        interactive
+        cursor={isDragging ? "grabbing" : "grab"}
+        onPointerOver={handlePointerEnter}
+        onPointerOut={handlePointerLeave}
+        onPointerDown={handlePointerDown}
+        onPointerUp={handlePointerUp}
+        onPointerUpOutside={handlePointerUp}
+        onGlobalPointerMove={handlePointerMove}
+      >
+        <pixiContainer
+          position={{
+            x:
+              (position.x + Math.cos(Math.atan2(position.y, position.x))) /
+              scale,
+            y:
+              (position.y + Math.sin(Math.atan2(position.y, position.x))) /
+              scale,
+          }}
+          anchor={dynamicAnchor}
+          zIndex={isHovered || isControlHovered ? 1000 : 0}
+        >
+          {ruLabel && (
+            <pixiText
+              ref={ruLabelRef}
+              text={ruLabel}
+              position={{ x: 0, y: 0 }}
+              anchor={{ x: 0.5, y: 0.5 }}
+              style={{
+                fontSize: compensatedRuFontSize,
+                fontWeight: "bold",
+                fill: "#ffffff",
+              }}
+            />
+          )}
+          {station.name && language !== "ru" && ruLabel && (
+            <pixiText
+              text={station.name}
+              position={{
+                x: getSecondLabelPosition(),
+                y: compensatedRuFontSize * 1.1,
+              }}
+              anchor={{ x: getSecondLabelAnchor(), y: 0.5 }}
+              style={{
+                fontSize: compensatedNameFontSize,
+                fontWeight: "bold",
+                fill: "#CCCCCC",
+              }}
+            />
+          )}
+          {(isHovered || isControlHovered) && !isDragging && (
+            <LabelAlignmentControl
+              scale={scale}
+              currentAlign={currentLabelAlign}
+              onAlignChange={handleAlignChange}
+              onPointerOver={handlePointerEnter}
+              onPointerOut={handlePointerLeave}
+              onControlPointerEnter={handleControlPointerEnter}
+              onControlPointerLeave={handleControlPointerLeave}
+            />
+          )}
+        </pixiContainer>
+      </pixiContainer>
+    );
+  }
+);
+
+export const Station = ({
+  station,
+  ruLabel,
+
+  labelAlign,
+  onLabelAlignChange,
+}: Readonly<StationProps>) => {
+  const [isTextHovered, setIsTextHovered] = useState(false);
+
+  const draw = useCallback(
+    (g: Graphics) => {
+      g.clear();
+      const coordinates = coordinatesToLocal(
+        station.latitude,
+        station.longitude
+      );
+
+      const radius = STATION_RADIUS;
+      const strokeWidth = STATION_OUTLINE_WIDTH;
+
+      g.circle(coordinates.x * UP_SCALE, coordinates.y * UP_SCALE, radius);
+
+      if (isTextHovered) {
+        g.fill({ color: 0x00aaff });
+        g.stroke({ color: 0xffffff, width: strokeWidth + 1 });
+      } else {
+        g.fill({ color: PATH_COLOR });
+        g.stroke({ color: BACKGROUND_COLOR, width: strokeWidth });
+      }
+    },
+    [station.latitude, station.longitude, isTextHovered]
+  );
+
+  return (
+    <pixiContainer zIndex={isTextHovered ? 1000 : 0}>
+      <pixiGraphics draw={draw} />
+      <StationLabel
+        station={station}
+        ruLabel={ruLabel}
+        labelAlign={labelAlign}
+        onLabelAlignChange={onLabelAlignChange}
+        onTextHover={setIsTextHovered}
+      />
+    </pixiContainer>
+  );
+};

src/pages/Route/route-preview/TravelPath.tsx

@@ -0,0 +1,34 @@
+import { Graphics } from "pixi.js";
+import { useCallback } from "react";
+import { PATH_COLOR, PATH_WIDTH } from "./Constants";
+import { coordinatesToLocal } from "./utils";
+
+interface TravelPathProps {
+  points: { x: number; y: number }[];
+}
+
+export function TravelPath({ points }: Readonly<TravelPathProps>) {
+  const draw = useCallback(
+    (g: Graphics) => {
+      g.clear();
+      const coordStart = coordinatesToLocal(points[0].x, points[0].y);
+      g.moveTo(coordStart.x, coordStart.y);
+      for (let i = 1; i <= points.length - 1; i++) {
+        const coordinates = coordinatesToLocal(points[i].x, points[i].y);
+        g.lineTo(coordinates.x, coordinates.y);
+      }
+      g.stroke({
+        color: PATH_COLOR,
+        width: PATH_WIDTH,
+      });
+    },
+    [points]
+  );
+
+  if (points.length === 0) {
+    console.error("points is empty");
+    return null;
+  }
+
+  return <pixiGraphics draw={draw} />;
+}

src/pages/Route/route-preview/index.tsx

@@ -1,5 +1,14 @@
 import { useRef, useEffect, useState } from "react";
 import { Widgets } from "./Widgets";
+import { extend } from "@pixi/react";
+import {
+  Container,
+  Graphics,
+  Sprite,
+  Texture,
+  TilingSprite,
+  Text,
+} from "pixi.js";
 import { Box, Stack } from "@mui/material";
 import { MapDataProvider, useMapData } from "./MapDataContext";
 import { TransformProvider, useTransform } from "./TransformContext";
@@ -13,6 +22,15 @@ import { UP_SCALE } from "./Constants";
 import { WebGLRouteMapPrototype } from "./webgl-prototype/WebGLRouteMapPrototype";
 import { CircularProgress } from "@mui/material";
 
+extend({
+  Container,
+  Graphics,
+  Sprite,
+  Texture,
+  TilingSprite,
+  Text,
+});
+
 const Loading = () => {
   const { isRouteLoading, isStationLoading, isSightLoading } = useMapData();
 
@@ -36,8 +54,7 @@ export const RoutePreview = () => {
           <Box
             sx={{
               position: "relative",
-              zIndex: 20,
+              width: isLeftSidebarOpen ? 300 : 0,
-              width: isLeftSidebarOpen ? 288 : 0,
               transition: "width 0.3s ease",
               overflow: "visible",
               height: "100%",
@@ -76,10 +93,9 @@ export const RouteMap = observer(() => {
   const parentRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
-    const previousBodyOverflow = document.body.style.overflow;
     document.body.style.overflow = "hidden";
     return () => {
-      document.body.style.overflow = previousBodyOverflow;
+      document.body.style.overflow = "auto";
     };
   }, []);
 
@@ -129,14 +145,14 @@ export const RouteMap = observer(() => {
     ) {
       const coordinates = coordinatesToLocal(
         originalRouteData?.center_latitude,
-        originalRouteData?.center_longitude,
+        originalRouteData?.center_longitude
       );
 
       setTransform(
         coordinates.x,
         coordinates.y,
         originalRouteData?.rotate,
-        originalRouteData?.scale_min,
+        originalRouteData?.scale_min
       );
       setIsSetup(true);
     }
@@ -155,6 +171,25 @@ export const RouteMap = observer(() => {
 
   return (
     <div style={{ width: "100%", height: "100%" }} ref={parentRef}>
+      {/* <Application resizeTo={parentRef} background="#000" preference="webgl">
+        <InfiniteCanvas>
+          <TravelPath points={points} />
+          {stationData[language].map((obj, index) => (
+            <Station
+              station={obj}
+              key={obj.id}
+              ruLabel={
+                language === "ru"
+                  ? stationData.ru[index].name
+                  : stationData.ru[index].name
+              }
+            />
+          ))}
+          {originalSightData?.map((sight: SightData, index: number) => {
+            return <Sight sight={sight} id={index} key={sight.id} />;
+          })}
+        </InfiniteCanvas>
+      </Application> */}
       <WebGLRouteMapPrototype />
     </div>
   );

src/pages/Route/route-preview/types.ts

@@ -6,7 +6,6 @@ export interface RouteData {
   icon_size?: number;
   font_size: number;
   governor_appeal: number;
-  button_text?: string;
   id: number;
   path: [number, number][];
   rotate: number;

src/pages/Route/route-preview/webgl-prototype/RouteWidget.module.css

@@ -26,12 +26,10 @@
   position: fixed;
   display: inline-flex;
   border-radius: 10px;
-  box-shadow:
+  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.3) inset,
-    0 0 0 1px rgba(255, 255, 255, 0.3) inset,
     /* Внутренняя рамка */ 4px 4px 12px 0 rgba(255, 255, 255, 0.12) inset; /* Ваш существующий внутренний shadow */
   padding: 1px; /* Чтобы контент не прилипал к рамке */
-  background:
+  background: linear-gradient(
-    linear-gradient(
       to bottom right,
       rgba(255, 255, 255, 0.2) 0%,
       rgba(255, 255, 255, 0) 100%
@@ -52,8 +50,7 @@
   height: 96px;
   background-color: #fcd500;
   color: black;
-  border-top-left-radius: 10px;
+  border-radius: 10px;
-  border-bottom-left-radius: 10px;
   display: flex;
   justify-content: center;
   align-items: center;

src/pages/Route/route-preview/webgl-prototype/WebGLRouteMapPrototype.tsx

@@ -2327,6 +2327,9 @@ export const WebGLRouteMapPrototype = observer(() => {
             const stationScreenY =
               rotatedY * camera.scale + camera.translation.y;
 
+            const labelX = stationScreenX + offsetX;
+            const labelY = stationScreenY + offsetY;
+
             const backendAlign = station.align;
 
             const anchor = getAnchorFromOffset(backendAlign ?? 2);
@@ -2336,6 +2339,8 @@ export const WebGLRouteMapPrototype = observer(() => {
 
             const dpr = Math.max(1, window.devicePixelRatio || 1);
 
+            const cssX = labelX / dpr;
+            const cssY = labelY / dpr;
             const rotationCss = `${rotationAngle}rad`;
             const counterRotationCss = `${-rotationAngle}rad`;
 
@@ -2354,13 +2359,6 @@ export const WebGLRouteMapPrototype = observer(() => {
             const scaleFactor = 1 + (zoomClampedScale - 1) * 0.4;
 
             const primaryFontSize = 16 * fontScale * scaleFactor;
-
-            const mainLabelHeight = primaryFontSize * 1.2;
-            const labelX = stationScreenX + offsetX;
-            const labelY = stationScreenY + offsetY + mainLabelHeight / 2;
-
-            const cssX = labelX / dpr;
-            const cssY = labelY / dpr;
             const secondaryFontSize = 13 * fontScale * scaleFactor;
 
             const secondaryMarginTop = 5 * fontScale * scaleFactor;
@@ -2406,7 +2404,13 @@ export const WebGLRouteMapPrototype = observer(() => {
               hoveredStationIconId === station.id ||
               resizingStationIconId === station.id;
 
-            const secondaryLineHeight = 1.2 * scaleFactor;
+            const secondaryLineHeight = 1.2;
+            const secondaryHeight = showSecondary
+              ? secondaryFontSize * secondaryLineHeight
+              : 0;
+            const menuPaddingTop = showSecondary
+              ? Math.max(0, secondaryHeight - secondaryMarginTop) + 3
+              : 3;
 
             return (
               <div key={station.id}>
@@ -2436,7 +2440,7 @@ export const WebGLRouteMapPrototype = observer(() => {
                     color: "#fff",
                     fontFamily: "Roboto, sans-serif",
                     textAlign: "left",
-                    pointerEvents: "none",
+                    pointerEvents: "auto",
                     cursor: "grab",
                     userSelect: "none",
                     touchAction: "none",
@@ -2444,16 +2448,14 @@ export const WebGLRouteMapPrototype = observer(() => {
                 >
                   <div
                     style={{
-                      display: "inline-block",
+                      pointerEvents: "auto",
-                      pointerEvents: "none",
                       transformOrigin: "left center",
                       transform: `rotate(${rotationCss})`,
                     }}
                   >
                     <div
                       style={{
-                        display: "inline-block",
+                        pointerEvents: "auto",
-                        pointerEvents: "none",
                         transformOrigin: "left center",
                         transform: `rotate(${counterRotationCss})`,
                       }}
@@ -2547,7 +2549,6 @@ export const WebGLRouteMapPrototype = observer(() => {
                         ) : null}
                         <div
                           style={{
-                            position: "relative",
                             fontWeight: 700,
                             fontSize: primaryFontSize,
                             textShadow: "0 0 4px rgba(0,0,0,0.6)",
@@ -2556,6 +2557,7 @@ export const WebGLRouteMapPrototype = observer(() => {
                           }}
                         >
                           {station.name}
+                        </div>
                         {showSecondary ? (
                           <div
                             style={{
@@ -2578,7 +2580,6 @@ export const WebGLRouteMapPrototype = observer(() => {
                       </div>
                     </div>
                   </div>
-                  </div>
                   {hoveredStationId === station.id && (
                     <div
                       style={{
@@ -2586,9 +2587,9 @@ export const WebGLRouteMapPrototype = observer(() => {
                         top: "100%",
                         left: "50%",
                         transform: "translateX(-50%)",
-                        paddingTop: "8px",
+                        paddingTop: menuPaddingTop,
                         pointerEvents: "auto",
-                        zIndex: 1000000,
+                        zIndex: 10,
                         cursor: "default",
                       }}
                       onPointerDown={(e) => e.stopPropagation()}

src/pages/Sight/SightListPage/index.tsx

@@ -46,7 +46,7 @@ export const SightListPage = observer(() => {
       setIsLoading(false);
     };
     fetchSights();
-  }, [language, selectedCityStore.cityVersion]);
+  }, [language]);
 
   const columns: GridColDef[] = [
     {
@@ -105,11 +105,10 @@ export const SightListPage = observer(() => {
       sortable: false,
       renderCell: (params: GridRenderCellParams) => (
         <div className="flex h-full gap-7 justify-center items-center">
-          <button title="Редактировать" onClick={() => navigate(`/sight/${params.row.id}/edit`)}>
+          <button onClick={() => navigate(`/sight/${params.row.id}/edit`)}>
             <Pencil size={20} className="text-blue-500" />
           </button>
           <button
-            title="Удалить"
             onClick={() => {
               setIsDeleteModalOpen(true);
               setRowId(params.row.id);
@@ -122,11 +121,8 @@ export const SightListPage = observer(() => {
     }] : []),
   ];
 
-  const { selectedCityId } = selectedCityStore;
   const filteredSights = useMemo(() => {
-    if (!selectedCityId) {
+    const { selectedCityId } = selectedCityStore;
-      return [];
-    }
     const allowedCityIds = canReadCities
       ? null
       : authStore.meCities["ru"].map((c) => c.city_id);
@@ -135,12 +131,12 @@ export const SightListPage = observer(() => {
       if (allowedCityIds && !allowedCityIds.includes(sight.city_id)) {
         return false;
       }
-      if (sight.city_id !== selectedCityId) {
+      if (selectedCityId && sight.city_id !== selectedCityId) {
         return false;
       }
       return true;
     });
-  }, [sights, selectedCityId, canReadCities, authStore.meCities]);
+  }, [sights, selectedCityStore.selectedCityId, canReadCities, authStore.meCities]);
 
   const query = searchQuery.trim().toLowerCase();
   const rows = filteredSights
@@ -181,9 +177,7 @@ export const SightListPage = observer(() => {
           </div>
         )}
 
-        {(rows.length > 0 || searchQuery) && (
         <SearchInput value={searchQuery} onChange={setSearchQuery} />
-        )}
 
         <DataGrid
           rows={rows}
@@ -222,8 +216,6 @@ export const SightListPage = observer(() => {
               <Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
                 {isLoading ? (
                   <CircularProgress size={20} />
-                ) : !selectedCityId ? (
-                  "Выберите город"
                 ) : (
                   "Нет достопримечательностей"
                 )}

src/pages/Snapshot/SnapshotCreatePage/index.tsx

@@ -1,58 +1,46 @@
-import {
+import { Button, TextField } from "@mui/material";
-  Button,
+import { snapshotStore } from "@shared";
-  TextField,
-  Dialog,
-  DialogTitle,
-  DialogContent,
-  DialogActions,
-} from "@mui/material";
-import { snapshotStore, authStore, routeStore, selectedCityStore, cityStore, carrierStore } from "@shared";
 import { observer } from "mobx-react-lite";
 import { ArrowLeft, Loader2, Save } from "lucide-react";
-import { useState, useEffect, useMemo } from "react";
+import { useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import { runInAction } from "mobx";
 
-function escapeRegex(s: string) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-function buildExportNameRegex(cityNames: string[]): RegExp {
-  if (!cityNames.length) return /.+/;
-  const pattern = cityNames.map(escapeRegex).join("|");
-  return new RegExp(`^(${pattern})_.+$`);
-}
-
 export const SnapshotCreatePage = observer(() => {
   const { createSnapshot, getSnapshotStatus, getStorageInfo, snapshotStatus } = snapshotStore;
   const navigate = useNavigate();
-
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const [name, setName] = useState("");
-  const [nameError, setNameError] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState(false);
-  const [duplicateWarningOpen, setDuplicateWarningOpen] = useState(false);
-  const [duplicateRouteNumbers, setDuplicateRouteNumbers] = useState<string[]>([]);
 
-  const exportNameRegex = useMemo(() => {
+  return (
-    const names = cityStore.cities["ru"].data.map((c) => c.name.trim());
+    <div className="w-full h-[400px] flex justify-center items-center">
-    return buildExportNameRegex(names);
+      <div className="w-full h-full p-3 flex flex-col gap-10">
-  }, [cityStore.cities["ru"].data.length]);
+        <div className="flex justify-between items-center">
+          <button
+            className="flex items-center gap-2"
+            onClick={() => navigate(-1)}
+          >
+            <ArrowLeft size={20} />
+            Назад
+          </button>
+        </div>
+        <h1 className="text-2xl font-bold">Создание экспорта медиа</h1>
+        <div className="flex flex-col gap-10 w-full items-end">
+          <TextField
+            className="w-full"
+            label="Название"
+            required
+            value={name}
+            onChange={(e) => setName(e.target.value)}
+          />
 
-  useEffect(() => {
+          <Button
-    if (!cityStore.cities["ru"].loaded) {
+            variant="contained"
-      cityStore.getCities("ru");
+            color="primary"
-    }
+            className="w-min flex gap-2 items-center"
-  }, []);
+            startIcon={<Save size={20} />}
-
+            onClick={async () => {
-  const canReadRoutes = authStore.canRead("routes");
-
-  const startExport = async () => {
               try {
                 setIsLoading(true);
                 const id = await createSnapshot(name);
@@ -80,118 +68,8 @@ export const SnapshotCreatePage = observer(() => {
               } finally {
                 setIsLoading(false);
               }
-  };
-
-  const handleSave = async () => {
-    if (!canReadRoutes) {
-      await startExport();
-      return;
-    }
-
-    try {
-      runInAction(() => {
-        routeStore.routes.loaded = false;
-      });
-      await routeStore.getRoutes();
-      await carrierStore.getCarriers("ru");
-
-      const routes = routeStore.routes.data;
-      const carriers = carrierStore.carriers.ru.data;
-      const carrierCityMap = new Map<number, number>();
-      for (const c of carriers) {
-        carrierCityMap.set(c.id, c.city_id);
-      }
-
-      const duplicateMessages: string[] = [];
-
-      const directionKey = new Map<string, number>();
-      for (const route of routes) {
-        const num = (route.route_sys_number ?? "").trim();
-        if (!num) continue;
-        const cityId = carrierCityMap.get(route.carrier_id) ?? 0;
-        const key = `${num}|${route.route_direction}|${cityId}`;
-        directionKey.set(key, (directionKey.get(key) ?? 0) + 1);
-      }
-      for (const [key, count] of directionKey) {
-        if (count > 1) {
-          const [num, dir] = key.split("|");
-          const dirLabel = dir === "true" ? "прямой" : "обратный";
-          duplicateMessages.push(
-            `Дублируется маршрут №${num} (${dirLabel})`
-          );
-        }
-      }
-
-      const cityPerNumber = new Map<string, Set<number>>();
-      for (const route of routes) {
-        const num = (route.route_sys_number ?? "").trim();
-        if (!num) continue;
-        const cityId = carrierCityMap.get(route.carrier_id) ?? 0;
-        if (!cityPerNumber.has(num)) {
-          cityPerNumber.set(num, new Set());
-        }
-        cityPerNumber.get(num)!.add(cityId);
-      }
-      for (const [num, cities] of cityPerNumber) {
-        if (cities.size > 1) {
-          duplicateMessages.push(
-            `Маршрут №${num} присутствует в нескольких городах`
-          );
-        }
-      }
-
-      if (duplicateMessages.length > 0) {
-        setDuplicateRouteNumbers(duplicateMessages);
-        setDuplicateWarningOpen(true);
-      } else {
-        await startExport();
-      }
-    } catch {
-      await startExport();
-    }
-  };
-
-  return (
-    <div className="w-full h-[400px] flex justify-center items-center">
-      <div className="w-full h-full p-3 flex flex-col gap-10">
-        <div className="flex justify-between items-center">
-          <button
-            className="flex items-center gap-2"
-            onClick={() => navigate(-1)}
-          >
-            <ArrowLeft size={20} />
-            Назад
-          </button>
-        </div>
-        <h1 className="text-2xl font-bold">Создание экспорта медиа</h1>
-        <div className="flex flex-col gap-10 w-full items-end">
-          <TextField
-            className="w-full"
-            label="Название"
-            required
-            value={name}
-            error={!!nameError}
-            helperText={nameError ?? " "}
-            onChange={(e) => {
-              const val = e.target.value;
-              setName(val);
-              const trimmed = val.trim();
-              const hasFullFormat = trimmed.includes("_") && trimmed.split("_").slice(1).join("_").length > 0;
-              if (hasFullFormat && !exportNameRegex.test(trimmed)) {
-                setNameError("Название должно начинаться с названия существующего города");
-              } else {
-                setNameError(null);
-              }
             }}
-          />
+            disabled={isLoading || !name.trim()}
-
-          <Button
-            variant="contained"
-            color="primary"
-            className="w-min flex gap-2 items-center"
-            startIcon={<Save size={20} />}
-            onClick={handleSave}
-            disabled={isLoading || !exportNameRegex.test(name.trim())}
           >
             {isLoading ? (
               <div className="flex items-center gap-2">
@@ -209,45 +87,6 @@ export const SnapshotCreatePage = observer(() => {
           </Button>
         </div>
       </div>
-
-      <Dialog
-        open={duplicateWarningOpen}
-        onClose={() => !isLoading && setDuplicateWarningOpen(false)}
-        maxWidth="sm"
-        fullWidth
-      >
-        <DialogTitle>Найдены повторяющиеся маршруты</DialogTitle>
-        <DialogContent>
-          <p className="mb-3">
-            Обнаружены маршруты с одинаковыми номерами трассы. Это может привести к
-            некорректным данным в экспорте.
-          </p>
-          <ul className="list-disc pl-5">
-            {duplicateRouteNumbers.map((msg, i) => (
-              <li key={i}>{msg}</li>
-            ))}
-          </ul>
-        </DialogContent>
-        <DialogActions>
-          <Button
-            onClick={() => setDuplicateWarningOpen(false)}
-            disabled={isLoading}
-          >
-            Отмена
-          </Button>
-          <Button
-            variant="contained"
-            sx={{ backgroundColor: "#795548", "&:hover": { backgroundColor: "#5D4037" } }}
-            disabled={isLoading}
-            onClick={async () => {
-              setDuplicateWarningOpen(false);
-              await startExport();
-            }}
-          >
-            Продолжить экспорт
-          </Button>
-        </DialogActions>
-      </Dialog>
     </div>
   );
 });

src/pages/Snapshot/SnapshotListPage/index.tsx

@@ -1,24 +1,14 @@
 import { DataGrid, GridColDef, GridRenderCellParams } from "@mui/x-data-grid";
 import { ruRU } from "@mui/x-data-grid/locales";
-import { authStore, languageStore, snapshotStore, cityStore, vehicleStore, SearchInput } from "@shared";
+import { authStore, languageStore, snapshotStore, SearchInput } from "@shared";
 import { useEffect, useState, useMemo } from "react";
 import { observer } from "mobx-react-lite";
 import { DatabaseBackup, Trash2 } from "lucide-react";
 import { CreateButton, DeleteModal, SnapshotRestore } from "@widgets";
-import { Alert, Box, Button, CircularProgress, Dialog, DialogActions, DialogContent, DialogTitle, TextField, Typography } from "@mui/material";
+import { Alert, Box, Button, CircularProgress, Dialog, DialogActions, DialogContent, DialogTitle, TextField } from "@mui/material";
 
 const LOW_STORAGE_THRESHOLD_GB = 10;
 
-function escapeRegex(s: string) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-function buildExportNameRegex(cityNames: string[]): RegExp {
-  if (!cityNames.length) return /.+/;
-  const pattern = cityNames.map(escapeRegex).join("|");
-  return new RegExp(`^(${pattern})_.+$`);
-}
-
 const SEGMENT_COLORS = [
   "#FF3B30",
   "#FF9500",
@@ -43,14 +33,11 @@ export const SnapshotListPage = observer(() => {
     createEmptySnapshot,
   } = snapshotStore;
   const canWriteDevices = authStore.canWrite("devices");
-  const canReadDevices = authStore.canRead("devices");
   const canCreateSnapshot =
     authStore.hasRole("snapshot_create") && canWriteDevices;
   const canManageSnapshots = authStore.canWrite("snapshot") && canWriteDevices;
 
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-  const [isSnapshotOnDeviceWarning, setIsSnapshotOnDeviceWarning] = useState(false);
-  const [devicesWithSnapshot, setDevicesWithSnapshot] = useState<string[]>([]);
   const [rowId, setRowId] = useState<string | null>(null);
   const { language } = languageStore;
   const [isRestoreModalOpen, setIsRestoreModalOpen] = useState(false);
@@ -58,12 +45,6 @@ export const SnapshotListPage = observer(() => {
   const [searchQuery, setSearchQuery] = useState("");
   const [isEmptySnapshotModalOpen, setIsEmptySnapshotModalOpen] = useState(false);
   const [emptySnapshotName, setEmptySnapshotName] = useState("");
-  const [emptySnapshotNameError, setEmptySnapshotNameError] = useState<string | null>(null);
-
-  const exportNameRegex = useMemo(() => {
-    const names = cityStore.cities["ru"].data.map((c) => c.name.trim());
-    return buildExportNameRegex(names);
-  }, [cityStore.cities["ru"].data.length]);
   const [isCreatingEmpty, setIsCreatingEmpty] = useState(false);
   const [paginationModel, setPaginationModel] = useState({
     page: 0,
@@ -80,11 +61,7 @@ export const SnapshotListPage = observer(() => {
   useEffect(() => {
     const fetchSnapshots = async () => {
       setIsLoading(true);
-      const promises: Promise<void>[] = [getSnapshots(), getStorageInfo()];
+      await Promise.all([getSnapshots(), getStorageInfo()]);
-      if (canReadDevices && !vehicleStore.vehicles.loaded) {
-        promises.push(vehicleStore.getVehicles());
-      }
-      await Promise.all(promises);
       setIsLoading(false);
     };
     fetchSnapshots();
@@ -99,26 +76,6 @@ export const SnapshotListPage = observer(() => {
   };
 
   const columns: GridColDef[] = [
-    {
-      field: "color",
-      headerName: "",
-      width: 28,
-      sortable: false,
-      disableColumnMenu: true,
-      renderCell: (params: GridRenderCellParams) => (
-        <div className="flex items-center justify-center h-full w-full">
-          <span
-            style={{
-              display: "inline-block",
-              width: 12,
-              height: 12,
-              backgroundColor: params.value,
-              borderRadius: "50%",
-            }}
-          />
-        </div>
-      ),
-    },
     {
       field: "name",
       headerName: "Название",
@@ -131,7 +88,7 @@ export const SnapshotListPage = observer(() => {
     },
     {
       field: "created_at",
-      headerName: "Дата создания (UTC+03:00, MSK)",
+      headerName: "Дата создания",
       flex: 1,
       renderCell: (params: GridRenderCellParams) => {
         return <div>{params.value ? params.value : "-"}</div>;
@@ -160,7 +117,6 @@ export const SnapshotListPage = observer(() => {
             renderCell: (params: GridRenderCellParams) => (
               <div className="flex h-full gap-7 justify-center items-center">
                 <button
-                  title="Восстановить"
                   onClick={() => {
                     setIsRestoreModalOpen(true);
                     setRowId(params.row.id);
@@ -169,22 +125,9 @@ export const SnapshotListPage = observer(() => {
                   <DatabaseBackup size={20} className="text-blue-500" />
                 </button>
                 <button
-                  title="Удалить"
                   onClick={() => {
-                    const snapshotId = params.row.id;
-                    if (canReadDevices) {
-                      const devicesUsing = vehicleStore.vehicles.data
-                        .filter(v => v.vehicle.current_snapshot_uuid === snapshotId)
-                        .map(v => v.vehicle.tail_number || v.vehicle.uuid || `ID ${v.vehicle.id}`);
-                      if (devicesUsing.length > 0) {
-                        setDevicesWithSnapshot(devicesUsing);
-                        setIsSnapshotOnDeviceWarning(true);
-                        setRowId(snapshotId);
-                        return;
-                      }
-                    }
                     setIsDeleteModalOpen(true);
-                    setRowId(snapshotId);
+                    setRowId(params.row.id);
                   }}
                 >
                   <Trash2 size={20} className="text-red-500" />
@@ -207,13 +150,12 @@ export const SnapshotListPage = observer(() => {
             .toLowerCase()
             .includes(query),
       )
-      .map((snapshot, index) => ({
+      .map((snapshot) => ({
         id: snapshot.ID,
         name: snapshot.Name,
         parent: snapshots.find((s) => s.ID === snapshot.ParentID)?.Name,
         created_at: formatCreationTime(snapshot.CreationTime),
         occupied_disk_space_gb: snapshot.occupied_disk_space_gb,
-        color: SEGMENT_COLORS[index % SEGMENT_COLORS.length],
       }));
   }, [snapshots, searchQuery]);
 
@@ -236,11 +178,10 @@ export const SnapshotListPage = observer(() => {
                 disabled={isLowStorage}
                 onClick={() => {
                   setEmptySnapshotName("");
-                  setEmptySnapshotNameError(null);
                   setIsEmptySnapshotModalOpen(true);
                 }}
               >
-                Создать пустой экспорт
+                Создать пустой снапшот
               </Button>
             )}
             {canCreateSnapshot && (
@@ -262,7 +203,7 @@ export const SnapshotListPage = observer(() => {
             </div>
 
             <div className="flex w-full h-3 rounded-lg overflow-hidden bg-gray-100">
-              {rows.map((row) => {
+              {rows.map((row, i) => {
                 const pct =
                   row.occupied_disk_space_gb != null && totalGB > 0
                     ? (row.occupied_disk_space_gb / totalGB) * 100
@@ -273,7 +214,8 @@ export const SnapshotListPage = observer(() => {
                     key={row.id}
                     style={{
                       width: `${pct}%`,
-                      backgroundColor: row.color,
+                      backgroundColor:
+                        SEGMENT_COLORS[i % SEGMENT_COLORS.length],
                     }}
                     title={`${row.name}: ${row.occupied_disk_space_gb?.toFixed(1)} ГБ`}
                   />
@@ -291,7 +233,7 @@ export const SnapshotListPage = observer(() => {
             </div>
 
             <div className="flex flex-wrap gap-x-5 gap-y-1 mt-3">
-              {rows.map((row) => {
+              {rows.map((row, i) => {
                 if (row.occupied_disk_space_gb == null || row.occupied_disk_space_gb <= 0)
                   return null;
                 return (
@@ -301,7 +243,10 @@ export const SnapshotListPage = observer(() => {
                   >
                     <span
                       className="inline-block w-2.5 h-2.5 rounded-full"
-                      style={{ backgroundColor: row.color }}
+                      style={{
+                        backgroundColor:
+                          SEGMENT_COLORS[i % SEGMENT_COLORS.length],
+                      }}
                     />
                     {row.name}
                   </div>
@@ -335,9 +280,7 @@ export const SnapshotListPage = observer(() => {
           </Alert>
         )}
 
-        {(rows.length > 0 || searchQuery) && (
         <SearchInput value={searchQuery} onChange={setSearchQuery} />
-        )}
 
         <DataGrid
           rows={rows}
@@ -382,26 +325,14 @@ export const SnapshotListPage = observer(() => {
         fullWidth
         maxWidth="xs"
       >
-        <DialogTitle>Создать пустой экспорт</DialogTitle>
+        <DialogTitle>Создать пустой снапшот</DialogTitle>
         <DialogContent>
           <TextField
             autoFocus
             fullWidth
             label="Название"
             value={emptySnapshotName}
-            error={!!emptySnapshotNameError}
+            onChange={(e) => setEmptySnapshotName(e.target.value)}
-            helperText={emptySnapshotNameError ?? " "}
-            onChange={(e) => {
-              const val = e.target.value;
-              setEmptySnapshotName(val);
-              const trimmed = val.trim();
-              const hasFullFormat = trimmed.includes("_") && trimmed.split("_").slice(1).join("_").length > 0;
-              if (hasFullFormat && !exportNameRegex.test(trimmed)) {
-                setEmptySnapshotNameError("Название должно начинаться с названия существующего города");
-              } else {
-                setEmptySnapshotNameError(null);
-              }
-            }}
             margin="normal"
           />
         </DialogContent>
@@ -411,7 +342,7 @@ export const SnapshotListPage = observer(() => {
           </Button>
           <Button
             variant="contained"
-            disabled={!exportNameRegex.test(emptySnapshotName.trim()) || isCreatingEmpty}
+            disabled={!emptySnapshotName.trim() || isCreatingEmpty}
             onClick={async () => {
               setIsCreatingEmpty(true);
               try {
@@ -428,36 +359,6 @@ export const SnapshotListPage = observer(() => {
         </DialogActions>
       </Dialog>
 
-      <Dialog
-        open={isSnapshotOnDeviceWarning}
-        onClose={() => setIsSnapshotOnDeviceWarning(false)}
-        fullWidth
-        maxWidth="xs"
-      >
-        <DialogTitle>Удаление невозможно</DialogTitle>
-        <DialogContent>
-          <Alert severity="warning" sx={{ mt: 1 }}>
-            Этот экспорт загружен на устройства. Удалите или замените экспорт на
-            устройствах перед удалением.
-          </Alert>
-          <Box sx={{ mt: 2 }}>
-            <Typography variant="body2" fontWeight={600} gutterBottom>
-              Устройства:
-            </Typography>
-            {devicesWithSnapshot.map((name, i) => (
-              <Typography key={i} variant="body2">
-                • {name}
-              </Typography>
-            ))}
-          </Box>
-        </DialogContent>
-        <DialogActions>
-          <Button onClick={() => setIsSnapshotOnDeviceWarning(false)}>
-            Закрыть
-          </Button>
-        </DialogActions>
-      </Dialog>
-
       <SnapshotRestore
         open={isRestoreModalOpen}
         loading={isLoading}

src/pages/Station/StationCreatePage/index.tsx

@@ -19,7 +19,6 @@ import {
   mediaStore,
   isMediaIdEmpty,
   useSelectedCity,
-  selectedCityStore,
   SelectMediaDialog,
   UploadMediaDialog,
   PreviewMediaDialog,
@@ -33,12 +32,6 @@ import {
 
 export const StationCreatePage = observer(() => {
   const navigate = useNavigate();
-
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const [isLoading, setIsLoading] = useState(false);
   const { language } = languageStore;
   const {

src/pages/Station/StationEditPage/index.tsx

@@ -19,7 +19,6 @@ import {
   mediaStore,
   isMediaIdEmpty,
   LoadingSpinner,
-  selectedCityStore,
   SelectMediaDialog,
   PreviewMediaDialog,
   UploadMediaDialog,
@@ -35,12 +34,6 @@ import { LinkedSights } from "../LinkedSights";
 
 export const StationEditPage = observer(() => {
   const navigate = useNavigate();
-
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   const [isLoading, setIsLoading] = useState(false);
   const [isLoadingData, setIsLoadingData] = useState(true);
   const { language } = languageStore;

src/pages/Station/StationListPage/index.tsx

@@ -49,7 +49,7 @@ export const StationListPage = observer(() => {
       loadSightCounts(stationIds);
     };
     fetchStations();
-  }, [language, selectedCityStore.cityVersion]);
+  }, [language]);
 
   const columns: GridColDef[] = [
     {
@@ -86,13 +86,13 @@ export const StationListPage = observer(() => {
     },
     {
       field: "sightCount",
-      headerName: "Привязки",
+      headerName: "Достопримечательности",
       width: 180,
       align: "center" as const,
       headerAlign: "center" as const,
       sortable: true,
       renderHeader: (params) => (
-        <Tooltip title="Отображает количество привязок">
+        <Tooltip title="Количество привязанных достопримечательностей">
           <span>{params.colDef.headerName}</span>
         </Tooltip>
       ),
@@ -114,7 +114,7 @@ export const StationListPage = observer(() => {
       headerAlign: "center" as const,
       sortable: true,
       renderHeader: (params) => (
-        <Tooltip title="Отображает подтверждение добавленных пересадок">
+        <Tooltip title="Подтверждение добавленных пересадок">
           <span>{params.colDef.headerName}</span>
         </Tooltip>
       ),
@@ -141,7 +141,7 @@ export const StationListPage = observer(() => {
         return (
           <div className="flex h-full gap-7 justify-center items-center">
             {canWriteStations && (
-              <button title="Редактировать" onClick={() => navigate(`/station/${params.row.id}/edit`)}>
+              <button onClick={() => navigate(`/station/${params.row.id}/edit`)}>
                 <Pencil size={20} className="text-blue-500" />
               </button>
             )}
@@ -151,14 +151,13 @@ export const StationListPage = observer(() => {
                   setSelectedStationId(params.row.id);
                   setIsTransfersModalOpen(true);
                 }}
-                title="Управление пересадками"
+                title="Редактировать пересадки"
               >
                 <Route size={20} className="text-purple-500" />
               </button>
             )}
             {canWriteStations && (
               <button
-                title="Удалить"
                 onClick={() => {
                   setIsDeleteModalOpen(true);
                   setRowId(params.row.id);
@@ -175,12 +174,9 @@ export const StationListPage = observer(() => {
 
   const rows = useMemo(() => {
     const { selectedCityId } = selectedCityStore;
-    if (!selectedCityId) {
-      return [];
-    }
     const query = searchQuery.trim().toLowerCase();
     return stationLists[language].data
-      .filter((station: any) => station.city_id === selectedCityId)
+      .filter((station: any) => !selectedCityId || station.city_id === selectedCityId)
       .filter(
         (station: any) =>
           !query ||
@@ -206,10 +202,7 @@ export const StationListPage = observer(() => {
         <div className="flex justify-between items-center mb-10">
           <h1 className="text-2xl">Остановки</h1>
           {canWriteStations && (
-            <CreateButton
+            <CreateButton label="Создать остановку" path="/station/create" />
-              label="Создать остановку"
-              path="/station/create"
-            />
           )}
         </div>
 
@@ -225,9 +218,7 @@ export const StationListPage = observer(() => {
           </div>
         )}
 
-        {(rows.length > 0 || searchQuery) && (
         <SearchInput value={searchQuery} onChange={setSearchQuery} />
-        )}
 
         <DataGrid
           rows={rows}
@@ -286,13 +277,7 @@ export const StationListPage = observer(() => {
           slots={{
             noRowsOverlay: () => (
               <Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
-                {isLoading ? (
+                {isLoading ? <CircularProgress size={20} /> : "Нет остановок"}
-                  <CircularProgress size={20} />
-                ) : !selectedCityStore.selectedCityId ? (
-                  "Выберите город"
-                ) : (
-                  "Нет остановок"
-                )}
               </Box>
             ),
           }}

src/pages/User/UserCreatePage/index.tsx

@@ -1,11 +1,4 @@
-import {
+import { Button, Paper, TextField } from "@mui/material";
-  Button,
-  Paper,
-  TextField,
-  Typography,
-  Box,
-  Divider,
-} from "@mui/material";
 import { observer } from "mobx-react-lite";
 import { ArrowLeft, Loader2, Save } from "lucide-react";
 import { useNavigate } from "react-router-dom";
@@ -17,10 +10,9 @@ import {
   SelectMediaDialog,
   UploadMediaDialog,
   PreviewMediaDialog,
-  selectedCityStore,
 } from "@shared";
 import { useState, useEffect } from "react";
-import { ImageUploadCard, PermissionsTable, RolesHintTable, ROLE_RESOURCES } from "@widgets";
+import { ImageUploadCard } from "@widgets";
 
 export const UserCreatePage = observer(() => {
   const navigate = useNavigate();
@@ -34,38 +26,13 @@ export const UserCreatePage = observer(() => {
     "thumbnail" | "watermark_lu" | "watermark_rd" | "image" | null
   >(null);
 
-  const [localRoles, setLocalRoles] = useState<string[]>(
-    createUserData.roles ?? ["articles_ro", "articles_rw", "media_ro", "media_rw"]
-  );
-
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   useEffect(() => {
     mediaStore.getMedia();
   }, []);
 
-  useEffect(() => {
-    const allRw = ROLE_RESOURCES.every(({ key }) => localRoles.includes(`${key}_rw`));
-    const isAdmin = allRw && !localRoles.includes("devices_maintenance_rw");
-    if (isAdmin !== createUserData.is_admin) {
-      setCreateUserData(
-        createUserData.name || "",
-        createUserData.email || "",
-        createUserData.password || "",
-        isAdmin,
-        createUserData.icon
-      );
-    }
-  }, [localRoles]);
-
   const handleCreate = async () => {
     try {
       setIsLoading(true);
-      // Убеждаемся, что роли в сторе обновлены перед созданием
-      userStore.createUserData.roles = localRoles;
       await createUser();
       toast.success("Пользователь успешно создан");
       navigate("/user");
@@ -100,15 +67,18 @@ export const UserCreatePage = observer(() => {
     : selectedMedia?.id ?? createUserData.icon ?? null;
 
   return (
-    <Paper className="w-full p-6 flex flex-col gap-8">
+    <Paper className="w-full h-full p-3 flex flex-col gap-10">
-      <button className="flex items-center gap-2 self-start" onClick={() => navigate(-1)}>
+      <div className="flex items-center gap-4">
+        <button
+          className="flex items-center gap-2"
+          onClick={() => navigate(-1)}
+        >
           <ArrowLeft size={20} />
           Назад
         </button>
+      </div>
 
-      <section className="flex flex-col gap-6">
+      <div className="flex flex-col gap-10 w-full items-end">
-        <Typography variant="h6">Основные данные</Typography>
-
         <TextField
           fullWidth
           label="Имя"
@@ -146,7 +116,6 @@ export const UserCreatePage = observer(() => {
           label="Пароль"
           value={createUserData.password || ""}
           required
-          type="password"
           onChange={(e) =>
             setCreateUserData(
               createUserData.name || "",
@@ -158,7 +127,7 @@ export const UserCreatePage = observer(() => {
           }
         />
 
-        <div className="w-full flex flex-col gap-4 max-w-[300px]">
+        <div className="w-full flex flex-col gap-4 max-w-[300px] mx-auto">
           <ImageUploadCard
             title="Аватар"
             imageKey="thumbnail"
@@ -187,64 +156,14 @@ export const UserCreatePage = observer(() => {
             }}
           />
         </div>
-      </section>
-
-      <Divider />
-
-      <section className="flex flex-col gap-4">
-        <Typography variant="h6">Права доступа</Typography>
-
-        <Box sx={{ display: "flex", gap: 1 }}>
-          <Button
-            variant="outlined"
-            size="small"
-            onClick={() => {
-              setCreateUserData(
-                createUserData.name || "",
-                createUserData.email || "",
-                createUserData.password || "",
-                true,
-                createUserData.icon
-              );
-              const next: string[] = [];
-              for (const { key } of ROLE_RESOURCES) {
-                next.push(`${key}_rw`);
-              }
-              next.push("snapshot_create");
-              setLocalRoles(next);
-            }}
-          >
-            Полный доступ (admin)
-          </Button>
-          <Button
-            variant="outlined"
-            size="small"
-            onClick={() => {
-              setCreateUserData(
-                createUserData.name || "",
-                createUserData.email || "",
-                createUserData.password || "",
-                false,
-                createUserData.icon
-              );
-              setLocalRoles(["devices_ro", "vehicles_ro", "devices_maintenance_rw"]);
-            }}
-          >
-            Администратор ТО
-          </Button>
-        </Box>
-
-        <PermissionsTable localRoles={localRoles} setLocalRoles={setLocalRoles} />
-        <RolesHintTable />
-      </section>
 
         <Button
           variant="contained"
-        className="self-end w-min flex gap-2 items-center"
+          className="w-min flex gap-2 items-center"
           startIcon={<Save size={20} />}
           onClick={handleCreate}
           disabled={
-          isLoading || !createUserData.name || !createUserData.password || !createUserData.email
+            isLoading || !createUserData.name || !createUserData.password
           }
         >
           {isLoading ? (
@@ -253,6 +172,7 @@ export const UserCreatePage = observer(() => {
             "Создать"
           )}
         </Button>
+      </div>
 
       <SelectMediaDialog
         open={isSelectMediaOpen}

src/pages/User/UserEditPage/index.tsx

@@ -1,9 +1,18 @@
 import {
   Button,
+  FormControlLabel,
+  Checkbox,
   Paper,
   TextField,
   Box,
   Typography,
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableRow,
+  Radio,
+  RadioGroup,
   Divider,
 } from "@mui/material";
 import { observer } from "mobx-react-lite";
@@ -22,12 +31,45 @@ import {
   authStore,
   cityStore,
   MultiSelect,
-  selectedCityStore,
   type User,
   type UserCity,
 } from "@shared";
 import { useEffect, useState } from "react";
-import { ImageUploadCard, DeleteModal, PermissionsTable, RolesHintTable, ROLE_RESOURCES } from "@widgets";
+import { ImageUploadCard, DeleteModal } from "@widgets";
+
+const ROLE_RESOURCES = [
+  { key: "snapshot", label: "Экспорт" },
+  { key: "devices", label: "Устройства" },
+  { key: "vehicles", label: "Транспорт" },
+  { key: "users", label: "Пользователи" },
+  { key: "sights", label: "Достопримечательности" },
+  { key: "stations", label: "Остановки" },
+  { key: "routes", label: "Маршруты" },
+  { key: "countries", label: "Страны" },
+  { key: "cities", label: "Города" },
+  { key: "carriers", label: "Перевозчики" },
+] as const;
+
+type PermissionLevel = "none" | "ro" | "rw";
+
+function getPermissionLevel(roles: string[], resource: string): PermissionLevel {
+  if (roles.includes(`${resource}_rw`)) return "rw";
+  if (roles.includes(`${resource}_ro`)) return "ro";
+  return "none";
+}
+
+function applyPermissionChange(
+  roles: string[],
+  resource: string,
+  level: PermissionLevel,
+): string[] {
+  const filtered = roles.filter(
+    (r) => r !== `${resource}_ro` && r !== `${resource}_rw`,
+  );
+  if (level === "ro") return [...filtered, `${resource}_ro`];
+  if (level === "rw") return [...filtered, `${resource}_rw`];
+  return filtered;
+}
 
 export const UserEditPage = observer(() => {
   const navigate = useNavigate();
@@ -51,29 +93,10 @@ export const UserEditPage = observer(() => {
     "thumbnail" | "watermark_lu" | "watermark_rd" | "image" | null
   >(null);
 
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   useEffect(() => {
     languageStore.setLanguage("ru");
   }, []);
 
-  useEffect(() => {
-    const allRw = ROLE_RESOURCES.every(({ key }) => localRoles.includes(`${key}_rw`));
-    const isAdmin = allRw && !localRoles.includes("devices_maintenance_rw");
-    if (isAdmin !== editUserData.is_admin) {
-      setEditUserData(
-        editUserData.name || "",
-        editUserData.email || "",
-        editUserData.password || "",
-        isAdmin,
-        editUserData.icon || ""
-      );
-    }
-  }, [localRoles]);
-
   useEffect(() => {
     (async () => {
       if (id) {
@@ -288,36 +311,175 @@ export const UserEditPage = observer(() => {
       <section className="flex flex-col gap-4">
         <Typography variant="h6">Права доступа</Typography>
 
-        <Box sx={{ display: "flex", gap: 1 }}>
+        <FormControlLabel
-          <Button
+          control={
-            variant="outlined"
+            <Checkbox
-            size="small"
+              checked={localRoles.includes("admin")}
-            onClick={() => {
+              onChange={(e) => {
-              setEditUserData(editUserData.name || "", editUserData.email || "", editUserData.password || "", true, editUserData.icon || "");
+                if (e.target.checked) {
-              const next: string[] = [];
+                  setLocalRoles((prev) => {
+                    let next = prev.filter((r) => r !== "admin");
                     for (const { key } of ROLE_RESOURCES) {
+                      next = next.filter((r) => r !== `${key}_ro` && r !== `${key}_rw`);
                       next.push(`${key}_rw`);
                     }
+                    if (!next.includes("snapshot_create")) {
                       next.push("snapshot_create");
-              setLocalRoles(next);
+                    }
+                    if (!next.includes("devices_maintenance_rw")) {
+                      next.push("devices_maintenance_rw");
+                    }
+                    next.push("admin");
+                    return next;
+                  });
+                } else {
+                  setLocalRoles((prev) => prev.filter((r) => r !== "admin"));
+                }
               }}
-          >
+            />
-            Полный доступ (admin)
+          }
-          </Button>
+          label="Полный доступ (admin)"
-          <Button
+        />
-            variant="outlined"
-            size="small"
-            onClick={() => {
-              setEditUserData(editUserData.name || "", editUserData.email || "", editUserData.password || "", false, editUserData.icon || "");
-              setLocalRoles(["devices_ro", "vehicles_ro", "devices_maintenance_rw"]);
-            }}
-          >
-            Администратор ТО
-          </Button>
-        </Box>
 
-        <PermissionsTable localRoles={localRoles} setLocalRoles={setLocalRoles} />
+        <Box sx={{ border: "1px solid", borderColor: "divider", borderRadius: 1 }}>
-        <RolesHintTable />
+          <Table size="small">
+            <TableHead>
+              <TableRow sx={{ bgcolor: "action.hover" }}>
+                <TableCell sx={{ fontWeight: 600, width: 220 }}>Ресурс</TableCell>
+                <TableCell align="center" sx={{ fontWeight: 600 }}>Нет доступа</TableCell>
+                <TableCell align="center" sx={{ fontWeight: 600 }}>Чтение</TableCell>
+                <TableCell align="center" sx={{ fontWeight: 600 }}>Чтение/Запись</TableCell>
+                <TableCell align="center" sx={{ fontWeight: 600 }}>
+                  Доп. права
+                </TableCell>
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {ROLE_RESOURCES.map(({ key, label }) => {
+                const level = getPermissionLevel(localRoles, key);
+                const isSnapshotResource = key === "snapshot";
+
+                const handleChange = (val: string) => {
+                  setLocalRoles((prev) => {
+                    let updated = applyPermissionChange(prev, key, val as PermissionLevel);
+
+                    if (key === "devices") {
+                      updated = applyPermissionChange(
+                        updated,
+                        "vehicles",
+                        val as PermissionLevel,
+                      );
+                    }
+
+                    const allRw = ROLE_RESOURCES.every(({ key: k }) =>
+                      updated.includes(`${k}_rw`),
+                    );
+                    if (allRw && !updated.includes("admin")) {
+                      const next = [...updated];
+                      if (!next.includes("snapshot_create")) {
+                        next.push("snapshot_create");
+                      }
+                      next.push("admin");
+                      return next;
+                    }
+                    if (!allRw) {
+                      return updated.filter((r) => r !== "admin");
+                    }
+                    return updated;
+                  });
+                };
+
+                const isDevicesResource = key === "devices";
+
+                const handleSnapshotCreateChange = (checked: boolean) => {
+                  if (!isSnapshotResource) {
+                    return;
+                  }
+                  setLocalRoles((prev) => {
+                    const withoutSnapshotCreate = prev.filter(
+                      (role) => role !== "snapshot_create"
+                    );
+                    return checked
+                      ? [...withoutSnapshotCreate, "snapshot_create"]
+                      : withoutSnapshotCreate;
+                  });
+                };
+
+                const handleMaintenanceChange = (checked: boolean) => {
+                  setLocalRoles((prev) => {
+                    const without = prev.filter((r) => r !== "devices_maintenance_rw");
+                    return checked ? [...without, "devices_maintenance_rw"] : without;
+                  });
+                };
+
+                return (
+                  <TableRow key={key} hover>
+                    <TableCell>{label}</TableCell>
+                    <TableCell align="center" padding="checkbox">
+                      <RadioGroup
+                        row
+                        value={level}
+                        onChange={(e) => handleChange(e.target.value)}
+                        sx={{ justifyContent: "center", flexWrap: "nowrap" }}
+                      >
+                        <Radio value="none" size="small" />
+                      </RadioGroup>
+                    </TableCell>
+                    <TableCell align="center" padding="checkbox">
+                      {isSnapshotResource ? (
+                        <Typography variant="body2" color="text.secondary">
+                          -
+                        </Typography>
+                      ) : (
+                        <RadioGroup
+                          row
+                          value={level}
+                          onChange={(e) => handleChange(e.target.value)}
+                          sx={{ justifyContent: "center", flexWrap: "nowrap" }}
+                        >
+                          <Radio value="ro" size="small" />
+                        </RadioGroup>
+                      )}
+                    </TableCell>
+                    <TableCell align="center" padding="checkbox">
+                      <RadioGroup
+                        row
+                        value={level}
+                        onChange={(e) => handleChange(e.target.value)}
+                        sx={{ justifyContent: "center", flexWrap: "nowrap" }}
+                      >
+                        <Radio value="rw" size="small" />
+                      </RadioGroup>
+                    </TableCell>
+                    <TableCell align="center" padding="checkbox">
+                      {isSnapshotResource ? (
+                        <Checkbox
+                          checked={localRoles.includes("snapshot_create")}
+                          onChange={(e) =>
+                            handleSnapshotCreateChange(e.target.checked)
+                          }
+                          size="small"
+                          title="Разрешает создавать новые снапшоты"
+                        />
+                      ) : isDevicesResource ? (
+                        <Checkbox
+                          checked={localRoles.includes("devices_maintenance_rw")}
+                          onChange={(e) => handleMaintenanceChange(e.target.checked)}
+                          size="small"
+                          title="Разрешает переводить устройства в режим технического обслуживания"
+                        />
+                      ) : (
+                        <Typography variant="body2" color="text.secondary">
+                          -
+                        </Typography>
+                      )}
+                    </TableCell>
+                  </TableRow>
+                );
+              })}
+            </TableBody>
+          </Table>
+        </Box>
       </section>
 
       <Divider />

src/pages/User/UserListPage/index.tsx

@@ -92,11 +92,10 @@ export const UserListPage = observer(() => {
       sortable: false,
       renderCell: (params: GridRenderCellParams) => (
         <div className="flex h-full gap-7 justify-center items-center">
-          <button title="Редактировать" onClick={() => navigate(`/user/${params.row.id}/edit`)}>
+          <button onClick={() => navigate(`/user/${params.row.id}/edit`)}>
             <Pencil size={20} className="text-blue-500" />
           </button>
           <button
-            title="Удалить"
             onClick={() => {
               setIsDeleteModalOpen(true);
               setRowId(params.row.id);
@@ -147,9 +146,7 @@ export const UserListPage = observer(() => {
           </div>
         )}
 
-        {(rows.length > 0 || searchQuery) && (
         <SearchInput value={searchQuery} onChange={setSearchQuery} />
-        )}
 
         <DataGrid
           rows={rows}
@@ -157,11 +154,6 @@ export const UserListPage = observer(() => {
           checkboxSelection={canWriteUsers}
           disableRowSelectionExcludeModel
           disableRowSelectionOnClick
-          onRowDoubleClick={(params) => {
-            if (canWriteUsers) {
-              navigate(`/user/${params.row.id}/edit`);
-            }
-          }}
           loading={isLoading}
           paginationModel={paginationModel}
           onPaginationModelChange={setPaginationModel}

src/pages/Vehicle/VehicleCreatePage/index.tsx

@@ -12,8 +12,6 @@ import {
   VEHICLE_TYPES,
   carrierStore,
   languageStore,
-  cityStore,
-  selectedCityStore,
 } from "@shared";
 import { observer } from "mobx-react-lite";
 import { ArrowLeft, Save } from "lucide-react";
@@ -28,18 +26,11 @@ export const VehicleCreatePage = observer(() => {
   const [type, setType] = useState("");
   const [carrierId, setCarrierId] = useState<number | null>(null);
   const [model, setModel] = useState("");
-  const [cityId, setCityId] = useState<number | null>(selectedCityStore.selectedCityId);
   const [isLoading, setIsLoading] = useState(false);
   const { language } = languageStore;
 
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   useEffect(() => {
     carrierStore.getCarriers(language);
-    cityStore.getCities("ru");
   }, [language]);
 
   const handleCreate = async () => {
@@ -52,7 +43,6 @@ export const VehicleCreatePage = observer(() => {
           ?.full_name as string,
         carrierId!,
         model || undefined,
-        cityId ?? undefined,
       );
       toast.success("Транспорт успешно создан");
     } catch (error) {
@@ -83,11 +73,12 @@ export const VehicleCreatePage = observer(() => {
           onChange={(e) => setTailNumber(e.target.value)}
         />
 
-        <FormControl fullWidth required>
+        <FormControl fullWidth>
           <InputLabel>Тип</InputLabel>
           <Select
             value={type}
             label="Тип"
+            required
             onChange={(e) => setType(e.target.value)}
           >
             {VEHICLE_TYPES.map((type) => (
@@ -98,11 +89,12 @@ export const VehicleCreatePage = observer(() => {
           </Select>
         </FormControl>
 
-        <FormControl fullWidth required>
+        <FormControl fullWidth>
           <InputLabel>Перевозчик</InputLabel>
           <Select
             value={carrierId || ""}
             label="Перевозчик"
+            required
             onChange={(e) => setCarrierId(e.target.value as number)}
           >
             {carrierStore.carriers[language].data?.map((carrier) => (
@@ -121,27 +113,12 @@ export const VehicleCreatePage = observer(() => {
           placeholder="Произвольное название модели"
         />
 
-        <FormControl fullWidth required>
-          <InputLabel>Город</InputLabel>
-          <Select
-            value={cityId ?? ""}
-            label="Город"
-            onChange={(e) => setCityId(e.target.value ? Number(e.target.value) : null)}
-          >
-            {cityStore.cities.ru.data.map((city) => (
-              <MenuItem key={city.id} value={city.id}>
-                {city.name}
-              </MenuItem>
-            ))}
-          </Select>
-        </FormControl>
-
         <Button
           variant="contained"
           className="w-min flex gap-2 items-center"
           startIcon={<Save size={20} />}
           onClick={handleCreate}
-          disabled={isLoading || !tailNumber || !type || !carrierId || !cityId}
+          disabled={isLoading || !tailNumber || !type || !carrierId}
         >
           {isLoading ? (
             <Loader2 size={20} className="animate-spin" />

src/pages/Vehicle/VehicleEditPage/index.tsx

@@ -20,8 +20,6 @@ import {
   VEHICLE_TYPES,
   vehicleStore,
   LoadingSpinner,
-  cityStore,
-  selectedCityStore,
 } from "@shared";
 import { toast } from "react-toastify";
 
@@ -40,11 +38,6 @@ export const VehicleEditPage = observer(() => {
   const [isLoading, setIsLoading] = useState(false);
   const [isLoadingData, setIsLoadingData] = useState(true);
 
-  useEffect(() => {
-    selectedCityStore.setIsLocked(true);
-    return () => selectedCityStore.setIsLocked(false);
-  }, []);
-
   useEffect(() => {
     // Устанавливаем русский язык при загрузке страницы
     languageStore.setLanguage("ru");
@@ -61,7 +54,6 @@ export const VehicleEditPage = observer(() => {
       try {
         await getVehicle(Number(id));
         await getCarriers(language);
-        await cityStore.getCities("ru");
 
         setEditVehicleData({
           tail_number: vehicle[Number(id)]?.vehicle.tail_number ?? "",
@@ -71,7 +63,6 @@ export const VehicleEditPage = observer(() => {
           model: vehicle[Number(id)]?.vehicle.model ?? "",
           snapshot_update_blocked:
             vehicle[Number(id)]?.vehicle.snapshot_update_blocked ?? false,
-          city_id: vehicle[Number(id)]?.vehicle.city_id ?? selectedCityStore.selectedCityId ?? undefined,
         });
       } finally {
         setIsLoadingData(false);
@@ -134,11 +125,12 @@ export const VehicleEditPage = observer(() => {
           }
         />
 
-        <FormControl fullWidth required>
+        <FormControl fullWidth>
           <InputLabel>Тип</InputLabel>
           <Select
             value={editVehicleData.type}
             label="Тип"
+            required
             onChange={(e) =>
               setEditVehicleData({ ...editVehicleData, type: e.target.value })
             }
@@ -151,11 +143,12 @@ export const VehicleEditPage = observer(() => {
           </Select>
         </FormControl>
 
-        <FormControl fullWidth required>
+        <FormControl fullWidth>
           <InputLabel>Перевозчик</InputLabel>
           <Select
             value={editVehicleData.carrier_id}
             label="Перевозчик"
+            required
             onChange={(e) =>
               setEditVehicleData({
                 ...editVehicleData,
@@ -184,26 +177,6 @@ export const VehicleEditPage = observer(() => {
           placeholder="Произвольное название модели"
         />
 
-        <FormControl fullWidth required>
-          <InputLabel>Город</InputLabel>
-          <Select
-            value={editVehicleData.city_id ?? ""}
-            label="Город"
-            onChange={(e) =>
-              setEditVehicleData({
-                ...editVehicleData,
-                city_id: e.target.value ? Number(e.target.value) : undefined,
-              })
-            }
-          >
-            {cityStore.cities.ru.data.map((city) => (
-              <MenuItem key={city.id} value={city.id}>
-                {city.name}
-              </MenuItem>
-            ))}
-          </Select>
-        </FormControl>
-
         <FormControlLabel
           control={
             <Checkbox
@@ -229,8 +202,7 @@ export const VehicleEditPage = observer(() => {
             isLoading ||
             !editVehicleData.tail_number ||
             !editVehicleData.type ||
-            !editVehicleData.carrier_id ||
+            !editVehicleData.carrier_id
-            !editVehicleData.city_id
           }
         >
           {isLoading ? (

src/pages/Vehicle/VehicleListPage/index.tsx

@@ -1,6 +1,6 @@
 import { DataGrid, GridColDef, GridRenderCellParams } from "@mui/x-data-grid";
 import { ruRU } from "@mui/x-data-grid/locales";
-import { authStore, carrierStore, languageStore, vehicleStore, SearchInput, selectedCityStore, cityStore } from "@shared";
+import { authStore, carrierStore, languageStore, vehicleStore, SearchInput } from "@shared";
 import { useEffect, useState, useMemo } from "react";
 import { observer } from "mobx-react-lite";
 import { Eye, Pencil, Trash2, Minus } from "lucide-react";
@@ -11,7 +11,7 @@ import { Box, CircularProgress } from "@mui/material";
 
 export const VehicleListPage = observer(() => {
   const { vehicles, getVehicles, deleteVehicle } = vehicleStore;
-  const { getCarriers } = carrierStore;
+  const { carriers, getCarriers } = carrierStore;
   const navigate = useNavigate();
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
   const [isBulkDeleteModalOpen, setIsBulkDeleteModalOpen] = useState(false);
@@ -31,11 +31,10 @@ export const VehicleListPage = observer(() => {
       setIsLoading(true);
       await getVehicles();
       await getCarriers(language);
-      await cityStore.getCities("ru");
       setIsLoading(false);
     };
     fetchData();
-  }, [language, selectedCityStore.cityVersion]);
+  }, [language]);
 
   const columns: GridColDef[] = [
     {
@@ -115,16 +114,15 @@ export const VehicleListPage = observer(() => {
         return (
           <div className="flex h-full gap-7 justify-center items-center">
             {canWrite && (
-              <button title="Редактировать" onClick={() => navigate(`/vehicle/${params.row.id}/edit`)}>
+              <button onClick={() => navigate(`/vehicle/${params.row.id}/edit`)}>
                 <Pencil size={20} className="text-blue-500" />
               </button>
             )}
-            <button title="Просмотр" onClick={() => navigate(`/vehicle/${params.row.id}`)}>
+            <button onClick={() => navigate(`/vehicle/${params.row.id}`)}>
               <Eye size={20} className="text-green-500" />
             </button>
             {canWrite && (
               <button
-                title="Удалить"
                 onClick={() => {
                   setIsDeleteModalOpen(true);
                   setRowId(params.row.id);
@@ -139,13 +137,9 @@ export const VehicleListPage = observer(() => {
     },
   ];
 
-  const { selectedCityId } = selectedCityStore;
-
   const rows = useMemo(() => {
-    if (!selectedCityId) return [];
     const query = searchQuery.trim().toLowerCase();
     return (vehicles.data ?? [])
-      .filter((vehicle) => vehicle.vehicle.city_id === selectedCityId)
       .filter(
         (vehicle) =>
           !query ||
@@ -157,9 +151,11 @@ export const VehicleListPage = observer(() => {
         tail_number: vehicle.vehicle.tail_number,
         type: vehicle.vehicle.type,
         carrier: vehicle.vehicle.carrier,
-        city: cityStore.cities.ru.data.find((c) => c.id === vehicle.vehicle.city_id)?.name,
+        city: carriers[language].data?.find(
+          (carrier) => carrier.id === vehicle.vehicle.carrier_id
+        )?.city,
       }));
-  }, [vehicles.data, selectedCityId, searchQuery]);
+  }, [vehicles.data, carriers[language].data, searchQuery]);
 
   return (
     <>
@@ -173,9 +169,7 @@ export const VehicleListPage = observer(() => {
           />
         </div>
 
-        {(rows.length > 0 || searchQuery) && (
         <SearchInput value={searchQuery} onChange={setSearchQuery} />
-        )}
 
         {canWriteVehicles && ids.length > 0 && (
           <div className="flex justify-end mb-5 duration-300">
@@ -229,8 +223,6 @@ export const VehicleListPage = observer(() => {
               <Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
                 {isLoading ? (
                   <CircularProgress size={20} />
-                ) : !selectedCityId ? (
-                  "Выберите город"
                 ) : (
                   "Нет транспортных средств"
                 )}

src/shared/modals/PreviewMediaDialog/index.tsx

@@ -1,8 +1,4 @@
-import {
+import { mediaStore, MEDIA_TYPE_LABELS } from "@shared";
-  mediaStore,
-  MEDIA_TYPE_LABELS,
-  PreviewBackgroundToggle,
-} from "@shared";
 import { observer } from "mobx-react-lite";
 import { useEffect, useState } from "react";
 import {
@@ -33,8 +29,6 @@ export const PreviewMediaDialog = observer(
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState<string | null>(null);
     const [success, setSuccess] = useState(false);
-    const [isPreviewBackgroundDark, setIsPreviewBackgroundDark] =
-      useState(false);
     const media = mediaId
       ? mediaStore.media.find((m) => m.id === mediaId)
       : null;
@@ -46,7 +40,6 @@ export const PreviewMediaDialog = observer(
       if (media) {
         setMediaName(media.media_name);
         setMediaFilename(media.filename);
-        setIsPreviewBackgroundDark(false);
       }
     }, [media]);
 
@@ -148,19 +141,8 @@ export const PreviewMediaDialog = observer(
                     display: "flex",
                     alignItems: "center",
                     justifyContent: "center",
-                    position: "relative",
-                    backgroundColor: isPreviewBackgroundDark ? "#000" : "#fff",
-                    transition: "background-color 150ms ease",
                   }}
                 >
-                  {[1, 3, 4, 5].includes(media.media_type) && (
-                    <PreviewBackgroundToggle
-                      dark={isPreviewBackgroundDark}
-                      onToggle={() =>
-                        setIsPreviewBackgroundDark((value) => !value)
-                      }
-                    />
-                  )}
                   <MediaViewer
                     media={{
                       id: mediaId,

src/shared/modals/UploadMediaDialog/index.tsx

@@ -6,7 +6,6 @@ import {
   clearBlobAndGLTFCache,
   authStore,
   snapshotStore,
-  PreviewBackgroundToggle,
 } from "@shared";
 import { observer } from "mobx-react-lite";
 import { useEffect, useState, useRef } from "react";
@@ -91,8 +90,6 @@ export const UploadMediaDialog = observer(
       []
     );
     const [isPreviewLoaded, setIsPreviewLoaded] = useState(false);
-    const [isPreviewBackgroundDark, setIsPreviewBackgroundDark] =
-      useState(false);
     const previousMediaUrlRef = useRef<string | null>(null);
 
     useEffect(() => {
@@ -106,26 +103,8 @@ export const UploadMediaDialog = observer(
 
         setMediaFile(initialFile);
         setMediaFilename(initialFile.name);
-
-        const extension = initialFile.name.split(".").pop()?.toLowerCase();
-        if (extension) {
-          if (["glb", "gltf"].includes(extension)) {
-            setAvailableMediaTypes([6]);
-            setMediaType(6);
-          }
-          if (
-            ["jpg", "jpeg", "png", "gif", "svg", "webp", "bmp"].includes(
-              extension
-            )
-          ) {
-            setAvailableMediaTypes([1, 3, 4, 5]);
-            setMediaType(1);
-          } else if (["mp4", "webm", "mov"].includes(extension)) {
         setAvailableMediaTypes([2]);
         setMediaType(2);
-          }
-        }
-
         const newBlobUrl = URL.createObjectURL(initialFile);
         setMediaUrl(newBlobUrl);
         previousMediaUrlRef.current = newBlobUrl;
@@ -350,7 +329,6 @@ export const UploadMediaDialog = observer(
       setMediaUrl(null);
       setMediaFile(null);
       setIsPreviewLoaded(false);
-      setIsPreviewBackgroundDark(false);
       previousMediaUrlRef.current = null;
       onClose();
     };
@@ -420,18 +398,8 @@ export const UploadMediaDialog = observer(
                     justifyContent: "center",
                     height: "100%",
                     position: "relative",
-                    backgroundColor: isPreviewBackgroundDark ? "#000" : "#fff",
-                    transition: "background-color 150ms ease",
                   }}
                 >
-                  {mediaUrl && mediaType !== 2 && mediaType !== 6 && (
-                    <PreviewBackgroundToggle
-                      dark={isPreviewBackgroundDark}
-                      onToggle={() =>
-                        setIsPreviewBackgroundDark((value) => !value)
-                      }
-                    />
-                  )}
                   {!isPreviewLoaded && mediaUrl && (
                     <Box
                       sx={{

src/shared/store/CarrierStore/index.tsx

@@ -12,13 +12,13 @@ export type Carrier = {
   id: number;
   short_name: string;
   full_name: string;
+  slogan: string;
   city: string;
   city_id: number;
-  preview_media?: string;
+  logo: string;
-  video_preview?: string;
+  // main_color: string;
-  main_color: string;
+  // left_color: string;
-  left_color: string;
+  // right_color: string;
-  right_color: string;
 };
 
 type CarrierData = {
@@ -111,48 +111,38 @@ class CarrierStore {
 
   createCarrierData = {
     city_id: 0,
-    preview_media: "",
+    logo: "",
-    video_preview: "",
-    main_color: "",
-    left_color: "",
-    right_color: "",
     ru: {
       full_name: "",
       short_name: "",
+      slogan: "",
     },
     en: {
       full_name: "",
       short_name: "",
+      slogan: "",
     },
     zh: {
       full_name: "",
       short_name: "",
+      slogan: "",
     },
   };
 
-  setCreateCarrierMedia = (
-    field: "preview_media" | "video_preview",
-    mediaId: string
-  ) => {
-    this.createCarrierData[field] = mediaId;
-  };
-
   setCreateCarrierData = (
     fullName: string,
     shortName: string,
     cityId: number,
-    language: Language,
+    slogan: string,
-    colors?: { main_color?: string; left_color?: string; right_color?: string }
+    logoId: string,
+    language: Language
   ) => {
     this.createCarrierData.city_id = cityId;
-    if (colors) {
+    this.createCarrierData.logo = logoId;
-      if (colors.main_color !== undefined) this.createCarrierData.main_color = colors.main_color;
-      if (colors.left_color !== undefined) this.createCarrierData.left_color = colors.left_color;
-      if (colors.right_color !== undefined) this.createCarrierData.right_color = colors.right_color;
-    }
     this.createCarrierData[language] = {
       full_name: fullName,
       short_name: shortName,
+      slogan: slogan,
     };
   };
 
@@ -207,15 +197,10 @@ class CarrierStore {
       short_name: (this.createCarrierData[language].short_name || "").trim(),
       city: cityName,
       city_id: this.createCarrierData.city_id,
-      ...(this.createCarrierData.preview_media
+      slogan: (this.createCarrierData[language].slogan || "").trim(),
-        ? { preview_media: this.createCarrierData.preview_media }
+      ...(this.createCarrierData.logo
+        ? { logo: this.createCarrierData.logo }
         : {}),
-      ...(this.createCarrierData.video_preview
-        ? { video_preview: this.createCarrierData.video_preview }
-        : {}),
-      ...(this.createCarrierData.main_color ? { main_color: this.createCarrierData.main_color } : {}),
-      ...(this.createCarrierData.left_color ? { left_color: this.createCarrierData.left_color } : {}),
-      ...(this.createCarrierData.right_color ? { right_color: this.createCarrierData.right_color } : {}),
     };
 
     const response = await languageInstance(language).post("/carrier", payload);
@@ -226,55 +211,52 @@ class CarrierStore {
       this.carriers[language].data.push(response.data);
     });
 
-    for (const lang of (["ru", "en", "zh"] as const).filter(
+    for (const lang of ["ru", "en", "zh"].filter((l) => l !== language)) {
-      (item) => item !== language
-    )) {
       const cityNameForLang = this.resolveCityName(
         this.createCarrierData.city_id,
-        lang
+        lang as Language
       );
-      const localizedData = this.createCarrierData[lang];
       const patchPayload = {
-        full_name: (localizedData.full_name || "").trim(),
+        // @ts-ignore
-        short_name: (localizedData.short_name || "").trim(),
+        full_name: ((this.createCarrierData[lang as any].full_name as string) || "").trim(),
+        // @ts-ignore
+        short_name: ((this.createCarrierData[lang as any].short_name as string) || "").trim(),
         city: cityNameForLang || cityName,
         city_id: this.createCarrierData.city_id,
-        ...(this.createCarrierData.preview_media
+        // @ts-ignore
-          ? { preview_media: this.createCarrierData.preview_media }
+        slogan: ((this.createCarrierData[lang as any].slogan as string) || "").trim(),
-          : {}),
+        ...(this.createCarrierData.logo
-        ...(this.createCarrierData.video_preview
+          ? { logo: this.createCarrierData.logo }
-          ? { video_preview: this.createCarrierData.video_preview }
           : {}),
       };
 
-      const response = await languageInstance(lang).patch(
+      const response = await languageInstance(lang as Language).patch(
         `/carrier/${carrierId}`,
         patchPayload
       );
 
       runInAction(() => {
-        this.carriers[lang].data.push(response.data);
+        this.carriers[lang as keyof Carriers].data.push(response.data);
       });
     }
 
     this.createCarrierData = {
       city_id: 0,
-      preview_media: "",
+      logo: "",
-      video_preview: "",
-      main_color: "",
-      left_color: "",
-      right_color: "",
       ru: {
         full_name: "",
         short_name: "",
+        slogan: "",
       },
       en: {
         full_name: "",
         short_name: "",
+        slogan: "",
       },
       zh: {
         full_name: "",
         short_name: "",
+        slogan: "",
       },
     };
   };
@@ -283,46 +265,54 @@ class CarrierStore {
     ru: {
       full_name: "",
       short_name: "",
+
+      // main_color: "",
+      // left_color: "",
+      // right_color: "",
+      slogan: "",
     },
     en: {
       full_name: "",
       short_name: "",
+
+      // main_color: "",
+      // left_color: "",
+      // right_color: "",
+      slogan: "",
     },
+    city_id: 0,
+    logo: "",
     zh: {
       full_name: "",
       short_name: "",
-    },
-    city_id: 0,
-    preview_media: "",
-    video_preview: "",
-    main_color: "",
-    left_color: "",
-    right_color: "",
-  };
 
-  setEditCarrierMedia = (
+      // main_color: "",
-    field: "preview_media" | "video_preview",
+      // left_color: "",
-    mediaId: string
+      // right_color: "",
-  ) => {
+      slogan: "",
-    this.editCarrierData[field] = mediaId;
+    },
   };
 
   setEditCarrierData = (
     fullName: string,
     shortName: string,
     cityId: number,
-    language: Language,
+    // main_color: string,
-    colors?: { main_color?: string; left_color?: string; right_color?: string }
+    // left_color: string,
+    // right_color: string,
+    slogan: string,
+    logoId: string,
+    language: Language
   ) => {
     this.editCarrierData.city_id = cityId;
-    if (colors) {
+    this.editCarrierData.logo = logoId;
-      if (colors.main_color !== undefined) this.editCarrierData.main_color = colors.main_color;
-      if (colors.left_color !== undefined) this.editCarrierData.left_color = colors.left_color;
-      if (colors.right_color !== undefined) this.editCarrierData.right_color = colors.right_color;
-    }
     this.editCarrierData[language] = {
       full_name: fullName,
       short_name: shortName,
+      // main_color: main_color,
+      // left_color: left_color,
+      // right_color: right_color,
+      slogan: slogan,
     };
   };
 
@@ -333,13 +323,12 @@ class CarrierStore {
         ...this.editCarrierData[lang],
         full_name: (this.editCarrierData[lang].full_name || "").trim(),
         short_name: (this.editCarrierData[lang].short_name || "").trim(),
+        slogan: (this.editCarrierData[lang].slogan || "").trim(),
         city: cityName,
         city_id: this.editCarrierData.city_id,
-        preview_media: this.editCarrierData.preview_media || null,
+        ...(this.editCarrierData.logo
-        video_preview: this.editCarrierData.video_preview || null,
+          ? { logo: this.editCarrierData.logo }
-        ...(this.editCarrierData.main_color ? { main_color: this.editCarrierData.main_color } : {}),
+          : {}),
-        ...(this.editCarrierData.left_color ? { left_color: this.editCarrierData.left_color } : {}),
-        ...(this.editCarrierData.right_color ? { right_color: this.editCarrierData.right_color } : {}),
       });
 
       runInAction(() => {

src/shared/store/RouteStore/index.ts

@@ -13,7 +13,6 @@ export type Route = {
   center_latitude: number;
   center_longitude: number;
   governor_appeal: number;
-  button_text?: string;
   id: number;
   icon: string;
   path: number[][];
@@ -144,7 +143,6 @@ class RouteStore {
     center_latitude: "",
     center_longitude: "",
     governor_appeal: 0,
-    button_text: "" as string | undefined,
     id: 0,
     icon: "",
     path: [] as number[][],
@@ -155,7 +153,7 @@ class RouteStore {
     scale_max: 0,
     scale_min: 0,
     video_preview: "" as string | undefined,
-    video_timer: 420,
+    video_timer: 60,
   };
 
   setEditRouteData = (data: any) => {

src/shared/store/SelectedCityStore/index.ts

@@ -3,8 +3,6 @@ import { City } from "../CityStore";
 
 class SelectedCityStore {
   selectedCity: City | null = null;
-  isLocked: boolean = false;
-  cityVersion: number = 0;
 
   constructor() {
     makeAutoObservable(this);
@@ -26,7 +24,6 @@ class SelectedCityStore {
   setSelectedCity = (city: City | null) => {
     runInAction(() => {
       this.selectedCity = city;
-      this.cityVersion += 1;
       if (city) {
         localStorage.setItem("selectedCity", JSON.stringify(city));
       } else {
@@ -35,12 +32,6 @@ class SelectedCityStore {
     });
   };
 
-  setIsLocked = (locked: boolean) => {
-    runInAction(() => {
-      this.isLocked = locked;
-    });
-  };
-
   clearSelectedCity = () => {
     this.setSelectedCity(null);
   };

src/shared/store/SnapshotStore/index.ts

@@ -60,6 +60,12 @@ class SnapshotStore {
       articlesStore.articleData = null;
       articlesStore.articleMedia = null;
 
+      countryStore.countries = {
+        ru: { data: [], loaded: false },
+        en: { data: [], loaded: false },
+        zh: { data: [], loaded: false },
+      };
+
       carrierStore.carriers = {
         ru: { data: [], loaded: false },
         en: { data: [], loaded: false },

src/shared/store/VehicleStore/index.ts

@@ -1,7 +1,7 @@
 import { authInstance, languageInstance, mobxFetch } from "@shared";
 import { makeAutoObservable, runInAction } from "mobx";
 import { getVehicleSessionsApi } from "./api";
-import { Vehicle, VehicleMaintenanceSession, SetMaintenanceModeResponse } from "./types";
+import { Vehicle, VehicleMaintenanceSession } from "./types";
 
 export type { Vehicle, VehicleMaintenanceSession } from "./types";
 
@@ -120,7 +120,6 @@ class VehicleStore {
     carrier: string,
     carrierId: number,
     model?: string,
-    cityId?: number,
   ) => {
     const payload: Record<string, unknown> = {
       tail_number: tailNumber.trim(),
@@ -130,7 +129,6 @@ class VehicleStore {
     };
     // TODO: когда будет бекенд — добавить model в payload и в ответ
     if (model != null && model !== "") payload.model = model;
-    if (cityId != null) payload.city_id = cityId;
     const response = await languageInstance("ru").post("/vehicle", payload);
     const normalizedVehicle = this.normalizeVehicleItem(response.data);
 
@@ -149,7 +147,6 @@ class VehicleStore {
     carrier_id: number;
     model: string;
     snapshot_update_blocked: boolean;
-    city_id?: number;
   } = {
     tail_number: "",
     type: 0,
@@ -157,7 +154,6 @@ class VehicleStore {
     carrier_id: 0,
     model: "",
     snapshot_update_blocked: false,
-    city_id: undefined,
   };
 
   setEditVehicleData = (data: {
@@ -167,7 +163,6 @@ class VehicleStore {
     carrier_id: number;
     model?: string;
     snapshot_update_blocked?: boolean;
-    city_id?: number;
   }) => {
     this.editVehicleData = {
       ...this.editVehicleData,
@@ -184,7 +179,6 @@ class VehicleStore {
       carrier_id: number;
       model?: string;
       snapshot_update_blocked?: boolean;
-      city_id?: number;
     },
   ) => {
     const payload: Record<string, unknown> = {
@@ -196,7 +190,6 @@ class VehicleStore {
     if (data.model != null && data.model !== "") payload.model = data.model;
     if (data.snapshot_update_blocked != null)
       payload.snapshot_update_blocked = data.snapshot_update_blocked;
-    if (data.city_id != null) payload.city_id = data.city_id;
     const response = await languageInstance("ru").patch(
       `/vehicle/${id}`,
       payload,
@@ -218,32 +211,23 @@ class VehicleStore {
     });
   };
 
-  setMaintenanceMode = async (
+  setMaintenanceMode = async (uuid: string, enabled: boolean) => {
-    uuid: string,
+    const response = await authInstance.post(
-    enabled: boolean,
-    durationSeconds?: number,
-  ): Promise<SetMaintenanceModeResponse> => {
-    const response = await authInstance.post<SetMaintenanceModeResponse>(
       `/devices/${uuid}/maintenance-mode`,
       {
         enabled,
-        ...(enabled && durationSeconds !== undefined
-          ? { duration_seconds: durationSeconds }
-          : {}),
       },
     );
-    if (!response.data.saved) {
+    const normalizedVehicle = this.normalizeVehicleItem(response.data);
-      throw new Error("Maintenance mode was not saved");
-    }
 
     runInAction(() => {
       this.mergeVehicleInCaches({
+        ...normalizedVehicle.vehicle,
         uuid,
-        maintenance_mode_on: response.data.enabled,
+        maintenance_mode_on:
-        maintenance_mode_duration_seconds: response.data.duration_seconds,
+          normalizedVehicle.vehicle.maintenance_mode_on ?? enabled,
       });
     });
-    return response.data;
   };
 
   setDemoMode = async (uuid: string, enabled: boolean) => {

src/shared/store/VehicleStore/types.ts

@@ -11,7 +11,6 @@ export type Vehicle = {
     snapshot_update_blocked?: boolean;
     demo_mode_enabled?: boolean;
     maintenance_mode_on?: boolean;
-    maintenance_mode_duration_seconds?: number;
     city_id?: number;
   };
   device_status?: {
@@ -22,24 +21,13 @@ export type Vehicle = {
     last_update: string;
     is_connected: boolean;
     current_route_id?: number;
-    maintenance_mode_on?: boolean;
-    maintenance_mode_duration_seconds?: number;
   };
 };
 
 export type VehicleMaintenanceSession = {
-  duration_seconds?: number | null;
+  duration_seconds: number;
-  ended_at?: string | null;
+  ended_at: string;
   id: number;
   started_at: string;
   vehicle_id: number;
 };
-
-export type SetMaintenanceModeResponse = {
-  message: string;
-  enabled: boolean;
-  duration_seconds: number;
-  saved: boolean;
-  sent: boolean;
-  warning?: string;
-};

src/shared/ui/PreviewBackgroundToggle/index.tsx

@@ -1,40 +0,0 @@
-import { IconButton, Tooltip } from "@mui/material";
-import { Contrast } from "lucide-react";
-
-interface PreviewBackgroundToggleProps {
-  dark: boolean;
-  onToggle: () => void;
-}
-
-export const PreviewBackgroundToggle = ({
-  dark,
-  onToggle,
-}: PreviewBackgroundToggleProps) => (
-  <Tooltip title={dark ? "Сделать фон белым" : "Сделать фон чёрным"}>
-    <IconButton
-      size="small"
-      aria-label={dark ? "Сделать фон белым" : "Сделать фон чёрным"}
-      onClick={(event) => {
-        event.stopPropagation();
-        onToggle();
-      }}
-      sx={{
-        position: "absolute",
-        top: 8,
-        left: 8,
-        zIndex: 2,
-        color: dark ? "#fff" : "#000",
-        backgroundColor: dark
-          ? "rgba(255, 255, 255, 0.16)"
-          : "rgba(255, 255, 255, 0.8)",
-        "&:hover": {
-          backgroundColor: dark
-            ? "rgba(255, 255, 255, 0.28)"
-            : "rgba(255, 255, 255, 1)",
-        },
-      }}
-    >
-      <Contrast size={18} />
-    </IconButton>
-  </Tooltip>
-);

src/shared/ui/index.ts

@@ -6,4 +6,3 @@ export * from "./AnimatedCircleButton";
 export * from "./LoadingSpinner";
 export * from "./MultiSelect";
 export * from "./SearchInput";
-export * from "./PreviewBackgroundToggle";