@opengis/gis 0.2.18 → 0.2.20

package/server/routes/map/index.mjs

@@ -1,129 +1,129 @@
-import map from './controllers/map.js';
-import mapTiles from './controllers/mapTiles.js';
-import mapFeatures from './controllers/mapFeatures.js';
-
-import mapCatalog from './controllers/mapCatalog.js';
-import mapCatalogAttribute from './controllers/mapCatalogAttribute.js';
-import rtile from './controllers/rtile.js';
-import vtile from './controllers/vtile.js';
-import vtile1 from './vtile1.js';
-import layerList from './controllers/layerList.js';
-
-import mapFormat from './controllers/mapFormat.js';
-import maps from './controllers/maps.js';
-import markerIconApi from './controllers/marker_icon.js';
-
-import getMap from './maps/get.map.js';
-import addMap from './maps/add.map.js';
-import delMap from './maps/del.map.js';
-
-import getWidget from './widgets/get.widget.js';
-import addWidget from './widgets/add.widget.js';
-import delWidget from './widgets/del.widget.js';
-
-const schemaInfo = {
-  type: 'object',
-  properties: {
-    publicParams: {
-      slug: {
-        type: 'string',
-      },
-      z: {
-        type: 'number',
-      },
-      y: {
-        type: 'number',
-      },
-      x: {
-        type: 'string',
-        pattern: '^\\d+\\.(pbf|vmt)$',
-      },
-      id: {
-        type: 'string',
-      },
-    },
-  },
-};
-
-const publicParams = { config: { policy: 'L0' }, schema: schemaInfo }; // * L0 === public
-const privilegedParams = { config: { policy: 'L1', role: 'admin' }, schema: schemaInfo }; // ? just auth or admin
-
-export default async function route(app) {
-  if (!app.hasRoute({ method: 'GET', url: '/gis-map/:id?' })) {
-    app.get('/gis-map/:id?', publicParams, getMap);
-  }
-  if (!app.hasRoute({ method: 'POST', url: '/gis-map/:id?' })) {
-    app.post('/gis-map/:id?', privilegedParams, addMap);
-  }
-  if (!app.hasRoute({ method: 'PUT', url: '/gis-map/:id' })) {
-    app.put('/gis-map/:id', privilegedParams, addMap);
-  }
-  if (!app.hasRoute({ method: 'DELETE', url: '/gis-map/:id' })) {
-    app.delete('/gis-map/:id', privilegedParams, delMap);
-  }
-
-  if (!app.hasRoute({ method: 'GET', url: '/gis-widget/:map/:id?' })) {
-    app.get('/gis-widget/:map/:id?', publicParams, getWidget);
-  }
-  if (!app.hasRoute({ method: 'POST', url: '/gis-widget/:map/:id?' })) {
-    app.post('/gis-widget/:map/:id?', privilegedParams, addWidget);
-  }
-  if (!app.hasRoute({ method: 'PUT', url: '/gis-widget/:map/:id' })) {
-    app.put('/gis-widget/:map/:id', privilegedParams, addWidget);
-  }
-  if (!app.hasRoute({ method: 'DELETE', url: '/gis-widget/:map/:id' })) {
-    app.delete('/gis-widget/:map/:id', privilegedParams, delWidget);
-  }
-
-  if (!app.hasRoute({ method: 'GET', url: '/maps' })) {
-    app.get('/maps', publicParams, maps);
-  }
-  if (!app.hasRoute({ method: 'GET', url: '/map/:slug' })) {
-    app.get('/map/:slug', publicParams, map);
-  }
-  if (!app.hasRoute({ method: 'GET', url: '/map-tiles/:slug/:z/:y/:x' })) {
-    app.get('/map-tiles/:slug/:z/:y/:x', publicParams, mapTiles);
-  }
-  if (!app.hasRoute({ method: 'GET', url: '/map-features/:slug/:id' })) {
-    app.get('/map-features/:slug/:id', publicParams, mapFeatures);
-  }
-  if (!app.hasRoute({ method: 'GET', url: '/map-features-point/:slug' })) {
-    app.get('/map-features-point/:slug', publicParams, mapFeatures);
-  }
-
-  if (!app.hasRoute({ method: 'GET', url: '/map-catalog' })) {
-    app.get('/map-catalog', publicParams, mapCatalog);
-  }
-  if (!app.hasRoute({ method: 'GET', url: '/map-catalog/:service/:attr' })) {
-    app.get('/map-catalog/:service/:attr', publicParams, mapCatalogAttribute);
-  }
-  if (!app.hasRoute({ method: 'GET', url: '/layer-rtile/:id/:z/:y/:x' })) {
-    app.get('/layer-rtile/:id/:z/:y/:x', publicParams, rtile);
-  }
-  if (!app.hasRoute({ method: 'GET', url: '/layer-vtile/:id/:z/:y/:x' })) {
-    app.get('/layer-vtile/:id/:z/:y/:x', publicParams, vtile);
-  }
-
-  if (!app.hasRoute({ method: 'GET', url: '/api/vtile/:layer/:lang/:z/:y/:x' })) {
-    console.log('\x1b[34m%s\x1b[0m', 'add vtile from gis');
-    app.get('/vtile/:layer/:lang/:z/:y/:x', publicParams, vtile1);
-  }
-  if (!app.hasRoute({ method: 'GET', url: '/api/gis-layer-list' })) {
-    console.log('\x1b[34m%s\x1b[0m', 'add gis-layer-list from gis');
-    app.get('/gis-layer-list', publicParams, layerList);
-  }
-
-  if (!app.hasRoute({ method: 'GET', url: '/gis-icon/*' })) {
-    app.get('/gis-icon/*', publicParams, markerIconApi);
-  }
-  if (!app.hasRoute({ method: 'GET', url: '/icon/*' })) {
-    app.get('/icon/*', publicParams, markerIconApi);
-  }
-  if (!app.hasRoute({ method: 'GET', url: '/marker-icon/*' })) {
-    app.get('/marker-icon/*', publicParams, markerIconApi);
-  }
-
-  if (!app.hasRoute({ method: 'GET', url: '/api/map-format' })) {
-    app.get('/map-format', publicParams, mapFormat);
-  }
-}
+import map from './controllers/map.js';
+import mapTiles from './controllers/mapTiles.js';
+import mapFeatures from './controllers/mapFeatures.js';
+
+import mapCatalog from './controllers/mapCatalog.js';
+import mapCatalogAttribute from './controllers/mapCatalogAttribute.js';
+import rtile from './controllers/rtile.js';
+import vtile from './controllers/vtile.js';
+import vtile1 from './vtile1.js';
+import layerList from './controllers/layerList.js';
+
+import mapFormat from './controllers/mapFormat.js';
+import maps from './controllers/maps.js';
+import markerIconApi from './controllers/marker_icon.js';
+
+import getMap from './maps/get.map.js';
+import addMap from './maps/add.map.js';
+import delMap from './maps/del.map.js';
+
+import getWidget from './widgets/get.widget.js';
+import addWidget from './widgets/add.widget.js';
+import delWidget from './widgets/del.widget.js';
+
+const schemaInfo = {
+  type: 'object',
+  properties: {
+    publicParams: {
+      slug: {
+        type: 'string',
+      },
+      z: {
+        type: 'number',
+      },
+      y: {
+        type: 'number',
+      },
+      x: {
+        type: 'string',
+        pattern: '^\\d+\\.(pbf|vmt)$',
+      },
+      id: {
+        type: 'string',
+      },
+    },
+  },
+};
+
+const publicParams = { config: { policy: 'L0' }, schema: schemaInfo }; // * L0 === public
+const privilegedParams = { config: { policy: 'L1', role: 'admin' }, schema: schemaInfo }; // ? just auth or admin
+
+export default async function route(app) {
+  if (!app.hasRoute({ method: 'GET', url: '/gis-map/:id?' })) {
+    app.get('/gis-map/:id?', publicParams, getMap);
+  }
+  if (!app.hasRoute({ method: 'POST', url: '/gis-map/:id?' })) {
+    app.post('/gis-map/:id?', privilegedParams, addMap);
+  }
+  if (!app.hasRoute({ method: 'PUT', url: '/gis-map/:id' })) {
+    app.put('/gis-map/:id', privilegedParams, addMap);
+  }
+  if (!app.hasRoute({ method: 'DELETE', url: '/gis-map/:id' })) {
+    app.delete('/gis-map/:id', privilegedParams, delMap);
+  }
+
+  if (!app.hasRoute({ method: 'GET', url: '/gis-widget/:map/:id?' })) {
+    app.get('/gis-widget/:map/:id?', publicParams, getWidget);
+  }
+  if (!app.hasRoute({ method: 'POST', url: '/gis-widget/:map/:id?' })) {
+    app.post('/gis-widget/:map/:id?', privilegedParams, addWidget);
+  }
+  if (!app.hasRoute({ method: 'PUT', url: '/gis-widget/:map/:id' })) {
+    app.put('/gis-widget/:map/:id', privilegedParams, addWidget);
+  }
+  if (!app.hasRoute({ method: 'DELETE', url: '/gis-widget/:map/:id' })) {
+    app.delete('/gis-widget/:map/:id', privilegedParams, delWidget);
+  }
+
+  if (!app.hasRoute({ method: 'GET', url: '/maps' })) {
+    app.get('/maps', publicParams, maps);
+  }
+  if (!app.hasRoute({ method: 'GET', url: '/map/:slug' })) {
+    app.get('/map/:slug', publicParams, map);
+  }
+  if (!app.hasRoute({ method: 'GET', url: '/map-tiles/:slug/:z/:y/:x' })) {
+    app.get('/map-tiles/:slug/:z/:y/:x', publicParams, mapTiles);
+  }
+  if (!app.hasRoute({ method: 'GET', url: '/map-features/:slug/:id' })) {
+    app.get('/map-features/:slug/:id', publicParams, mapFeatures);
+  }
+  if (!app.hasRoute({ method: 'GET', url: '/map-features-point/:slug' })) {
+    app.get('/map-features-point/:slug', publicParams, mapFeatures);
+  }
+
+  if (!app.hasRoute({ method: 'GET', url: '/map-catalog' })) {
+    app.get('/map-catalog', publicParams, mapCatalog);
+  }
+  if (!app.hasRoute({ method: 'GET', url: '/map-catalog/:service/:attr' })) {
+    app.get('/map-catalog/:service/:attr', publicParams, mapCatalogAttribute);
+  }
+  if (!app.hasRoute({ method: 'GET', url: '/layer-rtile/:id/:z/:y/:x' })) {
+    app.get('/layer-rtile/:id/:z/:y/:x', publicParams, rtile);
+  }
+  if (!app.hasRoute({ method: 'GET', url: '/layer-vtile/:id/:z/:y/:x' })) {
+    app.get('/layer-vtile/:id/:z/:y/:x', publicParams, vtile);
+  }
+
+  if (!app.hasRoute({ method: 'GET', url: '/api/vtile/:layer/:lang/:z/:y/:x' })) {
+    console.log('\x1b[34m%s\x1b[0m', 'add vtile from gis');
+    app.get('/vtile/:layer/:lang/:z/:y/:x', publicParams, vtile1);
+  }
+  if (!app.hasRoute({ method: 'GET', url: '/api/gis-layer-list' })) {
+    console.log('\x1b[34m%s\x1b[0m', 'add gis-layer-list from gis');
+    app.get('/gis-layer-list', publicParams, layerList);
+  }
+
+  if (!app.hasRoute({ method: 'GET', url: '/gis-icon/*' })) {
+    app.get('/gis-icon/*', publicParams, markerIconApi);
+  }
+  if (!app.hasRoute({ method: 'GET', url: '/icon/*' })) {
+    app.get('/icon/*', publicParams, markerIconApi);
+  }
+  if (!app.hasRoute({ method: 'GET', url: '/marker-icon/*' })) {
+    app.get('/marker-icon/*', publicParams, markerIconApi);
+  }
+
+  if (!app.hasRoute({ method: 'GET', url: '/api/map-format' })) {
+    app.get('/map-format', publicParams, mapFormat);
+  }
+}

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

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

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

