@opengis/gis 0.2.17 → 0.2.19

package/module/gis/table/gis.ogc_service.table.json

@@ -87,6 +87,12 @@
          "name": "service",
          "data": "ogc.service",
          "type": "Check"
+      },
+      {
+         "ua": "Група",
+         "name": "group_id",
+         "data": "gis.group_list",
+         "type": "Check"
       }
    ]
 }

package/module/test/cls/doc_status.json

@@ -1,32 +1,32 @@
-[
-    {
-        "id": "1",
-        "text": "Діючий",
-        "color": "#1ab394"
-    },
-    {
-        "id": "2",
-        "text": "Зупинений",
-        "color": "#ed82c8"
-    },
-    {
-        "id": "3",
-        "text": "Скасований",
-        "color": "#4a4a4a"
-    },
-    {
-        "id": "5",
-        "text": "Проектний",
-        "color": "#6495ed"
-    },
-    {
-        "id": "7",
-        "text": "Очікує розгляду",
-        "color": "#92b8ef"
-    },
-    {
-        "id": "10",
-        "text": "Архівний",
-        "color": "#d48428"
-    }
+[
+    {
+        "id": "1",
+        "text": "Діючий",
+        "color": "#1ab394"
+    },
+    {
+        "id": "2",
+        "text": "Зупинений",
+        "color": "#ed82c8"
+    },
+    {
+        "id": "3",
+        "text": "Скасований",
+        "color": "#4a4a4a"
+    },
+    {
+        "id": "5",
+        "text": "Проектний",
+        "color": "#6495ed"
+    },
+    {
+        "id": "7",
+        "text": "Очікує розгляду",
+        "color": "#92b8ef"
+    },
+    {
+        "id": "10",
+        "text": "Архівний",
+        "color": "#d48428"
+    }
 ]

package/module/test/select/core.user_uid.sql

@@ -1 +1 @@
-select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users
+select uid, coalesce(coalesce(sur_name,'')||coalesce(' '||user_name,'') ||coalesce(' '||father_name,''),login) as text from admin.users

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.17",
+  "version": "0.2.19",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -15,6 +15,8 @@
     "LICENSE"
   ],
   "scripts": {
+    "dump": "bun ./node_modules/@opengis/fastify-table/dist/script/dump.js",
+    "migrate": "MIGRATE=true bun ./node_modules/@opengis/fastify-table/dist/script/migrate.js",
     "start1": "bun server",
     "lint": "eslint src --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts",
     "fix": "eslint src --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
@@ -44,7 +46,7 @@
   },
   "devDependencies": {
     "@opengis/core": "^0.0.23",
-    "@opengis/fastify-table": "^2.0.43",
+    "@opengis/fastify-table": "^2.0.114",
     "@opengis/filter": "^0.1.25",
     "@opengis/form": "^0.0.48",
     "@opengis/table": "^0.0.27",
@@ -64,4 +66,4 @@
     "vue-router": "4.5.1",
     "vuedraggable": "^4.1.0"
   }
-}
+}

package/server/migrations/maps.sql

@@ -0,0 +1,30 @@
+create schema if not exists gis;
+
+CREATE TABLE if not exists gis.maps
+(
+    map_id text DEFAULT next_id(), -- -
+    name text , -- Назва
+    center numeric[] , -- Геометрія центру
+    zoom integer DEFAULT 10, -- Зум
+    widgets json,
+    layers text[],
+    map_key text , -- Унікальний ключ
+    description text , -- Опис
+    image text , -- Фото
+    holder text , -- Власник/Утримувач/Відповідальний
+    keywords text[] , -- Ключові слова
+    is_public boolean DEFAULT true, -- Чи публічна карта
+    srid integer DEFAULT 4326, -- Система координат
+    config jsonb , -- Опціональна конфігурація
+    created_by text , -- -
+    updated_by text , -- -
+    updated_at timestamp without time zone , -- -
+    created_at timestamp without time zone DEFAULT now(),
+    CONSTRAINT maps_pkey  PRIMARY KEY (map_id)
+);
+
+-- update gis.maps set center1=case when center is not null then array[st_x(center),st_y(center)] else null end
+alter table gis.maps add column if not exists center numeric[];
+alter table gis.maps add column if not exists zoom int;
+alter table gis.maps add column if not exists widgets json;
+alter table gis.maps add column if not exists layers text[];

package/server/routes/map/maps/get.map.js

@@ -1,7 +1,5 @@
-import path from 'node:path';
-import yaml from 'js-yaml';
 import {
-  getMeta, getTemplate, pgClients, getTemplates, getTemplateSync,
+  getMeta, getTemplate, pgClients, getTemplates, yml2json,
 } from '@opengis/fastify-table/utils.js';
 
 const table = 'gis.maps';
@@ -59,7 +57,7 @@ export default async function getMap({ params = {}, pg = pgClients.client }, rep
         const layerData = await getTemplate('layer', layer);
         const serviceData = layerData || await pg.query('select service_id as id, *, st_asgeojson(bbox)::json as bbox, st_asgeojson(center)::json as center from gis.services where service_id=$1', [layer]).then(el => el.rows?.[0]);
         Object.assign(serviceData || {}, { count: totals[serviceData?.source_path || ''] || 0 });
-        if (serviceData) { serviceData.style = typeof serviceData.style === 'object' ? serviceData.style : yaml.load(serviceData.style); }
+        if (serviceData) { serviceData.style = typeof serviceData.style === 'object' ? serviceData.style : yml2json(serviceData.style); }
         layers.push({ ...(serviceData || {}), id: layer, visible: !!serviceData });
       }));
     }

package/server/routes/map/vtile1.js

@@ -89,11 +89,11 @@ export default async function vtile({
     const { name, type: type1, sql: sql1 } = cls || getColumnCLS(table, col.data || key) || {};
     // console.log({ name, type, sql });
     if (name && type1 === 'cls') {
-      return `(select name from admin.cls where parent='${name}' and code::text=${key}::text limit 1) as "${key}_text","${key}"::text`;
+      return `(select name from admin.cls where parent='${name}' and code::text=q.${key}::text limit 1) as "${key}_text","${key}"::text`;
     }
     if (type1 === 'select' && sql1) {
       const { fields = [] } = await pg.query(`${sql1} limit 0`);
-      return `(select "${fields[1].name}" from (${sql1})s${idx} where "${fields[0].name}"::text="${key}"::text limit 1) as "${key}_text","${key}"::text`;
+      return `(select "${fields[1].name}" from (${sql1})s${idx} where "${fields[0].name}"::text=q."${key}"::text limit 1) as "${key}_text","${key}"::text`;
     }
     return `"${key}"::text`;
   }));