@opengis/gis 0.2.20 → 0.2.22

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

@@ -1,72 +1,72 @@
-import carto from 'carto';
-
-import rasterExists from './rasterExists.js';
-import rasterConfig from './rasterConfig.js';
-
-export default async function createXML({
-  fullPath, srs, extent: bounds, send, size
-}) {
-
-  const configFilePath = fullPath.replace('/preview1', '').replace('mosaic.vrt', 'config.yml')
-  const configData = await rasterConfig(configFilePath);
-
-  const rasterPreview = await rasterExists(fullPath, 1);
-
-  if (rasterPreview) {
-    send('preview:' + rasterPreview);
-  }
-
-  const rasterZoom = configData?.previewZoom ?? (rasterPreview && size?.includes('G') ? 16 : 0);
-
-  const rasterScaling = 'bilinear';
-
-  const Layer = [].concat([
-    {
-      id: 'test',
-      name: 'test',
-      geometry: 'raster',
-      properties: { minzoom: +rasterZoom + 1 },
-      srs: srs || '+proj=longlat +datum=WGS84 +no_defs ',
-      Datasource: {
-        // extent: bounds.join(','),
-        file: fullPath,
-        type: 'gdal',
-      },
-    }]).concat(
-      rasterZoom && rasterPreview ? [{
-        id: 'testpreview',
-        name: 'testpreview',
-        geometry: 'raster',
-        properties: { maxzoom: +rasterZoom },
-        srs: srs || '+proj=longlat +datum=WGS84 +no_defs ',
-        Datasource: {
-          // extent: bounds.join(','),
-          file: rasterPreview,
-          type: 'gdal',
-        },
-      }]
-        : [],
-    );
-
-  const data = `#testpreview{raster-opacity:1; raster-scaling:${rasterScaling};}  #test{raster-opacity:1;raster-scaling:${rasterScaling}; } `;
-
-  const configJson = {
-    format: 'png',
-    Layer,
-    srs: '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over',
-    bounds: bounds || [-180, -85.05112877980659, 180, 85.05112877980659],
-    'maximum-extent': '-20037508.34,-20037508.34,20037508.34,20037508.34',
-    center: [0, 0, 2],
-    minzoom: 1,
-    maxzoom: 25,
-    Stylesheet: [{ id: 'carto_css_style', data }],
-  };
-
-  const xmlFileText = new carto.Renderer().render(configJson);
-
-  if (!xmlFileText) {
-    return { status: 500, error: `Cant create xml for ${fullPath}` };
-  }
-
-  return xmlFileText;
-}
+import carto from 'carto';
+
+import rasterExists from './rasterExists.js';
+import rasterConfig from './rasterConfig.js';
+
+export default async function createXML({
+  fullPath, srs, extent: bounds, send, size
+}) {
+
+  const configFilePath = fullPath.replace('/preview1', '').replace('mosaic.vrt', 'config.yml')
+  const configData = await rasterConfig(configFilePath);
+
+  const rasterPreview = await rasterExists(fullPath, 1);
+
+  if (rasterPreview) {
+    send('preview:' + rasterPreview);
+  }
+
+  const rasterZoom = configData?.previewZoom ?? (rasterPreview && size?.includes('G') ? 16 : 0);
+
+  const rasterScaling = 'bilinear';
+
+  const Layer = [].concat([
+    {
+      id: 'test',
+      name: 'test',
+      geometry: 'raster',
+      properties: { minzoom: +rasterZoom + 1 },
+      srs: srs || '+proj=longlat +datum=WGS84 +no_defs ',
+      Datasource: {
+        // extent: bounds.join(','),
+        file: fullPath,
+        type: 'gdal',
+      },
+    }]).concat(
+      rasterZoom && rasterPreview ? [{
+        id: 'testpreview',
+        name: 'testpreview',
+        geometry: 'raster',
+        properties: { maxzoom: +rasterZoom },
+        srs: srs || '+proj=longlat +datum=WGS84 +no_defs ',
+        Datasource: {
+          // extent: bounds.join(','),
+          file: rasterPreview,
+          type: 'gdal',
+        },
+      }]
+        : [],
+    );
+
+  const data = `#testpreview{raster-opacity:1; raster-scaling:${rasterScaling};}  #test{raster-opacity:1;raster-scaling:${rasterScaling}; } `;
+
+  const configJson = {
+    format: 'png',
+    Layer,
+    srs: '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over',
+    bounds: bounds || [-180, -85.05112877980659, 180, 85.05112877980659],
+    'maximum-extent': '-20037508.34,-20037508.34,20037508.34,20037508.34',
+    center: [0, 0, 2],
+    minzoom: 1,
+    maxzoom: 25,
+    Stylesheet: [{ id: 'carto_css_style', data }],
+  };
+
+  const xmlFileText = new carto.Renderer().render(configJson);
+
+  if (!xmlFileText) {
+    return { status: 500, error: `Cant create xml for ${fullPath}` };
+  }
+
+  return xmlFileText;
+}

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

@@ -1,72 +1,72 @@
-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;
+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;