@opengis/gis 0.2.175 → 0.2.176

package/server/routes/mapnik/mapnik.schema.mjs

@@ -1,195 +1,195 @@
-const dirpathSchema = { type: "string", pattern: "^[а-яА-Яa-zA-Z0-9_/\\- ]+$" };
-const filepathSchema = { type: "string", pattern: "^[а-яА-Яa-zA-Z0-9_\/\\-\. ]+$" };
-
-// values hardcoded into mapnik
-const periodSchema = {
-  type: 'string', enum: ['1w', '1d', '1h', '5m', '1m']
-};
-
-export const pretileSchema = {
-  params: {
-    type: "object",
-    properties: {
-      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
-    },
-    required: ["id"],
-  },
-  querystring: {
-    type: "object",
-    additionalProperties: false,
-    properties: {
-      zoom: { type: "number", exclusiveMinimum: 0, maximum: 22 },
-      max: { type: "number", exclusiveMinimum: 0, maximum: 22 },
-    },
-    required: ["zoom"],
-  },
-};
-
-export const uploadRasterSchema = {
-  params: {
-    type: "object",
-    properties: {
-      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
-    },
-    required: ["id"],
-  },
-}
-
-export const gisXmlSchema = {
-  params: {
-    type: "object",
-    properties: {
-      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
-    },
-    required: ["id"],
-  },
-  querystring: {
-    type: "object",
-    additionalProperties: false,
-    properties: {
-      sql: { type: "number", minimum: 1, maximum: 1 },
-      nocache: { type: "string", enum: ['true', '1'] },
-      vrt: { type: "string", enum: ['true', '1'] },
-      debug: { type: "number", minimum: 1, maximum: 10 },
-      srid: { type: "number", minimum: 1, maximum: 1000000 },
-      proj4: {
-        type: "string", minLength: 1,
-        maxLength: 4096
-      },
-    },
-  },
-};
-
-export const gisRtileSchema = {
-  params: {
-    type: "object",
-    properties: {
-      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
-      z: {
-        type: 'number',
-      },
-      y: {
-        type: 'number',
-      },
-      x: {
-        type: 'string',
-        pattern: '^\\d+\\.(png|webp)$',
-      },
-    },
-    required: ["id", "z", "y", "x"],
-  },
-  querystring: {
-    type: "object",
-    additionalProperties: false,
-    properties: {
-      nocache: {
-        type: 'string', enum: ['1']
-      },
-      nottl: {
-        type: 'string', enum: ['1']
-      },
-      debug: {
-        type: 'number', minimum: 1, maximum: 10
-      },
-      // random from frontend
-      ts: {
-        type: 'string'
-      },
-    },
-  },
-};
-
-export const gisRasterSchema = {
-  params: {
-    type: "object",
-    properties: {
-      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
-    },
-    required: ["id"],
-  },
-  querystring: {
-    type: "object",
-    additionalProperties: false,
-    properties: {
-      debug: { type: "number", minimum: 1, maximum: 10 },
-    },
-  },
-};
-
-export const createXmlMultiSchema = {
-  params: {
-    type: "object",
-    properties: {
-      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
-    },
-  },
-  querystring: {
-    type: "object",
-    additionalProperties: false,
-    properties: {
-      nocache: { type: "number", enum: [1] },
-    },
-  },
-};
-
-export const readDirSchema = {
-  querystring: {
-    type: "object",
-    additionalProperties: false,
-    properties: {
-      dir: dirpathSchema,
-    },
-  },
-};
-
-export const fileStatSchema = {
-  querystring: {
-    type: "object",
-    additionalProperties: false,
-    required: ['path'],
-    properties: {
-      path: filepathSchema,
-    },
-  },
-};
-
-export const fileSearchSchema = {
-  querystring: {
-    type: "object",
-    additionalProperties: false,
-    properties: {
-      dir: dirpathSchema,
-      key: {
-        type: 'string', // filename
-      },
-      period: periodSchema,
-      size: {
-        type: 'number', minimum: 1
-      },
-      page: {
-        type: 'number', minimum: 1
-      },
-      limit: {
-        type: 'number', minimum: 1, maximum: 100
-      }
-    },
-  },
-};
-
-export const clearTilesSchema = {
-  params: {
-    type: "object",
-    properties: {
-      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
-    },
-  },
-  querystring: {
-    type: "object",
-    additionalProperties: false,
-    properties: {
-      debug: { type: "number", minimum: 1, maximum: 10 },
-    },
-  },
-};
-
-export default null;
+const dirpathSchema = { type: "string", pattern: "^[а-яА-Яa-zA-Z0-9_/\\- ]+$" };
+const filepathSchema = { type: "string", pattern: "^[а-яА-Яa-zA-Z0-9_\/\\-\. ]+$" };
+
+// values hardcoded into mapnik
+const periodSchema = {
+  type: 'string', enum: ['1w', '1d', '1h', '5m', '1m']
+};
+
+export const pretileSchema = {
+  params: {
+    type: "object",
+    properties: {
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
+    },
+    required: ["id"],
+  },
+  querystring: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      zoom: { type: "number", exclusiveMinimum: 0, maximum: 22 },
+      max: { type: "number", exclusiveMinimum: 0, maximum: 22 },
+    },
+    required: ["zoom"],
+  },
+};
+
+export const uploadRasterSchema = {
+  params: {
+    type: "object",
+    properties: {
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
+    },
+    required: ["id"],
+  },
+}
+
+export const gisXmlSchema = {
+  params: {
+    type: "object",
+    properties: {
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
+    },
+    required: ["id"],
+  },
+  querystring: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      sql: { type: "number", minimum: 1, maximum: 1 },
+      nocache: { type: "string", enum: ['true', '1'] },
+      vrt: { type: "string", enum: ['true', '1'] },
+      debug: { type: "number", minimum: 1, maximum: 10 },
+      srid: { type: "number", minimum: 1, maximum: 1000000 },
+      proj4: {
+        type: "string", minLength: 1,
+        maxLength: 4096
+      },
+    },
+  },
+};
+
+export const gisRtileSchema = {
+  params: {
+    type: "object",
+    properties: {
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
+      z: {
+        type: 'number',
+      },
+      y: {
+        type: 'number',
+      },
+      x: {
+        type: 'string',
+        pattern: '^\\d+\\.(png|webp)$',
+      },
+    },
+    required: ["id", "z", "y", "x"],
+  },
+  querystring: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      nocache: {
+        type: 'string', enum: ['1']
+      },
+      nottl: {
+        type: 'string', enum: ['1']
+      },
+      debug: {
+        type: 'number', minimum: 1, maximum: 10
+      },
+      // random from frontend
+      ts: {
+        type: 'string'
+      },
+    },
+  },
+};
+
+export const gisRasterSchema = {
+  params: {
+    type: "object",
+    properties: {
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
+    },
+    required: ["id"],
+  },
+  querystring: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      debug: { type: "number", minimum: 1, maximum: 10 },
+    },
+  },
+};
+
+export const createXmlMultiSchema = {
+  params: {
+    type: "object",
+    properties: {
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
+    },
+  },
+  querystring: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      nocache: { type: "number", enum: [1] },
+    },
+  },
+};
+
+export const readDirSchema = {
+  querystring: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      dir: dirpathSchema,
+    },
+  },
+};
+
+export const fileStatSchema = {
+  querystring: {
+    type: "object",
+    additionalProperties: false,
+    required: ['path'],
+    properties: {
+      path: filepathSchema,
+    },
+  },
+};
+
+export const fileSearchSchema = {
+  querystring: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      dir: dirpathSchema,
+      key: {
+        type: 'string', // filename
+      },
+      period: periodSchema,
+      size: {
+        type: 'number', minimum: 1
+      },
+      page: {
+        type: 'number', minimum: 1
+      },
+      limit: {
+        type: 'number', minimum: 1, maximum: 100
+      }
+    },
+  },
+};
+
+export const clearTilesSchema = {
+  params: {
+    type: "object",
+    properties: {
+      id: { type: "string", pattern: '^([\\d\\w._-]+)$', },
+    },
+  },
+  querystring: {
+    type: "object",
+    additionalProperties: false,
+    properties: {
+      debug: { type: "number", minimum: 1, maximum: 10 },
+    },
+  },
+};
+
+export default null;

