Merge pull request #23 from Feazom/dev

Dev

Author: Feazom

UrfuMaps.Client/src/components/MapCanvas.tsx

@@ -19,7 +19,7 @@ import {
 } from '../services/RequestService';
 import URLImage from './URLImage';
 import RouteSegmentDTO from '../DTOs/RouteSegmentDTO';
-import { canvaPosition } from '../services/utils';
+import { canvaPosition, toFrontName } from '../services/utils';
 import { OrientationContext } from '../context';
 import MarkCanvas from './MarkCanvas';
 import { Point } from '../types';
@@ -215,17 +215,23 @@ const MapCanvas = ({
 						/>
 					)}
 
-					{destinationMarker &&
+					{imageRef.current &&
+						destinationMarker &&
 						segment?.ids.includes(destinationMarker.id) && (
 							<MarkCanvas
 								x={destinationMarker.x}
 								y={destinationMarker.y}
 								color="red"
 							/>
 						)}
-					{sourceMarker && segment?.ids.includes(sourceMarker.id) && (
-						<PointCanvas x={sourceMarker.x} y={sourceMarker.y} />
-					)}
+					{imageRef.current &&
+						sourceMarker &&
+						segment?.ids.includes(sourceMarker.id) && (
+							<PointCanvas
+								x={sourceMarker.x}
+								y={sourceMarker.y}
+							/>
+						)}
 					{/*imageRef.current &&
 						floor?.positions?.map((position) => {
 							const backgroundHeight =
@@ -247,7 +253,7 @@ const MapCanvas = ({
 								<TextCanvas
 									x={x}
 									y={y}
-									text={position.id.toString()}
+									text={toFrontName(position.name)}
 									key={position.id}
 								/>
 							);

UrfuMaps.Client/src/components/NavAddMap.tsx

@@ -11,7 +11,7 @@ import CreateFloorDTO from '../DTOs/CreateFloorDTO';
 import CreatePositionDTO from '../DTOs/CreatePositionDTO';
 import { logout } from '../services/AuthService';
 import { addMap } from '../services/RequestService';
-import { convertCabinet } from '../services/utils';
+import { toApiName } from '../services/utils';
 import '../styles/navMap.css';
 import { EdgeDTODict } from '../types';
 
@@ -62,14 +62,15 @@ const NavAddMap = ({
 			imageLink: link,
 			positions: positions.map((p) => ({
 				localId: p.localId,
-				name: convertCabinet(p.name),
+				name: toApiName(p.name),
 				description: p.description,
 				type: p.type,
 				x: p.x,
 				y: p.y,
 			})),
 			edges: edges.current.keys(),
 		};
+
 		console.log(data);
 
 		if (

UrfuMaps.Client/src/components/NavMap.tsx

@@ -10,7 +10,7 @@ import {
 	useMemo,
 } from 'react';
 import '../styles/navMap.css';
-import { convertCabinet } from '../services/utils';
+import { toApiName } from '../services/utils';
 import { OrientationContext } from '../context';
 import { useQuery } from 'react-query';
 import { getPrefixes, wrapRequest } from '../services/RequestService';
@@ -78,14 +78,14 @@ const NavMap = ({
 	useEffect(() => {
 		window.clearTimeout(timeoutSrc.current);
 		timeoutSrc.current = window.setTimeout(() => {
-			setSource(convertCabinet(sourceInput, buildingName));
+			setSource(toApiName(sourceInput, buildingName));
 		}, 300);
 	}, [sourceInput]);
 
 	useEffect(() => {
 		window.clearTimeout(timeoutDst.current);
 		timeoutDst.current = window.setTimeout(() => {
-			setDestination(convertCabinet(destinationInput, buildingName));
+			setDestination(toApiName(destinationInput, buildingName));
 		}, 300);
 	}, [destinationInput]);
 

UrfuMaps.Client/src/context.ts

@@ -5,11 +5,35 @@ export const OrientationContext = createContext('landscape');
 
 i18next.init({
 	lng: 'ru',
-	debug: true,
 	resources: {
 		ru: {
 			translation: {
-				r: 'Р',
+				a: 'а',
+				b: 'б',
+				v: 'в',
+				g: 'г',
+				d: 'д',
+				e: 'э',
+				j: 'ж',
+				z: 'з',
+				i: 'и',
+				k: 'к',
+				l: 'л',
+				m: 'м',
+				n: 'н',
+				o: 'о',
+				p: 'п',
+				r: 'р',
+				s: 'с',
+				t: 'т',
+				u: 'у',
+				f: 'ф',
+				h: 'х',
+				c: 'с',
+				ch: 'ч',
+				sh: 'ш',
+				wcw: 'СУ Ж',
+				entryrtf: 'Вход',
 				rtf: 'ИРИТ-РТФ',
 				hti: 'ХТИ',
 				fti: 'ФТИ',

UrfuMaps.Client/src/pages/MainPage.tsx

@@ -36,6 +36,14 @@ const Main = memo(() => {
 	const [queryParams] = useSearchParams();
 	const [orientation, setOrientation] = useState('landscape');
 
+	useEffect(() => {
+		if (buildings && buildingName && floorNumber) {
+			if (!buildings[buildingName].includes(floorNumber)) {
+				setFloorNumber(1);
+			}
+		}
+	}, [buildings, buildingName]);
+
 	useEffect(() => {
 		const type = window.screen.orientation.type;
 		setOrientation(type.substring(0, type.indexOf('-')));

UrfuMaps.Client/src/services/utils.ts

@@ -1,4 +1,5 @@
 import { Vector2d } from 'konva/lib/types';
+import { t } from '../context';
 
 const special = /[\s`~!@#$%^&*()\-_=+[\]{};:'"\\|/,.<>?]/g;
 
@@ -12,38 +13,95 @@ const translation: Record<string, string> = {
 	а: 'a',
 	б: 'b',
 	в: 'v',
-	ф: 'f',
+	г: 'g',
+	д: 'd',
+	е: 'e',
+	ж: 'j',
+	з: 'z',
+	и: 'i',
+	к: 'k',
+	л: 'l',
+	м: 'm',
+	н: 'n',
+	о: 'o',
+	п: 'p',
+	р: 'r',
+	с: 's',
 	т: 't',
+	у: 'u',
+	ф: 'f',
 	х: 'h',
+	ц: 'c',
+	ч: 'ch',
+	ш: 'sh',
 	мт: 'mt',
-	и: 'i',
 	гук: 'mab',
-	м: 'm',
 	э: 'e',
 	сп: 'sp',
-	с: 's',
-	р: 'r',
 	вход: 'entry',
 	a: 'a',
 	b: 'b',
 	v: 'v',
-	f: 'f',
+	g: 'g',
+	d: 'd',
+	e: 'e',
+	j: 'j',
+	z: 'z',
+	i: 'i',
+	k: 'k',
+	l: 'l',
+	m: 'm',
+	n: 'n',
+	o: 'o',
+	p: 'p',
+	r: 'r',
+	s: 's',
 	t: 't',
+	u: 'u',
+	f: 'f',
 	h: 'h',
+	c: 'c',
+	ch: 'ch',
+	sh: 'sh',
 	mt: 'mt',
-	i: 'i',
 	mab: 'mab',
-	m: 'm',
-	e: 'e',
 	sp: 'sp',
-	s: 's',
-	r: 'r',
 	entry: 'entry',
 };
 
 const tr = new Proxy(translation, propertyHandler);
 
-export function convertCabinet(cabinet: string, building?: string): string {
+export function toFrontName(name: string) {
+	let result = name.toString();
+	if (!result && result === '') {
+		return result;
+	}
+	result = result.replace(special, '');
+	let numberIndex: number | undefined = undefined;
+	let postfixSize = 0;
+	for (let i = 0; i < result.length; i++) {
+		if (!isNaN(parseInt(result[i]))) {
+			numberIndex = i;
+			break;
+		}
+	}
+	for (let i = result.length - 1; i >= 0; i--) {
+		if (!isNaN(parseInt(result[i]))) {
+			break;
+		}
+		postfixSize++;
+	}
+	if (numberIndex) {
+		return (result =
+			t(result.slice(0, numberIndex)) +
+			' ' +
+			result.substring(numberIndex, result.length - postfixSize) +
+			t(result.substring(result.length - postfixSize)));
+	}
+	return t(result);
+}
+
+export function toApiName(cabinet: string, building?: string): string {
 	let result = cabinet.toLowerCase();
 	if (!result) {
 		return result;
@@ -69,11 +127,14 @@ export function convertCabinet(cabinet: string, building?: string): string {
 			result.substring(numberIndex, result.length - postfixSize) +
 			tr[result.substring(result.length - postfixSize)];
 	} else {
-		result = tr[result];
+		result = tr[result.slice(0, 5)];
 	}
 	if (building) {
 		if (result.slice(0, 5) === 'entry') {
 			result += building;
+			if (building === 'mab') {
+				result += 'm';
+			}
 		}
 	}
 	return result;