sync demo layout with client 1.0.8

feat: webgl preview improvements, permissions refactor and snapshot safeguards
feat: add markdown, lang atribute, button_text
2026-08-08 09:20:24 +03:00 · 2026-06-14 23:13:51 +03:00 · 2026-05-25 12:46:53 +03:00 · 2026-05-23 13:42:11 +03:00 · 2026-05-23 10:34:12 +03:00 · 2026-05-23 10:30:36 +03:00
122 changed files with 3809 additions and 4422 deletions
--- a/.env
+++ b/.env
@@ -1,8 +1,8 @@
-# VITE_API_URL='https://wn.st.unprism.ru'
-# VITE_REACT_APP ='https://wn.st.unprism.ru/'
-# VITE_KRBL_MEDIA='https://wn.st.unprism.ru/media/'
-# VITE_NEED_AUTH='true'
-VITE_API_URL='https://wn.krbl.ru'
-VITE_REACT_APP ='https://wn.krbl.ru/'
-VITE_KRBL_MEDIA='https://wn.krbl.ru/media/'
+VITE_API_URL='https://wn.st.unprism.ru'
+VITE_REACT_APP ='https://wn.st.unprism.ru/'
+VITE_KRBL_MEDIA='https://wn.st.unprism.ru/media/'
 VITE_NEED_AUTH='true'
+# VITE_API_URL='https://wn.krbl.ru'
+# VITE_REACT_APP ='https://wn.krbl.ru/'
+# VITE_KRBL_MEDIA='https://wn.krbl.ru/media/'
+# VITE_NEED_AUTH='true'
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,7 @@
 # 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*
@@ -17,23 +10,11 @@ lerna-debug.log*
 node_modules
 dist
 dist-ssr
-<<<<<<< HEAD
-\*.local
-
-# Editor directories and files
-
-.vscode/_
-!.vscode/extensions.json
-.idea
-.DS_Store
-_.suo
-_.ntvs_
-_.njsproj
-_.sln
-\*.sw?
-=======
 *.local

+# Build artifacts
+*.tsbuildinfo
+
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json
@@ -44,4 +25,3 @@ _.sln
 *.njsproj
 *.sln
 *.sw?
