@opengis/gis 0.1.72 → 0.1.74

package/module/test/layer/ts.linking_passport.yml

@@ -0,0 +1,56 @@
+title: Паспорти прив'язки тимчасових споруд
+table_name: ts.linking_passport
+category:
+
+style:
+  type: polygon
+  color: gray
+  colorAttr: lp_status
+  colorSet:
+    1: '#28a745'
+    2: '#dc3545'
+    3: '#ffc107'
+    4: 'purple'
+  width: 2
+  border: 1
+  nocache: 1
+  stroke: "#eee"
+
+setting:
+  popup: [reg_num]
+  title: {
+    reg_num: Реєстраційний номер паспорту прив’язки,
+    name: Назва тимчасової споруди
+  }
+  card_type: list
+  card_list: [
+    reg_num,
+    application_id,
+    reg_date,
+    reg_date_to,
+    lp_status,
+    done_status,
+    name,
+    ts_class,
+    type_building,
+    address_id
+  ]
+  cls: { application_id: ts.application.table, lp_status: ts.temp_struct_status, done_status: ts.done_status, ts_class: ts.tech_structure, type_building: ts.type_build, address_id: address.address_id}
+
+filter_list:
+  - name: application_id
+    title: Заява
+    data: ts.application_id
+    type: Autocomplete
+    inline: true
+  - name: lp_status
+    title: Статус паспорту прив’язки
+    data: ts.temp_struct_status
+    type: Check
+    inline: true
+  - name: reg_date
+    title: Дата видачі паспорту прив’язки
+    type: Date
+  - name: reg_date_to
+    title: Паспорт прив’язки дійсний до
+    type: Date

package/module/test/layer/ts.temp_structure.yml

@@ -0,0 +1,51 @@
+title: Тимчасова споруди
+table_name: ts.temp_structure
+category:
+
+style:
+  type: polygon
+  color: purple
+  width: 2
+  border: 1
+  nocache: 1
+  stroke: "purple"
+
+setting:
+  popup: [ name ]
+  title: {
+    linking_passport_id: Паспорт прив'язки,
+    name: Назва тимчасової споруди
+  }
+  card_type: list
+  card_list: [
+    name,
+    temp_structure_type,
+    linking_passport_id,
+    reg_date_to,
+    lp_status,
+    done_status,
+    name,
+    ts_class,
+    type_building,
+    address_id
+  ]
+  cls: { temp_structure_type: ts.temp_type, lp_status: ts.temp_struct_status, linking_passport_id: ts.linking_passport_id, temp_structure_status: ts.temp_status, ts_class: ts.tech_structure, type_building: ts.type_build, address_id: address.address_id }
+
+filter_list:
+  - name: temp_structure_type
+    title: Вид тимчасової споруди
+    data: ts.temp_type
+    type: Autocomplete
+    inline: true
+  - name: name
+    title: Назва
+    type: Text
+  - name: linking_passport_id
+    title: Паспорт прив'язки
+    type: Autocomplete
+    data: ts.linking_passport_id
+  - name: temp_structure_status
+    title: Статус тимчасової споруди
+    type: Check
+    data: ts.temp_status
+    inline: true

package/module/test/map/ts.json

@@ -0,0 +1,157 @@
+{
+  "history": true,
+  "height": "calc(100vh - 65px)",
+  "source_path": "ts.temp_structure",
+  "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"
+          }
+        ]
+      }
+    },
+    {
+      "type": "attribute",
+      "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"
+                }
+              ]
+            }
+          }
+        }
+      }
+    },
+    {
+      "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",
+            "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
+    }
+  },
+  "tools": [
+    "home",
+    "geolocation",
+    "length",
+    "area",
+    "print"
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.1.72",
+  "version": "0.1.74",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",
@@ -15,6 +15,7 @@
     "LICENSE"
   ],
   "scripts": {
+    "patch": "npm version patch && git push && npm publish",
     "dev": "node server",
     "front": "vite dev",
     "build-lib": "vite build",
@@ -32,21 +33,20 @@
     "@mapbox/sphericalmercator": "1.2.0",
     "carto": "0.16.3"
   },
-  "peerDependencies": {
-    "@opengis/fastify-table": "^1.4.24"
-  },
   "devDependencies": {
-    "lucide-vue-next": "^0.514.0",
-    "vue": "^3.5.13",
-    "vue-router": "4.5.1",
-    "vuedraggable": "^4.1.0",
     "@opengis/core": "^0.0.18",
-    "@opengis/filter": "^0.1.7",
+    "@opengis/fastify-auth": "^1.1.22",
     "@opengis/fastify-table": "^1.4.77",
+    "@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"
+    "vite": "^6.3.5",
+    "vue": "^3.5.13",
+    "vue-router": "4.5.1",
+    "vuedraggable": "^4.1.0"
   }
 }