package/server/routes/mapnik.prefixless/functions/mapnikLogger.js

@@ -1,31 +1,31 @@
-import { config } from '@opengis/fastify-table/utils.js';
-import { BadRequestError, NotImplementedError } from '@opengis/fastify-table/errors.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-export default async function mapnikLogger({
-    path: paramsPath,
-}) {
-    if (!config.mapnik?.server) {
-        throw NotImplementedError('mapnik server address needed');
-    }
-
-    const { GetLogs } = mapnik();
-    const { data, links, err } = await GetLogs({ path: paramsPath });
-
-    if (err) {
-        throw BadRequestError(err);
-    }
-
-    if (links) {
-        return {
-            headers: {
-                "Content-Type": "text/html; charset=UTF-8",
-                "Content-Security-Policy": "default-src 'none'",
-                "X-Content-Type-Options": "nosniff",
-            }, data: links.replace(/\/api\/gis-logger/g, '/logger-gis')
-        };
-    }
-
-    return { headers: { "Content-type": "text/plain; charset=UTF-8" }, data };
-}
+import { config } from '@opengis/fastify-table/utils.js';
+import { BadRequestError, NotImplementedError } from '@opengis/fastify-table/errors.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+export default async function mapnikLogger({
+    path: paramsPath,
+}) {
+    if (!config.mapnik?.server) {
+        throw NotImplementedError('mapnik server address needed');
+    }
+
+    const { GetLogs } = mapnik();
+    const { data, links, err } = await GetLogs({ path: paramsPath });
+
+    if (err) {
+        throw BadRequestError(err);
+    }
+
+    if (links) {
+        return {
+            headers: {
+                "Content-Type": "text/html; charset=UTF-8",
+                "Content-Security-Policy": "default-src 'none'",
+                "X-Content-Type-Options": "nosniff",
+            }, data: links.replace(/\/api\/gis-logger/g, '/logger-gis')
+        };
+    }
+
+    return { headers: { "Content-type": "text/plain; charset=UTF-8" }, data };
+}

