@opengis/gis 0.2.145 → 0.2.146

package/server/routes/mapnik/controllers/pretile.js

@@ -1,144 +1,144 @@
-import SphericalMercator from '@mapbox/sphericalmercator';
-
-import {
-  config, logger, eventStream, pgClients,
-} from '@opengis/fastify-table/utils.js';
-
-import convertBoundToTile from '../functions/convertBoundToTile.js';
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-import cartoBounds from '../functions/cartoBounds.js';
-import rasterInfo from './rasterInfo.js';
-
-const { RenderTile } = mapnik();
-
-const mercator = new SphericalMercator({ size: 256 });
-
-const MAX_LIMIT = 100000;
-
-const CONCURRENCY = 5;
-
-async function runPool(tasks, limit) {
-  return tasks.reduce(async (acc, task) => {
-    const pool = await acc;
-
-    const p = task().finally(() => {
-      const i = pool.indexOf(p);
-      if (i !== -1) pool.splice(i, 1);
-    });
-
-    pool.push(p);
-
-    if (pool.length >= limit) {
-      await Promise.race(pool);
-    }
-
-    return pool;
-  }, Promise.resolve([])).then((pool) => Promise.all(pool));
-}
-
-const maxBounds = [23, 44, 40, 53];
-
-export default async function pretile({
-  pg = pgClients.client, params, query,
-}, reply) {
-  const { zoom = 11, max = 15 } = query || {};
-
-  if (zoom > max) {
-    return reply.status(422).send({ error: 'Error: querystring/max must be > querystring/zoom', code: 422 });
-  }
-
-  const data = await pg.query(`select *, geom::box2d as bounds, 'raster' as source_type from gis.rasters where raster_id=$1`, [params.id]).then(el => el.rows?.[0])
-    || await pg.query(`select *, geom::box2d as bounds, 'css' as source_type from gis.cartocss where cartocss_id=$1`, [params.id]).then(el => el.rows?.[0]);
-
-  if (!data) {
-    return reply.status(404).send({ error: 'not found', code: 404 });
-  }
-
-  if (!data.bounds || data.bounds === 'BOX(-180 -85.05112877980659,180 85.05112877980659)') {
-    return reply.status(400).send({ error: 'geom is not set', code: 400 });
-  }
-
-  const send = eventStream(reply);
-
-  try {
-    const relpath = data.source_type === 'raster' ? ['raster', config.mapnik?.folder, data.source_path].filter(Boolean).join('/') : null;
-    const name = data.source_type === 'css' ? ['vector', config.mapnik?.folder || '', data.source_path || params.id].filter(Boolean).join('/') : null;
-
-    // refresh extent
-    const bounds = data.bounds.replace(')', '').substr(4).split(/[, ]/g).map((el) => el - 0);
-
-    send(`start: ${data.name} ${params.id} ${bounds} ${data.srid} ${data.proj4}`);
-
-    bounds[0] = Math.max(bounds[0], maxBounds[0]);
-    bounds[1] = Math.max(bounds[1], maxBounds[1]);
-
-    bounds[2] = Math.min(bounds[2], maxBounds[2]);
-    bounds[3] = Math.min(bounds[3], maxBounds[3]);
-
-    send({
-      bounds, minzoom: zoom, maxzoom: max, maxBounds,
-    });
-
-    const tiles = await convertBoundToTile({
-      bounds, minzoom: zoom, maxzoom: max, mercator,
-    });
-
-    send(tiles);
-
-    const tileLen = tiles.reduce((acc, el) => acc + el.count, 0);
-
-    if (tileLen > MAX_LIMIT) {
-      send({ MAX_LIMIT });
-    }
-
-    let tileNum = 0;
-
-    const tasks = tiles.flatMap((item) => {
-      const {
-        maxY, minY, minX, maxX, z,
-      } = item;
-
-      const xs = Array.from({ length: maxX - minX + 1 }, (_, i) => minX + i);
-
-      return xs.flatMap((x) => {
-        const ys = Array.from({ length: maxY - minY + 1 }, (_, i) => minY + i);
-
-        return ys.map((y) => async () => {
-          if (tileNum > MAX_LIMIT) return;
-
-          const tilePath = `${params.id}/${z}/${x}/${y}.png`;
-          send(`Start ${tileNum + 1}/${tileLen} ${tilePath}`);
-
-          const time = Date.now();
-
-          const bbox = mercator.bbox(x, y, z, false, '900913');
-          const render = await RenderTile({ path: relpath, name, bbox });
-
-          if (render?.err) {
-            send(render.err);
-            return;
-          }
-
-          send(
-            `${tileNum + 1}/${tileLen} ${config.local || config.debug ? render.tile_path : params.id} len:${render.base64.length} cache: ${!!render?.cache} time:${Date.now() - time}ms`,
-          );
-          tileNum += 1;
-        });
-      });
-    });
-
-    await runPool(tasks, CONCURRENCY);
-
-    send('OK');
-    return 'OK';
-  }
-  catch (err) {
-    const error = config.local || config.debug ? err.toString() : 'pretile error';
-    send(error);
-    logger.file('pretile.error', { error: err.toString(), stack: err.stack, id: params.id });
-    return reply.status(500).send({ error, code: 500 });
-  }
-  finally {
-    send('finish', true);
-  }
-}
+import SphericalMercator from '@mapbox/sphericalmercator';
+
+import {
+  config, logger, eventStream, pgClients,
+} from '@opengis/fastify-table/utils.js';
+
+import convertBoundToTile from '../functions/convertBoundToTile.js';
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+import cartoBounds from '../functions/cartoBounds.js';
+import rasterInfo from './rasterInfo.js';
+
+const { RenderTile } = mapnik();
+
+const mercator = new SphericalMercator({ size: 256 });
+
+const MAX_LIMIT = 100000;
+
+const CONCURRENCY = 5;
+
+async function runPool(tasks, limit) {
+  return tasks.reduce(async (acc, task) => {
+    const pool = await acc;
+
+    const p = task().finally(() => {
+      const i = pool.indexOf(p);
+      if (i !== -1) pool.splice(i, 1);
+    });
+
+    pool.push(p);
+
+    if (pool.length >= limit) {
+      await Promise.race(pool);
+    }
+
+    return pool;
+  }, Promise.resolve([])).then((pool) => Promise.all(pool));
+}
+
+const maxBounds = [23, 44, 40, 53];
+
+export default async function pretile({
+  pg = pgClients.client, params, query,
+}, reply) {
+  const { zoom = 11, max = 15 } = query || {};
+
+  if (zoom > max) {
+    return reply.status(422).send({ error: 'Error: querystring/max must be > querystring/zoom', code: 422 });
+  }
+
+  const data = await pg.query(`select *, geom::box2d as bounds, 'raster' as source_type from gis.rasters where raster_id=$1`, [params.id]).then(el => el.rows?.[0])
+    || await pg.query(`select *, geom::box2d as bounds, 'css' as source_type from gis.cartocss where cartocss_id=$1`, [params.id]).then(el => el.rows?.[0]);
+
+  if (!data) {
+    return reply.status(404).send({ error: 'not found', code: 404 });
+  }
+
+  if (!data.bounds || data.bounds === 'BOX(-180 -85.05112877980659,180 85.05112877980659)') {
+    return reply.status(400).send({ error: 'geom is not set', code: 400 });
+  }
+
+  const send = eventStream(reply);
+
+  try {
+    const relpath = data.source_type === 'raster' ? ['raster', config.mapnik?.folder, data.source_path].filter(Boolean).join('/') : null;
+    const name = data.source_type === 'css' ? ['vector', config.mapnik?.folder || '', data.source_path || params.id].filter(Boolean).join('/') : null;
+
+    // refresh extent
+    const bounds = data.bounds.replace(')', '').substr(4).split(/[, ]/g).map((el) => el - 0);
+
+    send(`start: ${data.name} ${params.id} ${bounds} ${data.srid} ${data.proj4}`);
+
+    bounds[0] = Math.max(bounds[0], maxBounds[0]);
+    bounds[1] = Math.max(bounds[1], maxBounds[1]);
+
+    bounds[2] = Math.min(bounds[2], maxBounds[2]);
+    bounds[3] = Math.min(bounds[3], maxBounds[3]);
+
+    send({
+      bounds, minzoom: zoom, maxzoom: max, maxBounds,
+    });
+
+    const tiles = await convertBoundToTile({
+      bounds, minzoom: zoom, maxzoom: max, mercator,
+    });
+
+    send(tiles);
+
+    const tileLen = tiles.reduce((acc, el) => acc + el.count, 0);
+
+    if (tileLen > MAX_LIMIT) {
+      send({ MAX_LIMIT });
+    }
+
+    let tileNum = 0;
+
+    const tasks = tiles.flatMap((item) => {
+      const {
+        maxY, minY, minX, maxX, z,
+      } = item;
+
+      const xs = Array.from({ length: maxX - minX + 1 }, (_, i) => minX + i);
+
+      return xs.flatMap((x) => {
+        const ys = Array.from({ length: maxY - minY + 1 }, (_, i) => minY + i);
+
+        return ys.map((y) => async () => {
+          if (tileNum > MAX_LIMIT) return;
+
+          const tilePath = `${params.id}/${z}/${x}/${y}.png`;
+          send(`Start ${tileNum + 1}/${tileLen} ${tilePath}`);
+
+          const time = Date.now();
+
+          const bbox = mercator.bbox(x, y, z, false, '900913');
+          const render = await RenderTile({ path: relpath, name, bbox });
+
+          if (render?.err) {
+            send(render.err);
+            return;
+          }
+
+          send(
+            `${tileNum + 1}/${tileLen} ${config.local || config.debug ? render.tile_path : params.id} len:${render.base64.length} cache: ${!!render?.cache} time:${Date.now() - time}ms`,
+          );
+          tileNum += 1;
+        });
+      });
+    });
+
+    await runPool(tasks, CONCURRENCY);
+
+    send('OK');
+    return 'OK';
+  }
+  catch (err) {
+    const error = config.local || config.debug ? err.toString() : 'pretile error';
+    send(error);
+    logger.file('pretile.error', { error: err.toString(), stack: err.stack, id: params.id });
+    return reply.status(500).send({ error, code: 500 });
+  }
+  finally {
+    send('finish', true);
+  }
+}

