tileserver-gl-light 4.5.2 → 4.6.0

package/src/server.js

@@ -6,7 +6,7 @@ process.env.UV_THREADPOOL_SIZE = Math.ceil(Math.max(4, os.cpus().length * 1.5));
 
 import fs from 'node:fs';
 import path from 'path';
-
+import fnv1a from '@sindresorhus/fnv1a';
 import chokidar from 'chokidar';
 import clone from 'clone';
 import cors from 'cors';
@@ -19,7 +19,7 @@ import morgan from 'morgan';
 import { serve_data } from './serve_data.js';
 import { serve_style } from './serve_style.js';
 import { serve_font } from './serve_font.js';
-import { getTileUrls, getPublicUrl } from './utils.js';
+import { getTileUrls, getPublicUrl, isValidHttpUrl } from './utils.js';
 
 import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
@@ -93,6 +93,7 @@ function start(opts) {
   paths.fonts = path.resolve(paths.root, paths.fonts || '');
   paths.sprites = path.resolve(paths.root, paths.sprites || '');
   paths.mbtiles = path.resolve(paths.root, paths.mbtiles || '');
+  paths.pmtiles = path.resolve(paths.root, paths.pmtiles || '');
   paths.icons = path.resolve(paths.root, paths.icons || '');
 
   const startupPromises = [];
@@ -109,6 +110,7 @@ function start(opts) {
   checkPath('fonts');
   checkPath('sprites');
   checkPath('mbtiles');
+  checkPath('pmtiles');
   checkPath('icons');
 
   /**
@@ -181,34 +183,43 @@ function start(opts) {
         item,
         id,
         opts.publicUrl,
-        (mbtiles, fromData) => {
+        (StyleSourceId, protocol) => {
           let dataItemId;
           for (const id of Object.keys(data)) {
-            if (fromData) {
-              if (id === mbtiles) {
-                dataItemId = id;
-              }
+            if (id === StyleSourceId) {
+              // Style id was found in data ids, return that id
+              dataItemId = id;
             } else {
-              if (data[id].mbtiles === mbtiles) {
+              const fileType = Object.keys(data[id])[0];
+              if (data[id][fileType] === StyleSourceId) {
+                // Style id was found in data filename, return the id that filename belong to
                 dataItemId = id;
               }
             }
           }
           if (dataItemId) {
-            // mbtiles exist in the data config
+            // input files exists in the data config, return found id
             return dataItemId;
           } else {
-            if (fromData || !allowMoreData) {
+            if (!allowMoreData) {
               console.log(
-                `ERROR: style "${item.style}" using unknown mbtiles "${mbtiles}"! Skipping...`,
+                `ERROR: style "${item.style}" using unknown file "${StyleSourceId}"! Skipping...`,
               );
               return undefined;
             } else {
-              let id = mbtiles.substr(0, mbtiles.lastIndexOf('.')) || mbtiles;
-              while (data[id]) id += '_';
+              let id =
+                StyleSourceId.substr(0, StyleSourceId.lastIndexOf('.')) ||
+                StyleSourceId;
+              if (isValidHttpUrl(StyleSourceId)) {
+                id =
+                  fnv1a(StyleSourceId) + '_' + id.replace(/^.*\/(.*)$/, '$1');
+              }
+              while (data[id]) id += '_'; //if the data source id already exists, add a "_" untill it doesn't
+              //Add the new data source to the data array.
               data[id] = {
-                mbtiles: mbtiles,
+                [protocol]: StyleSourceId,
               };
+
               return id;
             }
           }
@@ -229,14 +240,24 @@ function start(opts) {
             item,
             id,
             opts.publicUrl,
-            (mbtiles) => {
-              let mbtilesFile;
+            (StyleSourceId) => {
+              let fileType;
+              let inputFile;
               for (const id of Object.keys(data)) {
-                if (id === mbtiles) {
-                  mbtilesFile = data[id].mbtiles;
+                fileType = Object.keys(data[id])[0];
+                if (StyleSourceId == id) {
+                  inputFile = data[id][fileType];
+                  break;
+                } else if (data[id][fileType] == StyleSourceId) {
+                  inputFile = data[id][fileType];
+                  break;
                 }
               }
-              return mbtilesFile;
+              if (!isValidHttpUrl(inputFile)) {
+                inputFile = path.resolve(options.paths[fileType], inputFile);
+              }
+
+              return { inputfile: inputFile, filetype: fileType };
             },
           ),
         );
@@ -264,8 +285,11 @@ function start(opts) {
 
   for (const id of Object.keys(data)) {
     const item = data[id];
-    if (!item.mbtiles || item.mbtiles.length === 0) {
-      console.log(`Missing "mbtiles" property for ${id}`);
+    const fileType = Object.keys(data[id])[0];
+    if (!fileType || !(fileType === 'pmtiles' || fileType === 'mbtiles')) {
+      console.log(
+        `Missing "pmtiles" or "mbtiles" property for ${id} data source`,
+      );
       continue;
     }
 
@@ -424,14 +448,16 @@ function start(opts) {
   };
 
   serveTemplate('/$', 'index', (req) => {
-    const styles = clone(serving.styles || {});
-    for (const id of Object.keys(styles)) {
-      const style = styles[id];
-      style.name = (serving.styles[id] || serving.rendered[id] || {}).name;
-      style.serving_data = serving.styles[id];
-      style.serving_rendered = serving.rendered[id];
+    let styles = {};
+    for (const id of Object.keys(serving.styles || {})) {
+      let style = {
+        ...serving.styles[id],
+        serving_data: serving.styles[id],
+        serving_rendered: serving.rendered[id],
+      };
+
       if (style.serving_rendered) {
-        const center = style.serving_rendered.tileJSON.center;
+        const { center } = style.serving_rendered.tileJSON;
         if (center) {
           style.viewer_hash = `#${center[2]}/${center[1].toFixed(
             5,
@@ -451,40 +477,46 @@ function start(opts) {
           opts.publicUrl,
         )[0];
       }
+
+      styles[id] = style;
     }
-    const data = clone(serving.data || {});
-    for (const id of Object.keys(data)) {
-      const data_ = data[id];
-      const tilejson = data[id].tileJSON;
-      const center = tilejson.center;
+
+    let datas = {};
+    for (const id of Object.keys(serving.data || {})) {
+      let data = Object.assign({}, serving.data[id]);
+
+      const { tileJSON } = serving.data[id];
+      const { center } = tileJSON;
+
       if (center) {
-        data_.viewer_hash = `#${center[2]}/${center[1].toFixed(
+        data.viewer_hash = `#${center[2]}/${center[1].toFixed(
           5,
         )}/${center[0].toFixed(5)}`;
       }
-      data_.is_vector = tilejson.format === 'pbf';
-      if (!data_.is_vector) {
+
+      data.is_vector = tileJSON.format === 'pbf';
+      if (!data.is_vector) {
         if (center) {
           const centerPx = mercator.px([center[0], center[1]], center[2]);
-          data_.thumbnail = `${center[2]}/${Math.floor(
+          data.thumbnail = `${center[2]}/${Math.floor(
             centerPx[0] / 256,
-          )}/${Math.floor(centerPx[1] / 256)}.${data_.tileJSON.format}`;
+          )}/${Math.floor(centerPx[1] / 256)}.${tileJSON.format}`;
         }
 
-        data_.xyz_link = getTileUrls(
+        data.xyz_link = getTileUrls(
           req,
-          tilejson.tiles,
+          tileJSON.tiles,
           `data/${id}`,
-          tilejson.format,
+          tileJSON.format,
           opts.publicUrl,
           {
             pbf: options.pbfAlias,
           },
         )[0];
       }
-      if (data_.filesize) {
+      if (data.filesize) {
         let suffix = 'kB';
-        let size = parseInt(data_.filesize, 10) / 1024;
+        let size = parseInt(tileJSON.filesize, 10) / 1024;
         if (size > 1024) {
           suffix = 'MB';
           size /= 1024;
@@ -493,26 +525,33 @@ function start(opts) {
           suffix = 'GB';
           size /= 1024;
         }
-        data_.formatted_filesize = `${size.toFixed(2)} ${suffix}`;
+        data.formatted_filesize = `${size.toFixed(2)} ${suffix}`;
       }
+
+      datas[id] = data;
     }
+
     return {
       styles: Object.keys(styles).length ? styles : null,
-      data: Object.keys(data).length ? data : null,
+      data: Object.keys(datas).length ? datas : null,
     };
   });
 
   serveTemplate('/styles/:id/$', 'viewer', (req) => {
-    const id = req.params.id;
+    const { id } = req.params;
     const style = clone(((serving.styles || {})[id] || {}).styleJSON);
+
     if (!style) {
       return null;
     }
-    style.id = id;
-    style.name = (serving.styles[id] || serving.rendered[id]).name;
-    style.serving_data = serving.styles[id];
-    style.serving_rendered = serving.rendered[id];
-    return style;
+
+    return {
+      id,
+      name: (serving.styles[id] || serving.rendered[id]).name,
+      serving_data: serving.styles[id],
+      serving_rendered: serving.rendered[id],
+      ...style,
+    };
   });
 
   /*
@@ -521,37 +560,49 @@ function start(opts) {
   });
   */
   serveTemplate('/styles/:id/wmts.xml', 'wmts', (req) => {
-    const id = req.params.id;
+    const { id } = req.params;
     const wmts = clone((serving.styles || {})[id]);
+
     if (!wmts) {
       return null;
     }
+
     if (wmts.hasOwnProperty('serve_rendered') && !wmts.serve_rendered) {
       return null;
     }
-    wmts.id = id;
-    wmts.name = (serving.styles[id] || serving.rendered[id]).name;
+
+    let baseUrl;
     if (opts.publicUrl) {
-      wmts.baseUrl = opts.publicUrl;
+      baseUrl = opts.publicUrl;
     } else {
-      wmts.baseUrl = `${
+      baseUrl = `${
         req.get('X-Forwarded-Protocol')
           ? req.get('X-Forwarded-Protocol')
           : req.protocol
       }://${req.get('host')}/`;
     }
-    return wmts;
+
+    return {
+      id,
+      name: (serving.styles[id] || serving.rendered[id]).name,
+      baseUrl,
+      ...wmts,
+    };
   });
 
   serveTemplate('/data/:id/$', 'data', (req) => {
-    const id = req.params.id;
-    const data = clone(serving.data[id]);
+    const { id } = req.params;
+    const data = serving.data[id];
+
     if (!data) {
       return null;
     }
-    data.id = id;
-    data.is_vector = data.tileJSON.format === 'pbf';
-    return data;
+
+    return {
+      id,
+      is_vector: data.tileJSON.format === 'pbf',
+      ...data,
+    };
   });
 
   let startupComplete = false;
@@ -559,6 +610,7 @@ function start(opts) {
     console.log('Startup complete');
     startupComplete = true;
   });
+
   app.get('/health', (req, res, next) => {
     if (startupComplete) {
       return res.status(200).send('OK');

package/src/utils.js

@@ -2,7 +2,6 @@
 
 import path from 'path';
 import fs from 'node:fs';
-
 import clone from 'clone';
 import glyphCompose from '@mapbox/glyph-pbf-composite';
 
@@ -163,3 +162,15 @@ export const getFontsPbf = (
 
   return Promise.all(queue).then((values) => glyphCompose.combine(values));
 };
+
+export const isValidHttpUrl = (string) => {
+  let url;
+
+  try {
+    url = new URL(string);
+  } catch (_) {
+    return false;
+  }
+
+  return url.protocol === 'http:' || url.protocol === 'https:';
+};