Merge remote-tracking branch 'upstream/master' into pmtiles

Signed-off-by: Andrew Calcutt <acalcutt@techidiots.net>
This commit is contained in:
Andrew Calcutt 2023-10-13 23:34:58 -04:00
commit f2d7e44f3e
3 changed files with 4 additions and 3 deletions

View file

@ -33,6 +33,7 @@ Example:
"serveAllStyles": false, "serveAllStyles": false,
"serveStaticMaps": true, "serveStaticMaps": true,
"allowRemoteMarkerIcons": true, "allowRemoteMarkerIcons": true,
"allowInlineMarkerImages": true,
"staticAttributionText": "© OpenMapTiles © OpenStreetMaps", "staticAttributionText": "© OpenMapTiles © OpenStreetMaps",
"tileMargin": 0 "tileMargin": 0
}, },

4
package-lock.json generated
View file

@ -1,12 +1,12 @@
{ {
"name": "tileserver-gl", "name": "tileserver-gl",
"version": "4.5.1", "version": "4.5.2",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "tileserver-gl", "name": "tileserver-gl",
"version": "4.5.1", "version": "4.5.2",
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"dependencies": { "dependencies": {
"@mapbox/glyph-pbf-composite": "0.0.3", "@mapbox/glyph-pbf-composite": "0.0.3",

View file

@ -1,6 +1,6 @@
{ {
"name": "tileserver-gl", "name": "tileserver-gl",
"version": "4.5.1", "version": "4.5.2",
"description": "Map tile server for JSON GL styles - vector and server side generated raster tiles", "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
"main": "src/main.js", "main": "src/main.js",
"bin": "src/main.js", "bin": "src/main.js",