+
+ setSatelliteOpacity(Array.isArray(value) ? value[0] : value)} />
+
+ setSatMapsProvider(value as SatelliteMapsProvider)} />
+
+
-
- {
- fetch(`${import.meta.env.VITE_API_EMS_URL}/hello`, { method: 'GET' }).then(res => console.log(res))
- }}>
-
-
-
- {
- saveFeatures()
- }}>
-
-
-
- {
- draw.current?.removeLastPoint()
- }}>
-
-
-
- {
- handleToolSelect('Point')
- }}>
-
-
-
- {
- handleToolSelect('LineString')
- }}>
-
-
-
- {
- handleToolSelect('Polygon')
- }}>
-
-
-
- {
- handleToolSelect('Circle')
- }}>
-
-
-
- map?.current?.addInteraction(new Translate())}
- >
-
-
-
-
-
-
-
+ saveFeatures()}
+ onRemove={() => draw.current?.removeLastPoint()}
+ handleToolSelect={handleToolSelect}
+ onMover={() => map?.current?.addInteraction(new Translate())}
+ colorScheme={colorScheme}
+ />
{
-
- setSatelliteOpacity(Array.isArray(value) ? value[0] : value)} />
-
- setSatMapsProvider(value as SatelliteMapsProvider)} />
-
-
}>{'Объекты'}
-
+ {objectsList &&
+ (
+ {
+ elementProps.onClick(e)
+ if (node.value !== 'existing' && node.value !== 'planning') {
+ setSelectedObjectList(Number(node.value))
+ }
+ }}>
+ {hasChildren && (
+
+ )}
+
+ {node.label}
+
+ )}
+ />
+ }
+
-
- }>
- {'Текущий объект'}
-
-
-
-
-
+ {currentObjectId &&
+
+ }>
+ {'Текущий объект'}
+
+
+
+
+
+ }
- {valuesData &&
- }>{'Параметры объекта'}
-
-
- {Array.isArray(valuesData) && valuesData.map((param: IObjectParam) => {
- return (
-
- )
- })}
-
-
- }
+ {valuesData &&
+
+ }>{'Параметры объекта'}
+
+
+ {Array.isArray(valuesData) && valuesData.map((param: IObjectParam) => {
+ return (
+
+ )
+ })}
+
+
+
+ }
-
-
- x: {currentCoordinate?.[0]}
-
-
-
- y: {currentCoordinate?.[1]}
-
-
-
-
-
- Z={currentZ}
-
-
-
- X={currentX}
-
-
-
- Y={currentY}
-
-
-
- {statusText}
-
-
+
diff --git a/client/src/components/map/MapSources.ts b/client/src/components/map/MapSources.ts
index 7403867..e398ac9 100644
--- a/client/src/components/map/MapSources.ts
+++ b/client/src/components/map/MapSources.ts
@@ -10,12 +10,12 @@ register(proj4);
const yandexProjection = get('EPSG:3395')?.setExtent([-20037508.342789244, -20037508.342789244, 20037508.342789244, 20037508.342789244]) || 'EPSG:3395'
const googleMapsSatelliteSource = new XYZ({
- url: `${import.meta.env.VITE_API_EMS_URL}/tile/google/{z}/{x}/{y}`,
+ url: `${import.meta.env.VITE_API_EMS_URL}/tiles/tile/google/{z}/{x}/{y}`,
attributions: 'Map data © Google'
})
const yandexMapsSatelliteSource = new XYZ({
- url: `${import.meta.env.VITE_API_EMS_URL}/tile/yandex/{z}/{x}/{y}`,
+ url: `${import.meta.env.VITE_API_EMS_URL}/tiles/tile/yandex/{z}/{x}/{y}`,
attributions: 'Map data © Yandex',
projection: yandexProjection,
})
diff --git a/client/src/components/map/MapStatusbar/MapStatusbar.tsx b/client/src/components/map/MapStatusbar/MapStatusbar.tsx
new file mode 100644
index 0000000..50ac8a5
--- /dev/null
+++ b/client/src/components/map/MapStatusbar/MapStatusbar.tsx
@@ -0,0 +1,53 @@
+import { Divider, Flex, rem, Text } from '@mantine/core'
+import { Coordinate } from 'ol/coordinate';
+import React, { CSSProperties } from 'react'
+
+interface IMapStatusbarProps {
+ mapControlsStyle: CSSProperties;
+ currentCoordinate: Coordinate | null;
+ currentX: number | undefined;
+ currentY: number | undefined;
+ currentZ: number | undefined;
+ statusText: string;
+}
+
+const MapStatusbar = ({
+ mapControlsStyle,
+ currentCoordinate,
+ currentX,
+ currentY,
+ currentZ,
+ statusText
+}: IMapStatusbarProps) => {
+ return (
+
+
+ x: {currentCoordinate?.[0]}
+
+
+
+ y: {currentCoordinate?.[1]}
+
+
+
+
+
+ Z={currentZ}
+
+
+
+ X={currentX}
+
+
+
+ Y={currentY}
+
+
+
+ {statusText}
+
+
+ )
+}
+
+export default MapStatusbar
\ No newline at end of file
diff --git a/client/src/components/map/MapToolbar/MapToolbar.tsx b/client/src/components/map/MapToolbar/MapToolbar.tsx
new file mode 100644
index 0000000..173f245
--- /dev/null
+++ b/client/src/components/map/MapToolbar/MapToolbar.tsx
@@ -0,0 +1,93 @@
+import { ActionIcon, MantineColorScheme } from '@mantine/core'
+import { IconApi, IconArrowBackUp, IconArrowsMove, IconCircle, IconExclamationCircle, IconLine, IconPoint, IconPolygon, IconRuler } from '@tabler/icons-react'
+import { Type } from 'ol/geom/Geometry'
+import React from 'react'
+
+interface IToolbarProps {
+ currentTool: Type | null;
+ onSave: () => void;
+ onRemove: () => void;
+ handleToolSelect: (tool: Type) => void;
+ onMover: () => void;
+ colorScheme: MantineColorScheme;
+}
+
+const MapToolbar = ({
+ currentTool,
+ onSave,
+ onRemove,
+ handleToolSelect,
+ onMover,
+ colorScheme
+}: IToolbarProps) => {
+ return (
+
+ {
+ fetch(`${import.meta.env.VITE_API_EMS_URL}/hello`, { method: 'GET' }).then(res => console.log(res))
+ }}>
+
+
+
+
+
+
+
+
+
+
+
+ {
+ handleToolSelect('Point')
+ }}>
+
+
+
+ {
+ handleToolSelect('LineString')
+ }}>
+
+
+
+ {
+ handleToolSelect('Polygon')
+ }}>
+
+
+
+ {
+ handleToolSelect('Circle')
+ }}>
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default MapToolbar
\ No newline at end of file
diff --git a/client/src/components/map/ObjectData.tsx b/client/src/components/map/ObjectData.tsx
index 7f03109..18e0b44 100644
--- a/client/src/components/map/ObjectData.tsx
+++ b/client/src/components/map/ObjectData.tsx
@@ -1,4 +1,4 @@
-import { Flex, Table } from '@mantine/core'
+import { Flex } from '@mantine/core'
import { IObjectData, IObjectType } from '../../interfaces/objects'
import useSWR from 'swr'
import { fetcher } from '../../http/axiosInstance'
@@ -17,7 +17,7 @@ const ObjectData = (object_data: IObjectData) => {
{Array.isArray(typeData) && (typeData.find(type => Number(type.id) === Number(object_data.type)) as IObjectType).name}
-
+
)
}
diff --git a/client/src/components/map/ObjectParameter.tsx b/client/src/components/map/ObjectParameter.tsx
index 23473bd..04c818f 100644
--- a/client/src/components/map/ObjectParameter.tsx
+++ b/client/src/components/map/ObjectParameter.tsx
@@ -1,8 +1,7 @@
-import React from 'react'
import useSWR from 'swr'
import { fetcher } from '../../http/axiosInstance'
import { BASE_URL } from '../../constants'
-import { Checkbox, Flex, Grid } from '@mantine/core'
+import { Checkbox, Grid } from '@mantine/core'
import { IObjectParam, IParam } from '../../interfaces/objects'
const ObjectParameter = ({
diff --git a/client/src/interfaces/gis.ts b/client/src/interfaces/gis.ts
index 8b1f863..7b47f33 100644
--- a/client/src/interfaces/gis.ts
+++ b/client/src/interfaces/gis.ts
@@ -11,7 +11,9 @@ export interface IFigure {
label_top: number | null,
label_angle: number | null,
label_size: number | null,
- year: number
+ year: number,
+ type: number,
+ planning: boolean
}
export interface ILine {
@@ -28,5 +30,7 @@ export interface ILine {
label_sizes: string | null,
label_angels: string | null,
label_positions: string | null,
- year: number
+ year: number,
+ type: number,
+ planning: boolean
}
\ No newline at end of file
diff --git a/client/src/interfaces/map.ts b/client/src/interfaces/map.ts
index e8c7e1a..042460a 100644
--- a/client/src/interfaces/map.ts
+++ b/client/src/interfaces/map.ts
@@ -3,4 +3,11 @@ export interface SatelliteMapsProviders {
yandex: 'yandex';
custom: 'custom';
}
-export type SatelliteMapsProvider = SatelliteMapsProviders[keyof SatelliteMapsProviders]
\ No newline at end of file
+export type SatelliteMapsProvider = SatelliteMapsProviders[keyof SatelliteMapsProviders]
+
+export interface IGeometryTypes {
+ LINE: 'LINE'
+ POLYGON: 'POLYGON'
+}
+
+export type IGeometryType = IGeometryTypes[keyof IGeometryTypes]
diff --git a/client/src/interfaces/objects.ts b/client/src/interfaces/objects.ts
index 19b5907..134a104 100644
--- a/client/src/interfaces/objects.ts
+++ b/client/src/interfaces/objects.ts
@@ -1,3 +1,9 @@
+export interface IObjectList {
+ id: number,
+ name: string,
+ count: number
+}
+
export interface IObjectData {
object_id: string,
id_city: number,
diff --git a/client/src/pages/ApiTest.tsx b/client/src/pages/ApiTest.tsx
index b3e8a96..3c108df 100644
--- a/client/src/pages/ApiTest.tsx
+++ b/client/src/pages/ApiTest.tsx
@@ -1,9 +1,9 @@
-import { Box } from "@mui/material"
import { useCities } from "../hooks/swrHooks"
import { useEffect, useState } from "react"
import { DataGrid, GridColDef } from "@mui/x-data-grid"
import axiosInstance from "../http/axiosInstance"
import { BASE_URL } from "../constants"
+import { Flex } from "@mantine/core"
export default function ApiTest() {
@@ -36,7 +36,7 @@ export default function ApiTest() {
]
return (
-
+
-
+
)
}
\ No newline at end of file
diff --git a/client/src/pages/ComponentTest.tsx b/client/src/pages/ComponentTest.tsx
new file mode 100644
index 0000000..6ea762a
--- /dev/null
+++ b/client/src/pages/ComponentTest.tsx
@@ -0,0 +1,12 @@
+import { Flex } from '@mantine/core'
+import ServerHardware from '../components/ServerHardware'
+
+const ComponentTest = () => {
+ return (
+
+
+
+ )
+}
+
+export default ComponentTest
\ No newline at end of file
diff --git a/client/src/pages/MonitorPage.tsx b/client/src/pages/MonitorPage.tsx
index c249bce..32f2cc9 100644
--- a/client/src/pages/MonitorPage.tsx
+++ b/client/src/pages/MonitorPage.tsx
@@ -1,5 +1,5 @@
import { useEffect, useState } from 'react'
-import { Card, Stack } from '@mui/material';
+import { Card, Flex } from '@mantine/core';
function CardComponent({
url,
@@ -7,10 +7,10 @@ function CardComponent({
}: { url: any, is_alive: any }) {
return (
-
+
{url}
{JSON.stringify(is_alive)}
-
+
)
}
@@ -38,11 +38,11 @@ export default function MonitorPage() {
return (
-
+
{servers.length > 0 && servers.map((server: any) => (
))}
-
+
)
}
\ No newline at end of file
diff --git a/client/src/pages/auth/PasswordReset.tsx b/client/src/pages/auth/PasswordReset.tsx
index b78e7aa..cd10866 100644
--- a/client/src/pages/auth/PasswordReset.tsx
+++ b/client/src/pages/auth/PasswordReset.tsx
@@ -1,9 +1,8 @@
-import { CircularProgress, Fade, Grow } from '@mui/material'
import { useState } from 'react'
import { SubmitHandler, useForm } from 'react-hook-form';
import AuthService from '../../services/AuthService';
import { CheckCircle } from '@mui/icons-material';
-import { Button, Flex, Paper, Text, TextInput } from '@mantine/core';
+import { Button, Flex, Loader, Paper, Text, TextInput, Transition } from '@mantine/core';
interface PasswordResetProps {
email: string;
@@ -39,47 +38,54 @@ function PasswordReset() {
diff --git a/client/src/pages/auth/SignUp.tsx b/client/src/pages/auth/SignUp.tsx
index 8813dc5..c6e45ba 100644
--- a/client/src/pages/auth/SignUp.tsx
+++ b/client/src/pages/auth/SignUp.tsx
@@ -1,10 +1,10 @@
import { useForm, SubmitHandler } from 'react-hook-form';
-import { TextField, Button, Container, Typography, Box } from '@mui/material';
import UserService from '../../services/UserService';
import { IUser } from '../../interfaces/user';
+import { Button, Flex, Loader, Paper, Text, TextInput } from '@mantine/core';
const SignUp = () => {
- const { register, handleSubmit, formState: { errors } } = useForm({
+ const { register, handleSubmit, formState: { errors, isValid, isSubmitting } } = useForm({
defaultValues: {
email: '',
login: '',
@@ -26,77 +26,66 @@ const SignUp = () => {
};
return (
-
-
-
+
+
+
Регистрация
-
+
-
-
+
+
);
};
diff --git a/ems/src/api/general/index.ts b/ems/src/api/general/index.ts
new file mode 100644
index 0000000..bb91559
--- /dev/null
+++ b/ems/src/api/general/index.ts
@@ -0,0 +1,154 @@
+import express, { Request, Response } from 'express';
+import { tediousQuery } from '../../utils/tedious';
+const router = express.Router()
+
+router.get('/cities/all', async (req: Request, res: Response) => {
+ try {
+ const { offset, limit, search, id } = req.query
+
+ const result = await tediousQuery(
+ `
+ SELECT * FROM nGeneral..Cities
+ ${id ? `WHERE id = '${id}'` : ''}
+ ${search ? `WHERE name LIKE '%${search || ''}%'` : ''}
+ ORDER BY id
+ OFFSET ${Number(offset) || 0} ROWS
+ FETCH NEXT ${Number(limit) || 10} ROWS ONLY;
+ `
+ )
+ res.status(200).json(result)
+ } catch (err) {
+ res.status(500)
+ }
+})
+
+router.get('/types/all', async (req: Request, res: Response) => {
+ try {
+ const result = await tediousQuery(
+ `
+ SELECT * FROM nGeneral..tTypes
+ ORDER BY id
+ `
+ )
+ res.status(200).json(result)
+ } catch (err) {
+ res.status(500)
+ }
+})
+
+router.get('/objects/all', async (req: Request, res: Response) => {
+ try {
+ const { offset, limit, city_id } = req.query
+
+ const result = await tediousQuery(
+ `
+ SELECT * FROM nGeneral..vObjects
+ ${city_id ? `WHERE id_city = ${city_id}` : ''}
+ ORDER BY object_id
+ OFFSET ${Number(offset) || 0} ROWS
+ FETCH NEXT ${Number(limit) || 10} ROWS ONLY;
+ `
+ )
+ res.status(200).json(result)
+ } catch (err) {
+ res.status(500)
+ }
+})
+
+router.get('/objects/list', async (req: Request, res: Response) => {
+ try {
+ const { city_id, year, planning } = req.query
+
+ const result = await tediousQuery(
+ `
+ SELECT
+ tTypes.id AS id,
+ tTypes.name AS name,
+ COUNT(vObjects.type) AS count
+ FROM
+ vObjects
+ JOIN
+ tTypes ON vObjects.type = tTypes.id
+ WHERE
+ vObjects.id_city = ${city_id} AND vObjects.year = ${year}
+ AND
+ (
+ CASE
+ WHEN TRY_CAST(vObjects.planning AS BIT) IS NOT NULL THEN TRY_CAST(vObjects.planning AS BIT)
+ WHEN vObjects.planning = 'TRUE' THEN 1
+ WHEN vObjects.planning = 'FALSE' THEN 0
+ ELSE NULL
+ END
+ ) = ${planning}
+ GROUP BY
+ tTypes.id,
+ tTypes.name;
+ `
+ )
+ res.status(200).json(result)
+ } catch (err) {
+ res.status(500)
+ }
+})
+
+router.get('/objects/:id([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})', async (req: Request, res: Response) => {
+ try {
+ const { id } = req.params;
+
+ const result = await tediousQuery(
+ `
+ SELECT * FROM nGeneral..vObjects
+ ${id ? `WHERE object_id = '${id}'` : ''}
+ `
+ )
+ if (Array.isArray(result) && result.length > 0) {
+ res.status(200).json(result[0])
+ }
+ } catch (err) {
+ res.status(500)
+ }
+})
+
+router.get('/values/all', async (req: Request, res: Response) => {
+ try {
+ const { object_id } = req.query
+
+ if (!object_id) {
+ res.status(500)
+ }
+
+ const result = await tediousQuery(
+ `
+ SELECT * FROM nGeneral..tValues
+ WHERE id_object = '${object_id}'
+ `
+ )
+
+ res.status(200).json(result)
+ } catch (err) {
+ res.status(500)
+ }
+})
+
+router.get('/params/all', async (req: Request, res: Response) => {
+ try {
+ const { param_id } = req.query
+
+ if (!param_id) {
+ res.status(500)
+ }
+
+ const result = await tediousQuery(
+ `
+ SELECT * FROM nGeneral..tParameters
+ WHERE id = '${param_id}'
+ `
+ )
+
+ res.status(200).json(result)
+ } catch (err) {
+ res.status(500)
+ }
+})
+
+export default router
\ No newline at end of file
diff --git a/ems/src/api/gis/index.ts b/ems/src/api/gis/index.ts
new file mode 100644
index 0000000..11d4c80
--- /dev/null
+++ b/ems/src/api/gis/index.ts
@@ -0,0 +1,65 @@
+import express, { Request, Response } from 'express';
+import { tediousQuery } from '../../utils/tedious';
+const router = express.Router()
+
+router.get('/images/all', async (req: Request, res: Response) => {
+ try {
+ const { offset, limit, city_id } = req.query
+
+ const result = await tediousQuery(
+ `
+ SELECT * FROM New_Gis..images
+ ${city_id ? `WHERE city_id = ${city_id}` : ''}
+ ORDER BY city_id
+ OFFSET ${Number(offset) || 0} ROWS
+ FETCH NEXT ${Number(limit) || 10} ROWS ONLY;
+ `
+ )
+ res.status(200).json(result)
+ } catch (err) {
+ res.status(500)
+ }
+})
+
+
+// Get figures by year and city id
+router.get('/figures/all', async (req: Request, res: Response) => {
+ try {
+ const { offset, limit, object_id, year, city_id } = req.query
+
+ const result = await tediousQuery(
+ `
+ SELECT * FROM New_Gis..figures f
+ JOIN nGeneral..vObjects o ON f.object_id = o.object_id WHERE o.id_city = ${city_id} AND f.year = ${year}
+ ORDER BY f.year
+ OFFSET ${Number(offset) || 0} ROWS
+ FETCH NEXT ${Number(limit) || 10} ROWS ONLY;
+ `
+ )
+ res.status(200).json(result)
+ } catch (err) {
+ res.status(500)
+ }
+})
+
+// Get lines by year and city id
+router.get('/lines/all', async (req: Request, res: Response) => {
+ try {
+ const { offset, limit, object_id, year, city_id } = req.query
+
+ const result = await tediousQuery(
+ `
+ SELECT * FROM New_Gis..lines l
+ JOIN nGeneral..vObjects o ON l.object_id = o.object_id WHERE o.id_city = ${city_id} AND l.year = ${year}
+ ORDER BY l.year
+ OFFSET ${Number(offset) || 0} ROWS
+ FETCH NEXT ${Number(limit) || 10} ROWS ONLY;
+ `
+ )
+ res.status(200).json(result)
+ } catch (err) {
+ res.status(500)
+ }
+})
+
+export default router
\ No newline at end of file
diff --git a/ems/src/api/nodes/index.ts b/ems/src/api/nodes/index.ts
new file mode 100644
index 0000000..73f796c
--- /dev/null
+++ b/ems/src/api/nodes/index.ts
@@ -0,0 +1,72 @@
+import express, { Request, Response } from 'express';
+import { query, validationResult } from 'express-validator';
+import { PrismaClient } from '@prisma/client';
+const router = express.Router()
+
+const prisma = new PrismaClient()
+
+router.get('/all', async (req: Request, res: Response) => {
+ try {
+ const nodes = await prisma.nodes.findMany()
+
+ res.json(nodes)
+ } catch (error) {
+ console.error('Error getting node:', error);
+ res.status(500).json({ error: 'Failed to get node' });
+ }
+})
+
+router.get('/', query('id').isString().isUUID(), async (req: Request, res: Response) => {
+ try {
+ const result = validationResult(req)
+ if (!result.isEmpty()) {
+ return res.send({ errors: result.array() })
+ }
+
+ const { id } = req.params
+
+ const node = await prisma.nodes.findFirst({
+ where: {
+ id: id
+ }
+ })
+
+ res.json(node)
+
+ } catch (error) {
+ console.error('Error getting node:', error);
+ res.status(500).json({ error: 'Failed to get node' });
+ }
+})
+
+router.post('/', async (req: Request, res: Response) => {
+ try {
+ const { coordinates, object_id, type } = req.body;
+
+ // Convert the incoming array of coordinates into the shape structure
+ const shape = coordinates.map((point: number[]) => ({
+ object_id: object_id || null,
+ x: point[0],
+ y: point[1]
+ }));
+
+ console.log(shape)
+
+ // Create a new node in the database
+ const node = await prisma.nodes.create({
+ data: {
+ object_id: object_id || null, // Nullable if object_id is not provided
+ shape_type: type, // You can adjust this dynamically
+ shape: shape, // Store the shape array as Json[]
+ label: 'Default'
+ }
+ });
+
+ res.status(201).json(node);
+ } catch (error) {
+ console.error('Error creating node:', error);
+ res.status(500).json({ error: 'Failed to create node' });
+ }
+})
+
+export default router
\ No newline at end of file
diff --git a/ems/src/api/tiles/index.ts b/ems/src/api/tiles/index.ts
new file mode 100644
index 0000000..5eff191
--- /dev/null
+++ b/ems/src/api/tiles/index.ts
@@ -0,0 +1,83 @@
+import express, { Request, Response } from 'express';
+import multer from 'multer';
+import path from 'path';
+import fs from 'fs';
+import { Coordinate } from '../../interfaces/map';
+import { generateTilesForZoomLevel } from '../../utils/tiles';
+import axios from 'axios';
+
+const router = express.Router()
+
+const storage = multer.diskStorage({
+ destination: function (req, file, cb) {
+ cb(null, path.join(__dirname, '..', 'public', 'temp'))
+ },
+ filename: function (req, file, cb) {
+ cb(null, Date.now() + path.extname(file.originalname))
+ }
+})
+
+const upload = multer({ storage: storage })
+
+const tileFolder = path.join(__dirname, '..', '..', '..', 'public', 'tile_data')
+const uploadDir = path.join(__dirname, '..', '..', '..', 'public', 'temp')
+
+router.post('/upload', upload.single('file'), async (req: Request, res: Response) => {
+ const { extentMinX, extentMinY, extentMaxX, extentMaxY, blX, blY, tlX, tlY, trX, trY, brX, brY } = req.body
+
+ const bottomLeft: Coordinate = { x: blX, y: blY }
+ const topLeft: Coordinate = { x: tlX, y: tlY }
+ const topRight: Coordinate = { x: trX, y: trY }
+ const bottomRight: Coordinate = { x: brX, y: brY }
+
+ if (req.file) {
+ for (let z = 0; z <= 21; z++) {
+ await generateTilesForZoomLevel(uploadDir, tileFolder, req.file, [extentMinX, extentMinY, extentMaxX, extentMaxY], bottomLeft, topLeft, topRight, bottomRight, z)
+ }
+ }
+
+ return res.status(200)
+})
+
+router.get('/tile/:provider/:z/:x/:y', async (req: Request, res: Response) => {
+ const { provider, z, x, y } = req.params
+
+ if (!['google', 'yandex', 'custom'].includes(provider)) {
+ return res.status(400).send('Invalid provider')
+ }
+
+ const tilePath = provider === 'custom' ? path.join(tileFolder, provider, z, x, `${y}.png`) : path.join(tileFolder, provider, z, x, `${y}.jpg`)
+
+ if (fs.existsSync(tilePath)) {
+ return res.sendFile(tilePath)
+ } else {
+ if (provider !== 'custom') {
+ try {
+ const tileData = await fetchTileFromAPI(provider, z, x, y)
+
+ fs.mkdirSync(path.dirname(tilePath), { recursive: true })
+
+ fs.writeFileSync(tilePath, tileData)
+
+ res.contentType('image/jpeg')
+ res.send(tileData)
+ } catch (error) {
+ console.error('Error fetching tile from API:', error)
+ res.status(500).send('Error fetching tile from API')
+ }
+ } else {
+ res.status(404).send('Tile is not generated or not provided')
+ }
+ }
+})
+
+const fetchTileFromAPI = async (provider: string, z: string, x: string, y: string): Promise => {
+ const url = provider === 'google'
+ ? `https://khms2.google.com/kh/v=984?x=${x}&y=${y}&z=${z}`
+ : `https://core-sat.maps.yandex.net/tiles?l=sat&x=${x}&y=${y}&z=${z}&scale=1&lang=ru_RU`
+
+ const response = await axios.get(url, { responseType: 'arraybuffer' })
+ return response.data
+}
+
+export default router
\ No newline at end of file
diff --git a/ems/src/index.ts b/ems/src/index.ts
index 912d007..f8d7101 100644
--- a/ems/src/index.ts
+++ b/ems/src/index.ts
@@ -1,401 +1,23 @@
-import express, { Request, Response } from 'express'
-import { PrismaClient } from '@prisma/client'
-import fs from 'fs'
-import path from 'path'
-import axios from 'axios'
-import multer from 'multer'
+import express from 'express'
import bodyParser from 'body-parser'
import cors from 'cors'
-import { Coordinate } from './interfaces/map'
-import { generateTilesForZoomLevel } from './utils/tiles'
-import { query, validationResult } from 'express-validator'
-import { Connection, ConnectionConfiguration, Request as TediousRequest } from 'tedious'
+import generalRouter from './api/general'
+import gisRouter from './api/gis'
+import nodesRouter from './api/nodes'
+import tilesRouter from './api/tiles'
-const tediousConfig: ConnectionConfiguration = {
- server: 'localhost',
- options: {
- trustServerCertificate: true,
- port: 1433,
- database: 'nGeneral'
- },
- authentication: {
- type: 'default',
- options: {
- userName: 'SA',
- password: 'oMhthmsvbYHc'
- }
- }
-}
-
-const prisma = new PrismaClient()
const app = express()
const PORT = process.env.EMS_PORT || 5000
-const tileFolder = path.join(__dirname, '..', 'public', 'tile_data')
-const uploadDir = path.join(__dirname, '..', 'public', 'temp')
-
app.use(cors())
app.use(bodyParser.json())
app.use(bodyParser.urlencoded({ extended: true }))
-const storage = multer.diskStorage({
- destination: function (req, file, cb) {
- cb(null, path.join(__dirname, '..', 'public', 'temp'))
- },
- filename: function (req, file, cb) {
- cb(null, Date.now() + path.extname(file.originalname))
- }
-})
-
-const upload = multer({ storage: storage })
-
-app.get('/nodes/all', async (req: Request, res: Response) => {
- try {
- const nodes = await prisma.nodes.findMany()
-
- res.json(nodes)
- } catch (error) {
- console.error('Error getting node:', error);
- res.status(500).json({ error: 'Failed to get node' });
- }
-})
-
-app.get('/nodes', query('id').isString().isUUID(), async (req: Request, res: Response) => {
- try {
- const result = validationResult(req)
- if (!result.isEmpty()) {
- return res.send({ errors: result.array() })
- }
-
- const { id } = req.params
-
- const node = await prisma.nodes.findFirst({
- where: {
- id: id
- }
- })
-
- res.json(node)
-
- } catch (error) {
- console.error('Error getting node:', error);
- res.status(500).json({ error: 'Failed to get node' });
- }
-})
-
-app.post('/nodes', async (req: Request, res: Response) => {
- try {
- const { coordinates, object_id, type } = req.body;
-
- // Convert the incoming array of coordinates into the shape structure
- const shape = coordinates.map((point: number[]) => ({
- object_id: object_id || null,
- x: point[0],
- y: point[1]
- }));
-
- console.log(shape)
-
- // Create a new node in the database
- const node = await prisma.nodes.create({
- data: {
- object_id: object_id || null, // Nullable if object_id is not provided
- shape_type: type, // You can adjust this dynamically
- shape: shape, // Store the shape array as Json[]
- label: 'Default'
- }
- });
-
- res.status(201).json(node);
- } catch (error) {
- console.error('Error creating node:', error);
- res.status(500).json({ error: 'Failed to create node' });
- }
-})
-
-app.post('/upload', upload.single('file'), async (req: Request, res: Response) => {
- const { extentMinX, extentMinY, extentMaxX, extentMaxY, blX, blY, tlX, tlY, trX, trY, brX, brY } = req.body
-
- const bottomLeft: Coordinate = { x: blX, y: blY }
- const topLeft: Coordinate = { x: tlX, y: tlY }
- const topRight: Coordinate = { x: trX, y: trY }
- const bottomRight: Coordinate = { x: brX, y: brY }
-
- if (req.file) {
- for (let z = 0; z <= 21; z++) {
- await generateTilesForZoomLevel(uploadDir, tileFolder, req.file, [extentMinX, extentMinY, extentMaxX, extentMaxY], bottomLeft, topLeft, topRight, bottomRight, z)
- }
- }
-
- return res.status(200)
-})
-
-const fetchTileFromAPI = async (provider: string, z: string, x: string, y: string): Promise => {
- const url = provider === 'google'
- ? `https://khms2.google.com/kh/v=984?x=${x}&y=${y}&z=${z}`
- : `https://core-sat.maps.yandex.net/tiles?l=sat&x=${x}&y=${y}&z=${z}&scale=1&lang=ru_RU`
-
- const response = await axios.get(url, { responseType: 'arraybuffer' })
- return response.data
-}
-
-app.get('/tile/:provider/:z/:x/:y', async (req: Request, res: Response) => {
- const { provider, z, x, y } = req.params
-
- if (!['google', 'yandex', 'custom'].includes(provider)) {
- return res.status(400).send('Invalid provider')
- }
-
- const tilePath = provider === 'custom' ? path.join(tileFolder, provider, z, x, `${y}.png`) : path.join(tileFolder, provider, z, x, `${y}.jpg`)
-
- if (fs.existsSync(tilePath)) {
- return res.sendFile(tilePath)
- } else {
- if (provider !== 'custom') {
- try {
- const tileData = await fetchTileFromAPI(provider, z, x, y)
-
- fs.mkdirSync(path.dirname(tilePath), { recursive: true })
-
- fs.writeFileSync(tilePath, tileData)
-
- res.contentType('image/jpeg')
- res.send(tileData)
- } catch (error) {
- console.error('Error fetching tile from API:', error)
- res.status(500).send('Error fetching tile from API')
- }
- } else {
- res.status(404).send('Tile is not generated or not provided')
- }
- }
-})
-
-function tediousQuery(query: string) {
- // Read all rows from table
-
-
- return new Promise((resolve, reject) => {
- const connection = new Connection(tediousConfig)
-
- connection.on('connect', (err) => {
- if (err) {
- reject(err)
- return
- }
-
- const result: any = [];
-
- const request = new TediousRequest(
- query,
- (err, rowCount) => {
- if (err) {
- console.log(`Executing ${query}, ${rowCount} rows.`);
- console.error(err.message);
- } else {
- console.log(`Executing ${query}, ${rowCount} rows.`);
- }
- }
- )
-
- request.on("row", (columns) => {
- const entry: any = {};
- columns.forEach((column: any) => {
- entry[column.metadata.colName] = column.value;
- });
- result.push(entry);
- });
-
- request.on('error', error => reject(error));// some error happened, reject the promise
- request.on('requestCompleted', () => {
- connection.close();
- resolve(result)
- }); // resolve the promise with the result rows.
-
- connection.execSql(request)
- })
-
- connection.on('error', (err) => {
- reject(err)
- })
-
- connection.connect()
- });
-}
-
-app.get('/general/cities/all', async (req: Request, res: Response) => {
- try {
- const { offset, limit, search, id } = req.query
-
- const result = await tediousQuery(
- `
- SELECT * FROM nGeneral..Cities
- ${id ? `WHERE id = '${id}'` : ''}
- ${search ? `WHERE name LIKE '%${search || ''}%'` : ''}
- ORDER BY id
- OFFSET ${Number(offset) || 0} ROWS
- FETCH NEXT ${Number(limit) || 10} ROWS ONLY;
- `
- )
- res.status(200).json(result)
- } catch (err) {
- res.status(500)
- }
-})
-
-app.get('/general/types/all', async (req: Request, res: Response) => {
- try {
- const result = await tediousQuery(
- `
- SELECT * FROM nGeneral..tTypes
- ORDER BY id
- `
- )
- res.status(200).json(result)
- } catch (err) {
- res.status(500)
- }
-})
-
-app.get('/general/objects/all', async (req: Request, res: Response) => {
- try {
- const { offset, limit, city_id } = req.query
-
- const result = await tediousQuery(
- `
- SELECT * FROM nGeneral..vObjects
- ${city_id ? `WHERE id_city = ${city_id}` : ''}
- ORDER BY object_id
- OFFSET ${Number(offset) || 0} ROWS
- FETCH NEXT ${Number(limit) || 10} ROWS ONLY;
- `
- )
- res.status(200).json(result)
- } catch (err) {
- res.status(500)
- }
-})
-
-app.get('/general/objects/:id([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})', async (req: Request, res: Response) => {
- try {
- const { id } = req.params;
-
- const result = await tediousQuery(
- `
- SELECT * FROM nGeneral..vObjects
- ${id ? `WHERE object_id = '${id}'` : ''}
- `
- )
- if (Array.isArray(result) && result.length > 0) {
- res.status(200).json(result[0])
- }
- } catch (err) {
- res.status(500)
- }
-})
-
-app.get('/general/values/all', async (req: Request, res: Response) => {
- try {
- const { object_id } = req.query
-
- if (!object_id) {
- res.status(500)
- }
-
- const result = await tediousQuery(
- `
- SELECT * FROM nGeneral..tValues
- WHERE id_object = '${object_id}'
- `
- )
-
- res.status(200).json(result)
- } catch (err) {
- res.status(500)
- }
-})
-
-app.get('/general/params/all', async (req: Request, res: Response) => {
- try {
- const { param_id } = req.query
-
- if (!param_id) {
- res.status(500)
- }
-
- const result = await tediousQuery(
- `
- SELECT * FROM nGeneral..tParameters
- WHERE id = '${param_id}'
- `
- )
-
- res.status(200).json(result)
- } catch (err) {
- res.status(500)
- }
-})
-
-app.get('/gis/images/all', async (req: Request, res: Response) => {
- try {
- const { offset, limit, city_id } = req.query
-
- const result = await tediousQuery(
- `
- SELECT * FROM New_Gis..images
- ${city_id ? `WHERE city_id = ${city_id}` : ''}
- ORDER BY city_id
- OFFSET ${Number(offset) || 0} ROWS
- FETCH NEXT ${Number(limit) || 10} ROWS ONLY;
- `
- )
- res.status(200).json(result)
- } catch (err) {
- res.status(500)
- }
-})
-
-
-// Get figures by year and city id
-app.get('/gis/figures/all', async (req: Request, res: Response) => {
- try {
- const { offset, limit, object_id, year, city_id } = req.query
-
- const result = await tediousQuery(
- `
- SELECT * FROM New_Gis..figures f
- JOIN nGeneral..tObjects o ON f.object_id = o.id WHERE o.id_city = ${city_id} AND f.year = ${year}
- ORDER BY f.year
- OFFSET ${Number(offset) || 0} ROWS
- FETCH NEXT ${Number(limit) || 10} ROWS ONLY;
- `
- )
- res.status(200).json(result)
- } catch (err) {
- res.status(500)
- }
-})
-
-// Get lines by year and city id
-app.get('/gis/lines/all', async (req: Request, res: Response) => {
- try {
- const { offset, limit, object_id, year, city_id } = req.query
-
- const result = await tediousQuery(
- `
- SELECT * FROM New_Gis..lines l
- JOIN nGeneral..tObjects o ON l.object_id = o.id WHERE o.id_city = ${city_id} AND l.year = ${year}
- ORDER BY l.year
- OFFSET ${Number(offset) || 0} ROWS
- FETCH NEXT ${Number(limit) || 10} ROWS ONLY;
- `
- )
- res.status(200).json(result)
- } catch (err) {
- res.status(500)
- }
-})
+app.use('/general', generalRouter)
+app.use('/gis', gisRouter)
+app.use('/nodes', nodesRouter)
+app.use('/tiles', tilesRouter)
app.listen(PORT, () => console.log(`Server running on port ${PORT}`));
\ No newline at end of file
diff --git a/ems/src/utils/tedious.ts b/ems/src/utils/tedious.ts
new file mode 100644
index 0000000..6dc2704
--- /dev/null
+++ b/ems/src/utils/tedious.ts
@@ -0,0 +1,69 @@
+import { Connection, ConnectionConfiguration, Request } from "tedious";
+
+const tediousConfig: ConnectionConfiguration = {
+ server: 'localhost',
+ options: {
+ trustServerCertificate: true,
+ port: 1433,
+ database: 'nGeneral'
+ },
+ authentication: {
+ type: 'default',
+ options: {
+ userName: 'SA',
+ password: 'oMhthmsvbYHc'
+ }
+ }
+}
+
+export function tediousQuery(query: string) {
+ // Read all rows from table
+
+
+ return new Promise((resolve, reject) => {
+ const connection = new Connection(tediousConfig)
+
+ connection.on('connect', (err) => {
+ if (err) {
+ reject(err)
+ return
+ }
+
+ const result: any = [];
+
+ const request = new Request(
+ query,
+ (err, rowCount) => {
+ if (err) {
+ console.log(`Executing ${query}, ${rowCount} rows.`);
+ console.error(err.message);
+ } else {
+ console.log(`Executing ${query}, ${rowCount} rows.`);
+ }
+ }
+ )
+
+ request.on("row", (columns) => {
+ const entry: any = {};
+ columns.forEach((column: any) => {
+ entry[column.metadata.colName] = column.value;
+ });
+ result.push(entry);
+ });
+
+ request.on('error', error => reject(error));// some error happened, reject the promise
+ request.on('requestCompleted', () => {
+ connection.close();
+ resolve(result)
+ }); // resolve the promise with the result rows.
+
+ connection.execSql(request)
+ })
+
+ connection.on('error', (err) => {
+ reject(err)
+ })
+
+ connection.connect()
+ });
+}
\ No newline at end of file