package/server/routes/mapnik/controllers/rasterInfo.js

@@ -1,57 +1,57 @@
-import { config, pgClients } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { GetRasterInfo } = mapnik();
-
-const { prefix = '/api' } = config;
-
-// example: GET /api/gis-raster/9be8f8c51746
-export default async function rasterInfo({
-    pg = pgClients.client, params, query,
-}, reply) {
-    const time = Date.now();
-    if (!config.mapnik?.server) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const raster = pg.pk?.['gis.rasters']
-        ? await pg.query('select raster_id, source_path, name, description, raster_key, is_active, is_public, srid, proj4, geom from gis.rasters where raster_id=$1::text', [params.id])
-            .then(el => el.rows?.[0] || {})
-        : {};
-
-    if (raster.raster_id && !raster.source_path) {
-        return reply.status(400).send({ error: 'empty source_path', code: 400 });
-    }
-
-    if (!raster.raster_id) {
-        const decodedPath = Buffer.from(params.id, 'base64url').toString('utf-8');
-        Object.assign(raster, { source_path: decodedPath });
-    }
-
-    const proj4 = raster.proj4 || (raster.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [raster.srid]).then(el => el.rows?.[0]?.proj4text) : undefined);
-
-    const relpath = ['raster', config.mapnik?.folder, raster.source_path].filter(Boolean).join('/');
-
-    const { data, cache, error } = await GetRasterInfo({
-        path: relpath,
-        proj4,
-    }).catch(err => ({ error: err.toString() }));
-
-    if (query.debug) {
-        return { data, cache, raster };
-    }
-
-    if (!raster.geom && Array.isArray(data?.extent)) {
-        await pg.query(`update gis.rasters set geom = ST_MakeEnvelope(${data.extent.join(',')}) where raster_id = $1`, [raster.raster_id]);
-    }
-
-    return {
-        time: Date.now() - time,
-        ...data || {},
-        ...raster,
-        error,
-        cache,
-        url: `${prefix}/gis-rtile/${Buffer.from(raster.source_path).toString('base64url')}/{z}/{x}/{y}.png`,
-    };
-}
+import { config, pgClients } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { GetRasterInfo } = mapnik();
+
+const { prefix = '/api' } = config;
+
+// example: GET /api/gis-raster/9be8f8c51746
+export default async function rasterInfo({
+    pg = pgClients.client, params, query,
+}, reply) {
+    const time = Date.now();
+    if (!config.mapnik?.server) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const raster = pg.pk?.['gis.rasters']
+        ? await pg.query('select raster_id, source_path, name, description, raster_key, is_active, is_public, srid, proj4, geom from gis.rasters where raster_id=$1::text', [params.id])
+            .then(el => el.rows?.[0] || {})
+        : {};
+
+    if (raster.raster_id && !raster.source_path) {
+        return reply.status(400).send({ error: 'empty source_path', code: 400 });
+    }
+
+    if (!raster.raster_id) {
+        const decodedPath = Buffer.from(params.id, 'base64url').toString('utf-8');
+        Object.assign(raster, { source_path: decodedPath });
+    }
+
+    const proj4 = raster.proj4 || (raster.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [raster.srid]).then(el => el.rows?.[0]?.proj4text) : undefined);
+
+    const relpath = ['raster', config.mapnik?.folder, raster.source_path].filter(Boolean).join('/');
+
+    const { data, cache, error } = await GetRasterInfo({
+        path: relpath,
+        proj4,
+    }).catch(err => ({ error: err.toString() }));
+
+    if (query.debug) {
+        return { data, cache, raster };
+    }
+
+    if (!raster.geom && Array.isArray(data?.extent)) {
+        await pg.query(`update gis.rasters set geom = ST_MakeEnvelope(${data.extent.join(',')}) where raster_id = $1`, [raster.raster_id]);
+    }
+
+    return {
+        time: Date.now() - time,
+        ...data || {},
+        ...raster,
+        error,
+        cache,
+        url: `${prefix}/gis-rtile/${Buffer.from(raster.source_path).toString('base64url')}/{z}/{x}/{y}.png`,
+    };
+}

