@itwin/map-layers-formats 5.0.0-dev.99 → 5.0.1

package/CHANGELOG.md

@@ -1,6 +1,63 @@
 # Change Log - @itwin/map-layers-formats
 
-This log was last generated on Wed, 02 Apr 2025 19:38:36 GMT and should not be manually modified.
+This log was last generated on Tue, 17 Jun 2025 18:33:52 GMT and should not be manually modified.
+
+## 5.0.1
+Tue, 17 Jun 2025 18:33:52 GMT
+
+_Version update only_
+
+## 5.0.0
+Fri, 13 Jun 2025 20:25:38 GMT
+
+### Updates
+
+- Bug fix: Google Maps would only use the supplied session manager if an API key was also configured.
+- Exposed some missing Google maps sessions structures.
+- Added Google Maps 2D tiles support.
+- Revisted the Google Maps 2D tiles support to allow a custom session manager to be passed.
+- Upgrade compile target to ES2023 and module to ES2022
+- change map-layers-formats to pure esm
+
+## 4.11.6
+Mon, 16 Jun 2025 15:00:15 GMT
+
+_Version update only_
+
+## 4.11.5
+Fri, 06 Jun 2025 13:41:18 GMT
+
+_Version update only_
+
+## 4.11.4
+Tue, 03 Jun 2025 16:15:19 GMT
+
+_Version update only_
+
+## 4.11.3
+Wed, 28 May 2025 13:56:23 GMT
+
+_Version update only_
+
+## 4.11.2
+Tue, 20 May 2025 20:14:46 GMT
+
+_Version update only_
+
+## 4.11.1
+Wed, 30 Apr 2025 13:13:21 GMT
+
+_Version update only_
+
+## 4.11.0
+Wed, 16 Apr 2025 15:50:28 GMT
+
+_Version update only_
+
+## 4.10.13
+Thu, 10 Apr 2025 17:47:21 GMT
+
+_Version update only_
 
 ## 4.10.12
 Wed, 02 Apr 2025 19:35:47 GMT

package/lib/cjs/GoogleMaps/GoogleMapDecorator.d.ts

@@ -1,6 +1,6 @@
 import { CanvasDecoration, DecorateContext, Decorator, Sprite } from "@itwin/core-frontend";
 import { Point3d } from "@itwin/core-geometry";
-import { GoogleMapsMapTypes } from "./GoogleMaps.js";
+import { GoogleMapsMapTypes } from "./GoogleMapsSession.js";
 /** A simple decorator that show logo at the a given screen position.
  * @internal
  */

package/lib/cjs/GoogleMaps/GoogleMapDecorator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleMapDecorator.d.ts","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMapDecorator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,SAAS,EAA0B,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACpH,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGrD;;GAEG;AACH,qBAAa,cAAe,YAAW,gBAAgB;IACrD,OAAO,CAAC,OAAO,CAAC,CAAS;IAEzB,4DAA4D;IAC5D,SAAgB,QAAQ,UAAiB;IAEzC,OAAO,CAAC,OAAO,CAAoB;IAEnC,IAAW,MAAM,CAAC,MAAM,EAAE,OAAO,GAAC,SAAS,EAExC;IAEH,0CAA0C;IAC1C,IAAW,MAAM,IALS,OAAO,GAAC,SAAS,CAO1C;IAED,4DAA4D;IACrD,qBAAqB,CAAC,OAAO,EAAE,eAAe,GAAI,OAAO;IAahE,4DAA4D;IAC5D,IAAW,QAAQ,YAA8C;IAEpD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWvD;;OAEG;IACI,cAAc,CAAC,GAAG,EAAE,wBAAwB,GAAG,IAAI;IAOnD,QAAQ,CAAC,OAAO,EAAE,eAAe;CAGzC;AAED;;EAEE;AACF,qBAAa,mBAAoB,YAAW,SAAS;IACnD,SAAgB,IAAI,iBAAwB;IAE5C,qDAAqD;IACxC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IAYpE,8BAA8B;IACvB,QAAQ,YAAa,eAAe,UAKzC;CACH"}
+{"version":3,"file":"GoogleMapDecorator.d.ts","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMapDecorator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,SAAS,EAA0B,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACpH,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D;;GAEG;AACH,qBAAa,cAAe,YAAW,gBAAgB;IACrD,OAAO,CAAC,OAAO,CAAC,CAAS;IAEzB,4DAA4D;IAC5D,SAAgB,QAAQ,UAAiB;IAEzC,OAAO,CAAC,OAAO,CAAoB;IAEnC,IAAW,MAAM,CAAC,MAAM,EAAE,OAAO,GAAC,SAAS,EAExC;IAEH,0CAA0C;IAC1C,IAAW,MAAM,IALS,OAAO,GAAC,SAAS,CAO1C;IAED,4DAA4D;IACrD,qBAAqB,CAAC,OAAO,EAAE,eAAe,GAAI,OAAO;IAahE,4DAA4D;IAC5D,IAAW,QAAQ,YAA8C;IAEpD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAWvD;;OAEG;IACI,cAAc,CAAC,GAAG,EAAE,wBAAwB,GAAG,IAAI;IAOnD,QAAQ,CAAC,OAAO,EAAE,eAAe;CAGzC;AAED;;EAEE;AACF,qBAAa,mBAAoB,YAAW,SAAS;IACnD,SAAgB,IAAI,iBAAwB;IAE5C,qDAAqD;IACxC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IAYpE,8BAA8B;IACvB,QAAQ,YAAa,eAAe,UAKzC;CACH"}