package/server/routes/mapnik.prefixless/functions/mapnikStat.js

@@ -1,21 +1,21 @@
-import { config } from '@opengis/fastify-table/utils.js';
-
-import { NotImplementedError } from '@opengis/fastify-table/errors.js';
-
-import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
-
-const { GetStat } = mapnik();
-
-export default async function mapnikStat({
-    period,
-}) {
-    if (!config.mapnik?.server) {
-        throw NotImplementedError('mapnik server address needed');
-    }
-
-    const stat = await GetStat({
-        period,
-    });
-
-    return stat;
-}
+import { config } from '@opengis/fastify-table/utils.js';
+
+import { NotImplementedError } from '@opengis/fastify-table/errors.js';
+
+import mapnik from '../../../plugins/mapnik/funcs/mapnik.js';
+
+const { GetStat } = mapnik();
+
+export default async function mapnikStat({
+    period,
+}) {
+    if (!config.mapnik?.server) {
+        throw NotImplementedError('mapnik server address needed');
+    }
+
+    const stat = await GetStat({
+        period,
+    });
+
+    return stat;
+}

package/server/routes/mapnik.prefixless/mapnik.prefixless.route.js

@@ -1,20 +1,20 @@
-import mapnikLogger from './functions/mapnikLogger.js';
-import mapnikStat from './functions/mapnikStat.js';
-
-import {
-  mapnikLoggerSchema,
-  mapnikStatSchema,
-} from './mapnik.prefixless.schema.mjs';
-
-const adminParams = { config: { role: 'admin' }, package: 'gis' };
-
-export default function route(app) {
-  app.get('/logger-gis/stat', { ...adminParams, schema: mapnikStatSchema }, async ({ query }) => {
-    const result = await mapnikStat({ period: query.period });
-    return result;
-  });
-  app.get('/logger-gis/*', { ...adminParams, schema: mapnikLoggerSchema }, async ({ params }, reply) => {
-    const result = await mapnikLogger({ path: params['*'] });
-    return reply.headers(result.headers).send(result.data);
-  });
-}
+import mapnikLogger from './functions/mapnikLogger.js';
+import mapnikStat from './functions/mapnikStat.js';
+
+import {
+  mapnikLoggerSchema,
+  mapnikStatSchema,
+} from './mapnik.prefixless.schema.mjs';
+
+const adminParams = { config: { role: 'admin' }, package: 'gis' };
+
+export default function route(app) {
+  app.get('/logger-gis/stat', { ...adminParams, schema: mapnikStatSchema }, async ({ query }) => {
+    const result = await mapnikStat({ period: query.period });
+    return result;
+  });
+  app.get('/logger-gis/*', { ...adminParams, schema: mapnikLoggerSchema }, async ({ params }, reply) => {
+    const result = await mapnikLogger({ path: params['*'] });
+    return reply.headers(result.headers).send(result.data);
+  });
+}