@opengis/gis 0.2.115 → 0.2.116

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/gis",
-  "version": "0.2.115",
+  "version": "0.2.116",
   "type": "module",
   "author": "Softpro",
   "main": "./dist/index.js",

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

@@ -12,10 +12,10 @@ const dirname = path.dirname(filepath);
 const PROTO_PATH = path.join(dirname, '../', 'map.proto');
 // const PROTO_PATH = config.mapServerAddress && config.mapServerAddress.startsWith('127.0.0.1') ? path.join(dirname, '../../../../../../service/mapnikp/map.proto') : path.join(dirname, '../', 'map.proto');
 
-const { mapServerAddress } = config;
+const { mapnik } = config;
 
-if (!mapServerAddress) {
-  throw new Error("Map server address is not defined in the configuration.");
+if (!mapnik?.server) {
+  throw new Error("Mapnik server address is not defined in the configuration.");
 }
 
 const proto = grpc.loadPackageDefinition(
@@ -32,7 +32,7 @@ const proto = grpc.loadPackageDefinition(
 );
 
 const mapClient = new proto.map.MapService(
-  mapServerAddress,
+  mapnik.server,
   grpc.credentials.createInsecure(),
 );
 
@@ -140,7 +140,7 @@ const grpcMethods = Object.getOwnPropertyNames(
 
 const getMapnik = () => ({
   ...grpcMethods,
-  mapServerAddress,
+  mapServerAddress: mapnik?.server,
 });
 
 export default getMapnik;

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

@@ -1,6 +1,7 @@
+import path from 'node:path';
 import { createHash } from 'node:crypto';
 
-import Sphericalmercator from '@mapbox/sphericalmercator';
+import SphericalMercator from '@mapbox/sphericalmercator';
 
 import {
     config, logger, pgClients,
@@ -10,7 +11,7 @@ import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
 
 const { RenderTile } = mapnik();
 
-const mercator = new Sphericalmercator({ size: 256 });
+const mercator = new SphericalMercator({ size: 256 });
 
 /**
  * Формування растрового tile cartoCss
@@ -27,7 +28,7 @@ const mercator = new Sphericalmercator({ size: 256 });
  * @param {String} y - координата x
  */
 
-export default async function rtile({
+export default async function gisRtile({
     pg = pgClients.client, params, query, user,
 }, reply) {
     if (!RenderTile) {
@@ -93,14 +94,15 @@ export default async function rtile({
             : undefined;
 
         const param = {
-            path: data.type === 'css' ? null : data.source_path, // for rasters only
-            name: data.type === 'css' && data.source_path ? `vector/${data.source_path}` : id, // required for cartocss
+            // skipSubdir: true,
+            path: data.type === 'css' ? null : path.posix.join(config.mapnik?.folder || '', 'raster', data.source_path), // for rasters only
+            name: data.type === 'css' && data.source_path ? path.posix.join('raster', config.mapnik?.folder || '', 'vector', data.source_path) : id, // required for cartocss
             width: 256,
             bbox,
             ttl,
             debug: query.debug,
         };
-        // console.log(param);
+
         const result = await RenderTile(param);
 
         if (query.debug) {