package/server/plugins/vite.js

@@ -4,7 +4,7 @@ import { createServer } from 'vite';
 
 import { config } from '@opengis/fastify-table/utils.js';
 
-const isProduction = process.env.NODE_ENV === 'production';
+const isProduction = process.env.NODE_ENV === 'production' || config.production;
 
 console.log({ isProduction });
 
@@ -64,7 +64,7 @@ async function plugin(fastify, opts) {
   fastify.get('*', async (req, reply) => {
     const { user } = req.session?.passport || {};
     if (!user && config.pg && !config.auth?.disable) {
-      return reply.redirect('/login');
+      // return reply.redirect('/login');
     }
     if (!isProduction) return null; // admin vite
     const stream = fs.createReadStream('admin/dist/index.html');

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

@@ -0,0 +1,38 @@
+import { config, pgClients, yml2json } from '@opengis/fastify-table/utils.js';
+
+export default async function layerList({
+    pg = pgClients.client, query = {}, user = {},
+}, reply) {
+    const { sql } = query;
+
+    if (!pg.pk?.['gis.services']) {
+        return reply.status(404).send('services table not found');
+    }
+
+    const q = `
+    select service_id as id, name, category, style, bbox::box2d as extent, st_asgeojson(bbox)::json as geom, null as url, coalesce(service_type, 'vtile') as service from gis.services where is_active and ${!user.uid ? 'is_public' : '1=1'}
+    union all 
+    select ogc_service_id as id, name, category, null as style, geom::box2d as extent, st_asgeojson(geom)::json as geom, url, 'ogc' as service from gis.ogc_service where enabled and ${!user.uid ? 'ispublic' : '1=1'}
+    `;
+
+    if (user.uid && sql) return q;
+
+    const rows = await pg.query(q).then(el => el.rows || []);
+
+    if (!rows.length) {
+        return reply.status(200).send([]);
+    }
+
+    // parse service style
+    rows.forEach(row => Object.assign(row, { style: row.style ? yml2json(row.style) : null }));
+    // assign service url
+    rows.filter(row => row.service !== 'ogc').forEach(row => Object.assign(row, { url: `${config.prefix || '/api'}/vtile/${row.id}/ua/{z}/{x}/{y}.vmt` }));
+    // parse extent string to number[]
+    rows.filter(row => row.extent).forEach(row => Object.assign(row, {
+        extent: row.extent.match(/BOX\(([^)]+)\)/)?.[1]
+            ?.replace?.(/ /g, ",")
+            ?.split?.(",")
+    }));
+
+    return reply.status(200).send(rows);
+}

package/server/routes/map/index.mjs

@@ -7,6 +7,7 @@ import mapCatalogAttribute from './controllers/mapCatalogAttribute.js';
 import rtile from './controllers/rtile.js';
 import vtile from './controllers/vtile.js';
 import vtile1 from './vtile1.js';
+import layerList from './controllers/layerList.js';
 
 import mapFormat from './controllers/mapFormat.js';
 import maps from './controllers/maps.js';
@@ -50,10 +51,14 @@ export default async function route(app) {
   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);
 
-  if (!app.hasRoute({ method: 'GET', url: '/api/vtile/:layer/:lang/:z/:y/:x', })) {    
-    console.log("\x1b[34m%s\x1b[0m",'add vtile from gis');
+  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);
   }
+  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('/marker-icon/*', { config: { policy }, schema: {} }, markerIconApi);
   app.get('/map-format', { config: { policy }, schema: {} }, mapFormat);

package/server/routes/map/vtile1.js

@@ -6,23 +6,33 @@ import Sphericalmercator from '@mapbox/sphericalmercator';
 const mercator = new Sphericalmercator({ size: 256 });
 import { getTemplate, getMeta, getFilterSQL } from '@opengis/fastify-table/utils.js';
 
-export default async function vtile({ params = {}, query, pg }, reply) {
-    const { y, z, layer } = params;
+export default async function vtile({ params = {}, query, pg, user }, reply) {
+    const { y, z } = params;
     const x = params.x.split('.')[0] - 0;
 
     // layer
+    const [map, layer] = params.layer.includes(':') ? params.layer.split(':') : [null, params.layer];
     const data = await getTemplate('layer', layer);
-    if (!data) return { status: 404, message: 'not found' }
+    // service
+    const data1 = await pg.query(`select * from gis.services where is_active and ${!user?.uid ? 'is_public' : '1=1'} and service_id=$1`, [layer]).then(el => el.rows?.[0]);
+    if (!data && !data1) return { status: 404, message: 'not found' }
+
+    // style
+    const mapData = map ? await getTemplate('map', map) : {};
+    const mapStyle = mapData?.widgets?.find?.(el => el.type === 'attribute')?.config?.layer?.style;
+
+    const geom = data1?.geometry_column || 'geom';
+    const table = data?.table_name || data1?.source_path;
+    const style = mapStyle || data?.style || data1?.style;
+    const filterList = data?.filter_list || data1?.filters;
+    const layerQuery = data?.query || data1?.query;
 
     // bbox
     const bbox = mercator.bbox(+y, +x, +z, false/* , '900913' */);
     const bbox2d = `'BOX(${bbox[0]} ${bbox[1]},${bbox[2]} ${bbox[3]})'::box2d`;
 
-    // columns
-    const geom = 'geom';
-    const table = data.table_name;
     const filterData = query.filter ? await getFilterSQL({
-        filter: query.filter, table, filterList: data.filter_list,
+        filter: query.filter, table, filterList,
     }) : {};
 
     // meta
@@ -36,8 +46,8 @@ export default async function vtile({ params = {}, query, pg }, reply) {
         return el.type?.[0] === '_' ? `${el.name}[1] as ${el.name}` : `${el.name}${['int4'].includes(el.type) ? '::text' : ''}`;
     });
 
-    const geomCol = (data?.style?.type === 'point' ? `ST_Centroid(${geom})` : null)
-        || (parseInt(z, 10) < parseInt(query.pointZoom || data?.style?.pointZoom || data?.style?.iconZoom || '0', 10) ? `ST_Centroid(${geom})` : geom);
+    const geomCol = (style?.type === 'point' ? `ST_Centroid(${geom})` : null)
+        || (parseInt(z, 10) < parseInt(query.pointZoom || style?.pointZoom || style?.iconZoom || '0', 10) ? `ST_Centroid(${geom})` : geom);
 
     const koef = {
         10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
@@ -51,7 +61,7 @@ export default async function vtile({ params = {}, query, pg }, reply) {
                 SELECT floor(random() * 100000 + 1)::int + row_number() over() as row, point_count, ST_AsMVTGeom(st_transform(geom,3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
                 FROM (
                 SELECT st_centroid(st_union(geom)) as geom, count(*) as point_count
-                FROM ${table} where ${data?.query || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}  ) j            
+                FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}  ) j            
                 )q`: null
     ) || ((query.clusterZoom - z) > 0 ?
         `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
@@ -59,7 +69,7 @@ export default async function vtile({ params = {}, query, pg }, reply) {
                 SELECT floor(random() * 100000 + 1)::int +row_number() over() as row, count(*) as point_count, ST_AsMVTGeom(st_transform(st_centroid(ST_Union(geom)),3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
                 FROM (
                 SELECT geom, ST_ClusterDBSCAN(geom,${koef},1) OVER () AS cluster 
-                FROM ${table} where ${data?.query || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}  ) j
+                FROM ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d}  ) j
                 WHERE cluster IS NOT NULL
                 GROUP BY cluster
                 ORDER BY 1 DESC
@@ -76,7 +86,7 @@ export default async function vtile({ params = {}, query, pg }, reply) {
                         ${pkey} as  id, 
                         ST_AsMVTGeom(st_transform(${geomCol},3857),ST_TileEnvelope(${z},${y},${x})::box2d,4096,256,false) geom
 
-                        FROM (select * from ${table} where ${data.query || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} 
+                        FROM (select * from ${table} where ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${geom} && ${bbox2d} 
                         
                         and ${geom} is not null  and st_srid(${geom}) >0
                         
@@ -84,9 +94,9 @@ export default async function vtile({ params = {}, query, pg }, reply) {
 
                     ${types[type] ? ` and ST_GeometryType(geom) = any ('{ ${types[type]} }') ` : ''}
 
-                    and ${data?.query || 'true'} and ${filterData?.q || 'true'} and ${data?.filter || '1=1'}
+                    and ${layerQuery || 'true'} and ${filterData?.q || 'true'} and ${data?.filter || '1=1'}
                     
-                    ${(data?.style?.type || data?.geometry_type) === 'polygon' ? `order by st_area(st_transform(${geom},3857)) desc` : ''}
+                    ${(style?.type || data?.geometry_type) === 'polygon' ? `order by st_area(st_transform(${geom},3857)) desc` : ''}
 
                     limit 3000)q
                 ) q`);