tileserver-gl 4.3.3 → 4.4.0

package/.github/workflows/ct.yml

@@ -55,3 +55,18 @@ jobs:
 
       - name: Run tests 🧪
         run: xvfb-run --server-args="-screen 0 1024x768x24" npm test
+        
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: 'arm64'
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        
+      - name: Test Docker Build
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          push: false
+          platforms: linux/arm64,linux/amd64

package/Dockerfile

@@ -22,7 +22,7 @@ RUN set -ex; \
       librsvg2-dev \
       libcurl4-openssl-dev \
       libpixman-1-dev; \
-    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+    wget -qO- https://deb.nodesource.com/setup_18.x | bash; \
     apt-get install -y nodejs; \
     apt-get -y remove wget; \
     apt-get -y --purge autoremove; \
@@ -61,7 +61,7 @@ RUN set -ex; \
       libcurl4 \
       librsvg2-2 \
       libpango1.0; \
-    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+    wget -qO- https://deb.nodesource.com/setup_18.x | bash; \
     apt-get install -y nodejs; \
     apt-get -y remove wget; \
     apt-get -y --purge autoremove; \

package/Dockerfile_light

@@ -13,7 +13,7 @@ RUN set -ex; \
     apt-get -y --no-install-recommends install \
       ca-certificates \
       wget; \
-    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+    wget -qO- https://deb.nodesource.com/setup_18.x | bash; \
     apt-get install -y nodejs; \
     apt-get -y remove wget; \
     apt-get -y --purge autoremove; \

package/Dockerfile_test

@@ -27,7 +27,7 @@ RUN set -ex; \
       librsvg2-dev \
       libcurl4-openssl-dev \
       libpixman-1-dev; \
-    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+    wget -qO- https://deb.nodesource.com/setup_18.x | bash; \
     apt-get install -y nodejs; \
     apt-get clean;
 

package/README.md

@@ -10,7 +10,7 @@ Vector and raster maps with GL styles. Server-side rendering by MapLibre GL Nati
 Download vector tiles from [OpenMapTiles](https://data.maptiler.com/downloads/planet/).
 ## Getting Started with Node
 
-Make sure you have Node.js version **14.20.0** or above installed. Node 16 is recommended. (running `node -v` it should output something like `v16.x.x`). Running without docker requires [Native dependencies](https://tileserver.readthedocs.io/en/latest/installation.html#npm) to be installed first.
+Make sure you have Node.js version **14.20.0** or above installed. Node 18 is recommended. (running `node -v` it should output something like `v18.x.x`). Running without docker requires [Native dependencies](https://maptiler-tileserver.readthedocs.io/en/latest/installation.html#npm) to be installed first.
 
 Install `tileserver-gl` with server-side raster rendering of vector tiles with npm. 
 
@@ -81,7 +81,7 @@ xvfb-run --server-args="-screen 0 1024x768x24" node .
 
 ## Documentation
 
-You can read the full documentation of this project at https://tileserver.readthedocs.io/.
+You can read the full documentation of this project at https://maptiler-tileserver.readthedocs.io/.
 
 ## Alternative
 

package/docs/installation.rst

@@ -60,7 +60,7 @@ Alternatively, you can use ``tileserver-gl-light`` package instead, which is pur
 From source
 ===========
 
-Make sure you have Node v10 (nvm install 10) and run::
+Make sure you have Node v18 (nvm install 18) and run::
 
   npm install
   node .

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileserver-gl",
-  "version": "4.3.3",
+  "version": "4.4.0",
   "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
@@ -22,7 +22,7 @@
     "@mapbox/mbtiles": "0.12.1",
     "@mapbox/sphericalmercator": "1.2.0",
     "@mapbox/vector-tile": "1.3.1",
-    "@maplibre/maplibre-gl-native": "5.1.0",
+    "@maplibre/maplibre-gl-native": "5.1.1",
     "@maplibre/maplibre-gl-style-spec": "17.0.2",
     "advanced-pool": "0.3.3",
     "canvas": "2.11.0",
@@ -43,17 +43,17 @@
     "sanitize-filename": "1.6.3"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.3.0",
-    "@commitlint/config-conventional": "^17.3.0",
-    "@typescript-eslint/eslint-plugin": "^5.47.1",
-    "@typescript-eslint/parser": "^5.47.1",
+    "@commitlint/cli": "^17.4.0",
+    "@commitlint/config-conventional": "^17.4.0",
+    "@typescript-eslint/eslint-plugin": "^5.48.0",
+    "@typescript-eslint/parser": "^5.48.0",
     "chai": "4.3.7",
-    "eslint": "^8.30.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.31.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-jsdoc": "^39.6.4",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-security": "^1.5.0",
-    "husky": "^8.0.1",
+    "husky": "^8.0.3",
     "lint-staged": "^13.1.0",
     "mocha": "^10.2.0",
     "prettier": "^2.8.1",
@@ -69,7 +69,7 @@
   ],
   "license": "BSD-2-Clause",
   "engines": {
-    "node": ">=14.15.0 <17"
+    "node": ">=14.20.0 <19"
   },
   "repository": {
     "url": "git+https://github.com/maptiler/tileserver-gl.git",

package/src/serve_rendered.js

@@ -615,6 +615,7 @@ export const serve_rendered = {
       ) {
         return res.status(400).send('Invalid center');
       }
+
       if (
         Math.min(width, height) <= 0 ||
         Math.max(width, height) * scale > (options.maxSize || 2048) ||
@@ -623,6 +624,7 @@ export const serve_rendered = {
       ) {
         return res.status(400).send('Invalid size');
       }
+
       if (format === 'png' || format === 'webp') {
       } else if (format === 'jpg' || format === 'jpeg') {
         format = 'jpeg';
@@ -630,8 +632,9 @@ export const serve_rendered = {
         return res.status(400).send('Invalid format');
       }
 
+      const tileMargin = Math.max(options.tileMargin || 0, 0);
       let pool;
-      if (opt_mode === 'tile') {
+      if (opt_mode === 'tile' && tileMargin === 0) {
         pool = item.map.renderers[scale];
       } else {
         pool = item.map.renderers_static[scale];
@@ -646,12 +649,12 @@ export const serve_rendered = {
           width: width,
           height: height,
         };
+
         if (z === 0) {
           params.width *= 2;
           params.height *= 2;
         }
 
-        const tileMargin = Math.max(options.tileMargin || 0, 0);
         if (z > 2 && tileMargin > 0) {
           params.width += tileMargin * 2;
           params.height += tileMargin * 2;