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

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # tileserver-gl changelog
 
-## 5.5.0-pre.5
+## 5.5.0-pre.6
 * Add S3 support for PMTiles with multiple AWS credential profiles (https://github.com/maptiler/tileserver-gl/pull/1779) by @acalcutt
 * Create .aws directory passthrough folder in Dockerfile (https://github.com/maptiler/tileserver-gl/pull/1784) by @acalcutt
 * Update eslint to v9 (https://github.com/maptiler/tileserver-gl/pull/1473) by @acalcutt
@@ -8,6 +8,8 @@
 * Add Visual Regression Tests for Static Image Overlays (https://github.com/maptiler/tileserver-gl/pull/1792) by @acalcutt
 * Fix S3 URL parsing for nested paths in AWS buckets (https://github.com/maptiler/tileserver-gl/pull/1819) by @acalcutt
 * Fix Renderer Crashes and Memory Leak (https://github.com/maptiler/tileserver-gl/pull/1825) by @acalcutt
+* Fix loading local data sources (PMTiles/MBTiles) specified in style (https://github.com/maptiler/tileserver-gl/pull/1855) by @acalcutt
+* **BREAKING**: Change 'sparse' option default based on tile format - vector tiles (pbf) default to false (204), raster tiles default to true (404 for overzoom) by @acalcutt
 
 ## 5.4.0
 * Fix the issue where the tile URL cannot be correctly parsed with the HTTPS protocol when using an nginx proxy service (https://github.com/maptiler/tileserver-gl/pull/1578) by @dakanggo

package/docs/config.rst

@@ -249,7 +249,7 @@ The data source does not need to be specified here unless you explicitly want to
 Data Source Options
 --------------
 
-Within the top-level ``data`` object in your configuration, each defined data source (e.g., `terrain`, `sparse_vector_tiles`) can have several key properties. These properties define how *tileserver-gl* processes and serves the tiles from that source.
+Within the top-level ``data`` object in your configuration, each defined data source (e.g., `terrain`, `vector_tiles`) can have several key properties. These properties define how *tileserver-gl* processes and serves the tiles from that source.
 
 For example::
 
@@ -257,12 +257,10 @@ For example::
     "terrain": {
       "mbtiles": "terrain1.mbtiles",
       "encoding": "mapbox",
-      "tileSize": 512,
-      "sparse": true
+      "tileSize": 512
     },
-    "sparse_vector_tiles": {
-      "pmtiles": "custom_osm.pmtiles",
-      "sparse": true
+    "vector_tiles": {
+      "pmtiles": "custom_osm.pmtiles"
     },
     "production-s3-tiles": {
       "pmtiles": "s3://prod-bucket/tiles.pmtiles",
@@ -283,10 +281,13 @@ Here are the available options for each data source:
     Default: ``256``.
 
 ``sparse`` (boolean)
-    Controls the HTTP status code returned by *tileserver-gl* when a requested tile is not found in the source.
-    When ``true``, a ``410 Gone`` status is returned for missing tiles. This behaviour is beneficial for clients like MapLibre-GL-JS or MapLibre-Native, as it signals them to attempt loading tiles from lower zoom levels (overzooming) when a higher-zoom tile is explicitly missing.
-    When ``false`` (default), *tileserver-gl* returns a ``204 No Content`` for missing tiles, which typically signals the client to stop trying to load a substitute.
-    Default: ``false``.
+    Controls behavior when a tile is not found in the source.
+
+    * ``true`` - Returns HTTP 404, allowing clients like MapLibre to overzoom and use parent tiles. Use this for terrain or datasets with uneven zoom coverage.
+    * ``false`` - Returns HTTP 204 (No Content), signaling an intentionally empty tile and preventing overzoom.
+
+    This can be set globally in the top-level options or per-data-source (per-source overrides global).
+    Default: Depends on tile format - ``false`` for vector tiles (pbf), ``true`` for raster tiles (png, webp, jpg, etc.).
 
 ``s3Profile`` (string)
     Specifies the AWS credential profile to use for S3 PMTiles sources. The profile must be defined in your ``~/.aws/credentials`` file.

package/docs/usage.rst

@@ -19,6 +19,7 @@ Getting started
     -p, --port <port>         Port [8080] (default: 8080)
     -C|--no-cors              Disable Cross-origin resource sharing headers
     -u|--public_url <url>     Enable exposing the server on subpaths, not necessarily the root of the domain
+    --fetch-timeout <ms>      Timeout in milliseconds for fetching remote tiles (default: 15000)
     -V, --verbose [level]     More verbose output (level 1-3)
                                 -V, --verbose, -V 1, or --verbose 1: Important operations
                                 -V 2 or --verbose 2: Detailed operations  
@@ -101,6 +102,26 @@ Default preview style and configuration
 - If no configuration file is specified, a default preview style (compatible with openmaptiles) is used.
 - If no data file is specified (and is not found in the current working directory), a sample file is downloaded (showing the Zurich area)
 
+Remote tile fetching and timeouts
+======
+
+TileServer GL can fetch tiles from remote HTTP/HTTPS sources referenced in your style. The ``--fetch-timeout`` option controls how long the server will wait for remote tile requests before giving up.
+
+**Default behavior:**
+- Default timeout is 15 seconds (15000 milliseconds)
+- If a remote tile request exceeds this timeout, an error is logged and an empty tile is returned to the renderer
+
+**Tuning the timeout:**
+
+If you notice timeout errors with certain remote sources, you can adjust the timeout:
+::
+
+  # Increase timeout to 30 seconds for slower remote sources
+  tileserver-gl -c config.json --fetch-timeout 30000
+
+  # Reduce timeout to 5 seconds for faster failure
+  tileserver-gl -c config.json --fetch-timeout 5000
+
 Reloading the configuration
 ======
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileserver-gl-light",
-  "version": "5.5.0-pre.5",
+  "version": "5.5.0-pre.6",
   "description": "Map tile server for JSON GL styles - serving vector tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
@@ -35,14 +35,14 @@
     "docker": "docker build . && docker run --rm -i -p 8080:8080 $(docker build -q .)"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.935.0",
+    "@aws-sdk/client-s3": "^3.946.0",
     "@jsse/pbfont": "^0.3.0",
     "@mapbox/mapbox-gl-rtl-text": "0.3.0",
     "@mapbox/mbtiles": "0.12.1",
     "@mapbox/polyline": "^1.2.1",
     "@mapbox/sphericalmercator": "2.0.2",
     "@mapbox/vector-tile": "2.0.4",
-    "@maplibre/maplibre-gl-inspect": "1.8.0",
+    "@maplibre/maplibre-gl-inspect": "1.8.1",
     "@maplibre/maplibre-gl-style-spec": "24.3.1",
     "@sindresorhus/fnv1a": "3.1.0",
     "advanced-pool": "0.3.3",
@@ -52,12 +52,12 @@
     "commander": "14.0.2",
     "copyfiles": "2.4.1",
     "cors": "2.8.5",
-    "express": "5.1.0",
+    "express": "5.2.1",
     "handlebars": "4.7.8",
     "http-shutdown": "1.2.2",
     "leaflet": "1.9.4",
     "leaflet-hash": "0.2.1",
-    "maplibre-gl": "5.13.0",
+    "maplibre-gl": "5.14.0",
     "morgan": "1.10.1",
     "pbf": "4.0.1",
     "pmtiles": "4.3.0",

package/public/resources/maplibre-gl-inspect.js

@@ -59,7 +59,7 @@
     function requireLodash_isequal () {
     	if (hasRequiredLodash_isequal) return lodash_isequal.exports;
     	hasRequiredLodash_isequal = 1;
-    	(function (module, exports) {
+    	(function (module, exports$1) {
     		/** Used as the size to enable large array optimizations. */
     		var LARGE_ARRAY_SIZE = 200;
 
@@ -145,7 +145,7 @@
     		var root = freeGlobal || freeSelf || Function('return this')();
 
     		/** Detect free variable `exports`. */
-    		var freeExports = exports && !exports.nodeType && exports;
+    		var freeExports = exports$1 && !exports$1.nodeType && exports$1;
 
     		/** Detect free variable `module`. */
     		var freeModule = freeExports && 'object' == 'object' && module && !module.nodeType && module;
@@ -2115,7 +2115,7 @@
     function requireRandomColor () {
     	if (hasRequiredRandomColor) return randomColor$1.exports;
     	hasRequiredRandomColor = 1;
-    	(function (module, exports) {
+    	(function (module, exports$1) {
     (function(root, factory) {
 
     		  // Support CommonJS
@@ -2124,11 +2124,11 @@
 
     		    // Support NodeJS & Component, which allow module.exports to be a function
     		    if (module && module.exports) {
-    		      exports = module.exports = randomColor;
+    		      exports$1 = module.exports = randomColor;
     		    }
 
     		    // Support CommonJS 1.1.1 spec
-    		    exports.randomColor = randomColor;
+    		    exports$1.randomColor = randomColor;
 
     		  // Support AMD
     		  }
@@ -2860,18 +2860,18 @@
                                 this.sources[sourceId] = vectorLayerIds;
                             }
                             else {
-                                throw new Error("Missing vectorlayersIds in source" + sourceId);
+                                throw new Error("Missing vector_layers in source: " + sourceId);
                             }
                         }
                         catch (_b) {
                             console.warn("Unable to retrieve tileJSON from " + style.sources[sourceId].url + " using style's layers");
                             for (const layer of style.layers) {
                                 if ('source-layer' in layer && layer['source-layer']) {
-                                    const sourceId = layer['source-layer'];
+                                    const layerId = layer['source-layer'];
                                     if (!this.sources[sourceId]) {
                                         this.sources[sourceId] = [];
                                     }
-                                    this.sources[sourceId].push(layer.id);
+                                    this.sources[sourceId].push(layerId);
                                 }
                             }
                         }
@@ -2881,6 +2881,10 @@
                     if (mapStyleSourcesNames.indexOf(sourceId) === -1) {
                         delete this.sources[sourceId];
                     }
+                    else {
+                        // uniqify the list of layer names
+                        this.sources[sourceId] = [...new Set(this.sources[sourceId])];
+                    }
                 }
             });
         }