@opengis/gis 0.2.176 → 0.2.178

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

@@ -1,140 +1,140 @@
-import carto from 'carto';
-
-import { config } from '@opengis/fastify-table/utils.js';
-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';
-import { NotFoundError } from '@opengis/fastify-table/errors.js';
-
-function cartoData(el, extent, pg) {
-    const minzoom = el.minzoom ? (+el.minzoom || 5) : 5;
-    const maxzoom = el.maxzoom ? (+el.maxzoom || 22) : 22;
-    const geom = el.srid ? `st_setsrid(${el.gcol},${el.srid}) as ${el.gcol}` : el.gcol;
-    const bbox = el.srid ? `ST_Transform(!bbox!, ${el.srid})` : '!bbox!';
-    const view = `(select ${el.columns || '1'}, ${geom} from ${el.table} where ${el.query || 'true'} and ${el.gcol} && ${bbox} ) 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;
-    }
-
-    const tlist = await pg
-        .query(
-            `SELECT
-        array_agg(
-          (
-            SELECT
-              nspname
-            FROM
-              pg_namespace
-            WHERE
-              oid = relnamespace
-          ) || '.' || relname
-        ) tlist
-      FROM
-        pg_class
-      WHERE
-        relkind IN ('r', 'v', 'm')`
-        )
-        .then((d) => d.rows[0].tlist);
-
-    const { table: missingTable } = dataset.find(el => el.active !== false && el.table && !tlist.includes(el.table)) || {};
-    if (missingTable) {
-        throw NotFoundError('table not found: ' + missingTable);
-    }
-
-    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', config.mapnik?.folder || '', relpath].filter(Boolean).join('/') : null,
-        name: relpath ? null : [config.mapnik?.folder, id].filter(Boolean).join('/'),
-        xml: xmlFileText,
-    }).catch((err) => ({ error: err.toString() }));
-
-    if (status !== 'success') {
-        throw new Error(error || 'xml upload error');
-    }
-    return xmlFileText;
-}
+import carto from 'carto';
+
+import { config } from '@opengis/fastify-table/utils.js';
+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';
+import { NotFoundError } from '@opengis/fastify-table/errors.js';
+
+function cartoData(el, extent, pg) {
+    const minzoom = el.minzoom ? (+el.minzoom || 5) : 5;
+    const maxzoom = el.maxzoom ? (+el.maxzoom || 22) : 22;
+    const geom = el.srid ? `st_setsrid(${el.gcol},${el.srid}) as ${el.gcol}` : el.gcol;
+    const bbox = el.srid ? `ST_Transform(!bbox!, ${el.srid})` : '!bbox!';
+    const view = `(select ${el.columns || '1'}, ${geom} from ${el.table} where ${el.query || 'true'} and ${el.gcol} && ${bbox} ) 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;
+    }
+
+    const tlist = await pg
+        .query(
+            `SELECT
+        array_agg(
+          (
+            SELECT
+              nspname
+            FROM
+              pg_namespace
+            WHERE
+              oid = relnamespace
+          ) || '.' || relname
+        ) tlist
+      FROM
+        pg_class
+      WHERE
+        relkind IN ('r', 'v', 'm')`
+        )
+        .then((d) => d.rows[0].tlist);
+
+    const { table: missingTable } = dataset.find(el => el.active !== false && el.table && !tlist.includes(el.table)) || {};
+    if (missingTable) {
+        throw NotFoundError('table not found: ' + missingTable);
+    }
+
+    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', config.mapnik?.folder || '', relpath].filter(Boolean).join('/') : null,
+        name: relpath ? null : [config.mapnik?.folder, id].filter(Boolean).join('/'),
+        xml: xmlFileText,
+    }).catch((err) => ({ error: err.toString() }));
+
+    if (status !== 'success') {
+        throw new Error(error || 'xml upload error');
+    }
+    return xmlFileText;
+}

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

