tileserver-gl 3.1.1 → 4.1.0

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10-buster AS builder
+FROM node:16-bullseye AS builder
 
 RUN export DEBIAN_FRONTEND=noninteractive \
   && apt-get -qq update \
@@ -11,7 +11,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
       libcairo2-dev \
       libgles2-mesa-dev \
       libgbm-dev \
-      libllvm7 \
       libprotobuf-dev \
   && apt-get -y --purge autoremove \
   && apt-get clean \
@@ -24,7 +23,7 @@ ENV NODE_ENV="production"
 RUN cd /usr/src/app && npm install --production
 
 
-FROM node:10-buster-slim AS final
+FROM node:16-bullseye-slim AS final
 
 RUN export DEBIAN_FRONTEND=noninteractive \
   && apt-get -qq update \
@@ -33,9 +32,20 @@ RUN export DEBIAN_FRONTEND=noninteractive \
       libegl1 \
       xvfb \
       xauth \
+      libopengl0 \
+      libcurl4 \
+      curl \
+      libuv1-dev \
+      libc6-dev \
+      libcap2-bin \
   && apt-get -y --purge autoremove \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
+  
+RUN curl http://archive.ubuntu.com/ubuntu/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_2.0.3-0ubuntu1_amd64.deb --output libjpeg-turbo8_2.0.3-0ubuntu1_amd64.deb
+RUN apt install ./libjpeg-turbo8_2.0.3-0ubuntu1_amd64.deb
+RUN curl http://archive.ubuntu.com/ubuntu/pool/main/i/icu/libicu66_66.1-2ubuntu2_amd64.deb --output libicu66_66.1-2ubuntu2_amd64.deb
+RUN apt install ./libicu66_66.1-2ubuntu2_amd64.deb
 
 COPY --from=builder /usr/src/app /app
 
@@ -51,5 +61,3 @@ EXPOSE 80
 USER node:node
 
 ENTRYPOINT ["/app/docker-entrypoint.sh"]
-
-CMD ["-p", "80"]

package/Dockerfile_light

@@ -1,4 +1,4 @@
-FROM node:10-stretch
+FROM node:16-bullseye
 
 ENV NODE_ENV="production"
 ENV CHOKIDAR_USEPOLLING=1
@@ -6,8 +6,9 @@ ENV CHOKIDAR_INTERVAL=500
 EXPOSE 80
 VOLUME /data
 WORKDIR /data
-ENTRYPOINT ["node", "/usr/src/app/", "-p", "80"]
+ENTRYPOINT ["/usr/src/app/docker-entrypoint.sh"]
 
 RUN mkdir -p /usr/src/app
 COPY / /usr/src/app
 RUN cd /usr/src/app && npm install --production
+RUN ["chmod", "+x", "/usr/src/app/docker-entrypoint.sh"]

package/Dockerfile_test

@@ -2,7 +2,7 @@
 # Simply run "docker build -f Dockerfile_test ."
 # WARNING: sometimes it fails with a core dumped exception
 
-FROM node:10-stretch
+FROM node:16-bullseye
 
 RUN apt-get -qq update \
 && DEBIAN_FRONTEND=noninteractive apt-get -y install \
@@ -17,6 +17,7 @@ RUN apt-get -qq update \
     libllvm3.9 \
     libprotobuf-dev \
     libxxf86vm-dev \
+    libopengl0 \
     xvfb \
 && apt-get clean
 

package/README.md

