tileserver-gl-light 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

@@ -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/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-light",
-  "version": "4.3.3",
+  "version": "4.4.0",
   "description": "Map tile server for JSON GL styles - serving vector tiles",
   "main": "src/main.js",
   "bin": "src/main.js",

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;