package/lib/cjs/GoogleMaps/GoogleMapDecorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleMapDecorator.js","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMapDecorator.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { CanvasDecoration, DecorateContext, Decorator, IconSprites, IModelApp, Sprite } from \"@itwin/core-frontend\";\nimport { Point3d } from \"@itwin/core-geometry\";\nimport { GoogleMapsMapTypes } from \"./GoogleMaps.js\";\n\n\n/** A simple decorator that show logo at the a given screen position.\n * @internal\n */\nexport class LogoDecoration implements CanvasDecoration {\n  private _sprite?: Sprite;\n\n  /** The current position of the logo in view coordinates. */\n  public readonly position = new Point3d();\n\n  private _offset: Point3d|undefined;\n\n  public set offset(offset: Point3d|undefined) {\n      this._offset = offset;\n    }\n\n  /** The logo offset in view coordinates.*/\n  public get offset() {\n    return this._offset;\n  }\n\n  /** Move the logo to the lower left corner of the screen. */\n  public moveToLowerLeftCorner(context: DecorateContext) : boolean{\n    if (!this._sprite || !this._sprite.isLoaded)\n      return false;\n\n    this.position.x = this._offset?.x ?? 0;\n    this.position.y =  context.viewport.parentDiv.clientHeight - this._sprite.size.y;\n    if (this._offset?.y)\n      this.position.y -= this._offset.y;\n    return true;\n  }\n\n  /* TODO: Add other move methods as needed */\n\n  /** Indicate if the logo is loaded and ready to be drawn. */\n  public get isLoaded() { return this._sprite?.isLoaded ?? false; }\n\n  public async activate(sprite: Sprite): Promise<boolean> {\n    this._sprite = sprite;\n    return new Promise<boolean>((resolve, _reject) => {\n      sprite.loadPromise.then(() => {\n        resolve(true);\n      }).catch(() => {\n        resolve (false);\n      });\n    });\n  }\n\n  /** Draw this sprite onto the supplied canvas.\n   * @see [[CanvasDecoration.drawDecoration]]\n   */\n  public drawDecoration(ctx: CanvasRenderingContext2D): void {\n    if (this.isLoaded) {\n    // Draw image with an origin at the top left corner\n    ctx.drawImage(this._sprite!.image!, 0, 0);\n    }\n  }\n\n  public decorate(context: DecorateContext) {\n    context.addCanvasDecoration(this);\n  }\n}\n\n/** A decorator that adds the Google Maps logo to the lower left corner of the screen.\n * @internal\n*/\nexport class GoogleMapsDecorator implements Decorator {\n  public readonly logo = new LogoDecoration();\n\n  /** Activate the logo based on the given map type. */\n  public async activate(mapType: GoogleMapsMapTypes): Promise<boolean> {\n    // Pick the logo that is the most visible on the background map\n    const imageName = mapType === \"roadmap\" ?\n    \"google_on_white\" :\n    \"google_on_non_white\";\n\n    // We need to move the logo right after the 'i.js' button\n    this.logo.offset = new Point3d(45, 10);\n\n    return this.logo.activate(IconSprites.getSpriteFromUrl(`${IModelApp.publicPath}images/${imageName}.png`));\n  };\n\n  /** Decorate implementation */\n  public decorate = (context: DecorateContext) => {\n    if (!this.logo.isLoaded)\n      return;\n    this.logo.moveToLowerLeftCorner(context);\n    this.logo.decorate(context);\n  };\n}\n"]}
+{"version":3,"file":"GoogleMapDecorator.js","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMapDecorator.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { CanvasDecoration, DecorateContext, Decorator, IconSprites, IModelApp, Sprite } from \"@itwin/core-frontend\";\nimport { Point3d } from \"@itwin/core-geometry\";\nimport { GoogleMapsMapTypes } from \"./GoogleMapsSession.js\";\n\n\n/** A simple decorator that show logo at the a given screen position.\n * @internal\n */\nexport class LogoDecoration implements CanvasDecoration {\n  private _sprite?: Sprite;\n\n  /** The current position of the logo in view coordinates. */\n  public readonly position = new Point3d();\n\n  private _offset: Point3d|undefined;\n\n  public set offset(offset: Point3d|undefined) {\n      this._offset = offset;\n    }\n\n  /** The logo offset in view coordinates.*/\n  public get offset() {\n    return this._offset;\n  }\n\n  /** Move the logo to the lower left corner of the screen. */\n  public moveToLowerLeftCorner(context: DecorateContext) : boolean{\n    if (!this._sprite || !this._sprite.isLoaded)\n      return false;\n\n    this.position.x = this._offset?.x ?? 0;\n    this.position.y =  context.viewport.parentDiv.clientHeight - this._sprite.size.y;\n    if (this._offset?.y)\n      this.position.y -= this._offset.y;\n    return true;\n  }\n\n  /* TODO: Add other move methods as needed */\n\n  /** Indicate if the logo is loaded and ready to be drawn. */\n  public get isLoaded() { return this._sprite?.isLoaded ?? false; }\n\n  public async activate(sprite: Sprite): Promise<boolean> {\n    this._sprite = sprite;\n    return new Promise<boolean>((resolve, _reject) => {\n      sprite.loadPromise.then(() => {\n        resolve(true);\n      }).catch(() => {\n        resolve (false);\n      });\n    });\n  }\n\n  /** Draw this sprite onto the supplied canvas.\n   * @see [[CanvasDecoration.drawDecoration]]\n   */\n  public drawDecoration(ctx: CanvasRenderingContext2D): void {\n    if (this.isLoaded) {\n    // Draw image with an origin at the top left corner\n    ctx.drawImage(this._sprite!.image!, 0, 0);\n    }\n  }\n\n  public decorate(context: DecorateContext) {\n    context.addCanvasDecoration(this);\n  }\n}\n\n/** A decorator that adds the Google Maps logo to the lower left corner of the screen.\n * @internal\n*/\nexport class GoogleMapsDecorator implements Decorator {\n  public readonly logo = new LogoDecoration();\n\n  /** Activate the logo based on the given map type. */\n  public async activate(mapType: GoogleMapsMapTypes): Promise<boolean> {\n    // Pick the logo that is the most visible on the background map\n    const imageName = mapType === \"roadmap\" ?\n    \"google_on_white\" :\n    \"google_on_non_white\";\n\n    // We need to move the logo right after the 'i.js' button\n    this.logo.offset = new Point3d(45, 10);\n\n    return this.logo.activate(IconSprites.getSpriteFromUrl(`${IModelApp.publicPath}images/${imageName}.png`));\n  };\n\n  /** Decorate implementation */\n  public decorate = (context: DecorateContext) => {\n    if (!this.logo.isLoaded)\n      return;\n    this.logo.moveToLowerLeftCorner(context);\n    this.logo.decorate(context);\n  };\n}\n"]}

package/lib/cjs/GoogleMaps/GoogleMaps.d.ts

@@ -2,131 +2,7 @@
  * @module MapLayersFormats
  */
 import { BaseMapLayerSettings, ImageMapLayerSettings } from "@itwin/core-common";
