@opengis/gis 0.2.174 → 0.2.176

package/server/routes/mapnik.prefixless/mapnik.prefixless.route.test.js

@@ -1,91 +1,91 @@
-import {
-    describe, test, expect, beforeAll,
-} from 'vitest';
-
-import { build, injectWithHeaders } from '../../../test/helper.js';
-
-const user = { uid: '2', type: 'admin' };
-
-beforeAll(async () => {
-    await build();
-});
-
-test('GET /logger-gis/stat (restrict unauthorized)', async () => {
-    const res = await injectWithHeaders({
-        method: 'GET',
-        url: '/logger-gis/stat',
-
-    });
-    expect(res.statusCode).toBe(403);
-});
-
-test('GET /logger-gis/stat (restrict non-admin)', async () => {
-    const res = await injectWithHeaders({
-        method: 'GET',
-        url: '/logger-gis/stat',
-        headers: { uid: user.uid, user_type: 'regular' }
-
-    });
-    expect(res.statusCode).toBe(403);
-});
-
-test('GET /logger-gis/stat', async () => {
-    const res = await injectWithHeaders({
-        method: 'GET',
-        url: '/logger-gis/stat',
-        headers: { uid: user.uid, user_type: user.type }
-
-    });
-    expect(res.statusCode).toBe(200);
-
-    const body = res.json();
-
-    expect(body).toHaveProperty('timestamp');
-    expect(body).toHaveProperty('global');
-    expect(body).toHaveProperty('per_map_id');
-    expect(typeof body.global).toBe('object');
-    expect(typeof body.per_map_id).toBe('object');
-    expect(body.global).toHaveProperty('total_use_count');
-    expect(body.global).toHaveProperty('ready_1');
-    expect(body.global).toHaveProperty('total_maps');
-    expect(body.global).toHaveProperty('ready_0');
-    expect(body.global).toHaveProperty('max_in_use');
-    expect(body.global).toHaveProperty('current_in_use');
-    expect(body.global).toHaveProperty('avg_use_time_sec');
-
-    const mapKey = Object.keys(body.per_map_id)[0];
-    if (mapKey) {
-        expect(body.per_map_id[mapKey]).toHaveProperty('use_count');
-        expect(body.per_map_id[mapKey]).toHaveProperty('ready_1');
-        expect(body.per_map_id[mapKey]).toHaveProperty('total');
-        expect(body.per_map_id[mapKey]).toHaveProperty('ready_0');
-        expect(body.per_map_id[mapKey]).toHaveProperty('avg_use_time_sec');
-    }
-});
-
-describe('GET /gis-logger', () => {
-    test('returns log root directories', async () => {
-        const res = await injectWithHeaders({
-            method: 'GET',
-            url: '/logger-gis/',
-            headers: { uid: user.uid, user_type: user.type }
-
-        });
-
-        expect(res.statusCode).toBe(200);
-        expect(res.headers['content-type']).toBe('text/html; charset=UTF-8');
-        expect(res.body).toMatch('<a href=');
-    });
-    test('returns error log directories', async () => {
-        const res = await injectWithHeaders({
-            method: 'GET',
-            url: '/logger-gis/error',
-            headers: { uid: user.uid, user_type: user.type }
-
-
-        });
-        expect(res.statusCode).toBe(200);
-        expect(res.headers['content-type']).toBe('text/html; charset=UTF-8');
-        expect(res.body).toMatch('<a href=');
-    });
-});
+import {
+    describe, test, expect, beforeAll,
+} from 'vitest';
+
+import { build, injectWithHeaders } from '../../../test/helper.js';
+
+const user = { uid: '2', type: 'admin' };
+
+beforeAll(async () => {
+    await build();
+});
+
+test('GET /logger-gis/stat (restrict unauthorized)', async () => {
+    const res = await injectWithHeaders({
+        method: 'GET',
+        url: '/logger-gis/stat',
+
+    });
+    expect(res.statusCode).toBe(403);
+});
+
+test('GET /logger-gis/stat (restrict non-admin)', async () => {
+    const res = await injectWithHeaders({
+        method: 'GET',
+        url: '/logger-gis/stat',
+        headers: { uid: user.uid, user_type: 'regular' }
+
+    });
+    expect(res.statusCode).toBe(403);
+});
+
+test('GET /logger-gis/stat', async () => {
+    const res = await injectWithHeaders({
+        method: 'GET',
+        url: '/logger-gis/stat',
+        headers: { uid: user.uid, user_type: user.type }
+
+    });
+    expect(res.statusCode).toBe(200);
+
+    const body = res.json();
+
+    expect(body).toHaveProperty('timestamp');
+    expect(body).toHaveProperty('global');
+    expect(body).toHaveProperty('per_map_id');
+    expect(typeof body.global).toBe('object');
+    expect(typeof body.per_map_id).toBe('object');
+    expect(body.global).toHaveProperty('total_use_count');
+    expect(body.global).toHaveProperty('ready_1');
+    expect(body.global).toHaveProperty('total_maps');
+    expect(body.global).toHaveProperty('ready_0');
+    expect(body.global).toHaveProperty('max_in_use');
+    expect(body.global).toHaveProperty('current_in_use');
+    expect(body.global).toHaveProperty('avg_use_time_sec');
+
+    const mapKey = Object.keys(body.per_map_id)[0];
+    if (mapKey) {
+        expect(body.per_map_id[mapKey]).toHaveProperty('use_count');
+        expect(body.per_map_id[mapKey]).toHaveProperty('ready_1');
+        expect(body.per_map_id[mapKey]).toHaveProperty('total');
+        expect(body.per_map_id[mapKey]).toHaveProperty('ready_0');
+        expect(body.per_map_id[mapKey]).toHaveProperty('avg_use_time_sec');
+    }
+});
+
+describe('GET /gis-logger', () => {
+    test('returns log root directories', async () => {
+        const res = await injectWithHeaders({
+            method: 'GET',
+            url: '/logger-gis/',
+            headers: { uid: user.uid, user_type: user.type }
+
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.headers['content-type']).toBe('text/html; charset=UTF-8');
+        expect(res.body).toMatch('<a href=');
+    });
+    test('returns error log directories', async () => {
+        const res = await injectWithHeaders({
+            method: 'GET',
+            url: '/logger-gis/error',
+            headers: { uid: user.uid, user_type: user.type }
+
+
+        });
+        expect(res.statusCode).toBe(200);
+        expect(res.headers['content-type']).toBe('text/html; charset=UTF-8');
+        expect(res.body).toMatch('<a href=');
+    });
+});

package/server/routes/mapnik.prefixless/mapnik.prefixless.schema.mjs

@@ -1,27 +1,27 @@
-// values hardcoded into mapnik
-const periodSchema = {
-  type: 'string', enum: ['1w', '1d', '1h', '5m', '1m']
-};
-
-
-export const mapnikStatSchema = {
-  querystring: {
-    type: "object",
-    additionalProperties: false,
-    properties: {
-      period: periodSchema,
-    },
-  },
-};
-
-export const mapnikLoggerSchema = {
-  querystring: {
-    type: "object",
-    additionalProperties: false,
-    properties: {
-      debug: { type: "number", minimum: 1, maximum: 10 },
-    },
-  },
-};
-
-export default null;
+// values hardcoded into mapnik
+const periodSchema = {
+  type: 'string', enum: ['1w', '1d', '1h', '5m', '1m']
+};
+
+
+export const mapnikStatSchema = {
+  querystring: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      period: periodSchema,
+    },
+  },
+};
+
+export const mapnikLoggerSchema = {
+  querystring: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      debug: { type: "number", minimum: 1, maximum: 10 },
+    },
+  },
+};
+
+export default null;

