@opengis/gis 0.2.45 → 0.2.47

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

@@ -1,72 +0,0 @@
-import path from 'path';
-import { randomUUID as uuidv4 } from 'crypto';
-import mapnik from './mapnik.js';
-
-import { config } from '@opengis/fastify-table/utils.js';
-
-const { mapServerAddress } = mapnik();
-
-function unixPath(data) {
-  if (mapServerAddress && !mapServerAddress?.includes('localhost') && data?.[1] === ':') {
-    return path.posix.join('/data/softpro', data.substr(3).replace(/\\/g, '/'));
-  }
-  return data;
-}
-const gdalWrapper = async ({
-  name, pathIn, pathOut, parameters, funcs, send = console.log,
-}) => {
-  const timeStart = new Date();
-  const pref = name === 'gdalbuildvrt' ? ' -o ' : '';
-  const cmd = `${name} ${parameters || ''} ${unixPath(pathIn) || ''} ${pref} ${unixPath(pathOut) || ''}`;
-
-  if (mapServerAddress) {
-    const out = pref + (unixPath(pathOut) || '');
-    const obj = {
-      name, path: unixPath(pathIn), out, params: parameters,
-    };
-
-    const time = Date.now();
-    const { result, err } = await mapnik().gdal(obj);
-
-    if (config.local && false) {
-      send(cmd);
-      send(JSON.stringify(obj));
-      send(`${Date.now() - time}`);
-    }
-
-    if (err) {
-      const logObj = {
-        level: 'ERROR',
-        uuid: uuidv4(),
-        name: 'GDAL',
-        subname: 'GDALWRAPPER',
-        msec: new Date() - timeStart,
-        param: { cmd },
-        status: '500',
-        response: { error: err },
-      };
-      // log.error({ name: 'gdal', ...logObj });
-      send(err);
-    }
-    return { err, result };
-  }
-
-  const result = await funcs.exec(cmd, { send });
-  if (!result) {
-    const logObj = {
-      level: 'ERROR',
-      uuid: uuidv4(),
-      name: 'GDAL',
-      subname: 'GDALWRAPPER',
-      msec: new Date() - timeStart,
-      param: { cmd },
-      status: '500',
-      response: { error: `Cant execute ${cmd}` },
-    };
-    // log.error({ name: 'gdal', ...logObj });
-    return { err: `Cant execute ${cmd}` };
-  }
-  return { result };
-};
-
-export default gdalWrapper;

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

@@ -1,241 +0,0 @@
-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/rasterConfig.js

@@ -1,11 +0,0 @@
-import yaml from 'js-yaml';
-
-import mapnik from './mapnik.js';
-
-const { downloadFile } = mapnik();
-
-export default async function rasterConfig(fullPath) {
-  if (!fullPath.endsWith('config.yml')) return;
-  const { data } = await downloadFile({ filePath: fullPath });
-  return yaml.load(data.toString('utf8'));
-}

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

@@ -1,21 +0,0 @@
-import path from 'node:path';
-
-import mapnik from './mapnik.js';
-
-const { checkFiles } = mapnik();
-
-export default async function rasterExists(fullPath, preview = 0) {
-  const name = path.basename(fullPath).replace('.vrt', '.tif');
-  const findpath = preview ? path.posix.join(path.dirname(fullPath), 'preview1', name) : fullPath;
-  const { fileLoadingStatus: stat } = await checkFiles({ dir: path.dirname(findpath), filesSearch: [path.basename(findpath)] })
-
-  if (stat === 'OK') {
-    return findpath;
-  }
-
-  if (fullPath.includes('mosaic.vrt')) {
-    const { fileLoadingStatus: stat1 } = await checkFiles({ dir: path.dirname(findpath), filesSearch: ['mosaic.vrt'] });
-    console.log('stat: mosaic.vrt', stat1);
-    return stat1 === 'OK' ? findpath.replace('.tif', '.vrt') : null;
-  }
-}

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

