tileserver-gl-light 4.6.0 → 4.6.1

package/docs/installation.rst

@@ -11,7 +11,7 @@ Just run ``docker run --rm -it -v $(pwd):/data -p 8080:8080 maptiler/tileserver-
 
 Additional options (see :doc:`/usage`) can be passed to the TileServer GL by appending them to the end of this command. You can, for example, do the following:
 
-* ``docker run ... maptiler/tileserver-gl --mbtiles my-tiles.mbtiles`` -- explicitly specify which mbtiles to use (if you have more in the folder)
+* ``docker run ... maptiler/tileserver-gl --file my-tiles.mbtiles`` -- explicitly specify which mbtiles to use (if you have more in the folder)
 * ``docker run ... maptiler/tileserver-gl --verbose`` -- to see the default config created automatically
 
 npm

package/docs/usage.rst

@@ -6,28 +6,32 @@ Getting started
 ======
 ::
 
-  Usage: main.js tileserver-gl [mbtiles] [options]
+  Usage: main.js tileserver-gl [file] [options]
 
   Options:
-
-    -h, --help            output usage information
-    --mbtiles <file>      MBTiles file (uses demo configuration);
-                          ignored if the configuration file is also specified
-    -c, --config <file>   Configuration file [config.json]
-    -b, --bind <address>  Bind address
-    -p, --port <port>     Port [8080]
-    -C|--no-cors          Disable Cross-origin resource sharing headers
-    -u|--public_url <url> Enable exposing the server on subpaths, not necessarily the root of the domain
-    -V, --verbose         More verbose output
-    -s, --silent          Less verbose output
-    -v, --version         Version info
+    --file <file>             MBTiles or PMTiles file
+                                ignored if the configuration file is also specified
+    --mbtiles <file>          (DEPRECIATED) MBTiles file
+                                ignored if file is also specified
+                                ignored if the configuration file is also specified
+    -c, --config <file>       Configuration file [config.json] (default: "config.json")
+    -b, --bind <address>      Bind address
+    -p, --port <port>         Port [8080] (default: 8080)
+    -C|--no-cors              Disable Cross-origin resource sharing headers
+    -u|--public_url <url>     Enable exposing the server on subpaths, not necessarily the root of the domain
+    -V, --verbose             More verbose output
+    -s, --silent              Less verbose output
+    -l|--log_file <file>      output log file (defaults to standard out)
+    -f|--log_format <format>  define the log format:  https://github.com/expressjs/morgan#morganformat-options
+    -v, --version             output the version number
+    -h, --help                display help for command
 
 
 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)
+- If no data file is specified (and is not found in the current working directory), a sample file is downloaded (showing the Zurich area)
 
 Reloading the configuration
 ======

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileserver-gl-light",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "description": "Map tile server for JSON GL styles - serving vector tiles",
   "main": "src/main.js",
   "bin": "src/main.js",

package/src/server.js

@@ -546,11 +546,11 @@ function start(opts) {
     }
 
     return {
+      ...style,
       id,
       name: (serving.styles[id] || serving.rendered[id]).name,
       serving_data: serving.styles[id],
       serving_rendered: serving.rendered[id],
-      ...style,
     };
   });
 
@@ -583,10 +583,10 @@ function start(opts) {
     }
 
     return {
+      ...wmts,
       id,
       name: (serving.styles[id] || serving.rendered[id]).name,
       baseUrl,
-      ...wmts,
     };
   });
 
@@ -599,9 +599,9 @@ function start(opts) {
     }
 
     return {
+      ...data,
       id,
       is_vector: data.tileJSON.format === 'pbf',
-      ...data,
     };
   });