@@ -1,102 +1,102 @@
-import { eventStream } from '@opengis/fastify-table/utils.js';
-
-import uploadRaster from './functions/uploadRaster.js';
-import createXml from './functions/createXml.js';
-import rtile from './functions/rtile.js';
-import rasterInfo from './functions/rasterInfo.js';
-
-import createXmlMulti from './functions/createXmlMulti.js';
-import readDir from './functions/readDir.js';
-import fileStat from './functions/fileStat.js';
-import fileSearch from './functions/fileSearch.js';
-import clearTiles from './functions/clearTiles.js';
-import pretile from './functions/pretile.js';
-
-import {
-  pretileSchema,
-  uploadRasterSchema,
-  gisXmlSchema,
-  gisRtileSchema,
-  gisRasterSchema,
-  createXmlMultiSchema,
-  readDirSchema,
-  fileStatSchema,
-  fileSearchSchema,
-  clearTilesSchema,
-} from './mapnik.schema.mjs';
-
-const publicParams = { config: { policy: 'L0' }, package: 'gis' }; // L0 === public
-const adminParams = { config: { role: 'admin' }, package: 'gis' };
-const privateParams = { config: { policy: 'L1' }, package: 'gis' }; // L1 === authorized only
-
-export default function route(app) {
-  app.get('/gis-upload-raster/:id', { ...privateParams, schema: uploadRasterSchema }, async ({ params, pg }, reply) => {
-    const callback = process.env.NODE_ENV === 'test' || process.env.VITEST ? console.log : eventStream(reply);
-    const result = await uploadRaster({ id: params.id, callback }, pg).catch(err => ({ error: err.toString() }));
-    callback(result?.error || 'finish', true);
-    return result;
-  });
-  app.get('/gis-xml/:id', { ...publicParams, schema: gisXmlSchema }, async ({ params, query }, reply) => {
-    const callback = process.env.NODE_ENV === 'test' || process.env.VITEST ? console.log : eventStream(reply);
-    const result = await createXml({ id: params.id, srid: query.srid, proj4: query.proj4, vrt: query.vrt, debug: query.debug, nocache: query.nocache, callback }).catch(err => ({ error: err.toString() }));
-    callback(result?.error || 'finish', true);
-    return result;
-  });
-  app.get('/gis-rtile/:id/:z/:y/:x', { ...publicParams, schema: gisRtileSchema }, async ({ params, query, user, pg }, reply) => {
-    const result = await rtile({
-      id: params.id,
-      z: params.z,
-      y: params.y,
-      x: params.x.split('.')[0] - 0,
-      uid: user?.uid,
-      debug: query.debug,
-      nocache: query.nocache,
-      nottl: query.nottl,
-    }, pg);
-    if (query.debug) {
-      return result;
-    }
-
-    if (result.code === 204) {
-      return reply.headers(result.headers).code(204).send();
-    }
-
-    return reply.headers(result.headers).send(result.data);
-  });
-  app.get('/gis-raster/:id', { ...publicParams, schema: gisRasterSchema }, async ({ params, query, pg }) => {
-    const result = await rasterInfo({ id: params.id, debug: query.debug }, pg);
-    return result;
-  });
-
-  app.get('/gis-create-xml/:id?', { ...adminParams, schema: createXmlMultiSchema }, async ({ params, query, pg }, reply) => {
-    const callback = process.env.NODE_ENV === 'test' || process.env.VITEST ? console.log : eventStream(reply);
-    const result = await createXmlMulti({
-      id: params.id, nocache: query.nocache, callback
-    }, pg).catch(err => ({ error: err.toString() }));
-    callback(result?.error || 'finish', true);
-    return result;
-  });
-  app.get('/gis-files', { ...adminParams, schema: readDirSchema }, async ({ query }) => {
-    const result = await readDir({ dir: query.dir });
-    return result;
-  });
-  app.get('/gis-file-info', { ...adminParams, schema: fileStatSchema }, async ({ query }) => {
-    const result = await fileStat({ path: query.path });
-    return result;
-  });
-  app.get('/gis-file-search', { ...adminParams, schema: fileSearchSchema }, async ({ query }) => {
-    const { dir, key, period, size, page, limit } = query;
-    const result = await fileSearch({ dir, key, period, size, page, limit });
-    return result;
-  });
-  app.get('/gis-clear-rtile/:id', { ...adminParams, schema: clearTilesSchema }, async ({ params, query }) => {
-    const result = await clearTiles({ id: params.id, debug: query.debug });
-    return result;
-  });
-  app.get('/gis-pretile/:id', { ...adminParams, schema: pretileSchema }, async ({ params, query, pg }, reply) => {
-    const callback = process.env.NODE_ENV === 'test' || process.env.VITEST ? console.log : eventStream(reply);
-    const result = await pretile({ id: params.id, zoom: query.zoom, max: query.max, callback }, pg).catch(err => ({ error: err.toString() }));
-    callback(result?.error || 'finish', true);
-    return result;
-  });
-}
+import { eventStream } from '@opengis/fastify-table/utils.js';
+
+import uploadRaster from './functions/uploadRaster.js';
+import createXml from './functions/createXml.js';
+import rtile from './functions/rtile.js';
+import rasterInfo from './functions/rasterInfo.js';
+
+import createXmlMulti from './functions/createXmlMulti.js';
+import readDir from './functions/readDir.js';
+import fileStat from './functions/fileStat.js';
+import fileSearch from './functions/fileSearch.js';
+import clearTiles from './functions/clearTiles.js';
+import pretile from './functions/pretile.js';
+
+import {
+  pretileSchema,
+  uploadRasterSchema,
+  gisXmlSchema,
+  gisRtileSchema,
+  gisRasterSchema,
+  createXmlMultiSchema,
+  readDirSchema,
+  fileStatSchema,
+  fileSearchSchema,
+  clearTilesSchema,
+} from './mapnik.schema.mjs';
+
+const publicParams = { config: { policy: 'L0' }, package: 'gis' }; // L0 === public
+const adminParams = { config: { role: 'admin' }, package: 'gis' };
+const privateParams = { config: { policy: 'L1' }, package: 'gis' }; // L1 === authorized only
+
+export default function route(app) {
+  app.get('/gis-upload-raster/:id', { ...privateParams, schema: uploadRasterSchema }, async ({ params, pg }, reply) => {
+    const callback = process.env.NODE_ENV === 'test' || process.env.VITEST ? console.log : eventStream(reply);
+    const result = await uploadRaster({ id: params.id, callback }, pg).catch(err => ({ error: err.toString() }));
+    callback(result?.error || 'finish', true);
+    return result;
+  });
+  app.get('/gis-xml/:id', { ...publicParams, schema: gisXmlSchema }, async ({ params, query }, reply) => {
+    const callback = process.env.NODE_ENV === 'test' || process.env.VITEST ? console.log : eventStream(reply);
+    const result = await createXml({ id: params.id, srid: query.srid, proj4: query.proj4, vrt: query.vrt, debug: query.debug, nocache: query.nocache, callback }).catch(err => ({ error: err.toString() }));
+    callback(result?.error || 'finish', true);
+    return result;
+  });
+  app.get('/gis-rtile/:id/:z/:y/:x', { ...publicParams, schema: gisRtileSchema }, async ({ params, query, user, pg }, reply) => {
+    const result = await rtile({
+      id: params.id,
+      z: params.z,
+      y: params.y,
+      x: params.x.split('.')[0] - 0,
+      uid: user?.uid,
+      debug: query.debug,
+      nocache: query.nocache,
+      nottl: query.nottl,
+    }, pg);
+    if (query.debug) {
+      return result;
+    }
+
+    if (result.code === 204) {
+      return reply.headers(result.headers).code(204).send();
+    }
+
+    return reply.headers(result.headers).send(result.data);
+  });
+  app.get('/gis-raster/:id', { ...publicParams, schema: gisRasterSchema }, async ({ params, query, pg }) => {
+    const result = await rasterInfo({ id: params.id, debug: query.debug }, pg);
+    return result;
+  });
+
+  app.get('/gis-create-xml/:id?', { ...adminParams, schema: createXmlMultiSchema }, async ({ params, query, pg }, reply) => {
+    const callback = process.env.NODE_ENV === 'test' || process.env.VITEST ? console.log : eventStream(reply);
+    const result = await createXmlMulti({
+      id: params.id, nocache: query.nocache, callback
+    }, pg).catch(err => ({ error: err.toString() }));
+    callback(result?.error || 'finish', true);
+    return result;
+  });
+  app.get('/gis-files', { ...adminParams, schema: readDirSchema }, async ({ query }) => {
+    const result = await readDir({ dir: query.dir });
+    return result;
+  });
+  app.get('/gis-file-info', { ...adminParams, schema: fileStatSchema }, async ({ query }) => {
+    const result = await fileStat({ path: query.path });
+    return result;
+  });
+  app.get('/gis-file-search', { ...adminParams, schema: fileSearchSchema }, async ({ query }) => {
+    const { dir, key, period, size, page, limit } = query;
+    const result = await fileSearch({ dir, key, period, size, page, limit });
+    return result;
+  });
+  app.get('/gis-clear-rtile/:id', { ...adminParams, schema: clearTilesSchema }, async ({ params, query }) => {
+    const result = await clearTiles({ id: params.id, debug: query.debug });
+    return result;
+  });
+  app.get('/gis-pretile/:id', { ...adminParams, schema: pretileSchema }, async ({ params, query, pg }, reply) => {
+    const callback = process.env.NODE_ENV === 'test' || process.env.VITEST ? console.log : eventStream(reply);
+    const result = await pretile({ id: params.id, zoom: query.zoom, max: query.max, callback }, pg).catch(err => ({ error: err.toString() }));
+    callback(result?.error || 'finish', true);
+    return result;
+  });
+}