@opengis/gis 0.1.66 → 0.1.68

package/module/gis/table/site.gis.registers.table.json

@@ -78,6 +78,12 @@
             "id": "search",
             "type": "Text",
             "columns": "name,holder"
+        },
+        {
+            "label": "Ключові слова",
+            "id": "keywords",
+            "type": "Check",
+            "inline": true
         }
     ]
 }

package/module/gis/table/site.gis.services.table.json

@@ -7,20 +7,6 @@
     "title": "name",
     "search": "name,description,source_path"
   },
-  "sql": [
-    {
-      "sql": "select source, date_updated, size, region from gis.metadata where layer_id=t.service_id limit 1",
-      "name": "metadata_sql"
-    },
-    {
-      "sql": "select json_agg(q) as metadata_all from (select scale, katottg,srid, region, name, purpose, source,keywords,update_frequency,year,date_created,size,access_constraints,license  from gis.metadata where layer_id=t.service_id limit 1)q ",
-      "name": "metadata_list_sql"
-    },
-    {
-      "name": "is_export_sql",
-      "sql": "select jsonb_path_exists(attributes, '$[*] ? (@.is_export == true)') as is_export"
-    }
-  ],
   "title": "Сервіси",
   "form": "gis.services.form",
   "sqlColumns": "*",
@@ -85,10 +71,17 @@
     }
   ],
   "filterList": [
+    {
+      "label": "Назва, Опис",
+      "id": "search",
+      "type": "Text",
+      "columns": "name,description",
+      "inline": true
+    },
     {
       "label": "Ключові слова",
       "id": "keywords",
-      "type": "Text",
+      "type": "Check",
       "inline": true
     },
     {
@@ -108,7 +101,7 @@
     {
       "label": "Утримувач",
       "id": "holder",
-      "type": "Text"
+      "type": "Check"
     }
   ]
 }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@opengis/gis",
-  "version": "0.1.66",
+  "version": "0.1.68",
   "type": "module",
   "author": "Softpro",
-  "main": "dist/import-file.js",
+  "main": "./dist/index.js",
   "files": [
     "dist/*",
     "module/*",
@@ -28,20 +28,20 @@
     "docs:preview": "npm run --prefix ./docs docs:preview",
     "prepublishOnly": "npm run build"
   },
