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

package/CHANGELOG.md

@@ -1,11 +1,13 @@
 # tileserver-gl changelog
 
-## 5.4.0-pre.0
+## 5.4.0-pre.1
 * 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
 * Use jemalloc as memory allocator in the docker image (https://github.com/maptiler/tileserver-gl/pull/1574) by @MichielMortier
 * Rasters: Add tileSize to TileJSON (https://github.com/maptiler/tileserver-gl/pull/1559) by @roblabs
 * Allow a 'sparse' option per data source (https://github.com/maptiler/tileserver-gl/pull/1558) by @acalcutt
 * Updates Maplibre-gl-js to v5.6.0 and adds color-relief support (note: this is not yet supported by maplibre-native) (https://github.com/maptiler/tileserver-gl/pull/1591)
+* Fix getPublicUrl to handle relative and absolute URLs (https://github.com/maptiler/tileserver-gl/pull/1472) by @Monnte
+* Workaround for 'hillshade-method' not yet being suported in maplibre-native (https://github.com/maptiler/tileserver-gl/pull/1620) by @acalcutt
 
 ## 5.3.0
 * Fix - Include public\resources js files on npm publish by specifying included files in package.json (https://github.com/maptiler/tileserver-gl/pull/1490) by @acalcutt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileserver-gl-light",
-  "version": "5.4.0-pre.0",
+  "version": "5.4.0-pre.1",
   "description": "Map tile server for JSON GL styles - serving vector tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
@@ -39,12 +39,12 @@
     "@mapbox/mbtiles": "0.12.1",
     "@mapbox/polyline": "^1.2.1",
     "@mapbox/sphericalmercator": "2.0.1",
-    "@mapbox/vector-tile": "2.0.3",
+    "@mapbox/vector-tile": "2.0.4",
     "@maplibre/maplibre-gl-inspect": "1.7.1",
     "@maplibre/maplibre-gl-style-spec": "23.3.0",
     "@sindresorhus/fnv1a": "3.1.0",
     "advanced-pool": "0.3.3",
-    "axios": "^1.9.0",
+    "axios": "^1.10.0",
     "chokidar": "4.0.3",
     "clone": "2.1.2",
     "color": "5.0.0",
@@ -60,7 +60,7 @@
     "morgan": "1.10.0",
     "pbf": "4.0.1",
     "pmtiles": "4.3.0",
-    "proj4": "2.17.0",
+    "proj4": "2.19.4",
     "sanitize-filename": "1.6.3",
     "semver": "^7.7.2",
     "tileserver-gl-styles": "2.0.0"

package/src/serve_rendered.js

@@ -1276,13 +1276,65 @@ export const serve_rendered = {
 
     for (const layer of styleJSON.layers || []) {
       if (layer && layer.paint) {
+        const layerIdForWarning = layer.id || 'unnamed-layer';
+
         // Remove (flatten) 3D buildings
         if (layer.paint['fill-extrusion-height']) {
+          if (verbose) {
+            console.warn(
+              `Warning: Layer '${layerIdForWarning}' in style '${id}' has property 'fill-extrusion-height'. ` +
+                `3D extrusion may appear distorted or misleading when rendered as a static image due to camera angle limitations. ` +
+                `It will be flattened (set to 0) in rendered images. ` +
+                `Note: This property will still work with MapLibre GL JS vector maps.`,
+            );
+          }
           layer.paint['fill-extrusion-height'] = 0;
         }
         if (layer.paint['fill-extrusion-base']) {
+          if (verbose) {
+            console.warn(
+              `Warning: Layer '${layerIdForWarning}' in style '${id}' has property 'fill-extrusion-base'. ` +
+                `3D extrusion may appear distorted or misleading when rendered as a static image due to camera angle limitations. ` +
+                `It will be flattened (set to 0) in rendered images. ` +
+                `Note: This property will still work with MapLibre GL JS vector maps.`,
+            );
+          }
           layer.paint['fill-extrusion-base'] = 0;
         }
+
+        // --- Remove hillshade properties incompatible with MapLibre Native ---
+        const hillshadePropertiesToRemove = [
+          'hillshade-method',
+          'hillshade-illumination-direction',
+          'hillshade-highlight-color',
+        ];
+
+        for (const prop of hillshadePropertiesToRemove) {
+          if (prop in layer.paint) {
+            if (verbose) {
+              console.warn(
+                `Warning: Layer '${layerIdForWarning}' in style '${id}' has property '${prop}'. ` +
+                  `This property is not supported by MapLibre Native. ` +
+                  `It will be removed in rendered images. ` +
+                  `Note: This property will still work with MapLibre GL JS vector maps.`,
+              );
+            }
+            delete layer.paint[prop];
+          }
+        }
+
+        // --- Remove 'hillshade-shadow-color' if it is an array. It can only be a string in MapLibre Native ---
+        if (Array.isArray(layer.paint['hillshade-shadow-color'])) {
+          if (verbose) {
+            console.warn(
+              `Warning: Layer '${layerIdForWarning}' in style '${id}' has property 'hillshade-shadow-color'. ` +
+                `An array value is not supported by MapLibre Native for this property (expected string/color). ` +
+                `It will be removed in rendered images. ` +
+                `Note: Using an array for this property will still work with MapLibre GL JS vector maps.`,
+            );
+          }
+          delete layer.paint['hillshade-shadow-color'];
+        }
       }
     }
 

package/src/utils.js

@@ -119,7 +119,11 @@ function getUrlObject(req) {
  */
 export function getPublicUrl(publicUrl, req) {
   if (publicUrl) {
-    return publicUrl;
+    try {
+      return new URL(publicUrl).toString();
+    } catch {
+      return new URL(publicUrl, getUrlObject(req)).toString();
+    }
   }
   return getUrlObject(req).toString();
 }

package/test/style.js

@@ -25,7 +25,7 @@ describe('Styles', function () {
           expect(res.body.sources).to.be.a('object');
           expect(res.body.glyphs).to.be.a('string');
           expect(res.body.sprite).to.be.a('string');
-          expect(res.body.sprite).to.be.equal('/test/styles/test-style/sprite');
+          expect(res.body.sprite).to.contain('/test/styles/test-style/sprite');
           expect(res.body.layers).to.be.a('array');
         })
         .end(done);