@opengis/gis 0.2.174 → 0.2.176

package/server/routes/services/functions/create.route.js

@@ -1,93 +1,93 @@
-const ROUTE_URL = process.env.ROUTE_URL || 'https://data.gki.com.ua/api/osrm-routes';
-
-function parseCoordPair(raw) {
-  const [lngRaw, latRaw] = String(raw || '').split(',');
-  const lng = Number(lngRaw);
-  const lat = Number(latRaw);
-
-  if (
-    !Number.isFinite(lng)
-    || !Number.isFinite(lat)
-    || lng < -180
-    || lng > 180
-    || lat < -90
-    || lat > 90
-  ) {
-    throw new Error('invalid coordinate')
-  }
-
-  return [lng, lat];
-}
-
-function buildRoutePoints(from, to, via) {
-  const points = [parseCoordPair(from)];
-  if (via) {
-    for (const segment of String(via).split(';')) {
-      const trimmed = segment.trim();
-      if (trimmed) {
-        points.push(parseCoordPair(trimmed));
-      }
-    }
-  }
-  points.push(parseCoordPair(to));
-  return points;
-}
-
-function routeOptionsQuery(query) {
-  const params = new URLSearchParams()
-  for (const key of ['optimize', 'surface', 'weight', 'mode']) {
-    const value = typeof query?.[key] === 'string' ? query[key].trim() : '';
-    if (value) {
-      params.set(key, value);
-    }
-  }
-  const qs = params.toString();
-  return qs ? `&${qs}` : '';
-}
-
-function buildSegmentsBody(points) {
-  const segments = [];
-  for (let i = 0; i < points.length - 1; i += 1) {
-    segments.push([
-      [points[i][0], points[i][1]],
-      [points[i + 1][0], points[i + 1][1]],
-    ]);
-  }
-  return JSON.stringify(segments);
-}
-
-export default async function createRouteHandler({ from, to, via, mode, alternatives, steps, optimize, surface, weight }) {
-  const points = buildRoutePoints(from, to, via);
-  const query = { from, to, via, mode, alternatives, steps, optimize, surface, weight };
-  const url = `${ROUTE_URL}?steps=true&alternatives=true${routeOptionsQuery(query)}`;
-
-  const response = await fetch(url, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      Accept: 'application/json',
-    },
-    body: buildSegmentsBody(points),
-    signal: AbortSignal.timeout(10_000),
-  }).catch(error => ({
-    ok: false,
-    status: 502,
-    headers: new Headers({ 'content-type': 'application/json' }),
-    text: async () => JSON.stringify({ error: String(error), code: 502 }),
-  }))
-
-  const contentType = response.headers?.get?.('content-type') || 'application/json';
-  const text = await response.text();
-
-  let payload = text
-
-  if (contentType.includes('application/json')) {
-    try {
-      payload = text ? JSON.parse(text) : null
-    } catch {
-      payload = text
-    }
-  }
-
-  return payload;
-}
+const ROUTE_URL = process.env.ROUTE_URL || 'https://data.gki.com.ua/api/osrm-routes';
+
+function parseCoordPair(raw) {
+  const [lngRaw, latRaw] = String(raw || '').split(',');
+  const lng = Number(lngRaw);
+  const lat = Number(latRaw);
+
+  if (
+    !Number.isFinite(lng)
+    || !Number.isFinite(lat)
+    || lng < -180
+    || lng > 180
+    || lat < -90
+    || lat > 90
+  ) {
+    throw new Error('invalid coordinate')
+  }
+
+  return [lng, lat];
+}
+
+function buildRoutePoints(from, to, via) {
+  const points = [parseCoordPair(from)];
+  if (via) {
+    for (const segment of String(via).split(';')) {
+      const trimmed = segment.trim();
+      if (trimmed) {
+        points.push(parseCoordPair(trimmed));
+      }
+    }
+  }
+  points.push(parseCoordPair(to));
+  return points;
+}
+
+function routeOptionsQuery(query) {
+  const params = new URLSearchParams()
+  for (const key of ['optimize', 'surface', 'weight', 'mode']) {
+    const value = typeof query?.[key] === 'string' ? query[key].trim() : '';
+    if (value) {
+      params.set(key, value);
+    }
+  }
+  const qs = params.toString();
+  return qs ? `&${qs}` : '';
+}
+
+function buildSegmentsBody(points) {
+  const segments = [];
+  for (let i = 0; i < points.length - 1; i += 1) {
+    segments.push([
+      [points[i][0], points[i][1]],
+      [points[i + 1][0], points[i + 1][1]],
+    ]);
+  }
+  return JSON.stringify(segments);
+}
+
+export default async function createRouteHandler({ from, to, via, mode, alternatives, steps, optimize, surface, weight }) {
+  const points = buildRoutePoints(from, to, via);
+  const query = { from, to, via, mode, alternatives, steps, optimize, surface, weight };
+  const url = `${ROUTE_URL}?steps=true&alternatives=true${routeOptionsQuery(query)}`;
+
+  const response = await fetch(url, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      Accept: 'application/json',
+    },
+    body: buildSegmentsBody(points),
+    signal: AbortSignal.timeout(10_000),
+  }).catch(error => ({
+    ok: false,
+    status: 502,
+    headers: new Headers({ 'content-type': 'application/json' }),
+    text: async () => JSON.stringify({ error: String(error), code: 502 }),
+  }))
+
+  const contentType = response.headers?.get?.('content-type') || 'application/json';
+  const text = await response.text();
+
+  let payload = text
+
+  if (contentType.includes('application/json')) {
+    try {
+      payload = text ? JSON.parse(text) : null
+    } catch {
+      payload = text
+    }
+  }
+
+  return payload;
+}

