@opengis/gis 0.2.126 → 0.2.128

package/dist/{raster-fgKYYXVI.js → raster-BDWEafwx.js}

@@ -1,9 +1,9 @@
 import { defineComponent as F, resolveDirective as Ce, openBlock as o, createElementBlock as d, createElementVNode as s, Fragment as q, renderList as B, toDisplayString as c, withDirectives as ie, createTextVNode as Re, normalizeClass as W, ref as h, watch as S, computed as g, vModelText as Ee, onMounted as Se, onBeforeUnmount as Ie, unref as je, createCommentVNode as U, createVNode as M, withCtx as ze, createBlock as L, resolveDynamicComponent as Me } from "vue";
 import { useRouter as Le, useRoute as Ne } from "vue-router";
 import { TooltipDirective as Ue, notify as D } from "@opengis/core";
-import { _ as qe, u as Be, f as Te, M as De, i as Pe, j as re, F as Fe } from "./index-DWGGabsq.js";
-import { _ as Ve, a as Qe, b as Ge, c as Ae } from "./HeaderActions.vue_vue_type_script_setup_true_lang-K7A_UX_L.js";
-import { _ as Oe } from "./ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-DbJh2Fwh.js";
+import { _ as qe, u as Be, f as Te, M as De, i as Pe, j as re, F as Fe } from "./index-UGx54M0Q.js";
+import { _ as Ve, a as Qe, b as Ge, c as Ae } from "./HeaderActions.vue_vue_type_script_setup_true_lang-Cg2y4sIa.js";
+import { _ as Oe } from "./ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-DQnIBCpE.js";
 const We = { class: "flex-1 overflow-y-auto p-4 sm:p-6" }, Xe = { class: "space-y-3" }, Ye = { class: "bg-white p-3 rounded-xl border border-gray-200 shadow-sm" }, Ke = { class: "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-2" }, Ze = { class: "text-xs text-gray-500 mb-1" }, He = {
   key: 0,
   class: "text-base text-md font-semibold text-gray-900"

package/dist/{register-C-I3igBi.js → register-BfNUPbey.js}

@@ -2,9 +2,9 @@ import { defineComponent as B, mergeModels as j, useModel as S, computed as h, d
 import { useRoute as Z, useRouter as ee } from "vue-router";
 import { notify as F } from "@opengis/core";
 import { _ as te } from "./TableFormHeader.vue_vue_type_script_setup_true_lang-Mci_tseM.js";
-import { V as N } from "./vs-datatable-BKFXZaVJ.js";
-import { _ as z, n as R, m as E, r as H } from "./import-utils-CGjOAbEq.js";
-import { a as ae, b as le, c as se, d as oe, e as ie } from "./index-DWGGabsq.js";
+import { V as N } from "./vs-datatable-D6g7tjZo.js";
+import { _ as z, n as R, m as E, r as H } from "./import-utils-ElncWVJV.js";
+import { a as ae, b as le, c as se, d as oe, e as ie } from "./index-UGx54M0Q.js";
 import { LucideChevronRight as re } from "lucide-vue-next";
 import { _ as ne } from "./MapSettingsTabs.vue_vue_type_script_setup_true_lang-CKCK3NqY.js";
 const ue = { class: "vs-form" }, de = { class: "vs-form__body auto-rows-max container" }, ce = { class: "flex flex-wrap" }, me = { class: "h-fit w-full mb-6 bg-white border border-gray-200 rounded-lg p-6" }, ve = { class: "h-fit w-full flex flex-wrap" }, pe = { class: "w-full" }, fe = /* @__PURE__ */ B({

package/dist/{service-dErle1NR.js → service-DsykdHry.js}

@@ -1,12 +1,12 @@
 import { openBlock as C, createElementBlock as M, createElementVNode as v, defineComponent as Z, ref as S, watch as T, createTextVNode as Di, createVNode as j, createBlock as N, createCommentVNode as P, defineAsyncComponent as Ri, unref as ve, withCtx as qe, withDirectives as Be, vModelText as Ye, normalizeClass as he, Fragment as Nn, renderList as Mn, toDisplayString as te, getCurrentInstance as Dn, onBeforeUnmount as Rn, toRef as $i, computed as Se, onMounted as ji, resolveDynamicComponent as Ui } from "vue";
 import { useRoute as Bi, useRouter as Yi } from "vue-router";
 import { notify as z } from "@opengis/core";
-import { _ as Ne, u as $n, f as Pi, M as Hi, g as Vi, h as qi, i as Ki, j as mn, k as zi, l as Gi, m as Qi, s as hn } from "./index-DWGGabsq.js";
-import { _ as Wi, a as Ji, b as Zi, c as Xi } from "./HeaderActions.vue_vue_type_script_setup_true_lang-K7A_UX_L.js";
-import { S as el, C as nl } from "./CardIcon-BLMtCXLH.js";
+import { _ as Ne, u as $n, f as Pi, M as Hi, g as Vi, h as qi, i as Ki, j as mn, k as zi, l as Gi, m as Qi, s as hn } from "./index-UGx54M0Q.js";
+import { _ as Wi, a as Ji, b as Zi, c as Xi } from "./HeaderActions.vue_vue_type_script_setup_true_lang-Cg2y4sIa.js";
+import { S as el, C as nl } from "./CardIcon-DgpYeKbG.js";
 import { _ as jn } from "./MonacoEditor.vue_vue_type_script_setup_true_lang-D3ZPeXMw.js";
-import { V as Me } from "./vs-datatable-BKFXZaVJ.js";
-import { _ as Je, m as Ze, r as xe } from "./import-utils-CGjOAbEq.js";
+import { V as Me } from "./vs-datatable-D6g7tjZo.js";
+import { _ as Je, m as Ze, r as xe } from "./import-utils-ElncWVJV.js";
 /*! js-yaml 4.1.0 https://github.com/nodeca/js-yaml @license MIT */
 function Un(e) {
   return typeof e > "u" || e === null;

package/dist/{vs-datatable-BKFXZaVJ.js → vs-datatable-D6g7tjZo.js}

@@ -1,7 +1,7 @@
 import { defineComponent as F, mergeModels as O, defineAsyncComponent as I, useModel as R, ref as y, watch as K, openBlock as o, createElementBlock as s, createElementVNode as e, createVNode as $, unref as x, withCtx as S, createStaticVNode as V, useSlots as P, computed as H, Fragment as b, createTextVNode as U, createCommentVNode as N, renderList as A, normalizeStyle as Q, toDisplayString as M, normalizeClass as z, withModifiers as X, createBlock as Y, resolveDynamicComponent as ee, withDirectives as te, renderSlot as ne } from "vue";
 import { notify as E } from "@opengis/core";
 import { Edit as le, Trash as oe } from "lucide-vue-next";
-import { _ as u } from "./index-DWGGabsq.js";
+import { _ as u } from "./index-UGx54M0Q.js";
 const se = { class: "flex items-center justify-center col-span-3 gap-2" }, re = { class: "flex justify-end p-[20px] gap-[10px] border-t w-full" }, ie = /* @__PURE__ */ F({
   __name: "vs-datatable-controls",
   props: /* @__PURE__ */ O({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.126",
+  "version": "0.2.128",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

package/server/plugins/mapnik/map.proto

@@ -31,6 +31,7 @@ message RenderTileRequest {
     string path = 2;
     repeated double bbox = 3;  // [minx, miny, maxx, maxy]
     int32 width = 4;
+    string ttl = 5; // "5m", "1h", "1d" or "0"
     string debug = 6;
 }
 
@@ -39,6 +40,7 @@ message RenderTileOut {
     bool cache = 2;
     string err = 3;
     string xml_path = 4;
+    string tile_path = 5;
 }
 
 message ClearTileRequest {

package/server/routes/gis/checkXML.js

@@ -45,7 +45,6 @@ export default async function checkXML(req, reply) {
 
                 const rasterInfo = await GetRasterInfo({
                     path: row.source_path,
-                    ttl: '0',
                 }).catch(err => ({ err }));
 
                 if (rasterInfo.err) {

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

@@ -5,7 +5,7 @@ import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
 const { GetStat } = mapnik();
 
 export default async function mapnikStat({
-    params, query,
+    params,
 }, reply) {
     if (!config.mapnik?.server) {
         return reply.status(400).send({ error: 'mapnik server address needed', code: 400 });
@@ -13,7 +13,6 @@ export default async function mapnikStat({
 
     const stat = await GetStat({
         period: params.period,
-        ttl: query.nocache ? '0' : undefined,
     });
 
     return reply.status(200).send(stat);

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

@@ -0,0 +1,145 @@
+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';
+
+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 });
+  }
+
+  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.source_type === 'css'
+      ? await cartoBounds({ id: data.cartocss_id, dataset: data.config/* , table: data.card_table */ }, pg)
+      : data.bounds?.replace?.(')', '').substr(4).split(/[, ]/g).map((el) => el - 0);
+
+    send(`start: ${data.name} ${params.id} ${bounds} ${data.srid} ${data.proj4}`);
+
+    if (!bounds) {
+      return send('geom is not set');
+    }
+
+    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

@@ -36,7 +36,6 @@ export default async function rasterInfo({
     const { data, cache, error } = await GetRasterInfo({
         path: relpath,
         proj4,
-        ttl: query.nocache ? '0' : '1h',
     }).catch(err => ({ error: err.toString() }));
 
     if (query.debug) {

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

@@ -6,8 +6,8 @@ export default async function cartoBounds({ id, dataset, table }, pg = pgClients
     }
 
     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.replace(/"/g, "").split('.')[0]}', '${table.replace(/"/g, "").split('.')[1]}', 'geom'),(SELECT st_srid(geom) from ${table} limit 1)),4326)`];
+        ? 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[0]}."${tbl[1]}" limit 1)),4326)`)
+        : [`select ST_Transform(ST_SetSRID(ST_EstimatedExtent('${table.replace(/"/g, "").split('.')[0]}', '${table.replace(/"/g, "").split('.')[1]}', 'geom'),(SELECT st_srid(geom) from ${table.split('.')[0]}."${table.split('.')[1]}" limit 1)),4326)`];
 
     const geom = await pg.query(
         `update gis.cartocss set             

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

@@ -0,0 +1,27 @@
+export default async function boundsToTiles({
+  bounds, minzoom, maxzoom, mercator,
+}) {
+  if (!bounds) return { error: 'param bounds is required', status: 400 };
+  if (!minzoom) return { error: 'param minzoom is required ', status: 400 };
+  if (!maxzoom) return { error: 'param maxzoom is required ', status: 400 };
+
+  const minzoom1 = minzoom - 0;
+  const maxzoom1 = maxzoom - 0;
+
+  if (maxzoom1 < minzoom1) {
+    return { error: 'maxzoom must be >= minzoom', status: 400 };
+  }
+
+  const arr = Array.from(
+    { length: maxzoom1 - minzoom1 + 1 },
+    (_, i) => minzoom1 + i,
+  );
+
+  const TILE = arr.reduce((prev, z) => {
+    const convert = mercator.convert(Array.isArray(bounds) ? bounds : bounds.split(','), '900913');
+    const XY = mercator.xyz(convert, z, false, '900913');
+    prev.push({ ...XY, z, count: (XY.maxX - XY.minX + 1) * (XY.maxY - XY.minY + 1) });
+    return prev;
+  }, []);
+  return TILE;
+}

package/server/routes/mapnik/index.js

@@ -8,11 +8,23 @@ import readDir from './controllers/readDir.js';
 import fileStat from './controllers/fileStat.js';
 import fileSearch from './controllers/fileSearch.js';
 import clearTiles from './controllers/clearTiles.js';
+import pretile from './controllers/pretile.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
 
+const pretileSchema = {
+  querystring: {
+    type: "object",
+    properties: {
+      zoom: { type: "number", exclusiveMinimum: 0, maximum: 22 },
+      max: { type: "number", exclusiveMinimum: 0, maximum: 22 },
+    },
+    required: ["zoom"],
+  },
+};
+
 export default async function route(app) {
   app.get('/gis-upload-raster/:id', params, uploadRaster);
   app.get('/gis-xml/:id', publicParams, createXml);
@@ -24,4 +36,5 @@ export default async function route(app) {
   app.get('/gis-file-info', adminParams, fileStat);
   app.get('/gis-file-search', adminParams, fileSearch);
   app.get('/gis-clear-rtile/:id', adminParams, clearTiles);
+  app.get('/gis-pretile/:id', { ...adminParams, schema: pretileSchema }, pretile);
 }