-import { MapCartoRectangle } from "@itwin/core-frontend";
-/**
- * The type of base map.
- * @beta*/
-export type GoogleMapsLayerTypes = "layerRoadmap" | "layerStreetview";
-/**
- *  Layer types that can be added to the map.
- * @beta
- * */
-export type GoogleMapsMapTypes = "roadmap" | "satellite" | "terrain";
-/**
- * Scale factors that can be applied to labels and objects in the map.
- * @beta
- * */
-export type GoogleMapsScaleFactors = "scaleFactor1x" | "scaleFactor2x" | "scaleFactor4x";
-/**
-* Represents the options to create a Google Maps session.
-* @beta
-*/
-export interface GoogleMapsCreateSessionOptions {
-    /**
-   * The type of base map.
-   *
-   * `roadmap`: The standard Google Maps painted map tiles.
-   *
-   * `satellite`: Satellite imagery.
-   *
-   * `terrain`: Terrain imagery. When selecting `terrain` as the map type, you must also include the `layerRoadmap` layer type.
-   * @beta
-   * */
-    mapType: GoogleMapsMapTypes;
-    /**
-     * An {@link https://en.wikipedia.org/wiki/IETF_language_tag | IETF language tag} that specifies the language used to display information on the tiles. For example, `en-US` specifies the English language as spoken in the United States.
-     */
-    language: string;
-    /**
-    * A {@link https://cldr.unicode.org/ | Common Locale Data Repository}  region identifier (two uppercase letters) that represents the physical location of the user. For example, `US`.
-    */
-    region: string;
-    /**
-     * An array of values that specifies the layer types added to the map.
-     *
-     * `layerRoadmap`: Required if you specify terrain as the map type. Can also be optionally overlaid on the satellite map type. Has no effect on roadmap tiles.
-     *
-     * `layerStreetview`: Shows Street View-enabled streets and locations using blue outlines on the map.
-     *
-     * @beta
-     * */
-    layerTypes?: GoogleMapsLayerTypes[];
-    /**
-     * Scales-up the size of map elements (such as road labels), while retaining the tile size and coverage area of the default tile.
-     * Increasing the scale also reduces the number of labels on the map, which reduces clutter.
-     *
-     * `scaleFactor1x`: The default.
-     *
-     * `scaleFactor2x`: Doubles label size and removes minor feature labels.
-     *
-     * `scaleFactor4x`: Quadruples label size and removes minor feature labels.
-     * @beta
-     * */
-    scale?: GoogleMapsScaleFactors;
-    /**
-     * A boolean value that specifies whether layerTypes should be rendered as a separate overlay, or combined with the base imagery.
-     * When true, the base map isn't displayed. If you haven't defined any layerTypes, then this value is ignored.
-     * Default is false.
-     * @beta
-     * */
-    overlay?: boolean;
-    /**
-     * An array of values specifying additional options to apply.
-     * @beta
-     * */
-    apiOptions?: string[];
-}
-/**
-* Structure representing a Google Maps session.
-* @beta
-*/
-export interface GoogleMapsSession {
-    /** A session token value that you must include in all of your Map Tiles API requests. */
-    session: string;
-    /**  string that contains the time (in seconds since the epoch) at which the token expires. A session token is valid for two weeks from its creation time, but this policy might change without notice. */
-    expiry: number;
-    /** The width of the tiles measured in pixels. */
-    tileWidth: number;
-    /** he height of the tiles measured in pixels. */
-    tileHeight: number;
-    /** The image format, which can be either `png` or `jpeg`. */
-    imageFormat: string;
-}
-/**
- * Represents the maximum zoom level available within a bounding rectangle.
-* @beta
-*/
-export interface MaxZoomRectangle {
-    maxZoom: number;
-    north: number;
-    south: number;
-    east: number;
-    west: number;
-}
-/**
- * Indicate which areas of given viewport have imagery, and at which zoom levels.
- * @beta
-*/
-export interface ViewportInfo {
-    /**  Attribution string that you must display on your map when you display roadmap and satellite tiles. */
-    copyright: string;
-    /** Array of bounding rectangles that overlap with the current viewport. Also contains the maximum zoom level available within each rectangle.. */
-    maxZoomRects: MaxZoomRectangle[];
-}
-/**
- * Request parameters for the getViewportInfo method.
- * @beta
-*/
-export interface ViewportInfoRequestParams {
-    /** Bounding rectangle */
-    rectangle: MapCartoRectangle;
-    /** Session token */
-    session: string;
-    /** The Google Cloud API key */
-    key: string;
-    /** Zoom level of the viewport */
-    zoom: number;
-}
+import { GoogleMapsCreateSessionOptions } from "./GoogleMapsSession.js";
 /**
  * Google Maps API
  * @beta
@@ -162,5 +38,12 @@ export declare const GoogleMaps: {
      * @beta
     */
     createBaseLayerSettings: (opts?: GoogleMapsCreateSessionOptions) => BaseMapLayerSettings;
+    /**
+     * Read the session options from the map layer settings.
+     * @param settings Map layer settings
+     * ```
+     * @beta
+    */
+    getMapLayerSessionOptions: (settings: ImageMapLayerSettings) => GoogleMapsCreateSessionOptions;
 };
 //# sourceMappingURL=GoogleMaps.d.ts.map

package/lib/cjs/GoogleMaps/GoogleMaps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleMaps.d.ts","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMaps.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAIzD;;UAEU;AACV,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG,iBAAiB,CAAC;AAEtE;;;KAGK;AACL,MAAM,MAAM,kBAAkB,GAAI,SAAS,GAAC,WAAW,GAAC,SAAS,CAAC;AAElE;;;KAGK;AACL,MAAM,MAAM,sBAAsB,GAAI,eAAe,GAAG,eAAe,GAAG,eAAe,CAAC;AAE1F;;;EAGE;AACF,MAAM,WAAW,8BAA8B;IAC3C;;;;;;;;;OASG;IACL,OAAO,EAAE,kBAAkB,CAAC;IAC5B;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACf;;MAEE;IACJ,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;;;SAQK;IACL,UAAU,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAEpC;;;;;;;;;;SAUK;IACL,KAAK,CAAC,EAAE,sBAAsB,CAAA;IAE9B;;;;;SAKK;IACH,OAAO,CAAC,EAAG,OAAO,CAAC;IAEnB;;;SAGK;IACL,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED;;;EAGE;AACF,MAAM,WAAW,iBAAiB;IAChC,yFAAyF;IACzF,OAAO,EAAE,MAAM,CAAC;IAEhB,0MAA0M;IAC1M,MAAM,EAAE,MAAM,CAAC;IAEf,iDAAiD;IACjD,SAAS,EAAE,MAAM,CAAC;IAElB,iDAAiD;IACjD,UAAU,EAAE,MAAM,CAAC;IAEnB,6DAA6D;IAC7D,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;EAGE;AACF,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;EAGE;AACF,MAAM,WAAW,YAAY;IAC3B,0GAA0G;IAC1G,SAAS,EAAE,MAAM,CAAC;IAElB,kJAAkJ;IAClJ,YAAY,EAAE,gBAAgB,EAAE,CAAC;CAClC;AAED;;;EAGE;AACF,MAAM,WAAW,yBAAyB;IACxC,yBAAyB;IACzB,SAAS,EAAE,iBAAiB,CAAC;IAE7B,oBAAoB;IACpB,OAAO,EAAE,MAAM,CAAC;IAEhB,+BAA+B;IAC/B,GAAG,EAAE,MAAM,CAAC;IAEZ,iCAAiC;IACjC,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;EAGE;AAEF,eAAO,MAAM,UAAU;IACvB;;;;;;;;;;;;;MAaE;oCACgC,MAAM,SAAS,8BAA8B;IAI/E;;;;;;;;;;;;;MAaE;qCACiC,8BAA8B;CAGhE,CAAC"}
+{"version":3,"file":"GoogleMaps.d.ts","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMaps.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAC;AAIxE;;;EAGE;AAEF,eAAO,MAAM,UAAU;IACrB;;;;;;;;;;;;;MAaE;oCAC8B,MAAM,SAAS,8BAA8B;IAI7E;;;;;;;;;;;;;MAaE;qCAC+B,8BAA8B;IAI/D;;;;;MAKE;0CACoC,qBAAqB;CAG5D,CAAC"}