@@ -5,44 +5,85 @@
 [![Build Status](https://travis-ci.org/maptiler/tileserver-gl.svg?branch=master)](https://travis-ci.org/maptiler/tileserver-gl)
 [![Docker Hub](https://img.shields.io/badge/docker-hub-blue.svg)](https://hub.docker.com/r/maptiler/tileserver-gl/)
 
-Vector and raster maps with GL styles. Server side rendering by Mapbox GL Native. Map tile server for Mapbox GL JS, Android, iOS, Leaflet, OpenLayers, GIS via WMTS, etc.
+Vector and raster maps with GL styles. Server-side rendering by MapLibre GL Native. Map tile server for MapLibre GL JS, Android, iOS, Leaflet, OpenLayers, GIS via WMTS, etc.
 
-## Get Started
+Download vector tiles from [OpenMapTiles](https://data.maptiler.com/downloads/planet/).
+## Getting Started with Node
 
-Make sure you have Node.js version **10** installed (running `node -v` it should output something like `v10.17.0`).
+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.
 
-Install `tileserver-gl` with server-side raster rendering of vector tiles with npm
+Install `tileserver-gl` with server-side raster rendering of vector tiles with npm. 
 
 ```bash
 npm install -g tileserver-gl
 ```
 
-Now download vector tiles from [OpenMapTiles](https://openmaptiles.org/downloads/).
+Once installed, you can use it like the following examples.
 
+using a mbtiles file
 ```bash
-curl -o zurich_switzerland.mbtiles https://[GET-YOUR-LINK]/extracts/zurich_switzerland.mbtiles
+wget https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/zurich_switzerland.mbtiles
+tileserver-gl --mbtiles zurich_switzerland.mbtiles
+[in your browser, visit http://[server ip]:8080]
 ```
 
-Start `tileserver-gl` with the downloaded vector tiles.
-
+using a config.json + style + mbtiles file
 ```bash
-tileserver-gl zurich_switzerland.mbtiles
+wget https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/test_data.zip
+unzip test_data.zip
+tileserver-gl
+[in your browser, visit http://[server ip]:8080]
 ```
 
-Alternatively, you can use the `tileserver-gl-light` package instead, which is pure javascript (does not have any native dependencies) and can run anywhere, but does not contain rasterization on the server side made with MapBox GL Native.
+Alternatively, you can use the `tileserver-gl-light` npm package instead, which is pure javascript, does not have any native dependencies, and can run anywhere, but does not contain rasterization on the server side made with Maplibre GL Native.
 
-## Using Docker
+## Getting Started with Docker
 
-An alternative to npm to start the packed software easier is to install [Docker](https://www.docker.com/) on your computer and then run in the directory with the downloaded MBTiles the command:
+An alternative to npm to start the packed software easier is to install [Docker](https://www.docker.com/) on your computer and then run from the tileserver-gl directory
 
+Example using a mbtiles file
 ```bash
+wget https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/zurich_switzerland.mbtiles
+docker run --rm -it -v $(pwd):/data -p 8080:80 maptiler/tileserver-gl --mbtiles zurich_switzerland.mbtiles
+[in your browser, visit http://[server ip]:8080]
+```
+
+Example using a config.json + style + mbtiles file
+```bash
+wget https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/test_data.zip
+unzip test_data.zip
 docker run --rm -it -v $(pwd):/data -p 8080:80 maptiler/tileserver-gl
+[in your browser, visit http://[server ip]:8080]
 ```
 
-This will download and start a ready to use container on your computer and the maps are going to be available in webbrowser on localhost:8080.
+Example using a different path
+```bash
+docker run --rm -it -v /your/local/config/path:/data -p 8080:80 maptiler/tileserver-gl
+```
+replace '/your/local/config/path' with the path to your config file
+
 
-On laptop you can use [Docker Kitematic](https://kitematic.com/) and search "tileserver-gl" and run it, then drop in the 'data' folder the MBTiles.
+Alternatively, you can use the `maptiler/tileserver-gl-light` docker image instead, which is pure javascript, does not have any native dependencies, and can run anywhere, but does not contain rasterization on the server side made with Maplibre GL Native.
+
+## Getting Started with Linux cli
+
+Test from command line
+```bash
+wget https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/test_data.zip
+unzip -q test_data.zip -d test_data
+xvfb-run --server-args="-screen 0 1024x768x24" npm test
+```
+
+Run from command line
+```bash
+xvfb-run --server-args="-screen 0 1024x768x24" node .
+```
 
 ## Documentation
 
-You can read full documentation of this project at https://tileserver.readthedocs.io/.
+You can read the full documentation of this project at https://tileserver.readthedocs.io/.
+
+## Alternative
+
+Discover MapTiler Server if you need a [map server with easy setup and user-friendly interface](https://www.maptiler.com/server/).
+

package/docker-entrypoint.sh

@@ -10,12 +10,24 @@ handle() {
 
 trap handle INT TERM
 
+refresh() {
+	SIGNAL=$(( $? - 128 ))
+	echo "Caught signal ${SIGNAL}, refreshing"
+	kill -s ${SIGNAL} $(pidof node) 2>/dev/null
+}
+
+trap refresh HUP
+
 if ! which -- "${1}"; then
   # first arg is not an executable
-  xvfb-run -a --server-args="-screen 0 1024x768x24" -- node /app/ "$@" &
+  xvfb-run -a --server-args="-screen 0 1024x768x24" -- node /app/ -p 80 "$@" &
 	# Wait exits immediately on signals which have traps set. Store return value and wait
 	# again for all jobs to actually complete before continuing.
 	wait $! || RETVAL=$?
+	while [ ${RETVAL} = 129 ] ; do
+	  # Refressh signal HUP received. Continue waiting for signals.
+	  wait $! || RETVAL=$?
+	done
 	wait
 	exit ${RETVAL}
 fi

package/docker-entrypoint_light.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+set -e
+
+handle() {
+	SIGNAL=$(( $? - 128 ))
+	echo "Caught signal ${SIGNAL}, stopping gracefully"
+	kill -s ${SIGNAL} $(pidof node) 2>/dev/null
+}
+
+trap handle INT TERM
+
+refresh() {
+	SIGNAL=$(( $? - 128 ))
+	echo "Caught signal ${SIGNAL}, refreshing"
+	kill -s ${SIGNAL} $(pidof node) 2>/dev/null
+}
+
+trap refresh HUP
+
+if ! which -- "${1}"; then
+  # first arg is not an executable
+  node /usr/src/app/ -p 80 "$@" &
+	# Wait exits immediately on signals which have traps set. Store return value and wait
+	# again for all jobs to actually complete before continuing.
+	wait $! || RETVAL=$?
+	while [ ${RETVAL} = 129 ] ; do
+	  # Refressh signal HUP received. Continue waiting for signals.
+	  wait $! || RETVAL=$?
+	done
+	wait
+	exit ${RETVAL}
+fi
+
+exec "$@"

package/docs/conf.py

@@ -44,7 +44,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'TileServer GL'
-copyright = u'2016, Klokan Technologies GmbH'
+copyright = u'2022, MapTiler.com'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -197,7 +197,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
   ('index', 'TileServerGL.tex', u'TileServer GL Documentation',
-   u'Klokan Technologies GmbH', 'manual'),
+   u'MapTiler.com', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -227,7 +227,7 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'tileservergl', u'TileServer GL Documentation',
-     [u'Klokan Technologies GmbH'], 1)
+     [u'MapTiler.com'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -241,7 +241,7 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index', 'TileServerGL', u'TileServer GL Documentation',
-   u'Klokan Technologies GmbH', 'TileServerGL', 'One line description of project.',
+   u'MapTiler.com', 'TileServerGL', 'One line description of project.',
    'Miscellaneous'),
 ]
 

package/docs/deployment.rst

@@ -2,7 +2,7 @@
 Deployment
 ==========
 
-Typically - you should use nginx/lighttpd/apache on the frontend - and the tileserver-gl server is hidden behind it in production deployment.
+Typically, you should use nginx, lighttpd or apache on the frontend. The tileserver-gl server is hidden behind it in production deployment.
 
 Caching
 =======
@@ -17,4 +17,4 @@ Nginx can be used to add protection via https, password, referrer, IP address re
 Running behind a proxy or a load-balancer
 =========================================
 
-If you need to run TileServer GL behind a proxy, make sure the proxy sends ``X-Forwarded-*`` headers to the server (most importantly ``X-Forwarded-Host`` and ``X-Forwarded-Proto``) to ensures the URLs generated inside TileJSON etc. are using the desired domain and protocol.
+If you need to run TileServer GL behind a proxy, make sure the proxy sends ``X-Forwarded-*`` headers to the server (most importantly ``X-Forwarded-Host`` and ``X-Forwarded-Proto``) to ensure the URLs generated inside TileJSON, etc. are using the desired domain and protocol.

package/docs/installation.rst

@@ -26,11 +26,30 @@ 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 9:
-  * ``build-essential``
+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``
-  * ``libprotobuf-dev``
-
+  * ``libjpeg8-dev``
+  * ``libpango1.0-dev``
+  * ``libgif-dev``
+  * ``build-essential``
+  * ``g++``
+  * ``xvfb``
+  * ``libgles2-mesa-dev``
+  * ``libgbm-dev``
+  * ``libxxf86vm-dev``
 
 ``tileserver-gl-light`` on npm
 ==============================

package/docs/usage.rst

@@ -29,8 +29,10 @@ Default preview style and configuration
 - If no configuration file is specified, a default preview style (compatible with openmaptiles) is used.
 - If no mbtiles file is specified (and is not found in the current working directory), a sample file is downloaded (showing the Zurich area)
 
-Reloading configuration
+Reloading the configuration
 ======
 
 It is possible to reload the configuration file without restarting the whole process by sending a SIGHUP signal to the node process.
-However, this does not currently work when running the tileserver-gl docker container (the signal is not passed to the subprocess, see https://github.com/maptiler/tileserver-gl/issues/420#issuecomment-597507663).
+
+- The `docker kill -s HUP tileserver-gl` command can be used when running the tileserver-gl docker container.
+- The `docker-compose kill -s HUP tileserver-gl-service-name` can be used when tileserver-gl is run as a docker-compose service.

package/fonts/Open Sans Bold/10240-10495.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold10240-10495

package/fonts/Open Sans Bold/10496-10751.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold10496-10751

package/fonts/Open Sans Bold/10752-11007.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold10752-11007

package/fonts/Open Sans Bold/11008-11263.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold11008-11263

package/fonts/Open Sans Bold/11264-11519.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold11264-11519

package/fonts/Open Sans Bold/11520-11775.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold11520-11775

package/fonts/Open Sans Bold/11776-12031.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold11776-12031

package/fonts/Open Sans Bold/12032-12287.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold12032-12287

package/fonts/Open Sans Bold/12288-12543.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold12288-12543

package/fonts/Open Sans Bold/12544-12799.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold12544-12799

package/fonts/Open Sans Bold/12800-13055.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold12800-13055

package/fonts/Open Sans Bold/13056-13311.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold13056-13311

package/fonts/Open Sans Bold/13312-13567.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold13312-13567

package/fonts/Open Sans Bold/13568-13823.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold13568-13823

package/fonts/Open Sans Bold/13824-14079.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold13824-14079

package/fonts/Open Sans Bold/14080-14335.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold14080-14335

package/fonts/Open Sans Bold/14336-14591.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold14336-14591

package/fonts/Open Sans Bold/14592-14847.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold14592-14847

package/fonts/Open Sans Bold/14848-15103.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold14848-15103

package/fonts/Open Sans Bold/15104-15359.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold15104-15359

package/fonts/Open Sans Bold/1536-1791.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold	1536-1791

package/fonts/Open Sans Bold/15360-15615.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold15360-15615

package/fonts/Open Sans Bold/15616-15871.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold15616-15871

package/fonts/Open Sans Bold/15872-16127.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold15872-16127

package/fonts/Open Sans Bold/16128-16383.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold16128-16383

package/fonts/Open Sans Bold/16384-16639.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold16384-16639

package/fonts/Open Sans Bold/16640-16895.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold16640-16895

package/fonts/Open Sans Bold/16896-17151.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold16896-17151

package/fonts/Open Sans Bold/17152-17407.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold17152-17407

package/fonts/Open Sans Bold/17408-17663.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold17408-17663

package/fonts/Open Sans Bold/17664-17919.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold17664-17919

package/fonts/Open Sans Bold/1792-2047.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold	1792-2047

package/fonts/Open Sans Bold/17920-18175.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold17920-18175

package/fonts/Open Sans Bold/18176-18431.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold18176-18431

package/fonts/Open Sans Bold/18432-18687.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold18432-18687

package/fonts/Open Sans Bold/18688-18943.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold18688-18943

package/fonts/Open Sans Bold/18944-19199.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold18944-19199

package/fonts/Open Sans Bold/19200-19455.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold19200-19455

package/fonts/Open Sans Bold/19456-19711.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold19456-19711

package/fonts/Open Sans Bold/19712-19967.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold19712-19967

package/fonts/Open Sans Bold/19968-20223.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold19968-20223

package/fonts/Open Sans Bold/20224-20479.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold20224-20479

package/fonts/Open Sans Bold/2048-2303.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold	2048-2303

package/fonts/Open Sans Bold/20480-20735.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold20480-20735

package/fonts/Open Sans Bold/20736-20991.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold20736-20991

package/fonts/Open Sans Bold/20992-21247.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold20992-21247

package/fonts/Open Sans Bold/21248-21503.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold21248-21503

package/fonts/Open Sans Bold/21504-21759.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold21504-21759

package/fonts/Open Sans Bold/21760-22015.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold21760-22015

package/fonts/Open Sans Bold/22016-22271.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold22016-22271

package/fonts/Open Sans Bold/22272-22527.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold22272-22527

package/fonts/Open Sans Bold/22528-22783.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold22528-22783

package/fonts/Open Sans Bold/22784-23039.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold22784-23039

package/fonts/Open Sans Bold/2304-2559.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold	2304-2559

package/fonts/Open Sans Bold/23040-23295.pbf

@@ -0,0 +1,3 @@
+
+
+Open Sans Bold23040-23295