itowns 2.42.1-next.12 → 2.42.1-next.14

package/lib/Source/C3DTilesGoogleSource.js

@@ -0,0 +1,84 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Fetcher = _interopRequireDefault(require("../Provider/Fetcher"));
+var _C3DTilesSource = _interopRequireDefault(require("./C3DTilesSource"));
+function findSessionId(tile) {
+  if (!tile) {
+    return null;
+  }
+  if (tile.content && tile.content.uri) {
+    const searchParams = new URLSearchParams(tile.content.uri.slice(tile.content.uri.indexOf('?') + 1));
+    return searchParams.get('session');
+  } else if (tile.children && tile.children.length > 0) {
+    for (const c of tile.children) {
+      const sessionId = findSessionId(c);
+      if (sessionId) {
+        return sessionId;
+      }
+    }
+  }
+  return null;
+}
+
+/**
+ * @classdesc
+ * An object defining the source connection to a 3DTiles asset from a [Google api](https://tile.googleapis.com).
+ *
+ * @extends C3DTilesSource
+ *
+ * @property {boolean} isC3DTilesGoogleSource - Used to checkout whether this source is a C3DTilesGoogleSource. Default is
+ * true. You should not change this, as it is used internally for optimisation.
+ * @property {string} url - The URL to the tileset json.
+ * @property {string} baseUrl - The base URL to access tiles.
+ */
+class C3DTilesGoogleSource extends _C3DTilesSource.default {
+  /**
+   * Create a new Source for 3D Tiles data from Google api (experimental).
+   *
+   * @constructor
+   * @extends C3DTilesSource
+   *
+   * @property {boolean} isC3DTilesGoogleSource - Used to checkout whether this source is a C3DTilesGoogleSource. Default is
+   * true. You should not change this, as it is used internally for optimisation.
+   * @param {Object} source An object that can contain all properties of a C3DTilesGoogleSource and {@link Source}.
+   * @param {String} source.key Your google tiles map API access key
+   */
+  constructor(source) {
+    if (!source.key) {
+      throw new Error('[C3DTilesGoogleSource]: A API key for the google map tiles API is required');
+    }
+    // URL to the root tileset
+    source.url = `https://tile.googleapis.com/v1/3dtiles/root.json?key=${source.key}`;
+    super(source);
+    this.isC3DTilesGoogleSource = true;
+    this.baseUrl = 'https://tile.googleapis.com';
+    this.key = source.key;
+    this.whenReady = _Fetcher.default.json(source.url, this.networkOptions).then(json => {
+      if (json && json.root) {
+        this.sessionId = findSessionId(json.root);
+        if (this.sessionId === null) {
+          throw new Error('[C3DTilesGoogleSource]: Cannot find sessionId from the tileset while it is mandatory to request tiles.');
+        }
+      }
+      return json;
+    });
+  }
+
+  /**
+   * Adds the key and session to the tile url (non-standard behaviour, that is specific to Google 3D tiles),
+   * see https://github.com/CesiumGS/3d-tiles/issues/746
+   * @param {String} url the tile url
+   * @returns {String} the tile url with Google map tiles api key and session parameters added at the end of the url
+   */
+  getTileUrl(url) {
+    const extraParameters = `key=${this.key}&session=${this.sessionId}`;
+    return /\?/.test(url) ? `${url}&${extraParameters}` : `${url}?${extraParameters}`;
+  }
+}
+var _default = C3DTilesGoogleSource;
+exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.42.1-next.12",
+  "version": "2.42.1-next.14",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "main": "lib/Main.js",
   "exports": {
@@ -76,6 +76,7 @@
     "@babel/preset-env": "^7.22.5",
     "@babel/register": "^7.22.5",
     "@types/three": "^0.159.0",
+    "@xmldom/xmldom": "^0.8.10",
     "babel-inline-import-loader": "^1.0.1",
     "babel-loader": "^9.1.3",
     "babel-plugin-inline-import": "^3.0.0",
@@ -107,6 +108,7 @@
     "puppeteer": "^21.6.0",
     "q": "^1.5.1",
     "replace-in-file": "^7.0.2",
+    "sinon": "^17.0.1",
     "three": "^0.159.0",
     "typescript": "^5.3.3",
     "webpack": "^5.89.0",