@@ -1,109 +0,0 @@
-import path from 'node:path';
-import { createHash } from 'node:crypto';
-import { existsSync } from 'node:fs';
-import { writeFile, mkdir, readFile } from 'node:fs/promises';
-
-import { getRedis, logger, getPG } from '@opengis/fastify-table/utils.js';
-
-import mapnik from './mapnik.js';
-import rasterVrt from './rasterVrt.js';
-import rasterExists from './rasterExists.js';
-import rootFolder from './rootFolder.mjs';
-
-const { gdal } = mapnik();
-
-const pg = getPG();
-const rclient = getRedis();
-
-export default async function rasterInfo(fullPath, send = () => { }, proj4text, nocache = 0) {
-  const time = [Date.now()];
-
-  const key = `raster-stat:${fullPath}`;
-  const cache = await rclient.get(key).then(el => (el ? JSON.parse(el) : null));
-
-  if (cache?.fullPath && cache.size && cache.extent && !nocache) {
-    return { type: 'redis', ...cache };
-  }
-
-  // console.log(fullPath)
-  if (fullPath.includes('.vrt')) {
-    await rasterVrt(fullPath, send)
-  }
-
-  // file cache
-  const hash = createHash('md5').update(fullPath).digest("hex");
-
-  const statPath = path.join(rootFolder, `stat/${hash}.json`);
-  if (existsSync(statPath) && !nocache) {
-    send('stat:' + statPath);
-    const fileData = await readFile(statPath, 'utf-8');
-
-    await rclient.set(key, fileData);
-    const parse = JSON.parse(fileData)
-
-    if (parse.fullPath && parse.extent) return parse;
-  }
-  // console.log(fullPath);
-
-  // size
-  const exists = fullPath.includes('.vrt') ? 1 : await rasterExists(fullPath)
-  //console.log(fullPath, exists)
-  send('exists:' + fullPath + ' - ' + (exists ? 'yes' : 'no'));
-  if (!exists) return { error: 'file not exists info ' + fullPath }
-
-  const { result: stat, error: err1 = '' } = await gdal({ name: 'ls -lah  ', path: fullPath })
-    .then(el => (el.result ? { result: el.result.replace(/\n/g, '') } : el));
-  time.push(Date.now());
-
-  const size = stat.split(' ')[4]
-
-  // srs
-  // send('srs:' + (proj4text || '') + fullPath)
-  const { result: srs, err: error1 } = proj4text ? { result: proj4text } : await gdal({ name: 'gdalsrsinfo', path: fullPath, params: '-o proj4 ' })
-    .then(el => (el.result ? { result: el.result.replace(/\n/g, '') } : el));
-
-  if (error1) return { error: error1 }
-  time.push(Date.now());
-
-  // gdalinfo
-  // send('info:' + fullPath)
-  const { result, err: error } = await gdal({ name: 'gdalinfo', path: fullPath, params: '-json' });
-
-  if (error) return { error }
-  const gdalInfo = JSON.parse(result);
-
-  time.push(Date.now());
-  send('wgs84:' + JSON.stringify(gdalInfo?.wgs84Extent) + ' coors:' + JSON.stringify(gdalInfo?.cornerCoordinates));
-
-  console.log(proj4text, gdalInfo?.cornerCoordinates)
-  if (proj4text && gdalInfo?.cornerCoordinates) {
-    const { lowerLeft, upperRight } = gdalInfo.cornerCoordinates;
-    //send(gdalInfo.cornerCoordinates);
-    const { geom, extent } = await pg.query(`select st_asgeojson(geom)::json as geom, geom::box2d as extent from 
-      (select st_transform('box(${lowerLeft[0]} ${lowerLeft[1]}, ${upperRight[0]} ${upperRight[1]})'::box2d,'${proj4text}','+proj=longlat +datum=WGS84 +no_defs') as geom )q`)
-      .then(el => el.rows[0]);
-    //send(extent)
-    gdalInfo.wgs84Extent = geom;
-    gdalInfo.extent = extent.substring(4, extent.length - 1).replace(/ /g, ',').split(',')
-  }
-
-  // extent
-  const geom = gdalInfo?.wgs84Extent;
-  const extent = gdalInfo.extent || (geom?.coordinates?.[0]?.[0] ? geom.coordinates[0][0].concat(geom.coordinates[0][2]) : undefined);
-  //  send(extent);
-
-  const data = {
-    time: { total: Date.now() - time[0], size: time[1] - time[0], srs: time[2] - time[1], info: time[3] - time[2] }, srs, gdalInfo, fullPath, size, extent, error
-  };
-
-  await rclient.setex(key, 8000, JSON.stringify(data));
-
-  // file cache
-  await mkdir(path.dirname(statPath), { recursive: true });
-
-  logger.file('editor', { time: Date.now() - time[0], srs, statPath, })
-
-  await writeFile(statPath, JSON.stringify(data, null, 2));
-
-  return data;
-}

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

