ol 9.0.1-dev.1709147539193 → 9.0.1-dev.1709292731025

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "9.0.1-dev.1709147539193",
+  "version": "9.0.1-dev.1709292731025",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/source/Google.d.ts

@@ -40,10 +40,6 @@ export type Options = {
      * [Custom styles](https://developers.google.com/maps/documentation/tile/style-reference) applied to the map.
      */
     styles?: any[] | undefined;
-    /**
-     * Attributions.
-     */
-    attributions?: import("./Source.js").AttributionLike | undefined;
     /**
      * Use interpolated values when resampling.  By default,
      * linear interpolation is used when resampling.  Set to false to use the nearest neighbor instead.
@@ -154,7 +150,6 @@ export type SessionTokenResponse = {
  * @property {Array<string>} [layerTypes] The layer types added to the map (e.g. `'layerRoadmap'`, `'layerStreetview'`, or `'layerTraffic'`).
  * @property {boolean} [overlay=false] Display only the `layerTypes` and not the underlying `mapType` (only works if `layerTypes` is provided).
  * @property {Array<Object>} [styles] [Custom styles](https://developers.google.com/maps/documentation/tile/style-reference) applied to the map.
- * @property {import("./Source.js").AttributionLike} [attributions] Attributions.
  * @property {boolean} [interpolate=true] Use interpolated values when resampling.  By default,
  * linear interpolation is used when resampling.  Set to false to use the nearest neighbor instead.
  * @property {number} [cacheSize] Initial tile cache size. Will auto-grow to hold at least the number of tiles in the viewport.
@@ -220,11 +215,26 @@ declare class Google extends TileImage {
      * @private
      */
     private sessionTokenRequest_;
+    /**
+     * @type {string}
+     * @private
+     */
+    private sessionTokenValue_;
     /**
      * @type {ReturnType<typeof setTimeout>}
      * @private
      */
     private sessionRefreshId_;
+    /**
+     * @type {string}
+     * @private
+     */
+    private previousViewportAttribution_;
+    /**
+     * @type {string}
+     * @private
+     */
+    private previousViewportExtent_;
     /**
      * @return {Error|null} A source loading error. When the source state is `error`, use this function
      * to get more information about the error. To debug a faulty configuration, you may want to use
@@ -250,6 +260,7 @@ declare class Google extends TileImage {
      * @private
      */
     private createSession_;
+    fetchAttributions(frameState: any): Promise<string>;
 }
 import TileImage from './TileImage.js';
 //# sourceMappingURL=Google.d.ts.map

package/source/Google.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Google.d.ts","sourceRoot":"","sources":["Google.js"],"names":[],"mappings":";;;;;SAmBc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAgCN,MAAM;;;;cACN,MAAM;;;;YACN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAWN,MAAM;;;;YACN,MAAM;;;;eACN,MAAM;;;;gBACN,MAAM;;;;iBACN,MAAM;;AAnDpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH;;;;;;;;;;;GAWG;AAEH;;;;;;;GAOG;AAEH;;;;;;;GAOG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA0EjB;IAnDC;;;OAGG;IACH,gBAA0B;IAE1B;;OAEG;IACH,QAFU,KAAK,GAAC,IAAI,CAEF;IA6BlB;;;OAGG;IACH,6BAA+C;IAE/C;;;OAGG;IACH,0BAAsB;IAKxB;;;;;;;;;;;OAWG;IACH,YAXY,KAAK,GAAC,IAAI,CAarB;IAED;;;;;OAKG;IACH,uBAJW,MAAM,UACN,WAAW,GACV,QAAQ,QAAQ,CAAC,CAI5B;IAED;;;OAGG;IACH,uBAuDC;CAMF;sBApPqB,gBAAgB"}
+{"version":3,"file":"Google.d.ts","sourceRoot":"","sources":["Google.js"],"names":[],"mappings":";;;;;SAiBc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA+BN,MAAM;;;;cACN,MAAM;;;;YACN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAWN,MAAM;;;;YACN,MAAM;;;;eACN,MAAM;;;;gBACN,MAAM;;;;iBACN,MAAM;;AAlDpB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH;;;;;;;;;;;GAWG;AAEH;;;;;;;GAOG;AAEH;;;;;;;GAOG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA2FjB;IArEC;;;OAGG;IACH,gBAA0B;IAE1B;;OAEG;IACH,QAFU,KAAK,GAAC,IAAI,CAEF;IA6BlB;;;OAGG;IACH,6BAA+C;IAE/C;;;OAGG;IACH,2BAAuB;IAEvB;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,qCAAiC;IAEjC;;;OAGG;IACH,gCAA4B;IAK9B;;;;;;;;;;;OAWG;IACH,YAXY,KAAK,GAAC,IAAI,CAarB;IAED;;;;;OAKG;IACH,uBAJW,MAAM,UACN,WAAW,GACV,QAAQ,QAAQ,CAAC,CAI5B;IAED;;;OAGG;IACH,uBAyDC;IAED,oDAmCC;CAMF;sBAzSqB,gBAAgB"}

package/source/Google.js

@@ -3,16 +3,14 @@
  */
 
 import TileImage from './TileImage.js';
+import ViewHint from '../ViewHint.js';
 import {createXYZ, extentFromProjection} from '../tilegrid.js';
-
-const defaultAttribution =
-  'Google Maps' +
-  '<a class="ol-attribution-google-tos" href="https://cloud.google.com/maps-platform/terms/" target="_blank">Terms of Use</a>' +
-  ' and ' +
-  '<a class="ol-attribution-google-tos" href="https://policies.google.com/privacy" target="_blank">Privacy Policy</a>';
+import {getBottomLeft, getTopRight} from '../extent.js';
+import {toLonLat} from '../proj.js';
 
 const createSessionUrl = 'https://tile.googleapis.com/v1/createSession';
 const tileUrl = 'https://tile.googleapis.com/v1/2dtiles';
+const attributionUrl = 'https://tile.googleapis.com/tile/v1/viewport';
 const maxZoom = 22;
 
 /**
@@ -27,7 +25,6 @@ const maxZoom = 22;
  * @property {Array<string>} [layerTypes] The layer types added to the map (e.g. `'layerRoadmap'`, `'layerStreetview'`, or `'layerTraffic'`).
  * @property {boolean} [overlay=false] Display only the `layerTypes` and not the underlying `mapType` (only works if `layerTypes` is provided).
  * @property {Array<Object>} [styles] [Custom styles](https://developers.google.com/maps/documentation/tile/style-reference) applied to the map.
- * @property {import("./Source.js").AttributionLike} [attributions] Attributions.
  * @property {boolean} [interpolate=true] Use interpolated values when resampling.  By default,
  * linear interpolation is used when resampling.  Set to false to use the nearest neighbor instead.
  * @property {number} [cacheSize] Initial tile cache size. Will auto-grow to hold at least the number of tiles in the viewport.
@@ -84,10 +81,9 @@ class Google extends TileImage {
   constructor(options) {
     const highDpi = !!options.highDpi;
     const opaque = !(options.overlay === true);
-    const attributions = options.attributions || [defaultAttribution];
 
     super({
-      attributions: attributions,
+      attributionsCollapsible: false,
       cacheSize: options.cacheSize,
       crossOrigin: 'anonymous',
       interpolate: options.interpolate,
@@ -146,12 +142,30 @@ class Google extends TileImage {
      */
     this.sessionTokenRequest_ = sessionTokenRequest;
 
+    /**
+     * @type {string}
+     * @private
+     */
+    this.sessionTokenValue_;
+
     /**
      * @type {ReturnType<typeof setTimeout>}
      * @private
      */
     this.sessionRefreshId_;
 
+    /**
+     * @type {string}
+     * @private
+     */
+    this.previousViewportAttribution_;
+
+    /**
+     * @type {string}
+     * @private
+     */
+    this.previousViewportExtent_;
+
     this.createSession_();
   }
 
