tileserver-gl-light 5.3.1 → 5.4.0-pre.0

package/src/serve_data.js

@@ -108,7 +108,11 @@ export const serve_data = {
         x,
         y,
       );
-      if (fetchTile == null) return res.status(204).send();
+      if (fetchTile == null && item.tileJSON.sparse) {
+        return res.status(410).send();
+      } else if (fetchTile == null) {
+        return res.status(204).send();
+      }
 
       let data = fetchTile.data;
       let headers = fetchTile.headers;
@@ -366,51 +370,35 @@ export const serve_data = {
 
     let source;
     let sourceType;
+    tileJSON['name'] = id;
+    tileJSON['format'] = 'pbf';
+    tileJSON['encoding'] = params['encoding'];
+    tileJSON['tileSize'] = params['tileSize'];
+    tileJSON['sparse'] = params['sparse'];
+
     if (inputType === 'pmtiles') {
       source = openPMtiles(inputFile);
       sourceType = 'pmtiles';
       const metadata = await getPMtilesInfo(source);
-
-      tileJSON['encoding'] = params['encoding'];
-      tileJSON['tileSize'] = params['tileSize'];
-      tileJSON['name'] = id;
-      tileJSON['format'] = 'pbf';
       Object.assign(tileJSON, metadata);
-
-      tileJSON['tilejson'] = '2.0.0';
-      delete tileJSON['filesize'];
-      delete tileJSON['mtime'];
-      delete tileJSON['scheme'];
-
-      Object.assign(tileJSON, params.tilejson || {});
-      fixTileJSONCenter(tileJSON);
-
-      if (options.dataDecoratorFunc) {
-        tileJSON = options.dataDecoratorFunc(id, 'tilejson', tileJSON);
-      }
     } else if (inputType === 'mbtiles') {
       sourceType = 'mbtiles';
       const mbw = await openMbTilesWrapper(inputFile);
       const info = await mbw.getInfo();
       source = mbw.getMbTiles();
-      tileJSON['encoding'] = params['encoding'];
-      tileJSON['tileSize'] = params['tileSize'];
-      tileJSON['name'] = id;
-      tileJSON['format'] = 'pbf';
-
       Object.assign(tileJSON, info);
+    }
 
-      tileJSON['tilejson'] = '2.0.0';
-      delete tileJSON['filesize'];
-      delete tileJSON['mtime'];
-      delete tileJSON['scheme'];
+    delete tileJSON['filesize'];
+    delete tileJSON['mtime'];
+    delete tileJSON['scheme'];
+    tileJSON['tilejson'] = '3.0.0';
 
-      Object.assign(tileJSON, params.tilejson || {});
-      fixTileJSONCenter(tileJSON);
+    Object.assign(tileJSON, params.tilejson || {});
+    fixTileJSONCenter(tileJSON);
 
-      if (options.dataDecoratorFunc) {
-        tileJSON = options.dataDecoratorFunc(id, 'tilejson', tileJSON);
-      }
+    if (options.dataDecoratorFunc) {
+      tileJSON = options.dataDecoratorFunc(id, 'tilejson', tileJSON);
     }
 
     repo[id] = {

package/src/serve_rendered.js

@@ -1005,6 +1005,7 @@ export const serve_rendered = {
         );
       }
       const info = clone(item.tileJSON);
+      info.tileSize = tileSize != undefined ? tileSize : 256;
       info.tiles = getTileUrls(
         req,
         info.tiles,
@@ -1122,7 +1123,16 @@ export const serve_rendered = {
                 x,
                 y,
               );
-              if (fetchTile == null) {
+              if (fetchTile == null && sourceInfo.sparse == true) {
+                if (verbose) {
+                  console.log(
+                    'fetchTile warning on %s, sparse response',
+                    req.url,
+                  );
+                }
+                callback();
+                return;
+              } else if (fetchTile == null) {
                 if (verbose) {
                   console.log(
                     'fetchTile error on %s, serving empty response',
@@ -1308,6 +1318,7 @@ export const serve_rendered = {
 
     for (const name of Object.keys(styleJSON.sources)) {
       let sourceType;
+      let sparse;
       let source = styleJSON.sources[name];
       let url = source.url;
       if (
@@ -1332,6 +1343,7 @@ export const serve_rendered = {
         if (dataInfo.inputFile) {
           inputFile = dataInfo.inputFile;
           sourceType = dataInfo.fileType;
+          sparse = dataInfo.sparse;
         } else {
           console.error(`ERROR: data "${inputFile}" not found!`);
           process.exit(1);
@@ -1360,6 +1372,7 @@ export const serve_rendered = {
           const type = source.type;
           Object.assign(source, metadata);
           source.type = type;
+          source.sparse = sparse;
           source.tiles = [
             // meta url which will be detected when requested
             `pmtiles://${name}/{z}/{x}/{y}.${metadata.format || 'pbf'}`,
@@ -1399,6 +1412,7 @@ export const serve_rendered = {
           const type = source.type;
           Object.assign(source, info);
           source.type = type;
+          source.sparse = sparse;
           source.tiles = [
             // meta url which will be detected when requested
             `mbtiles://${name}/{z}/{x}/{y}.${info.format || 'pbf'}`,

package/src/server.js

@@ -268,23 +268,80 @@ async function start(opts) {
             opts,
             styleJSON,
             function dataResolver(styleSourceId) {
-              let fileType;
-              let inputFile;
+              let resolvedFileType;
+              let resolvedInputFile;
+              let resolvedSparse = false;
+
               for (const id of Object.keys(data)) {
-                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;
+                const sourceData = data[id];
+                let currentFileType;
+                let currentInputFileValue;
+
+                // Check for recognized file type keys
+                if (sourceData.hasOwnProperty('pmtiles')) {
+                  currentFileType = 'pmtiles';
+                  currentInputFileValue = sourceData.pmtiles;
+                } else if (sourceData.hasOwnProperty('mbtiles')) {
+                  currentFileType = 'mbtiles';
+                  currentInputFileValue = sourceData.mbtiles;
+                }
+
+                if (currentFileType && currentInputFileValue) {
+                  // Check if this source matches the styleSourceId
+                  if (
+                    styleSourceId === id ||
+                    styleSourceId === currentInputFileValue
+                  ) {
+                    resolvedFileType = currentFileType;
+                    resolvedInputFile = currentInputFileValue;
+
+                    // Get sparse flag specifically from this matching source
+                    // Default to false if 'sparse' key doesn't exist or is falsy in a boolean context
+                    if (sourceData.hasOwnProperty('sparse')) {
+                      resolvedSparse = !!sourceData.sparse; // Ensure boolean
+                    } else {
+                      resolvedSparse = false; // Explicitly set default if not present on item
+                    }
+                    break; // Found our match, exit the outer loop
+                  }
                 }
               }
-              if (!isValidHttpUrl(inputFile)) {
-                inputFile = path.resolve(options.paths[fileType], inputFile);
+
+              // If no match was found
+              if (!resolvedInputFile || !resolvedFileType) {
+                console.warn(
+                  `Data source not found for styleSourceId: ${styleSourceId}`,
+                );
+                return {
+                  inputFile: undefined,
+                  fileType: undefined,
+                  sparse: false,
+                };
+              }
+
+              if (!isValidHttpUrl(resolvedInputFile)) {
+                // Ensure options.paths and options.paths[resolvedFileType] exist before trying to use them
+                if (
+                  options &&
+                  options.paths &&
+                  options.paths[resolvedFileType]
+                ) {
+                  resolvedInputFile = path.resolve(
+                    options.paths[resolvedFileType],
+                    resolvedInputFile,
+                  );
+                } else {
+                  console.warn(
+                    `Path configuration missing for fileType: ${resolvedFileType}. Using relative path for: ${resolvedInputFile}`,
+                  );
+                }
               }
 
-              return { inputFile, fileType };
+              return {
+                inputFile: resolvedInputFile,
+                fileType: resolvedFileType,
+                sparse: resolvedSparse,
+              };
             },
           ),
         );

package/src/utils.js

@@ -198,9 +198,12 @@ export function getTileUrls(
   const uris = [];
   if (!publicUrl) {
     let xForwardedPath = `${req.get('X-Forwarded-Path') ? '/' + req.get('X-Forwarded-Path') : ''}`;
+    let protocol = req.get('X-Forwarded-Protocol')
+      ? req.get('X-Forwarded-Protocol')
+      : req.protocol;
     for (const domain of domains) {
       uris.push(
-        `${req.protocol}://${domain}${xForwardedPath}/${path}/${tileParams}${format}${query}`,
+        `${protocol}://${domain}${xForwardedPath}/${path}/${tileParams}${format}${query}`,
       );
     }
   } else {