tileserver-gl-light 5.5.0-pre.2 → 5.5.0-pre.4

package/CHANGELOG.md

@@ -1,10 +1,12 @@
 # tileserver-gl changelog
 
-## 5.5.0-pre.2
+## 5.5.0-pre.4
 * Add S3 support for PMTiles with multiple AWS credential profiles (https://github.com/maptiler/tileserver-gl/pull/1779) by @acalcutt
 * Create .aws directory passthrough folder in Dockerfile (https://github.com/maptiler/tileserver-gl/pull/1784) by @acalcutt
 * Update eslint to v9 (https://github.com/maptiler/tileserver-gl/pull/1473) by @acalcutt
 * Fix Renderer Crashes from Failed Fetches (https://github.com/maptiler/tileserver-gl/pull/1798) by @acalcutt
+* Add Visual Regression Tests for Static Image Overlays (https://github.com/maptiler/tileserver-gl/pull/1792) by @acalcutt
+* Fix S3 URL parsing for nested paths in AWS buckets (https://github.com/maptiler/tileserver-gl/pull/1819) by @acalcutt
 
 ## 5.4.0
 * Fix the issue where the tile URL cannot be correctly parsed with the HTTPS protocol when using an nginx proxy service (https://github.com/maptiler/tileserver-gl/pull/1578) by @dakanggo

package/docs/config.rst

@@ -311,6 +311,23 @@ Here are the available options for each data source:
     If not specified, uses ``AWS_REGION`` environment variable or defaults to ``us-east-1``.
     Optional, only applicable to PMTiles sources using S3 URLs.
 
+``s3UrlFormat`` (string)
+    Specifies how to interpret the S3 URL format.
+    
+    Allowed values:
+    
+    * ``aws`` - Interpret as AWS S3 (``s3://bucket/path/file.pmtiles``)
+    * ``custom`` - Interpret as custom S3 endpoint (``s3://endpoint/bucket/path/file.pmtiles``)
+    * Not specified (default) - Auto-detect based on URL pattern
+    
+    Can be specified in the URL using ``?s3UrlFormat=aws`` or in the configuration.
+    If both are specified, the configuration value takes precedence.
+    
+    Optional, only applicable to PMTiles sources using S3 URLs.
+
+.. note::
+    By default, URLs with dots in the first segment (e.g., ``s3://storage.example.com/bucket/file.pmtiles``) are treated as custom endpoints, while URLs without dots are treated as AWS S3. Use ``s3UrlFormat: "aws"`` if your AWS bucket name contains dots.
+
 .. note::
     These configuration options will be overridden by metadata in the MBTiles or PMTiles file. if corresponding properties exist in the file's metadata, you do not need to specify them in the data configuration.
 
@@ -445,6 +462,17 @@ Precedence order (highest to lowest): Configuration property ``s3Region``, URL p
 
 Precedence order (highest to lowest): Configuration property ``requestPayer``, URL parameter ``?requestPayer=true``, Default: ``false``.
 
+*S3UrlFormat* - Specifies how to interpret S3 URLs::
+
+  # URL parameter
+  "pmtiles": "s3://my.bucket.name/tiles.pmtiles?s3UrlFormat=aws"
+  
+  # Configuration property
+  "pmtiles": "s3://my.bucket.name/tiles.pmtiles",
+  "s3UrlFormat": "aws"
+
+Precedence order (highest to lowest): Configuration property ``s3UrlFormat``, URL parameter ``?s3UrlFormat=...``, Auto-detection.
+
 **Complete Configuration Examples:**
 
 Using URL parameters::
@@ -453,6 +481,9 @@ Using URL parameters::
     "us-west-tiles": {
       "pmtiles": "s3://prod-bucket/tiles.pmtiles?profile=production&region=us-west-2"
     },
+    "dotted-bucket-name": {
+      "pmtiles": "s3://my.bucket.name/tiles.pmtiles?s3UrlFormat=aws&region=us-east-1"
+    },
     "eu-requester-pays": {
       "pmtiles": "s3://bucket/tiles.pmtiles?profile=prod&region=eu-central-1&requestPayer=true"
     }
@@ -466,6 +497,11 @@ Using configuration properties (recommended)::
       "s3Profile": "production",
       "s3Region": "us-west-2"
     },
+    "dotted-bucket-name": {
+      "pmtiles": "s3://my.bucket.name/tiles.pmtiles",
+      "s3UrlFormat": "aws",
+      "s3Region": "us-east-1"
+    },
     "eu-requester-pays": {
       "pmtiles": "s3://bucket/tiles.pmtiles",
       "s3Profile": "production",
@@ -476,13 +512,17 @@ Using configuration properties (recommended)::
 
 **Using S3 in Style JSON Sources:**
 
-When referencing S3 sources from within a style JSON file, use the ``pmtiles://`` prefix with S3 URLs. You can only specify profile, region, and requestPayer using URL query parameters (configuration properties are not available in style JSON)::
+When referencing S3 sources from within a style JSON file, use the ``pmtiles://`` prefix with S3 URLs. You can specify profile, region, requestPayer, and s3UrlFormat using URL query parameters (configuration properties are not available in style JSON)::
 
   "sources": {
     "aws-tiles": {
       "url": "pmtiles://s3://my-bucket/tiles.pmtiles?profile=production",
       "type": "vector"
     },
+    "dotted-bucket": {
+      "url": "pmtiles://s3://my.bucket.name/tiles.pmtiles?s3UrlFormat=aws",
+      "type": "vector"
+    },
     "spaces-tiles": {
       "url": "pmtiles://s3://example-storage.com/my-bucket/tiles.pmtiles?region=nyc3",
       "type": "vector"

package/docs/usage.rst

@@ -64,6 +64,9 @@ The `--file` option supports multiple source types:
   # Requester-pays bucket
   tileserver-gl --file "s3://bucket/tiles.pmtiles?requestPayer=true"
 
+  # Bucket name with dots (force AWS S3 interpretation)
+  tileserver-gl --file "s3://my.bucket.name/tiles.pmtiles?s3UrlFormat=aws"
+
   # All options combined
   tileserver-gl --file "s3://bucket/tiles.pmtiles?profile=prod&region=us-west-2&requestPayer=true"
 
@@ -82,6 +85,8 @@ You can also use `pmtiles://` or `mbtiles://` prefixes to explicitly specify the
 .. note::
     For S3 sources, AWS credentials must be configured via environment variables, AWS credentials file (`~/.aws/credentials` on Linux/macOS or `C:\Users\USERNAME\.aws\credentials` on Windows), or IAM roles. 
     
+    The `s3UrlFormat` parameter can be set to `aws` or `custom` to override auto-detection when needed (e.g., for AWS bucket names containing dots).
+    
     **When using Docker**, the host credentials file can be mounted to the container's user home directory:
 
     ::

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tileserver-gl-light",
-  "version": "5.5.0-pre.2",
+  "version": "5.5.0-pre.4",
   "description": "Map tile server for JSON GL styles - serving vector tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
@@ -35,7 +35,7 @@
     "docker": "docker build . && docker run --rm -i -p 8080:8080 $(docker build -q .)"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.927.0",
+    "@aws-sdk/client-s3": "^3.932.0",
     "@jsse/pbfont": "^0.3.0",
     "@mapbox/mapbox-gl-rtl-text": "0.3.0",
     "@mapbox/mbtiles": "0.12.1",
@@ -48,7 +48,7 @@
     "advanced-pool": "0.3.3",
     "chokidar": "4.0.3",
     "clone": "2.1.2",
-    "color": "5.0.0",
+    "color": "5.0.3",
     "commander": "14.0.2",
     "copyfiles": "2.4.1",
     "cors": "2.8.5",
@@ -57,11 +57,11 @@
     "http-shutdown": "1.2.2",
     "leaflet": "1.9.4",
     "leaflet-hash": "0.2.1",
-    "maplibre-gl": "5.11.0",
+    "maplibre-gl": "5.13.0",
     "morgan": "1.10.1",
     "pbf": "4.0.1",
     "pmtiles": "4.3.0",
-    "proj4": "2.19.10",
+    "proj4": "2.20.0",
     "sanitize-filename": "1.6.3",
     "semver": "^7.7.3",
     "tileserver-gl-styles": "2.0.0"

package/public/resources/elevation-control.js

@@ -37,7 +37,7 @@ class ElevationInfoControl {
             } else {
               this.controlContainer.textContent = `Elevation: ${JSON.parse(request.responseText).elevation} (${JSON.stringify(coord)})`;
             }
-          }
+          };
           request.send();
         } else {
           this.controlContainer.textContent = "Elevation: Click on Globe";