package/server/routes/maps/functions/add.map.js

@@ -1,42 +1,42 @@
-import { BadRequestError, UnauthorizedError } from "@opengis/fastify-table/errors.js";
-import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function addMap({
-  method, id, body, uid,
-}, pg = pgClients.client) {
-  if (!uid) {
-    throw UnauthorizedError('unauthorized');
-  }
-
-  if (method === 'POST') {
-    if (!body?.name) {
-      throw BadRequestError('not enough body params: name');
-    }
-
-    if (!body?.map_key) {
-      throw BadRequestError('not enough body params: map_key');
-    }
-
-    const { rows = [] } = await dataInsert({
-      pg,
-      id,
-      table: 'gis.maps',
-      data: body,
-      uid,
-    });
-    return rows[0];
-  }
-
-  if (!id) {
-    throw BadRequestError('not enough params: id');
-  }
-
-  const row = await dataUpdate({
-    pg,
-    id,
-    table: 'gis.maps',
-    data: body,
-    uid,
-  });
-  return row;
-}
+import { BadRequestError, UnauthorizedError } from "@opengis/fastify-table/errors.js";
+import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function addMap({
+  method, id, body, uid,
+}, pg = pgClients.client) {
+  if (!uid) {
+    throw UnauthorizedError('unauthorized');
+  }
+
+  if (method === 'POST') {
+    if (!body?.name) {
+      throw BadRequestError('not enough body params: name');
+    }
+
+    if (!body?.map_key) {
+      throw BadRequestError('not enough body params: map_key');
+    }
+
+    const { rows = [] } = await dataInsert({
+      pg,
+      id,
+      table: 'gis.maps',
+      data: body,
+      uid,
+    });
+    return rows[0];
+  }
+
+  if (!id) {
+    throw BadRequestError('not enough params: id');
+  }
+
+  const row = await dataUpdate({
+    pg,
+    id,
+    table: 'gis.maps',
+    data: body,
+    uid,
+  });
+  return row;
+}