@@ -225,6 +239,7 @@ class Google extends TileImage {
     });
 
     const session = sessionTokenResponse.session;
+    this.sessionTokenValue_ = session;
     const key = this.apiKey_;
     this.tileUrlFunction = function (tileCoord, pixelRatio, projection) {
       const z = tileCoord[0];
@@ -238,10 +253,48 @@ class Google extends TileImage {
     const timeout = Math.max(expiry - Date.now() - 60 * 1000, 1);
     this.sessionRefreshId_ = setTimeout(() => this.createSession_(), timeout);
 
+    this.setAttributions(this.fetchAttributions.bind(this));
     // even if the state is already ready, we want the change event
     this.setState('ready');
   }
 
+  async fetchAttributions(frameState) {
+    if (
+      frameState.viewHints[ViewHint.ANIMATING] ||
+      frameState.viewHints[ViewHint.INTERACTING] ||
+      frameState.animate
+    ) {
+      return this.previousViewportAttribution_;
+    }
+    const [west, south] = toLonLat(
+      getBottomLeft(frameState.extent),
+      frameState.viewState.projection,
+    );
+    const [east, north] = toLonLat(
+      getTopRight(frameState.extent),
+      frameState.viewState.projection,
+    );
+    const tileGrid = this.getTileGrid();
+    const zoom = tileGrid.getZForResolution(
+      frameState.viewState.resolution,
+      this.zDirection,
+    );
+    const viewportExtent = `zoom=${zoom}&north=${north}&south=${south}&east=${east}&west=${west}`;
+    // check if the extent or zoom has actually changed to avoid unnecessary requests
+    if (this.previousViewportExtent_ == viewportExtent) {
+      return this.previousViewportAttribution_;
+    }
+    this.previousViewportExtent_ = viewportExtent;
+    const session = this.sessionTokenValue_;
+    const key = this.apiKey_;
+    const url = `${attributionUrl}?session=${session}&key=${key}&${viewportExtent}`;
+    this.previousViewportAttribution_ = await fetch(url)
+      .then((response) => response.json())
+      .then((json) => json.copyright);
+
+    return this.previousViewportAttribution_;
+  }
+
   disposeInternal() {
     clearTimeout(this.sessionRefreshId_);
     super.disposeInternal();

package/util.js

@@ -33,4 +33,4 @@ export function getUid(obj) {
  * OpenLayers version.
  * @type {string}
  */
-export const VERSION = '9.0.1-dev.1709147539193';
+export const VERSION = '9.0.1-dev.1709292731025';