tileserver-gl-light 5.5.0-pre.5 → 5.5.0-pre.7

package/src/server.js

@@ -206,8 +206,9 @@ async function start(opts) {
         const styleFileData = await fs.promises.readFile(styleFile);
         styleJSON = JSON.parse(styleFileData);
       }
-    } catch {
+    } catch (err) {
       console.log(`Error getting style file "${item.style}"`);
+      console.error(err && err.stack ? err.stack : err);
       return false;
     }
 
@@ -225,13 +226,17 @@ async function start(opts) {
             if (id === styleSourceId) {
               // Style id was found in data ids, return that id
               dataItemId = id;
+              break;
             } else {
               // eslint-disable-next-line security/detect-object-injection -- id is from Object.keys of data config
-              const fileType = Object.keys(data[id])[0];
-              // eslint-disable-next-line security/detect-object-injection -- id is from Object.keys of data config, fileType is from Object.keys
-              if (data[id][fileType] === styleSourceId) {
-                // Style id was found in data filename, return the id that filename belong to
+              const sourceData = data[id];
+
+              if (
+                (sourceData.pmtiles && sourceData.pmtiles === styleSourceId) ||
+                (sourceData.mbtiles && sourceData.mbtiles === styleSourceId)
+              ) {
                 dataItemId = id;
+                break;
               }
             }
           }
@@ -286,11 +291,21 @@ async function start(opts) {
             function dataResolver(styleSourceId) {
               let resolvedFileType;
               let resolvedInputFile;
-              let resolvedSparse = false;
               let resolvedS3Profile;
               let resolvedRequestPayer;
               let resolvedS3Region;
               let resolvedS3UrlFormat;
+              let resolvedSparse;
+
+              // Debug logging to see what we're trying to match
+              if (opts.verbose >= 3) {
+                console.log(
+                  `[dataResolver] Looking for styleSourceId: ${styleSourceId}`,
+                );
+                console.log(
+                  `[dataResolver] Available data keys: ${Object.keys(data).join(', ')}`,
+                );
+              }
 
               for (const id of Object.keys(data)) {
                 // eslint-disable-next-line security/detect-object-injection -- id is from Object.keys of data config
@@ -308,21 +323,31 @@ async function start(opts) {
                 }
 
                 if (currentFileType && currentInputFileValue) {
+                  // Debug logging
+                  if (opts.verbose >= 3) {
+                    console.log(
+                      `[dataResolver] Checking id="${id}", file="${currentInputFileValue}"`,
+                    );
+                  }
+
                   // Check if this source matches the styleSourceId
-                  if (
-                    styleSourceId === id ||
-                    styleSourceId === currentInputFileValue
-                  ) {
+                  // Match by ID, by file path, or by base filename
+                  const matchById = styleSourceId === id;
+                  const matchByFile = styleSourceId === currentInputFileValue;
+                  const matchByBasename =
+                    styleSourceId.includes(currentInputFileValue) ||
+                    currentInputFileValue.includes(styleSourceId);
+
+                  if (matchById || matchByFile || matchByBasename) {
+                    if (opts.verbose >= 2) {
+                      console.log(
+                        `[dataResolver] Match found for styleSourceId: ${styleSourceId}. (byId=${matchById}, byFile=${matchByFile}, byBasename=${matchByBasename})`,
+                      );
+                    }
+
                     resolvedFileType = currentFileType;
                     resolvedInputFile = currentInputFileValue;
 
-                    // Get sparse if present
-                    if (Object.hasOwn(sourceData, 'sparse')) {
-                      resolvedSparse = !!sourceData.sparse;
-                    } else {
-                      resolvedSparse = false;
-                    }
-
                     // Get s3Profile if present
                     if (Object.hasOwn(sourceData, 's3Profile')) {
                       resolvedS3Profile = sourceData.s3Profile;
@@ -343,6 +368,10 @@ async function start(opts) {
                       resolvedS3Region = sourceData.s3Region;
                     }
 
+                    // Get sparse: per-source overrides global, default to true
+                    resolvedSparse =
+                      sourceData.sparse ?? options.sparse ?? true;
+
                     break; // Found our match, exit the outer loop
                   }
                 }
@@ -353,14 +382,23 @@ async function start(opts) {
                 console.warn(
                   `Data source not found for styleSourceId: ${styleSourceId}`,
                 );
+                console.warn(
+                  `Available data sources: ${Object.keys(data)
+                    .map((id) => {
+                      // eslint-disable-next-line security/detect-object-injection
+                      const src = data[id];
+                      return `${id} -> ${src.pmtiles || src.mbtiles || 'unknown'}`;
+                    })
+                    .join(', ')}`,
+                );
                 return {
                   inputFile: undefined,
                   fileType: undefined,
-                  sparse: false,
                   s3Profile: undefined,
                   requestPayer: false,
                   s3Region: undefined,
                   s3UrlFormat: undefined,
+                  sparse: true,
                 };
               }
 
@@ -388,11 +426,11 @@ async function start(opts) {
               return {
                 inputFile: resolvedInputFile,
                 fileType: resolvedFileType,
-                sparse: resolvedSparse,
                 s3Profile: resolvedS3Profile,
                 requestPayer: resolvedRequestPayer,
                 s3Region: resolvedS3Region,
                 s3UrlFormat: resolvedS3UrlFormat,
+                sparse: resolvedSparse,
               };
             },
           ),
@@ -404,6 +442,8 @@ async function start(opts) {
     return success;
   }
 
+  // Collect style loading promises separately
+  const stylePromises = [];
   for (const id of Object.keys(config.styles || {})) {
     // eslint-disable-next-line security/detect-object-injection -- id is from Object.keys of config.styles
     const item = config.styles[id];
@@ -411,26 +451,38 @@ async function start(opts) {
       console.log(`Missing "style" property for ${id}`);
       continue;
     }
-    startupPromises.push(addStyle(id, item, true, true));
+    stylePromises.push(addStyle(id, item, true, true));
   }
+
+  // Wait for styles to finish loading, then load data sources
+  // This ensures data sources added by styles are included
+  startupPromises.push(
+    Promise.all(stylePromises).then(() => {
+      const dataLoadPromises = [];
+      for (const id of Object.keys(data)) {
+        // eslint-disable-next-line security/detect-object-injection -- id is from Object.keys of data config
+        const item = data[id];
+
+        if (!item.pmtiles && !item.mbtiles) {
+          console.log(
+            `Missing "pmtiles" or "mbtiles" property for ${id} data source`,
+          );
+          continue;
+        }
+
+        dataLoadPromises.push(
+          serve_data.add(options, serving.data, item, id, opts),
+        );
+      }
+      return Promise.all(dataLoadPromises);
+    }),
+  );
+
   startupPromises.push(
     serve_font(options, serving.fonts, opts).then((sub) => {
       app.use('/', sub);
     }),
   );
-  for (const id of Object.keys(data)) {
-    // eslint-disable-next-line security/detect-object-injection -- id is from Object.keys of data config
-    const item = data[id];
-    // eslint-disable-next-line security/detect-object-injection -- id is from Object.keys of data config
-    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;
-    }
-    startupPromises.push(serve_data.add(options, serving.data, item, id, opts));
-  }
   if (options.serveAllStyles) {
     fs.readdir(options.paths.styles, { withFileTypes: true }, (err, files) => {
       if (err) {
@@ -606,7 +658,7 @@ async function start(opts) {
       const content = fs.readFileSync(templateFile, 'utf-8');
       const compiled = handlebars.compile(content.toString());
       app.get(urlPath, (req, res, next) => {
-        if (opts.verbose) {
+        if (opts.verbose >= 1) {
           console.log(`Serving template at path: ${urlPath}`);
         }
         let data = {};
@@ -626,7 +678,7 @@ async function start(opts) {
             if (template === 'wmts') res.set('Content-Type', 'text/xml');
             return res.status(200).send(compiled(data));
           } else {
-            if (opts.verbose) {
+            if (opts.verbose >= 1) {
               console.log(`Forwarding request for: ${urlPath} to next route`);
             }
             next('route');

package/src/utils.js

@@ -493,8 +493,7 @@ export async function fetchTileData(source, sourceType, z, x, y) {
   } else if (sourceType === 'mbtiles') {
     return new Promise((resolve) => {
       source.getTile(z, x, y, (err, tileData, tileHeader) => {
-        if (err) {
-          console.error('Error fetching MBTiles tile:', err);
+        if (err || tileData == null) {
           return resolve(null);
         }
         resolve({ data: tileData, headers: tileHeader });

package/test/tiles_data.js

@@ -23,6 +23,6 @@ describe('Vector tiles', function () {
     testTile(prefix, 0, 1, 0, 404);
     testTile(prefix, 0, 0, 1, 404);
 
-    testTile(prefix, 14, 0, 0, 204); // non existent tile
+    testTile(prefix, 14, 0, 0, 204); // non existent tile (vector tiles default to 204)
   });
 });