package/server/routes/mapnik/controllers/readDir.js

@@ -1,22 +1,22 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { ReadDir } = mapnik();
-
-// example: GET /api/gis-files?dir=raster/genplan
-export default async function readDir({
-    query,
-}, reply) {
-    if (!ReadDir) {
-        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
-    }
-
-    const { dir } = query;
-    const relpath = `raster/${[config.mapnik?.folder, dir].filter(Boolean).join('/')}`;
-
-    const {
-        exists = false, count = 0, files = [], directories = [],
-    } = await ReadDir({ path: relpath });
-    return { exists, count, data: files.map(el => ({ type: 'file', ...el })).concat(directories.map(el => ({ type: 'directory', ...el }))) };
-}
+import { config } from '@opengis/fastify-table/utils.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { ReadDir } = mapnik();
+
+// example: GET /api/gis-files?dir=raster/genplan
+export default async function readDir({
+    query,
+}, reply) {
+    if (!ReadDir) {
+        return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
+    }
+
+    const { dir } = query;
+    const relpath = `raster/${[config.mapnik?.folder, dir].filter(Boolean).join('/')}`;
+
+    const {
+        exists = false, count = 0, files = [], directories = [],
+    } = await ReadDir({ path: relpath });
+    return { exists, count, data: files.map(el => ({ type: 'file', ...el })).concat(directories.map(el => ({ type: 'directory', ...el }))) };
+}