package/server/routes/services/functions/del.service.js

@@ -1,13 +1,13 @@
-import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function deleteService({
-    id, uid,
-}, pg = pgClients.client) {
-    const row = await dataDelete({
-        pg,
-        id,
-        table: 'gis.services',
-        uid,
-    });
-    return row;
+import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function deleteService({
+    id, uid,
+}, pg = pgClients.client) {
+    const row = await dataDelete({
+        pg,
+        id,
+        table: 'gis.services',
+        uid,
+    });
+    return row;
 }

package/server/routes/services/functions/get.layer.geom.js

@@ -1,27 +1,27 @@
-export default async function getLayerGeom(req) {
-  const { pg, params, query } = req;
-
-  const { id } = params;
-  if (!id) return { message: 'id is empty', status: 403 };
-
-  const selectTable = `select source_path,geometry_column from gis.services where service_id='${id}'`;
-  const { source_path: table, geometry_column: geometryColumn = 'geom' } = await pg.one(selectTable);
-  if (!table) return;
-  const selectGeom = `
-    SELECT 'FeatureCollection' As type,
-                               json_agg(q) as features
-                        FROM (
-                                SELECT 'Feature' as type,
-                                     row_number() over() as id, st_asgeojson(
-                                    st_force2d(${geometryColumn}),
-                                        6,
-                                        0
-                                    ) :: json as geometry
-                              from ${table}
-                              where ${geometryColumn} is not null) q`;
-  if (query?.sql) return selectGeom;
-  const { rows } = await pg.query(selectGeom);
-
-  return { message: rows, status: 200 };
-
-}
+export default async function getLayerGeom(req) {
+  const { pg, params, query } = req;
+
+  const { id } = params;
+  if (!id) return { message: 'id is empty', status: 403 };
+
+  const selectTable = `select source_path,geometry_column from gis.services where service_id='${id}'`;
+  const { source_path: table, geometry_column: geometryColumn = 'geom' } = await pg.one(selectTable);
+  if (!table) return;
+  const selectGeom = `
+    SELECT 'FeatureCollection' As type,
+                               json_agg(q) as features
+                        FROM (
+                                SELECT 'Feature' as type,
+                                     row_number() over() as id, st_asgeojson(
+                                    st_force2d(${geometryColumn}),
+                                        6,
+                                        0
+                                    ) :: json as geometry
+                              from ${table}
+                              where ${geometryColumn} is not null) q`;
+  if (query?.sql) return selectGeom;
+  const { rows } = await pg.query(selectGeom);
+
+  return { message: rows, status: 200 };
+
+}

package/server/routes/services/functions/get.service.users.js

@@ -1,76 +1,76 @@
-import { BadRequestError } from '@opengis/fastify-table/errors.js';
-import { pgClients } from '@opengis/fastify-table/utils.js';
-
-/**
- * Апі повертає перелік користувачів, які мають доступ до георесурсу
- *
- * @method GET
- * @summary Апі повертає перелік користувачів, які мають доступ до георесурсу
- * @alias getServiceUsers
- * @tag services
- * @param {String} id Ідентифікатор георесурсу (service_id)
- * @param {Number} query.limit Кількість записів на сторінці (макс. 100, за замовчуванням 20)
- * @param {Number} query.offset Зміщення для пагінації
- * @param {String} query.search Текстовий пошук за прізвищем, іменем, по-батькові або логіном
- * @type api
- *
- * @example /api/gis-service-users/3054579335420708639?limit=8&offset=0
- */
-export default async function getServiceUsers({ id, search: querySearch = '', limit: queryLimit = 10, offset = 0 }, pg = pgClients.client) {
-  const limit = Math.min(queryLimit, 100);
-
-  const search = querySearch?.trim() || '';
-
-  if (!id) {
-    throw BadRequestError('service_id is required');
-  }
-
-  const args = search ? [id, `%${search}%`] : [id];
-
-  const searchFilter = search
-    ? `and (
-        coalesce(b.sur_name,'') || ' ' || coalesce(b.user_name,'') || ' ' || coalesce(b.father_name,'') ilike $2
-        or b.login ilike $2
-        or b.uid::text ilike $2
-      )`
-    : '';
-
-  const sql = `
-    select
-      a.user_id,
-      a.actions,
-      coalesce(
-        nullif(
-          coalesce(b.sur_name,'') || coalesce(' ' || b.user_name,'') || coalesce(' ' || b.father_name,''),
-          ''
-        ),
-        b.login,
-        b.uid::text,
-        a.user_id
-      ) as user_full_name
-    from gis.services_users_rel a
-    left join admin.users b on b.uid = a.user_id
-    where a.service_id = $1
-    ${searchFilter}
-    order by user_full_name
-    limit $${args.length + 1}::bigint offset $${args.length + 2}::bigint
-  `;
-
-  const countSql = `
-    select count(*)::int as total
-    from gis.services_users_rel a
-    left join admin.users b on b.uid = a.user_id
-    where a.service_id = $1
-    ${searchFilter}
-  `;
-
-  const [{ rows }, countResult] = await Promise.all([
-    pg.query(sql, args.concat([limit, offset])),
-    pg.query(countSql, args).then((r) => r.rows?.[0]?.total ?? 0),
-  ]);
-
-  return {
-    rows,
-    count: countResult,
-  };
-}
+import { BadRequestError } from '@opengis/fastify-table/errors.js';
+import { pgClients } from '@opengis/fastify-table/utils.js';
+
+/**
+ * Апі повертає перелік користувачів, які мають доступ до георесурсу
+ *
+ * @method GET
+ * @summary Апі повертає перелік користувачів, які мають доступ до георесурсу
+ * @alias getServiceUsers
+ * @tag services
+ * @param {String} id Ідентифікатор георесурсу (service_id)
+ * @param {Number} query.limit Кількість записів на сторінці (макс. 100, за замовчуванням 20)
+ * @param {Number} query.offset Зміщення для пагінації
+ * @param {String} query.search Текстовий пошук за прізвищем, іменем, по-батькові або логіном
+ * @type api
+ *
+ * @example /api/gis-service-users/3054579335420708639?limit=8&offset=0
+ */
+export default async function getServiceUsers({ id, search: querySearch = '', limit: queryLimit = 10, offset = 0 }, pg = pgClients.client) {
+  const limit = Math.min(queryLimit, 100);
+
+  const search = querySearch?.trim() || '';
+
+  if (!id) {
+    throw BadRequestError('service_id is required');
+  }
+
+  const args = search ? [id, `%${search}%`] : [id];
+
+  const searchFilter = search
+    ? `and (
+        coalesce(b.sur_name,'') || ' ' || coalesce(b.user_name,'') || ' ' || coalesce(b.father_name,'') ilike $2
+        or b.login ilike $2
+        or b.uid::text ilike $2
+      )`
+    : '';
+
+  const sql = `
+    select
+      a.user_id,
+      a.actions,
+      coalesce(
+        nullif(
+          coalesce(b.sur_name,'') || coalesce(' ' || b.user_name,'') || coalesce(' ' || b.father_name,''),
+          ''
+        ),
+        b.login,
+        b.uid::text,
+        a.user_id
+      ) as user_full_name
+    from gis.services_users_rel a
+    left join admin.users b on b.uid = a.user_id
+    where a.service_id = $1
+    ${searchFilter}
+    order by user_full_name
+    limit $${args.length + 1}::bigint offset $${args.length + 2}::bigint
+  `;
+
+  const countSql = `
+    select count(*)::int as total
+    from gis.services_users_rel a
+    left join admin.users b on b.uid = a.user_id
+    where a.service_id = $1
+    ${searchFilter}
+  `;
+
+  const [{ rows }, countResult] = await Promise.all([
+    pg.query(sql, args.concat([limit, offset])),
+    pg.query(countSql, args).then((r) => r.rows?.[0]?.total ?? 0),
+  ]);
+
+  return {
+    rows,
+    count: countResult,
+  };
+}

package/server/routes/services/functions/get.services.col.js

@@ -1,34 +1,34 @@
-import { NotFoundError } from '@opengis/fastify-table/errors.js';
-import { metaFormat, pgClients, getTemplate } from '@opengis/fastify-table/utils.js';
-
-export default async function getServicesCol({ id, column }, pg = pgClients.client) {
-  const row = await getTemplate('layer', id) || await pg.query(`
-           SELECT 
-               service_id, source_path, attributes
-           FROM gis.services where ${id ? 'service_id=$1' : '1=1'}
-       `, [id].filter(Boolean)).then(r => r.rows[0] || {});
-
-  if (!row.source_path) {
-    throw NotFoundError('source not found');
-  }
-
-  const fields = await pg.query(`SELECT * FROM ${row.source_path} limit 0`).then(r => r.fields);
-  const field = fields.find(el => el.name === column);
-
-  if (!field) {
-    throw NotFoundError('column not found: ' + column);
-  }
-
-  const rows = await pg.query(`SELECT ${column}::text as id, ${column}, count(*) FROM ${row.source_path} 
-        where ${column} is not null group by ${column} order by count(*) desc limit 10`).then(r => r.rows || []);
-
-  const cls = row.attributes?.filter?.((col) => col.name && col.data && ['select', 'badge', 'tags'].includes(col.format)).reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {}) || {};
-
-  await metaFormat({ rows, table: row.source_path, cls });
-
-  const rows1 = rows.map(row => ({
-    ...row[`${column}_data`], ...row, [`${column}_data`]: undefined, [column]: undefined,
-  }));
-
-  return { rows: rows1, field, fields };
-}
+import { NotFoundError } from '@opengis/fastify-table/errors.js';
+import { metaFormat, pgClients, getTemplate } from '@opengis/fastify-table/utils.js';
+
+export default async function getServicesCol({ id, column }, pg = pgClients.client) {
+  const row = await getTemplate('layer', id) || await pg.query(`
+           SELECT 
+               service_id, source_path, attributes
+           FROM gis.services where ${id ? 'service_id=$1' : '1=1'}
+       `, [id].filter(Boolean)).then(r => r.rows[0] || {});
+
+  if (!row.source_path) {
+    throw NotFoundError('source not found');
+  }
+
+  const fields = await pg.query(`SELECT * FROM ${row.source_path} limit 0`).then(r => r.fields);
+  const field = fields.find(el => el.name === column);
+
+  if (!field) {
+    throw NotFoundError('column not found: ' + column);
+  }
+
+  const rows = await pg.query(`SELECT ${column}::text as id, ${column}, count(*) FROM ${row.source_path} 
+        where ${column} is not null group by ${column} order by count(*) desc limit 10`).then(r => r.rows || []);
+
+  const cls = row.attributes?.filter?.((col) => col.name && col.data && ['select', 'badge', 'tags'].includes(col.format)).reduce((acc, curr) => ({ ...acc, [curr.name]: curr.data }), {}) || {};
+
+  await metaFormat({ rows, table: row.source_path, cls });
+
+  const rows1 = rows.map(row => ({
+    ...row[`${column}_data`], ...row, [`${column}_data`]: undefined, [column]: undefined,
+  }));
+
+  return { rows: rows1, field, fields };
+}