-  "dependencies": {},
+  "dependencies": {
+    "@mapbox/sphericalmercator": "1.2.0",
+    "carto": "0.16.3"
+  },
   "peerDependencies": {
     "@opengis/fastify-table": "^1.4.24",
     "@opengis/filter": "^0.1.7",
     "@opengis/core": "^0.0.18"
   },
   "devDependencies": {
-    "@mapbox/sphericalmercator": "1.2.0",
     "lucide-vue-next": "^0.514.0",
-    "carto": "0.16.3",
     "vue": "^3.5.13",
     "vue-router": "4.5.1",
     "vuedraggable": "^4.1.0",
-    "yaml": "^2.8.0",
     "@opengis/core": "^0.0.18",
     "@opengis/filter": "^0.1.7",
     "@opengis/fastify-table": "^1.4.77",

package/server/plugins/mapnik/funcs/map.proto

@@ -0,0 +1,241 @@
+syntax = "proto3";
+
+
+message render_in {
+	string path = 1;
+	string name = 2;
+	repeated double bbox = 3 [packed=true];
+	string tile = 4;
+	string xml = 5;
+	int32 width = 6;
+	int32 height = 7;
+}
+
+
+message render_out {
+	string err = 1;
+	string base64 = 2;
+	string tile = 3;
+}
+
+message xml_in {
+	string path = 1;
+	string name = 2;
+	string xml = 3;
+	bool reload = 4;
+}
+
+message xml_out {
+	string err = 1;
+	bool is_ok = 2;
+}
+
+message cmd_in {
+	string cmd = 1;
+	string svg = 2;
+	string filename = 3;
+}
+
+message cmd_out {
+	string err = 1;
+	string base64 = 2;
+}
+
+message gdal_in {
+	string name = 1;
+	string path = 2;
+	string out = 3;
+	string params = 4;
+}
+message gdal_out {
+	string result = 1;
+	string err = 2;
+}
+
+message clear_tiles_in {
+	string path = 1;
+}
+
+message clear_tiles_out {
+	oneof clear_message {
+		bool ok = 1;
+		string err = 2;
+	}
+}
+
+message empty {}
+
+message statusRenderInfo {
+	string name = 1;
+	bool isActive = 2;
+	float workTime = 3;
+}
+
+message statusInfo {
+	repeated statusRenderInfo info = 1;
+}
+
+message printMapOut {
+	string map = 1;
+	string err = 2;
+}
+
+message xyz {
+	float x = 1;
+	float y = 2;
+	float z = 3;
+}
+
+message printMapIn {
+	string baseurl = 1;
+	string baseImg = 2;
+	repeated string xml = 3;
+	string overlayXml = 4;
+	string overlay = 5;
+	int32 width = 6;
+	int32 height = 7;
+	repeated double bbox = 8;
+	xyz pos = 9;
+	string geojsonSettings = 10;
+}
+
+message log_in {
+	uint32 rows = 1;
+	string level = 2;
+}
+
+message log_out {
+	repeated string logs = 1;
+}
+
+message sqlToShpIn {
+  string db = 1;
+  string host = 2;
+  string port = 3;
+  string sql = 4;
+  string savePath = 5;
+	string shpName = 6;
+}
+
+message shapeOut {
+  string zipPath = 1;
+}
+
+message fileIn {
+	bytes fileBytes = 1;
+	string relativeFilepath = 2;
+}
+
+message deleteFileIn {
+	string dir = 1;
+	repeated string objectList = 2;
+}
+
+message fileManagerOut {
+	bool status = 1;
+	string operation = 2;
+}
+
+message checkFilesDir {
+	string dir = 1;
+	repeated string filesSearch = 2;
+}
+
+enum status {
+	LOADING = 0;
+	OK = 1;
+}
+
+message filesStatus {
+	status fileLoadingStatus = 1;
+}
+
+message fileListIn {
+	string dir = 1;
+}
+
+message fileInfo {
+	repeated fileInfoL fileInfoList = 1;
+}
+
+message fileInfoL {
+	oneof fileInfo {
+		fileInfoObj file = 1;
+		dirInfoObj dir = 2;
+	}
+}
+
+message fileInfoObj {
+	string type = 1;
+	string birthtime = 2;
+	string name = 3;
+	uint64 size = 4;
+	string ext = 5;
+	string server = 6;
+}
+
+message dirInfoObj {
+	string type = 1;
+	string birthtime = 2;
+	string name = 3;
+	uint64 size = 4;
+	uint64 count = 5;
+	string server = 6;
+}
+
+message deleteOut {
+	repeated deleteObjSuccess success = 1;
+	repeated deleteObjError error = 2;
+
+}
+
+message deleteObjSuccess {
+	string object = 1;
+	string type = 2;
+	string status = 3;
+}
+
+message deleteObjError {
+	string object = 1;
+	string fullPath = 2;
+	string result = 3;
+}
+
+message readDirIn {
+	string dir = 1;
+	repeated string filter = 2;
+	string fullPath = 3;
+}
+
+message readDirOut {
+	repeated string res = 1;
+
+}
+
+message downloadFileIn {
+	string filePath = 1;
+}
+
+message downloadFileOut {
+	bytes chunk_data = 1;
+}
+
+
+service Map {
+	rpc Render(render_in) returns (render_out) {}	
+	rpc RenderXML(render_in) returns (render_out) {}	
+	rpc LoadXML(xml_in) returns (xml_out) {}	
+	rpc MarkerIcon(cmd_in) returns (cmd_out) {}
+	rpc Gdal(gdal_in) returns (gdal_out) {}
+	rpc ClearTiles(clear_tiles_in) returns (clear_tiles_out) {}
+	rpc RenderStatus(empty) returns (statusInfo) {}
+	rpc PrintMap(printMapIn) returns (printMapOut) {}
+	rpc Log(log_in) returns (log_out) {}
+	rpc SqlToShp(sqlToShpIn) returns (shapeOut) {}
+	rpc uploadFile(fileIn) returns (fileManagerOut) {}
+	rpc deleteFiles(deleteFileIn) returns (deleteOut) {}
+	rpc checkFiles(checkFilesDir) returns (filesStatus) {}
+	rpc fileList(fileListIn) returns (fileInfo) {}
+	rpc readDir(readDirIn) returns (readDirOut) {}
+	rpc downloadFile(downloadFileIn) returns (stream downloadFileOut) {}
+}

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

@@ -9,89 +9,90 @@ import { config, logger } from '@opengis/fastify-table/utils.js';
 config.ready = config.ready || {};
 
 const { mapServerAddress } = config || {};
-
+const funcs1 =[]
 if (!mapServerAddress) {
-  throw new Error('mapServerAddress not set in config');
-}
+  console.log("\x1b[34m%s\x1b[0m",'mapServerAddress not set in config');
+} else {
 
-const proto = grpc.loadPackageDefinition(
-  protoLoader.loadSync(path.join(process.cwd(), '/server/plugins/mapnik/utils/map.proto'), {
-    keepCase: true,
-    longs: String,
-    enums: String,
-    defaults: true,
-    oneofs: true,
-  }),
-);
+  const PROTO_PATH = path.join(__dirname, 'map.proto')
 
-const mapClient = mapServerAddress ? new proto.Map(
-  mapServerAddress,
-  grpc.credentials.createInsecure(),
-) : null;
+  const proto = grpc.loadPackageDefinition(
+    protoLoader.loadSync(PROTO_PATH, {
+      keepCase: true,
+      longs: String,
+      enums: String,
+      defaults: true,
+      oneofs: true,
+    }),
+  );
 
-mapClient.waitForReady(Date.now() + 5000, (err) => {
-  if (err) {
-    config.ready.mapnik = false;
-    console.error('Mapnik client connection timeout or failure:', err);
-  }
-  else {
-    config.ready.mapnik = true;
-    console.log('Mapnik client connected successfully.');
-    // You can now make RPC calls safely
-  }
-});
+  const mapClient = mapServerAddress ? new proto.Map(
+    mapServerAddress,
+    grpc.credentials.createInsecure(),
+  ) : null;
+
+  mapClient.waitForReady(Date.now() + 5000, (err) => {
+    if (err) {
+      config.ready.mapnik = false;
+      console.error('Mapnik client connection timeout or failure:', err);
+    }
+    else {
+      config.ready.mapnik = true;
+      console.log('Mapnik client connected successfully.');
+      // You can now make RPC calls safely
+    }
+  });
 
-const fsFuncsList = ['uploadFile', 'deleteFiles', 'downloadFile', 'checkFiles', 'fileList', 'readDir'];
+  const fsFuncsList = ['uploadFile', 'deleteFiles', 'downloadFile', 'checkFiles', 'fileList', 'readDir'];
 
-const funcs1 = [
-  'render', 'renderXML', 'loadXML', 'markerIcon', 'gdal',
-  'printMap', 'log', 'sqlToShp', 'uploadFile', 'deleteFiles',
-  'downloadFile', 'checkFiles', 'fileList', 'readDir', 'renderStatus',
-].reduce((p, el) => {
-  // eslint-disable-next-line no-param-reassign
-  p[el] = mapServerAddress ? async (data) => new Promise((res, rej) => {
-    const capitalized = fsFuncsList.includes(el) ? el : el.charAt(0).toUpperCase() + el.slice(1);
+  [
+    'render', 'renderXML', 'loadXML', 'markerIcon', 'gdal',
+    'printMap', 'log', 'sqlToShp', 'uploadFile', 'deleteFiles',
+    'downloadFile', 'checkFiles', 'fileList', 'readDir', 'renderStatus',
+  ].forEach(el => {
     // eslint-disable-next-line no-param-reassign
-    if (data) {
-      if (data?.path && data.path?.[0] !== '"') {
-        // eslint-disable-next-line no-param-reassign
-        data.path = `"${data.path}"`;
+    funcs1[el] = mapServerAddress ? async (data) => new Promise((res, rej) => {
+      const capitalized = fsFuncsList.includes(el) ? el : el.charAt(0).toUpperCase() + el.slice(1);
+      // eslint-disable-next-line no-param-reassign
+      if (data) {
+        if (data?.path && data.path?.[0] !== '"') {
+          // eslint-disable-next-line no-param-reassign
+          data.path = `"${data.path}"`;
+        }
       }
-    }
 
-    if (el === 'downloadFile') {
-      const downloadBuffer = [];
-      const download = mapClient[capitalized].call(mapClient, data, (err, data1) => {
-        if (err || data1?.result?.startsWith?.('Usage:')) {
-          logger.file('grpc/mapnik', { error: err.toString(), stack: err.stack, ready: config.ready.mapnik });
-          if (!config.ready.mapnik) {
-            return rej(new Error('no grpc mapnik connection'));
+      if (el === 'downloadFile') {
+        const downloadBuffer = [];
+        const download = mapClient[capitalized].call(mapClient, data, (err, data1) => {
+          if (err || data1?.result?.startsWith?.('Usage:')) {
+            logger.file('grpc/mapnik', { error: err.toString(), stack: err.stack, ready: config.ready.mapnik });
+            if (!config.ready.mapnik) {
+              return rej(new Error('no grpc mapnik connection'));
+            }
+            return rej(err || data1?.result);
           }
-          return rej(err || data1?.result);
-        }
-        res(data1);
-      });
-      download.on('data', (resp) => {
-        downloadBuffer.push(...resp.chunk_data);
-      });
-      download.on('end', () => res({ data: Buffer.from(downloadBuffer) }));
-    }
-    else {
-      mapClient[capitalized].call(mapClient, data, (err, data1) => {
-        if (err || data1?.result?.startsWith?.('Usage:')) {
-          logger.file('grpc/mapnik', { error: err.toString(), stack: err.stack, ready: config.ready.mapnik });
-          if (!config.ready.mapnik) {
-            return rej(new Error('no grpc mapnik connection'));
+          res(data1);
+        });
+        download.on('data', (resp) => {
+          downloadBuffer.push(...resp.chunk_data);
+        });
+        download.on('end', () => res({ data: Buffer.from(downloadBuffer) }));
+      }
+      else {
+        mapClient[capitalized].call(mapClient, data, (err, data1) => {
+          if (err || data1?.result?.startsWith?.('Usage:')) {
+            logger.file('grpc/mapnik', { error: err.toString(), stack: err.stack, ready: config.ready.mapnik });
+            if (!config.ready.mapnik) {
+              return rej(new Error('no grpc mapnik connection'));
+            }
+            return rej(err || data1?.result);
           }
-          return rej(err || data1?.result);
-        }
-        res(data1);
-      });
-    }
-  }) : null;
-  return p;
-}, {});
-
+          res(data1);
+        });
+      }
+    }) : null;    
+  });
+}
 
 const getMapnik = () => ({
   ...funcs1,

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

@@ -33,6 +33,7 @@ const autoGenerate = {};
 export default async function rtile({
     pg = pgClients.client, params = {}, query = {}, user = {},
 }, reply) {
+    if(!render) return reply.status(400).send('mapnik server address needed');
     const { id, z, y } = params;
     const { debug, nocache } = query;
     const db = pg.options?.database;

package/server/routes/map/index.mjs

@@ -6,6 +6,7 @@ import mapCatalog from './controllers/mapCatalog.js';
 import mapCatalogAttribute from './controllers/mapCatalogAttribute.js';
 import rtile from './controllers/rtile.js';
 import vtile from './controllers/vtile.js';
+import vtile1 from './vtile1.js';
 
 import mapFormat from './controllers/mapFormat.js';
 import maps from './controllers/maps.js';
@@ -49,6 +50,11 @@ 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');
+    app.get('/vtile/:layer/:lang/:z/:y/:x', { config: { policy }, schema: schemaInfo }, vtile1);
+  }
+
   app.get('/marker-icon/*', { config: { policy }, schema: {} }, markerIconApi);
   app.get('/map-format', { config: { policy }, schema: {} }, mapFormat);
 }

package/server/routes/map/vtile1.js

@@ -0,0 +1,98 @@
+const headers = {
+    'Content-Type': 'application/x-protobuf',
+    'Cache-Control': 'no-cache',
+};
+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;
+    const x = params.x.split('.')[0] - 0;
+
+    // layer
+    const data = await getTemplate('layer', layer);
+    if (!data) return { status: 404, message: 'not found' }
+
+    // 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,
+    }) : {};
+
+    // meta
+    const metaTable = await getMeta({ pg, table });
+    if (metaTable.error) { return metaTable; }
+    const { pk: pkey, columns } = metaTable;
+
+    // props
+    const columnsFiltered = columns.filter(el => !['json', 'geometry'].includes(pg.pgType[el.dataTypeID]) && !['uid', 'cdate', 'editor_id', 'editor_date'].includes(el.name));
+    const props = columnsFiltered.map(el => {
+        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 koef = {
+        10: 0.1, 11: 0.05, 12: 0.005, 13: 0.001, 14: 0.001, 15: 0.0005,
+    }[z] || 0.0005;
+
+    const { type } = query;
+    const types = { point: 'ST_Point' /* ,ST_MultiPoint */, polygon: 'ST_Polygon,ST_MultiPolygon' };
+    const sql = ((query.clusterZoom - z) > 2
+        ? `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
+            FROM (
+                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            
+                )q`: null
+    ) || ((query.clusterZoom - z) > 0 ?
+        `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
+            FROM (
+                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
+                WHERE cluster IS NOT NULL
+                GROUP BY cluster
+                ORDER BY 1 DESC
+                )q`
+
+        : `SELECT ST_AsMVT(q, '${layer}', 4096, 'geom','row') as tile
+                FROM (
+                    SELECT
+
+                        floor(random() * 100000 + 1)::int + row_number() over() as row,
+
+                        ${props?.length ? `${props.map(el => `"${el}"`).join(',')},` : ''}
+
+                        ${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} 
+                        
+                        and ${geom} is not null  and st_srid(${geom}) >0
+                        
+                        
+
+                    ${types[type] ? ` and ST_GeometryType(geom) = any ('{ ${types[type]} }') ` : ''}
+
+                    and ${data?.query || '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` : ''}
+
+                    limit 3000)q
+                ) q`);
+
+    if (query.sql === '1') { return sql; }
+    const tile = await pg.query(sql);
+    const buffer = Buffer.concat(tile.rows.map((el) => Buffer.from(el.tile)));
+    return reply.headers(headers).send(buffer);
+}

package/server/plugins/mapnik/index.mjs

@@ -1,12 +0,0 @@
-import fp from 'fastify-plugin';
-// import config from '../config.js';
-
-import mapnik from './funcs/mapnik.js';
-import gdalWrapper from './funcs/gdalWrapper.js';
-
-async function plugin(fastify, opts) {
-  // fastify.decorate('mapnik', mapnik);
-  // fastify.decorate('gdalWrapper', gdalWrapper);
-}
-
-export default fp(plugin);