From 677709c1bf2284d9a10bbab9a930ba521a7f2c80 Mon Sep 17 00:00:00 2001
From: popovspiridon99 <popovspiridon0799@mail.ru>
Date: Mon, 22 Dec 2025 14:09:48 +0900
Subject: [PATCH] exclude duplicate object_id

---
 server/src/gis/gis.service.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/src/gis/gis.service.ts b/server/src/gis/gis.service.ts
index 55791b0..670e26f 100644
--- a/server/src/gis/gis.service.ts
+++ b/server/src/gis/gis.service.ts
@@ -121,13 +121,12 @@ export class GisService {
 
     async getFigures(offset: number, limit: number, year: number, city_id: number): Promise<any[]> {
         const result = await this.emsDataSource.query(`
-            SELECT * FROM figures f
-            JOIN nGeneral..vObjects o ON f.object_id = o.object_id WHERE o.id_city = ${city_id} AND f.year = ${year}
+            SELECT o.*, f.[figure_type_id], f.[left], f.[top], f.[width], f.[height], f.[angle], f.[points], f.[label_left], f.[label_top], f.[label_angle], f.[label_size] FROM New_Gis..figures f
+            JOIN nGeneral..vObjects o ON o.object_id = f.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;
         `)
-
         return result
     }