@opengis/gis 0.2.160 → 0.2.162

package/dist/{vs-datatable-B989esR4.js → vs-datatable-aAXTRfDg.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-CIF8ZBn4.js";
+import { _ as u } from "./index-DCKH-TcG.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({
@@ -725,12 +725,11 @@ const kt = /* @__PURE__ */ u(pt, [["render", wt]]), W = {
                     ])
                   ])) : (o(), s(b, { key: 1 }, [
                     a.slot && g(a.slot) ? ne(i.$slots, a.slot, {
-                      key: 0,
                       row: l,
                       column: a,
                       value: l[a.key],
                       rowIndex: f
-                    }, void 0, !0) : a.type === "color" ? (o(), s("div", zt, [
+                    }, void 0, !0, 0) : a.type === "color" ? (o(), s("div", zt, [
                       e("div", {
                         class: z(["w-4 h-4 rounded-full align-middle", `bg-[${l[a.key]}]`])
                       }, null, 2)

package/module/test/map/main.json

@@ -1,32 +1,32 @@
 {
   "history": true,
   "height": "calc(100vh - 65px)",
-   "center": [    
+   "center": [
     34.65450,
-    48.51174    
+    48.51174
   ],
   "zoom": 11,
   "widgets": [
-   
+
     {
       "type": "catalog",
       "position": "top-left"
-      
+
     },
     {
       "type": "legend",
-      "position": "bottom-right"     
+      "position": "bottom-right"
     },
-    
+
     {
       "type": "basemaps",
       "position": "bottom-left",
-      "title": "Базові карти",      
+      "title": "Базові карти",
       "visible": true
     }
-   
+
   ],
-  
+
   "tools": [
     "home",
     "geolocation",
@@ -36,4 +36,4 @@
     "print",
     "add-data"
   ]
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.160",
+  "version": "0.2.162",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -72,4 +72,4 @@
     "vue-router": "4.5.1",
     "vuedraggable": "^4.1.0"
   }
-}
+}

package/server/plugins/mapnik/map.proto

@@ -10,7 +10,12 @@ package map;
 service MapService {
     rpc PrintMap(PrintMapRequest) returns (PrintMapOut);
     rpc RenderTile(RenderTileRequest) returns (RenderTileOut);
+    rpc GetTile(GetTileRequest) returns (GetTileOut);
+    rpc VectorTile(VectorTileRequest) returns (VectorTileOut);
+    rpc PoolClear(PoolClearRequest) returns (PoolClearOut);
     rpc ClearTile(ClearTileRequest) returns (ClearTileOut);
+    rpc ReadFile(ReadFileRequest) returns (ReadFileOut);
+    rpc WriteFile(WriteFileRequest) returns (WriteFileOut);
     rpc ReadDir(ReadDirRequest) returns (ReadDirOut);
     rpc FileStat(FileStatRequest) returns (FileStatOut);
     rpc FileSearch(FileSearchRequest) returns (FileSearchOut);
@@ -20,8 +25,10 @@ service MapService {
     rpc ConvertCog(ConvertCogRequest) returns (stream JobProgress); // streaming COG conversion
     rpc ConvertVector(ConvertVectorRequest) returns (ConvertVectorOut); // vector file/archive -> GeoJSON
     rpc ImportData(ImportDataRequest) returns (stream JobProgress); // streaming SHP -> PostGIS import
+    rpc DumpTable(DumpTableRequest) returns (stream JobProgress); // streaming PostGIS -> SHP dump
     rpc UploadXML(UploadXMLRequest) returns (UploadXMLOut);
     rpc UploadRaster(UploadRasterRequest) returns (UploadRasterOut);
+    rpc UploadChunk(UploadChunkRequest) returns (UploadChunkOut);
     rpc GetRasterStatus(GetRasterStatusRequest) returns (GetStatusOut);
     rpc GetStat(GetStatRequest) returns (GetStatOut);
     rpc GetLogs(GetLogsRequest) returns (GetLogsOut);
@@ -43,6 +50,7 @@ message PrintMapRequest {
     int32 opacity = 8; // 0-255
     repeated string colors = 9; // [ #00FF00, #0000FF]
     repeated string layers = 10;
+    optional bool ignoreBusy = 11; // when true fallback to one-off renderer if pool is exhausted
 }
 
 message PrintMapOut {
@@ -65,6 +73,8 @@ message RenderTileRequest {
     bool meta = 10; // when true return tile metadata/path only (without base64 image payload)
     optional bool base64 = 11; // optional output mode flag: true -> base64, false -> raw bytes
     optional string format = 12; // optional tile image format: png|jpg|jpeg|webp
+    optional bool ignoreBusy = 13; // when true fallback to one-off renderer if pool is exhausted
+    optional int32 maxZoom = 14; // optional per-request max zoom override
 }
 
 message RenderTileOut {
@@ -77,16 +87,71 @@ message RenderTileOut {
     bytes data = 7; // raw PNG bytes (used when request.base64=false)
 }
 
+message GetTileRequest {
+    string path = 1; // tile path relative to tiles root
+    bool meta = 2; // when true return metadata/path only without binary payload
+}
+
+message GetTileOut {
+    string tile_path = 1; // normalized relative tile path under tiles/
+    bytes data = 2; // raw tile bytes when meta=false
+    string err = 3;
+}
+
+message VectorTileRequest {
+    string path = 1; // vector tile folder/path relative to tiles root
+    int32 z = 2;
+    int32 x = 3;
+    int32 y = 4;
+    bool meta = 5; // when true return metadata/path only without binary payload
+}
+
+message VectorTileOut {
+    string tile_path = 1; // normalized relative tile path under tiles/
+    bytes data = 2; // raw vector tile bytes when meta=false
+    string err = 3;
+}
+
 message ClearTileRequest {
     string name = 1;
     string path = 2;
 }
 
+message PoolClearRequest {
+    string path = 1;
+}
+
+message PoolClearOut {
+    string result = 1;
+    string err = 2;
+}
+
 message ClearTileOut {
     string result = 1;
     string err = 2;
 }
 
+message ReadFileRequest {
+    string path = 1;
+}
+
+message ReadFileOut {
+    string data = 1;
+    string path = 2;
+    string err = 3;
+}
+
+message WriteFileRequest {
+    string path = 1;
+    string data = 2;
+}
+
+message WriteFileOut {
+    string status = 1;
+    string path = 2;
+    string err = 3;
+}
+
 message FileStatRequest {
     string path = 1;
 }
@@ -210,6 +275,7 @@ message ConvertVectorRequest {
     string format = 2; // optional input format hint: zip|shp|kml|gml|geojson|json
     int32 srs = 3; // target EPSG code, default 4326
     string filename = 4; // optional original filename for extension/layer detection
+    string encoding = 5; // optional encoding, default UTF-8
 }
 
 message ConvertVectorOut {
@@ -221,13 +287,22 @@ message ConvertVectorOut {
 message ImportDataRequest {
     string path = 1; // path to .shp file or directory under vector root
     bool recursive = 2; // process nested folders when path is directory
-    bool force = 3; // overwrite existing tables when true
+    optional bool force = 3; // overwrite existing tables when true; defaults to true when omitted
     string mode = 4; // import mode: file|type (aliases: 1|2)
     string db = 5; // PostgreSQL URL: postgresql://user:pass@host:port/dbname
     string schema = 6; // target schema override
     string type = 7; // optional geometry type override, e.g. LineString
 }
 
+message DumpTableRequest {
+    string path = 1; // target directory under vector/root where SHP files will be written
+    optional bool overwrite = 2; // overwrite existing shapefiles when true
+    repeated string include = 3; // optional allow-list of table names to dump
+    optional bool explodeMulti = 4; // dump multipart geometries as separate single-part features
+    repeated string ignore = 5; // optional deny-list of table names to skip
+    int32 limit = 6; // optional max number of tables to dump after filtering
+}
+
 message UploadXMLRequest {
     string name = 1;
     string xml = 2;
@@ -253,6 +328,21 @@ message UploadRasterOut {
     bool finished = 3;
 }
 
+message UploadChunkRequest {
+    string path = 1;
+    int64 part = 2;
+    int64 offset = 3;
+    bytes data = 4;
+    int64 filesize = 5;
+}
+
+message UploadChunkOut {
+    string status = 1;
+    int64 uploaded = 2;
+    bool finished = 3;
+    string path = 4;
+}
+
 message GetRasterStatusRequest {
     string path = 1;
     bool md5 = 2;
@@ -266,6 +356,8 @@ message GetStatusOut {
 
 message GetStatRequest {
     string period = 1;  // "5m", "1h", "1d"
+    string path = 2; // optional map_id or XML/map path filter
+    bool recursive = 3; // when path is a directory/map prefix, include nested maps
 }
 
 message GetStatOut {

package/server/routes/gis/index.mjs

@@ -25,6 +25,7 @@ import checkXML from './checkXML.js';
 
 import getCartocss from './cartocss/get.cartocss.js';
 import addCartocss from './cartocss/add.cartocss.js';
+import createRoute from './services/create.route.js';
 
 const mapInfoPointSchema = {
   querystring: {
@@ -83,6 +84,8 @@ async function route(app) {
 
   app.get('/dashboard', publicParams, getDashboard);
 
+  app.get('/routes', publicParams, createRoute);
+
   app.get('/gis-css/:id', publicParams, getCartocss);
   app.post('/gis-css/:id', { config: { policy: 'L0', allowSql: true, package: 'gis' } }, addCartocss);
 }

package/server/routes/gis/services/create.route.js

@@ -0,0 +1,96 @@
+const ROUTE_URL = 'https://data.gki.com.ua/api/osrm-routes'
+
+function parseCoordPair(raw) {
+  const [lngRaw, latRaw] = String(raw || '').split(',')
+  const lng = Number(lngRaw)
+  const lat = Number(latRaw)
+
+  if (
+    !Number.isFinite(lng)
+    || !Number.isFinite(lat)
+    || lng < -180
+    || lng > 180
+    || lat < -90
+    || lat > 90
+  ) {
+    throw new Error('invalid coordinate')
+  }
+
+  return [lng, lat]
+}
+
+function buildRoutePoints(from, to, via) {
+  const points = [parseCoordPair(from)]
+  if (via) {
+    for (const segment of String(via).split(';')) {
+      const trimmed = segment.trim()
+      if (trimmed) points.push(parseCoordPair(trimmed))
+    }
+  }
+  points.push(parseCoordPair(to))
+  return points
+}
+
+function routeOptionsQuery(query) {
+  const params = new URLSearchParams()
+  for (const key of ['optimize', 'surface', 'weight', 'mode']) {
+    const value = typeof query?.[key] === 'string' ? query[key].trim() : ''
+    if (value) params.set(key, value)
+  }
+  const qs = params.toString()
+  return qs ? `&${qs}` : ''
+}
+
+function buildSegmentsBody(points) {
+  const segments = []
+  for (let i = 0; i < points.length - 1; i += 1) {
+    segments.push([
+      [points[i][0], points[i][1]],
+      [points[i + 1][0], points[i + 1][1]],
+    ])
+  }
+  return JSON.stringify(segments)
+}
+
+export default async function createRouteHandler(req, reply) {
+  try {
+    const points = buildRoutePoints(req.query.from, req.query.to, req.query.via)
+    const url = `${ROUTE_URL}?steps=true&alternatives=true${routeOptionsQuery(req.query)}`
+
+    const response = await fetch(url, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+      },
+      body: buildSegmentsBody(points),
+      signal: AbortSignal.timeout(10_000),
+    }).catch(error => ({
+      ok: false,
+      status: 502,
+      headers: new Headers({ 'content-type': 'application/json' }),
+      text: async () => JSON.stringify({ error: String(error), code: 502 }),
+    }))
+
+    const contentType = response.headers?.get?.('content-type') || 'application/json'
+    const text = await response.text()
+    let payload = text
+
+    if (contentType.includes('application/json')) {
+      try {
+        payload = text ? JSON.parse(text) : null
+      } catch {
+        payload = text
+      }
+    }
+
+    return reply
+      .status(response.status || 200)
+      .header('Content-Type', contentType)
+      .send(payload)
+  } catch (err) {
+    const message = err?.message || 'external route provider request failed'
+    const statusCode = /invalid coordinate/i.test(message) ? 400 : 502
+    return reply.status(statusCode).send({ error: message, code: statusCode })
+  }
+}

package/server/routes/map/controllers/gis.convert.js

@@ -1,7 +1,7 @@
 import path from "node:path";
 
-import mapnik from "../../../plugins/mapnik/funcs/mapnik.js";
 import { downloadFile } from "@opengis/fastify-table/utils.js";
+import mapnik from "../../../plugins/mapnik/funcs/mapnik.js";
 
 const { ConvertVector } = mapnik();
 
@@ -15,7 +15,7 @@ const ALLOWED_FORMAT = new Set(["zip", "shp", "kml", "gml", "geojson", "json"]);
  * @body {number}  [srid=4326] - цільовий EPSG код
  */
 export default async function gisConvert({ body = {} }, reply) {
-  const { filepath, srid = 4326 } = body;
+  const { filepath, srid = 4326, encoding } = body;
 
   if (!filepath || typeof filepath !== "string") {
     return reply
@@ -42,6 +42,7 @@ export default async function gisConvert({ body = {} }, reply) {
     data,
     format: ext,
     srs: +srid,
+    encoding,
     filename: path.basename(filepath),
   }).catch((err) => ({ err }));
 

package/server/routes/map/controllers/pointHeight.js

@@ -0,0 +1,55 @@
+const DEFAULT_ENDPOINT = 'https://api.opentopodata.org/v1/srtm90m';
+
+function parseLatLng(query) {
+  const lat = Number(query?.lat);
+  const lng = Number(query?.lng);
+  if (!Number.isFinite(lat) || !Number.isFinite(lng)) {
+    throw new Error('lat and lng are required');
+  }
+  if (Math.abs(lat) > 90 || Math.abs(lng) > 180) {
+    throw new Error('coordinates out of range');
+  }
+  return { lat, lng };
+}
+
+function getEndpoint() {
+  const configured = process.env.ELEVATION_API_URL?.trim();
+  return configured || DEFAULT_ENDPOINT;
+}
+
+async function fetchHeight(lat, lng) {
+  const base = getEndpoint();
+  const url = new URL(base);
+  url.searchParams.set('locations', `${lat},${lng}`);
+
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 12_000);
+
+  try {
+    const response = await fetch(url, { signal: controller.signal });
+    if (!response.ok) {
+      throw new Error(`Elevation API returned ${response.status}`);
+    }
+
+    const body = await response.json();
+    const result = body?.results?.[0] || null;
+    if (!result || result.elevation == null) return null;
+    const height = Number(result.elevation);
+    return Number.isFinite(height) ? height : null;
+  }
+  finally {
+    clearTimeout(timeout);
+  }
+}
+
+export default async function pointHeight(ctx = {}) {
+  const query = ctx?.query ?? ctx ?? {};
+  const { lat, lng } = parseLatLng(query);
+  const height = await fetchHeight(lat, lng);
+
+  return {
+    lat,
+    lng,
+    height,
+  };
+}

package/server/routes/map/index.mjs

@@ -26,6 +26,28 @@ import addWidget from './widgets/add.widget.js';
 import delWidget from './widgets/del.widget.js';
 
 import gisConvert from './controllers/gis.convert.js';
+import pointHeight from './controllers/pointHeight.js';
+
+const gisConvertSchema = {
+  body: {
+    type: 'object',
+    properties: {
+      encoding: {
+        type: 'string',
+        // python is case insensitive and ignores "-"
+        enum: ['LATIN-1', 'CP1251', 'UTF-8'],
+      },
+      srid: {
+        type: 'number',
+        minimum: 1,
+      },
+      filepath: {
+        type: 'string',
+      },
+    },
+    required: ['filepath'],
+  },
+};
 
 const schemaInfo = {
   type: 'object',
@@ -74,6 +96,27 @@ const mapFormatSchema = {
   },
 };
 
+const pointHeightSchema = {
+  querystring: {
+    type: 'object',
+    required: ['lat', 'lng'],
+    properties: {
+      lat: { type: 'number', minimum: -90, maximum: 90 },
+      lng: { type: 'number', minimum: -180, maximum: 180 },
+    },
+  },
+  response: {
+    200: {
+      type: 'object',
+      properties: {
+        lat: { type: 'number' },
+        lng: { type: 'number' },
+        height: { anyOf: [{ type: 'number' }, { type: 'null' }] },
+      },
+    },
+  },
+};
+
 const publicParams = {
   config: { policy: 'L0' },
   schema: schemaInfo,
@@ -184,6 +227,14 @@ export default async function route(app) {
     );
   }
 
+  if (!app.hasRoute({ method: 'GET', url: '/api/coords/height' })) {
+    app.get(
+      '/coords/height',
+      { ...publicParams, schema: pointHeightSchema },
+      pointHeight,
+    );
+  }
+
   if (!app.hasRoute({ method: 'POST', url: '/api/gis-parse-geo' })) {
     app.post('/gis-parse-geo', publicParams, parseGeoFile);
   }
@@ -191,7 +242,7 @@ export default async function route(app) {
   if (!app.hasRoute({ method: 'POST', url: '/api/gis-convert' })) {
     app.post(
       '/gis-convert',
-      { config: { policy: 'L0' }, schema: {}, package: 'gis' },
+      { config: { policy: 'L0' }, schema: gisConvertSchema, package: 'gis' },
       gisConvert,
     );
   }

package/server/routes/map/vtile1.js

@@ -20,7 +20,7 @@ const mercator = new Sphericalmercator({ size: 256 });
 import {
   getColumnCLS, getTemplate, getMeta, getFilterSQL, getSelect,
 } from '@opengis/fastify-table/utils.js';
-import yaml from 'js-yaml';
+import * as yaml from 'js-yaml';
 import rootFolder from '../../plugins/mapnik/funcs/rootFolder.mjs';
 
 const propsCache = {};