tileserver-gl-light 4.6.6 → 4.8.0

package/.eslintrc.cjs

@@ -28,5 +28,9 @@ module.exports = {
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    '@typescript-eslint/no-unused-vars': [
+      'warn',
+      { argsIgnorePattern: 'next|err|info|reject' },
+    ],
   },
 };

package/.github/workflows/ci.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   ci:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out repository ✨ (non-dependabot)
         if: ${{ github.actor != 'dependabot[bot]' }}

package/.github/workflows/codeql.yml

@@ -25,13 +25,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: '/language:${{ matrix.language }}'

package/.github/workflows/ct.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   ct:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out repository ✨ (non-dependabot)
         if: ${{ github.actor != 'dependabot[bot]' }}
@@ -38,7 +38,7 @@ jobs:
           cache: 'npm'
 
       - name: Install dependencies 🚀
-        run: npm ci --prefer-offline --no-audit --omit=optional
+        run: npm ci --prefer-offline --no-audit
 
       - name: Pull test data 📦
         run: >-

package/.github/workflows/release.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   release:
     name: 'Build, Test, Publish'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out repository ✨
         uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
           cache: 'npm'
 
       - name: Install dependencies 🚀
-        run: npm ci --prefer-offline --no-audit --omit=optional
+        run: npm ci --prefer-offline --no-audit
 
       - name: Pull test data 📦
         run: >-

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 ENV \
     NODE_ENV="production" \
@@ -16,7 +16,7 @@ RUN set -ex; \
       gnupg; \
     mkdir -p /etc/apt/keyrings; \
     curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg; \
-    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list; \
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list; \
     apt-get -qq update; \
     apt-get install -y nodejs; \
     npm i -g npm@latest; \

package/Dockerfile_test

@@ -2,7 +2,7 @@
 # Simply run "docker build -f Dockerfile_test ."
 # WARNING: sometimes it fails with a core dumped exception
 
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 ENV NODE_ENV="development"
 
@@ -19,7 +19,7 @@ RUN set -ex; \
       libglfw3-dev \
       libuv1-dev \
       libjpeg-turbo8 \
-      libicu66 \
+      libicu70 \
       libcairo2-dev \
       libpango1.0-dev \
       libjpeg-dev \

package/README.md

