@opengis/gis 0.1.82 → 0.2.0

package/module/test/map/ts.json

@@ -1,152 +1,43 @@
 {
   "history": true,
-  "height": "calc(100vh - 65px)",
-  "source_path": "ts.temp_structure",
+  "height": "calc(100vh - 65px)",  
+  "center": [    
+    34.65450,
+    48.51174    
+  ],
+  "zoom": 11,
+  "layers": ["ed67980cd690"],
   "widgets": [
     {
       "type": "info",
       "position": "top-left",
       "config": {
         "title": "Тимчасові споруди",
-        "content": "<p style='font-size: 14px; color: #34495E;'>Інформація про тимчасові споруди встановлені на території м. Кам'янське</p>",
-        "goTo": [
-          {
-            "label": "Карта адресного реєстру",
-            "url": "/map/addr"
-          },
-          {
-            "label": "Карта БП/МУО",
-            "url": "/map/bp_myo"
-          },
-          {
-            "label": "Карта містобудівної документації",
-            "url": "/map/mbd"
-          },
-          {
-            "label": "Основна карта",
-            "url": "/map/main"
-          }
-        ]
+        "content": "<p style='font-size: 14px; color: #34495E;'>Інформація про тимчасові споруди встановлені на території м. Кам'янське</p>"        
       }
     },
     {
-      "type": "attribute",
+      "type": "dataset",
       "position": "top-left",
       "config": {
-        "layer": {
-          "id": "temp_structure",
-          "service": "vtile",
-          "service_key": "ts",
-          "map_key": "ts",
-          "visible": true,
-          "url": "/api/vtile/ts.temp_structure/ua/{z}/{x}/{y}.vmt",
-          "style": {
-            "type": "polygon",
-            "attrType": "icon-by-attribute",
-            "attribute": "temp_structure_status",
-            "default_icon": "pin6-l-fa-question+4767e6.png",
-            "icon_base_url": "https://data.softpro.ua/api-user/markerIcon/",
-            "icon_size": 1,
-            "iconZoom": 14,
-            "pointZoom": 14,
-            "icon_anchor": "bottom",
-            "rules": [
-              {
-                "value": "1",
-                "label": "Діючий",
-                "color": "#28a745",
-                "icon": "pin6-l-fa-check+28a745.png"
-              },
-              {
-                "value": "2",
-                "label": "Анульований",
-                "color": "#dc3545",
-                "icon": "pin6-l-fa-exclamation+dc3545.png"
-              },
-              {
-                "value": "3",
-                "label": "Призупинений",
-                "color": "#ffc107",
-                "icon": "pin6-l-ty-lock-closed-outline+ffc107.png"
-              },
-              {
-                "value": "4",
-                "label": "Завершився термін дії",
-                "color": "purple",
-                "icon": "pin6-l-fa-clock-o+800080.png"
-              }
-            ],
-            "popup": {
-              "mode": "html",
-              "title": "<strong>Тимчасова споруда</strong>",
-              "fields": [
-                {
-                  "label": "Назва",
-                  "value": "name"
-                },
-                {
-                  "label": "Кадастровий номер ЗД",
-                  "value": "cad_num"
-                },
-                {
-                  "label": "Площа тимчасової споруди, м. кв.",
-                  "value": "area"
-                }
-              ]
-            }
-          }
-        }
+        "layer":"ed67980cd690",
+        "attribute":"status"
       }
     },
-    {
-      "type": "card",
-      "position": "top-right",
-      "config": {
-        "title": "Інформація про об'єкт"
-      }
+     {
+      "type": "layers",
+      "visible":false      
+    },
+     {
+      "type": "legend",
+      "position":"bottom-right"      
     },
     {
       "type": "basemaps",
       "position": "bottom-left",
-      "title": "Базові карти",
-      "config": {
-        "default": "voyager",
-        "layers": [
-          {
-            "id": "voyager",
-            "title": "Базова карта (voyager)",
-            "url": "https://data.gki.com.ua/api-user/rtile/voyager/ua/{z}/{x}/{y}.png",
-            "service": "raster",
-            "map_key": "ts",
-            "service_key": "ts",
-            "attribution": "&copy; <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap</a>, &copy; <a href='https://carto.com/attributions'>CARTO</a>",
-            "image": "https://data.gki.com.ua/api-user/rtile/voyager/ua/12/2422/1400.png",
-            "owner": "OSM",
-            "basemap": true
-          },
-          {
-            "id": "esri",
-            "title": "ESRI Online Imagery(2022-2023)",
-            "url": "https://server.arcgisonline.com/arcgis/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}.png",
-            "service": "raster",
-            "image": "https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/7/47/69.png"
-          }
-        ]
-      },
-      "visible": true
-    }
-  ],
-  "interactions": {
-    "hover": {
-      "enabled": true
-    },
-    "navigation": {
-      "enabled": true
-    },
-    "click": {
-      "enabled": true
+      "title": "Базові карти"      
     }
-  },
+  ],  
   "tools": [
     "home",
     "geolocation",

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,61 +1,61 @@
-{
-  "name": "@opengis/gis",
-  "version": "0.1.82",
-  "type": "module",
-  "author": "Softpro",
-  "main": "./dist/index.js",
-  "files": [
-    "dist/*",
-    "module/*",
-    "server/*",
-    "plugin.js",
-    "utils.js",
-    "config.js",
-    "README.md",
-    "LICENSE"
-  ],
-  "scripts": {
-    "patch": "npm version patch && git push && npm publish",
-    "dev": "node server",
-    "front": "vite dev",
-    "build-lib": "vite build",
-    "build:admin": "vite build admin",
-    "build": "vite build",
-    "preview": "vite preview",
-    "prod": "NODE_ENV=production  node server",
-    "docs:install": "npm install --prefix ./docs",
-    "docs:dev": "npm run --prefix ./docs docs:dev",
-    "docs:build": "npm run --prefix ./docs docs:build",
-    "docs:preview": "npm run --prefix ./docs docs:preview",
-    "prepublishOnly": "npm run build"
-  },
-  "dependencies": {
-    "@mapbox/sphericalmercator": "1.2.0",
-    "carto": "0.16.3"
-  },
-  "peerDependencies": {
-    "@opengis/fastify-table": "^2.0.13"
-  },
-  "resolutions": {
-    "rollup": "4.30.0"
-  },
-  "devDependencies": {
-    "yaml": "2.8.1",
-    "@opengis/form": "^0.0.28",
-    "@opengis/core": "^0.0.23",
-    "@opengis/fastify-table": "^2.0.13",
-    "@opengis/filter": "^0.1.7",
-    "@vitejs/plugin-vue": "^5.2.3",
-    "axios": "^1.11.0",
-    "eslint": "8.49.0",
-    "eslint-config-airbnb": "19.0.4",
-    "lucide-vue-next": "^0.514.0",
-    "sass-embedded": "1.86.3",
-    "vite": "^6.3.5",
-    "vue": "^3.5.13",
-    "vue-router": "4.5.1",
-    "vuedraggable": "^4.1.0",
-    "typescript": "^5.9.2",
-    "@opengis/table": "^0.0.27"
-  }
-}
+{
+  "name": "@opengis/gis",
+  "version": "0.2.0",
+  "type": "module",
+  "author": "Softpro",
+  "main": "./dist/index.js",
+  "files": [
+    "dist/*",
+    "module/*",
+    "server/*",
+    "plugin.js",
+    "utils.js",
+    "config.js",
+    "README.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "start1": "bun server",
+    "patch": "npm version patch && git push && npm publish",
+    "dev": "bun --hot server",
+    "front": "vite dev",
+    "build-lib": "vite build",
+    "build:admin": "vite build admin",
+    "build": "vite build",
+    "preview": "vite preview",
+    "prod": "NODE_ENV=production  node server",
+    "docs:install": "npm install --prefix ./docs",
+    "docs:dev": "npm run --prefix ./docs docs:dev",
+    "docs:build": "npm run --prefix ./docs docs:build",
+    "docs:preview": "npm run --prefix ./docs docs:preview",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    "@mapbox/sphericalmercator": "1.2.0",
+    "carto": "0.16.3"
+  },
+  "peerDependencies": {
+    "@opengis/fastify-table": "^2.0.13"
+  },
+  "resolutions": {
+    "rollup": "4.30.0"
+  },
+  "devDependencies": {
+    "@opengis/core": "^0.0.23",
+    "@opengis/fastify-table": "^2.0.13",
+    "@opengis/filter": "^0.1.7",
+    "@opengis/form": "^0.0.28",
+    "@opengis/table": "^0.0.27",
+    "@vitejs/plugin-vue": "^5.2.3",
+    "axios": "^1.11.0",
+    "eslint": "8.49.0",
+    "eslint-config-airbnb": "19.0.4",
+    "lucide-vue-next": "^0.514.0",
+    "sass-embedded": "1.86.3",
+    "typescript": "^5.9.2",
+    "vite": "^6.3.5",
+    "vue": "^3.5.13",
+    "vue-router": "4.5.1",
+    "vuedraggable": "^4.1.0"
+  }
+}

package/server/migrations/widgets.sql

@@ -0,0 +1,21 @@
+create schema if not exists gis;
+
+CREATE TABLE if not exists gis.widgets
+(
+  widget_id text NOT NULL DEFAULT next_id(),
+  map_id text NOT NULL,
+  name text,
+  type text NOT NULL,
+  title text,
+  position text,
+  config jsonb,
+  created_by text NOT NULL,
+  updated_by text,
+  updated_at timestamp without time zone,
+  created_at timestamp without time zone NOT NULL DEFAULT now(),
+  CONSTRAINT widgets_pkey PRIMARY KEY (widget_id),
+  CONSTRAINT widgets_map_id_fkey FOREIGN KEY (map_id)
+      REFERENCES gis.maps (map_id)
+);
+
+COMMENT ON TABLE gis.widgets IS 'Map widgets';

package/server/routes/gis/index.mjs

@@ -15,6 +15,7 @@ import addService from './services/add.service.js';
 import addGisRegistry from './registers/add.registry.js';
 import deleteGisRegistry from './registers/del.registry.js';
 import getServicesCol from './services/get.services.col.js';
+import legendAuto from './services/legend.auto.js';
 
 async function route(app) {
   app.put('/insert-columns/:token', insertColumns);
@@ -38,6 +39,7 @@ async function route(app) {
   app.post('/gis-service/:id?', { config: { policy: ['public'] } }, addService);
   app.put('/gis-service/:id', { config: { policy: ['public'] } }, addService);
   app.delete('/gis-service/:id', { config: { policy: ['public'] } }, deleteService);
+  app.get('/legend-auto/:id', { config: { policy: ['public'] } }, legendAuto);
 }
 
 export default route;

package/server/routes/gis/services/get.services.js

@@ -13,9 +13,7 @@ const columnType = {
 };
 
 export default async function getServices({ params = {}, pg = pgClients.client }, reply) {
-    const { columns = [] } = await getMeta({ pg, table }) || {};
 
-    const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
 
     const rows = await pg.query(`
         SELECT 
@@ -31,6 +29,10 @@ export default async function getServices({ params = {}, pg = pgClients.client }
         Object.assign(rows[0], { html });
     }
 
+    const { columns = [] } = await getMeta({ pg, table: rows[0].source_path }) || {};
+
+    const fields = columns.map(({ name, dataTypeID, title }) => ({ name, type: columnType[pg.pgType?.[dataTypeID] || 'text'], label: title || name }));
+
     const noCenterIds = rows.filter(row => !row.center && row.bbox).map(row => row.service_id);
 
     const centers = noCenterIds.length ? await pg.query(`SELECT json_object_agg(service_id, st_pointonsurface(bbox)::json) FROM gis.services where service_id=any($1)`, [noCenterIds].filter(Boolean)).then(el => el.rows?.[0]?.json_object_agg || {}) : {};

package/server/routes/gis/services/legend.auto.js

@@ -0,0 +1,78 @@
+import { dataUpdate, getMeta, getSelectVal, yml2json } from "@opengis/fastify-table/utils.js";
+
+export default async function legendAuto({ params = {}, query = {}, user = {}, pg = pgClients.client }, reply) {
+    if (!params.id) {
+        return reply.status(400).send({ error: "not enough params: id", code: 400 });
+    }
+
+    const service = await pg.query(`SELECT source_path as table, style, legend as dblegend FROM gis.services where service_id=$1`, [params.id]).then(el => el.rows?.[0]);
+
+    if (!service) {
+        return reply.status(404).send({ error: "Service not found", code: 404 });
+    }
+
+    const { style, dblegend, table } = service;
+
+    if (!table) {
+        return reply.status(400).send({ error: "service table not specified", code: 400 });
+    }
+
+    if (dblegend && !query.nocache) {
+        return reply.status(400).send({ error: "legend already exists", code: 400 });
+    }
+
+    if (!style) {
+        return reply.status(400).send({ error: "empty service style", code: 400 });
+    }
+
+    const { colorAttr, iconAttr } = yml2json(style);
+
+    if (!colorAttr && !iconAttr) {
+        return reply.status(400).send({ error: "colorAttr / iconAttr not specified", code: 400 });
+    }
+
+    const { columns = [] } = await getMeta({ pg, table });
+
+    const attr = columns.find(col => col.name === (colorAttr || iconAttr));
+
+    if (!attr?.name) {
+        return reply.status(404).send({ error: "attribute column not found", code: 404 });
+    }
+
+    const values = await pg.query(`select array_agg(distinct "${attr.name}") from ${table}`).then(el => el.rows?.[0]?.array_agg || []);
+    const arr = await getSelectVal({ pg, name: `${table}.${attr.name}`, table, values, ar: true });
+
+    const colors = {
+        1: "#FFCF1F1F",
+        2: "#FF1FCF2D",
+        3: "#FF1F77CF"
+    };
+
+    const colorKeys = Object.keys(colors).map(Number);
+
+    const legend = arr
+        ? arr.map((el, idx) => ({
+            name: el.id,
+            label: el.text,
+            icon: iconAttr ? el.icon : undefined,
+            color: colorAttr ? (el.color || colors[colorKeys[idx % colorKeys.length]]) : undefined,
+        }))
+        : values.map((el, idx) => ({
+            name: el,
+            label: el,
+            icon: undefined,
+            color: colorAttr ? (colors[colorKeys[idx % colorKeys.length]]) : undefined,
+        }));
+
+    const res = await dataUpdate({
+        pg,
+        table: 'gis.services',
+        id: params.id,
+        data: {
+            legend
+        },
+        uid: user.uid,
+    });
+
+    return reply.status(200).send(res);
+}

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

@@ -84,22 +84,21 @@ export default async function mapFormat(req, reply) {
         if (excluded.includes(col.name)) continue;
         if (col.hidden_card === true) continue;
 
-        const name = col.ua || col.name;
+        const name =  col.label || col.ua || col.name;
         let value;
         value = fullRow[`${col.name}_data`]?.text
             || fullRow[`${col.name}_text`]
-            || fullRow[col.name]
-            || '-';
+            || fullRow[col.name]            ;
 
         if (col.format === 'date' && fullRow[col.name]) {
             // const dt = formatDate(fullRow[col.name], { hash: { format: 'dd.mm.yy' } });
             const dt = await handlebars.compile(`{{formatDate "${fullRow[col.name]}"}}`)({ format: 'dd.mm.yy' });
             value = dt;
         }
-
+        if (!value) continue;
         result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 even:bg-gray-50 text-[12px]">
             <dt class="text-gray-900">${name}</dt>
-            <dd class="text-gray-700 sm:col-span-2">${value}</dd>
+            <dd class="text-gray-700 sm:col-span-2">${value|| '-'}</dd>
         </div>`);
     }
 

package/server/routes/map/index.mjs

@@ -13,10 +13,18 @@ import mapFormat from './controllers/mapFormat.js';
 import maps from './controllers/maps.js';
 import markerIconApi from './controllers/marker_icon.js';
 
+import getMap from './maps/get.map.js';
+import addMap from './maps/add.map.js';
+import delMap from './maps/del.map.js';
+
+import getWidget from './widgets/get.widget.js';
+import addWidget from './widgets/add.widget.js';
+import delWidget from './widgets/del.widget.js';
+
 const schemaInfo = {
   type: 'object',
   properties: {
-    params: {
+    publicParams: {
       slug: {
         type: 'string',
       },
@@ -37,31 +45,42 @@ const schemaInfo = {
   },
 };
 
-const policy = ['public'];
+const publicParams = { config: { policy: 'L0' }, schema: schemaInfo }; // * L0 === public
+const privilegedParams = { config: { policy: 'L1', role: 'admin' }, schema: schemaInfo }; // ? just auth or admin
 
 export default async function route(app) {
-  app.get('/maps', { config: { policy }, schema: schemaInfo }, maps);
-  app.get('/map/:slug', { config: { policy }, schema: schemaInfo }, map);
-  app.get('/map-tiles/:slug/:z/:y/:x', { config: { policy }, schema: schemaInfo }, mapTiles);
-  app.get('/map-features/:slug/:id', { config: { policy }, schema: schemaInfo }, mapFeatures);
-  app.get('/map-features-point/:slug', { config: { policy }, schema: schemaInfo }, mapFeatures);
+  app.get('/gis-map/:id?', publicParams, getMap);
+  app.post('/gis-map/:id?', privilegedParams, addMap);
+  app.put('/gis-map/:id', privilegedParams, addMap);
+  app.delete('/gis-map/:id', privilegedParams, delMap);
+
+  app.get('/gis-widget/:map/:id?', publicParams, getWidget);
+  app.post('/gis-widget/:map/:id?', privilegedParams, addWidget);
+  app.put('/gis-widget/:map/:id', privilegedParams, addWidget);
+  app.delete('/gis-widget/:map/:id', privilegedParams, delWidget);
+
+  app.get('/maps', publicParams, maps);
+  app.get('/map/:slug', publicParams, map);
+  app.get('/map-tiles/:slug/:z/:y/:x', publicParams, mapTiles);
+  app.get('/map-features/:slug/:id', publicParams, mapFeatures);
+  app.get('/map-features-point/:slug', publicParams, mapFeatures);
 
-  app.get('/map-catalog', { config: { policy }, schema: schemaInfo }, mapCatalog);
-  app.get('/map-catalog/:service/:attr', { config: { policy }, schema: schemaInfo }, mapCatalogAttribute);
-  app.get('/layer-rtile/:id/:z/:y/:x', { config: { policy }, schema: {} }, rtile);
-  app.get('/layer-vtile/:id/:z/:y/:x', { config: { policy }, schema: schemaInfo }, vtile);
+  app.get('/map-catalog', publicParams, mapCatalog);
+  app.get('/map-catalog/:service/:attr', publicParams, mapCatalogAttribute);
+  app.get('/layer-rtile/:id/:z/:y/:x', publicParams, rtile);
+  app.get('/layer-vtile/:id/:z/:y/:x', publicParams, vtile);
 
   if (!app.hasRoute({ method: 'GET', url: '/api/vtile/:layer/:lang/:z/:y/:x', })) {
     console.log("\x1b[34m%s\x1b[0m", 'add vtile from gis');
-    app.get('/vtile/:layer/:lang/:z/:y/:x', { config: { policy }, schema: schemaInfo }, vtile1);
+    app.get('/vtile/:layer/:lang/:z/:y/:x', publicParams, vtile1);
   }
   if (!app.hasRoute({ method: 'GET', url: '/api/gis-layer-list', })) {
     console.log("\x1b[34m%s\x1b[0m", 'add gis-layer-list from gis');
-    app.get('/gis-layer-list', { config: { policy }, }, layerList);
+    app.get('/gis-layer-list', publicParams, layerList);
   }
 
-  app.get('/gis-icon/*', { config: { policy }, schema: {} }, markerIconApi);
-  app.get('/icon/*', { config: { policy }, schema: {} }, markerIconApi);
-  app.get('/marker-icon/*', { config: { policy }, schema: {} }, markerIconApi);
-  app.get('/map-format', { config: { policy }, schema: {} }, mapFormat);
+  app.get('/gis-icon/*', publicParams, markerIconApi);
+  app.get('/icon/*', publicParams, markerIconApi);
+  app.get('/marker-icon/*', publicParams, markerIconApi);
+  app.get('/map-format', publicParams, mapFormat);
 }

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

@@ -0,0 +1,42 @@
+import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
+export default async function addMap({
+    method, params = {}, body, pg = pgClients.client, user = {},
+}, reply) {
+    const { uid } = user;
+
+    if (!uid) {
+        return reply.status(401).send('unauthorized');
+    }
+
+    if (method === 'POST') {
+        if (!body?.name) {
+            return reply.status(400).send('not enough body params: name');
+        }
+
+        if (!body?.map_key) {
+            return reply.status(400).send('not enough body params: map_key');
+        }
+
+        const { rows = [] } = await dataInsert({
+            pg,
+            id: params.id,
+            table: 'gis.maps',
+            data: body,
+            uid,
+        });
+        return reply.status(200).send(rows[0]);
+    }
+
+    if (!params.id) {
+        return reply.status(400).send('not enough params: id');
+    }
+
+    const row = await dataUpdate({
+        pg,
+        id: params.id,
+        table: 'gis.maps',
+        data: body,
+        uid,
+    });
+    return reply.status(200).send(row);
+}

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

@@ -0,0 +1,19 @@
+import { dataDelete, pgClients } from "@opengis/fastify-table/utils.js";
+
+export default async function delMap({
+    params = {}, pg = pgClients.client, user = {},
+}, reply) {
+    const { uid } = user;
+
+    if (!uid) {
+        return reply.status(401).send('unauthorized');
+    }
+
+    const row = await dataDelete({
+        pg,
+        id: params.id,
+        table: 'gis.maps',
+        uid,
+    });
+    return reply.status(200).send(row);
+}