->>>>>>> 6b9aa78 (init: Init React Application)
--- a/Subtract.svg
+++ b/Subtract.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="21" viewBox="0 0 24 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.3888 2.85031C11.7638 2.66434 12.1989 2.66434 12.5739 2.85031L21.0037 7.06792C21.4462 7.29108 21.7245 7.73709 21.7245 8.22802V20.145H21.7464C21.7462 20.6134 21.3641 20.9999 20.8843 21H15.7689C15.3788 21 15.0562 20.6874 15.0562 20.2932V13.807C15.0562 12.1333 13.6909 10.7792 12.0033 10.7792C10.3159 10.7794 8.95116 12.1334 8.95115 13.807V20.2932C8.95115 20.68 8.63599 21 8.23847 21H3.10101C2.62861 21 2.23837 20.6209 2.23818 20.145V8.22802C2.23819 7.73714 2.51576 7.2911 2.95818 7.06792L11.3888 2.85031Z" fill="white"/>
+<path d="M10.7962 0.268599C11.5012 -0.088374 12.3413 -0.0882526 13.0463 0.261335L23.6142 5.54243C23.9592 5.71352 24.1018 6.1379 23.9218 6.48751C23.7943 6.73297 23.5464 6.87397 23.2839 6.87397C23.179 6.87392 23.0663 6.85189 22.9689 6.79987L12.401 1.51877C12.101 1.37 11.7408 1.37 11.4408 1.51877L1.03036 6.79261C0.677932 6.97088 0.250655 6.82952 0.0781632 6.48751C-0.101845 6.14534 0.0407786 5.72096 0.385795 5.54243L10.7962 0.268599Z" fill="white"/>
+</svg>
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "white-nights",
-  "version": "1.0.6",
+  "version": "1.0.8",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "white-nights",
-      "version": "1.0.6",
+      "version": "1.0.8",
      "license": "UNLICENSED",
      "dependencies": {
        "@emotion/react": "^11.14.0",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "white-nights",
  "private": true,
-  "version": "1.0.6",
+  "version": "1.0.8",
  "type": "module",
  "license": "UNLICENSED",
  "scripts": {
@@ -18,7 +18,6 @@
    "@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",
@@ -33,7 +32,6 @@
    "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",
--- a/src/app/index.tsx
+++ b/src/app/index.tsx
@@ -1,13 +1,19 @@
 import * as React from "react";

 import { Router } from "./router";
-import { CustomTheme } from "@shared";
+import { CustomTheme, languageStore } 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 = () => (
+export const App: React.FC = observer(() => {
+  React.useEffect(() => {
+    document.documentElement.lang = languageStore.language;
+  }, [languageStore.language]);
+
+  return (
    <GlobalErrorBoundary>
      <ThemeProvider theme={CustomTheme.Light}>
        <TestingModeBanner />
@@ -16,3 +22,4 @@ export const App: React.FC = () => (
      </ThemeProvider>
    </GlobalErrorBoundary>
  );
+});
--- a/src/app/router/index.tsx
+++ b/src/app/router/index.tsx
@@ -92,6 +92,9 @@ 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 />;
  }

--- a/src/client/src/api/ApiStore/store.ts
+++ b/src/client/src/api/ApiStore/store.ts
@@ -24,6 +24,54 @@ 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;
@@ -63,6 +111,7 @@ class ApiStore {
  simulationDirection: 1 | -1 = 1;
  simulationPaused = false;
  simulationInstantMove = false;
+  showHitboxes = false;

  constructor() {
    makeAutoObservable(this);
@@ -114,6 +163,10 @@ 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 () => {
@@ -191,6 +244,10 @@ class ApiStore {
    this.simulationInstantMove = !this.simulationInstantMove;
  };

+  toggleShowHitboxes = () => {
+    this.showHitboxes = !this.showHitboxes;
+  };
+
  startPositionSimulation = () => {
    if (this.positionInterval) return;

--- a/src/client/src/api/ApiStore/types.ts
+++ b/src/client/src/api/ApiStore/types.ts
@@ -55,6 +55,7 @@ export type GetRouteResponse = {
  center_latitude: number;
  center_longitude: number;
  governor_appeal: number;
+  button_text?: string;
  id: number;
  path: [number, number][];
  rotate: number;
@@ -78,6 +79,9 @@ export type GetCarrierResponse = {
  logo: string;
  short_name: string;
  slogan: string;
+  main_color?: string;
+  left_color?: string;
+  right_color?: string;
 };

 export type GetCityResponse = {
--- a/src/client/src/assets/icons/subtract-home.svg
+++ b/src/client/src/assets/icons/subtract-home.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="21" viewBox="0 0 24 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.3888 2.85031C11.7638 2.66434 12.1989 2.66434 12.5739 2.85031L21.0037 7.06792C21.4462 7.29108 21.7245 7.73709 21.7245 8.22802V20.145H21.7464C21.7462 20.6134 21.3641 20.9999 20.8843 21H15.7689C15.3788 21 15.0562 20.6874 15.0562 20.2932V13.807C15.0562 12.1333 13.6909 10.7792 12.0033 10.7792C10.3159 10.7794 8.95116 12.1334 8.95115 13.807V20.2932C8.95115 20.68 8.63599 21 8.23847 21H3.10101C2.62861 21 2.23837 20.6209 2.23818 20.145V8.22802C2.23819 7.73714 2.51576 7.2911 2.95818 7.06792L11.3888 2.85031Z" fill="white"/>
+<path d="M10.7962 0.268599C11.5012 -0.088374 12.3413 -0.0882526 13.0463 0.261335L23.6142 5.54243C23.9592 5.71352 24.1018 6.1379 23.9218 6.48751C23.7943 6.73297 23.5464 6.87397 23.2839 6.87397C23.179 6.87392 23.0663 6.85189 22.9689 6.79987L12.401 1.51877C12.101 1.37 11.7408 1.37 11.4408 1.51877L1.03036 6.79261C0.677932 6.97088 0.250655 6.82952 0.0781632 6.48751C-0.101845 6.14534 0.0407786 5.72096 0.385795 5.54243L10.7962 0.268599Z" fill="white"/>
+</svg>
--- a/src/client/src/assets/icons/three-view-pan.svg
+++ b/src/client/src/assets/icons/three-view-pan.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="14" viewBox="0 0 15 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9941 5.96193C13.028 4.86487 12.0189 3.81 11.0097 2.73404C10.5374 2.2277 9.78591 2.14332 9.18473 2.50197C8.86267 2.69185 8.64796 2.98721 8.51914 3.32476C7.51002 2.33319 6.47943 1.42601 5.47031 0.434434C4.69737 -0.325069 3.47355 -0.0508043 3.10855 0.961866C3.10855 1.00406 3.08707 1.00406 3.0656 1.02516C2.65766 0.750893 2.18531 0.708699 1.69148 0.919672C1.11178 1.17284 0.811185 1.61588 0.789714 2.2488C0.789714 2.56526 0.897071 2.86062 1.06884 3.13489C0.746777 3.24038 0.489128 3.40915 0.295893 3.66232C-0.154991 4.25305 -0.09058 5.05474 0.489127 5.60327C2.16384 7.24886 3.83854 8.89445 5.53472 10.5611C5.57767 10.6033 5.62061 10.6455 5.68502 10.7088C5.66355 10.7088 5.64208 10.7088 5.62061 10.7088C4.63296 10.8565 3.62384 11.0253 2.63619 11.173C1.88472 11.2784 1.3909 11.6793 1.17619 12.3966C0.918542 13.2405 1.43383 14 2.29266 14C4.71884 14 7.12355 14 9.54973 14C10.7091 14 11.6968 13.5992 12.5127 12.7975C12.9421 12.3755 13.3715 11.9536 13.8009 11.5316C15.3253 9.99151 15.4112 7.56532 13.9727 5.94083L13.9941 5.96193ZM13.2212 11.0675C12.8133 11.4683 12.4053 11.8692 11.9974 12.27C11.3103 12.924 10.4944 13.2616 9.52826 13.2616C8.36885 13.2616 7.18796 13.2616 6.02855 13.2616C4.86913 13.2616 3.60236 13.2616 2.37854 13.2616C1.99207 13.2616 1.82031 13.0506 1.92766 12.692C2.01354 12.2911 2.3356 12.0169 2.76501 11.9536C4.01031 11.7637 5.27708 11.5738 6.52237 11.3839C6.69414 11.3628 6.84443 11.2995 6.88737 11.1308C6.95178 10.9409 6.88737 10.7932 6.73708 10.6666C4.84767 8.81006 2.95825 6.9535 1.06884 5.09694C0.83266 4.86487 0.746777 4.6117 0.85413 4.31634C1.00442 3.87329 1.56266 3.72561 1.94913 3.99988C2.01354 4.04207 2.05648 4.10536 2.1209 4.14756C3.34472 5.35011 4.59001 6.57375 5.81384 7.77629C5.92119 7.88178 6.02855 7.96617 6.17884 7.94507C6.47943 7.94507 6.62972 7.60752 6.47943 7.37545C6.43649 7.31215 6.37208 7.24886 6.32914 7.20667C4.84767 5.72986 3.34472 4.27414 1.84177 2.81843C1.64854 2.62855 1.54119 2.39648 1.6056 2.12222C1.73443 1.61588 2.3356 1.42601 2.74354 1.76356C2.78648 1.80576 2.82943 1.84795 2.89384 1.89015C4.35384 3.32476 5.83532 4.78048 7.29532 6.2151C7.33826 6.25729 7.35973 6.29948 7.40267 6.32058C7.57444 6.46826 7.81061 6.48936 7.9609 6.32058C8.1112 6.1729 8.1112 5.94083 7.9609 5.77205C7.72473 5.53998 7.25237 5.07584 7.25237 5.07584L6.24325 4.08427C6.24325 4.08427 5.49178 3.34586 5.12678 2.98721C4.76178 2.62855 4.41825 2.291 4.05325 1.93234C3.88149 1.74247 3.77413 1.55259 3.83855 1.27833C3.9459 0.814185 4.50413 0.62431 4.89061 0.919672C4.95502 0.961866 4.99796 1.02516 5.0409 1.06735C6.1359 2.14332 7.25238 3.11379 8.34738 4.18975C8.54061 4.37963 8.71238 4.56951 8.90561 4.73828C9.09885 4.92816 9.33502 4.94926 9.50679 4.80158C9.67855 4.65389 9.65708 4.42182 9.46385 4.21085C9.18473 3.89439 9.2062 3.47245 9.50679 3.21928C9.80738 2.96611 10.2368 2.98721 10.5159 3.28257C11.4606 4.29524 12.4053 5.32901 13.35 6.34168C14.5953 7.713 14.5524 9.73834 13.2427 11.0464L13.2212 11.0675Z" fill="white"/>
+</svg>
--- a/src/client/src/assets/icons/three-view-rotate.svg
+++ b/src/client/src/assets/icons/three-view-rotate.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="12" viewBox="0 0 15 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.993 3.76793C13.0258 2.64439 12.0155 1.56407 11.0053 0.462135C10.5324 -0.0564207 9.78007 -0.142847 9.17822 0.224464C8.8558 0.418922 8.64085 0.721413 8.51188 1.06712C7.69509 0.505348 6.57737 0.786232 6.19046 1.82334C6.19046 1.82334 6.19046 1.82334 6.19046 1.88816C5.78206 1.62889 5.33068 1.60728 4.85779 1.82334C4.40641 2.0178 4.14847 2.3419 4.0195 2.75242C3.6326 2.36351 2.60085 1.348 2.47189 1.21836C2.0205 0.786232 1.46164 0.699806 0.902776 0.959084C0.773808 1.0023 0.687829 1.06712 0.580356 1.15354C0.365409 1.30479 0.236441 1.49925 0.128968 1.73692C0.128968 1.78013 0.107473 1.82334 0.0859786 1.86656C0 1.9962 0 2.14744 0 2.29869C0 2.53636 0.064484 2.75242 0.150463 2.96849C0.150463 2.96849 0.343915 3.27098 0.472883 3.40062C2.14947 5.08592 3.82605 6.77123 5.52413 8.47814C5.56712 8.52135 5.61011 8.56457 5.67459 8.62939C5.6531 8.62939 5.6316 8.62939 5.61011 8.62939C4.62135 8.78063 3.6111 8.95348 2.62235 9.10473C1.87004 9.21276 1.37566 9.62329 1.16071 10.3579C0.902776 11.2222 1.41865 12 2.27843 12C4.70733 12 7.11473 12 9.54363 12C10.7043 12 11.6931 11.5895 12.5099 10.7684C12.9398 10.3363 13.3697 9.90417 13.7996 9.47204C15.3257 7.89477 15.4117 5.41002 13.9715 3.74632L13.993 3.76793ZM13.2192 8.9967C12.8108 9.40722 12.4024 9.81774 11.994 10.2283C11.3062 10.8981 10.4894 11.2438 9.52213 11.2438C8.36142 11.2438 7.17922 11.2438 6.0185 11.2438C4.85779 11.2438 3.58961 11.2438 2.36441 11.2438C1.97751 11.2438 1.80555 11.0277 1.91302 10.6604C1.999 10.2499 2.32142 9.96899 2.75132 9.90417C3.99801 9.70971 5.26619 9.51525 6.51288 9.3208C6.68484 9.29919 6.8353 9.23437 6.87829 9.06152C6.94278 8.86706 6.87829 8.71581 6.72783 8.58617C4.8363 6.6848 2.94477 4.78343 1.05324 2.88206C0.92427 2.75242 0.838292 2.60118 0.795302 2.44993C0.795302 2.44993 0.795302 2.40672 0.795302 2.38511C0.795302 2.38511 0.795302 2.3419 0.795302 2.32029C0.795302 2.27708 0.795302 2.23387 0.795302 2.16905C0.795302 2.16905 0.795302 2.14744 0.795302 2.12583C0.795302 2.10423 0.795302 2.08262 0.816797 2.06101C0.816797 2.03941 0.838292 1.9962 0.859786 1.97459C1.07473 1.60728 1.56911 1.49925 1.93452 1.80174C1.97751 1.84495 2.0205 1.88816 2.08498 1.93138C3.05224 2.90367 4.0195 3.87596 4.98676 4.84825C5.2447 5.10753 5.52413 5.38841 5.78206 5.64769C5.88954 5.75572 5.99701 5.84215 6.14747 5.82054C6.4484 5.82054 6.59886 5.47484 6.4484 5.23717C6.40541 5.17235 6.34092 5.10753 6.29794 5.06432C5.84655 4.61058 5.37366 4.13524 4.92228 3.6815C4.77181 3.50865 4.70733 3.29258 4.77181 3.05491C4.90078 2.53636 5.50263 2.3419 5.91103 2.6876C5.95402 2.73082 5.99701 2.77403 6.06149 2.81724C6.38391 3.14134 6.68484 3.44383 7.00726 3.76793C7.09324 3.85435 7.17922 3.94078 7.28669 4.04881C7.32968 4.09202 7.35117 4.13524 7.39416 4.15684C7.56612 4.30809 7.80256 4.3297 7.95302 4.15684C8.10349 4.0056 8.10349 3.76793 7.95302 3.59508C7.80256 3.44383 7.6521 3.27098 7.48014 3.11973C7.35117 2.99009 7.2437 2.88206 7.11473 2.75242C6.8568 2.42833 6.92128 2.0178 7.15772 1.78013C7.45865 1.47764 7.86705 1.49925 8.23245 1.86656C8.4689 2.10423 8.68384 2.32029 8.92028 2.55796C9.11374 2.75242 9.35018 2.77403 9.52213 2.62278C9.69409 2.47154 9.6726 2.23387 9.47915 2.0178C9.19971 1.6937 9.22121 1.26158 9.52213 1.0023C9.82306 0.743019 10.253 0.764626 10.5324 1.06712C11.4781 2.10423 12.4239 3.16295 13.3697 4.20006C14.6164 5.60448 14.5734 7.6787 13.2622 9.0183L13.2192 8.9967Z" fill="white"/>
+</svg>
--- a/src/client/src/assets/icons/three-view-zoom.svg
+++ b/src/client/src/assets/icons/three-view-zoom.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="13" viewBox="0 0 15 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.67979 9.7487C5.63689 9.68658 5.57254 9.64516 5.52964 9.60374C3.85647 7.98845 2.16185 6.37316 0.488679 4.73716C-0.0904948 4.17802 -0.154849 3.41179 0.295619 2.83194C0.488677 2.58343 0.746089 2.41776 1.06785 2.31422C0.896245 2.045 0.767539 1.77579 0.78899 1.44444C0.78899 0.823178 1.11075 0.388292 1.68993 0.139785C2.2691 -0.108722 2.80537 -0.0258861 3.25584 0.388291C3.87792 0.96814 4.47854 1.5687 5.07917 2.14855C5.44383 2.5006 5.8085 2.85265 6.19461 3.22541C6.58073 2.23138 7.69618 1.94146 8.51131 2.5006C8.64001 2.14855 8.85452 1.87933 9.17629 1.69295C9.77691 1.3409 10.5277 1.42374 10.9996 1.92075C12.0078 2.9769 13.016 4.01235 13.9813 5.08921C15.4185 6.68379 15.3112 9.06531 13.8097 10.5771C13.3807 10.9912 12.9516 11.4054 12.5226 11.8196C11.7075 12.5858 10.7207 12.9793 9.5624 13C7.13845 13 4.73595 13 2.312 13C1.45397 13 0.917694 12.2752 1.19656 11.4261C1.41106 10.722 1.92589 10.3493 2.65522 10.225C3.64196 10.08 4.65015 9.91438 5.63689 9.76941C5.63689 9.76941 5.65834 9.76941 5.70124 9.76941L5.67979 9.7487ZM6.023 12.2545C7.18135 12.2545 8.36115 12.2545 9.5195 12.2545C10.4848 12.2545 11.2999 11.9231 11.9864 11.2812C12.3939 10.8877 12.8015 10.4942 13.2091 10.1008C14.5176 8.81681 14.5819 6.82875 13.3163 5.48268C12.3725 4.46794 11.4286 3.47391 10.4848 2.47989C10.2059 2.18996 9.77691 2.14855 9.4766 2.41776C9.17629 2.68698 9.15484 3.10115 9.4337 3.39108C9.62675 3.59817 9.62675 3.80526 9.4766 3.97093C9.30499 4.11589 9.09048 4.09518 8.87597 3.9088C8.64001 3.70171 8.4255 3.47391 8.18955 3.24612C7.84633 2.91477 7.41731 2.87336 7.117 3.16328C6.85959 3.41179 6.79524 3.86738 7.18135 4.19873C7.43877 4.40581 7.65327 4.65432 7.88923 4.88212C8.06084 5.04779 8.06084 5.27559 7.88923 5.42055C7.73908 5.56551 7.50312 5.56551 7.33151 5.42055C7.28861 5.37913 7.24571 5.33771 7.22426 5.317C5.7656 3.9088 4.28548 2.47989 2.82682 1.07168C2.78392 1.03027 2.74102 0.988849 2.67667 0.947431C2.2691 0.616089 1.66848 0.802469 1.53977 1.29948C1.47542 1.5687 1.58267 1.7965 1.77573 1.98288C3.27729 3.41179 4.7574 4.86141 6.25897 6.29032C6.32332 6.35245 6.36622 6.39387 6.40912 6.45599C6.55928 6.7045 6.40912 6.99442 6.10881 7.01513C5.95865 7.01513 5.8514 6.9323 5.74415 6.84946C4.52145 5.66906 3.27729 4.46794 2.05459 3.28753C1.99024 3.22541 1.94734 3.18399 1.88299 3.14257C1.49687 2.87336 0.960597 3.01832 0.78899 3.45321C0.681736 3.76384 0.78899 4.01235 1.0035 4.21943C2.89118 6.04182 4.77885 7.8642 6.66653 9.68658C6.79524 9.81083 6.88104 9.95579 6.81669 10.1422C6.75234 10.3078 6.62363 10.37 6.45202 10.3907C5.20787 10.5771 3.94227 10.7634 2.69812 10.9498C2.2691 11.0119 1.96879 11.2812 1.86153 11.6746C1.77573 12.0474 1.92589 12.2338 2.312 12.2338C3.5347 12.2338 4.73595 12.2338 5.95865 12.2338L6.023 12.2545Z" fill="white"/>
+</svg>
--- a/src/client/src/components/Fullscreen3DModal.jsx
+++ b/src/client/src/components/Fullscreen3DModal.jsx
@@ -37,14 +37,14 @@ const Fullscreen3DModal = ({ isOpen, onClose, fileUrl }) => {
        </div>
      </div>
      <div className="fullscreen-3d-actions">
-        <button title="Увеличить масштаб" disabled={scale >= 1}>
+        <button disabled={scale >= 1}>
          <img src={scale_plus} alt="Увеличить" />
        </button>
-        <button title="Уменьшить масштаб" disabled={scale <= 0.1}>
+        <button disabled={scale <= 0.1}>
          <img src={scale_minus} alt="Уменьшить" />
        </button>

-        <button onPointerUp={onClose} title="Закрыть">
+        <button onPointerUp={onClose}>
          <img src={closeIcon} alt="Закрыть" />
        </button>
      </div>
--- a/src/client/src/components/ListOfSights.jsx
+++ b/src/client/src/components/ListOfSights.jsx
@@ -95,9 +95,10 @@ const ListOfSights = observer(() => {

        // Находим все достопримечательности, начинающиеся с выбранной буквы
        const sightsForLetter = sightData.filter((sight) => {
-          if (!sight.name) return false;
+          const name = sight.name;
+          if (!name) return false;

-          let sightFirstChar = sight.name.trim().charAt(0);
+          let sightFirstChar = name.trim().charAt(0);

          // Для китайского языка используем пиньинь или иероглиф
          if (selectedLanguageRight === "zh") {
@@ -105,7 +106,7 @@ const ListOfSights = observer(() => {
              sightFirstChar = sight.name_pinyin.trim().toUpperCase().charAt(0);
            } else {
              // Если пиньинь нет, используем первый иероглиф
-              sightFirstChar = sight.name.trim().charAt(0);
+              sightFirstChar = name.trim().charAt(0);
            }
          } else {
            sightFirstChar = sightFirstChar.toUpperCase();
@@ -411,13 +412,13 @@ const ListOfSights = observer(() => {
  }, [currentSelectedSight]);

  return (
-    <div className="right-widget">
+    <div className="right-widget" lang={selectedLanguageRight}>
      {currentSelectedSight && (
        <SightFrame
          key={currentSelectedSight.id}
          media={sightFrameMedia}
          sight_id={currentSelectedSight.id}
-          sight_name={currentSelectedSight.short_name || currentSelectedSight.name}
+          sight_name={currentSelectedSight.name}
          selectedLanguageRight={selectedLanguageRight}
        />
      )}
@@ -440,11 +441,6 @@ const ListOfSights = observer(() => {
          isLangOpen={isLangMenuOpen}
        />

-        <TransferWidget
-          isOpen={isTransferWidgetOpen}
-          selectedLanguageRight={selectedLanguage}
-        />
-
        <LanguageSelector
          selectedLanguageRight={selectedLanguageRight}
          onLanguageChange={handleLanguageChange}
@@ -476,6 +472,12 @@ const ListOfSights = observer(() => {
            isDisabled={isAlphabetDisabled}
          />
        </div>
+      </div>
+
+      <TransferWidget
+        isOpen={isTransferWidgetOpen}
+        selectedLanguageRight={selectedLanguage}
+      />

      <div
        className="transfer-button-container"
@@ -513,7 +515,6 @@ const ListOfSights = observer(() => {
          </div>
        </div>
    </div>
-    </div>
  );
 });

--- a/src/client/src/components/ListOfSights/AlphabetNavigator.jsx
+++ b/src/client/src/components/ListOfSights/AlphabetNavigator.jsx
@@ -14,8 +14,9 @@ const AlphabetNavigator = forwardRef(function AlphabetNavigator(
    const letters = new Set();

    sightData.forEach((sight) => {
-      if (sight.name && sight.name.trim()) {
-        let firstChar = sight.name.trim().charAt(0);
+      const name = sight.short_name || sight.name;
+      if (name && name.trim()) {
+        let firstChar = name.trim().charAt(0);

        // Для китайского языка используем пиньинь (если доступен) или иероглиф
        if (selectedLanguage === "zh") {
@@ -23,7 +24,7 @@ const AlphabetNavigator = forwardRef(function AlphabetNavigator(
            firstChar = sight.name_pinyin.trim().toUpperCase().charAt(0);
          } else {
            // Если пиньинь нет, используем первый иероглиф
-            firstChar = sight.name.trim().charAt(0);
+            firstChar = name.trim().charAt(0);
          }
        } else {
          firstChar = firstChar.toUpperCase();
--- a/src/client/src/components/ListOfSights/ListHeader.jsx
+++ b/src/client/src/components/ListOfSights/ListHeader.jsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState, useEffect, useRef } from "react";

 const LANGUAGES = {
  EN: "en",
@@ -18,6 +18,26 @@ 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
      ? "Достопримечательности"
@@ -41,14 +61,11 @@ const ListHeader = function ListHeader({
      >
        <svg
          xmlns="http://www.w3.org/2000/svg"
-          width="21"
-          height="12"
+          width="20"
+          height="20"
          viewBox="0 0 21 12"
          fill="none"
-          style={{
-            transform: isOpen ? "rotate(180deg)" : "rotate(0deg)",
-            transition: "transform 0.15s ease-in-out",
-          }}
+          className={`chevron-svg${isOpen ? " is-open" : ""}${isIdle ? " is-idle" : ""}`}
        >
          <g clipPath="url(#clip0_658_91932)">
            <path
--- a/src/client/src/components/ListOfSights/SightComponent.jsx
+++ b/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" title={title}>
+      <div className="sight-title">
        {title}
      </div>
    </div>
--- a/src/client/src/components/ListOfSights/SightFrame.jsx
+++ b/src/client/src/components/ListOfSights/SightFrame.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef, useMemo } from "react";
+import React, { useState, useEffect, useRef, useMemo, useLayoutEffect, useCallback } from "react";
 import axios from "axios";
 import { observer } from "mobx-react-lite";
 import { useGeolocationStore } from "../../stores";
@@ -16,6 +16,10 @@ import { ThreeViewErrorBoundary } from "../ThreeViewErrorBoundary";
 import { apiStore } from "../../api/ApiStore/store";
 import { ReactMarkdownComponent } from "../ReactMarkdown";
 import { TouchableLayout } from "../TouchableLayout";
+import rotate3DIcon from "../../assets/icons/three-view-rotate.svg";
+import zoom3DIcon from "../../assets/icons/three-view-zoom.svg";
+import pan3DIcon from "../../assets/icons/three-view-pan.svg";
+import subtractHomeIcon from "../../assets/icons/subtract-home.svg";

 const Watermark = ({ path }) => {
  if (!path) return null;
@@ -37,10 +41,68 @@ 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,
@@ -80,11 +142,16 @@ 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 статьи.");
@@ -162,12 +229,18 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
        const introSection = {
          id: media?.id || "intro-title",
          heading:
-            sight?.short_name || sight?.name || sight_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]);
@@ -208,9 +281,43 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {

  useEffect(() => {
    setSelectedSection(0);
+    setIsSwitching(false);
+    if (switchTimerRef.current) {
+      clearTimeout(switchTimerRef.current);
+      switchTimerRef.current = null;
+    }
  }, [sight_id]);

-  const currentSection = articleSections?.[selectedSection] ?? null;
+  useLayoutEffect(() => {
+    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) {
@@ -240,9 +347,7 @@ 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";
              }}
            />
@@ -257,9 +362,7 @@ 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";
              }}
            >
@@ -309,27 +412,20 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
                <button
                  type="button"
                  className="three-d-control-btn"
-                  title="Уменьшить"
-                  onPointerUp={() =>
-                    threeViewControlRef.current?.zoomOut?.()
-                  }
+                  onPointerUp={() => threeViewControlRef.current?.zoomOut?.()}
                >
                  <MinusIcon />
                </button>
                <button
                  type="button"
                  className="three-d-control-btn"
-                  title="Увеличить"
-                  onPointerUp={() =>
-                    threeViewControlRef.current?.zoomIn?.()
-                  }
+                  onPointerUp={() => threeViewControlRef.current?.zoomIn?.()}
                >
                  <PlusIcon />
                </button>
                <button
                  type="button"
                  className="three-d-control-btn"
-                  title={isFullscreen3D ? "Свернуть" : "Развернуть"}
                  onPointerUp={() => {
                    if (isFullscreen3D) {
                      setIsFullscreen3D(false);
@@ -344,11 +440,6 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
              </div>
              <button
                className={"fullscreen-3d-button"}
-                title={
-                  isFullscreen3D
-                    ? "Закрыть полноэкранный режим"
-                    : "Открыть в полноэкранном режиме"
-                }
                aria-hidden="true"
              >
                <svg
@@ -364,6 +455,100 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
                  />
                </svg>
              </button>
+              {isFullscreen3D && (
+                <div
+                  style={{
+                    position: "absolute",
+                    top: 94,
+                    right: 10,
+                    zIndex: 10,
+                    pointerEvents: "none",
+                  }}
+                >
+                  <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)`,
+                      backdropFilter: "blur(10px)",
+                      borderRadius: "8px",
+                      width: 200,
+                      boxShadow:
+                        "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",
+                      padding: "8px 13px",
+                    }}
+                  >
+                    {[
+                      {
+                        label: "Вращать",
+                        icon: (
+                          <img
+                            src={rotate3DIcon}
+                            alt=""
+                            width="14"
+                            height="14"
+                          />
+                        ),
+                      },
+                      {
+                        label: "Приблизить / Отдалить",
+                        icon: (
+                          <img src={zoom3DIcon} alt="" width="14" height="14" />
+                        ),
+                      },
+                      {
+                        label: "Переместить",
+                        icon: (
+                          <img src={pan3DIcon} alt="" width="14" height="14" />
+                        ),
+                      },
+                    ].map((item, index, arr) => (
+                      <div
+                        key={index}
+                        style={{
+                          display: "flex",
+                          alignItems: "center",
+                          height: "30px",
+                          userSelect: "none",
+                          touchAction: "none",
+                          padding: "0 4px",
+                          borderBottom:
+                            index < arr.length - 1
+                              ? "1px solid rgba(255, 255, 255, 0.1)"
+                              : "none",
+                          transition: "background-color 0.2s",
+                        }}
+                      >
+                        <span
+                          style={{
+                            display: "block",
+                            marginRight: "8px",
+                            flexShrink: 0,
+                            lineHeight: 0,
+                          }}
+                        >
+                          {item.icon}
+                        </span>
+                        <span
+                          style={{
+                            color: "white",
+                            fontSize: "12px",
+                            lineHeight: "1.5",
+                            fontWeight: "400",
+                            overflow: "hidden",
+                            textOverflow: "ellipsis",
+                            whiteSpace: "nowrap",
+                            flex: 1,
+                          }}
+                        >
+                          {item.label}
+                        </span>
+                      </div>
+                    ))}
+                  </div>
+                </div>
+              )}
            </div>
          );
        default:
@@ -428,7 +613,6 @@ 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}>
@@ -464,7 +648,7 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {

  const titleLineHeight = useMemo(() => {
    if (!sight_name) return "120%";
-    const textLength = sight_name.length;
+    const textLength = sight_name.replace(/\n/g, "").length;
    const calculatedLineHeight = Math.max(
      100,
      Math.min(120, 120 - (textLength / 10) * 1),
@@ -473,6 +657,7 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
  }, [sight_name]);

  return (
+    <>
      <div
        className={`sight-frame ${isVisible ? "is-visible" : ""} ${
          isFullscreen3D && isCurrentMedia3D ? "three-d-fullscreen" : ""
@@ -482,6 +667,7 @@ 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" : ""
          }`}
@@ -499,99 +685,68 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
            renderCurrentMedia()
          )}
        </div>
-      <div className="sight-frame-content">
+        <div className={`sight-frame-content ${isSwitching ? "is-switching" : ""}`}>
          {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 ? processedSightName : sight_name}
+                    {selectedSection === 0
+                      ? processedSightName || sightData?.name
+                      : sightData?.short_name || sightData?.name}
                  </p>
                </div>
              )}
-            {selectedSection !== 0 && (
              <TouchableLayout
-                className="sight-frame-text-wrapper"
+                key={selectedSection}
+                className={`sight-frame-text-wrapper ${selectedSection === 0 ? "is-intro" : ""}`}
                ref={textWrapperRef}
-                maxHeight="calc(80vh - 354px)"
              >
-                <div className="sight-frame-text">
+                <div className="sight-frame-text fade-in-text">
+                  {isLoadingContent || !currentSection ? (
+                    <div className="sight-frame-loading-placeholder" />
+                  ) : (
+                    selectedSection !== 0 && (
                      <ReactMarkdownComponent value={currentSection.body} />
+                    )
+                  )}
                </div>
              </TouchableLayout>
-            )}
            </>
          )}
        </div>
-      <div className="sight-frame-menu">
-        {selectedSection !== 0 && (
-          <div
-            style={{
-              position: "absolute",
-              left: "10px",
-              marginTop: "-4.5px",
-              zIndex: 1,
-              paddingLeft: "15px",
-              paddingRight: "7.5px",
-              paddingTop: "4.5px",
-              paddingBottom: "4.5px",
-              cursor: "pointer",
-            }}
-            onPointerUp={() => setSelectedSection(0)}
-          >
-            <svg
-              width="20"
-              height="25"
-              viewBox="0 0 20 25"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-              style={{ display: "block" }}
-            >
-              <defs>
-                <linearGradient
-                  id="sightFrameGradient3"
-                  x1="0%"
-                  y1="0%"
-                  x2="100%"
-                  y2="100%"
-                  gradientUnits="userSpaceOnUse"
-                >
-                  <stop offset="0%" stopColor="rgba(255, 255, 255, 0.2)" />
-                  <stop offset="100%" stopColor="rgba(255, 255, 255, 0)" />
-                </linearGradient>
-                <clipPath id="clip0_662_97446">
-                  <rect
-                    width="20"
-                    height="25"
-                    fill="white"
-                    transform="translate(12.5 0.5) rotate(90)"
-                  />
-                </clipPath>
-              </defs>
-              <g clipPath="url(#clip0_662_97446)">
-                <path
-                  d="M4.03158 11.0738C4.21879 11.2087 4.34702 11.2766 4.44531 11.3747C6.93048 13.8687 9.41098 16.3665 11.8962 18.8605C12.3408 19.3067 12.5186 19.8207 12.3361 20.4339C12.0281 21.4658 10.7776 21.8393 9.95295 21.1498C9.86309 21.0743 9.78165 20.9894 9.69928 20.9064C6.85279 18.0446 4.00537 15.1817 1.15982 12.3189C0.280876 11.4341 0.281813 10.6456 1.16169 9.75982C4.04 6.86305 6.91457 3.96155 9.80786 1.07986C10.0597 0.828952 10.4144 0.619547 10.7561 0.537482C11.4019 0.382786 12.015 0.72142 12.3193 1.28644C12.6263 1.85334 12.5392 2.56079 12.0806 3.05129C11.7286 3.4286 11.3561 3.78704 10.991 4.15209C8.79601 6.35557 6.60194 8.55904 4.40599 10.7606C4.32362 10.8436 4.22721 10.9106 4.03158 11.0729L4.03158 11.0738Z"
-                  fill="url(#sightFrameGradient3)"
-                />
-              </g>
-            </svg>
      </div>
-        )}
+      <div
+        className="sight-frame-menu-wrapper"
+        style={{
+          opacity: isVisible ? 1 : 0,
+          transition: "opacity 0.9s cubic-bezier(0.16, 1, 0.3, 1) 0.08s",
+          pointerEvents: isVisible ? "auto" : "none",
+        }}
+      >
+        <div className="sight-frame-menu-fade left" style={{ opacity: canScrollLeft ? 1 : 0 }} />
+        <div className="sight-frame-menu-fade right" style={{ opacity: canScrollRight ? 1 : 0 }} />
+        <div
+          className="sight-frame-menu"
+          ref={menuRef}
+          style={menuNeedsScroll ? { justifyContent: 'flex-start' } : undefined}
+        >
          {contentError ? (
            <p className="error-message">{contentError}</p>
          ) : (
@@ -599,8 +754,9 @@ const SightFrame = observer(({ media, sight_id, sight_name }) => {
            articleSections.length > 1 &&
            articleSections.slice(1).map((section, index) => (
              <div
-              onPointerUp={() => setSelectedSection(index + 1)}
+                onPointerUp={() => requestSection(index + 1)}
                key={section.id || section.heading || index}
+                data-label={section.heading}
                className={`sight-frame-menu-point ${
                  index + 1 === selectedSection ? "active" : ""
                }`}
@@ -613,6 +769,33 @@ 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>
+    </>
  );
 });

--- a/src/client/src/components/ListOfSights/TransferWidget.jsx
+++ b/src/client/src/components/ListOfSights/TransferWidget.jsx
@@ -96,20 +96,35 @@ const TransferWidget = observer(function TransferWidget({

  const getTransferLabel = () => {
    if (selectedLanguageRight === "ru") {
-      return stationName
-        ? `Пересадки остановки ${stationName}:`
-        : "Ближайшая остановка не обнаружена";
+      return stationName ? (
+        <>
+          <div>Пересадка на остановке</div>
+          <div>«{stationName}»:</div>
+        </>
+      ) : (
+        "Ближайшая остановка не обнаружена"
+      );
    }

    if (selectedLanguageRight === "en") {
-      return stationName
-        ? `Available transfers at station ${stationName}`
-        : "Nearest station not found";
+      return stationName ? (
+        <>
+          <div>Transfer at stop</div>
+          <div>«{stationName}»:</div>
+        </>
+      ) : (
+        "Nearest station not found"
+      );
    }

-    return stationName
-      ? `在车站可用的换乘：${stationName}`
-      : "最近的站点未找到";
+    return stationName ? (
+      <>
+        <div>在站点换乘</div>
+        <div>«{stationName}»:</div>
+      </>
+    ) : (
+      "最近的站点未找到"
+    );
  };

  const getNoTransfersMessage = () => {
--- a/src/client/src/components/ReactMarkdown/ReactMarkdown.css
+++ b/src/client/src/components/ReactMarkdown/ReactMarkdown.css
@@ -71,7 +71,7 @@
 }

 .react-markdown-container blockquote {
-  border-left: 4px solid #006F3A;
+  border-left: 4px solid var(--carrier-main, #006F3A);
  padding-left: 16px;
  margin-top: 16px;
  margin-bottom: 16px;
--- a/src/client/src/components/SimulationSettings.tsx
+++ b/src/client/src/components/SimulationSettings.tsx
@@ -80,6 +80,15 @@ export const SimulationSettings = observer(() => {
              onClick={apiStore.toggleSimulationInstantMove}
            />
          </Row>
+
+          {/* Хитбоксы */}
+          <Row>
+            <span>Хитбоксы</span>
+            <Toggle
+              on={apiStore.showHitboxes}
+              onClick={apiStore.toggleShowHitboxes}
+            />
+          </Row>
        </div>
      )}
    </div>
--- a/src/client/src/components/ThreeViewErrorBoundary.css
+++ b/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%
-  ), #006F3A;
+  ), var(--carrier-main, #006F3A);
  border-radius: 12px;
  box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1);
  color: white;
--- a/src/client/src/components/TouchableLayout/index.tsx
+++ b/src/client/src/components/TouchableLayout/index.tsx
@@ -12,6 +12,7 @@ interface TouchableLayoutProps {
  children?: ReactNode;
  className?: string;
  maxHeight?: string | number;
+  style?: React.CSSProperties;
 }

 function useThumbSync(scrollableRef: React.RefObject<HTMLDivElement | null>) {
@@ -19,20 +20,30 @@ 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;

-    if (sh <= ch) {
-      setState({ height: th, top: 0, hasScroll: false });
+    const isAtTop = st <= 0;
+    const isAtBottom = st + ch >= sh - 1;
+
+    if (sh <= ch + 2) {
+      setState((prev) => ({ ...prev, hasScroll: false, isAtTop: true, isAtBottom: true }));
      return;
    }

@@ -41,7 +52,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 });
+    setState({ height: thumbHeight, top, hasScroll: true, isAtTop, isAtBottom });
  }, []);

  useEffect(() => {
@@ -57,22 +68,36 @@ 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]);

-  return state;
+  useEffect(() => {
+    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 }, ref) => {
+  ({ children, className, maxHeight, style }, ref) => {
    const containerRef = useRef<HTMLDivElement>(null);
    const scrollableRef = useRef<HTMLDivElement>(null);
    const trackRef = useRef<HTMLDivElement>(null);
@@ -234,9 +259,12 @@ export const TouchableLayout = forwardRef<HTMLDivElement, TouchableLayoutProps>(
      };
    }, [thumb.hasScroll]);

-    const containerClassName = className
-      ? `scrollable-container ${className}`
-      : "scrollable-container";
+    const containerClassName = [
+      "scrollable-container",
+      className,
+      thumb.isAtTop ? "is-at-top" : "",
+      thumb.isAtBottom ? "is-at-bottom" : "",
+    ].filter(Boolean).join(" ");

    const viewportStyle: React.CSSProperties = maxHeight
      ? {
@@ -246,20 +274,27 @@ export const TouchableLayout = forwardRef<HTMLDivElement, TouchableLayoutProps>(
      : {};

    return (
-      <div ref={setRefs} className={containerClassName}>
+      <div ref={setRefs} className={containerClassName} style={style}>
        <div className="scrollable-viewport" style={viewportStyle}>
          <div ref={scrollableRef} className="scrollable">
            {children}
          </div>
-          {thumb.hasScroll && (
-            <div ref={trackRef} className="custom-scrollbar-track">
+          <div
+            ref={trackRef}
+            className="custom-scrollbar-track"
+            style={{ opacity: thumb.visible ? 1 : 0 }}
+          >
            <div
              ref={thumbRef}
              className="custom-scrollbar-thumb"
-                style={{ height: thumb.height, top: thumb.top }}
+              style={{
+                height: thumb.height,
+                top: thumb.top,
+                opacity: thumb.visible ? 1 : 0,
+                pointerEvents: thumb.visible ? "auto" : "none",
+              }}
            />
          </div>
-          )}
        </div>
      </div>
    );
--- a/src/client/src/components/WeatherWidget.jsx
+++ b/src/client/src/components/WeatherWidget.jsx
@@ -8,6 +8,7 @@ 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 (
@@ -43,7 +44,11 @@ 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);
--- a/src/client/src/components/map/InfiniteCanvas.tsx
+++ b/src/client/src/components/map/InfiniteCanvas.tsx
@@ -1,349 +0,0 @@
-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>
-      </>
-    );
-  }
-);
--- a/src/client/src/components/map/Map.tsx
+++ b/src/client/src/components/map/Map.tsx
@@ -5,8 +5,6 @@ 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
@@ -19,8 +17,6 @@ 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>
--- a/src/client/src/components/map/Sight.tsx
+++ b/src/client/src/components/map/Sight.tsx
@@ -1,393 +0,0 @@
-// 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}
-          />
-        );
-      })}
-    </>
-  );
-}
--- a/src/client/src/components/map/Station.tsx
+++ b/src/client/src/components/map/Station.tsx
@@ -1,174 +0,0 @@
-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>
-    );
-  }
-);
--- a/src/client/src/components/map/TramIcon.tsx
+++ b/src/client/src/components/map/TramIcon.tsx
@@ -1,375 +0,0 @@
-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>
-  );
-}
--- a/src/client/src/components/map/TravelPath.tsx
+++ b/src/client/src/components/map/TravelPath.tsx
@@ -1,92 +0,0 @@
-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} />;
-}
--- a/src/client/src/components/map/WebGLMap.tsx
+++ b/src/client/src/components/map/WebGLMap.tsx
@@ -17,7 +17,6 @@ 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";
@@ -156,6 +155,19 @@ 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;
@@ -165,8 +177,12 @@ 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
          ) {
@@ -176,6 +192,10 @@ const useSightClustering = (
        }
      }

+      for (const leftover of queue) {
+        leftover.visited = false;
+      }
+
      if (clusterSights.length > 1) {
        let furthestSight: SightData | null = null;
        let maxDistanceToPath = -1;
@@ -382,13 +402,15 @@ 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" &&
@@ -797,9 +819,8 @@ export const WebGLMap = observer(() => {
      const textBlockPositionX = rx + labelOffsetX;
      const textBlockPositionY = ry + labelOffsetY;

-      const nameLines = st.name.replace(/\\n/g, '\n').split('\n');
-      const longestLine = nameLines.reduce((a: string, b: string) => a.length > b.length ? a : b, '');
-      const approximateTextWidth = longestLine.length * fontSize * 0.6;
+      const normalizedName = st.name.replace(/\\n|\n/g, "");
+      const approximateTextWidth = normalizedName.length * fontSize * 0.6;
      const textWidthInMapCoords = approximateTextWidth / scale;

      let anchorXOffset = 0;
@@ -829,8 +850,8 @@ export const WebGLMap = observer(() => {
      result.push({
        x: sx,
        y: sy,
-        name: st.name.replace(/\\n/g, '\n'),
-        sub: sub ? sub.replace(/\\n/g, '\n') : sub,
+        name: normalizedName,
+        sub: sub ? sub.replace(/\\n|\n/g, "") : sub,
        anchorX: anchorX,
        anchorY: anchorY,
        distance: distanceInPixels,
@@ -882,25 +903,36 @@ export const WebGLMap = observer(() => {

  // Сегментный индекс каждой упорядоченной станции на routePath (canvas-пространство)
  const orderedStationSegs = useMemo(() => {
-    if (!orderedRouteStations || !stationData || routePath.length < 4) return [] as number[];
+    if (!orderedRouteStations || !stationData || routePath.length < 4)
+      return [] as number[];
    return (orderedRouteStations as any[]).map((ordStation) => {
-      const stIdx = stationData.findIndex((s: any) => String(s.id) === String(ordStation.id));
+      const stIdx = stationData.findIndex(
+        (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, bestD = Infinity;
+      let best = -1,
+        bestD = Infinity;
      for (let i = 0; i < routePath.length - 2; i += 2) {
-        const p1x = routePath[i], p1y = routePath[i + 1];
-        const p2x = routePath[i + 2], p2y = routePath[i + 3];
-        const dx = p2x - p1x, dy = p2y - p1y;
+        const p1x = routePath[i],
+          p1y = routePath[i + 1];
+        const p2x = routePath[i + 2],
+          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, py = p1y + cl * dy;
+        const px = p1x + cl * dx,
+          py = p1y + cl * dy;
        const d = Math.hypot(sx - px, sy - py);
-        if (d < bestD) { bestD = d; best = i / 2; }
+        if (d < bestD) {
+          bestD = d;
+          best = i / 2;
+        }
      }
      return best;
    });
@@ -1145,7 +1177,9 @@ export const WebGLMap = observer(() => {
        const curIdx = apiStore.positionIndex;
        const prevIdx = prevPositionIndexRef.current;
        const pathLen = apiStore.route?.path?.length ?? 0;
-        const isWrap = prevIdx >= 0 && pathLen > 0 &&
+        const isWrap =
+          prevIdx >= 0 &&
+          pathLen > 0 &&
          Math.abs(curIdx - prevIdx) > pathLen / 4;
        prevPositionIndexRef.current = curIdx;

@@ -1415,32 +1449,72 @@ export const WebGLMap = observer(() => {

      gl.uniform1f(u_pointSize, pointInnerSizePx);

-      if (tramSegIndex >= 0 && orderedRouteStations && stationData && orderedStationSegs.length > 0) {
+      if (
+        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 = simulationDirection === 1 ? stationSeg < tramSegIndex : stationSeg > tramSegIndex;
-          const stIdx = stationData.findIndex((s: any) => String(s.id) === String(orderedStation.id));
+          const isPassed =
+            simulationDirection === 1
+              ? 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) { passedPts1.push(sx, sy); } else { unpassedPts1.push(sx, sy); }
+          if (isPassed) {
+            passedPts1.push(sx, sy);
+          } else {
+            unpassedPts1.push(sx, sy);
+          }
        }
        if (passedPts1.length > 0) {
-          gl.uniform4f(u_color_pts, ((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.uniform4f(
+            u_color_pts,
+            ((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(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, new Float32Array(unpassedPts1), gl.STATIC_DRAW);
+          gl.uniform4f(
+            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,
+            new Float32Array(unpassedPts1),
+            gl.STATIC_DRAW,
+          );
          gl.drawArrays(gl.POINTS, 0, unpassedPts1.length / 2);
        }
      } else {
-        gl.uniform4f(u_color_pts, ((UNPASSED_STATION_COLOR >> 16) & 0xff) / 255, ((UNPASSED_STATION_COLOR >> 8) & 0xff) / 255, (UNPASSED_STATION_COLOR & 0xff) / 255, 1);
+        gl.uniform4f(
+          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);
      }
@@ -1514,12 +1588,17 @@ export const WebGLMap = observer(() => {
    const passedStationIds = new Set<string>();
    const unpassedStationIds = new Set<string>();

-    if (tramSegIndex >= 0 && orderedRouteStations && orderedStationSegs.length === orderedRouteStations.length) {
+    if (
+      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 = simulationDirection === 1 ? seg < tramSegIndex : seg > tramSegIndex;
+        const isPassed =
+          simulationDirection === 1 ? seg < tramSegIndex : seg > tramSegIndex;
        if (isPassed) passedStationIds.add(String(station.id));
        else unpassedStationIds.add(String(station.id));
      }
@@ -1663,11 +1742,26 @@ export const WebGLMap = observer(() => {
        const sin = Math.sin(rotationAngle);

        const startStationData = orderedRouteStations?.[0]
-          ? stationData.find((station: any) => station.id.toString() === String(orderedRouteStations[0].id))
-          : stationData.find((station: any) => station.id.toString() === apiStore.context?.startStopId);
+          ? stationData.find(
+              (station: any) =>
+                station.id.toString() === String(orderedRouteStations[0].id),
+            )
+          : stationData.find(
+              (station: any) =>
+                station.id.toString() === apiStore.context?.startStopId,
+            );
        const endStationData = orderedRouteStations?.length
-          ? stationData.find((station: any) => station.id.toString() === String(orderedRouteStations[orderedRouteStations.length - 1].id))
-          : stationData.find((station: any) => station.id.toString() === apiStore.context?.endStopId);
+          ? stationData.find(
+              (station: any) =>
+                station.id.toString() ===
+                String(
+                  orderedRouteStations[orderedRouteStations.length - 1].id,
+                ),
+            )
+          : stationData.find(
+              (station: any) =>
+                station.id.toString() === apiStore.context?.endStopId,
+            );

        const terminalStations: number[] = [];

@@ -1767,7 +1861,13 @@ export const WebGLMap = observer(() => {
                  }
                  return best;
                })();
-                return tramSegIndex !== -1 && seg !== -1 && (simulationDirection === 1 ? seg < tramSegIndex : seg > tramSegIndex);
+                return (
+                  tramSegIndex !== -1 &&
+                  seg !== -1 &&
+                  (simulationDirection === 1
+                    ? seg < tramSegIndex
+                    : seg > tramSegIndex)
+                );
              })()
            : false;

@@ -1800,7 +1900,13 @@ export const WebGLMap = observer(() => {
                  }
                  return best;
                })();
-                return tramSegIndex !== -1 && seg !== -1 && (simulationDirection === 1 ? seg < tramSegIndex : seg > tramSegIndex);
+                return (
+                  tramSegIndex !== -1 &&
+                  seg !== -1 &&
+                  (simulationDirection === 1
+                    ? seg < tramSegIndex
+                    : seg > tramSegIndex)
+                );
              })()
            : false;

@@ -1826,11 +1932,24 @@ export const WebGLMap = observer(() => {
          const b_unpassed = (UNPASSED_STATION_COLOR & 0xff) / 255;

          if (startStationData && endStationData) {
-            const startIsPassed = simulationDirection === 1 ? true : isStartPassed;
+            const startIsPassed =
+              simulationDirection === 1 ? true : isStartPassed;
            const endIsPassed = simulationDirection === -1 ? true : isEndPassed;
-            gl.uniform4f(u_color_pts, startIsPassed ? r_passed : r_unpassed, startIsPassed ? g_passed : g_unpassed, startIsPassed ? b_passed : b_unpassed, 1.0);
+            gl.uniform4f(
+              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(u_color_pts, endIsPassed ? r_passed : r_unpassed, endIsPassed ? g_passed : g_unpassed, endIsPassed ? b_passed : b_unpassed, 1.0);
+            gl.uniform4f(
+              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;
@@ -2315,7 +2434,7 @@ export const WebGLMap = observer(() => {
                    fontSize: primaryFontSize,
                    textShadow: "0 0 4px rgba(0,0,0,0.6)",
                    pointerEvents: "none",
-                    whiteSpace: "pre-line",
+                    whiteSpace: "nowrap",
                  }}
                >
                  {l.name}
@@ -2331,7 +2450,7 @@ export const WebGLMap = observer(() => {
                      lineHeight: secondaryLineHeight,
                      color: "#CBCBCB",
                      textShadow: "0 0 3px rgba(0,0,0,0.4)",
-                      whiteSpace: "pre-line",
+                      whiteSpace: "nowrap",
                      ...secondaryPositionStyle,
                      pointerEvents: "none",
                    }}
@@ -2417,6 +2536,11 @@ export const WebGLMap = observer(() => {
                  cursor: "pointer",
                  userSelect: "none",
                  touchAction: "none",
+                  ...(apiStore.showHitboxes && {
+                    outline: "2px solid rgba(0,255,0,0.8)",
+                    outlineOffset: "2px",
+                    backgroundColor: "rgba(0,255,0,0.08)",
+                  }),
                }}
              >
                <div
@@ -2449,14 +2573,8 @@ 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(
@@ -2468,6 +2586,20 @@ 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 &&
@@ -2525,7 +2657,7 @@ export const WebGLMap = observer(() => {
                )
              : false;

-            const badgeColor = "#006F3A";
+            const badgeColor = "var(--carrier-main, #006F3A)";
            const listPanelWidth = 200;
            const listItemHeight = 30;
            const listMaxHeight = 250;
@@ -2541,29 +2673,38 @@ export const WebGLMap = observer(() => {
                    onTouchEnd={handleClusterClick}
                    style={{
                      position: "absolute",
-                      left: iconLeft - CLUSTER_RADIUS_BASE - 10,
-                      top: iconTop - CLUSTER_RADIUS_BASE - 10,
-                      width: iconSize + CLUSTER_RADIUS_BASE * 2 + 20,
-                      height: iconSize + CLUSTER_RADIUS_BASE * 2 + 20,
-                      display: "flex",
-                      alignItems: "center",
-                      justifyContent: "center",
+                      left: iconLeft,
+                      top: iconTop,
+                      width: iconSize,
+                      height: iconSize,
                      pointerEvents: "auto",
                      cursor: "pointer",
                      userSelect: "none",
                      touchAction: "none",
                      zIndex: 10,
+                      ...(apiStore.showHitboxes && {
+                        outline: "2px solid rgba(255,165,0,0.8)",
+                        outlineOffset: "2px",
+                        backgroundColor: "rgba(255,165,0,0.08)",
+                      }),
+                    }}
+                  >
+                    <div
+                      style={{
+                        position: "absolute",
+                        width: iconSize,
+                        height: iconSize,
+                        flexShrink: 0,
                      }}
                    >
-                    <div style={{ position: "relative" }}>
                      <img
                        src={clusterIconUrl}
                        alt=""
-                        width={iconSize}
-                        height={iconSize}
                        style={{
                          display: "block",
                          pointerEvents: "none",
+                          width: "100%",
+                          height: "100%",
                          filter: hasSelectedSight
                            ? hasSelectedAltIconInCluster
                              ? "none"
@@ -2576,6 +2717,7 @@ export const WebGLMap = observer(() => {
                          position: "absolute",
                          top: -6,
                          right: -6,
+                          zIndex: 1,
                          width: 15,
                          height: 15,
                          borderRadius: "10px",
@@ -2598,16 +2740,20 @@ export const WebGLMap = observer(() => {
                  <div
                    data-expanded-cluster={cluster.id}
                    onTouchStart={handleCircleInteraction}
-                    onTouchMove={handleCircleInteraction}
                    onMouseMove={handleCircleInteraction}
                    style={{
                      position: "absolute",
-                      left: screenX - iconSize / 2,
-                      top: screenY - iconSize / 2,
+                      left: screenX - iconSize,
+                      top: screenY - iconSize,
                      display: "flex",
                      alignItems: "flex-start",
                      pointerEvents: "auto",
                      zIndex: 100000000000000,
+                      ...(apiStore.showHitboxes && {
+                        outline: "2px solid rgba(0,180,255,0.8)",
+                        outlineOffset: "2px",
+                        backgroundColor: "rgba(0,180,255,0.08)",
+                      }),
                    }}
                  >
                    <div
@@ -2659,15 +2805,14 @@ 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(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(var(--carrier-main-rgb, 0, 111, 58), 0.4)`,
                        backdropFilter: "blur(10px)",
                        borderRadius: "8px",
                        width: listPanelWidth,
                        maxHeight: hasMoreThanTwo ? listMaxHeight : undefined,
                        boxShadow:
-                          "0 0 0 1px rgba(255, 255, 255, 0.3) inset, 4px 4px 12px 0 rgba(255, 255, 255, 0.12) inset",
+                          "inset 0 0 0 1px rgba(255, 255, 255, 0.3), inset 4px 4px 12px 0 rgba(255, 255, 255, 0.12)",
                        display: "flex",
-
                        flexDirection: "column",
                      }}
                      onClick={(e) => e.stopPropagation()}
@@ -2810,7 +2955,6 @@ export const WebGLMap = observer(() => {
                                  whiteSpace: "nowrap",
                                  flex: 1,
                                }}
-                                title={sightName}
                              >
                                {sightName}
                              </span>
--- a/src/client/src/components/side-menu/BackButtonSVG.jsx
+++ b/src/client/src/components/side-menu/BackButtonSVG.jsx
@@ -1,20 +1,16 @@
+import subtractHomeIcon from "../../assets/icons/subtract-home.svg";
+
 function BackButtonSVG({ onPointerUp }) {
  return (
-    <svg
+    <img
+      src={subtractHomeIcon}
+      alt=""
+      width="24"
+      height="21"
      onPointerUp={onPointerUp}
      className="sight-frame-get-back"
-      width="13"
-      height="22"
-      viewBox="0 0 13 22"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      style={{ cursor: "pointer", transform: "rotate(-90deg)" }}
-    >
-      <path
-        d="M4.03042 11.0738C4.21763 11.2087 4.34586 11.2766 4.44415 11.3747C6.92933 13.8687 9.40982 16.3665 11.895 18.8605C12.3396 19.3066 12.5175 19.8207 12.3349 20.4339C12.027 21.4658 10.7764 21.8393 9.95179 21.1498C9.86193 21.0743 9.78049 20.9894 9.69812 20.9064C6.85163 18.0446 4.00421 15.1817 1.15866 12.3189C0.279718 11.4341 0.280654 10.6456 1.16053 9.75982C4.03884 6.86305 6.91341 3.96155 9.8067 1.07986C10.0585 0.828952 10.4133 0.619547 10.7549 0.537482C11.4008 0.382786 12.0139 0.72142 12.3181 1.28644C12.6251 1.85334 12.5381 2.56079 12.0794 3.05129C11.7275 3.4286 11.3549 3.78704 10.9899 4.15209C8.79485 6.35557 6.60078 8.55904 4.40483 10.7606C4.32246 10.8436 4.22605 10.9106 4.03042 11.0729L4.03042 11.0738Z"
-        fill="white"
+      style={{ cursor: "pointer", display: "block" }}
    />
-    </svg>
  );
 }

--- a/src/client/src/components/side-menu/Collapsible.jsx
+++ b/src/client/src/components/side-menu/Collapsible.jsx
@@ -0,0 +1,39 @@
+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;
--- a/src/client/src/components/side-menu/LeftWidget.jsx
+++ b/src/client/src/components/side-menu/LeftWidget.jsx
@@ -5,6 +5,8 @@ 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 }) => {
@@ -15,8 +17,7 @@ const LeftWidget = observer(
    const [isImageLoaded, setIsImageLoaded] = useState(false);
    const [widgetHeight, setWidgetHeight] = useState(0);

-    const textRef = useRef(null);
-    const activeTouch = useRef(null);
+    const layoutRef = useRef(null);
    const widgetRef = useRef(null);

    const store = useGeolocationStore();
@@ -37,64 +38,10 @@ const LeftWidget = observer(
    }, [selectedSightData, isImageLoaded, isVisible, isLoading, error]);

    useEffect(() => {
-      const scrollContainer = textRef.current;
-      if (!scrollContainer) return;
-
-      const handleTouchStart = (e) => {
-        e.stopPropagation();
-        if (e.touches.length === 1) {
-          activeTouch.current = {
-            identifier: e.touches[0].identifier,
-            lastY: e.touches[0].clientY,
-          };
+      if (layoutRef.current) {
+        const scrollable = layoutRef.current.querySelector(".scrollable");
+        if (scrollable) scrollable.scrollTop = 0;
      }
-      };
-
-      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(() => {
@@ -123,6 +70,8 @@ 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 =
@@ -132,15 +81,17 @@ 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: sight.short_name || sight.name || leftArticleData.heading,
+            title: leftArticleData.heading,
            text: leftArticleData.body,
            address: sight.address,
          };
@@ -178,7 +129,7 @@ const LeftWidget = observer(
      setIsImageLoaded(false);
      console.error(
        "Ошибка загрузки изображения для достопримечательности:",
-        selectedSightId
+        selectedSightId,
      );
      if (isVisible) {
        setTimeout(() => {
@@ -208,7 +159,7 @@ const LeftWidget = observer(
    };

    return (
-      <div ref={widgetRef} style={widgetTransformStyle} className="left-widget">
+      <div ref={widgetRef} style={widgetTransformStyle} className="left-widget" lang={selectedLanguage}>
        {isLoading ? (
          <div>Загрузка информации...</div>
        ) : error ? (
@@ -234,9 +185,11 @@ const LeftWidget = observer(
              <div className="left-widget-address">
                {selectedSightData.address}
              </div>
-              <div ref={textRef} className="left-widget-text">
-                {selectedSightData.text}
+              <TouchableLayout ref={layoutRef} className="left-widget-text-scroll">
+                <div className="left-widget-text">
+                  <ReactMarkdownComponent value={selectedSightData.text} />
                </div>
+              </TouchableLayout>
            </div>
          </>
        ) : (isVisible || selectedSightData) && !isLoading ? (
@@ -250,7 +203,7 @@ const LeftWidget = observer(
        ) : null}
      </div>
    );
-  }
+  },
 );

 export default LeftWidget;
--- a/src/client/src/components/side-menu/SideMenu.jsx
+++ b/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";
@@ -13,6 +13,7 @@ import StationsList from "./StationsList";
 import LeftWidget from "./LeftWidget";
 import { apiStore } from "../../api/ApiStore/store";
 import { getMediaUrl } from "../../api/apiConfig";
+import defaultCrest from "../../assets/images/Герб.png";

 const SideMenu = observer(({ onMenuToggle }) => {
  const {
@@ -85,7 +86,7 @@ const SideMenu = observer(({ onMenuToggle }) => {
        let scrollTarget = null;
        const targetElement = document.elementFromPoint(
          touch.clientX,
-          touch.clientY
+          touch.clientY,
        );

        // Определяем, над каким из скролл-контейнеров находится палец
@@ -263,15 +264,19 @@ 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 >= 45 && isMenuOpen) {
-        handleMenuToggle(false);
+      if (idleSeconds >= 60 && isMenuOpenRef.current) {
+        handleMenuToggleRef.current(false);
      }
    };

@@ -300,7 +305,48 @@ 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);
@@ -357,7 +403,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(76, 175, 75, 0.4)`
+              ? `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)`
              : undefined,
          backdropFilter:
            isSightsOpen || isStationOpen ? "blur(10px)" : undefined,
@@ -369,13 +415,11 @@ 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}
+          src={designData?.creastPath || defaultCrest}
          alt="Герб"
        />
-        )}
        {carrier?.slogan && (
          <div className="side-menu-label">{carrier.slogan}</div>
        )}
@@ -444,14 +488,16 @@ const SideMenu = observer(({ onMenuToggle }) => {
            }}
            className="appeal-button"
          >
-            {selectedLanguage == "ru"
+            {route?.button_text
+              ? route.button_text
+              : selectedLanguage == "ru"
                ? "Обращение губернатора"
                : selectedLanguage == "zh"
                  ? "州长致辞"
                  : "Governor's appeal"}
          </div>
        )}
-        <div className="side-menu-buttons">
+        <div className="side-menu-buttons" style={{ marginTop: route?.governor_appeal > 0 ? '40px' : '260px' }}>
          <div
            onPointerUp={() => {
              if (!isSightsOpen) {
@@ -578,12 +624,33 @@ const SideMenu = observer(({ onMenuToggle }) => {
      <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={gouvermentImage}
+          widgetImgPath={(() => {
+            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"
--- a/src/client/src/components/side-menu/SightStationsList.jsx
+++ b/src/client/src/components/side-menu/SightStationsList.jsx
@@ -64,7 +64,6 @@ 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}
--- a/src/client/src/components/side-menu/SightsList.jsx
+++ b/src/client/src/components/side-menu/SightsList.jsx
@@ -10,6 +10,7 @@ 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";

@@ -38,25 +39,8 @@ const SightItem = ({
  const [shouldAnimate, setShouldAnimate] = useState(false);
  const [isExpanded, setIsExpanded] = useState(false);

-  // Получаем название для отображения
  const getSightName = () => {
-    // Если есть короткое название, используем его
-    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 sight.short_name || sight.name;
  };

  const sightName = getSightName();
@@ -95,28 +79,48 @@ 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 ${
-          localSelectedSightId === sight.id ? "selected" : ""
-        }`}
-        title={sightName}
+        className="side-menu-sight pointer"
      >
        <span ref={textRef} className={shouldAnimate ? "marquee-text" : ""}>
          {sightName}
        </span>
      </div>
-      <div
-        className={`side-menu-sight-transfer-list ${isExpanded ? "open" : ""}`}
-      >
+      <Collapsible className="side-menu-sight-transfer-list" open={isExpanded}>
        {stations.length > 0 ? (
          stations.map((station, index) => {
-            const iconSrc = isMediaIdEmpty(station.icon)
+            let isMediaIdEmptyResult = isMediaIdEmpty(station.icon);
+            const iconSrc = isMediaIdEmptyResult
              ? stationIcon
              : getMediaUrl(station.icon);

@@ -157,7 +161,7 @@ const SightItem = ({
                : "No stations"}
          </div>
        )}
-      </div>
+      </Collapsible>
    </div>
  );
 };
@@ -233,24 +237,8 @@ const SightsList = observer(
                : selectedLanguage === "en"
                  ? routeSightsEn
                  : routeSightsZh;
-            // Функция для получения названия для сортировки
            const getSightNameForSort = (sight) => {
-              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();
+              return (sight.short_name || sight.name).trim();
            };

            const sortedSights = [...(sights || [])].sort((a, b) => {
@@ -349,25 +337,18 @@ 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 = () => {
--- a/src/client/src/components/side-menu/StationSightsList.jsx
+++ b/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
+  // Получаем название из left_article или используем short_name/name
  const getSightName = () => {
    if (!sight.left_article) {
-      return sight.name;
+      return sight.short_name || 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.name;
+    return leftArticleData?.heading || sight.short_name || sight.name;
  };

  const sightName = getSightName();
@@ -70,7 +70,6 @@ const SightItem = ({
      className={`side-menu-sight pointer ${
        localSelectedSightId === sight.id ? "selected" : ""
      }`}
-      title={sightName}
    >
      <span ref={textRef} className={shouldAnimate ? "marquee-text" : ""}>
        {sightName}
@@ -120,10 +119,9 @@ const StationSightsList = observer(
              selectedLanguage
            );

-            // Функция для получения названия из left_article
            const getSightNameForSort = (sight) => {
              if (!sight.left_article) {
-                return sight.name.trim();
+                return (sight.short_name || sight.name).trim();
              }

              const leftArticleData =
@@ -133,7 +131,7 @@ const StationSightsList = observer(
                  ? sightArticlesEn.get(sight.left_article + "_en")
                  : sightArticlesZh.get(sight.left_article + "_zh");

-              return (leftArticleData?.heading || sight.name).trim();
+              return (leftArticleData?.heading || sight.short_name || sight.name).trim();
            };

            const sortedSights = [...(response || [])].sort((a, b) => {
@@ -311,3 +309,4 @@ const StationSightsList = observer(
 );

 export default StationSightsList;
+nSightsList;
--- a/src/client/src/components/side-menu/StationsList.jsx
+++ b/src/client/src/components/side-menu/StationsList.jsx
@@ -10,6 +10,43 @@ 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,
@@ -56,26 +93,15 @@ const StationItem = ({
  const sights = stationSightsCache.get(cacheKey) || [];

  const getSightName = (sight) => {
-    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 sight.short_name || 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"
@@ -88,22 +114,20 @@ const StationItem = ({
            );
          }
        }}
-        title={station.name}
      >
        <span ref={textRef} className={shouldAnimate ? "marquee-text" : ""}>
          {station.name}
        </span>
      </div>
-      <div
-        className={`side-menu-sight-transfer-list ${
-          selectedStationId === station.id ? "open" : ""
-        }`}
+      <Collapsible
+        className="side-menu-sight-transfer-list"
+        open={selectedStationId === station.id}
      >
        {sights.length > 0 ? (
          sights.map((sight, index) => (
-            <div
+            <SightTransferItem
              key={sight.id}
-              className="side-menu-sight-transfer pointer"
+              name={getSightName(sight)}
              style={{
                borderBottom:
                  index < sights.length - 1
@@ -115,19 +139,11 @@ const StationItem = ({
              onPointerUp={(e) => {
                e.stopPropagation();
                if (onSightClick) {
-                  // Вычисляем позицию элемента для правильного позиционирования левого виджета
-                  const element = e.currentTarget;
-                  const elementRect = element.getBoundingClientRect();
-
-                  // Используем позицию элемента относительно viewport (elementRect.top)
-                  // чтобы верхняя граница виджета совпадала с верхней границей элемента
-                  const elementTop = elementRect.top;
-                  onSightClick(sight.id, elementTop);
+                  const elementRect = e.currentTarget.getBoundingClientRect();
+                  onSightClick(sight.id, elementRect.top);
                }
              }}
-            >
-              {getSightName(sight)}
-            </div>
+            />
          ))
        ) : (
          <div className="side-menu-sight-transfer-empty">
@@ -138,7 +154,7 @@ const StationItem = ({
                : "No sights"}
          </div>
        )}
-      </div>
+      </Collapsible>
    </div>
  );
 };
--- a/src/client/src/components/widgets/AppealWidget.jsx
+++ b/src/client/src/components/widgets/AppealWidget.jsx
@@ -1,13 +1,50 @@
-import '../../styles/AppealWidget.css'
+import { useRef, useEffect } from "react";
+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 style={style} className='dynamic-widget'>
-            <img className='dynamic-widget-image' src={widgetImgPath} />
-            <div className='dynamic-widget-label'>{widgetLabel}</div>
-            <div className='dynamic-widget-text'>{widgetText}</div>
+    <div
+      style={style}
+      className="dynamic-widget"
+      onPointerDown={stopProp}
+      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;
--- a/src/client/src/components/widgets/RouteWidget.jsx
+++ b/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, route } = apiStore;
+  const { routeStations, routeStationsEn, routeStationsZh, context } = apiStore;
  const [startStation, setStartStation] = useState(null);
  const [startStationEn, setStartStationEn] = useState(null);
  const [endStation, setEndStation] = useState(null);
@@ -64,6 +64,13 @@ const RouteWidget = observer(() => {
  }, [context?.endStopId, isLoading, selectedLanguage]);

  const shouldAnimate = (text, maxLength) => text?.length > maxLength;
+  const getNumberSizeClass = (text) => {
+    const length = text?.length || 0;
+    if (length <= 2) return "";
+    if (length === 3) return "route-widget-number--3";
+    if (length === 4) return "route-widget-number--4";
+    return "route-widget-number--5";
+  };
  const getLabelSizeClass = (text) => {
    const length = text?.length || 0;

@@ -77,15 +84,14 @@ const RouteWidget = observer(() => {
  const routeZhSubtitle = `${startStationZh?.name} - ${endStationZh?.name}`;
  return (
    <div className="route-widget">
-      <div className="route-widget-number">
-        {route?.route_sys_number || context?.routeNumber || ""}
+      <div className={`route-widget-number ${getNumberSizeClass(context?.routeNumber)}`}>
+        {context?.routeNumber || "No number"}
      </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>
@@ -93,7 +99,6 @@ const RouteWidget = observer(() => {
          className={`route-widget-label ${
            shouldAnimate(endStation?.name, 18) ? "marquee" : ""
          } ${getLabelSizeClass(endStation?.name)}`}
-          title={endStation?.name}
        >
          {endStation?.name}
        </div>
@@ -102,7 +107,6 @@ const RouteWidget = observer(() => {
            className={`route-widget-subtitle ${
              shouldAnimate(routeEnSubtitle, 50) ? "marquee" : ""
            }`}
-            title={routeEnSubtitle}
          >
            {routeEnSubtitle}
          </div>
@@ -112,7 +116,6 @@ const RouteWidget = observer(() => {
            className={`route-widget-subtitle ${
              shouldAnimate(routeZhSubtitle, 50) ? "marquee" : ""
            }`}
-            title={routeZhSubtitle}
          >
            {routeZhSubtitle}
          </div>
--- a/src/client/src/components/widgets/ThreeView.tsx
+++ b/src/client/src/components/widgets/ThreeView.tsx
@@ -1,6 +1,6 @@
-import { Canvas, useThree } from "@react-three/fiber";
-import { OrbitControls, Stage, useGLTF } from "@react-three/drei";
-import React, { useEffect, Suspense } from "react";
+import { Canvas, useThree, useFrame } from "@react-three/fiber";
+import { OrbitControls, Center, useGLTF } from "@react-three/drei";
+import React, { useEffect, useRef, Suspense, useCallback } from "react";
 import { BACKGROUND_COLOR } from "../../assets/Constants";
 import * as THREE from "three";
 import type { OrbitControls as OrbitControlsImpl } from "three-stdlib";
@@ -23,6 +23,7 @@ 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();
@@ -197,6 +198,47 @@ 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,
@@ -233,21 +275,37 @@ 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, 5], fov: 40 }}
+        camera={{ position: [0, 0, 50], fov: CAMERA_FOV }}
        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} />
@@ -265,23 +323,18 @@ export const ThreeView: React.FC<ThreeViewProps> = ({
        <pointLight position={[0, 30, 0]} intensity={0.6} />

        <Suspense fallback={null}>
-          <Stage
-            environment={null}
-            intensity={1}
-            castShadow={false}
-            shadows={false}
-            adjustCamera={true}
-            center={{ precise: true }}
-          >
-            <Model fileUrl={fileUrl} onLoad={onLoad} />
-          </Stage>
+          <Center precise>
+            <group ref={groupRef}>
+              <Model fileUrl={fileUrl} />
+            </group>
+          </Center>
        </Suspense>

        <OrbitControls
          makeDefault
          enableZoom={true}
          enablePan={true}
-          target={[50, 50, 50]}
+          target={[0, 0, 0]}
          minDistance={1}
          maxDistance={100}
          enableDamping={true}
--- a/src/client/src/index.css
+++ b/src/client/src/index.css
@@ -14,9 +14,9 @@
 .side-menu-sights-block {
  height: calc(60%);
  overflow-y: scroll;
-  margin-left: 20px;
+  margin-left: 0;
  margin-top: 8px;
-  margin-right: 5px;
+  padding-right: 5px;
  touch-action: none; /* Отключаем стандартные действия */
  overscroll-behavior: contain; /* Предотвращаем прокрутку родительских элементов */
 }
--- a/src/client/src/stores/ColorStore.ts
+++ b/src/client/src/stores/ColorStore.ts
@@ -1,21 +1,45 @@
 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;
@@ -28,12 +52,12 @@ class ColorStore implements ColorStore {
    this.currentColor = color;
  };

-  private interpolateColor(progress: number): string {
-    const h = Math.round(COLOR_WHITE.h + (COLOR_GREEN.h - COLOR_WHITE.h) * progress);
-    const s = Math.round(COLOR_WHITE.s + (COLOR_GREEN.s - COLOR_WHITE.s) * progress);
-    const l = Math.round(COLOR_WHITE.l + (COLOR_GREEN.l - COLOR_WHITE.l) * progress);
-    return `hsl(${h}, ${s}%, ${l}%)`;
+  setMainColor = (hex: string) => {
+    const parsed = hexToRgb(hex);
+    if (parsed) {
+      this.mainColor = parsed;
    }
+  };

  startColorAnimation = () => {
    if (this.tickInterval) return;
@@ -50,7 +74,7 @@ class ColorStore implements ColorStore {
          this.direction = 1;
        }

-        this.currentColor = this.interpolateColor(this.progress);
+        this.currentColor = interpolateRgb(WHITE, this.mainColor, this.progress);
      });
    }, TICK_INTERVAL);
  };
--- a/src/client/src/styles/AppealWidget.css
+++ b/src/client/src/styles/AppealWidget.css
@@ -5,37 +5,124 @@
  flex-direction: column;
  align-items: center;
  width: 420px;
+  max-height: calc(100vh - 150px - 98px);
  border-radius: 10px;
-  background: linear-gradient(
+  background:
+    linear-gradient(
      114deg,
      rgba(255, 255, 255, 0) 8.71%,
      rgba(255, 255, 255, 0.16) 69.69%
    ),
-    #006F3A;
+    var(--carrier-left, #006f3a);
  box-sizing: border-box;
+  overflow: hidden;
+  touch-action: none;
 }

 .dynamic-widget-image {
-  border-radius-top-left: 10px;
-  border-radius-top-right: 10px;
-  padding-top: 4px;
-  margin-left: 4px;
-  margin-right: 4px;
-  width: 412px;
+  padding-top: 2px;
+  margin-left: 2px;
+  margin-right: 2px;
+  width: 416px;
+  border-radius: 10px 10px 0 0;
+  object-fit: cover;
 }

 .dynamic-widget-label {
-  width: 380px;
-  margin-top: 29px;
+  width: 100%;
+  padding: 10px 20px;
+  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: 150%;
+  line-height: 135%;
+  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;
 }
--- a/src/client/src/styles/LeftWidget.css
+++ b/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%
    ),
-    #006F3A;
+    var(--carrier-left, #006F3A);
  will-change: transform, opacity;
  backface-visibility: hidden;
 }
@@ -67,17 +67,78 @@
  line-height: 150%;
 }

-.left-widget-text {
+.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 {
  color: #fff;
  font-family: "Roboto";
  font-size: 16px;
  font-weight: 300;
  line-height: 135%;
-  max-height: 200px; /* Пример ограничения высоты */
-  overflow-y: auto;
-  touch-action: none;
-  overscroll-behavior: contain;
+  padding-right: 3px;
+}
+
+.left-widget-text .react-markdown-container {
+  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 {
@@ -93,26 +154,27 @@
  padding-left: 10px;
  padding-bottom: 6px;
  width: 100%;
+  overflow: hidden;
 }

-/* Анимация для списка пересадок */
-.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 {
-  max-height: 0;
+  height: 0;
  opacity: 0;
  overflow: hidden;
-  transition: max-height 0.3s ease-out, opacity 0.3s ease-out; /* Анимация при открытии/закрытии */
+  transition:
+    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;
 }
--- a/src/client/src/styles/ListOfSights.css
+++ b/src/client/src/styles/ListOfSights.css
@@ -1,3 +1,45 @@
+@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;
@@ -6,6 +48,8 @@
 }

 .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);
@@ -17,11 +61,11 @@
      rgba(255, 255, 255, 0) 8.71%,
      rgba(255, 255, 255, 0.16) 69.69%
    ),
-    #006f3a;
+    var(--carrier-right, #806c59);
  color: white;

  max-height: 68px;
-  transition: max-height 0.15s ease;
+  transition: max-height 0.35s cubic-bezier(0.16, 1, 0.3, 1);
  overflow: hidden;
 }

@@ -63,7 +107,7 @@
  border-radius: 10px;
  width: 128px;

-  background-color: #0e8953;
+  background-color: var(--carrier-right-dark, #005a2f);
 }

 .list-of-sights-title {
@@ -81,7 +125,7 @@

  opacity: 0;
  pointer-events: none;
-  transition: opacity 0.15s ease-in-out 0.15s;
+  transition: opacity 0.25s cubic-bezier(0.16, 1, 0.3, 1) 0.1s;

  overscroll-behavior: contain;
  touch-action: pan-y;
@@ -90,6 +134,29 @@
  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);
@@ -103,6 +170,12 @@
  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;
@@ -175,18 +248,18 @@
  height: 1px;
  width: 100%;
  background-color: rgba(255, 255, 255, 0.3);
-  margin-bottom: 14px;
+  margin-bottom: 0;
 }

 .sight-frame {
  z-index: -1;
  position: absolute;
-  bottom: 66px;
+  bottom: 100px;
+  left: 0;
  display: flex;
  flex-direction: column;
  align-items: center;
-  margin-bottom: 32px;
-  width: 550px;
+  width: 100%;
  border-radius: 10px;
  background:
    linear-gradient(
@@ -194,8 +267,14 @@
      rgba(255, 255, 255, 0) 8.71%,
      rgba(255, 255, 255, 0.16) 69.69%
    ),
-    #006f3a;
+    var(--carrier-right, #806c59);
  max-height: calc(100vh - 128px);
+  transform: translate3d(0, 0, 0);
+  overflow: hidden;
+}
+
+.sight-frame.three-d-fullscreen {
+  overflow: visible;
 }

 .sight-frame-image {
@@ -212,6 +291,11 @@
  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 {
@@ -237,15 +321,37 @@
      rgba(255, 255, 255, 0.22) 0%,
      rgba(255, 255, 255, 0.04) 100%
    ),
-    rgba(0, 111, 58, 0.72);
+    rgba(var(--carrier-right-rgb, 128, 108, 89), 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;
@@ -263,18 +369,40 @@
 }

 .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;
+  padding: 16px 16px 76px 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;
@@ -285,11 +413,12 @@
 }

 .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: 18px;
+  font-size: 20px;
  font-style: normal;
  font-weight: 400;
  line-height: 150%;
@@ -326,13 +455,57 @@
  margin-bottom: 0;
 }

-.sight-frame-menu {
-  position: relative;
-  padding: 7px;
+.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;
+  width: 100%;
+  height: 60px;
  display: flex;
  align-items: center;
-  justify-content: space-around;
+  justify-content: space-evenly;
  border-radius: 0px 0px 10px 10px;
  border-top: 1px solid rgba(255, 255, 255, 0.8);
  background:
@@ -341,11 +514,22 @@
      rgba(255, 255, 255, 0.2) 0%,
      rgba(255, 255, 255, 0) 100%
    ),
-    rgba(0, 111, 58, 0.4);
+    rgba(var(--carrier-right-menu-rgb, 179, 165, 152), 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 {
@@ -356,16 +540,17 @@
  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 {
-  border-bottom: 2px solid #fff;
-  font-weight: 600;
+  text-shadow: 0 0 0.4px #fff, 0 0 0.4px #fff;
+  border-bottom-color: #fff;
 }

 .sight-frame-text-wrapper::-webkit-scrollbar-track {
@@ -390,30 +575,20 @@
 }
 .sight-frame {
  opacity: 0;
-  transform: translateY(20px);
-  transition:
-    opacity 0.2s ease-out,
-    transform 0.2s ease-out;
+  transition: opacity 0.9s ease-out;
 }

 .sight-frame.is-visible {
  opacity: 1;
-  transform: translateY(0);
-  animation: fadeInScale 0.6s ease-out forwards;
+  animation: fadeInScale 0.9s cubic-bezier(0.16, 1, 0.3, 1) forwards;
 }

@keyframes fadeInScale {
-  0% {
+  from {
    opacity: 0;
-    transform: translateY(20px) scale(0.95);
  }
-  50% {
-    opacity: 0.7;
-    transform: translateY(-5px) scale(1.02);
-  }
-  100% {
+  to {
    opacity: 1;
-    transform: translateY(0) scale(1);
  }
 }

@@ -465,6 +640,7 @@
  font-size: 40px;
  font-weight: 600;
  line-height: 150%;
+  padding-bottom: 60px;
 }

 .svg-container {
@@ -519,17 +695,20 @@
 }

 .alphabet {
-  width: 100px;
+  width: 40px;
+  flex-shrink: 0;
  margin-right: 10px;
-  padding-top: 24px;
+  margin-top: 14px;
+  margin-bottom: 10px;
+  padding-top: 10px;
+  padding-bottom: 10px;
  display: flex;
  align-items: center;
  flex-direction: column;
-  gap: 16px;
+  gap: 20px;
  overflow-y: auto;
  overflow-x: hidden;
-  height: 650px;
-  padding-bottom: 30px;
+  height: 676px;
  touch-action: pan-y;
  overscroll-behavior: contain;
  scrollbar-width: none;
@@ -579,8 +758,9 @@
 }

 .alphabet-position {
-  display: inline-flex;
+  display: flex;
  justify-content: space-between;
+  width: 100%;
 }

 .transfer-button-container {
@@ -607,14 +787,14 @@

  position: absolute;
  border-radius: 10px;
-  border: 1px solid #006f3a;
+  border: 1px solid var(--carrier-main, #006f3a);
  background:
    linear-gradient(
      180deg,
      rgba(255, 255, 255, 0.2) 0%,
      rgba(255, 255, 255, 0) 100%
    ),
-    rgba(0, 111, 58, 0.4);
+    rgba(var(--carrier-main-rgb, 0, 111, 58), 0.4);

  box-shadow: 4px 4px 12px 0px rgba(255, 255, 255, 0.12) inset;
  backdrop-filter: blur(10px);
@@ -747,7 +927,7 @@
  border-radius: 32px;
  right: 20px;
  bottom: 20px;
-  background: #006f3a;
+  background: var(--carrier-main, #006f3a);
  z-index: 9999;
  display: flex;
 }
--- a/src/client/src/styles/RouteWidget.css
+++ b/src/client/src/styles/RouteWidget.css
@@ -26,10 +26,12 @@
  position: fixed;
  display: inline-flex;
  border-radius: 10px;
-  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.3) inset,
+  box-shadow:
+    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: linear-gradient(
+  background:
+    linear-gradient(
      to bottom right,
      rgba(255, 255, 255, 0.2) 0%,
      rgba(255, 255, 255, 0) 100%
@@ -50,7 +52,7 @@
  height: 96px;
  background-color: #fcd500;
  color: black;
-  border-radius: 10px;
+  border-radius: 10px 0 0 10px;
  display: flex;
  justify-content: center;
  align-items: center;
@@ -59,6 +61,18 @@
  font-weight: 900;
 }

+.route-widget-number--3 {
+  font-size: 50px;
+}
+
+.route-widget-number--4 {
+  font-size: 38px;
+}
+
+.route-widget-number--5 {
+  font-size: 30px;
+}
+
 .route-widget-content {
  overflow: hidden;
  width: 257px;
--- a/src/client/src/styles/SideMenu.css
+++ b/src/client/src/styles/SideMenu.css
@@ -13,7 +13,7 @@
      rgba(255, 255, 255, 0.2) 0%,
      rgba(255, 255, 255, 0) 100%
    ),
-    #006f3a;
+    var(--carrier-left, #006f3a);
 }

 .side-menu-label {
@@ -35,11 +35,12 @@
  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 {
@@ -51,10 +52,6 @@
  border-radius: 10px;
 }

-.side-menu-button--sights {
-  background-color: #fcd500;
-}
-
 .side-menu-button--active {
  background-color: #fcd500;
  color: #000;
@@ -138,10 +135,10 @@
  }

  3.33% {
-    fill: rgb(76, 175, 75);
+    fill: var(--carrier-left, rgb(76, 175, 75));
  }
  50% {
-    fill: rgb(76, 175, 75);
+    fill: var(--carrier-left, rgb(76, 175, 75));
  }
  53.33% {
    fill: #ffffff;
@@ -191,7 +188,7 @@
  top: -2px;
  width: 100px;
  height: 7px;
-  background-color: #0e8953;
+  background-color: color-mix(in srgb, var(--carrier-left, #006f3a) 80%, black);
  border-radius: 10px;
 }

@@ -200,6 +197,8 @@
  overflow: hidden;
  top: 250px;
  bottom: 0;
+  display: flex;
+  flex-direction: column;
  border-radius: 10px 10px 0px 0px;
  background:
    linear-gradient(
@@ -207,7 +206,7 @@
      rgba(255, 255, 255, 0) 8.71%,
      rgba(255, 255, 255, 0.16) 69.69%
    ),
-    #006f3a;
+    var(--carrier-left, #006f3a);
  position: absolute;
  width: 288px;
  transform: translateY(100%);
@@ -215,8 +214,6 @@
  transition:
    transform 0.3s ease-out,
    opacity 0.3s ease-out;
-  display: flex;
-  flex-direction: column;
 }

 .side-menu-sights.slide-in {
@@ -231,12 +228,10 @@
 .side-menu-sights-block {
  flex: 1;
  min-height: 0;
-  margin-left: 20px;
  margin-top: 8px;
  touch-action: none;
  overscroll-behavior: contain;
-  width: auto;
-  max-width: calc(100% - 20px);
+  width: 100%;
  box-sizing: border-box;
  overflow-x: hidden;
  overflow-y: auto;
@@ -244,10 +239,10 @@

 .side-menu-sight {
  padding-bottom: 2px;
-  margin-right: 20px;
  margin-bottom: 6px;
  margin-top: 6px;
-  border-bottom: 1px solid #0e8953;
+  border-bottom: 1px solid
+    color-mix(in srgb, var(--carrier-left, #006f3a) 80%, black);
  font-family: "Roboto";
  font-size: 16px;
  font-weight: 300;
@@ -257,6 +252,17 @@
  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;
--- a/src/client/src/styles/TouchableLayout.css
+++ b/src/client/src/styles/TouchableLayout.css
@@ -43,6 +43,8 @@
  position: relative;
  background: rgba(255, 255, 255, 0.2);
  border-radius: 3px;
+  overflow: hidden;
+  transition: opacity 0.5s ease;
 }

 .custom-scrollbar-thumb {
@@ -55,6 +57,7 @@
  pointer-events: auto;
  cursor: grab;
  touch-action: none;
+  transition: opacity 0.5s ease, height 0.5s ease;
 }

 .custom-scrollbar-thumb:active {
@@ -62,11 +65,12 @@
 }

 .side-menu-sights-block .scrollable-viewport {
-  height: calc(92%);
+  height: calc(98%);
 }

 .side-menu-sights-block .scrollable {
  height: 100%;
+  padding-left: 20px;
 }

 .list-of-sights-content .scrollable-viewport {
--- a/src/features/navigation/ui/index.tsx
+++ b/src/features/navigation/ui/index.tsx
@@ -17,6 +17,11 @@ 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),
--- a/src/pages/Article/ArticleCreatePage/index.tsx
+++ b/src/pages/Article/ArticleCreatePage/index.tsx
@@ -1,12 +1,17 @@
-import React from "react";
+import React, { useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import { ArrowLeft } from "lucide-react";
 import { LanguageSwitcher } from "@widgets";
-import { articlesStore } from "@shared";
+import { articlesStore, selectedCityStore } from "@shared";

 const ArticleCreatePage: React.FC = () => {
  const navigate = useNavigate();

+  useEffect(() => {
+    selectedCityStore.setIsLocked(true);
+    return () => selectedCityStore.setIsLocked(false);
+  }, []);
+
  const { articleData } = articlesStore;

  return (
--- a/src/pages/Article/ArticleEditPage/index.tsx
+++ b/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 } from "@shared";
+import { articlesStore, languageStore, selectedCityStore } from "@shared";
 import { observer } from "mobx-react-lite";

 const ArticleEditPage: React.FC = observer(() => {
@@ -11,6 +11,11 @@ const ArticleEditPage: React.FC = observer(() => {

  const { articleData, getArticle } = articlesStore;

+  useEffect(() => {
+    selectedCityStore.setIsLocked(true);
+    return () => selectedCityStore.setIsLocked(false);
+  }, []);
+
  useEffect(() => {
    // Устанавливаем русский язык при загрузке страницы
    languageStore.setLanguage("ru");
--- a/src/pages/Article/ArticleListPage/index.tsx
+++ b/src/pages/Article/ArticleListPage/index.tsx
@@ -31,7 +31,7 @@ export const ArticleListPage = observer(() => {
      setIsLoading(false);
    };
    fetchArticles();
-  }, [language]);
+  }, [language, selectedCityStore.cityVersion]);

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

+        {(rows.length > 0 || searchQuery) && (
          <SearchInput value={searchQuery} onChange={setSearchQuery} />
+        )}

        <div className="w-full">
          <DataGrid
--- a/src/pages/Carrier/CarrierCreatePage/index.tsx
+++ b/src/pages/Carrier/CarrierCreatePage/index.tsx
@@ -20,6 +20,7 @@ import {
  languageStore,
  isMediaIdEmpty,
  useSelectedCity,
+  selectedCityStore,
  SelectMediaDialog,
  UploadMediaDialog,
  PreviewMediaDialog,
@@ -27,6 +28,56 @@ import {
 import { useState, useEffect } from "react";
 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 { createCarrierData, setCreateCarrierData } = carrierStore;
@@ -43,6 +94,11 @@ export const CarrierCreatePage = observer(() => {
    "thumbnail" | "watermark_lu" | "watermark_rd" | "image" | null
  >(null);

+  useEffect(() => {
+    selectedCityStore.setIsLocked(true);
+    return () => selectedCityStore.setIsLocked(false);
+  }, []);
+
  useEffect(() => {
    const fetchCities = async () => {
      if (!authStore.me) {
@@ -220,6 +276,69 @@ export const CarrierCreatePage = observer(() => {
          }
        />

+        <div className="w-full flex flex-col gap-6">
+          <div className="flex flex-col gap-1">
+            <ColorPickerField
+              label="Основной цвет"
+              value={createCarrierData.main_color}
+              onChange={(val) =>
+                setCreateCarrierData(
+                  createCarrierData[language].full_name,
+                  createCarrierData[language].short_name,
+                  createCarrierData.city_id,
+                  createCarrierData[language].slogan,
+                  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,
+                  createCarrierData[language].slogan,
+                  selectedMediaId || "",
+                  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,
+                  createCarrierData[language].slogan,
+                  selectedMediaId || "",
+                  language,
+                  { ...colorFields(createCarrierData), right_color: val }
+                )
+              }
+            />
+            <p className="text-xs text-gray-500 pl-1">
+              Используется в: список достопримечательностей, страница достопримечательности
+            </p>
+          </div>
+        </div>
+
        <div className="w-full flex flex-col gap-4 max-w-[300px] mx-auto">
          <ImageUploadCard
            title="Логотип перевозчика"
--- a/src/pages/Carrier/CarrierEditPage/index.tsx
+++ b/src/pages/Carrier/CarrierEditPage/index.tsx
@@ -21,6 +21,7 @@ import {
  languageStore,
  isMediaIdEmpty,
  LoadingSpinner,
+  selectedCityStore,
 } from "@shared";
 import { useState, useEffect } from "react";
 import { ImageUploadCard, LanguageSwitcher, DeleteModal } from "@widgets";
@@ -30,6 +31,60 @@ import {
  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();
@@ -49,6 +104,11 @@ export const CarrierEditPage = observer(() => {
    "thumbnail" | "watermark_lu" | "watermark_rd" | "image" | null
  >(null);

+  useEffect(() => {
+    selectedCityStore.setIsLocked(true);
+    return () => selectedCityStore.setIsLocked(false);
+  }, []);
+
  useEffect(() => {
    (async () => {
      if (!id) {
@@ -68,13 +128,19 @@ 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,
            carrierData.ru?.slogan || "",
            carrierData.ru?.logo || "",
-            "ru"
+            "ru",
+            colors,
          );
          setEditCarrierData(
            carrierData.en?.full_name || "",
@@ -82,7 +148,7 @@ export const CarrierEditPage = observer(() => {
            carrierData.en?.city_id || 0,
            carrierData.en?.slogan || "",
            carrierData.en?.logo || "",
-            "en"
+            "en",
          );
          setEditCarrierData(
            carrierData.zh?.full_name || "",
@@ -90,7 +156,7 @@ export const CarrierEditPage = observer(() => {
            carrierData.zh?.city_id || 0,
            carrierData.zh?.slogan || "",
            carrierData.zh?.logo || "",
-            "zh"
+            "zh",
          );
          setInitialCityName(carrierData.ru?.city || "");
        }
@@ -129,7 +195,7 @@ export const CarrierEditPage = observer(() => {
      editCarrierData.city_id,
      editCarrierData[language].slogan,
      media.id,
-      language
+      language,
    );
  };

@@ -211,7 +277,7 @@ export const CarrierEditPage = observer(() => {
                Number(e.target.value),
                editCarrierData[language].slogan,
                editCarrierData.logo,
-                language
+                language,
              )
            }
          >
@@ -235,7 +301,7 @@ export const CarrierEditPage = observer(() => {
              editCarrierData.city_id,
              editCarrierData[language].slogan,
              editCarrierData.logo,
-              language
+              language,
            )
          }
        />
@@ -252,7 +318,7 @@ export const CarrierEditPage = observer(() => {
              editCarrierData.city_id,
              editCarrierData[language].slogan,
              editCarrierData.logo,
-              language
+              language,
            )
          }
        />
@@ -268,11 +334,77 @@ export const CarrierEditPage = observer(() => {
              editCarrierData.city_id,
              e.target.value,
              editCarrierData.logo,
-              language
+              language,
            )
          }
        />

+        <div className="w-full flex flex-col gap-6">
+          <div className="flex flex-col gap-1">
+            <ColorPickerField
+              label="Основной цвет"
+              value={editCarrierData.main_color}
+              onChange={(val) =>
+                setEditCarrierData(
+                  editCarrierData[language].full_name,
+                  editCarrierData[language].short_name,
+                  editCarrierData.city_id,
+                  editCarrierData[language].slogan,
+                  editCarrierData.logo,
+                  language,
+                  { ...colorFields(editCarrierData), main_color: val },
+                )
+              }
+            />
+            <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,
+                  editCarrierData[language].slogan,
+                  editCarrierData.logo,
+                  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,
+                  editCarrierData[language].slogan,
+                  editCarrierData.logo,
+                  language,
+                  { ...colorFields(editCarrierData), right_color: val },
+                )
+              }
+            />
+            <p className="text-xs text-gray-500 pl-1">
+              Используется в: список достопримечательностей (фон, карточки),
+              правый виджет достопримечательности
+            </p>
+          </div>
+        </div>
+
        <div className="w-full flex flex-col gap-4 max-w-[300px] mx-auto">
          <ImageUploadCard
            title="Логотип перевозчика"
@@ -346,7 +478,7 @@ export const CarrierEditPage = observer(() => {
            editCarrierData.city_id,
            editCarrierData[language].slogan,
            "",
-            language
+            language,
          );
          setIsDeleteLogoModalOpen(false);
        }}
--- a/src/pages/Carrier/CarrierListPage/index.tsx
+++ b/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, SearchInput } from "@shared";
+import { authStore, carrierStore, cityStore, languageStore, selectedCityStore, 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]);
+  }, [language, selectedCityStore.cityVersion]);

  const columns: GridColDef[] = [
    {
@@ -98,10 +98,11 @@ export const CarrierListPage = observer(() => {
      sortable: false,
      renderCell: (params: GridRenderCellParams) => (
        <div className="flex h-full gap-7 justify-center items-center">
-          <button onClick={() => navigate(`/carrier/${params.row.id}/edit`)}>
+          <button title="Редактировать" onClick={() => navigate(`/carrier/${params.row.id}/edit`)}>
            <Pencil size={20} className="text-blue-500" />
          </button>
          <button
+            title="Удалить"
            onClick={() => {
              setIsDeleteModalOpen(true);
              setRowId(params.row.id);
@@ -161,7 +162,9 @@ export const CarrierListPage = observer(() => {
          </div>
        )}

+        {(rows.length > 0 || searchQuery) && (
          <SearchInput value={searchQuery} onChange={setSearchQuery} />
+        )}

        <DataGrid
          rows={rows}
@@ -169,6 +172,11 @@ export const CarrierListPage = observer(() => {
          checkboxSelection={canWriteCarriers}
          disableRowSelectionExcludeModel
          disableRowSelectionOnClick
+          onRowDoubleClick={(params) => {
+            if (canWriteCarriers) {
+              navigate(`/carrier/${params.id}/edit`);
+            }
+          }}
          loading={isLoading}
          paginationModel={paginationModel}
          onPaginationModelChange={setPaginationModel}
--- a/src/pages/City/CityCreatePage/index.tsx
+++ b/src/pages/City/CityCreatePage/index.tsx
@@ -17,16 +17,24 @@ 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;
@@ -53,7 +61,13 @@ 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) {
@@ -143,9 +157,9 @@ export const CityCreatePage = observer(() => {
        <TextField
          fullWidth
          label="Код города для погоды"
-          type="number"
          value={createCityData.weather_city_code ?? 0}
          onChange={(e) => setCreateCityWeatherCode(Number(e.target.value))}
+          helperText="ID города брать с ресурса openweathermap.org"
        />

        <div className="w-full flex flex-col gap-4 max-w-[300px] mx-auto">
--- a/src/pages/City/CityEditPage/index.tsx
+++ b/src/pages/City/CityEditPage/index.tsx
@@ -23,12 +23,19 @@ 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);
@@ -189,9 +196,9 @@ export const CityEditPage = observer(() => {
        <TextField
          fullWidth
          label="Код города для погоды"
-          type="number"
          value={editCityData.weather_city_code ?? 0}
          onChange={(e) => setEditCityWeatherCode(Number(e.target.value))}
+          helperText="ID города брать с ресурса openweathermap.org"
        />

        <div className="w-full flex flex-col gap-4 max-w-[300px] mx-auto">
--- a/src/pages/City/CityListPage/index.tsx
+++ b/src/pages/City/CityListPage/index.tsx
@@ -114,10 +114,11 @@ export const CityListPage = observer(() => {
      sortable: false,
      renderCell: (params: GridRenderCellParams) => (
        <div className="flex h-full gap-7 justify-center items-center">
-          <button onClick={() => navigate(`/city/${params.row.id}/edit`)}>
+          <button title="Редактировать" onClick={() => navigate(`/city/${params.row.id}/edit`)}>
            <Pencil size={20} className="text-blue-500" />
          </button>
          <button
+            title="Удалить"
            onClick={(e) => {
              e.stopPropagation();
              setIsDeleteModalOpen(true);
@@ -139,7 +140,10 @@ export const CityListPage = observer(() => {
        <div className="flex justify-between items-center mb-10">
          <h1 className="text-2xl">Города</h1>
          {canWriteCities && (
-            <CreateButton label="Создать город" path="/city/create" />
+            <CreateButton
+              label="Создать город"
+              path="/city/create"
+            />
          )}
        </div>

@@ -155,7 +159,9 @@ export const CityListPage = observer(() => {
          </div>
        )}

+        {(rows.length > 0 || searchQuery) && (
          <SearchInput value={searchQuery} onChange={setSearchQuery} />
+        )}

        <DataGrid
          rows={filteredRows}
@@ -163,6 +169,11 @@ export const CityListPage = observer(() => {
          checkboxSelection={canWriteCities}
          disableRowSelectionExcludeModel
          disableRowSelectionOnClick
+          onRowDoubleClick={(params) => {
+            if (canWriteCities) {
+              navigate(`/city/${params.id}/edit`);
+            }
+          }}
          loading={isLoading}
          paginationModel={paginationModel}
          onPaginationModelChange={setPaginationModel}
@@ -195,7 +206,11 @@ export const CityListPage = observer(() => {
          slots={{
            noRowsOverlay: () => (
              <Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
-                {isLoading ? <CircularProgress size={20} /> : "Нет городов"}
+                {isLoading ? (
+                  <CircularProgress size={20} />
+                ) : (
+                  "Нет городов"
+                )}
              </Box>
            ),
          }}
--- a/src/pages/Country/CountryAddPage/index.tsx
+++ b/src/pages/Country/CountryAddPage/index.tsx
@@ -15,11 +15,18 @@ import {
  RU_COUNTRIES,
  EN_COUNTRIES,
  ZH_COUNTRIES,
+  selectedCityStore,
 } from "@shared";
-import { useState } from "react";
+import { useState, useEffect } 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;

--- a/src/pages/Country/CountryCreatePage/index.tsx
+++ b/src/pages/Country/CountryCreatePage/index.tsx
@@ -4,12 +4,18 @@ 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 } from "@shared";
-import { useState } from "react";
+import { countryStore, languageStore, selectedCityStore } from "@shared";
+import { useState, useEffect } 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;
--- a/src/pages/Country/CountryEditPage/index.tsx
+++ b/src/pages/Country/CountryEditPage/index.tsx
@@ -4,12 +4,18 @@ 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 } from "@shared";
+import { countryStore, languageStore, LoadingSpinner, selectedCityStore } 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;
--- a/src/pages/Country/CountryListPage/index.tsx
+++ b/src/pages/Country/CountryListPage/index.tsx
@@ -92,7 +92,10 @@ export const CountryListPage = observer(() => {
        <div className="flex justify-between items-center mb-10">
          <h1 className="text-2xl">Страны</h1>
          {canWriteCountries && (
-            <CreateButton label="Добавить страну" path="/country/add" />
+            <CreateButton
+              label="Добавить страну"
+              path="/country/add"
+            />
          )}
        </div>

@@ -108,7 +111,9 @@ export const CountryListPage = observer(() => {
          </div>
        )}

+        {(rows.length > 0 || searchQuery) && (
          <SearchInput value={searchQuery} onChange={setSearchQuery} />
+        )}

        <DataGrid
          rows={rows}
@@ -148,7 +153,11 @@ export const CountryListPage = observer(() => {
          slots={{
            noRowsOverlay: () => (
              <Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
-                {isLoading ? <CircularProgress size={20} /> : "Нет стран"}
+                {isLoading ? (
+                  <CircularProgress size={20} />
+                ) : (
+                  "Нет стран"
+                )}
              </Box>
            ),
          }}
--- a/src/pages/CreateSightPage/index.tsx
+++ b/src/pages/CreateSightPage/index.tsx
@@ -5,6 +5,7 @@ import {
  cityStore,
  createSightStore,
  languageStore,
+  selectedCityStore,
 } from "@shared";
 import {
  CreateInformationTab,
@@ -14,6 +15,7 @@ import {
 } from "@widgets";
 import { useEffect, useState } from "react";
 import { observer } from "mobx-react-lite";
+import { runInAction } from "mobx";

 function a11yProps(index: number) {
  return {
@@ -30,6 +32,11 @@ 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);
  };
@@ -56,6 +63,14 @@ 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();
  }, []);
--- a/src/pages/EditSightPage/index.tsx
+++ b/src/pages/EditSightPage/index.tsx
@@ -9,6 +9,7 @@ import {
  cityStore,
  editSightStore,
  LoadingSpinner,
+  selectedCityStore,
 } from "@shared";
 import { useBlocker, useParams } from "react-router-dom";

@@ -25,6 +26,11 @@ 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;

--- a/src/pages/Media/MediaCreatePage/index.tsx
+++ b/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 } from "react";
+import { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";

@@ -20,6 +20,11 @@ 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);
--- a/src/pages/Media/MediaEditPage/index.tsx
+++ b/src/pages/Media/MediaEditPage/index.tsx
@@ -22,6 +22,7 @@ import {
  MEDIA_TYPE_LABELS,
  languageStore,
  LoadingSpinner,
+  selectedCityStore,
 } from "@shared";
 import { MediaViewer } from "@widgets";

@@ -42,6 +43,11 @@ 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);
--- a/src/pages/Media/MediaListPage/index.tsx
+++ b/src/pages/Media/MediaListPage/index.tsx
@@ -78,11 +78,12 @@ export const MediaListPage = observer(() => {
      sortable: false,
      renderCell: (params: GridRenderCellParams) => (
        <div className="flex h-full gap-7 justify-center items-center">
-          <button onClick={() => navigate(`/media/${params.row.id}`)}>
+          <button title="Просмотр" onClick={() => navigate(`/media/${params.row.id}`)}>
            <Eye size={20} className="text-green-500" />
          </button>
          {canWriteMedia && (
            <button
+              title="Удалить"
              onClick={() => {
                setIsDeleteModalOpen(true);
                setRowId(params.row.id);
@@ -112,7 +113,9 @@ 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">
--- a/src/pages/Route/RouteCreatePage/index.tsx
+++ b/src/pages/Route/RouteCreatePage/index.tsx
@@ -39,11 +39,18 @@ 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");
@@ -51,7 +58,7 @@ export const RouteCreatePage = observer(() => {
  const [turn, setTurn] = useState("");
  const [centerLat, setCenterLat] = useState("");
  const [centerLng, setCenterLng] = useState("");
-  const [videoTimer, setVideoTimer] = useState(60);
+  const [videoTimer, setVideoTimer] = useState(420);
  const [videoPreview, setVideoPreview] = useState<string>("");
  const [icon, setIcon] = useState<string>("");
  const [isLoading, setIsLoading] = useState(false);
@@ -286,6 +293,10 @@ 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`);
@@ -401,6 +412,18 @@ 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>
@@ -555,7 +578,7 @@ export const RouteCreatePage = observer(() => {
          />
          <TextField
            className="w-full"
-            label="Таймер видео (сек)"
+            label="Таймер видео заставки (сек)"
            type="number"
            value={videoTimer}
            onChange={(e) => {
--- a/src/pages/Route/RouteEditPage/index.tsx
+++ b/src/pages/Route/RouteEditPage/index.tsx
@@ -36,11 +36,18 @@ 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);
@@ -548,9 +555,9 @@ export const RouteEditPage = observer(() => {
          />
          <TextField
            className="w-full"
-            label="Таймер видео (сек)"
+            label="Таймер видео заставки (сек)"
            type="number"
-            value={editRouteData.video_timer ?? 60}
+            value={editRouteData.video_timer ?? 420}
            onChange={(e) => {
              const val = Math.max(1, Math.round(Number(e.target.value)));
              if (Number.isFinite(val)) {
@@ -559,6 +566,22 @@ 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>
--- a/src/pages/Route/RouteListPage/index.tsx
+++ b/src/pages/Route/RouteListPage/index.tsx
@@ -43,7 +43,7 @@ export const RouteListPage = observer(() => {
      loadCounts(routeIds);
    };
    fetchData();
-  }, [language]);
+  }, [language, selectedCityStore.cityVersion]);

  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,22 +178,23 @@ export const RouteListPage = observer(() => {
        return (
          <div className="flex h-full gap-7 justify-center items-center">
            {canWriteRoutes && (
-              <button onClick={() => navigate(`/route/${params.row.id}/edit`)}>
+              <button title="Редактировать" onClick={() => navigate(`/route/${params.row.id}/edit`)}>
                <Pencil size={20} className="text-blue-500" />
              </button>
            )}
            {canShowRoutePreview && (
-              <button onClick={() => navigate(`/route-preview/${params.row.id}`)}>
+              <button title="Предпросмотр на карте" onClick={() => navigate(`/route-preview/${params.row.id}`)}>
                <Map size={20} className="text-purple-500" />
              </button>
            )}
            {canShowRoutePreview && (
-              <button onClick={() => window.open(`/demo/${params.row.id}`, "_blank")}>
+              <button title="Демо" 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);
@@ -210,6 +211,9 @@ export const RouteListPage = observer(() => {

  const rows = useMemo(() => {
    const { selectedCityId } = selectedCityStore;
+    if (!selectedCityId) {
+      return [];
+    }
    const query = searchQuery.trim().toLowerCase();
    let filtered = routes.data;
    if (selectedCityId) {
@@ -247,7 +251,10 @@ export const RouteListPage = observer(() => {
        <div className="flex justify-between items-center mb-10">
          <h1 className="text-2xl">Маршруты</h1>
          {canWriteRoutes && (
-            <CreateButton label="Создать маршрут" path="/route/create" />
+            <CreateButton
+              label="Создать маршрут"
+              path="/route/create"
+            />
          )}
        </div>

@@ -263,7 +270,9 @@ export const RouteListPage = observer(() => {
          </div>
        )}

+        {(rows.length > 0 || searchQuery) && (
          <SearchInput value={searchQuery} onChange={setSearchQuery} />
+        )}

        <DataGrid
          rows={rows}
@@ -304,7 +313,13 @@ export const RouteListPage = observer(() => {
          slots={{
            noRowsOverlay: () => (
              <Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
-                {isLoading ? <CircularProgress size={20} /> : "Нет маршрутов"}
+                {isLoading ? (
+                  <CircularProgress size={20} />
+                ) : !selectedCityStore.selectedCityId ? (
+                  "Выберите город"
+                ) : (
+                  "Нет маршрутов"
+                )}
              </Box>
            ),
          }}
--- a/src/pages/Route/route-preview/InfiniteCanvas.tsx
+++ b/src/pages/Route/route-preview/InfiniteCanvas.tsx
@@ -1,232 +0,0 @@
-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>
-  );
-}
--- a/src/pages/Route/route-preview/LeftSidebar.tsx
+++ b/src/pages/Route/route-preview/LeftSidebar.tsx
@@ -1,4 +1,4 @@
-import { Box, Stack, Typography, Button } from "@mui/material";
+import { Button } from "@mui/material";
 import { useNavigate, useNavigationType } from "react-router";
 import { MediaViewer } from "@widgets";
 import { useMapData } from "./MapDataContext";
@@ -15,22 +15,24 @@ type LeftSidebarProps = {

 export const LeftSidebar = observer(({ open, onToggle }: LeftSidebarProps) => {
  const navigate = useNavigate();
-  const navigationType = useNavigationType(); // PUSH, POP, REPLACE
+  const navigationType = useNavigationType();
  const { routeData } = useMapData();
-  const [carrierThumbnail, setCarrierThumbnail] = useState<string | null>(null);
  const [carrierLogo, setCarrierLogo] = useState<string | null>(null);
+  const [carrierSlogan, setCarrierSlogan] = useState<string | null>(null);
+  const [carrierShortName, setCarrierShortName] = useState<string | null>(null);
+
  useEffect(() => {
-    async function fetchCarrierThumbnail() {
+    async function fetchCarrierData() {
      if (routeData?.carrier_id) {
-        const { city_id, logo } = (
+        const carrier = (
          await authInstance.get(`/carrier/${routeData.carrier_id}`)
        ).data;
-        const { arms } = (await authInstance.get(`/city/${city_id}`)).data;
-        setCarrierThumbnail(arms);
-        setCarrierLogo(logo);
+        setCarrierLogo(carrier.logo);
+        setCarrierSlogan(carrier.slogan ?? null);
+        setCarrierShortName(carrier.short_name ?? null);
      }
    }
-    fetchCarrierThumbnail();
+    fetchCarrierData();
  }, [routeData?.carrier_id]);

  const handleBack = () => {
@@ -42,131 +44,190 @@ export const LeftSidebar = observer(({ open, onToggle }: LeftSidebarProps) => {
  };

  return (
-    <Box
-      sx={{
+    <div
+      style={{
        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
-        direction="column"
-        height="100%"
-        width="100%"
-        spacing={4}
-        alignItems="stretch"
-        justifyContent="space-between"
-        sx={{
+      {/* Кнопка назад — вне основного меню */}
+      <div
+        style={{
+          padding: "12px 12px 0",
          opacity: open ? 1 : 0,
-          transition: "opacity 0.25s ease",
          pointerEvents: open ? "auto" : "none",
-          display: open ? "flex" : "none",
+          transition: "opacity 0.25s ease",
        }}
      >
-        <div>
        <Button
          onClick={handleBack}
          variant="contained"
-            color="primary"
          sx={{
            backgroundColor: "#222",
            color: "#fff",
            borderRadius: 1.5,
            px: 2,
            py: 1,
-              marginBottom: 10,
-              "&:hover": {
-                backgroundColor: "#2d2d2d",
-              },
+            "&:hover": { backgroundColor: "#2d2d2d" },
          }}
          fullWidth
          startIcon={<ArrowBackIcon />}
        >
          Назад
        </Button>
+      </div>

-          <Stack
-            direction="column"
-            alignItems="center"
-            justifyContent="center"
-            spacing={3}
-          >
+      {/* Основное меню — повторяет .side-menu */}
      <div
        style={{
-                maxWidth: 150,
+          boxSizing: "border-box",
+          paddingTop: 46,
          display: "flex",
          flexDirection: "column",
          alignItems: "center",
-                gap: 10,
+          height: "calc(100% - 56px)",
+          position: "relative",
+          opacity: open ? 1 : 0,
+          transition: "opacity 0.25s ease",
+          pointerEvents: open ? "auto" : "none",
        }}
      >
-              {carrierThumbnail && !isMediaIdEmpty(carrierThumbnail) && (
-                <MediaViewer
-                  media={{
-                    id: carrierThumbnail,
-                    media_type: 1, // Тип "Фото" для логотипа
-                    filename: "route_thumbnail",
+        {/* Герб — .side-menu-crest */}
+        <div
+          style={{
+            width: 170,
+            height: 170,
+            alignSelf: "flex-start",
+            marginLeft: 20,
+            backgroundColor: "rgba(255,255,255,0.15)",
+            borderRadius: 8,
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            color: "rgba(255,255,255,0.5)",
+            fontSize: 14,
+            fontWeight: 500,
          }}
-                  fullWidth
-                  fullHeight
-                />
+        >
+          Герб
+        </div>
+
+        {/* Слоган — .side-menu-label */}
+        {carrierSlogan && (
+          <div
+            style={{
+              marginTop: 10,
+              textAlign: "left",
+              fontSize: 15,
+              padding: "0 20px",
+              alignSelf: "flex-start",
+              fontWeight: 400,
+              lineHeight: "150%",
+            }}
+          >
+            {carrierSlogan}
+          </div>
        )}
-              <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>
-
-        <Stack
-          direction="column"
-          alignItems="center"
-          maxHeight={150}
-          justifyContent="center"
-          flexGrow={1}
+        {/* Кнопки — .side-menu-buttons */}
+        <div
+          style={{
+            width: 220,
+            marginTop: routeData?.governor_appeal || 0 > 0 ? 40 : 260,
+          }}
        >
+          <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-carrier-block */}
+          <div style={{ padding: "0 20px" }}>
            {carrierLogo && !isMediaIdEmpty(carrierLogo) && (
+              <div style={{ width: 170 }}>
                <MediaViewer
                  media={{
                    id: carrierLogo,
-                media_type: 1, // Тип "Фото" для логотипа
-                filename: "route_thumbnail_logo",
+                    media_type: 1,
+                    filename: "carrier_logo",
                  }}
-              fullHeight
+                  fullWidth
                />
+              </div>
            )}
-        </Stack>
-
-        <Typography
-          variant="h6"
-          textAlign="center"
-          sx={{ color: "#fff", marginTop: "auto" }}
+            {carrierShortName && (
+              <div
+                style={{
+                  marginTop: 4,
+                  textAlign: "left",
+                  fontSize: 16,
+                  fontWeight: 700,
+                  lineHeight: "150%",
+                  color: "#fff",
+                }}
              >
-          #ВсемПоПути
-        </Typography>
-      </Stack>
+                {carrierShortName}
+              </div>
+            )}
+          </div>

-      <div className="absolute bottom-[20px] -right-[520px] z-10">
+          {/* .side-menu-bottom-photo */}
+          <img
+            src="/side-menu-photo.png"
+            alt=""
+            style={{
+              width: "288px",
+              marginTop: 32,
+              display: "block",
+              pointerEvents: "none",
+            }}
+          />
+        </div>
+      </div>
+
+      <div
+        className="absolute bottom-[20px] z-10"
+        style={{
+          right: open ? -520 : -312,
+          transition: "right 0.3s ease",
+        }}
+      >
        <LanguageSelector onBack={onToggle} isSidebarOpen={open} />
      </div>
-    </Box>
+    </div>
  );
 });
--- a/src/pages/Route/route-preview/Sight.tsx
+++ b/src/pages/Route/route-preview/Sight.tsx
@@ -1,137 +0,0 @@
-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>
-  );
-};
--- a/src/pages/Route/route-preview/Station.tsx
+++ b/src/pages/Route/route-preview/Station.tsx
@@ -1,541 +0,0 @@
-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>
-  );
-};
--- a/src/pages/Route/route-preview/TravelPath.tsx
+++ b/src/pages/Route/route-preview/TravelPath.tsx
@@ -1,34 +0,0 @@
-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} />;
-}
--- a/src/pages/Route/route-preview/index.tsx
+++ b/src/pages/Route/route-preview/index.tsx
@@ -1,14 +1,5 @@
 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";
@@ -22,15 +13,6 @@ 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();

@@ -54,7 +36,8 @@ export const RoutePreview = () => {
          <Box
            sx={{
              position: "relative",
-              width: isLeftSidebarOpen ? 300 : 0,
+              zIndex: 20,
+              width: isLeftSidebarOpen ? 288 : 0,
              transition: "width 0.3s ease",
              overflow: "visible",
              height: "100%",
@@ -145,14 +128,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);
    }
@@ -171,25 +154,6 @@ 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>
  );
--- a/src/pages/Route/route-preview/types.ts
+++ b/src/pages/Route/route-preview/types.ts
@@ -6,6 +6,7 @@ export interface RouteData {
  icon_size?: number;
  font_size: number;
  governor_appeal: number;
+  button_text?: string;
  id: number;
  path: [number, number][];
  rotate: number;
--- a/src/pages/Route/route-preview/webgl-prototype/RouteWidget.module.css
+++ b/src/pages/Route/route-preview/webgl-prototype/RouteWidget.module.css
@@ -26,10 +26,12 @@
  position: fixed;
  display: inline-flex;
  border-radius: 10px;
-  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.3) inset,
+  box-shadow:
+    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: linear-gradient(
+  background:
+    linear-gradient(
      to bottom right,
      rgba(255, 255, 255, 0.2) 0%,
      rgba(255, 255, 255, 0) 100%
@@ -50,7 +52,8 @@
  height: 96px;
  background-color: #fcd500;
  color: black;
-  border-radius: 10px;
+  border-top-left-radius: 10px;
+  border-bottom-left-radius: 10px;
  display: flex;
  justify-content: center;
  align-items: center;
@@ -59,6 +62,18 @@
  font-weight: 900;
 }

+.route-widget-number--3 {
+  font-size: 50px;
+}
+
+.route-widget-number--4 {
+  font-size: 38px;
+}
+
+.route-widget-number--5 {
+  font-size: 30px;
+}
+
 .route-widget-content {
  overflow: hidden;
  width: 257px;
--- a/src/pages/Route/route-preview/webgl-prototype/RouteWidget.tsx
+++ b/src/pages/Route/route-preview/webgl-prototype/RouteWidget.tsx
@@ -6,6 +6,14 @@ import { observer } from "mobx-react-lite";
 const shouldAnimate = (text: string | undefined, maxLength: number) =>
  (text?.length ?? 0) > maxLength;

+const getNumberSizeClass = (text: string | undefined) => {
+  const length = text?.length ?? 0;
+  if (length <= 2) return "";
+  if (length === 3) return styles["route-widget-number--3"];
+  if (length === 4) return styles["route-widget-number--4"];
+  return styles["route-widget-number--5"];
+};
+
 const getLabelSizeClass = (text: string | undefined) => {
  const length = text?.length ?? 0;
  if (length <= 40) return "";
@@ -33,7 +41,7 @@ export const RouteWidget = observer(() => {

  return (
    <div className={styles["route-widget"]} style={{ position: "relative" }}>
-      <div className={styles["route-widget-number"]}>
+      <div className={[styles["route-widget-number"], getNumberSizeClass(routeData?.route_sys_number)].join(" ")}>
        {routeData?.route_sys_number || ""}
      </div>
      <div className={styles["route-widget-content"]}>
--- a/src/pages/Route/route-preview/webgl-prototype/WebGLRouteMapPrototype.tsx
+++ b/src/pages/Route/route-preview/webgl-prototype/WebGLRouteMapPrototype.tsx
@@ -2327,9 +2327,6 @@ 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);
@@ -2339,8 +2336,6 @@ 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`;

@@ -2359,6 +2354,13 @@ 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;
@@ -2404,13 +2406,7 @@ export const WebGLRouteMapPrototype = observer(() => {
              hoveredStationIconId === station.id ||
              resizingStationIconId === station.id;

-            const secondaryLineHeight = 1.2;
-            const secondaryHeight = showSecondary
-              ? secondaryFontSize * secondaryLineHeight
-              : 0;
-            const menuPaddingTop = showSecondary
-              ? Math.max(0, secondaryHeight - secondaryMarginTop) + 3
-              : 3;
+            const secondaryLineHeight = 1.2 * scaleFactor;

            return (
              <div key={station.id}>
@@ -2440,7 +2436,7 @@ export const WebGLRouteMapPrototype = observer(() => {
                    color: "#fff",
                    fontFamily: "Roboto, sans-serif",
                    textAlign: "left",
-                    pointerEvents: "auto",
+                    pointerEvents: "none",
                    cursor: "grab",
                    userSelect: "none",
                    touchAction: "none",
@@ -2448,14 +2444,16 @@ export const WebGLRouteMapPrototype = observer(() => {
                >
                  <div
                    style={{
-                      pointerEvents: "auto",
+                      display: "inline-block",
+                      pointerEvents: "none",
                      transformOrigin: "left center",
                      transform: `rotate(${rotationCss})`,
                    }}
                  >
                    <div
                      style={{
-                        pointerEvents: "auto",
+                        display: "inline-block",
+                        pointerEvents: "none",
                        transformOrigin: "left center",
                        transform: `rotate(${counterRotationCss})`,
                      }}
@@ -2549,6 +2547,7 @@ export const WebGLRouteMapPrototype = observer(() => {
                        ) : null}
                        <div
                          style={{
+                            position: "relative",
                            fontWeight: 700,
                            fontSize: primaryFontSize,
                            textShadow: "0 0 4px rgba(0,0,0,0.6)",
@@ -2557,7 +2556,6 @@ export const WebGLRouteMapPrototype = observer(() => {
                          }}
                        >
                          {station.name}
-                        </div>
                          {showSecondary ? (
                            <div
                              style={{
@@ -2580,6 +2578,7 @@ export const WebGLRouteMapPrototype = observer(() => {
                        </div>
                      </div>
                    </div>
+                  </div>
                  {hoveredStationId === station.id && (
                    <div
                      style={{
@@ -2587,9 +2586,9 @@ export const WebGLRouteMapPrototype = observer(() => {
                        top: "100%",
                        left: "50%",
                        transform: "translateX(-50%)",
-                        paddingTop: menuPaddingTop,
+                        paddingTop: "8px",
                        pointerEvents: "auto",
-                        zIndex: 10,
+                        zIndex: 1000000,
                        cursor: "default",
                      }}
                      onPointerDown={(e) => e.stopPropagation()}
--- a/src/pages/Sight/SightListPage/index.tsx
+++ b/src/pages/Sight/SightListPage/index.tsx
@@ -46,7 +46,7 @@ export const SightListPage = observer(() => {
      setIsLoading(false);
    };
    fetchSights();
-  }, [language]);
+  }, [language, selectedCityStore.cityVersion]);

  const columns: GridColDef[] = [
    {
@@ -105,10 +105,11 @@ export const SightListPage = observer(() => {
      sortable: false,
      renderCell: (params: GridRenderCellParams) => (
        <div className="flex h-full gap-7 justify-center items-center">
-          <button onClick={() => navigate(`/sight/${params.row.id}/edit`)}>
+          <button title="Редактировать" onClick={() => navigate(`/sight/${params.row.id}/edit`)}>
            <Pencil size={20} className="text-blue-500" />
          </button>
          <button
+            title="Удалить"
            onClick={() => {
              setIsDeleteModalOpen(true);
              setRowId(params.row.id);
@@ -121,8 +122,11 @@ export const SightListPage = observer(() => {
    }] : []),
  ];

-  const filteredSights = useMemo(() => {
  const { selectedCityId } = selectedCityStore;
+  const filteredSights = useMemo(() => {
+    if (!selectedCityId) {
+      return [];
+    }
    const allowedCityIds = canReadCities
      ? null
      : authStore.meCities["ru"].map((c) => c.city_id);
@@ -131,12 +135,12 @@ export const SightListPage = observer(() => {
      if (allowedCityIds && !allowedCityIds.includes(sight.city_id)) {
        return false;
      }
-      if (selectedCityId && sight.city_id !== selectedCityId) {
+      if (sight.city_id !== selectedCityId) {
        return false;
      }
      return true;
    });
-  }, [sights, selectedCityStore.selectedCityId, canReadCities, authStore.meCities]);
+  }, [sights, selectedCityId, canReadCities, authStore.meCities]);

  const query = searchQuery.trim().toLowerCase();
  const rows = filteredSights
@@ -177,7 +181,9 @@ export const SightListPage = observer(() => {
          </div>
        )}

+        {(rows.length > 0 || searchQuery) && (
          <SearchInput value={searchQuery} onChange={setSearchQuery} />
+        )}

        <DataGrid
          rows={rows}
@@ -216,6 +222,8 @@ export const SightListPage = observer(() => {
              <Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
                {isLoading ? (
                  <CircularProgress size={20} />
+                ) : !selectedCityId ? (
+                  "Выберите город"
                ) : (
                  "Нет достопримечательностей"
                )}
--- a/src/pages/Snapshot/SnapshotCreatePage/index.tsx
+++ b/src/pages/Snapshot/SnapshotCreatePage/index.tsx
@@ -1,46 +1,58 @@
-import { Button, TextField } from "@mui/material";
-import { snapshotStore } from "@shared";
+import {
+  Button,
+  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 } from "react";
+import { useState, useEffect, useMemo } 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[]>([]);

-  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}
-            onChange={(e) => setName(e.target.value)}
-          />
+  const exportNameRegex = useMemo(() => {
+    const names = cityStore.cities["ru"].data.map((c) => c.name.trim());
+    return buildExportNameRegex(names);
+  }, [cityStore.cities["ru"].data.length]);

-          <Button
-            variant="contained"
-            color="primary"
-            className="w-min flex gap-2 items-center"
-            startIcon={<Save size={20} />}
-            onClick={async () => {
+  useEffect(() => {
+    if (!cityStore.cities["ru"].loaded) {
+      cityStore.getCities("ru");
+    }
+  }, []);
+
+  const canReadRoutes = authStore.canRead("routes");
+
+  const startExport = async () => {
    try {
      setIsLoading(true);
      const id = await createSnapshot(name);
@@ -68,8 +80,118 @@ 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">
@@ -87,6 +209,45 @@ 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>
  );
 });
--- a/src/pages/Snapshot/SnapshotListPage/index.tsx
+++ b/src/pages/Snapshot/SnapshotListPage/index.tsx
@@ -1,14 +1,24 @@
 import { DataGrid, GridColDef, GridRenderCellParams } from "@mui/x-data-grid";
 import { ruRU } from "@mui/x-data-grid/locales";
-import { authStore, languageStore, snapshotStore, SearchInput } from "@shared";
+import { authStore, languageStore, snapshotStore, cityStore, vehicleStore, 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 } from "@mui/material";
+import { Alert, Box, Button, CircularProgress, Dialog, DialogActions, DialogContent, DialogTitle, TextField, Typography } 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",
@@ -33,11 +43,14 @@ 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);
@@ -45,6 +58,12 @@ 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,
@@ -61,7 +80,11 @@ export const SnapshotListPage = observer(() => {
  useEffect(() => {
    const fetchSnapshots = async () => {
      setIsLoading(true);
-      await Promise.all([getSnapshots(), getStorageInfo()]);
+      const promises: Promise<void>[] = [getSnapshots(), getStorageInfo()];
+      if (canReadDevices && !vehicleStore.vehicles.loaded) {
+        promises.push(vehicleStore.getVehicles());
+      }
+      await Promise.all(promises);
      setIsLoading(false);
    };
    fetchSnapshots();
@@ -76,6 +99,26 @@ 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: "Название",
@@ -117,6 +160,7 @@ 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);
@@ -125,9 +169,22 @@ 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(params.row.id);
+                    setRowId(snapshotId);
                  }}
                >
                  <Trash2 size={20} className="text-red-500" />
@@ -150,12 +207,13 @@ export const SnapshotListPage = observer(() => {
            .toLowerCase()
            .includes(query),
      )
-      .map((snapshot) => ({
+      .map((snapshot, index) => ({
        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]);

@@ -178,10 +236,11 @@ export const SnapshotListPage = observer(() => {
                disabled={isLowStorage}
                onClick={() => {
                  setEmptySnapshotName("");
+                  setEmptySnapshotNameError(null);
                  setIsEmptySnapshotModalOpen(true);
                }}
              >
-                Создать пустой снапшот
+                Создать пустой экспорт
              </Button>
            )}
            {canCreateSnapshot && (
@@ -203,7 +262,7 @@ export const SnapshotListPage = observer(() => {
            </div>

            <div className="flex w-full h-3 rounded-lg overflow-hidden bg-gray-100">
-              {rows.map((row, i) => {
+              {rows.map((row) => {
                const pct =
                  row.occupied_disk_space_gb != null && totalGB > 0
                    ? (row.occupied_disk_space_gb / totalGB) * 100
@@ -214,8 +273,7 @@ export const SnapshotListPage = observer(() => {
                    key={row.id}
                    style={{
                      width: `${pct}%`,
-                      backgroundColor:
-                        SEGMENT_COLORS[i % SEGMENT_COLORS.length],
+                      backgroundColor: row.color,
                    }}
                    title={`${row.name}: ${row.occupied_disk_space_gb?.toFixed(1)} ГБ`}
                  />
@@ -233,7 +291,7 @@ export const SnapshotListPage = observer(() => {
            </div>

            <div className="flex flex-wrap gap-x-5 gap-y-1 mt-3">
-              {rows.map((row, i) => {
+              {rows.map((row) => {
                if (row.occupied_disk_space_gb == null || row.occupied_disk_space_gb <= 0)
                  return null;
                return (
@@ -243,10 +301,7 @@ export const SnapshotListPage = observer(() => {
                  >
                    <span
                      className="inline-block w-2.5 h-2.5 rounded-full"
-                      style={{
-                        backgroundColor:
-                          SEGMENT_COLORS[i % SEGMENT_COLORS.length],
-                      }}
+                      style={{ backgroundColor: row.color }}
                    />
                    {row.name}
                  </div>
@@ -280,7 +335,9 @@ export const SnapshotListPage = observer(() => {
          </Alert>
        )}

+        {(rows.length > 0 || searchQuery) && (
          <SearchInput value={searchQuery} onChange={setSearchQuery} />
+        )}

        <DataGrid
          rows={rows}
@@ -325,14 +382,26 @@ export const SnapshotListPage = observer(() => {
        fullWidth
        maxWidth="xs"
      >
-        <DialogTitle>Создать пустой снапшот</DialogTitle>
+        <DialogTitle>Создать пустой экспорт</DialogTitle>
        <DialogContent>
          <TextField
            autoFocus
            fullWidth
            label="Название"
            value={emptySnapshotName}
-            onChange={(e) => setEmptySnapshotName(e.target.value)}
+            error={!!emptySnapshotNameError}
+            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>
@@ -342,7 +411,7 @@ export const SnapshotListPage = observer(() => {
          </Button>
          <Button
            variant="contained"
-            disabled={!emptySnapshotName.trim() || isCreatingEmpty}
+            disabled={!exportNameRegex.test(emptySnapshotName.trim()) || isCreatingEmpty}
            onClick={async () => {
              setIsCreatingEmpty(true);
              try {
@@ -359,6 +428,36 @@ 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}
--- a/src/pages/Station/StationCreatePage/index.tsx
+++ b/src/pages/Station/StationCreatePage/index.tsx
@@ -19,6 +19,7 @@ import {
  mediaStore,
  isMediaIdEmpty,
  useSelectedCity,
+  selectedCityStore,
  SelectMediaDialog,
  UploadMediaDialog,
  PreviewMediaDialog,
@@ -32,6 +33,12 @@ 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 {
--- a/src/pages/Station/StationEditPage/index.tsx
+++ b/src/pages/Station/StationEditPage/index.tsx
@@ -19,6 +19,7 @@ import {
  mediaStore,
  isMediaIdEmpty,
  LoadingSpinner,
+  selectedCityStore,
  SelectMediaDialog,
  PreviewMediaDialog,
  UploadMediaDialog,
@@ -34,6 +35,12 @@ 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;
--- a/src/pages/Station/StationListPage/index.tsx
+++ b/src/pages/Station/StationListPage/index.tsx
@@ -49,7 +49,7 @@ export const StationListPage = observer(() => {
      loadSightCounts(stationIds);
    };
    fetchStations();
-  }, [language]);
+  }, [language, selectedCityStore.cityVersion]);

  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 onClick={() => navigate(`/station/${params.row.id}/edit`)}>
+              <button title="Редактировать" onClick={() => navigate(`/station/${params.row.id}/edit`)}>
                <Pencil size={20} className="text-blue-500" />
              </button>
            )}
@@ -151,13 +151,14 @@ 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);
@@ -174,9 +175,12 @@ 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) => !selectedCityId || station.city_id === selectedCityId)
+      .filter((station: any) => station.city_id === selectedCityId)
      .filter(
        (station: any) =>
          !query ||
@@ -202,7 +206,10 @@ export const StationListPage = observer(() => {
        <div className="flex justify-between items-center mb-10">
          <h1 className="text-2xl">Остановки</h1>
          {canWriteStations && (
-            <CreateButton label="Создать остановку" path="/station/create" />
+            <CreateButton
+              label="Создать остановку"
+              path="/station/create"
+            />
          )}
        </div>

@@ -218,7 +225,9 @@ export const StationListPage = observer(() => {
          </div>
        )}

+        {(rows.length > 0 || searchQuery) && (
          <SearchInput value={searchQuery} onChange={setSearchQuery} />
+        )}

        <DataGrid
          rows={rows}
@@ -277,7 +286,13 @@ export const StationListPage = observer(() => {
          slots={{
            noRowsOverlay: () => (
              <Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
-                {isLoading ? <CircularProgress size={20} /> : "Нет остановок"}
+                {isLoading ? (
+                  <CircularProgress size={20} />
+                ) : !selectedCityStore.selectedCityId ? (
+                  "Выберите город"
+                ) : (
+                  "Нет остановок"
+                )}
              </Box>
            ),
          }}
--- a/src/pages/User/UserCreatePage/index.tsx
+++ b/src/pages/User/UserCreatePage/index.tsx
@@ -1,4 +1,11 @@
-import { Button, Paper, TextField } from "@mui/material";
+import {
+  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";
@@ -10,9 +17,10 @@ import {
  SelectMediaDialog,
  UploadMediaDialog,
  PreviewMediaDialog,
+  selectedCityStore,
 } from "@shared";
 import { useState, useEffect } from "react";
-import { ImageUploadCard } from "@widgets";
+import { ImageUploadCard, PermissionsTable, RolesHintTable, ROLE_RESOURCES } from "@widgets";

 export const UserCreatePage = observer(() => {
  const navigate = useNavigate();
@@ -26,13 +34,38 @@ 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");
@@ -67,18 +100,15 @@ export const UserCreatePage = observer(() => {
    : selectedMedia?.id ?? createUserData.icon ?? null;

  return (
-    <Paper className="w-full h-full p-3 flex flex-col gap-10">
-      <div className="flex items-center gap-4">
-        <button
-          className="flex items-center gap-2"
-          onClick={() => navigate(-1)}
-        >
+    <Paper className="w-full p-6 flex flex-col gap-8">
+      <button className="flex items-center gap-2 self-start" onClick={() => navigate(-1)}>
        <ArrowLeft size={20} />
        Назад
      </button>
-      </div>

-      <div className="flex flex-col gap-10 w-full items-end">
+      <section className="flex flex-col gap-6">
+        <Typography variant="h6">Основные данные</Typography>
+
        <TextField
          fullWidth
          label="Имя"
@@ -116,6 +146,7 @@ export const UserCreatePage = observer(() => {
          label="Пароль"
          value={createUserData.password || ""}
          required
+          type="password"
          onChange={(e) =>
            setCreateUserData(
              createUserData.name || "",
@@ -127,7 +158,7 @@ export const UserCreatePage = observer(() => {
          }
        />

-        <div className="w-full flex flex-col gap-4 max-w-[300px] mx-auto">
+        <div className="w-full flex flex-col gap-4 max-w-[300px]">
          <ImageUploadCard
            title="Аватар"
            imageKey="thumbnail"
@@ -156,14 +187,64 @@ 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="w-min flex gap-2 items-center"
+        className="self-end w-min flex gap-2 items-center"
        startIcon={<Save size={20} />}
        onClick={handleCreate}
        disabled={
-            isLoading || !createUserData.name || !createUserData.password
+          isLoading || !createUserData.name || !createUserData.password || !createUserData.email
        }
      >
        {isLoading ? (
@@ -172,7 +253,6 @@ export const UserCreatePage = observer(() => {
          "Создать"
        )}
      </Button>
-      </div>

      <SelectMediaDialog
        open={isSelectMediaOpen}
--- a/src/pages/User/UserEditPage/index.tsx
+++ b/src/pages/User/UserEditPage/index.tsx
@@ -1,18 +1,9 @@
 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";
@@ -31,45 +22,12 @@ import {
  authStore,
  cityStore,
  MultiSelect,
+  selectedCityStore,
  type User,
  type UserCity,
 } from "@shared";
 import { useEffect, useState } from "react";
-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;
-}
+import { ImageUploadCard, DeleteModal, PermissionsTable, RolesHintTable, ROLE_RESOURCES } from "@widgets";

 export const UserEditPage = observer(() => {
  const navigate = useNavigate();
@@ -93,10 +51,29 @@ 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) {
@@ -311,175 +288,36 @@ export const UserEditPage = observer(() => {
      <section className="flex flex-col gap-4">
        <Typography variant="h6">Права доступа</Typography>

-        <FormControlLabel
-          control={
-            <Checkbox
-              checked={localRoles.includes("admin")}
-              onChange={(e) => {
-                if (e.target.checked) {
-                  setLocalRoles((prev) => {
-                    let next = prev.filter((r) => r !== "admin");
+        <Box sx={{ display: "flex", gap: 1 }}>
+          <Button
+            variant="outlined"
+            size="small"
+            onClick={() => {
+              setEditUserData(editUserData.name || "", editUserData.email || "", editUserData.password || "", true, editUserData.icon || "");
+              const next: string[] = [];
              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");
-                    }
-                    if (!next.includes("devices_maintenance_rw")) {
-                      next.push("devices_maintenance_rw");
-                    }
-                    next.push("admin");
-                    return next;
-                  });
-                } else {
-                  setLocalRoles((prev) => prev.filter((r) => r !== "admin"));
-                }
+              setLocalRoles(next);
            }}
-            />
-          }
-          label="Полный доступ (admin)"
-        />
-
-        <Box sx={{ border: "1px solid", borderColor: "divider", borderRadius: 1 }}>
-          <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)
-                          }
+            Полный доступ (admin)
+          </Button>
+          <Button
+            variant="outlined"
            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>
+            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} />
+        <RolesHintTable />
      </section>

      <Divider />
--- a/src/pages/User/UserListPage/index.tsx
+++ b/src/pages/User/UserListPage/index.tsx
@@ -92,10 +92,11 @@ export const UserListPage = observer(() => {
      sortable: false,
      renderCell: (params: GridRenderCellParams) => (
        <div className="flex h-full gap-7 justify-center items-center">
-          <button onClick={() => navigate(`/user/${params.row.id}/edit`)}>
+          <button title="Редактировать" onClick={() => navigate(`/user/${params.row.id}/edit`)}>
            <Pencil size={20} className="text-blue-500" />
          </button>
          <button
+            title="Удалить"
            onClick={() => {
              setIsDeleteModalOpen(true);
              setRowId(params.row.id);
@@ -146,7 +147,9 @@ export const UserListPage = observer(() => {
          </div>
        )}

+        {(rows.length > 0 || searchQuery) && (
          <SearchInput value={searchQuery} onChange={setSearchQuery} />
+        )}

        <DataGrid
          rows={rows}
@@ -154,6 +157,11 @@ export const UserListPage = observer(() => {
          checkboxSelection={canWriteUsers}
          disableRowSelectionExcludeModel
          disableRowSelectionOnClick
+          onRowDoubleClick={(params) => {
+            if (canWriteUsers) {
+              navigate(`/user/${params.row.id}/edit`);
+            }
+          }}
          loading={isLoading}
          paginationModel={paginationModel}
          onPaginationModelChange={setPaginationModel}
--- a/src/pages/Vehicle/VehicleCreatePage/index.tsx
+++ b/src/pages/Vehicle/VehicleCreatePage/index.tsx
@@ -12,6 +12,8 @@ import {
  VEHICLE_TYPES,
  carrierStore,
  languageStore,
+  cityStore,
+  selectedCityStore,
 } from "@shared";
 import { observer } from "mobx-react-lite";
 import { ArrowLeft, Save } from "lucide-react";
@@ -26,11 +28,18 @@ 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 () => {
@@ -43,6 +52,7 @@ export const VehicleCreatePage = observer(() => {
          ?.full_name as string,
        carrierId!,
        model || undefined,
+        cityId ?? undefined,
      );
      toast.success("Транспорт успешно создан");
    } catch (error) {
@@ -73,12 +83,11 @@ export const VehicleCreatePage = observer(() => {
          onChange={(e) => setTailNumber(e.target.value)}
        />

-        <FormControl fullWidth>
+        <FormControl fullWidth required>
          <InputLabel>Тип</InputLabel>
          <Select
            value={type}
            label="Тип"
-            required
            onChange={(e) => setType(e.target.value)}
          >
            {VEHICLE_TYPES.map((type) => (
@@ -89,12 +98,11 @@ export const VehicleCreatePage = observer(() => {
          </Select>
        </FormControl>

-        <FormControl fullWidth>
+        <FormControl fullWidth required>
          <InputLabel>Перевозчик</InputLabel>
          <Select
            value={carrierId || ""}
            label="Перевозчик"
-            required
            onChange={(e) => setCarrierId(e.target.value as number)}
          >
            {carrierStore.carriers[language].data?.map((carrier) => (
@@ -113,12 +121,27 @@ 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}
+          disabled={isLoading || !tailNumber || !type || !carrierId || !cityId}
        >
          {isLoading ? (
            <Loader2 size={20} className="animate-spin" />
--- a/src/pages/Vehicle/VehicleEditPage/index.tsx
+++ b/src/pages/Vehicle/VehicleEditPage/index.tsx
@@ -20,6 +20,8 @@ import {
  VEHICLE_TYPES,
  vehicleStore,
  LoadingSpinner,
+  cityStore,
+  selectedCityStore,
 } from "@shared";
 import { toast } from "react-toastify";

@@ -38,6 +40,11 @@ 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");
@@ -54,6 +61,7 @@ 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 ?? "",
@@ -63,6 +71,7 @@ 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);
@@ -125,12 +134,11 @@ export const VehicleEditPage = observer(() => {
          }
        />

-        <FormControl fullWidth>
+        <FormControl fullWidth required>
          <InputLabel>Тип</InputLabel>
          <Select
            value={editVehicleData.type}
            label="Тип"
-            required
            onChange={(e) =>
              setEditVehicleData({ ...editVehicleData, type: e.target.value })
            }
@@ -143,12 +151,11 @@ export const VehicleEditPage = observer(() => {
          </Select>
        </FormControl>

-        <FormControl fullWidth>
+        <FormControl fullWidth required>
          <InputLabel>Перевозчик</InputLabel>
          <Select
            value={editVehicleData.carrier_id}
            label="Перевозчик"
-            required
            onChange={(e) =>
              setEditVehicleData({
                ...editVehicleData,
@@ -177,6 +184,26 @@ 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
@@ -202,7 +229,8 @@ export const VehicleEditPage = observer(() => {
            isLoading ||
            !editVehicleData.tail_number ||
            !editVehicleData.type ||
-            !editVehicleData.carrier_id
+            !editVehicleData.carrier_id ||
+            !editVehicleData.city_id
          }
        >
          {isLoading ? (
--- a/src/pages/Vehicle/VehicleListPage/index.tsx
+++ b/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 } from "@shared";
+import { authStore, carrierStore, languageStore, vehicleStore, SearchInput, selectedCityStore, cityStore } 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 { carriers, getCarriers } = carrierStore;
+  const { getCarriers } = carrierStore;
  const navigate = useNavigate();
  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
  const [isBulkDeleteModalOpen, setIsBulkDeleteModalOpen] = useState(false);
@@ -31,10 +31,11 @@ export const VehicleListPage = observer(() => {
      setIsLoading(true);
      await getVehicles();
      await getCarriers(language);
+      await cityStore.getCities("ru");
      setIsLoading(false);
    };
    fetchData();
-  }, [language]);
+  }, [language, selectedCityStore.cityVersion]);

  const columns: GridColDef[] = [
    {
@@ -114,15 +115,16 @@ export const VehicleListPage = observer(() => {
        return (
          <div className="flex h-full gap-7 justify-center items-center">
            {canWrite && (
-              <button onClick={() => navigate(`/vehicle/${params.row.id}/edit`)}>
+              <button title="Редактировать" onClick={() => navigate(`/vehicle/${params.row.id}/edit`)}>
                <Pencil size={20} className="text-blue-500" />
              </button>
            )}
-            <button onClick={() => navigate(`/vehicle/${params.row.id}`)}>
+            <button title="Просмотр" onClick={() => navigate(`/vehicle/${params.row.id}`)}>
              <Eye size={20} className="text-green-500" />
            </button>
            {canWrite && (
              <button
+                title="Удалить"
                onClick={() => {
                  setIsDeleteModalOpen(true);
                  setRowId(params.row.id);
@@ -137,9 +139,13 @@ 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 ||
@@ -151,11 +157,9 @@ export const VehicleListPage = observer(() => {
        tail_number: vehicle.vehicle.tail_number,
        type: vehicle.vehicle.type,
        carrier: vehicle.vehicle.carrier,
-        city: carriers[language].data?.find(
-          (carrier) => carrier.id === vehicle.vehicle.carrier_id
-        )?.city,
+        city: cityStore.cities.ru.data.find((c) => c.id === vehicle.vehicle.city_id)?.name,
      }));
-  }, [vehicles.data, carriers[language].data, searchQuery]);
+  }, [vehicles.data, selectedCityId, searchQuery]);

  return (
    <>
@@ -169,7 +173,9 @@ 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">
@@ -223,6 +229,8 @@ export const VehicleListPage = observer(() => {
              <Box sx={{ mt: 5, textAlign: "center", color: "text.secondary" }}>
                {isLoading ? (
                  <CircularProgress size={20} />
+                ) : !selectedCityId ? (
+                  "Выберите город"
                ) : (
                  "Нет транспортных средств"
                )}
--- a/src/shared/modals/UploadMediaDialog/index.tsx
+++ b/src/shared/modals/UploadMediaDialog/index.tsx
@@ -103,8 +103,26 @@ 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;
--- a/src/shared/store/CarrierStore/index.tsx
+++ b/src/shared/store/CarrierStore/index.tsx
@@ -16,9 +16,9 @@ export type Carrier = {
  city: string;
  city_id: number;
  logo: string;
-  // main_color: string;
-  // left_color: string;
-  // right_color: string;
+  main_color: string;
+  left_color: string;
+  right_color: string;
 };

 type CarrierData = {
@@ -112,6 +112,9 @@ class CarrierStore {
  createCarrierData = {
    city_id: 0,
    logo: "",
+    main_color: "",
+    left_color: "",
+    right_color: "",
    ru: {
      full_name: "",
      short_name: "",
@@ -135,10 +138,16 @@ class CarrierStore {
    cityId: number,
    slogan: string,
    logoId: string,
-    language: Language
+    language: Language,
+    colors?: { main_color?: string; left_color?: string; right_color?: string }
  ) => {
    this.createCarrierData.city_id = cityId;
    this.createCarrierData.logo = logoId;
+    if (colors) {
+      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,
@@ -198,9 +207,10 @@ class CarrierStore {
      city: cityName,
      city_id: this.createCarrierData.city_id,
      slogan: (this.createCarrierData[language].slogan || "").trim(),
-      ...(this.createCarrierData.logo
-        ? { logo: this.createCarrierData.logo }
-        : {}),
+      ...(this.createCarrierData.logo ? { logo: this.createCarrierData.logo } : {}),
+      ...(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);
@@ -243,6 +253,9 @@ class CarrierStore {
    this.createCarrierData = {
      city_id: 0,
      logo: "",
+      main_color: "",
+      left_color: "",
+      right_color: "",
      ru: {
        full_name: "",
        short_name: "",
@@ -265,53 +278,44 @@ 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: "",
+    },
+    zh: {
+      full_name: "",
+      short_name: "",
      slogan: "",
    },
    city_id: 0,
    logo: "",
-    zh: {
-      full_name: "",
-      short_name: "",
-
-      // main_color: "",
-      // left_color: "",
-      // right_color: "",
-      slogan: "",
-    },
+    main_color: "",
+    left_color: "",
+    right_color: "",
  };

  setEditCarrierData = (
    fullName: string,
    shortName: string,
    cityId: number,
-    // main_color: string,
-    // left_color: string,
-    // right_color: string,
    slogan: string,
    logoId: string,
-    language: Language
+    language: Language,
+    colors?: { main_color?: string; left_color?: string; right_color?: string }
  ) => {
    this.editCarrierData.city_id = cityId;
    this.editCarrierData.logo = logoId;
+    if (colors) {
+      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,
    };
  };
@@ -326,9 +330,10 @@ class CarrierStore {
        slogan: (this.editCarrierData[lang].slogan || "").trim(),
        city: cityName,
        city_id: this.editCarrierData.city_id,
-        ...(this.editCarrierData.logo
-          ? { logo: this.editCarrierData.logo }
-          : {}),
+        ...(this.editCarrierData.logo ? { 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(() => {
--- a/src/shared/store/RouteStore/index.ts
+++ b/src/shared/store/RouteStore/index.ts
@@ -13,6 +13,7 @@ export type Route = {
  center_latitude: number;
  center_longitude: number;
  governor_appeal: number;
+  button_text?: string;
  id: number;
  icon: string;
  path: number[][];
@@ -143,6 +144,7 @@ class RouteStore {
    center_latitude: "",
    center_longitude: "",
    governor_appeal: 0,
+    button_text: "" as string | undefined,
    id: 0,
    icon: "",
    path: [] as number[][],
@@ -153,7 +155,7 @@ class RouteStore {
    scale_max: 0,
    scale_min: 0,
    video_preview: "" as string | undefined,
-    video_timer: 60,
+    video_timer: 420,
  };

  setEditRouteData = (data: any) => {
--- a/src/shared/store/SelectedCityStore/index.ts
+++ b/src/shared/store/SelectedCityStore/index.ts
@@ -3,6 +3,8 @@ import { City } from "../CityStore";

 class SelectedCityStore {
  selectedCity: City | null = null;
+  isLocked: boolean = false;
+  cityVersion: number = 0;

  constructor() {
    makeAutoObservable(this);
@@ -24,6 +26,7 @@ class SelectedCityStore {
  setSelectedCity = (city: City | null) => {
    runInAction(() => {
      this.selectedCity = city;
+      this.cityVersion += 1;
      if (city) {
        localStorage.setItem("selectedCity", JSON.stringify(city));
      } else {
@@ -32,6 +35,12 @@ class SelectedCityStore {
    });
  };

+  setIsLocked = (locked: boolean) => {
+    runInAction(() => {
+      this.isLocked = locked;
+    });
+  };
+
  clearSelectedCity = () => {
    this.setSelectedCity(null);
  };
--- a/src/shared/store/SnapshotStore/index.ts
+++ b/src/shared/store/SnapshotStore/index.ts
@@ -60,12 +60,6 @@ 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 },
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
itoshi	8e8eb625dd	sync demo layout with client 1.0.8	2026-08-08 09:20:24 +03:00
itoshi	cc38f2e66c	feat: webgl preview improvements, permissions refactor and snapshot safeguards	2026-06-14 23:13:51 +03:00
itoshi	d4c5db61ea	feat: add markdown, lang atribute, button_text	2026-05-25 12:46:53 +03:00
itoshi	55cdea17ea	fix: stabilize right widget layout and sight frame menu height with lang	2026-05-23 13:42:11 +03:00
itoshi	3725c7f569	fix: change route_number to route_sys_number	2026-05-23 10:34:12 +03:00
itoshi	2659c6a5b8	feat: add city name in snaphost name	2026-05-23 10:30:36 +03:00
itoshi	1bb3f43979	feat: add scrollable menu with fade hints and home button transition	2026-05-20 12:48:00 +03:00
itoshi	7e539f550b	feat: hide search input when list is empty and add animated city selector highlight Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-05-19 14:14:04 +03:00
itoshi	fbf6b0dc9d	feat: add annotation for action buttons and double click for user list page	2026-05-19 13:47:36 +03:00
itoshi	a997cdb198	feat: delete title atribute from the client page	2026-05-19 13:16:17 +03:00
itoshi	bf45dcdbfc	feat: update appeal widget and check double routes for create snapshot	2026-05-19 13:16:02 +03:00
itoshi	83ccdef790	feat: update media in edit article and remove big hit boxes from clusters	2026-05-13 11:09:12 +03:00
itoshi	51d1870198	feat: appeal widget and right widget update	2026-05-12 00:04:02 +03:00
itoshi	193f53c029	feat: update map, admin to and cache	2026-05-08 13:33:41 +03:00
itoshi	4bda233b63	feat: update route widget and leftsidebar in route-preview	2026-05-08 01:12:28 +03:00
itoshi	d758dbffa6	feat: big update 07.05.26	2026-05-07 13:08:33 +03:00
itoshi	6af95bb449	feat: update color carrier	2026-05-05 15:07:18 +03:00
itoshi	e3469763ce	feat: update colors and home icon	2026-05-01 02:43:22 +03:00
itoshi	7f8a327329	feat: update right widget and add new 3d widget	2026-04-30 22:57:14 +03:00
itoshi	53b8ce7095	feat: udpate route widget	2026-04-28 11:04:09 +03:00