package/lib/cjs/GoogleMaps/GoogleMaps.js

@@ -10,8 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoogleMaps = void 0;
 const core_common_1 = require("@itwin/core-common");
 const GoogleMapsUtils_js_1 = require("../internal/GoogleMapsUtils.js");
-;
-;
 /**
  * Google Maps API
  * @beta
@@ -51,6 +49,15 @@ exports.GoogleMaps = {
     */
     createBaseLayerSettings: (opts) => {
         return core_common_1.BaseMapLayerSettings.fromJSON(GoogleMapsUtils_js_1.GoogleMapsUtils.createMapLayerProps("GoogleMaps", opts));
-    }
+    },
+    /**
+     * Read the session options from the map layer settings.
+     * @param settings Map layer settings
+     * ```
+     * @beta
+    */
+    getMapLayerSessionOptions: (settings) => {
+        return GoogleMapsUtils_js_1.GoogleMapsUtils.getSessionOptionsFromMapLayer(settings);
+    },
 };
 //# sourceMappingURL=GoogleMaps.js.map

package/lib/cjs/GoogleMaps/GoogleMaps.js.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleMaps.js","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMaps.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,oDAAiF;AAEjF,uEAAiE;AAkFhE,CAAC;AAqBD,CAAC;AA4CF;;;EAGE;AACF,gEAAgE;AACnD,QAAA,UAAU,GAAG;IAC1B;;;;;;;;;;;;;MAaE;IACA,sBAAsB,EAAE,CAAC,IAAa,EAAE,IAAqC,EAAE,EAAE;QAC/E,OAAO,mCAAqB,CAAC,QAAQ,CAAC,oCAAe,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IACzF,CAAC;IAEH;;;;;;;;;;;;;MAaE;IACA,uBAAuB,EAAE,CAAC,IAAqC,EAAE,EAAE;QACjE,OAAO,kCAAoB,CAAC,QAAQ,CAAC,oCAAe,CAAC,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IAChG,CAAC;CACF,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module MapLayersFormats\n */\n\nimport { BaseMapLayerSettings, ImageMapLayerSettings } from \"@itwin/core-common\";\nimport { MapCartoRectangle } from \"@itwin/core-frontend\";\nimport { GoogleMapsUtils } from \"../internal/GoogleMapsUtils.js\";\n\n\n/**\n * The type of base map.\n * @beta*/\nexport type GoogleMapsLayerTypes = \"layerRoadmap\" | \"layerStreetview\";\n\n/**\n *  Layer types that can be added to the map.\n * @beta\n * */\nexport type GoogleMapsMapTypes =  \"roadmap\"|\"satellite\"|\"terrain\";\n\n/**\n * Scale factors that can be applied to labels and objects in the map.\n * @beta\n * */\nexport type GoogleMapsScaleFactors =  \"scaleFactor1x\" | \"scaleFactor2x\" | \"scaleFactor4x\";\n\n/**\n* Represents the options to create a Google Maps session.\n* @beta\n*/\nexport interface GoogleMapsCreateSessionOptions {\n    /**\n   * The type of base map.\n   *\n   * `roadmap`: The standard Google Maps painted map tiles.\n   *\n   * `satellite`: Satellite imagery.\n   *\n   * `terrain`: Terrain imagery. When selecting `terrain` as the map type, you must also include the `layerRoadmap` layer type.\n   * @beta\n   * */\n  mapType: GoogleMapsMapTypes,\n  /**\n   * An {@link https://en.wikipedia.org/wiki/IETF_language_tag | IETF language tag} that specifies the language used to display information on the tiles. For example, `en-US` specifies the English language as spoken in the United States.\n   */\n  language: string;\n    /**\n    * A {@link https://cldr.unicode.org/ | Common Locale Data Repository}  region identifier (two uppercase letters) that represents the physical location of the user. For example, `US`.\n    */\n  region: string;\n\n  /**\n   * An array of values that specifies the layer types added to the map.\n   *\n   * `layerRoadmap`: Required if you specify terrain as the map type. Can also be optionally overlaid on the satellite map type. Has no effect on roadmap tiles.\n   *\n   * `layerStreetview`: Shows Street View-enabled streets and locations using blue outlines on the map.\n   *\n   * @beta\n   * */\n  layerTypes?: GoogleMapsLayerTypes[];\n\n  /**\n   * Scales-up the size of map elements (such as road labels), while retaining the tile size and coverage area of the default tile.\n   * Increasing the scale also reduces the number of labels on the map, which reduces clutter.\n   *\n   * `scaleFactor1x`: The default.\n   *\n   * `scaleFactor2x`: Doubles label size and removes minor feature labels.\n   *\n   * `scaleFactor4x`: Quadruples label size and removes minor feature labels.\n   * @beta\n   * */\n  scale?: GoogleMapsScaleFactors\n\n  /**\n   * A boolean value that specifies whether layerTypes should be rendered as a separate overlay, or combined with the base imagery.\n   * When true, the base map isn't displayed. If you haven't defined any layerTypes, then this value is ignored.\n   * Default is false.\n   * @beta\n   * */\n    overlay? : boolean;\n\n    /**\n     * An array of values specifying additional options to apply.\n     * @beta\n     * */\n    apiOptions?: string[];\n};\n\n/**\n* Structure representing a Google Maps session.\n* @beta\n*/\nexport interface GoogleMapsSession {\n  /** A session token value that you must include in all of your Map Tiles API requests. */\n  session: string;\n\n  /**  string that contains the time (in seconds since the epoch) at which the token expires. A session token is valid for two weeks from its creation time, but this policy might change without notice. */\n  expiry: number;\n\n  /** The width of the tiles measured in pixels. */\n  tileWidth: number;\n\n  /** he height of the tiles measured in pixels. */\n  tileHeight: number;\n\n  /** The image format, which can be either `png` or `jpeg`. */\n  imageFormat: string;\n};\n\n/**\n * Represents the maximum zoom level available within a bounding rectangle.\n* @beta\n*/\nexport interface MaxZoomRectangle {\n  maxZoom: number;\n  north: number;\n  south: number;\n  east: number;\n  west: number;\n}\n\n/**\n * Indicate which areas of given viewport have imagery, and at which zoom levels.\n * @beta\n*/\nexport interface ViewportInfo {\n  /**  Attribution string that you must display on your map when you display roadmap and satellite tiles. */\n  copyright: string;\n\n  /** Array of bounding rectangles that overlap with the current viewport. Also contains the maximum zoom level available within each rectangle.. */\n  maxZoomRects: MaxZoomRectangle[];\n}\n\n/**\n * Request parameters for the getViewportInfo method.\n * @beta\n*/\nexport interface ViewportInfoRequestParams {\n  /** Bounding rectangle */\n  rectangle: MapCartoRectangle;\n\n  /** Session token */\n  session: string;\n\n  /** The Google Cloud API key */\n  key: string;\n\n  /** Zoom level of the viewport */\n  zoom: number;\n}\n\n/**\n * Google Maps API\n * @beta\n*/\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport const GoogleMaps = {\n/**\n * Creates Google Maps map-layer settings.\n * @param name Name of the layer (Defaults to \"GoogleMaps\")\n * @param opts Options to create the session  (Defaults to satellite map type, English language, US region, and roadmap layer type)\n *\n * The following examples illustrates how a Googles Map layer can be attached to a viewport:\n * ```ts\n * [[include:GoogleMaps_AttachMapLayerSimple]]\n * ```\n * ```ts\n * [[include:GoogleMaps_AttachMapLayerOpts]]\n * ```\n * @beta\n*/\n  createMapLayerSettings: (name?: string, opts?: GoogleMapsCreateSessionOptions) => {\n    return ImageMapLayerSettings.fromJSON(GoogleMapsUtils.createMapLayerProps(name, opts));\n  },\n\n/**\n * Creates Google Maps base layer settings.\n * @param name Name of the layer (Defaults to \"GoogleMaps\")\n * @param opts Options to create the session  (Defaults to satellite map type, English language, US region, and roadmap layer type)\n *\n * The following examples illustrates how a Google Maps base layer can be set on a viewport:\n * ```ts\n * [[include:GoogleMaps_BaseMapSimple]]\n * ```\n * ```ts\n * [[include:GoogleMaps_BaseMapOpts]]\n * ```\n * @beta\n*/\n  createBaseLayerSettings: (opts?: GoogleMapsCreateSessionOptions) => {\n    return BaseMapLayerSettings.fromJSON(GoogleMapsUtils.createMapLayerProps(\"GoogleMaps\", opts));\n  }\n};"]}
+{"version":3,"file":"GoogleMaps.js","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMaps.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAEH,oDAAiF;AAEjF,uEAAiE;AAGjE;;;EAGE;AACF,gEAAgE;AACnD,QAAA,UAAU,GAAG;IACxB;;;;;;;;;;;;;MAaE;IACF,sBAAsB,EAAE,CAAC,IAAa,EAAE,IAAqC,EAAE,EAAE;QAC/E,OAAO,mCAAqB,CAAC,QAAQ,CAAC,oCAAe,CAAC,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IACzF,CAAC;IAED;;;;;;;;;;;;;MAaE;IACF,uBAAuB,EAAE,CAAC,IAAqC,EAAE,EAAE;QACjE,OAAO,kCAAoB,CAAC,QAAQ,CAAC,oCAAe,CAAC,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IAChG,CAAC;IAED;;;;;MAKE;IACF,yBAAyB,EAAE,CAAC,QAA+B,EAAE,EAAE;QAC7D,OAAO,oCAAe,CAAC,6BAA6B,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC;CACF,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module MapLayersFormats\n */\n\nimport { BaseMapLayerSettings, ImageMapLayerSettings } from \"@itwin/core-common\";\nimport { GoogleMapsCreateSessionOptions } from \"./GoogleMapsSession.js\";\nimport { GoogleMapsUtils } from \"../internal/GoogleMapsUtils.js\";\n\n\n/**\n * Google Maps API\n * @beta\n*/\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport const GoogleMaps = {\n  /**\n   * Creates Google Maps map-layer settings.\n   * @param name Name of the layer (Defaults to \"GoogleMaps\")\n   * @param opts Options to create the session  (Defaults to satellite map type, English language, US region, and roadmap layer type)\n   *\n   * The following examples illustrates how a Googles Map layer can be attached to a viewport:\n   * ```ts\n   * [[include:GoogleMaps_AttachMapLayerSimple]]\n   * ```\n   * ```ts\n   * [[include:GoogleMaps_AttachMapLayerOpts]]\n   * ```\n   * @beta\n  */\n  createMapLayerSettings: (name?: string, opts?: GoogleMapsCreateSessionOptions) => {\n    return ImageMapLayerSettings.fromJSON(GoogleMapsUtils.createMapLayerProps(name, opts));\n  },\n\n  /**\n   * Creates Google Maps base layer settings.\n   * @param name Name of the layer (Defaults to \"GoogleMaps\")\n   * @param opts Options to create the session  (Defaults to satellite map type, English language, US region, and roadmap layer type)\n   *\n   * The following examples illustrates how a Google Maps base layer can be set on a viewport:\n   * ```ts\n   * [[include:GoogleMaps_BaseMapSimple]]\n   * ```\n   * ```ts\n   * [[include:GoogleMaps_BaseMapOpts]]\n   * ```\n   * @beta\n  */\n  createBaseLayerSettings: (opts?: GoogleMapsCreateSessionOptions) => {\n    return BaseMapLayerSettings.fromJSON(GoogleMapsUtils.createMapLayerProps(\"GoogleMaps\", opts));\n  },\n\n  /**\n   * Read the session options from the map layer settings.\n   * @param settings Map layer settings\n   * ```\n   * @beta\n  */\n  getMapLayerSessionOptions: (settings: ImageMapLayerSettings) => {\n    return GoogleMapsUtils.getSessionOptionsFromMapLayer(settings);\n  },\n};\n"]}

