@opengis/gis 0.2.154 → 0.2.156

package/server/routes/map/index.mjs

@@ -13,6 +13,7 @@ import jsonData from './controllers/jsonData.js';
 import layerList from './controllers/layerList.js';
 
 import mapFormat from './controllers/mapFormat.js';
+import parseGeoFile from './controllers/parseGeoFile.js';
 import maps from './controllers/maps.js';
 import markerIconApi from './controllers/marker_icon.js';
 
@@ -24,6 +25,8 @@ import getWidget from './widgets/get.widget.js';
 import addWidget from './widgets/add.widget.js';
 import delWidget from './widgets/del.widget.js';
 
+import gisConvert from './controllers/gis.convert.js';
+
 const schemaInfo = {
   type: 'object',
   properties: {
@@ -71,8 +74,16 @@ const mapFormatSchema = {
   },
 };
 
-const publicParams = { config: { policy: 'L0' }, schema: schemaInfo, package: 'gis' }; // * L0 === public
-const privilegedParams = { config: { policy: 'L1', role: 'admin' }, schema: schemaInfo, package: 'gis' }; // ? just auth or admin
+const publicParams = {
+  config: { policy: 'L0' },
+  schema: schemaInfo,
+  package: 'gis',
+}; // * L0 === public
+const privilegedParams = {
+  config: { policy: 'L1', role: 'admin' },
+  schema: schemaInfo,
+  package: 'gis',
+}; // ? just auth or admin
 
 export default async function route(app) {
   if (!app.hasRoute({ method: 'GET', url: '/gis-map/:id?' })) {
@@ -130,7 +141,9 @@ export default async function route(app) {
     app.get('/layer-vtile/:id/:z/:y/:x', publicParams, vtile);
   }
 
-  if (!app.hasRoute({ method: 'GET', url: '/api/vtile/:layer/:lang/:z/:y/:x' })) {
+  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', publicParams, vtile1);
   }
@@ -164,6 +177,22 @@ export default async function route(app) {
   }
 
   if (!app.hasRoute({ method: 'GET', url: '/api/map-format' })) {
-    app.get('/map-format', { ...publicParams, schema: mapFormatSchema }, mapFormat);
+    app.get(
+      '/map-format',
+      { ...publicParams, schema: mapFormatSchema },
+      mapFormat,
+    );
+  }
+
+  if (!app.hasRoute({ method: 'POST', url: '/api/gis-parse-geo' })) {
+    app.post('/gis-parse-geo', publicParams, parseGeoFile);
+  }
+
+  if (!app.hasRoute({ method: 'POST', url: '/api/gis-convert' })) {
+    app.post(
+      '/gis-convert',
+      { config: { policy: 'L0' }, schema: {}, package: 'gis' },
+      gisConvert,
+    );
   }
 }

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

@@ -113,6 +113,7 @@ export default async function gisRtile({
             width: 256,
             bbox,
             ttl,
+            format: 'webp',
             meta,
             base64: false,
             debug: query.debug,
@@ -130,7 +131,7 @@ export default async function gisRtile({
         if (meta) {
             const accelPath = result.tile_path?.startsWith('/') ? result.tile_path : `/${result.tile_path}`;
             const metaHeaders = {
-                'Content-Type': 'image/png',
+                'Content-Type': 'image/webp',
                 'Cache-Control': query.nocache || query.nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000',
                 'X-Accel-Redirect': accelPath,
             };
@@ -155,7 +156,7 @@ export default async function gisRtile({
 
         const buffer = result.data || Buffer.from(result.base64, 'base64');
 
-        return reply.headers({ 'Content-Type': 'image/png', 'Cache-Control': query.nocache || query.nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' }).send(buffer);
+        return reply.headers({ 'Content-Type': 'image/webp', 'Cache-Control': query.nocache || query.nottl ? 'no-store, no-cache, must-revalidate' : 'public, max-age=2592000' }).send(buffer);
     }
     catch (err) {
         logger.file('rtile/error', {