@opengis/gis 0.2.167 → 0.2.169

package/module/test/map/addr.json

@@ -0,0 +1,303 @@
+{
+  "history": true,
+  "height": "calc(100vh - 65px)",
+  "source_path": "data_address.street",
+  "layers": [
+    {
+      "id": "address",
+      "service": "vtile",
+      "source_path": "data_address.address",
+      "url": "/api/map-tiles/addr/{z}/{x}/{y}.pbf",
+      "title": "Адреси",
+      "visible": true,
+      "style": {
+        "type": "point",
+        "color": "orange",
+        "width": 1,
+        "border": 1,
+        "opacity": 0.6,
+        "stroke": "black",
+        "popup": {
+          "mode": "html",
+          "title": "<strong>Адреса</strong>",
+          "fields": [
+            {
+              "label": "Номер будинку",
+              "value": "addr_num"
+            }
+          ],
+          "content": "<p style='font-size: 14px; color: #000000; background: #FFFFFF; padding: 6px 10px; border-radius: 6px; margin: 0;'><b>Номер будинку:</b> {{addr_num}}</p>"
+        }
+      }
+    },
+    {
+      "id": "street",
+      "service": "vtile",
+      "source_path": "data_address.street",
+      "visible": true,
+      "url": "/api/map-tiles/addr/{z}/{x}/{y}.pbf",
+      "title": "Вулиці",
+      "style": {
+        "type": "line",
+        "color": "blue",
+        "popup": {
+          "mode": "html",
+          "title": "<strong>Вулиця</strong>",
+          "fields": [
+            {
+              "label": "Версія",
+              "value": "name"
+            }
+          ]
+        }
+      }
+    },
+    {
+      "id": "sline",
+      "service": "vtile",
+      "source_path": "data_address.address",
+      "url": "/api/map-tiles/addr/{z}/{x}/{y}.pbf",
+      "geometry_column": "geom_sline",
+      "visible": true,
+      "title": "Прив'язка адрес",
+      "style": {
+        "type": "line",
+        "color": "gray",
+        "popup": {
+          "mode": "html",
+          "title": "<strong>Прив'язка адреси</strong>",
+          "fields": [
+            {
+              "label": "Номер будинку",
+              "value": "addr_num"
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "widgets": [
+    {
+      "type": "info",
+      "position": "top-left",
+      "config": {
+        "title": "Адресний реєстр",
+        "content": "<p style='font-size: 14px; color: #34495E;'>Карта адресного реєстру відображає офіційно зареєстровані адреси на території громади або населеного пункту. До складу інформації входять дані про вулиці, будинки, типи об'єктів (житлові, комерційні, адміністративні тощо), а також структуровані компоненти адреси: назва вулиці, номер будинку, корпус, літера, тощо.</p>",
+        "goTo": [
+          {
+            "label": "Карта БП/МУО",
+            "url": "/maps/bp_myo"
+          },
+          {
+            "label": "Карта містобудівної документації",
+            "url": "/maps/mbd"
+          },
+          {
+            "label": "Основна карта",
+            "url": "/maps/main"
+          },
+          {
+            "label": "Карта тимчасових споруд",
+            "url": "/maps/ts"
+          }
+        ]
+      },
+      "visible": true
+    },
+    {
+      "type": "layers",
+      "position": "top-left",
+      "search": true,
+      "config": {
+        "layers": [
+          {
+            "id": "address",
+            "service": "vtile",
+            "url": "/api/map-tiles/addr/{z}/{x}/{y}.pbf",
+            "service_key": "address",
+            "map_key": "addr",
+            "title": "Адреси",
+            "visible": true,
+            "style": {
+              "type": "point",
+              "color": "orange",
+              "width": 1,
+              "border": 1,
+              "opacity": 0.6,
+              "stroke": "black",
+              "popup": {
+                "mode": "html",
+                "content": [
+                  "<p style='font-size: 14px; color: #000000; padding: 6px 10px; border-radius: 6px; margin: 0;'><b>Номер будинку:</b> {{addr_num}}</p>"
+                ]
+              }
+            }
+          },
+          {
+            "id": "street",
+            "service": "vtile",
+            "url": "/api/map-tiles/addr/{z}/{x}/{y}.pbf",
+            "service_key": "street",
+            "map_key": "addr",
+            "visible": true,
+            "title": "Вулиці",
+            "style": {
+              "type": "line",
+              "color": "blue",
+              "popup": {
+                "mode": "html",
+                "content": [
+                  "<p style='font-size: 14px; color: #000000; padding: 6px 10px; border-radius: 6px; margin: 0;'><b>Вулиця:</b> {{name}}</p>"
+                ]
+              }
+            },
+            "actions": [
+              {
+                "icon": "<svg width=\"18\" height=\"18\" viewBox=\"0 0 24 24\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><g clip-path=\"url(#clip0_231_103)\"><path d=\"M12 20L9 21V12.5L4.52 7.572C4.18545 7.20393 4.00005 6.7244 4 6.227V4H20V6.172C19.9999 6.70239 19.7891 7.21101 19.414 7.586L15 12\" stroke=\"#424242\" stroke-linecap=\"round\" stroke-linejoin=\"round\"></path><path d=\"M21.121 20.1209C21.5406 19.7014 21.8265 19.1668 21.9423 18.5849C22.0581 18.0029 21.9988 17.3997 21.7717 16.8514C21.5447 16.3032 21.1602 15.8346 20.6668 15.5049C20.1734 15.1752 19.5934 14.9993 19 14.9993C18.4066 14.9993 17.8266 15.1752 17.3332 15.5049C16.8398 15.8346 16.4553 16.3032 16.2283 16.8514C16.0012 17.3997 15.9419 18.0029 16.0577 18.5849C16.1735 19.1668 16.4594 19.7014 16.879 20.1209C17.297 20.5399 18.004 21.1659 19 21.9999C20.051 21.1099 20.759 20.4839 21.121 20.1209Z\" stroke=\"#424242\" stroke-linecap=\"round\" stroke-linejoin=\"round\"></path><path d=\"M19 18V18.01\" stroke=\"#424242\" stroke-linecap=\"round\" stroke-linejoin=\"round\"></path></g><defs><clipPath id=\"clip0_231_103\"><rect width=\"24\" height=\"24\" fill=\"white\"></rect></clipPath></defs></svg>",
+                "widget": "filters"
+              }
+            ]
+          },
+          {
+            "id": "sline",
+            "service": "vtile",
+            "url": "/api/map-tiles/addr/{z}/{x}/{y}.pbf",
+            "visible": true,
+            "geometry_column": "geom_sline",
+            "title": "Прив'язка адрес",
+            "noCard": true,
+            "style": {
+              "type": "line",
+              "color": "gray",
+              "popup": {
+                "mode": "html",
+                "title": "<strong>Прив'язка адреси</strong>",
+                "fields": [
+                  {
+                    "label": "Номер будинку",
+                    "value": "addr_num"
+                  }
+                ]
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "type": "card",
+      "position": "top-right",
+      "config": {
+        "title": "Інформація про об'єкт"
+      }
+    },
+    {
+      "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",
+            "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
+    },
+    {
+      "type": "legend",
+      "position": "bottom-right",
+      "config": {
+        "width": "200px",
+        "items": [
+          {
+            "label": "Адреси",
+            "color": "orange",
+            "shape": "circle"
+          },
+          {
+            "label": "Вулиці",
+            "color": "blue",
+            "shape": "line"
+          },
+          {
+            "label": "Прив'язка адрес",
+            "color": "gray",
+            "shape": "line"
+          }
+        ]
+      }
+    },
+    {
+      "id": "filters",
+      "type": "filters",
+      "position": "top-left",
+      "config": {
+        "visible": false,
+        "title": "Фільтри (Вулиці)",
+        "layer_id": "street",
+        "source_path": "data_address.street",
+        "filters": [
+          {
+            "label": "Назва вулиці",
+            "id": "name",
+            "type": "Text",
+            "inline": true
+          },
+          {
+            "label": "Тип об'єкта",
+            "id": "type",
+            "data": "str_type",
+            "type": "Autocomplete",
+            "inline": true
+          },
+          {
+            "label": "Статус",
+            "id": "status",
+            "data": "address.status",
+            "type": "Autocomplete",
+            "inline": true
+          }
+        ],
+        "conditions": {
+          "layers": [
+            "street"
+          ]
+        }
+      }
+    }
+  ],
+  "interactions": {
+    "hover": {
+      "enabled": true
+    },
+    "click": {
+      "enabled": true
+    },
+    "navigation": {
+      "enabled": true
+    }
+  },
+  "tools": [
+    "home",
+    "geolocation",
+    "length",
+    "area",
+    "print"
+  ]
+}

package/module/test/map/{addr.yml → addr1.yml}

@@ -6,7 +6,9 @@ center:
   - 48.51174
 zoom: 11
 layers:
-  - faafbea5263a  
+  - faafbea5263a
+  - 5158e1c607fb
+  - 7be6d21f512a
 widgets:
   - type: search
     position: top-left

package/module/test/select/address.str_id.sql

@@ -0,0 +1,3 @@
+select a.str_id,coalesce(b.name||' ','')||a.name
+from data_address.street a
+left join admin.cls b on code=a.type::text and b.parent='str_type'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.167",
+  "version": "0.2.169",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -43,22 +43,22 @@
   },
   "dependencies": {
     "@fortawesome/free-solid-svg-icons": "7.3.1",
-    "@mapbox/sphericalmercator": "1.2.0",
-    "carto": "0.16.3",
+    "@mapbox/sphericalmercator": "2.0.2",
+    "carto": "1.2.0",
     "sharp": "0.35.3"
   },
   "peerDependencies": {
-    "@opengis/fastify-table": "^2.3.4"
+    "@opengis/fastify-table": "^2.5.32"
   },
   "resolutions": {
     "rollup": "4.30.0"
   },
   "devDependencies": {
-    "@opengis/core": "^0.0.23",
-    "@opengis/fastify-table": "^2.4.10",
-    "@opengis/filter": "0.1.35",
-    "@opengis/form": "^0.0.133",
-    "@opengis/table": "^0.0.27",
+    "@opengis/core": "^0.0.37",
+    "@opengis/fastify-table": "^2.5.32",
+    "@opengis/filter": "0.1.52",
+    "@opengis/form": "^0.1.20",
+    "@opengis/table": "^0.0.47",
     "@vitejs/plugin-vue": "^5.2.4",
     "eslint": "^8.57.1",
     "eslint-config-airbnb": "19.0.4",
@@ -68,7 +68,7 @@
     "vue-eslint-parser": "^10.4.1",
     "lucide-vue-next": "^0.577.0",
     "sass-embedded": "1.86.3",
-    "typescript": "^5.9.3",
+    "typescript": "^7.0.2",
     "vite": "^6.4.3",
     "vue": "^3.5.38",
     "vue-router": "4.5.1",

package/plugin.js

@@ -1,14 +1,13 @@
 import fp from 'fastify-plugin';
 
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
 import {
   config, addHook, getMeta, pgClients, execMigrations,
 } from '@opengis/fastify-table/utils.js';
 
 config.prefix = config.prefix || '/api';
-import { join, dirname } from 'path';
-import { fileURLToPath } from 'url';
-import mapnikLogger from './server/routes/mapnik/controllers/mapnikLogger.js';
-import mapnikStat from './server/routes/mapnik/controllers/mapnikStat.js';
 
 const dir = dirname(fileURLToPath(import.meta.url));
 
@@ -29,16 +28,25 @@ const columnType = {
   'integer[]': 'array',
   'character varying[]': 'array',
 };
-const adminParams = { config: { policy: 'L1', role: 'admin' }, package: 'gis' };
+
 async function plugin(app, opts = config) {
-  // API
-  app.register(import('./server/routes/map/index.mjs'), opts);
+  // plugins
   app.register(import('./server/plugins/crons.js'), opts);
-  app.register(import('./server/routes/gis/index.mjs'), opts);
-  app.register(import('./server/routes/permissions/index.mjs'), opts);
-  app.register(import('./server/routes/mapnik/index.js'), opts);
-  app.get('/logger-gis/stat', adminParams, mapnikStat);
-  app.get('/logger-gis/*', adminParams, mapnikLogger);
+
+  // routes
+  app.register(import('./server/routes/gis/gis.route.js'), opts);
+  app.register(import('./server/routes/cartocss/cartocss.route.js'), opts);
+  app.register(import('./server/routes/map/map.route.js'), opts);
+  app.register(import('./server/routes/mapnik/mapnik.route.js'), opts);
+  app.register(import('./server/routes/mapnik.prefixless/mapnik.prefixless.route.js')); // no /api prefix applied
+  app.register(import('./server/routes/maps/maps.route.js'), opts);
+  app.register(import('./server/routes/metadata/metadata.route.js'), opts);
+  app.register(import('./server/routes/ogc/ogc.route.js'), opts);
+  app.register(import('./server/routes/permissions/permissions.route.js'), opts);
+  app.register(import('./server/routes/registers/registers.route.js'), opts);
+  app.register(import('./server/routes/services/services.route.js'), opts);
+  app.register(import('./server/routes/widgets/widgets.route.js'), opts);
+
 
   addHook('afterData', async ({
     pg = pgClients.client, payload, id, template,
@@ -50,6 +58,7 @@ async function plugin(app, opts = config) {
     const { columns = [] } = await getMeta({ table, pg });
     // payload.rows[0].token = payload.tokens?.edit; // token with ignore filtering of payload keys check
     Object.assign(payload, { fields: columns?.map?.(({ name, title, dataTypeID }) => ({ name, title: title || name, type: columnType[pg?.pgType?.[dataTypeID] || 'text'] })).filter(el => el.type) });
+    return null;
   });
 }
 export default fp(plugin);

package/server/plugins/mapnik/funcs/checkRasterFile.js

@@ -20,9 +20,7 @@ function sequence(arr, fn) {
 
 const unsafe = true;
 
-export default async function checkRasterFile({ rows, reply, nocache }) {
-    const callback = reply ? eventStream(reply) : () => { };
-
+export default async function checkRasterFile({ rows, callback = () => { }, nocache }) {
     let
         createdCount = 0,
         existsCount = 0,

package/server/routes/cartocss/cartocss.route.js

@@ -0,0 +1,31 @@
+import getCartocss from './functions/get.cartocss.js';
+import addCartocss from './functions/add.cartocss.js';
+
+import {
+    getCartocssSchema,
+    addCartocssSchema,
+} from './cartocss.schema.js';
+
+const privateParams = { config: { policy: 'L1', package: 'gis' } };
+const publicParams = { config: { policy: 'L0', package: 'gis' } };
+
+async function route(app) {
+    app.get('/gis-css/:id', { ...publicParams, schema: getCartocssSchema }, async ({ params, query, user, pg }) => {
+        const result = await getCartocss({
+            id: params.id,
+            sql: query.sql,
+            nocache: query.nocache,
+            isAdmin: user?.user_type?.includes?.('admin')
+        }, pg);
+        return result;
+    });
+    app.post('/gis-css/:id', { ...privateParams, schema: addCartocssSchema }, async ({ params, body, user, pg }) => {
+        const result = await addCartocss({
+            id: params.id,
+            body,
+            uid: user?.uid,
+        }, pg);
+        return result;
+    });
+}
+export default route;

package/server/routes/cartocss/cartocss.route.test.js

@@ -0,0 +1,79 @@
+import { afterAll, beforeAll, describe, expect, test } from 'vitest';
+
+import { getPGAsync } from '@opengis/fastify-table/utils.js';
+
+import { build, injectWithHeaders } from '../../../test/helper.js';
+
+const user = { id: '2', type: 'admin' };
+
+let pg;
+
+beforeAll(async () => {
+    await build();
+
+    pg = await getPGAsync();
+
+    await cleanUp('before');
+});
+
+afterAll(async () => {
+    await cleanUp('after');
+});
+
+const testId = 'testCss';
+
+const cleanUp = async (when) => {
+    if (!pg) return;
+    const rowCount = await pg.query('delete from gis.cartocss where cartocss_id=$1', [testId]).then(r => r.rowCount || 0);
+    const rowCount3 = await pg.query('delete from gis.metadata where metadata_id=$1', [testId]).then(r => r.rowCount || 0);
+    console.log(`clean up finished: ${when}`, rowCount, rowCount3);
+};
+
+describe('cartocss api', () => {
+    test('POST /gis-css/:id returns 200', async () => {
+        const payload = {
+            source_path: 'test',
+            config: { test: 1 },
+            style: '#test { color: red; }'
+        };
+
+        await pg.query('insert into gis.cartocss(cartocss_id,name) values($1,$2)', [testId, 'unit-test']).catch(err => console.error(err));
+        const res = await injectWithHeaders({
+            method: 'POST',
+            url: `/api/gis-css/${testId}`,
+            payload,
+            headers: { uid: user.id, user_type: user.type }
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toHaveProperty('message');
+        expect(res.body).toHaveProperty('code');
+    });
+
+    test('POST /gis-metadata/:type/:id returns 200', async () => {
+        const res = await injectWithHeaders({
+            method: 'POST',
+            url: `/api/gis-metadata/css/${testId}`,
+            payload: {
+                layer_id: testId
+            },
+            headers: { uid: user.id, user_type: user.type }
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toHaveProperty('metadata_id');
+        expect(res.body.metadata_id).toBe(testId);
+    });
+
+    test('GET /gis-css/:id returns 200', async () => {
+        const res = await injectWithHeaders({
+            url: `/api/gis-css/${testId}`,
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toHaveProperty('source_path');
+        expect(res.body).toHaveProperty('cartocss_id');
+        expect(res.body).toHaveProperty('cartocss_key');
+        expect(res.body).toHaveProperty('url');
+    });
+});

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

@@ -0,0 +1,73 @@
+const geometrySchema = {
+
+    type: "object",
+    required: ["type", "coordinates"],
+    properties: {
+        type: {
+            enum: [
+                "Point",
+                "LineString",
+                "Polygon",
+                "MultiPoint",
+                "MultiLineString",
+                "MultiPolygon",
+            ],
+        },
+        coordinates: {
+            type: "array",
+        },
+    },
+
+};
+
+const cssBodySchema = {
+    type: "object",
+    additionalProperties: true,
+
+    properties: {
+        id: { type: "string", pattern: '^([\\d\\w]+)$' },
+        name: { type: "string" },
+        group_id: { type: "string" },
+        cartocss_key: { type: "string" },
+        source_path: { type: "string" },
+        description: { type: ["string", "null"] },
+        card_table: { type: "string" },
+        card_columns: { type: "string" },
+        card_html: { type: "string" },
+        is_public: { type: "boolean" },
+        is_static: { type: "boolean" },
+        enabled: { type: "boolean" },
+        geom: geometrySchema,
+    },
+};
+
+export const getCartocssSchema = {
+    params: {
+        type: 'object',
+        required: ['id'],
+        properties: {
+            id: { type: 'string', pattern: '^([\\d\\w]+)$' }
+        }
+    },
+    querystring: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+            nocache: { type: 'number', enum: [1] },
+            sql: { type: 'number', enum: [1] },
+        }
+    }
+};
+
+export const addCartocssSchema = {
+    params: {
+        type: 'object',
+        required: ['id'],
+        properties: {
+            id: { type: 'string', pattern: '^([\\d\\w]+)$' }
+        }
+    },
+    body: cssBodySchema,
+};
+
+export default null;

package/server/routes/{gis/cartocss → cartocss/functions}/add.cartocss.js

@@ -1,16 +1,13 @@
 import { pgClients, dataUpdate } from '@opengis/fastify-table/utils.js';
 
 import uploadXML from '../../mapnik/functions/uploadXML.js';
+import { NotFoundError } from '@opengis/fastify-table/errors.js';
 
-export default async function addCartocss(req, reply) {
-  const {
-    pg = pgClients.client, body, params, user,
-  } = req;
-
-  const cartocss = await pg.query('select cartocss_id, source_path, config, style from gis.cartocss where cartocss_id=$1', [params.id]).then(el => el.rows?.[0]);
+export default async function addCartocss({ id, body, uid }, pg = pgClients.client) {
+  const cartocss = await pg.query('select cartocss_id, source_path, config, style from gis.cartocss where cartocss_id=$1', [id]).then(el => el.rows?.[0]);
 
   if (!cartocss) {
-    return reply.status(404).send({ error: 'cartocss not found', code: 404 });
+    throw NotFoundError('cartocss not found');
   }
 
   const sourcePath = body.source_path || cartocss.source_path;
@@ -22,21 +19,21 @@ export default async function addCartocss(req, reply) {
 
   await dataUpdate({
     pg,
-    id: params.id,
+    id,
     table: 'gis.cartocss',
     data,
-    uid: user?.uid,
+    uid,
   });
 
   // if not from static xml file
   if (!data.source_path) {
     await uploadXML({
-      id: params.id,
+      id,
       dataset: config,
       style,
       source_path: sourcePath,
     }, pg);
   }
 
-  return reply.status(200).send({ message: 'cartocss updated', code: 200 });
+  return { message: 'cartocss updated', code: 200 };
 }