@opengis/gis 0.1.17 → 0.1.18

package/dist/import-file.js

@@ -25083,8 +25083,7 @@ const Pb = { class: "w-full flex flex-col bg-white border border-stone-200 shado
                 default: yr(() => [
                   v[1] || (v[1] = ei(" Перейти на карту "))
                 ]),
-                _: 1,
-                __: [1]
+                _: 1
               })
             ]),
             default: yr(() => [
@@ -30855,8 +30854,7 @@ const B2 = { class: "w-full flex flex-col bg-white border border-stone-200 shado
             default: yr(() => [
               I[1] || (I[1] = ei(" Відкрити бокову панель "))
             ]),
-            _: 1,
-            __: [1]
+            _: 1
           })
         ]),
         _: 1
@@ -31048,8 +31046,7 @@ function dS(u, d, y, x, A, P) {
       default: yr(() => [
         d[0] || (d[0] = re("div", null, "Повернутися до початкових налаштувань", -1))
       ]),
-      _: 1,
-      __: [0]
+      _: 1
     })
   ]);
 }
@@ -31221,8 +31218,7 @@ function xS(u, d, y, x, A, P) {
     default: yr(() => [
       d[0] || (d[0] = re("div", null, "Надрукувати", -1))
     ]),
-    _: 1,
-    __: [0]
+    _: 1
   });
 }
 const bS = /* @__PURE__ */ br(vS, [["render", xS]]), wS = {
@@ -31277,8 +31273,7 @@ function SS(u, d, y, x, A, P) {
     default: yr(() => [
       d[1] || (d[1] = re("div", null, "Перемикач виду", -1))
     ]),
-    _: 1,
-    __: [1]
+    _: 1
   });
 }
 const AS = /* @__PURE__ */ br(wS, [["render", SS]]), kS = {}, TS = {
@@ -31498,8 +31493,7 @@ function HS(u, d, y, x, A, P) {
       default: yr(() => [
         d[7] || (d[7] = re("div", null, "Дізнатися геолокацію", -1))
       ]),
-      _: 1,
-      __: [7]
+      _: 1
     })
   ]);
 }
@@ -32259,8 +32253,7 @@ function xA(u, d, y, x, A, P) {
             default: yr(() => [
               d[2] || (d[2] = ei(" Приховати панель "))
             ]),
-            _: 1,
-            __: [2]
+            _: 1
           })
         ]),
         re("div", gA, [
@@ -32305,8 +32298,7 @@ function xA(u, d, y, x, A, P) {
       default: yr(() => [
         d[6] || (d[6] = re("div", null, "Виміряти довжину", -1))
       ]),
-      _: 1,
-      __: [6]
+      _: 1
     })
   ]);
 }
@@ -32607,8 +32599,7 @@ function zA(u, d, y, x, A, P) {
             default: yr(() => [
               d[1] || (d[1] = ei(" Приховати панель "))
             ]),
-            _: 1,
-            __: [1]
+            _: 1
           })
         ]),
         re("div", LA, [
@@ -32645,8 +32636,7 @@ function zA(u, d, y, x, A, P) {
       default: yr(() => [
         d[4] || (d[4] = re("div", null, "Виміряти площу", -1))
       ]),
-      _: 1,
-      __: [4]
+      _: 1
     })
   ]);
 }