@@ -1,19 +1,19 @@
-import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function delMap({
-    params = {}, pg = pgClients.client, user = {},
-}, reply) {
-    const { uid } = user;
-
-    if (!uid) {
-        return reply.status(401).send('unauthorized');
-    }
-
-    const row = await dataDelete({
-        pg,
-        id: params.id,
-        table: 'gis.maps',
-        uid,
-    });
-    return reply.status(200).send(row);
+import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function delMap({
+    params = {}, pg = pgClients.client, user = {},
+}, reply) {
+    const { uid } = user;
+
+    if (!uid) {
+        return reply.status(401).send('unauthorized');
+    }
+
+    const row = await dataDelete({
+        pg,
+        id: params.id,
+        table: 'gis.maps',
+        uid,
+    });
+    return reply.status(200).send(row);
 }

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

@@ -1,88 +1,86 @@
-import path from 'node:path';
-import yaml from 'js-yaml';
-import {
-  getMeta, getTemplate, pgClients, getTemplates, getTemplateSync,
-} 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({ params = {}, pg = pgClients.client }, reply) {
-  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 ${params.id ? 'map_id=$1' : '1=1'}`,
-    [params.id].filter(Boolean),
-  ).then(el => el.rows || []) : [];
-
-  if (params.id && !mapList?.includes(params.id) && !rows[0]) {
-    return { status: 404, message: '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 slug, name FROM gis.maps',
-  ).then(el => el.rows || []) : [];
-
-  if (params.id) {
-    const map = rows[0] || {};
-    const loadTemplate = await getTemplate('map', params.id) || await getTemplate('map', map.map_key);
-
-    const obj = loadTemplate;
-
-    const layers = [];
-
-    if (Array.isArray(obj?.ogc) && obj.ogc.length && ['string', 'number'].includes(typeof obj.ogc[0])) {
-      await Promise.all(obj.ogc.map(async (layer) => {
-        const ogcData = await pg.query('select ogc_service_id as id, url as service_url, * from gis.ogc_service where ogc_service_id=$1', [layer]).then(el => el.rows?.[0]);
-        layers.push({
-          ...(ogcData || {}), id: layer, /* center: [], bbox: null, filters: [], style: { color: 'red' }, */ visible: !!ogcData, type: 'ogc',
-        });
-      }));
-    }
-
-    if (Array.isArray(obj?.layers) && typeof obj?.layers?.[0] === 'string') {
-      await Promise.all(obj.layers.map(async (layer) => {
-        const layerData = await getTemplate('layer', layer);
-        const serviceData = layerData || await pg.query('select service_id as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center from gis.services where service_id=$1', [layer]).then(el => el.rows?.[0]);
-        Object.assign(serviceData || {}, { count: totals[serviceData?.source_path || ''] || 0 });
-        if (serviceData) { serviceData.style = typeof serviceData.style === 'object' ? serviceData.style : yaml.load(serviceData.style); }
-        layers.push({ ...(serviceData || {}), id: layer, visible: !!serviceData });
-      }));
-    }
-
-    if (obj?.layers || obj?.ogc) {
-      return {
-        maps, ...rows[0], ...obj, layers,
-      };
-    }
-
-    return reply.status(200).send({ maps, ...rows[0], ...loadTemplate });
-  }
-
-  if (params.id && !rows.length) {
-    return reply.status(404).send('map not found');
-  }
-
-  if (params.id) {
-    return reply.status(200).send({ ...rows[0], fields });
-  }
-
-  return reply.status(200).send({
-    rows,
-    fields,
-  });
-}
+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({ params = {}, pg = pgClients.client }, reply) {
+  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 ${params.id ? 'map_id=$1' : '1=1'}`,
+    [params.id].filter(Boolean),
+  ).then(el => el.rows || []) : [];
+
+  if (params.id && !mapList?.includes(params.id) && !rows[0]) {
+    return { status: 404, message: '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 slug, name FROM gis.maps',
+  ).then(el => el.rows || []) : [];
+
+  if (params.id) {
+    const map = rows[0] || {};
+    const loadTemplate = await getTemplate('map', params.id) || await getTemplate('map', map.map_key);
+
+    const obj = loadTemplate;
+
+    const layers = [];
+
+    if (Array.isArray(obj?.ogc) && obj.ogc.length && ['string', 'number'].includes(typeof obj.ogc[0])) {
+      await Promise.all(obj.ogc.map(async (layer) => {
+        const ogcData = await pg.query('select ogc_service_id as id, url as service_url, * from gis.ogc_service where ogc_service_id=$1', [layer]).then(el => el.rows?.[0]);
+        layers.push({
+          ...(ogcData || {}), id: layer, /* center: [], bbox: null, filters: [], style: { color: 'red' }, */ visible: !!ogcData, type: 'ogc',
+        });
+      }));
+    }
+
+    if (Array.isArray(obj?.layers) && typeof obj?.layers?.[0] === 'string') {
+      await Promise.all(obj.layers.map(async (layer) => {
+        const layerData = await getTemplate('layer', layer);
+        const serviceData = layerData || await pg.query('select service_id as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center from gis.services where service_id=$1', [layer]).then(el => el.rows?.[0]);
+        Object.assign(serviceData || {}, { count: totals[serviceData?.source_path || ''] || 0 });
+        if (serviceData) { serviceData.style = typeof serviceData.style === 'object' ? serviceData.style : yml2json(serviceData.style); }
+        layers.push({ ...(serviceData || {}), id: layer, visible: !!serviceData });
+      }));
+    }
+
+    if (obj?.layers || obj?.ogc) {
+      return {
+        maps, ...rows[0], ...obj, layers,
+      };
+    }
+
+    return reply.status(200).send({ maps, ...rows[0], ...loadTemplate });
+  }
+
+  if (params.id && !rows.length) {
+    return reply.status(404).send('map not found');
+  }
+
+  if (params.id) {
+    return reply.status(200).send({ ...rows[0], fields });
+  }
+
+  return reply.status(200).send({
+    rows,
+    fields,
+  });
+}