package/lib/cjs/GoogleMaps/GoogleMapsImageryFormat.d.ts

@@ -3,8 +3,16 @@
  */
 import { ImageMapLayerSettings } from "@itwin/core-common";
 import { ImageryMapLayerFormat, MapLayerImageryProvider } from "@itwin/core-frontend";
+/**
+ * Google Maps imagery layer format.
+ * @public
+ */
 export declare class GoogleMapsMapLayerFormat extends ImageryMapLayerFormat {
+    /** Google Maps imagery layer format.
+     * @public
+     */
     static formatId: string;
+    /** @internal */
     static createImageryProvider(settings: ImageMapLayerSettings): MapLayerImageryProvider | undefined;
 }
 //# sourceMappingURL=GoogleMapsImageryFormat.d.ts.map

package/lib/cjs/GoogleMaps/GoogleMapsImageryFormat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleMapsImageryFormat.d.ts","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMapsImageryFormat.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAGtF,qBAAa,wBAAyB,SAAQ,qBAAqB;IACjE,OAAuB,QAAQ,SAAgB;WACxB,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,uBAAuB,GAAG,SAAS;CAGnH"}
+{"version":3,"file":"GoogleMapsImageryFormat.d.ts","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMapsImageryFormat.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAItF;;;GAGG;AACH,qBAAa,wBAAyB,SAAQ,qBAAqB;IACjE;;OAEG;IACH,OAAuB,QAAQ,SAAgB;IAE/C,gBAAgB;WACO,qBAAqB,CAAC,QAAQ,EAAE,qBAAqB,GAAG,uBAAuB,GAAG,SAAS;CAGnH"}