@@ -33383,8 +33373,9 @@ const BA = /* @__PURE__ */ br(EA, [["render", zA], ["__scopeId", "data-v-024154e
                 key: 0,
                 map: y.value,
                 activeTool: I.value,
-                setActiveTool: Un
-              }, { ref_for: !0 }, Ft === "home" ? { initialView: cn.value } : {}, { onCardValuesId: ai }), null, 16, ["map", "activeTool"])) : Yt("", !0)
+                setActiveTool: Un,
+                ref_for: !0
+              }, Ft === "home" ? { initialView: cn.value } : {}, { onCardValuesId: ai }), null, 16, ["map", "activeTool"])) : Yt("", !0)
             ], 64))), 128))
           ])) : Yt("", !0)
         ], 512), [
@@ -33481,7 +33472,11 @@ const Qy = /* @__PURE__ */ br(jA, [["render", KA]]), GA = {
     },
     table: {
       type: String,
-      required: !0
+      default: ""
+    },
+    slug: {
+      type: String,
+      default: ""
     }
   },
   data() {
@@ -33512,8 +33507,8 @@ const Qy = /* @__PURE__ */ br(jA, [["render", KA]]), GA = {
     },
     async getData() {
       try {
-        const u = this.type === "registry" ? "/api/gis-registry" : "/api/data", { data: d } = await Zr.get(
-          `${u}/${this.table}?filter=${this.filterUrl}&page=${this.currentPage}&limit=${this.limit}`
+        const u = this.type === "registry" ? `/api/gis-registry/${this.slug}` : `/api/data/${this.table}`, { data: d } = await Zr.get(
+          `${u}?filter=${this.filterUrl}&page=${this.currentPage}&limit=${this.limit}`
         );
         d && (this.tableData = d == null ? void 0 : d.rows, this.localTotal = this.type === "registry" ? d == null ? void 0 : d.total : d == null ? void 0 : d.filtered);
       } catch (u) {

package/module/gis/table/gis.maps.table.json

@@ -1,23 +1,16 @@
 {
   "key": "map_id",
   "table": "gis.maps",
-  "actions": [
-    "add",
-    "edit",
-    "del"
-  ],
-  "controls": [
-    "search",
-    "list",
-    "add"
-  ],
+  "public": true,
+  "actions": ["add", "edit", "del"],
+  "controls": ["search", "list", "add"],
   "access": "user",
   "order": "created_at desc",
   "meta": {
     "title": "name",
     "search": "name,description"
   },
-  "title":"Тематичні карти",
+  "title": "Тематичні карти",
   "form": "gis.maps.form",
   "sql": [
     {

package/module/gis/table/gis.registers.table.json

@@ -1,23 +1,16 @@
 {
   "key": "register_id",
   "table": "gis.registers",
-  "actions": [
-    "add",
-    "edit",
-    "del"
-  ],
-  "controls": [
-    "search",
-    "list",
-    "add"
-  ],
+  "public": true,
+  "actions": ["add", "edit", "del"],
+  "controls": ["search", "list", "add"],
   "access": "user",
   "order": "created_at desc",
   "meta": {
     "title": "name",
     "search": "name,description"
   },
-  "title":"Реєстри",
+  "title": "Реєстри",
   "form": "gis.registers.form",
   "columns": [
     {

package/module/gis/table/gis.services.table.json

@@ -1,23 +1,16 @@
 {
   "key": "service_id",
   "table": "gis.services",
-  "actions": [
-    "add",
-    "edit",
-    "del"
-  ],
-  "controls": [
-    "search",
-    "list",
-    "add"
-  ],
+  "public": true,
+  "actions": ["add", "edit", "del"],
+  "controls": ["search", "list", "add"],
   "access": "user",
   "order": "created_by desc",
   "meta": {
     "title": "name",
     "search": "name,description,source_path"
   },
-  "title":"Набори даних",
+  "title": "Набори даних",
   "form": "gis.services.form",
   "sqlColumns": "*",
   "columns": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "type": "module",
   "author": "Softpro",
   "main": "import-file.js",
@@ -39,15 +39,16 @@
     "handlebars": "4.7.8",
     "maplibre-gl": "5.5.0",
     "marked": "15.0.12",
+    "monaco-editor": "^0.52.2",
     "vue": "^3.5.13",
     "vue-router": "4.5.1",
     "vue3-smooth-dnd": "0.0.6"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.2.3",
-    "vite": "^6.3.5",
     "eslint": "8.49.0",
     "eslint-config-airbnb": "19.0.4",
-    "sass-embedded": "1.86.3"
+    "sass-embedded": "1.86.3",
+    "vite": "^6.3.5"
   }
 }

package/server/routes/gis/index.mjs

@@ -10,7 +10,8 @@ export default async function route(app) {
   app.put('/insert-columns/:token', insertColumns);
   app.put('/insert-filters/:token', insertFilters);
   app.get('/gis-registry/:slug', { config: { policy: ['public'] } }, gisRegistry);
-  app.get('/gis-registry-list', { config: { policy: ['public'] } }, gisRegistryList);
+  app.get('/gis-registry/:slug/:objectId', { config: { policy: ['public'] } }, gisRegistry);
+  app.get('/gis-registry', { config: { policy: ['public'] } }, gisRegistryList);
   app.get('/map-registry/:slug/:id', { config: { policy: ['public'] } }, mapRegistry);
 
   app.get('/xml/:id', { config: { policy: ['public'] } }, metadataXML);

package/server/routes/gis/registers/funcs/handleRegistryRequest.js

@@ -2,7 +2,7 @@ import { attachClassifiers } from './classifiers.js';
 import { extractVisibleColumns } from './columns.js';
 import { getMeta, getFilterSQL } from "@opengis/fastify-table/utils.js";
 
-export async function handleRegistryRequest({ settings, query, object_id, offset, limit, page, pg }) {
+export async function handleRegistryRequest({ settings, query, object_id, offset = 0, limit = 16, page = 1, pg }) {
     const { name, table_name, columns, filters, query: whereQuery, order, pk, register_id, is_files } = settings;
     const parsedColumns = Array.isArray(columns) ? columns : JSON.parse(columns);
     const filtersParsed = Array.isArray(filters) ? filters : JSON.parse(filters);
@@ -39,6 +39,8 @@ export async function handleRegistryRequest({ settings, query, object_id, offset
 
         await attachClassifiers(row, classifiers);
 
+        return row;
+
         return {
             row,
             columns: columnsInfo,

package/server/routes/gis/registers/gis.registry.js

@@ -1,12 +1,17 @@
 import { pgClients, getTemplate } from "@opengis/fastify-table/utils.js";
+
 import { handleRegistryRequest } from './funcs/handleRegistryRequest.js';
-const pg = pgClients.client;
 
-export default async function gisRegistry(req = {}) {
-    const { params = {}, query = {} } = req;
-    const { slug } = params;
-    const { page = 1, limit = 9, object_id } = query;
-    const offset = limit * (page - 1);
+const maxLimit = 100;
+const defaultLimit = 9;
+
+export default async function gisRegistry({
+    pg = pgClients.client, params = {}, query = {},
+}) {
+    const { slug, objectId } = params;
+
+    const limit = Math.min(query.limit || defaultLimit, maxLimit);
+    const offset = query.page && query.page > 0 && !objectId ? (query.page - 1) * limit : 0;
 
     //if (!slug) return reply.code(404).send({ message: 'Params slug is required', status: 404 });
     if (!slug) throw new Error('Params slug is required');
@@ -19,14 +24,14 @@ export default async function gisRegistry(req = {}) {
         WHERE register_key = $1`,
         [slug]
     );
-    
+
     if (registry) {
-        return await handleRegistryRequest({ settings: registry, query, object_id, offset, limit, page, pg });
+        return handleRegistryRequest({ settings: registry, query, object_id: objectId, offset, limit, page: query.page, pg });
     }
 
     const registryTemplate = await getTemplate('registry', slug);
     //if (!registryTemplate) return reply.code(404).send({ message: 'Template not found', status: 404 });
     if (!registryTemplate) throw new Error('Template not found');
 
-    return await handleRegistryRequest({ settings: registryTemplate, query, object_id, offset, limit, page, pg });
+    return handleRegistryRequest({ settings: registryTemplate, query, object_id: objectId, offset, limit, page: query.page, pg });
 }

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

@@ -1,4 +1,4 @@
-import { config, pgClients } from "@opengis/fastify-table/utils.js";
+import { config, pgClients, yml2json } from "@opengis/fastify-table/utils.js";
 
 const { prefix = '/api' } = config;
 
@@ -25,6 +25,10 @@ export default async function mapCatalog({ pg = pgClients.client }, reply) {
         )
         : {};
 
+    services.filter(row => row.style).map(row => {
+        row.style = yml2json(row.style);
+    });
+
     services.filter(el => el.bbox).forEach(el => {
         el.bbox = getBBox(el.bbox);
     });

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

@@ -5,7 +5,7 @@ import { readFile, stat, mkdir, writeFile } from 'node:fs/promises';
 
 import Sphericalmercator from '@mapbox/sphericalmercator';
 
-import { getTemplate, pgClients, getFilterSQL, getMeta } from '@opengis/fastify-table/utils.js';
+import { getTemplate, pgClients, getFilterSQL, getMeta, yml2json } from '@opengis/fastify-table/utils.js';
 
 import rootFolder from '../../../plugins/mapnik/funcs/rootFolder.mjs';
 
@@ -64,7 +64,9 @@ export default async function vtile({ pg = pgClients.client, params = {}, query
         return reply.status(404).send('service not found');
     }
 
-    const { source, style, gt, gc } = data;
+    const { source, gt, gc } = data;
+
+    const style = data.style ? yml2json(data.style) : {};
 
     if (!source) {
         return reply.status(400).send('invalid service source path');