@basemaps/landing 6.33.0 → 6.35.0

package/build/url.js

@@ -1,4 +1,16 @@
+import { GoogleTms, ImageFormat } from '@basemaps/geo';
 import { Config } from './config.js';
+import { toQueryString } from '@basemaps/shared/build/url.js';
+import { isBase58, base58 } from '@basemaps/config/build/base58.js';
+export function ensureBase58(s) {
+    if (s == null)
+        return null;
+    if (isBase58(s))
+        return s;
+    const text = new TextEncoder();
+    const buffer = text.encode(s);
+    return base58.encode(buffer);
+}
 export const WindowUrl = {
     ImageFormat: 'png',
     /**
@@ -48,29 +60,48 @@ export const WindowUrl = {
         return baseUrl;
     },
     toBaseWmts() {
-        const api = Config.ApiKey == null || Config.ApiKey === '' ? '' : `?api=${Config.ApiKey}`;
-        return `${this.baseUrl()}/v1/tiles/aerial/WMTSCapabilities.xml${api}`;
+        const query = toQueryString({ api: Config.ApiKey, config: ensureBase58(Config.map.config) });
+        return `${this.baseUrl()}/v1/tiles/aerial/WMTSCapabilities.xml${query}`;
     },
     toImageryUrl(layerId, imageryType) {
         return `${this.baseUrl()}/v1/imagery/${layerId}/${imageryType}`;
     },
-    toTileUrl(urlType, tileMatrix, layerId, style) {
-        const api = Config.ApiKey == null || Config.ApiKey === '' ? '' : `?api=${Config.ApiKey}`;
+    toTileUrl(urlType, tileMatrix, layerId, style, config) {
+        const queryParams = new URLSearchParams();
+        if (Config.ApiKey != null && Config.ApiKey !== '')
+            queryParams.set('api', Config.ApiKey);
+        if (config != null)
+            queryParams.set('config', ensureBase58(config));
+        if (urlType === "style" /* Style */) {
+            if (tileMatrix.identifier !== GoogleTms.identifier)
+                queryParams.set('tileMatrix', tileMatrix.identifier);
+            if (WindowUrl.ImageFormat !== ImageFormat.Webp)
+                queryParams.set('format', WindowUrl.ImageFormat);
+        }
+        const q = '?' + queryParams.toString();
         const baseTileUrl = `${this.baseUrl()}/v1/tiles/${layerId}/${tileMatrix.identifier}`;
         if (urlType === "raster" /* TileRaster */)
-            return `${baseTileUrl}/{z}/{x}/{y}.${WindowUrl.ImageFormat}${api}`;
+            return `${baseTileUrl}/{z}/{x}/{y}.${WindowUrl.ImageFormat}${q}`;
         if (urlType === "vector-xyz" /* TileVectorXyz */)
-            return `${baseTileUrl}/{z}/{x}/{y}.pbf${api}`;
-        if (urlType === "style" /* TileVectorStyle */)
-            return `${baseTileUrl}/style/${style}.json${api}`;
+            return `${baseTileUrl}/{z}/{x}/{y}.pbf${q}`;
+        if (urlType === "style" /* Style */)
+            return `${this.baseUrl()}/v1/styles/${style !== null && style !== void 0 ? style : layerId}.json${q}`;
         if (urlType === "wmts" /* Wmts */)
-            return `${baseTileUrl}/WMTSCapabilities.xml${api}`;
+            return `${baseTileUrl}/WMTSCapabilities.xml${q}`;
         if (urlType === "attribution" /* Attribution */)
-            return `${baseTileUrl}/attribution.json${api}`;
+            return `${baseTileUrl}/attribution.json${q}`;
         if (urlType === "tile-wmts" /* TileWmts */) {
-            return `${baseTileUrl}/{TileMatrix}/{TileCol}/{TileRow}.${WindowUrl.ImageFormat}${api}`;
+            return `${baseTileUrl}/{TileMatrix}/{TileCol}/{TileRow}.${WindowUrl.ImageFormat}${q}`;
         }
         throw new Error('Unknown url type: ' + urlType);
     },
+    toConfigUrl(layerId, config = Config.map.config) {
+        const query = toQueryString({ api: Config.ApiKey, config });
+        return `${this.baseUrl()}/v1/config/${layerId}.json${query}`;
+    },
+    toConfigImageryUrl(layerId, imageryId, config = Config.map.config) {
+        const query = toQueryString({ api: Config.ApiKey, config });
+        return `${this.baseUrl()}/v1/config/${layerId}/${imageryId}.json${query}`;
+    },
 };
 //# sourceMappingURL=url.js.map

package/build/url.js.map

@@ -1 +1 @@
-{"version":3,"file":"url.js","sourceRoot":"","sources":["../src/url.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"url.js","sourceRoot":"","sources":["../src/url.ts"],"names":[],"mappings":"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"}

package/dist/examples/index.openlayers.attribution.wmts.3857.html

@@ -7,7 +7,7 @@
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.3.1/css/ol.css"
     type="text/css" />
   <script src="https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.3.1/build/ol.js"></script>
-  <script src="../lib/attribution-6.33.0-a5dcb359f35150b9.js" integrity="sha512-pdyzWfNRULnTqKS/7l7Cpz01oahUjsKk1QO0F1C+ZACqxwM3yvvXQOF88SP78pWAf2EGystuQ0OdOTR42bkmEQ=="></script>
+  <script src="../lib/attribution-6.35.0-b4a0b401b1a4cc45.js" integrity="sha512-tKC0AbGkzEXQ42XNQaATba8ZU1/ed8I1pI3e0XYfq8AWBxvjnAMA1x8rt+h2O+R68L14byRdoia4s0FBv7q7tA=="></script>
 </head>
 
 <body>