@opengis/gis 0.1.82 → 0.2.1

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/address_id.json

@@ -0,0 +1,3 @@
+{
+    "extra": true
+}

package/module/test/select/address_id.sql

@@ -0,0 +1,8 @@
+SELECT addr_id,
+coalesce(c.name , ' ')  || ' ' ||  (select name from data_address.street where str_id=a.parent limit 1) || 
+coalesce(', ' ||addr_num,'')
+FROM data_address.address a 
+left join data_address.street b on a.parent=b.str_id
+left join admin.cls c on c.parent='str_type' and c.code=b.type::text
+order by
+b.name

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/module/test/table/data_bp_myo.bp.table.json

@@ -0,0 +1,123 @@
+{
+  "key": "bp_id",
+  "table": "data_bp_myo.bp",
+  "actions": [
+    "add",
+    "edit",
+    "del"
+  ],
+  "controls": [
+    "search",
+    "list",
+    "add"
+  ],
+  "access": "user",
+  "order": "cdate desc",
+  "meta": {
+    "title": "bp_code",
+    "search": "bp_code,bp_number,bp_reg_num,bp_issued_name,bp_customer_name,bp_object_name"
+  },
+  "title": "Будівельні паспорти",
+  "form": "data_bp_myo.bp.form",
+  "columns": [
+    {
+      "ua": "Реєстраційний номер МБК",
+      "name": "bp_number",
+      "width": 100,
+      "format": "text"
+    },
+    {
+      "ua": "Реєстраційний номер в ЄДЕССБ",
+      "meta": "title",
+      "name": "bp_code",
+      "hidden": true,
+      "format": "text"
+    },
+    {
+      "ua": "Реєстраційний номер",
+      "name": "bp_reg_num",
+      "width": 100,
+      "format": "text"
+    },
+    {
+      "ua": "Назва об’єкта будівництва",
+      "name": "bp_object_name",
+      "width": 300,
+      "format": "text"
+    },
+    {
+      "ua": "Адреса",
+      "name": "address",
+      "width": 300,
+      "format": "text"
+    },
+    {
+      "ua": "Вид будівництва",
+      "name": "bp_build_type",
+      "data": "bp_build_type",
+      "width": 150,
+      "format": "badge"
+    },
+    {
+      "ua": "Дата видачі",
+      "name": "bp_issued_date",
+      "width": 100,
+      "format": "date"
+    },
+    {
+      "ua": "Статус реєстрації",
+      "name": "bp_doc_status",
+      "data": "doc_status",
+      "width": 150,
+      "hidden": true,
+      "format": "badge"
+    },
+    {
+      "ua": "Назва органу, що видав",
+      "name": "bp_issued_name",
+      "width": 300,
+      "hidden": true,
+      "format": "text"
+    },
+    {
+      "ua": "Замовник",
+      "name": "bp_customer_name",
+      "width": 300,
+      "format": "text"
+    },
+    {
+      "ua": "Кадастрові номери",
+      "name": "land_number",
+      "format": "slot",
+      "hidden": true,
+      "slot": {
+        "content": "<p v-for=\"item in data?.land_number\">{{item}}</p>"
+      }
+    },
+    {
+      "ua": "Версія документу",
+      "name": "obj_version",
+      "format": "text",
+      "hidden": true
+    }
+  ],
+  "filterList": [
+    {
+      "ua": "Вид будівництва",
+      "name": "bp_build_type",
+      "data": "bp_build_type",
+      "type": "Check"
+    },
+    {
+      "ua": "Дата видачі",
+      "name": "bp_issued_date",
+      "type": "Date"
+    },
+    {
+      "ua": "Статус документа",
+      "name": "bp_doc_status",
+      "data": "doc_status",
+      "type": "Check"
+    }
+  ]
+}

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.1",
+  "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.23"
+  },
+  "resolutions": {
+    "rollup": "4.30.0"
+  },
+  "devDependencies": {
+    "@opengis/core": "^0.0.23",
+    "@opengis/fastify-table": "^2.0.23",
+    "@opengis/filter": "^0.1.7",
+    "@opengis/form": "^0.0.42",
+    "@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/ogc.sql

@@ -0,0 +1,107 @@
+CREATE TABLE if not exists gis.ogc_service
+(
+  ogc_service_id text NOT NULL DEFAULT admin.next_id(),
+  name text, -- Назва
+  service text, -- TMS/WMS/WFS
+  url text, -- Шлях
+  enabled boolean, -- Опис
+  geom geometry, -- Баунд
+  updated_by text,
+  updated_at timestamp without time zone,
+  created_at timestamp without time zone DEFAULT date_trunc('minutes'::text, now()),
+  created_by text,
+  group_id text, -- Ідентифікатор групи
+  ispublic boolean DEFAULT false, -- Чи є сервіс публічним
+  service_id text DEFAULT admin.next_id(), -- ID
+  srid text, -- srid
+  info text,
+  scheme text, -- Схема
+  category text, -- Категорія
+  attribution text, -- Атрибуція
+  editor_id text,
+  editor_date timestamp without time zone,
+  cdate timestamp without time zone DEFAULT date_trunc('minutes'::text, now()),
+  uid text,
+  files json,
+  access_level text DEFAULT 'public'::text, -- Рівень доступу (public, user, admin)
+  sub_layers text, -- Під шари (Для WMS)
+  isadmin boolean DEFAULT false, -- Ознака доступу лише для адмін частини порталу
+  user_group_id text, -- Група користувачів
+  url_list text[], -- URL List
+  table_name text, -- Таблиця на клік (інтерактивний шар)
+  setting json, -- Додаткові налаштування
+  CONSTRAINT ogc_service_pkey PRIMARY KEY (ogc_service_id),
+  CONSTRAINT gis_ogc_service_group_id_fkey FOREIGN KEY (group_id)
+      REFERENCES gis.group_list (group_id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION
+);
+
+COMMENT ON TABLE gis.ogc_service IS 'Сервіси';
+
+COMMENT ON COLUMN gis.ogc_service.name IS 'Назва';
+COMMENT ON COLUMN gis.ogc_service.service IS 'TMS/WMS/WFS';
+COMMENT ON COLUMN gis.ogc_service.url IS 'Шлях';
+COMMENT ON COLUMN gis.ogc_service.enabled IS 'Опис';
+COMMENT ON COLUMN gis.ogc_service.geom IS 'Баунд';
+COMMENT ON COLUMN gis.ogc_service.group_id IS 'Ідентифікатор групи';
+COMMENT ON COLUMN gis.ogc_service.ispublic IS 'Чи є сервіс публічним';
+COMMENT ON COLUMN gis.ogc_service.service_id IS 'ID';
+COMMENT ON COLUMN gis.ogc_service.srid IS 'srid';
+COMMENT ON COLUMN gis.ogc_service.scheme IS 'Схема';
+COMMENT ON COLUMN gis.ogc_service.category IS 'Категорія';
+COMMENT ON COLUMN gis.ogc_service.attribution IS 'Атрибуція';
+COMMENT ON COLUMN gis.ogc_service.access_level IS 'Рівень доступу (public, user, admin)';
+COMMENT ON COLUMN gis.ogc_service.sub_layers IS 'Під шари (Для WMS)';
+COMMENT ON COLUMN gis.ogc_service.isadmin IS 'Ознака доступу лише для адмін частини порталу';
+COMMENT ON COLUMN gis.ogc_service.user_group_id IS 'Група користувачів';
+COMMENT ON COLUMN gis.ogc_service.url_list IS 'URL List';
+COMMENT ON COLUMN gis.ogc_service.table_name IS 'Таблиця на клік (інтерактивний шар)';
+COMMENT ON COLUMN gis.ogc_service.setting IS 'Додаткові налаштування';
+
+CREATE INDEX if not exists gis_ogc_service_category_trgm_idx
+  ON gis.ogc_service
+  USING gin
+  (category COLLATE pg_catalog."default" gin_trgm_ops);
+
+CREATE INDEX if not exists gis_ogc_service_enabled_btree_idx
+  ON gis.ogc_service
+  USING btree
+  (enabled);
+
+CREATE INDEX if not exists gis_ogc_service_isadmin_btree_idx
+  ON gis.ogc_service
+  USING btree
+  (ispublic);
+
+CREATE INDEX if not exists gis_ogc_service_ispublic_btree_idx
+  ON gis.ogc_service
+  USING btree
+  (ispublic);
+
+CREATE INDEX if not exists gis_ogc_service_name_gin_idx
+  ON gis.ogc_service
+  USING gin
+  (name COLLATE pg_catalog."default" gin_trgm_ops);
+
+CREATE INDEX if not exists gis_ogc_service_name_gin_idx_lower
+  ON gis.ogc_service
+  USING gin
+  (lower(name) COLLATE pg_catalog."default" gin_trgm_ops);
+
+CREATE INDEX if not exists gis_ogc_service_name_trgm_idx
+  ON gis.ogc_service
+  USING gin
+  (name COLLATE pg_catalog."default" gin_trgm_ops);
+
+CREATE INDEX if not exists gis_ogc_service_service_btree_idx
+  ON gis.ogc_service
+  USING btree
+  (service COLLATE pg_catalog."default");
+
+CREATE INDEX if not exists gis_ogc_service_srid_btree_idx
+  ON gis.ogc_service
+  USING btree
+  (srid COLLATE pg_catalog."default");
+
+alter table gis.ogc_service add column if not exists html text;
+comment on column gis.ogc_service.html is 'HTML картки';

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

@@ -1,5 +1,3 @@
-import fp from 'fastify-plugin';
-
 import insertColumns from './registers/insert.columns.js';
 import insertFilters from './registers/insert.filters.js';
 import metadataXML from './metadata/metadataXML.js';
@@ -15,6 +13,21 @@ 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';
+import mapInfoPoint from './ogc/map.info.point.js';
+
+const mapInfoPointSchema = {
+  querystring: {
+    type: 'object',
+    properties: {
+      x: { type: 'number' },
+      y: { type: 'number' },
+      layers: { type: 'string' },
+      index: { type: 'number', minimum: 0 }
+    },
+    required: ['x', 'y', 'layers']
+  }
+};
 
 async function route(app) {
   app.put('/insert-columns/:token', insertColumns);
@@ -38,6 +51,9 @@ 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);
+
+  app.get('/map-info-point', { config: { policy: ['public'] }, schema: mapInfoPointSchema }, mapInfoPoint);
 }
 
 export default route;