From 1353b23c7db2ad73b2e302a76b14404618b52889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=D1=81=20=D0=A1=D1=83=D0=BB=D1=82?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Wed, 23 Sep 2026 12:52:18 +0300 Subject: [PATCH] =?UTF-8?q?feat(gps):=20=D1=81=D0=BE=D0=B2=D0=BF=D0=B0?= =?UTF-8?q?=D0=B4=D0=B0=D1=8E=D1=89=D0=B8=D0=B5=20=D1=82=D0=BE=D1=87=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=20=D1=80=D0=B0=D1=81?= =?UTF-8?q?=D0=BA=D0=B8=D0=B4=D1=8B=D0=B2=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20?= =?UTF-8?q?=D0=B2=D0=B5=D0=B5=D1=80=D0=BE=D0=BC=20(~30=20=D0=BC)=20?= =?UTF-8?q?=E2=80=94=20=D0=BA=D0=BB=D0=B0=D1=81=D1=82=D0=B5=D1=80=20=D0=B8?= =?UTF-8?q?=D0=B7=20=D0=BE=D0=B4=D0=BD=D0=BE=D0=B9=20=D0=BA=D0=BE=D0=BE?= =?UTF-8?q?=D1=80=D0=B4=D0=B8=D0=BD=D0=B0=D1=82=D1=8B=20=D1=80=D0=B0=D1=81?= =?UTF-8?q?=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=B7?= =?UTF-8?q?=D1=83=D0=BC=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/pages/gps/MapTab.tsx | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/client/src/pages/gps/MapTab.tsx b/client/src/pages/gps/MapTab.tsx index 920547f..f201e0c 100644 --- a/client/src/pages/gps/MapTab.tsx +++ b/client/src/pages/gps/MapTab.tsx @@ -256,6 +256,23 @@ export function GpsMapTab({ onShowRoute }: { onShowRoute: (assetId: number) => v onClick: rulerMode ? undefined : () => setSelectedTask({ id: t.id, title: t.title }), }); } + // Совпадающие координаты (несколько задач в одной точке, напр. 3 ТМИМ) + // раскидываем «веером» — иначе кластер из них никогда не раскрывается зумом + const groups = new Map(); + for (const m of markers) { + const key = `${m.lat.toFixed(5)},${m.lng.toFixed(5)}`; + const g = groups.get(key); + if (g) g.push(m); else groups.set(key, [m]); + } + for (const g of groups.values()) { + if (g.length < 2) continue; + const r = 0.00028; // ≈ 30 м + g.forEach((m, i) => { + const a = (2 * Math.PI * i) / g.length; + m.lat += r * Math.cos(a); + m.lng += r * Math.sin(a); + }); + } return markers; }, [tasksLayer, mapFieldId, tasksData, rulerMode, showLabels]);