package/lib/cjs/GoogleMaps/GoogleMapsImageryFormat.js

@@ -10,10 +10,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoogleMapsMapLayerFormat = void 0;
 const core_frontend_1 = require("@itwin/core-frontend");
 const GoogleMapsImageryProvider_js_1 = require("./GoogleMapsImageryProvider.js");
+const mapLayersFormats_js_1 = require("../mapLayersFormats.js");
+/**
+ * Google Maps imagery layer format.
+ * @public
+ */
 class GoogleMapsMapLayerFormat extends core_frontend_1.ImageryMapLayerFormat {
+    /** Google Maps imagery layer format.
+     * @public
+     */
     static formatId = "GoogleMaps";
+    /** @internal */
     static createImageryProvider(settings) {
-        return new GoogleMapsImageryProvider_js_1.GoogleMapsImageryProvider(settings);
+        return new GoogleMapsImageryProvider_js_1.GoogleMapsImageryProvider(settings, mapLayersFormats_js_1.MapLayersFormats.googleMapsOpts?.sessionManager);
     }
 }
 exports.GoogleMapsMapLayerFormat = GoogleMapsMapLayerFormat;

package/lib/cjs/GoogleMaps/GoogleMapsImageryFormat.js.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleMapsImageryFormat.js","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMapsImageryFormat.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAGH,wDAAsF;AACtF,iFAA2E;AAE3E,MAAa,wBAAyB,SAAQ,qCAAqB;IAC1D,MAAM,CAAU,QAAQ,GAAG,YAAY,CAAC;IACxC,MAAM,CAAU,qBAAqB,CAAC,QAA+B;QAC1E,OAAO,IAAI,wDAAyB,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC;;AAJH,4DAKC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module MapLayersFormats\n */\n\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\nimport { ImageryMapLayerFormat, MapLayerImageryProvider } from \"@itwin/core-frontend\";\nimport { GoogleMapsImageryProvider } from \"./GoogleMapsImageryProvider.js\";\n\nexport class GoogleMapsMapLayerFormat extends ImageryMapLayerFormat {\n  public static override formatId = \"GoogleMaps\";\n  public static override createImageryProvider(settings: ImageMapLayerSettings): MapLayerImageryProvider | undefined {\n    return new GoogleMapsImageryProvider(settings);\n  }\n}\n"]}
+{"version":3,"file":"GoogleMapsImageryFormat.js","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMapsImageryFormat.ts"],"names":[],"mappings":";AAAA;;;+FAG+F;AAC/F;;GAEG;;;AAGH,wDAAsF;AACtF,iFAA2E;AAC3E,gEAA0D;AAE1D;;;GAGG;AACH,MAAa,wBAAyB,SAAQ,qCAAqB;IACjE;;OAEG;IACI,MAAM,CAAU,QAAQ,GAAG,YAAY,CAAC;IAE/C,gBAAgB;IACT,MAAM,CAAU,qBAAqB,CAAC,QAA+B;QAC1E,OAAO,IAAI,wDAAyB,CAAC,QAAQ,EAAE,sCAAgB,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;IAClG,CAAC;;AATH,4DAUC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module MapLayersFormats\n */\n\nimport { ImageMapLayerSettings } from \"@itwin/core-common\";\nimport { ImageryMapLayerFormat, MapLayerImageryProvider } from \"@itwin/core-frontend\";\nimport { GoogleMapsImageryProvider } from \"./GoogleMapsImageryProvider.js\";\nimport { MapLayersFormats } from \"../mapLayersFormats.js\";\n\n/**\n * Google Maps imagery layer format.\n * @public\n */\nexport class GoogleMapsMapLayerFormat extends ImageryMapLayerFormat {\n  /** Google Maps imagery layer format.\n   * @public\n   */\n  public static override formatId = \"GoogleMaps\";\n\n  /** @internal */\n  public static override createImageryProvider(settings: ImageMapLayerSettings): MapLayerImageryProvider | undefined {\n    return new GoogleMapsImageryProvider(settings, MapLayersFormats.googleMapsOpts?.sessionManager);\n  }\n}\n"]}

package/lib/cjs/GoogleMaps/GoogleMapsImageryProvider.d.ts

@@ -2,19 +2,22 @@
  * @module MapLayersFormats
  */
 import { ImageMapLayerSettings, ImageSource } from "@itwin/core-common";
