setSelectedSection(index + 1)}
+ onPointerUp={() => { setSelectedSection(index + 1); setIsFullscreen3D(false); }}
key={section.id || section.heading || index}
className={`sight-frame-menu-point ${
index + 1 === selectedSection ? "active" : ""
diff --git a/src/client/src/components/SimulationSettings.tsx b/src/client/src/components/SimulationSettings.tsx
index ca59aac..c99fc06 100644
--- 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}
/>
+
+ {/* Хитбоксы */}
+
+ Хитбоксы
+
+
)}
diff --git a/src/client/src/components/map/WebGLMap.tsx b/src/client/src/components/map/WebGLMap.tsx
index cfd39a0..2c94600 100644
--- a/src/client/src/components/map/WebGLMap.tsx
+++ b/src/client/src/components/map/WebGLMap.tsx
@@ -797,9 +797,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 +828,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,
@@ -2315,7 +2314,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 +2330,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 +2416,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)",
+ }),
}}
>
{
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)",
+ }),
}}
>
@@ -2608,6 +2617,11 @@ export const WebGLMap = observer(() => {
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)",
+ }),
}}
>
{
setCreateCityWeatherCode(Number(e.target.value))}
+ helperText="ID города брать с ресурса openweathermap.org"
/>
diff --git a/src/pages/City/CityEditPage/index.tsx b/src/pages/City/CityEditPage/index.tsx
index 8759211..1090841 100644
--- a/src/pages/City/CityEditPage/index.tsx
+++ b/src/pages/City/CityEditPage/index.tsx
@@ -189,9 +189,9 @@ export const CityEditPage = observer(() => {
setEditCityWeatherCode(Number(e.target.value))}
+ helperText="ID города брать с ресурса openweathermap.org"
/>
diff --git a/src/widgets/SightTabs/CreateInformationTab/index.tsx b/src/widgets/SightTabs/CreateInformationTab/index.tsx
index 6378dfc..9c87680 100644
--- a/src/widgets/SightTabs/CreateInformationTab/index.tsx
+++ b/src/widgets/SightTabs/CreateInformationTab/index.tsx
@@ -205,7 +205,7 @@ export const CreateInformationTab = observer(
>
-
{sight[language].name}
+ {sight[language].name.replace(/\n/g, " ")}
-
{sight[language].name}
+ {sight[language].name.replace(/\n/g, " ")}
-
{sight[language].name}
+ {sight[language].name.replace(/\n/g, " ")}
@@ -508,36 +508,44 @@ export const CreateRightTab = observer(
/>
)}
-
-
- updateSightInfo({ name: e.target.value }, language)
- }
- inputRef={shortNameRef}
- sx={{ flexGrow: 1 }}
- />
-
-
+ {type === "media" && (
+
+
+ updateSightInfo({ name: e.target.value }, language)
+ }
+ onKeyDown={(e) => {
+ if (e.key === "Enter") {
+ e.preventDefault();
+ insertNewline();
+ }
+ }}
+ inputRef={shortNameRef}
+ sx={{ flexGrow: 1 }}
+ />
+
+
+ )}
-
{sight[language].name}
+ {sight[language].name.replace(/\n/g, " ")}
diff --git a/src/widgets/SightTabs/LeftWidgetTab/index.tsx b/src/widgets/SightTabs/LeftWidgetTab/index.tsx
index 02b22c1..65c67bf 100644
--- a/src/widgets/SightTabs/LeftWidgetTab/index.tsx
+++ b/src/widgets/SightTabs/LeftWidgetTab/index.tsx
@@ -112,7 +112,7 @@ export const LeftWidgetTab = observer(
>
-
{sight[language].name}
+ {sight[language].name.replace(/\n/g, " ")}
-
{sight[language].name}
+ {sight[language].name.replace(/\n/g, " ")}
@@ -476,28 +476,36 @@ export const RightWidgetTab = observer(
/>
)}
-
- updateSightInfo(language, { name: e.target.value })}
- inputRef={shortNameRef}
- sx={{ flexGrow: 1 }}
- />
-
-
+ {type === "media" && (
+
+ updateSightInfo(language, { name: e.target.value })}
+ onKeyDown={(e) => {
+ if (e.key === "Enter") {
+ e.preventDefault();
+ insertNewline();
+ }
+ }}
+ inputRef={shortNameRef}
+ sx={{ flexGrow: 1 }}
+ />
+
+
+ )}
,
+ },
+ {
+ label: "Приблизить / Отдалить",
+ icon: 
,
+ },
+ {
+ label: "Переместить",
+ icon: 
,
+ },
+ ].map((item, index, arr) => (
+