@@ -28,8 +28,8 @@ docker build -t tileserver-gl-light .
 [Download from OpenMapTiles.com](https://openmaptiles.com/downloads/planet/) or [create](https://github.com/openmaptiles/openmaptiles) your vector tile, and run following in directory contains your *.mbtiles.
 
 ```
-docker run --rm -it -v $(pwd):/data -p 8000:80 tileserver-gl-light
+docker run --rm -it -v $(pwd):/data -p 8080:8080 tileserver-gl-light
 ```
 
 ## Documentation
-You can read full documentation of this project at https://tileserver.readthedocs.io/.
+You can read full documentation of this project at https://maptiler-tileserver.readthedocs.io/

package/docs/config.rst

@@ -132,6 +132,19 @@ If you have plenty of memory, try setting these equal to or slightly above your
 If you need to conserve memory, try lower values for scale factors that are less common.
 Default is ``[16, 8, 4]``.
 
+``pbfAlias``
+------------------------
+
+Some CDNs did not handle .pbf extension as a static file correctly.
+The default URLs (with .pbf) are always available, but an alternative can be set.
+An example extension suffix would be ".pbf.pict".
+
+``serveAllFonts``
+------------------------
+
+If this option is enabled, all the fonts from the ``paths.fonts`` will be served.
+Otherwise only the fonts referenced by available styles will be served.
+
 ``serveAllStyles``
 ------------------------
 
@@ -139,10 +152,16 @@ If this option is enabled, all the styles from the ``paths.styles`` will be serv
 The process will also watch for changes in this directory and remove/add more styles dynamically.
 It is recommended to also use the ``serveAllFonts`` option when using this option.
 
+``serveStaticMaps``
+------------------------
+
+If this option is enabled, all the static map endpoints will be served.
+Default is ``true``.
+
 ``watermark``
 -----------
 
-Optional string to be rendered into the raster tiles (and static maps) as watermark (bottom-left corner).
+Optional string to be rendered into the raster tiles and static maps as watermark (bottom-left corner).
 Not used by default.
 
 ``staticAttributionText``

package/docs/endpoints.rst

@@ -52,14 +52,14 @@ Static images
 
     * can be provided multiple times
 
-  * ``latlng`` - indicates coordinates are in ``lat,lng`` order rather than the usual ``lng,lat``
-  * ``fill`` - color to use as the fill (e.g. ``red``, ``rgba(255,255,255,0.5)``, ``#0000ff``)
-  * ``stroke`` - color of the path stroke
-  * ``width`` - width of the stroke
-  * ``linecap`` - rendering style for the start and end points of the path
-  * ``linejoin`` - rendering style for overlapping segments of the path with differing directions
-  * ``border`` - color of the optional border path stroke
-  * ``borderwidth`` - width of the border stroke (default 10% of width)
+  * ``latlng`` - indicates coordinates are in ``lat,lng`` order rather than the usual ``lng,lat`` for paths and markers
+  * ``fill`` - default color to use as the fill (e.g. ``red``, ``rgba(255,255,255,0.5)``, ``#0000ff``) for all paths
+  * ``stroke`` - default color of the path stroke for all paths
+  * ``width`` - default width of the stroke for all paths
+  * ``linecap`` - rendering style for the start and end points of all paths - see https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineCap
+  * ``linejoin`` - rendering style for joining successive segments of all paths when the direction changes - see https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/lineJoin
+  * ``border`` - color of the optional border stroke for all paths ; the border is like a halo around the stroke
+  * ``borderwidth`` - width of the border stroke (default 10% of stroke width) for all paths
   * ``marker`` - Marker in format ``lng,lat|iconPath|option|option|...``
 
     * Will be rendered with the bottom center at the provided location

package/docs/installation.rst

@@ -17,61 +17,48 @@ Additional options (see :doc:`/usage`) can be passed to the TileServer GL by app
 npm
 ===
 
-Just run ``npm install -g tileserver-gl``.
+npm is supported on the following platforms with `Native Dependencies <#id1>`_ installed.
 
+- Operating systems:
 
-Native dependencies
--------------------
-
-There are some native dependencies that you need to make sure are installed if you plan to run the TileServer GL natively without docker.
-The precise package names you need to install may differ on various platforms.
-
-These are required on Debian 11:
-  * ``libgles2-mesa``
-  * ``libegl1``
-  * ``xvfb``
-  * ``xauth``
-  * ``libopengl0``
-  * ``libcurl4``
-  * ``curl``
-  * ``libuv1-dev``
-  * ``libc6-dev``
-  * ``http://archive.ubuntu.com/ubuntu/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_2.0.3-0ubuntu1_amd64.deb``
-  * ``http://archive.ubuntu.com/ubuntu/pool/main/i/icu/libicu66_66.1-2ubuntu2_amd64.deb``
-
-These are required on Ubuntu 20.04:
-  * ``libcairo2-dev``
-  * ``libjpeg8-dev``
-  * ``libpango1.0-dev``
-  * ``libgif-dev``
-  * ``build-essential``
-  * ``g++``
-  * ``xvfb``
-  * ``libgles2-mesa-dev``
-  * ``libgbm-dev``
-  * ``libxxf86vm-dev``
-
-``tileserver-gl-light`` on npm
-==============================
-
-Alternatively, you can use ``tileserver-gl-light`` package instead, which is pure javascript (does not have any native dependencies) and can run anywhere, but does not contain rasterization features.
+  - Ubuntu 22.04 (x64/arm64)
+  - macOS 12 (x64/arm64)
+  - Windows (x64)
 
+- Node.js 18,20
+  
+Install globally from npmjs.
+------------------------------
+::
 
-From source
-===========
+  npm install -g tileserver-gl
+  tileserver-gl
 
-Make sure you have Node v18 (nvm install 18) and run::
+Install locally from source
+-------------------
+::
 
+  git clone https://github.com/maptiler/tileserver-gl.git
+  cd tileserver-gl
   npm install
   node .
 
+Native dependencies
+-------------------
 
-On OSX
-======
+Ubuntu 22.04 (x64/arm64)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+- apt install build-essential pkg-config xvfb libglfw3-dev libuv1-dev libjpeg-turbo8 libicu70 libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev gir1.2-rsvg-2.0 librsvg2-2 librsvg2-common libcurl4-openssl-dev libpixman-1-dev libpixman-1-0
 
-Make sure to have dependencies of canvas_ package installed::
+MacOS 12 (x64/arm64)
+~~~~~~~~~~~~~~~~~~~~~~
+- brew install pkg-config cairo libpng jpeg giflib
 
-  brew install pkg-config cairo libpng jpeg giflib
+Windows (x64)
+~~~~~~~~~~~~~~~~~~~~~~~~~
+- `Microsoft Visual C++ 2015-2022 Redistributable <https://aka.ms/vs/17/release/vc_redist.x64.exe>`_
 
+``tileserver-gl-light`` on npm
+==============================
 
-.. _canvas: https://www.npmjs.com/package/canvas
+Alternatively, you can use ``tileserver-gl-light`` package instead, which is pure javascript (does not have any native dependencies) and can run anywhere, but does not contain rasterization features.

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "tileserver-gl-light",
-  "version": "4.6.6",
+  "version": "4.8.0",
   "description": "Map tile server for JSON GL styles - serving vector tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
   "type": "module",
   "scripts": {
-    "test": "mocha test/**.js --timeout 10000",
+    "test": "mocha test/**.js --timeout 10000 --exit",
     "lint:yml": "yamllint --schema=CORE_SCHEMA *.{yml,yaml}",
     "lint:js": "npm run lint:eslint && npm run lint:prettier",
     "lint:js:fix": "npm run lint:eslint:fix && npm run lint:prettier:fix",
@@ -14,7 +14,7 @@
     "lint:eslint:fix": "eslint --fix \"{,!(node_modules|dist|static|public)/**/}*.{js,ts,cjs,mjs}\" --ignore-path .gitignore",
     "lint:prettier": "prettier --check \"{,!(node_modules|dist|static|public)/**/}*.{js,ts,cjs,mjs,json}\" --ignore-path .gitignore",
     "lint:prettier:fix": "prettier --write \"{,!(node_modules|dist|static|public)/**/}*.{js,ts,cjs,mjs,json}\" --ignore-path .gitignore",
-    "docker": "docker build -f Dockerfile . && docker run --rm -i -p 8080:8080 $(docker build -q .)"
+    "docker": "docker build . && docker run --rm -i -p 8080:8080 $(docker build -q .)"
   },
   "dependencies": {
     "@mapbox/glyph-pbf-composite": "0.0.3",
@@ -23,9 +23,9 @@
     "@mapbox/sphericalmercator": "1.2.0",
     "@mapbox/vector-tile": "1.3.1",
     "@maplibre/maplibre-gl-style-spec": "18.0.0",
-    "@sindresorhus/fnv1a": "3.0.0",
+    "@sindresorhus/fnv1a": "3.1.0",
     "advanced-pool": "0.3.3",
-    "axios": "^1.6.1",
+    "axios": "^1.6.5",
     "chokidar": "3.5.3",
     "clone": "2.1.2",
     "color": "4.2.3",
@@ -37,7 +37,7 @@
     "morgan": "1.10.0",
     "pbf": "3.2.1",
     "pmtiles": "2.11.0",
-    "proj4": "2.9.2",
+    "proj4": "2.10.0",
     "sanitize-filename": "1.6.3",
     "tileserver-gl-styles": "2.0.0"
   },

package/public/resources/leaflet.css

@@ -60,6 +60,11 @@
 	padding: 0;
 	}
 
+.leaflet-container img.leaflet-tile {
+	/* See: https://bugs.chromium.org/p/chromium/issues/detail?id=600120 */
+	mix-blend-mode: plus-lighter;
+}
+
 .leaflet-container.leaflet-touch-zoom {
 	-ms-touch-action: pan-x pan-y;
 	touch-action: pan-x pan-y;
@@ -646,7 +651,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	}
 
 /* Printing */
-	
+
 @media print {
 	/* Prevent printers from removing background-images of controls. */
 	.leaflet-control {