-import { DecorateContext, MapLayerImageryProvider, MapLayerSourceValidation, ScreenViewport } from "@itwin/core-frontend";
-import { GoogleMapsSession } from "./GoogleMaps.js";
+import { DecorateContext, MapCartoRectangle, MapLayerImageryProvider, ScreenViewport } from "@itwin/core-frontend";
+import { GoogleMapsCreateSessionOptions, GoogleMapsSessionManager, ViewportInfo } from "./GoogleMapsSession.js";
 export declare class GoogleMapsImageryProvider extends MapLayerImageryProvider {
     private _decorator;
     private _hadUnrecoverableError;
     private _tileSize;
-    constructor(settings: ImageMapLayerSettings);
-    static validateUrlTemplate(template: string): MapLayerSourceValidation;
-    protected createSession(): Promise<GoogleMapsSession | undefined>;
+    private _sessionManager?;
+    private _sessionOptions;
+    private _activeSession?;
+    constructor(settings: ImageMapLayerSettings, sessionManager?: GoogleMapsSessionManager);
     get tileSize(): number;
     initialize(): Promise<void>;
-    private createCreateSessionOptions;
-    constructUrl(row: number, column: number, level: number): Promise<string>;
+    protected getSessionManager(): Promise<GoogleMapsSessionManager>;
+    protected createCreateSessionOptions(settings: ImageMapLayerSettings): GoogleMapsCreateSessionOptions;
+    constructUrl(_row: number, _column: number, _level: number): Promise<string>;
+    fetchViewportInfo(rectangle: MapCartoRectangle, zoomLevel: number): Promise<ViewportInfo>;
     private fetchAttributions;
     private logJsonError;
     loadTile(row: number, column: number, zoomLevel: number): Promise<ImageSource | undefined>;

package/lib/cjs/GoogleMaps/GoogleMapsImageryProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GoogleMapsImageryProvider.d.ts","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMapsImageryProvider.ts"],"names":[],"mappings":"AAIA;;GAEG;AAGH,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAgC,uBAAuB,EAAwB,wBAAwB,EAAW,cAAc,EAAQ,MAAM,sBAAsB,CAAC;AAG7L,OAAO,EAAoG,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAatJ,qBAAa,yBAA0B,SAAQ,uBAAuB;IAEpE,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,SAAS,CAAM;gBACX,QAAQ,EAAE,qBAAqB;WAI7B,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,wBAAwB;cAI7D,aAAa,IAAK,OAAO,CAAC,iBAAiB,GAAC,SAAS,CAAC;IAYtE,IAAoB,QAAQ,IAAI,MAAM,CAA2B;IAE3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BjD,OAAO,CAAC,0BAA0B;IAoCrB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAWxE,iBAAiB;YAqCjB,YAAY;IASJ,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IA0ChG,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAIxD,OAAO,CAAC,gBAAgB;IAIF,eAAe,CAAE,KAAK,EAAE,gBAAgB,EAAE,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAuBnG"}
+{"version":3,"file":"GoogleMapsImageryProvider.d.ts","sourceRoot":"","sources":["../../../src/GoogleMaps/GoogleMapsImageryProvider.ts"],"names":[],"mappings":"AAIA;;GAEG;AAGH,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,eAAe,EAAa,iBAAiB,EAAE,uBAAuB,EAAwB,cAAc,EAAQ,MAAM,sBAAsB,CAAC;AAE1J,OAAO,EAAG,8BAA8B,EAAuF,wBAAwB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAUtM,qBAAa,yBAA0B,SAAQ,uBAAuB;IAEpE,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,sBAAsB,CAAS;IACvC,OAAO,CAAC,SAAS,CAAO;IACxB,OAAO,CAAC,eAAe,CAAC,CAA2B;IACnD,OAAO,CAAC,eAAe,CAA2C;IAClE,OAAO,CAAC,cAAc,CAAC,CAAoB;gBAC/B,QAAQ,EAAE,qBAAqB,EAAE,cAAc,CAAC,EAAE,wBAAwB;IAMtF,IAAoB,QAAQ,IAAI,MAAM,CAA2B;IAE3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;cAajC,iBAAiB,IAAK,OAAO,CAAC,wBAAwB,CAAC;IAavE,SAAS,CAAC,0BAA0B,CAAC,QAAQ,EAAE,qBAAqB,GAAG,8BAA8B;IAoCxF,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI5E,iBAAiB,CAAC,SAAS,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;YAoBxF,iBAAiB;YAiCjB,YAAY;IASJ,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAiDhG,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI;IAIxD,OAAO,CAAC,gBAAgB;IAIF,eAAe,CAAE,KAAK,EAAE,gBAAgB,EAAE,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBnG"}

package/lib/cjs/GoogleMaps/GoogleMapsImageryProvider.js

@@ -10,68 +10,54 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoogleMapsImageryProvider = void 0;
 const core_bentley_1 = require("@itwin/core-bentley");
 const core_frontend_1 = require("@itwin/core-frontend");
-const GoogleMapsUtils_js_1 = require("../internal/GoogleMapsUtils.js");
 const GoogleMapDecorator_js_1 = require("./GoogleMapDecorator.js");
+const NativeGoogleMapsSession_js_1 = require("../internal/NativeGoogleMapsSession.js");
+const GoogleMapsUtils_js_1 = require("../internal/GoogleMapsUtils.js");
 const loggerCategory = "MapLayersFormats.GoogleMaps";
-const levelToken = "{level}";
-const rowToken = "{row}";
-const columnToken = "{column}";
-const urlTemplate = `https://tile.googleapis.com/v1/2dtiles/${levelToken}/${columnToken}/${rowToken}`;
 /*
 * Google Maps imagery provider
-* @internal
+* @beta
 */
 class GoogleMapsImageryProvider extends core_frontend_1.MapLayerImageryProvider {
     _decorator;
     _hadUnrecoverableError = false;
     _tileSize = 256;
-    constructor(settings) {
+    _sessionManager;
+    _sessionOptions;
+    _activeSession;
+    constructor(settings, sessionManager) {
         super(settings, true);
         this._decorator = new GoogleMapDecorator_js_1.GoogleMapsDecorator();
-    }
-    static validateUrlTemplate(template) {
-        return { status: (template.indexOf(levelToken) > 0 && template.indexOf(columnToken) > 0 && template.indexOf(rowToken) > 0) ? core_frontend_1.MapLayerSourceStatus.Valid : core_frontend_1.MapLayerSourceStatus.InvalidUrl };
-    }
-    async createSession() {
-        const sessionOptions = this.createCreateSessionOptions();
-        if (this._settings.accessKey) {
-            // Create session and store in query parameters
-            const sessionObj = await GoogleMapsUtils_js_1.GoogleMapsUtils.createSession(this._settings.accessKey.value, sessionOptions);
-            this._settings.unsavedQueryParams = { session: sessionObj.session };
-            return sessionObj;
-        }
-        else {
-            core_bentley_1.Logger.logError(loggerCategory, `Missing GoogleMaps api key`);
-            return undefined;
-        }
+        this._sessionManager = sessionManager;
     }
     get tileSize() { return this._tileSize; }
     async initialize() {
-        const layerPropertyKeys = this._settings.properties ? Object.keys(this._settings.properties) : undefined;
-        if (layerPropertyKeys === undefined ||
-            !layerPropertyKeys.includes("mapType") ||
-            !layerPropertyKeys.includes("language") ||
-            !layerPropertyKeys.includes("region")) {
-            const msg = "Missing session options";
+        this._sessionOptions = GoogleMapsUtils_js_1.GoogleMapsUtils.getSessionOptionsFromMapLayer(this._settings);
+        this._sessionManager = await this.getSessionManager();
+        this._activeSession = await this._sessionManager.createSession(this._sessionOptions);
+        ;
+        this._tileSize = this._activeSession.getTileSize();
+        const isActivated = await this._decorator.activate(this._settings.properties.mapType);
+        if (!isActivated) {
+            const msg = `Failed to activate decorator`;
             core_bentley_1.Logger.logError(loggerCategory, msg);
             throw new core_bentley_1.BentleyError(core_bentley_1.BentleyStatus.ERROR, msg);
         }
-        const session = await this.createSession();
-        if (!session) {
-            const msg = `Failed to create session`;
-            core_bentley_1.Logger.logError(loggerCategory, msg);
-            throw new core_bentley_1.BentleyError(core_bentley_1.BentleyStatus.ERROR, msg);
+    }
+    async getSessionManager() {
+        if (this._sessionManager)
+            return this._sessionManager;
+        if (this._settings.accessKey?.value) {
+            return new NativeGoogleMapsSession_js_1.NativeGoogleMapsSessionManager(this._settings.accessKey.value);
         }
-        this._tileSize = session.tileWidth; // assuming here tiles are square
-        const isActivated = await this._decorator.activate(this._settings.properties.mapType);
-        if (!isActivated) {
-            const msg = `Failed to activate decorator`;
+        else {
+            const msg = `Missing GoogleMaps api key`;
             core_bentley_1.Logger.logError(loggerCategory, msg);
             throw new core_bentley_1.BentleyError(core_bentley_1.BentleyStatus.ERROR, msg);
         }
     }
-    createCreateSessionOptions() {
-        const layerPropertyKeys = this._settings.properties ? Object.keys(this._settings.properties) : undefined;
+    createCreateSessionOptions(settings) {
+        const layerPropertyKeys = settings.properties ? Object.keys(settings.properties) : undefined;
         if (layerPropertyKeys === undefined ||
             !layerPropertyKeys.includes("mapType") ||
             !layerPropertyKeys.includes("language") ||
@@ -81,11 +67,11 @@ class GoogleMapsImageryProvider extends core_frontend_1.MapLayerImageryProvider
             throw new core_bentley_1.BentleyError(core_bentley_1.BentleyStatus.ERROR, msg);
         }
         const createSessionOptions = {
-            mapType: this._settings.properties.mapType,
+            mapType: settings.properties.mapType,
             region: this._settings.properties.region,
             language: this._settings.properties.language,
         };
-        if (this._settings.properties?.layerTypes !== undefined) {
+        if (Array.isArray(this._settings.properties?.layerTypes) && this._settings.properties.layerTypes.length > 0) {
             createSessionOptions.layerTypes = this._settings.properties.layerTypes;
         }
         if (this._settings.properties?.scale !== undefined) {
@@ -99,15 +85,27 @@ class GoogleMapsImageryProvider extends core_frontend_1.MapLayerImageryProvider
         }
         return createSessionOptions;
     }
-    // construct the Url from the desired Tile
-    async constructUrl(row, column, level) {
-        const tmpUrl = urlTemplate.replace(levelToken, level.toString()).replace(columnToken, column.toString()).replace(rowToken, row.toString());
-        const obj = new URL(tmpUrl);
-        if (this._settings.accessKey) {
-            obj.searchParams.append("key", this._settings.accessKey.value);
-        }
-        // We assume the 'session' param to be already part of the query parameters (checked in initialize)
-        return this.appendCustomParams(obj.toString());
+    // not used, see loadTile
+    async constructUrl(_row, _column, _level) {
+        return "";
+    }
+    async fetchViewportInfo(rectangle, zoomLevel) {
+        if (!this._activeSession) {
+            core_bentley_1.Logger.logError(loggerCategory, `Session is not initialized`);
+            throw new core_bentley_1.BentleyError(core_bentley_1.BentleyStatus.ERROR, "Session is not initialized");
+        }
+        const req = this._activeSession.getViewportInfoRequest(rectangle, zoomLevel);
+        const request = new Request(req.url, { method: "GET" });
+        if (req.authorization) {
+            request.headers.set("Authorization", req.authorization);
+        }
+        // Add the session token to the request
+        const response = await fetch(request);
+        if (!response.ok) {
+            core_bentley_1.Logger.logError(loggerCategory, `Error while loading viewport info: ${response.statusText}`);
+            throw new core_bentley_1.BentleyError(core_bentley_1.BentleyStatus.ERROR, `Error while loading viewport info: ${response.statusText}`);
+        }
+        return response.json();
     }
     async fetchAttributions(tiles) {
         const zooms = new Set();
@@ -126,14 +124,9 @@ class GoogleMapsImageryProvider extends core_frontend_1.MapLayerImageryProvider
                         cartoRect = rect;
                 }
             }
-            if (cartoRect) {
+            if (cartoRect && this._activeSession) {
                 try {
-                    const viewportInfo = await GoogleMapsUtils_js_1.GoogleMapsUtils.getViewportInfo({
-                        rectangle: cartoRect,
-                        session: this._settings.collectQueryParams().session,
-                        key: this._settings.accessKey.value,
-                        zoom
-                    });
+                    const viewportInfo = await this.fetchViewportInfo(cartoRect, zoom);
                     if (viewportInfo?.copyright) {
                         matchingAttributions.push(viewportInfo.copyright);
                     }
@@ -155,18 +148,23 @@ class GoogleMapsImageryProvider extends core_frontend_1.MapLayerImageryProvider
         }
     }
     async loadTile(row, column, zoomLevel) {
+        const tilePos = { row, column, level: zoomLevel };
         if (this._hadUnrecoverableError)
             return undefined;
+        if (this._activeSession === undefined || this._sessionOptions === undefined) {
+            core_bentley_1.Logger.logError(loggerCategory, `Session manager is not initialized`);
+            return undefined;
+        }
         try {
-            let tileUrl = await this.constructUrl(row, column, zoomLevel);
-            let tileResponse = await this.makeTileRequest(tileUrl);
+            let tileRequest = this._activeSession.getTileRequest(tilePos);
+            let tileResponse = await this.makeTileRequest(tileRequest.url.toString(), undefined, tileRequest.authorization);
             if (!tileResponse.ok) {
-                if (tileResponse.headers.get("content-type")?.includes("application/json")) {
-                    // Session might have expired, lets try to re-new it.
-                    const isSessionCreated = await this.createSession();
-                    if (isSessionCreated) {
-                        tileUrl = await this.constructUrl(row, column, zoomLevel);
-                        tileResponse = await this.makeTileRequest(tileUrl);
+                if (tileResponse.headers.get("content-type")?.includes("application/json") && this._sessionManager) {
+                    try {
+                        // Session might have expired, lets try to refresh it
+                        this._activeSession = await this._sessionManager.createSession(this._sessionOptions);
+                        tileRequest = this._activeSession.getTileRequest(tilePos);
+                        tileResponse = await this.makeTileRequest(tileRequest.url.toString(), undefined, tileRequest.authorization);
                         if (!tileResponse.ok) {
                             if (tileResponse.headers.get("content-type")?.includes("application/json")) {
                                 await this.logJsonError(tileResponse);
@@ -178,7 +176,7 @@ class GoogleMapsImageryProvider extends core_frontend_1.MapLayerImageryProvider
                             return undefined;
                         }
                     }
-                    else {
+                    catch {
                         await this.logJsonError(tileResponse);
                     }
                 }