@@ -1,56 +0,0 @@
-import path from 'node:path';
-
-import mapnik from './mapnik.js';
-import rasterConfig from './rasterConfig.js';
-
-const { gdal, uploadFile, downloadFile } = mapnik();
-
-export default async function rasterVrt(rasterPath, send = () => { }) {
-  if (rasterPath.includes('.tif')) {
-    return null;
-  }
-
-  const folderPath = path.posix.dirname(rasterPath);
-
-  // vrt config 
-  const configFilePath = rasterPath.replace('/preview1', '').replace('mosaic.vrt', 'config.yml')
-  const configData = await rasterConfig(configFilePath);
-
-  // -b 1 -b 2 -b 3 -overwrite
-  // -b 1 -b 2 -b 3 -hidenodata -srcnodata "0 0 0" -addalpha -overwrite 
-  const vrt = configData?.vrt || ' -b 1 -b 2 -b 3 -hidenodata -srcnodata "0 0 0" -vrtnodata "256 256 256" -addalpha -overwrite';
-
-
-  const paramsVrt = `${vrt}  -input_file_list ${folderPath}/files.txt `; // ${folderPath}/mosaic.vrt ${folderPath}/*.tif
-  send(paramsVrt)
-  const obj = {
-    name: 'gdalbuildvrt', out: ` -o ${folderPath}/mosaic.vrt `, params: paramsVrt,
-  };
-
-  // check mosaic.vrt exists
-  const time1 = Date.now()
-  const fullPath = rasterPath;
-
-  send('vrt:' + rasterPath)
-  const { result: resStat } = await gdal({ name: `ls "${fullPath}"` });
-
-  if (resStat) return { obj, resStat };
-
-  const { result: files } = await gdal({ name: `ls "${folderPath}"` });
-  const fileList = files.split('\n').filter(el => el.toLowerCase().endsWith('.tif') && !el.includes('mosaic')).map(el => path.posix.join(folderPath, el) || `"${path.posix.join(folderPath, el)}"`);
-  send({ folderPath, files: fileList.length, time: Date.now() - time1 })
-
-  if (!fileList.length) return { err: 'fileList is empty' };
-
-  await gdal({ name: `rm -rf "${folderPath}/files.txt"` });
-
-  await uploadFile({ fileBytes: Buffer.from(fileList.join('\n')), relativeFilepath: path.posix.join(folderPath, 'files.txt') });
-
-  const time = Date.now()
-  send(obj);
-  const { result, err } = await gdal(obj);
-  send(err || result);
-  await downloadFile({ filePath: fullPath });
-  send({ rasterPath, time: Date.now() - time })
-  return { result, err, obj };
-}

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

@@ -1,65 +0,0 @@
-import path from 'node:path';
-import { mkdir, writeFile } from 'node:fs/promises';
-
-import { config, pgClients } from '@opengis/fastify-table/utils.js';
-
-import rasterInfo from './rasterInfo.js';
-import createXML from './createXML.js';
-import mapnik from './mapnik.js';
-import rootFolder from './rootFolder.mjs';
-
-const { loadXML } = mapnik();
-
-export default async function rasterXML({ id, pg = pgClients.client, send = () => { } }) {
-  if (!id) {
-    send('not enough params: id', true);
-    return { error: 'not enough params: id' };
-  }
-
-  const db = pg.options?.database;
-
-  const { source_path: rasterPath, srid, proj4 } = await pg.query(
-    'SELECT source_path, srid, proj4 from gis.rasters where raster_id=$1',
-    [id]
-  ).then(el => el.rows?.[0] || {});
-
-  const proj4text = srid ? await pg.query('select proj4text from spatial_ref_sys where srid::text=$1', [srid]).then(el => el.rows?.[0]?.proj4text) : null;
-  const fullPath = rasterPath ? path.posix.join(config.mapServerRoot || '', config.folder, '/map/raster/', rasterPath, (rasterPath?.toLowerCase().includes('.tif') ? '' : 'mosaic.vrt')) : null;
-
-  if (!fullPath) {
-    send('file not found ' + fullPath, true);
-    return { error: 'file not found ' + fullPath };
-  }
-
-  const { error, srs = proj4, extent, size, gdalInfo } = await rasterInfo(fullPath);
-
-  send(`xml srs: ${proj4text || proj4 || '-'} file:${fullPath} size:${size}`);
-
-  if (error) {
-    send(error.toString(), true);
-    return { error: error.toString() };
-  }
-
-  const xmlFileText = await createXML({
-    fullPath,
-    srs: proj4 || proj4text || srs,
-    extent,
-    send,
-    size,
-  });
-
-  if (srs && proj4 && gdalInfo?.wgs84Extent && id) {
-    const wgs = '+proj=longlat +datum=WGS84 +no_defs';
-    await pg.query(
-      'update gis.rasters set bbox=st_transform(st_transform($2,$5,$3),$4,$5) where raster_id=$1 returning bbox::box2d',
-      [id, gdalInfo.wgs84Extent, srs, proj4, wgs],
-    ).then(el => el.rows?.[0]) || {};
-  }
-
-  send(xmlFileText);
-  await loadXML({ xml: xmlFileText, name: id, reload: true });
-  const localPath = path.join(rootFolder, `mapnik/${db}_${id}.xml`);
-  await mkdir(path.dirname(localPath), { recursive: true });
-  await writeFile(localPath, xmlFileText);
-  return localPath;
-}