@opengis/gis 0.2.172 → 0.2.174

package/dist/{raster-GtCFqtk-.js → raster-dSEb1SIG.js}

@@ -1,9 +1,9 @@
 import { defineComponent as te, resolveDirective as We, openBlock as u, createElementBlock as m, createElementVNode as n, Fragment as W, renderList as X, toDisplayString as d, withDirectives as we, createTextVNode as Xe, normalizeClass as ae, ref as $, watch as S, computed as h, vModelText as Ke, onMounted as Ye, onBeforeUnmount as Ze, createCommentVNode as q, createVNode as B, withCtx as He, createBlock as F, resolveDynamicComponent as Je } from "vue";
 import { useRouter as et, useRoute as tt } from "vue-router";
 import { TooltipDirective as st, notify as M } from "@opengis/core";
-import { _ as nt, u as lt, f as rt, M as ot, i as it, j as be, F as at } from "./index-BaB3A3Tb.js";
-import { _ as ut, a as ct, b as dt, c as ft } from "./HeaderActions.vue_vue_type_script_setup_true_lang-D_BESZDN.js";
-import { _ as he } from "./ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-3IWWtgKt.js";
+import { _ as nt, u as lt, f as rt, M as ot, i as it, j as be, F as at } from "./index-CHFLgCGW.js";
+import { _ as ut, a as ct, b as dt, c as ft } from "./HeaderActions.vue_vue_type_script_setup_true_lang-Buff9gTO.js";
+import { _ as he } from "./ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-BIL1ocLY.js";
 const mt = { class: "flex-1 overflow-y-auto p-4 sm:p-6" }, pt = { class: "space-y-3" }, gt = { class: "bg-white p-3 rounded-xl border border-gray-200 shadow-sm" }, yt = { class: "grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-2" }, vt = { class: "text-xs text-gray-500 mb-1" }, xt = {
   key: 0,
   class: "text-base text-md font-semibold text-gray-900"

package/dist/{register-BQEx0elz.js → register-D7Puupgo.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-B3hGBtGc.js";
-import { _ as z, n as R, m as E, r as H } from "./import-utils-Dp6H-Ajf.js";
-import { a as ae, b as le, c as se, d as oe, e as ie } from "./index-BaB3A3Tb.js";
+import { V as N } from "./vs-datatable-DqVncrSg.js";
+import { _ as z, n as R, m as E, r as H } from "./import-utils-CMWiuRPp.js";
+import { a as ae, b as le, c as se, d as oe, e as ie } from "./index-CHFLgCGW.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-CgO3RsDo.js → service-Cz6T0O3Z.js}

@@ -4,12 +4,12 @@ var L = (e, n, t) => pi(e, typeof n != "symbol" ? n + "" : n, t);
 import { openBlock as _, createElementBlock as M, createElementVNode as g, defineComponent as ae, ref as E, watch as $, createTextVNode as mi, createVNode as D, createBlock as P, createCommentVNode as W, defineAsyncComponent as hi, unref as ze, withCtx as bn, withDirectives as fn, vModelText as dn, normalizeClass as _e, Fragment as kt, renderList as At, toDisplayString as fe, getCurrentInstance as Ct, onBeforeUnmount as wt, toRef as gi, computed as ve, onMounted as yi, resolveDynamicComponent as vi } from "vue";
 import { useRoute as bi, useRouter as xi } from "vue-router";
 import { notify as X } from "@opengis/core";
-import { _ as Xe, u as Ge, f as Si, M as ki, g as Ai, h as Ci, i as wi, j as tt, k as Ti, l as _i, m as Ei, s as it, n as Ii } from "./index-BaB3A3Tb.js";
-import { _ as Ni, a as $i, b as Li, c as Fi } from "./HeaderActions.vue_vue_type_script_setup_true_lang-D_BESZDN.js";
-import { S as Oi, C as Ri } from "./CardIcon-DrNd-2PW.js";
+import { _ as Xe, u as Ge, f as Si, M as ki, g as Ai, h as Ci, i as wi, j as tt, k as Ti, l as _i, m as Ei, s as it, n as Ii } from "./index-CHFLgCGW.js";
+import { _ as Ni, a as $i, b as Li, c as Fi } from "./HeaderActions.vue_vue_type_script_setup_true_lang-Buff9gTO.js";
+import { S as Oi, C as Ri } from "./CardIcon-Cg8bUM4G.js";
 import { _ as Tt } from "./MonacoEditor.vue_vue_type_script_setup_true_lang-D3ZPeXMw.js";
-import { V as Ze } from "./vs-datatable-B3hGBtGc.js";
-import { _ as Nn, m as $n, r as $e } from "./import-utils-Dp6H-Ajf.js";
+import { V as Ze } from "./vs-datatable-DqVncrSg.js";
+import { _ as Nn, m as $n, r as $e } from "./import-utils-CMWiuRPp.js";
 /*! js-yaml 5.2.1 https://github.com/nodeca/js-yaml @license MIT */
 var T = Symbol("NOT_RESOLVED"), Ln = Symbol("MERGE_KEY");
 function U(e, n) {

package/dist/{vs-datatable-B3hGBtGc.js → vs-datatable-DqVncrSg.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-BaB3A3Tb.js";
+import { _ as u } from "./index-CHFLgCGW.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.172",
+  "version": "0.2.174",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

package/server/routes/cartocss/cartocss.schema.js

@@ -25,7 +25,7 @@ const cssBodySchema = {
     additionalProperties: true,
 
     properties: {
-        id: { type: "string", pattern: '^([\\d\\w]+)$' },
+        id: { type: "string", pattern: '^([\\d\\w._-]+)$' },
         name: { type: "string" },
         group_id: { type: "string" },
         cartocss_key: { type: "string" },
@@ -46,7 +46,7 @@ export const getCartocssSchema = {
         type: 'object',
         required: ['id'],
         properties: {
-            id: { type: 'string', pattern: '^([\\d\\w]+)$' }
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' }
         }
     },
     querystring: {
@@ -64,7 +64,7 @@ export const addCartocssSchema = {
         type: 'object',
         required: ['id'],
         properties: {
-            id: { type: 'string', pattern: '^([\\d\\w]+)$' }
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' }
         }
     },
     body: cssBodySchema,

package/server/routes/map/map.schema.js

@@ -259,7 +259,7 @@ export const clearTilesSchema = {
     type: 'object',
     properties: {
       id: {
-        type: 'string', pattern: '^([\\d\\w]+)$'
+        type: 'string', pattern: '^([\\d\\w._-]+)$'
       },
     },
   },

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

@@ -1,14 +1,14 @@
 import path from 'node:path';
 
 import { config, pgClients } from '@opengis/fastify-table/utils.js';
+import { BadRequestError, NotImplementedError } from '@opengis/fastify-table/errors.js';
 
 import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-import { BadRequestError, NotFoundError, NotImplementedError } from '@opengis/fastify-table/errors.js';
 
 const { GetRasterStatus, CreateXML } = mapnik();
 
 export default async function createXml({
-    id, vrt, debug, nocache, callback = () => { },
+    id, vrt, srid, proj4: queryProj4, debug, nocache, callback = () => { },
 }, pg = pgClients.client) {
     if (!GetRasterStatus || !CreateXML) {
         throw NotImplementedError('mapnik server address needed');
@@ -24,18 +24,30 @@ export default async function createXml({
         : null;
 
     if (!data?.id) {
-        throw NotFoundError('raster not found')
+        // throw NotFoundError('raster not found');
     }
 
-    if (!data.source_path) {
+    if (data && !data?.source_path) {
         throw BadRequestError('raster source_path not set');
     }
 
+    const sourcePath = data?.id ? data.source_path : Buffer.from(id, "base64").toString("utf-8");
+
+    const extension = path.extname(sourcePath)?.toLowerCase();
+
+    if (!data && (!extension || !extension.match(/^(\.tif|\.tiff)$/i))) {
+        throw BadRequestError('invalid params: id');
+    }
+
+    if (!data && !(srid || queryProj4)) {
+        // throw BadRequestError('not enough query params: srid/proj4');
+    }
+
     // const relpath = `/map/raster/${data.source_path}`;
-    const relpath = ['raster', config.mapnik?.folder, data.source_path].filter(Boolean).join('/');
+    const relpath = ['raster', config.mapnik?.folder, sourcePath].filter(Boolean).join('/');
 
     // check raster upload status, skip for directories
-    const uploadStatus = path.extname(data.source_path) ? await GetRasterStatus({ path: relpath }) : {};
+    const uploadStatus = extension ? await GetRasterStatus({ path: relpath }) : {};
 
     if (uploadStatus.exists === false) {
         throw BadRequestError('raster not uploaded');
@@ -45,13 +57,13 @@ export default async function createXml({
         throw BadRequestError('upload not finished');
     }
 
-    const proj4 = data.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [data.srid]).then(r => r.rows?.[0]?.proj4text) : undefined;
+    const proj4 = queryProj4 || (data?.srid && pg.pk?.['public.spatial_ref_sys'] ? await pg.query('select proj4text from public.spatial_ref_sys where srid=$1', [srid || data?.srid]).then(r => r.rows?.[0]?.proj4text) : undefined);
 
     // create at xml/:id with name only, always - by path
     const resp = await CreateXML({
         path: relpath,
         name: [config.mapnik?.folder, id].filter(Boolean).join('/'), // create additional xml named as primary key at xml directory
-        previewZoom: data.raster_zoom, // preview<=>detailed, default = 16 if file size > 1GB
+        previewZoom: data?.raster_zoom, // preview<=>detailed, default = 16 if file size > 1GB
         // srid: data.srid, // auto detected if not supplied
         proj4,
         vrt, // force vrt even if relpath leads to single raster file

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

@@ -38,7 +38,7 @@ export default function route(app) {
   });
   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, vrt: query.vrt, debug: query.debug, nocache: query.nocache, callback }).catch(err => ({ error: err.toString() }));
+    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;
   });

package/server/routes/mapnik/mapnik.schema.mjs

@@ -10,7 +10,7 @@ export const pretileSchema = {
   params: {
     type: "object",
     properties: {
-      id: { type: "string", pattern: '^([\\d\\w]+)$', },
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
     },
     required: ["id"],
   },
@@ -29,7 +29,7 @@ export const uploadRasterSchema = {
   params: {
     type: "object",
     properties: {
-      id: { type: "string", pattern: '^([\\d\\w]+)$', },
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
     },
     required: ["id"],
   },
@@ -39,7 +39,7 @@ export const gisXmlSchema = {
   params: {
     type: "object",
     properties: {
-      id: { type: "string", pattern: '^([\\d\\w]+)$', },
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
     },
     required: ["id"],
   },
@@ -51,6 +51,11 @@ export const gisXmlSchema = {
       nocache: { type: "string", enum: ['true', '1'] },
       vrt: { type: "string", enum: ['true', '1'] },
       debug: { type: "number", minimum: 1, maximum: 10 },
+      srid: { type: "number", minimum: 1, maximum: 1000000 },
+      proj4: {
+        type: "string", minLength: 1,
+        maxLength: 4096
+      },
     },
   },
 };
@@ -59,7 +64,7 @@ export const gisRtileSchema = {
   params: {
     type: "object",
     properties: {
-      id: { type: "string", pattern: '^([\\d\\w]+)$', },
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
       z: {
         type: 'number',
       },
@@ -98,7 +103,7 @@ export const gisRasterSchema = {
   params: {
     type: "object",
     properties: {
-      id: { type: "string", pattern: '^([\\d\\w]+)$', },
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
     },
     required: ["id"],
   },
@@ -115,7 +120,7 @@ export const createXmlMultiSchema = {
   params: {
     type: "object",
     properties: {
-      id: { type: "string", pattern: '^([\\d\\w]+)$', },
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
     },
   },
   querystring: {
@@ -175,7 +180,7 @@ export const clearTilesSchema = {
   params: {
     type: "object",
     properties: {
-      id: { type: "string", pattern: '^([\\d\\w]+)$', },
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
     },
   },
   querystring: {

package/server/routes/maps/maps.schema.js

@@ -2,7 +2,7 @@ export const schemaInfo = {
     params: {
         type: 'object',
         properties: {
-            id: { type: "string", pattern: '^([\\d\\w]+)$' },
+            id: { type: "string", pattern: '^([\\d\\w._-]+)$' },
         },
     },
 };

package/server/routes/metadata/metadata.schema.js

@@ -4,7 +4,7 @@ export const editMetadataSchema = {
         required: ['type', 'id'],
         properties: {
             type: { type: 'string', enum: ['raster', 'css', 'dataset', 'service'] },
-            id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
         },
     },
     body: {
@@ -45,7 +45,7 @@ export const metadataXMLSchema = {
         type: 'object',
         required: ['id'],
         properties: {
-            id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
         },
     },
 };

package/server/routes/permissions/permissions.schema.js

@@ -4,7 +4,7 @@ export const getCatalogPermissionsSchema = {
         required: ['uid'],
         properties: {
             uid: {
-                type: 'string', pattern: '^([\\d\\w]+)$'
+                type: 'string', pattern: '^([\\d\\w._-]+)$'
             },
         },
     },
@@ -16,7 +16,7 @@ export const editCatalogPermissionsSchema = {
         required: ['uid'],
         properties: {
             uid: {
-                type: 'string', pattern: '^([\\d\\w]+)$'
+                type: 'string', pattern: '^([\\d\\w._-]+)$'
             },
         },
     },
@@ -27,7 +27,7 @@ export const editCatalogPermissionsSchema = {
             required: ['service_id', 'actions'],
             properties: {
                 service_id: {
-                    type: 'string', pattern: '^([\\d\\w]+)$'
+                    type: 'string', pattern: '^([\\d\\w._-]+)$'
                 },
                 actions: {
                     type: 'array',

package/server/routes/registers/registers.schema.js

@@ -5,9 +5,9 @@ const registerSchema = {
     type: 'object',
     additionalProperties: false,
     properties: {
-        id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-        register_id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-        service_id: { type: ['string', 'null'], pattern: '^([\\d\\w]+)$' },
+        id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        register_id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+        service_id: { type: ['string', 'null'], pattern: '^([\\d\\w._-]+)$' },
 
         name: { type: 'string' },
         description: { type: ['string', 'null'] },
@@ -105,7 +105,7 @@ const registerSchema = {
             additionalProperties: false,
             required: ['id', 'text'],
             properties: {
-                id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+                id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
                 text: { type: 'string' },
                 icon: { type: ['string', 'null'] },
                 color: { type: 'string' },
@@ -119,7 +119,7 @@ const registerSchema = {
             additionalProperties: false,
             required: ['id', 'text'],
             properties: {
-                id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+                id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
                 text: { type: 'string' },
                 icon: { type: ['string', 'null'] },
                 color: { type: 'string' },
@@ -131,7 +131,7 @@ const registerSchema = {
             additionalProperties: false,
             required: ['id', 'text'],
             properties: {
-                id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+                id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
                 text: { type: 'string' },
                 icon: { type: ['string', 'null'] },
                 color: { type: 'string' },
@@ -156,7 +156,7 @@ export const gisRegistrySchema = {
         required: ['slug'],
         properties: {
             slug: { type: 'string' },
-            objectId: { type: 'string', pattern: '^([\\d\\w]+)$' },
+            objectId: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
         },
     },
     querystring: {

package/server/routes/services/services.schema.js

@@ -4,7 +4,7 @@ const serviceBodySchema = {
     type: 'object',
     additionalProperties: false,
     properties: {
-        service_id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+        service_id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
         service_key: { type: 'string' },
         name: { type: 'string' },
         description: { type: ['string', 'null'] },
@@ -188,7 +188,7 @@ export const getServicesSchema = {
     params: {
         type: 'object',
         properties: {
-            id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
         },
     },
 };
@@ -198,7 +198,7 @@ export const getServicesColSchema = {
         type: 'object',
         required: ['id', 'col'],
         properties: {
-            id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
             col: { type: 'string', pattern: '^([\\d\\w_]+)$' },
         },
     },
@@ -207,7 +207,7 @@ export const addServiceSchema = {
     params: {
         type: 'object',
         properties: {
-            id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
         },
     },
     body: { ...serviceBodySchema, required: ['name', 'service_type'] }
@@ -217,7 +217,7 @@ export const editServiceSchema = {
         type: 'object',
         required: ['id'],
         properties: {
-            id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
         },
     },
     body: serviceBodySchema
@@ -227,7 +227,7 @@ export const deleteServiceSchema = {
         type: 'object',
         required: ['id'],
         properties: {
-            id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
         },
     },
 };
@@ -236,7 +236,7 @@ export const getServiceUsersSchema = {
     params: {
         type: 'object',
         properties: {
-            id: { type: 'string', pattern: '^([\\d\\w]+)$' },
+            id: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
         },
     },
     querystring: {