package/server/routes/maps/functions/del.map.js

@@ -1,18 +1,18 @@
-import { UnauthorizedError } from "@opengis/fastify-table/errors.js";
-import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function delMap({
-    id, uid,
-}, pg = pgClients.client) {
-    if (!uid) {
-        throw UnauthorizedError('unauthorized');
-    }
-
-    const row = await dataDelete({
-        pg,
-        id,
-        table: 'gis.maps',
-        uid,
-    });
-    return row;
+import { UnauthorizedError } from "@opengis/fastify-table/errors.js";
+import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function delMap({
+    id, uid,
+}, pg = pgClients.client) {
+    if (!uid) {
+        throw UnauthorizedError('unauthorized');
+    }
+
+    const row = await dataDelete({
+        pg,
+        id,
+        table: 'gis.maps',
+        uid,
+    });
+    return row;
 }

package/server/routes/maps/functions/get.map.js

@@ -1,119 +1,119 @@
-import { NotFoundError } from '@opengis/fastify-table/errors.js';
-import {
-  getMeta, getTemplate, pgClients, getTemplates, yml2json,
-} from '@opengis/fastify-table/utils.js';
-
-const table = 'gis.maps';
-
-const columnType = {
-  text: 'text',
-  date: 'date',
-  bool: 'yes/no',
-  numeric: 'number',
-  integer: 'number',
-  'timestamp without time zone': 'date',
-  'timestamp with time zone': 'date',
-};
-
-export default async function getMap({ id }, pg = pgClients.client) {
-  const { columns = [] } = await getMeta({ pg, table }) || {};
-
-  const fields = columns.map(({ name, dataTypeID, title }) => ({
-    name,
-    type: columnType[pg.pgType?.[dataTypeID] || 'text'],
-    label: title || name,
-  }));
-
-  const mapList = getTemplates('map').map(el => el[0]);
-
-  const rows = pg.pk?.['gis.maps'] ? await pg.query(
-    `SELECT map_id as id, * FROM gis.maps where ${id ? '$1 in (map_id,map_key)' : '1=1'}`,
-    [id].filter(Boolean),
-  ).then(el => el.rows || []) : [];
-
-  if (id && !mapList?.includes(id) && !rows[0]) {
-    throw NotFoundError('map not found');
-  }
-
-  const totals = pg.queryCache ? await pg.queryCache('select json_object_agg(oid::regclass, reltuples) from pg_class')
-    .then(el => el.rows?.[0]?.json_object_agg || {}) : {};
-
-  const maps = pg.pk?.['gis.maps'] ? await pg.query(
-    'SELECT map_id as id, map_key as slug, name FROM gis.maps where is_active and is_public order by name',
-  ).then(el => el.rows || []) : [];
-
-  if (mapList.includes('main') && !maps.find(el => el.slug === 'main')) {
-    maps.unshift({ id: 'main', slug: 'main', name: 'Основна карта' });
-  }
-
-  if (id) {
-    const map = rows[0] || {};
-    const loadTemplate = await getTemplate('map', id) || await getTemplate('map', map.map_key);
-    const obj = loadTemplate || map;
-
-    const rawIds = [
-      ...(Array.isArray(obj?.layers) ? obj.layers : []),
-      ...(Array.isArray(obj?.ogc) ? obj.ogc : []),
-      ...(Array.isArray(obj?.cartocss) ? obj.cartocss : []),
-      ...(Array.isArray(obj?.rasters) ? obj.rasters : []),
-    ];
-    const layerIds = [...new Set(rawIds.map(id => id?.toString().trim()).filter(Boolean))];
-
-    let layers = [];
-
-    if (layerIds.length > 0) {
-      const [resServices, resOgc, resRasters, resCarto] = await Promise.all([
-        pg.query(`SELECT service_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, coalesce('/api/vtile/'||service_id||'/ua/{z}/{x}/{y}.vmt',null) as url FROM gis.services WHERE is_active = true AND is_public = true AND service_id::text = ANY($1)`, [layerIds]),
-        pg.query(`SELECT ogc_service_id::text as id, url as service_url, * FROM gis.ogc_service WHERE enabled = true AND ispublic = true AND ogc_service_id::text = ANY($1)`, [layerIds]),
-        pg.query(`SELECT raster_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, coalesce('/api/gis-rtile/'||raster_id||'/{z}/{x}/{y}.png',null) as url FROM gis.rasters WHERE is_active = true AND is_public = true AND isadmin = false AND raster_id::text = ANY($1)`, [layerIds]),
-        pg.query(`SELECT cartocss_id::text as id, *, st_asgeojson(geom)::json as bbox, coalesce('/api/gis-rtile/'||cartocss_id||'/{z}/{x}/{y}.png',null) as url FROM gis.cartocss WHERE enabled = true AND is_public = true AND cartocss_id::text = ANY($1)`, [layerIds]),
-      ]);
-
-      const allFetchedLayers = [
-        ...resServices.rows.map(row => ({ ...row, type: row.service_type || 'layer' })),
-        ...resOgc.rows.map(row => ({ ...row, type: 'ogc', source_path: row.table_name })),
-        ...resRasters.rows.map(row => ({ ...row, type: 'raster' })),
-        ...resCarto.rows.map(row => ({ ...row, type: 'cartocss' })),
-      ];
-
-      const dbLayersMap = new Map(allFetchedLayers.map(l => [String(l.id), l]));
-
-      const layersResults = await Promise.all(layerIds.map(async (id) => {
-        const idStr = String(id);
-
-        if (!dbLayersMap.has(idStr)) {
-          return null;
-        }
-
-        const dbData = dbLayersMap.get(idStr);
-        const templateData = await getTemplate('layer', idStr);
-
-        const layerData = { ...dbData, ...(templateData || {}) };
-
-        layerData.count = totals[layerData.source_path || ''] || 0;
-        layerData.visible = true;
-
-        if (layerData.style && typeof layerData.style === 'string') {
-          if (layerData.type === 'cartocss') {
-            layerData.style = layerData.style.replace(/\s+/g, ' ').trim();
-          }
-          else if (layerData.type !== 'ogc') {
-            layerData.style = yml2json(layerData.style);
-          }
-        }
-
-        return layerData;
-      }));
-
-      layers = layersResults.filter(Boolean);
-    }
-
-    return { maps, ...obj, layers };
-  }
-
-  if (id && !rows.length) {
-    throw NotFoundError('map not found');
-  }
-
-  return id ? { ...rows[0], fields } : { rows, fields };
-}
+import { NotFoundError } from '@opengis/fastify-table/errors.js';
+import {
+  getMeta, getTemplate, pgClients, getTemplates, yml2json,
+} from '@opengis/fastify-table/utils.js';
+
+const table = 'gis.maps';
+
+const columnType = {
+  text: 'text',
+  date: 'date',
+  bool: 'yes/no',
+  numeric: 'number',
+  integer: 'number',
+  'timestamp without time zone': 'date',
+  'timestamp with time zone': 'date',
+};
+
+export default async function getMap({ id }, pg = pgClients.client) {
+  const { columns = [] } = await getMeta({ pg, table }) || {};
+
+  const fields = columns.map(({ name, dataTypeID, title }) => ({
+    name,
+    type: columnType[pg.pgType?.[dataTypeID] || 'text'],
+    label: title || name,
+  }));
+
+  const mapList = getTemplates('map').map(el => el[0]);
+
+  const rows = pg.pk?.['gis.maps'] ? await pg.query(
+    `SELECT map_id as id, * FROM gis.maps where ${id ? '$1 in (map_id,map_key)' : '1=1'}`,
+    [id].filter(Boolean),
+  ).then(el => el.rows || []) : [];
+
+  if (id && !mapList?.includes(id) && !rows[0]) {
+    throw NotFoundError('map not found');
+  }
+
+  const totals = pg.queryCache ? await pg.queryCache('select json_object_agg(oid::regclass, reltuples) from pg_class')
+    .then(el => el.rows?.[0]?.json_object_agg || {}) : {};
+
+  const maps = pg.pk?.['gis.maps'] ? await pg.query(
+    'SELECT map_id as id, map_key as slug, name FROM gis.maps where is_active and is_public order by name',
+  ).then(el => el.rows || []) : [];
+
+  if (mapList.includes('main') && !maps.find(el => el.slug === 'main')) {
+    maps.unshift({ id: 'main', slug: 'main', name: 'Основна карта' });
+  }
+
+  if (id) {
+    const map = rows[0] || {};
+    const loadTemplate = await getTemplate('map', id) || await getTemplate('map', map.map_key);
+    const obj = loadTemplate || map;
+
+    const rawIds = [
+      ...(Array.isArray(obj?.layers) ? obj.layers : []),
+      ...(Array.isArray(obj?.ogc) ? obj.ogc : []),
+      ...(Array.isArray(obj?.cartocss) ? obj.cartocss : []),
+      ...(Array.isArray(obj?.rasters) ? obj.rasters : []),
+    ];
+    const layerIds = [...new Set(rawIds.map(id => id?.toString().trim()).filter(Boolean))];
+
+    let layers = [];
+
+    if (layerIds.length > 0) {
+      const [resServices, resOgc, resRasters, resCarto] = await Promise.all([
+        pg.query(`SELECT service_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, coalesce('/api/vtile/'||service_id||'/ua/{z}/{x}/{y}.vmt',null) as url FROM gis.services WHERE is_active = true AND is_public = true AND service_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT ogc_service_id::text as id, url as service_url, * FROM gis.ogc_service WHERE enabled = true AND ispublic = true AND ogc_service_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT raster_id::text as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center, coalesce('/api/gis-rtile/'||raster_id||'/{z}/{x}/{y}.png',null) as url FROM gis.rasters WHERE is_active = true AND is_public = true AND isadmin = false AND raster_id::text = ANY($1)`, [layerIds]),
+        pg.query(`SELECT cartocss_id::text as id, *, st_asgeojson(geom)::json as bbox, coalesce('/api/gis-rtile/'||cartocss_id||'/{z}/{x}/{y}.png',null) as url FROM gis.cartocss WHERE enabled = true AND is_public = true AND cartocss_id::text = ANY($1)`, [layerIds]),
+      ]);
+
+      const allFetchedLayers = [
+        ...resServices.rows.map(row => ({ ...row, type: row.service_type || 'layer' })),
+        ...resOgc.rows.map(row => ({ ...row, type: 'ogc', source_path: row.table_name })),
+        ...resRasters.rows.map(row => ({ ...row, type: 'raster' })),
+        ...resCarto.rows.map(row => ({ ...row, type: 'cartocss' })),
+      ];
+
+      const dbLayersMap = new Map(allFetchedLayers.map(l => [String(l.id), l]));
+
+      const layersResults = await Promise.all(layerIds.map(async (id) => {
+        const idStr = String(id);
+
+        if (!dbLayersMap.has(idStr)) {
+          return null;
+        }
+
+        const dbData = dbLayersMap.get(idStr);
+        const templateData = await getTemplate('layer', idStr);
+
+        const layerData = { ...dbData, ...(templateData || {}) };
+
+        layerData.count = totals[layerData.source_path || ''] || 0;
+        layerData.visible = true;
+
+        if (layerData.style && typeof layerData.style === 'string') {
+          if (layerData.type === 'cartocss') {
+            layerData.style = layerData.style.replace(/\s+/g, ' ').trim();
+          }
+          else if (layerData.type !== 'ogc') {
+            layerData.style = yml2json(layerData.style);
+          }
+        }
+
+        return layerData;
+      }));
+
+      layers = layersResults.filter(Boolean);
+    }
+
+    return { maps, ...obj, layers };
+  }
+
+  if (id && !rows.length) {
+    throw NotFoundError('map not found');
+  }
+
+  return id ? { ...rows[0], fields } : { rows, fields };
+}