@opengis/gis 0.2.120 → 0.2.121

package/server/routes/mapnik/functions/cartoBounds.js

@@ -1,28 +1,28 @@
-import { pgClients } from "@opengis/fastify-table/utils.js";
-
-export default async function cartoBounds({ id, dataset, table }, pg = pgClients.client) {
-    if (!dataset?.length && !table) {
-        return [-180, -85.05112877980659, 180, 85.05112877980659];
-    }
-
-    const sqlBounds = dataset
-        ? dataset.map(el => ({ tbl: el.table.replace(/"/g, "").split('.'), geom: el.gcol || 'geom' })).map(({ tbl, geom }) => `select ST_Transform(ST_SetSRID( ST_EstimatedExtent('${tbl[0]}','${tbl[1]}', '${geom}'), (SELECT st_srid(${geom}) from ${tbl.join('.')} limit 1)),4326)`)
-        : [`select ST_Transform(ST_SetSRID(ST_EstimatedExtent('${table.split('.')[0]}', '${table.split('.')[1]}', 'geom'),(SELECT st_srid(geom) from ${table} limit 1)),4326)`];
-
-    const geom = await pg.query(
-        `update gis.cartocss set             
-        geom=(select st_extent(st_transform) from ( ${sqlBounds.join(' union all ')})q )
-        where cartocss_id=$1 returning geom::box2d`,
-        [id],
-    ).then(e => e.rows?.[0]?.geom);
-
-    const bounds = geom
-        ? geom.replace(/[A-Z\)\(]+/g, '').split(/[ ,]+/).map(el => el - 0)
-        : null;
-
-    if (!bounds) {
-        // throw new Error('empty bounds');
-    }
-
-    return bounds || [-180, -85.05112877980659, 180, 85.05112877980659];
-}
+import { pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function cartoBounds({ id, dataset, table }, pg = pgClients.client) {
+    if (!dataset?.length && !table) {
+        return [-180, -85.05112877980659, 180, 85.05112877980659];
+    }
+
+    const sqlBounds = dataset
+        ? dataset.map(el => ({ tbl: el.table.replace(/"/g, "").split('.'), geom: el.gcol || 'geom' })).map(({ tbl, geom }) => `select ST_Transform(ST_SetSRID( ST_EstimatedExtent('${tbl[0]}','${tbl[1]}', '${geom}'), (SELECT st_srid(${geom}) from ${tbl.join('.')} limit 1)),4326)`)
+        : [`select ST_Transform(ST_SetSRID(ST_EstimatedExtent('${table.split('.')[0]}', '${table.split('.')[1]}', 'geom'),(SELECT st_srid(geom) from ${table} limit 1)),4326)`];
+
+    const geom = await pg.query(
+        `update gis.cartocss set             
+        geom=(select st_extent(st_transform) from ( ${sqlBounds.join(' union all ')})q )
+        where cartocss_id=$1 returning geom::box2d`,
+        [id],
+    ).then(e => e.rows?.[0]?.geom);
+
+    const bounds = geom
+        ? geom.replace(/[A-Z\)\(]+/g, '').split(/[ ,]+/).map(el => el - 0)
+        : null;
+
+    if (!bounds) {
+        // throw new Error('empty bounds');
+    }
+
+    return bounds || [-180, -85.05112877980659, 180, 85.05112877980659];
+}

package/server/routes/mapnik/functions/uploadXML.js

@@ -1,110 +1,110 @@
-import carto from 'carto';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { UploadXML } = mapnik();
-
-const srsList = {};
-
-const getGeomColumn = (geoms, customColumn) => {
-    if (customColumn && geoms.includes(customColumn)) {
-        return customColumn;
-    }
-    if (geoms.includes('geom')) {
-        return 'geom';
-    }
-    return geoms[0];
-};
-
-import cartoBounds from './cartoBounds.js';
-
-function cartoData(el, extent, pg) {
-    const minzoom = el.minzoom ? (+el.minzoom || 5) : 5;
-    const maxzoom = el.maxzoom ? (+el.maxzoom || 22) : 22;
-    const view = `(select ${el.columns || '1'}, ${el.gcol} from ${el.table} where ${el.query || 'true'} ) as data`;
-    const layerBound = extent || [-180, -85, 180, 85];
-
-    return {
-        id: el.key,
-        name: el.key,
-        properties: { minzoom, maxzoom },
-        srs: el.proj4text || '+proj=longlat +datum=WGS84 +no_defs',
-        Datasource: {
-            simplify_geometries: true,
-            type: 'postgis',
-            extent: layerBound.join(','),
-            table: view,
-            geometry_field: el.gcol,
-            host: pg.options?.host || 'localhost',
-            dbname: pg.options?.database || 'postgres',
-            port: pg.options?.port || 5432,
-            user: pg.options?.user || 'postgres',
-            password: pg.options?.password || 'postgres',
-        },
-    };
-}
-
-export default async function uploadXML({
-    id, dataset, style, source_path: relpath,
-}, pg) {
-    if (!id || !dataset?.length || Array.isArray(dataset) === false) {
-        return null;
-    }
-    await Promise.all(dataset.filter((el) => el.active !== false).map(async el => {
-        const { table } = el;
-
-        const geoms = await pg.query(`SELECT json_agg(attname) as geoms FROM pg_attribute
-      where attrelid = to_regclass($1::text)
-      and attnum > 0
-      AND NOT attisdropped
-      and atttypid::regtype::text ='geometry'`, [table]).then(e => e.rows?.[0]?.geoms || []);
-
-        const gcol = getGeomColumn(geoms, el.gcol);
-        Object.assign(el, { gcol });
-
-        const srid = el.srid ? el.srid
-            : await pg.query(`select st_srid(${gcol}) as srid from ${table} where ${gcol} is not null limit 1`).then(e => e.rows[0]?.srid);
-
-        if (srid && !srsList[srid] && (srid - 0 > 0)) {
-            srsList[srid] = await pg.query(`SELECT proj4text from spatial_ref_sys where srid=$1`, [srid])
-                .then(e => e.rows[0]?.proj4text);
-        }
-        Object.assign(el, { gcol, proj4text: el.proj4text || srsList[srid] });
-    }));
-
-    const bounds = await cartoBounds({ id, dataset }, pg);
-
-    const arrayLayers = dataset.filter((el) => el.active !== false).map((el) => cartoData(el, bounds, pg));
-
-    const configJson = {
-        format: 'png',
-        Layer: arrayLayers.reverse(),
-        srs: '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over',
-        bounds,
-        'maximum-extent': '-20037508.34,-20037508.34,20037508.34,20037508.34',
-        center: [0, 0, 2],
-        minzoom: 1,
-        maxzoom: 25,
-        Stylesheet: [{
-            id: 'carto_css_style',
-            data: style || '',
-        }],
-    };
-
-    // generate  mapnik_version: 3,
-    const res = new carto.Renderer({ mapnik_version: 3, cache_resources: true, strict: false }).render(configJson);
-    const xmlFileText = typeof res === 'string' ? res : res?.data;
-    if (!xmlFileText) {
-        throw new Error('xml generation error');
-    }
-    const { status, error } = await UploadXML({
-        path: relpath ? `vector/${relpath}` : null,
-        name: relpath ? null : id,
-        xml: xmlFileText,
-    }).catch((err) => ({ error: err.toString() }));
-
-    if (status !== 'success') {
-        throw new Error(error || 'xml upload error');
-    }
-    return xmlFileText;
-}
+import carto from 'carto';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { UploadXML } = mapnik();
+
+const srsList = {};
+
+const getGeomColumn = (geoms, customColumn) => {
+    if (customColumn && geoms.includes(customColumn)) {
+        return customColumn;
+    }
+    if (geoms.includes('geom')) {
+        return 'geom';
+    }
+    return geoms[0];
+};
+
+import cartoBounds from './cartoBounds.js';
+
+function cartoData(el, extent, pg) {
+    const minzoom = el.minzoom ? (+el.minzoom || 5) : 5;
+    const maxzoom = el.maxzoom ? (+el.maxzoom || 22) : 22;
+    const view = `(select ${el.columns || '1'}, ${el.gcol} from ${el.table} where ${el.query || 'true'} ) as data`;
+    const layerBound = extent || [-180, -85, 180, 85];
+
+    return {
+        id: el.key,
+        name: el.key,
+        properties: { minzoom, maxzoom },
+        srs: el.proj4text || '+proj=longlat +datum=WGS84 +no_defs',
+        Datasource: {
+            simplify_geometries: true,
+            type: 'postgis',
+            extent: layerBound.join(','),
+            table: view,
+            geometry_field: el.gcol,
+            host: pg.options?.host || 'localhost',
+            dbname: pg.options?.database || 'postgres',
+            port: pg.options?.port || 5432,
+            user: pg.options?.user || 'postgres',
+            password: pg.options?.password || 'postgres',
+        },
+    };
+}
+
+export default async function uploadXML({
+    id, dataset, style, source_path: relpath,
+}, pg) {
+    if (!id || !dataset?.length || Array.isArray(dataset) === false) {
+        return null;
+    }
+    await Promise.all(dataset.filter((el) => el.active !== false).map(async el => {
+        const { table } = el;
+
+        const geoms = await pg.query(`SELECT json_agg(attname) as geoms FROM pg_attribute
+      where attrelid = to_regclass($1::text)
+      and attnum > 0
+      AND NOT attisdropped
+      and atttypid::regtype::text ='geometry'`, [table]).then(e => e.rows?.[0]?.geoms || []);
+
+        const gcol = getGeomColumn(geoms, el.gcol);
+        Object.assign(el, { gcol });
+
+        const srid = el.srid ? el.srid
+            : await pg.query(`select st_srid(${gcol}) as srid from ${table} where ${gcol} is not null limit 1`).then(e => e.rows[0]?.srid);
+
+        if (srid && !srsList[srid] && (srid - 0 > 0)) {
+            srsList[srid] = await pg.query(`SELECT proj4text from spatial_ref_sys where srid=$1`, [srid])
+                .then(e => e.rows[0]?.proj4text);
+        }
+        Object.assign(el, { gcol, proj4text: el.proj4text || srsList[srid] });
+    }));
+
+    const bounds = await cartoBounds({ id, dataset }, pg);
+
+    const arrayLayers = dataset.filter((el) => el.active !== false).map((el) => cartoData(el, bounds, pg));
+
+    const configJson = {
+        format: 'png',
+        Layer: arrayLayers.reverse(),
+        srs: '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over',
+        bounds,
+        'maximum-extent': '-20037508.34,-20037508.34,20037508.34,20037508.34',
+        center: [0, 0, 2],
+        minzoom: 1,
+        maxzoom: 25,
+        Stylesheet: [{
+            id: 'carto_css_style',
+            data: style || '',
+        }],
+    };
+
+    // generate  mapnik_version: 3,
+    const res = new carto.Renderer({ mapnik_version: 3, cache_resources: true, strict: false }).render(configJson);
+    const xmlFileText = typeof res === 'string' ? res : res?.data;
+    if (!xmlFileText) {
+        throw new Error('xml generation error');
+    }
+    const { status, error } = await UploadXML({
+        path: relpath ? `vector/${relpath}` : null,
+        name: relpath ? null : id,
+        xml: xmlFileText,
+    }).catch((err) => ({ error: err.toString() }));
+
+    if (status !== 'success') {
+        throw new Error(error || 'xml upload error');
+    }
+    return xmlFileText;
+}

package/server/routes/mapnik/index.js

@@ -1,27 +1,27 @@
-import uploadRaster from './controllers/uploadRaster.js';
-import createXml from './controllers/createXml.js';
-import rtile from './controllers/rtile.js';
-import rasterInfo from './controllers/rasterInfo.js';
-
-import createXmlMulti from './controllers/createXmlMulti.js';
-import readDir from './controllers/readDir.js';
-import fileStat from './controllers/fileStat.js';
-import fileSearch from './controllers/fileSearch.js';
-import clearTiles from './controllers/clearTiles.js';
-
-const publicParams = { config: { policy: 'L0' }, package: 'gis' }; // L0 === public
-const adminParams = { config: { policy: 'L1', role: 'admin' }, package: 'gis' };
-const params = { config: { policy: 'L1' }, package: 'gis' }; // L1 === authorized only
-
-export default async function route(app) {
-  app.get('/gis-upload-raster/:id', params, uploadRaster);
-  app.get('/gis-xml/:id', publicParams, createXml);
-  app.get('/gis-rtile/:id/:z/:y/:x', publicParams, rtile);
-  app.get('/gis-raster/:id', publicParams, rasterInfo);
-
-  app.get('/gis-create-xml/:id?', adminParams, createXmlMulti);
-  app.get('/gis-files', adminParams, readDir);
-  app.get('/gis-file-info', adminParams, fileStat);
-  app.get('/gis-file-search', adminParams, fileSearch);
-  app.get('/gis-clear-rtile/:id', adminParams, clearTiles);
-}
+import uploadRaster from './controllers/uploadRaster.js';
+import createXml from './controllers/createXml.js';
+import rtile from './controllers/rtile.js';
+import rasterInfo from './controllers/rasterInfo.js';
+
+import createXmlMulti from './controllers/createXmlMulti.js';
+import readDir from './controllers/readDir.js';
+import fileStat from './controllers/fileStat.js';
+import fileSearch from './controllers/fileSearch.js';
+import clearTiles from './controllers/clearTiles.js';
+
+const publicParams = { config: { policy: 'L0' }, package: 'gis' }; // L0 === public
+const adminParams = { config: { policy: 'L1', role: 'admin' }, package: 'gis' };
+const params = { config: { policy: 'L1' }, package: 'gis' }; // L1 === authorized only
+
+export default async function route(app) {
+  app.get('/gis-upload-raster/:id', params, uploadRaster);
+  app.get('/gis-xml/:id', publicParams, createXml);
+  app.get('/gis-rtile/:id/:z/:y/:x', publicParams, rtile);
+  app.get('/gis-raster/:id', publicParams, rasterInfo);
+
+  app.get('/gis-create-xml/:id?', adminParams, createXmlMulti);
+  app.get('/gis-files', adminParams, readDir);
+  app.get('/gis-file-info', adminParams, fileStat);
+  app.get('/gis-file-search', adminParams, fileSearch);
+  app.get('/gis-clear-rtile/:id', adminParams, clearTiles);
+}

package/server/routes/permissions/controllers/catalog.permissions.edit.js

@@ -1,22 +1,22 @@
-export default async function catalogPermissionsEdit(req, reply) {
-    const { pg, params, body } = req;
-    const { uid } = params;
-    if (!uid) return reply.status(403).send({ status: 403, message: 'access restricted' });
-    if (!body?.length) return reply.status(400).send({ status: 400, message: 'body is empty' });
-
-    try {
-        await pg.one(`delete from gis.services_users_rel where user_id = $1`, [uid]);
-
-        const sql = [];
-        body.map(el => {
-            const insertSql = `('${el?.service_id}','${uid}','${uid}',${(el?.actions?.length) ? `'{${el?.actions?.map(action => `"${action}"`)}}'::text[]` : 'null'})`;
-            sql.push(insertSql);
-        });
-
-        await pg.query(`insert into gis.services_users_rel (service_id,user_id,created_by,actions) values ${sql?.join(',')}`);
-        return reply.status(201).send({ status: 201, message: `Inserted ${body?.length} permissions` });
-    }
- catch (err) {
-        return reply.status(500).send({ status: 500, message: err.toString() });
-    }
-}
+export default async function catalogPermissionsEdit(req, reply) {
+    const { pg, params, body } = req;
+    const { uid } = params;
+    if (!uid) return reply.status(403).send({ status: 403, message: 'access restricted' });
+    if (!body?.length) return reply.status(400).send({ status: 400, message: 'body is empty' });
+
+    try {
+        await pg.one(`delete from gis.services_users_rel where user_id = $1`, [uid]);
+
+        const sql = [];
+        body.map(el => {
+            const insertSql = `('${el?.service_id}','${uid}','${uid}',${(el?.actions?.length) ? `'{${el?.actions?.map(action => `"${action}"`)}}'::text[]` : 'null'})`;
+            sql.push(insertSql);
+        });
+
+        await pg.query(`insert into gis.services_users_rel (service_id,user_id,created_by,actions) values ${sql?.join(',')}`);
+        return reply.status(201).send({ status: 201, message: `Inserted ${body?.length} permissions` });
+    }
+ catch (err) {
+        return reply.status(500).send({ status: 500, message: err.toString() });
+    }
+}

package/server/routes/permissions/controllers/catalog.permissions.js

@@ -1,8 +1,8 @@
-export default async function catalogPermissions(req, reply) {
-    const { pg, params } = req;
-    const { uid } = params;
-    if (!uid) return reply.status(403).send({ status: 403, message: 'access restricted' });
-    const { total, layer_list } = await pg.one(
-        `select count(*)::int as total,array_agg(json_build_object('service_id',service_id,'actions',actions)) as layer_list from gis.services_users_rel where user_id=$1`, [uid]);
-    return reply.status(200).send({ status: 200, total, layer_list })
+export default async function catalogPermissions(req, reply) {
+    const { pg, params } = req;
+    const { uid } = params;
+    if (!uid) return reply.status(403).send({ status: 403, message: 'access restricted' });
+    const { total, layer_list } = await pg.one(
+        `select count(*)::int as total,array_agg(json_build_object('service_id',service_id,'actions',actions)) as layer_list from gis.services_users_rel where user_id=$1`, [uid]);
+    return reply.status(200).send({ status: 200, total, layer_list })
 }

package/server/routes/permissions/controllers/gis.catalog.js

@@ -1,80 +1,80 @@
-import getPermissions from './utils/get.permissions.js';
-
-export default async function gisCatalog(req, reply) {
-  const { pg, user } = req;
-
-  if (!user?.uid) return reply.status(403).send({ status: 403, message: 'access restricted' });
-
-  // permissions
-  const { all_layers, group_list, layer_list } = await getPermissions({ pg, uid: user.uid });
-  if (!all_layers && !group_list?.length && !layer_list?.length) {
-    return reply.status(200).send({
-      status: 204, categoriesCount: 0, layersCount: 0, servicesCount: 0, rastersCount: 0, categories: [], layers: [],
-    });
-  }
-
-  // groups
-  const selectCategories = `select group_id as category_id, trim(group_name) as name, icon from gis.group_list where enabled and ${all_layers ? '$1' : 'group_id = any($1)'} order by trim(group_name)`;
-  const { rows: categories } = await pg.query(selectCategories, [all_layers ? true : group_list]);
-  const categoriesCount = categories?.length || 0;
-
-  // services
-  const selectLayers = `
-    select
-    service_id as layer_id,
-    group_id as category_id,
-    name,
-    service_type,
-    source_path,
-    geom_type /*,
-   style,
-    popup,
-    card,
-    bi,
-    legend,
-    attributes,
-    popup*/
-    from gis.services
-    where is_active and 
-    ${all_layers ? '$1' : 'service_id = any($1)'}`;
-  const { rows: services } = await pg.query(selectLayers, [all_layers ? true : layer_list]);
-  const servicesCount = services?.length || 0;
-
-  // ogc services
-  const selectOgcServices = `select ogc_service_id as layer_id,group_id as category_id,name,service as service_type,url,html from gis.ogc_service where enabled and ${all_layers ? '$1' : 'ogc_service_id = any($1)'}`;
-  const { rows: ogcServices } = await pg.query(selectOgcServices, [all_layers ? true : layer_list]);
-  const ogcServicesCount = ogcServices?.length || 0;
-
-  // rasters
-  const selectRasters = `select raster_id as layer_id, group_id as category_id,name,'raster' as service_type,source_path from gis.rasters where enabled and ${all_layers ? '$1' : 'raster_id = any($1)'}`;
-  const { rows: rasters } = await pg.query(selectRasters, [all_layers ? true : layer_list]);
-  const rastersCount = rasters?.length || 0;
-
-  // cartocss
-  const selectCartocss = `select cartocss_id as layer_id, group_id as category_id,name,'cartocss' as service_type,config from gis.cartocss where enabled and ${all_layers ? '$1' : 'cartocss_id = any($1)'}`;
-  const { rows: cartocss } = await pg.query(selectCartocss, [all_layers ? true : layer_list]);
-  const cartocssCount = cartocss?.length || 0;
-
-  const layers = [
-    ...services,
-    ...ogcServices,
-    ...rasters,
-    ...cartocss,
-  ];
-  const layersCount = layers?.length || 0;
-
-  const res = {
-    categoriesCount,
-    layersCount,
-    servicesCount,
-    ogcServicesCount,
-    rastersCount,
-    cartocssCount,
-    categories,
-    layers,
-
-  };
-  const statusCode = (!layersCount && !categoriesCount) ? 204 : 200;
-
-  return reply.status(statusCode).send(res);
-}
+import getPermissions from './utils/get.permissions.js';
+
+export default async function gisCatalog(req, reply) {
+  const { pg, user } = req;
+
+  if (!user?.uid) return reply.status(403).send({ status: 403, message: 'access restricted' });
+
+  // permissions
+  const { all_layers, group_list, layer_list } = await getPermissions({ pg, uid: user.uid });
+  if (!all_layers && !group_list?.length && !layer_list?.length) {
+    return reply.status(200).send({
+      status: 204, categoriesCount: 0, layersCount: 0, servicesCount: 0, rastersCount: 0, categories: [], layers: [],
+    });
+  }
+
+  // groups
+  const selectCategories = `select group_id as category_id, trim(group_name) as name, icon from gis.group_list where enabled and ${all_layers ? '$1' : 'group_id = any($1)'} order by trim(group_name)`;
+  const { rows: categories } = await pg.query(selectCategories, [all_layers ? true : group_list]);
+  const categoriesCount = categories?.length || 0;
+
+  // services
+  const selectLayers = `
+    select
+    service_id as layer_id,
+    group_id as category_id,
+    name,
+    service_type,
+    source_path,
+    geom_type /*,
+   style,
+    popup,
+    card,
+    bi,
+    legend,
+    attributes,
+    popup*/
+    from gis.services
+    where is_active and 
+    ${all_layers ? '$1' : 'service_id = any($1)'}`;
+  const { rows: services } = await pg.query(selectLayers, [all_layers ? true : layer_list]);
+  const servicesCount = services?.length || 0;
+
+  // ogc services
+  const selectOgcServices = `select ogc_service_id as layer_id,group_id as category_id,name,service as service_type,url,html from gis.ogc_service where enabled and ${all_layers ? '$1' : 'ogc_service_id = any($1)'}`;
+  const { rows: ogcServices } = await pg.query(selectOgcServices, [all_layers ? true : layer_list]);
+  const ogcServicesCount = ogcServices?.length || 0;
+
+  // rasters
+  const selectRasters = `select raster_id as layer_id, group_id as category_id,name,'raster' as service_type,source_path from gis.rasters where enabled and ${all_layers ? '$1' : 'raster_id = any($1)'}`;
+  const { rows: rasters } = await pg.query(selectRasters, [all_layers ? true : layer_list]);
+  const rastersCount = rasters?.length || 0;
+
+  // cartocss
+  const selectCartocss = `select cartocss_id as layer_id, group_id as category_id,name,'cartocss' as service_type,config from gis.cartocss where enabled and ${all_layers ? '$1' : 'cartocss_id = any($1)'}`;
+  const { rows: cartocss } = await pg.query(selectCartocss, [all_layers ? true : layer_list]);
+  const cartocssCount = cartocss?.length || 0;
+
+  const layers = [
+    ...services,
+    ...ogcServices,
+    ...rasters,
+    ...cartocss,
+  ];
+  const layersCount = layers?.length || 0;
+
+  const res = {
+    categoriesCount,
+    layersCount,
+    servicesCount,
+    ogcServicesCount,
+    rastersCount,
+    cartocssCount,
+    categories,
+    layers,
+
+  };
+  const statusCode = (!layersCount && !categoriesCount) ? 204 : 200;
+
+  return reply.status(statusCode).send(res);
+}