itowns 2.42.1-next.2 → 2.42.1-next.21

package/lib/Parser/XbilParser.js

@@ -1,17 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.checkNodeElevationTextureValidity = checkNodeElevationTextureValidity;
-exports.computeMinMaxElevation = computeMinMaxElevation;
-exports.insertSignificantValuesFromParent = insertSignificantValuesFromParent;
-var _DEMUtils = require("../Utils/DEMUtils");
+import { readTextureValueWithBilinearFiltering } from "../Utils/DEMUtils.js";
 function minMax4Corners(texture, pitch, options) {
   const u = pitch.x;
   const v = pitch.y;
   const w = pitch.z;
-  const z = [(0, _DEMUtils.readTextureValueWithBilinearFiltering)(options, texture, u, v), (0, _DEMUtils.readTextureValueWithBilinearFiltering)(options, texture, u + w, v), (0, _DEMUtils.readTextureValueWithBilinearFiltering)(options, texture, u + w, v + w), (0, _DEMUtils.readTextureValueWithBilinearFiltering)(options, texture, u, v + w)].filter(val => val != undefined);
+  const z = [readTextureValueWithBilinearFiltering(options, texture, u, v), readTextureValueWithBilinearFiltering(options, texture, u + w, v), readTextureValueWithBilinearFiltering(options, texture, u + w, v + w), readTextureValueWithBilinearFiltering(options, texture, u, v + w)].filter(val => val != undefined);
   if (z.length) {
     return {
       min: Math.min(...z),
@@ -36,7 +28,7 @@ function minMax4Corners(texture, pitch, options) {
  * @param      {number}          [options.zmax]   The maximum elevation value after which it will be clamped
  * @return     {Object}  The minimum and maximum elevation.
  */
-function computeMinMaxElevation(texture, pitch, options) {
+export function computeMinMaxElevation(texture, pitch, options) {
   const {
     width,
     height,
@@ -99,13 +91,13 @@ function computeMinMaxElevation(texture, pitch, options) {
 }
 
 // We check if the elevation texture has some significant values through corners
-function checkNodeElevationTextureValidity(data, noDataValue) {
+export function checkNodeElevationTextureValidity(data, noDataValue) {
   const l = data.length;
   return data[0] > noDataValue && data[l - 1] > noDataValue && data[Math.sqrt(l) - 1] > noDataValue && data[l - Math.sqrt(l)] > noDataValue;
 }
 
 // This function replaces noDataValue by significant values from parent texture (or 0)
-function insertSignificantValuesFromParent(data) {
+export function insertSignificantValuesFromParent(data) {
   let dataParent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : () => 0;
   let noDataValue = arguments.length > 2 ? arguments[2] : undefined;
   for (let i = 0, l = data.length; i < l; ++i) {

package/lib/Parser/deprecated/LegacyGLTFLoader.js

@@ -1,15 +1,6 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /* eslint-disable */
 // Copy LegacyGLTFLoader file from THREE v110 because it was removed in THREE v111
-
+import * as THREE from 'three';
 const threeExamples = {};
 /**
  * @author Rich Tibbett / https://github.com/richtr
@@ -1373,5 +1364,4 @@ threeExamples.LegacyGLTFLoader = function () {
   };
   return LegacyGLTFLoader;
 }();
-var _default = threeExamples.LegacyGLTFLoader;
-exports.default = _default;
+export default threeExamples.LegacyGLTFLoader;

package/lib/Process/3dTilesProcessing.js

@@ -1,21 +1,8 @@
-"use strict";
+import * as THREE from 'three';
+import ObjectRemovalHelper from "./ObjectRemovalHelper.js";
+import { C3DTilesBoundingVolumeTypes } from "../Core/3DTiles/C3DTilesEnums.js";
+import { C3DTILES_LAYER_EVENTS } from "../Layer/C3DTilesLayer.js";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.$3dTilesCulling = $3dTilesCulling;
-exports.$3dTilesSubdivisionControl = $3dTilesSubdivisionControl;
-exports.computeNodeSSE = computeNodeSSE;
-exports.init3dTilesLayer = init3dTilesLayer;
-exports.pre3dTilesUpdate = pre3dTilesUpdate;
-exports.process3dTilesNode = process3dTilesNode;
-var THREE = _interopRequireWildcard(require("three"));
-var _ObjectRemovalHelper = _interopRequireDefault(require("./ObjectRemovalHelper"));
-var _C3DTilesEnums = require("../Core/3DTiles/C3DTilesEnums");
-var _C3DTilesLayer = require("../Layer/C3DTilesLayer");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /** @module 3dTilesProcessing
 */
 
@@ -31,7 +18,7 @@ function requestNewTile(view, scheduler, geometryLayer, metadata, parent, redraw
     redraw
   };
   geometryLayer.dispatchEvent({
-    type: _C3DTilesLayer.C3DTILES_LAYER_EVENTS.ON_TILE_REQUESTED,
+    type: C3DTILES_LAYER_EVENTS.ON_TILE_REQUESTED,
     metadata
   });
   return scheduler.execute(command);
@@ -117,7 +104,7 @@ function _subdivideNodeSubstractive(context, layer, node) {
  * @param      {THREE.Matrix4}   tileMatrixWorld  The node matrix world
  * @return     {boolean}  return true if the node is visible
  */
-function $3dTilesCulling(layer, camera, node, tileMatrixWorld) {
+export function $3dTilesCulling(layer, camera, node, tileMatrixWorld) {
   // For viewer Request Volume
   // https://github.com/AnalyticalGraphicsInc/3d-tiles-samples/tree/master/tilesets/TilesetWithRequestVolume
   if (node.viewerRequestVolume && node.viewerRequestVolume.viewerRequestVolumeCulling(camera, tileMatrixWorld)) {
@@ -148,7 +135,7 @@ function cleanup3dTileset(layer, n) {
     // skip non-tiles elements
     if (!n.children[i].content) {
       if (canCleanCompletely) {
-        _ObjectRemovalHelper.default.removeChildrenAndCleanupRecursively(n.children[i].layer, n.children[i]);
+        ObjectRemovalHelper.removeChildrenAndCleanupRecursively(n.children[i].layer, n.children[i]);
       }
     } else {
       cleanup3dTileset(layer, n.children[i], depth + 1);
@@ -173,7 +160,7 @@ function cleanup3dTileset(layer, n) {
 }
 
 // this is a layer
-function pre3dTilesUpdate() {
+export function pre3dTilesUpdate() {
   if (!this.visible) {
     return [];
   }
@@ -202,13 +189,13 @@ function pre3dTilesUpdate() {
 }
 const boundingVolumeBox = new THREE.Box3();
 const boundingVolumeSphere = new THREE.Sphere();
-function computeNodeSSE(camera, node) {
+export function computeNodeSSE(camera, node) {
   node.distance = 0;
-  if (node.boundingVolume.initialVolumeType === _C3DTilesEnums.C3DTilesBoundingVolumeTypes.box) {
+  if (node.boundingVolume.initialVolumeType === C3DTilesBoundingVolumeTypes.box) {
     boundingVolumeBox.copy(node.boundingVolume.volume);
     boundingVolumeBox.applyMatrix4(node.matrixWorld);
     node.distance = boundingVolumeBox.distanceToPoint(camera.camera3D.position);
-  } else if (node.boundingVolume.initialVolumeType === _C3DTilesEnums.C3DTilesBoundingVolumeTypes.sphere || node.boundingVolume.initialVolumeType === _C3DTilesEnums.C3DTilesBoundingVolumeTypes.region) {
+  } else if (node.boundingVolume.initialVolumeType === C3DTilesBoundingVolumeTypes.sphere || node.boundingVolume.initialVolumeType === C3DTilesBoundingVolumeTypes.region) {
     boundingVolumeSphere.copy(node.boundingVolume.volume);
     boundingVolumeSphere.applyMatrix4(node.matrixWorld);
     // TODO: see https://github.com/iTowns/itowns/issues/800
@@ -222,7 +209,7 @@ function computeNodeSSE(camera, node) {
   }
   return camera._preSSE * (node.geometricError / node.distance);
 }
-function init3dTilesLayer(view, scheduler, layer, rootTile) {
+export function init3dTilesLayer(view, scheduler, layer, rootTile) {
   return requestNewTile(view, scheduler, layer, rootTile, undefined, true).then(tile => {
     layer.object3d.add(tile);
     tile.updateMatrixWorld();
@@ -256,7 +243,7 @@ function markForDeletion(layer, elt) {
  * @param      {Function}  [subdivisionTest=$3dTilesSubdivisionControl]  The subdivision test method.
  * @return     {Function}    { description_of_the_return_value }
  */
-function process3dTilesNode() {
+export function process3dTilesNode() {
   let cullingTest = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : $3dTilesCulling;
   let subdivisionTest = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : $3dTilesSubdivisionControl;
   return function (context, layer, node) {
@@ -304,7 +291,7 @@ function process3dTilesNode() {
  * @param      {THREE.Object3D}  node  The 3d tile node
  * @return     {boolean}
  */
-function $3dTilesSubdivisionControl(context, layer, node) {
+export function $3dTilesSubdivisionControl(context, layer, node) {
   if (layer.tileset.tiles[node.tileId].children === undefined) {
     return false;
   }

package/lib/Process/FeatureProcessing.js

@@ -1,34 +1,27 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _LayerUpdateState = _interopRequireDefault(require("../Layer/LayerUpdateState"));
-var _ObjectRemovalHelper = _interopRequireDefault(require("./ObjectRemovalHelper"));
-var _handlerNodeError = _interopRequireDefault(require("./handlerNodeError"));
-var _Coordinates = _interopRequireDefault(require("../Core/Geographic/Coordinates"));
-var _GeoidLayer = require("../Layer/GeoidLayer");
-const coord = new _Coordinates.default('EPSG:4326', 0, 0, 0);
-var _default = {
+import LayerUpdateState from "../Layer/LayerUpdateState.js";
+import ObjectRemovalHelper from "./ObjectRemovalHelper.js";
+import handlingError from "./handlerNodeError.js";
+import Coordinates from "../Core/Geographic/Coordinates.js";
+import { geoidLayerIsVisible } from "../Layer/GeoidLayer.js";
+const coord = new Coordinates('EPSG:4326', 0, 0, 0);
+export default {
   update(context, layer, node) {
     if (!node.parent && node.children.length) {
       // if node has been removed dispose three.js resource
-      _ObjectRemovalHelper.default.removeChildrenAndCleanupRecursively(layer, node);
+      ObjectRemovalHelper.removeChildrenAndCleanupRecursively(layer, node);
       return;
     }
     if (!node.visible) {
       return;
     }
     if (node.layerUpdateState[layer.id] === undefined) {
-      node.layerUpdateState[layer.id] = new _LayerUpdateState.default();
+      node.layerUpdateState[layer.id] = new LayerUpdateState();
     } else if (!node.layerUpdateState[layer.id].canTryUpdate()) {
       var _node$link$layer$id;
       // toggle visibility features
       (_node$link$layer$id = node.link[layer.id]) === null || _node$link$layer$id === void 0 ? void 0 : _node$link$layer$id.forEach(f => {
         f.layer.object3d.add(f);
-        f.meshes.position.z = (0, _GeoidLayer.geoidLayerIsVisible)(layer.parent) ? node.geoidHeight : 0;
+        f.meshes.position.z = geoidLayerIsVisible(layer.parent) ? node.geoidHeight : 0;
         f.meshes.updateMatrixWorld();
       });
       return;
@@ -61,14 +54,14 @@ var _default = {
         if (featureMesh) {
           node.link[layer.id] = node.link[layer.id] || [];
           featureMesh.as(context.view.referenceCrs);
-          featureMesh.meshes.position.z = (0, _GeoidLayer.geoidLayerIsVisible)(layer.parent) ? node.geoidHeight : 0;
+          featureMesh.meshes.position.z = geoidLayerIsVisible(layer.parent) ? node.geoidHeight : 0;
           featureMesh.updateMatrixWorld();
           if (layer.onMeshCreated) {
             layer.onMeshCreated(featureMesh, context);
           }
           if (!node.parent) {
             // TODO: Clean cache needs a refactory, because it isn't really efficient and used
-            _ObjectRemovalHelper.default.removeChildrenAndCleanupRecursively(layer, featureMesh);
+            ObjectRemovalHelper.removeChildrenAndCleanupRecursively(layer, featureMesh);
           } else {
             layer.object3d.add(featureMesh);
             node.link[layer.id].push(featureMesh);
@@ -79,7 +72,6 @@ var _default = {
           node.layerUpdateState[layer.id].failure(1, true);
         }
       });
-    }, err => (0, _handlerNodeError.default)(err, node, layer, node.level, context.view));
+    }, err => handlingError(err, node, layer, node.level, context.view));
   }
-};
-exports.default = _default;
+};

package/lib/Process/LayeredMaterialNodeProcessing.js

@@ -1,20 +1,8 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.SIZE_TEXTURE_TILE = exports.SIZE_DIAGONAL_TEXTURE = void 0;
-exports.removeLayeredMaterialNodeLayer = removeLayeredMaterialNodeLayer;
-exports.updateLayeredMaterialNodeElevation = updateLayeredMaterialNodeElevation;
-exports.updateLayeredMaterialNodeImagery = updateLayeredMaterialNodeImagery;
-var _LayerUpdateStrategy = require("../Layer/LayerUpdateStrategy");
-var _LayerUpdateState = _interopRequireDefault(require("../Layer/LayerUpdateState"));
-var _handlerNodeError = _interopRequireDefault(require("./handlerNodeError"));
-const SIZE_TEXTURE_TILE = 256;
-exports.SIZE_TEXTURE_TILE = SIZE_TEXTURE_TILE;
-const SIZE_DIAGONAL_TEXTURE = (2 * (SIZE_TEXTURE_TILE * SIZE_TEXTURE_TILE)) ** 0.5;
-exports.SIZE_DIAGONAL_TEXTURE = SIZE_DIAGONAL_TEXTURE;
+import { chooseNextLevelToFetch } from "../Layer/LayerUpdateStrategy.js";
+import LayerUpdateState from "../Layer/LayerUpdateState.js";
+import handlingError from "./handlerNodeError.js";
+export const SIZE_TEXTURE_TILE = 256;
+export const SIZE_DIAGONAL_TEXTURE = (2 * (SIZE_TEXTURE_TILE * SIZE_TEXTURE_TILE)) ** 0.5;
 function materialCommandQueuePriorityFunction(material) {
   // We know that 'node' is visible because commands can only be
   // issued for visible nodes.
@@ -50,7 +38,7 @@ function buildCommand(view, layer, extentsSource, extentsDestination, requester)
     earlyDropFunction: refinementCommandCancellationFn
   };
 }
-function updateLayeredMaterialNodeImagery(context, layer, node, parent) {
+export function updateLayeredMaterialNodeImagery(context, layer, node, parent) {
   const material = node.material;
   if (!parent || !material) {
     return;
@@ -64,7 +52,7 @@ function updateLayeredMaterialNodeImagery(context, layer, node, parent) {
 
   // Initialisation
   if (node.layerUpdateState[layer.id] === undefined) {
-    node.layerUpdateState[layer.id] = new _LayerUpdateState.default();
+    node.layerUpdateState[layer.id] = new LayerUpdateState();
     if (!layer.source.extentInsideLimit(node.extent, zoom)) {
       // we also need to check that tile's parent doesn't have a texture for this layer,
       // because even if this tile is outside of the layer, it could inherit it's
@@ -118,7 +106,7 @@ function updateLayeredMaterialNodeImagery(context, layer, node, parent) {
   }
   const failureParams = node.layerUpdateState[layer.id].failureParams;
   const destinationLevel = extentsDestination[0].zoom || node.level;
-  const targetLevel = (0, _LayerUpdateStrategy.chooseNextLevelToFetch)(layer.updateStrategy.type, node, destinationLevel, nodeLayer.level, layer, failureParams);
+  const targetLevel = chooseNextLevelToFetch(layer.updateStrategy.type, node, destinationLevel, nodeLayer.level, layer, failureParams);
   if (!layer.source.isVectorSource && targetLevel <= nodeLayer.level || targetLevel > destinationLevel) {
     if (failureParams.lowestLevelError != Infinity) {
       // this is the highest level found in case of error.
@@ -144,9 +132,9 @@ function updateLayeredMaterialNodeImagery(context, layer, node, parent) {
     const pitchs = extentsDestination.map((ext, i) => ext.offsetToParent(result[i].extent, nodeLayer.offsetScales[i]));
     nodeLayer.setTextures(result, pitchs);
     node.layerUpdateState[layer.id].success();
-  }, err => (0, _handlerNodeError.default)(err, node, layer, targetLevel, context.view));
+  }, err => handlingError(err, node, layer, targetLevel, context.view));
 }
-function updateLayeredMaterialNodeElevation(context, layer, node, parent) {
+export function updateLayeredMaterialNodeElevation(context, layer, node, parent) {
   const material = node.material;
   if (!parent || !material) {
     return;
@@ -171,7 +159,7 @@ function updateLayeredMaterialNodeElevation(context, layer, node, parent) {
   }
   if (node.layerUpdateState[layer.id] === undefined) {
     var _parent$material2;
-    node.layerUpdateState[layer.id] = new _LayerUpdateState.default();
+    node.layerUpdateState[layer.id] = new LayerUpdateState();
     const parentLayer = (_parent$material2 = parent.material) === null || _parent$material2 === void 0 ? void 0 : _parent$material2.getLayer(layer.id);
     nodeLayer.initFromParent(parentLayer, extentsDestination);
     if (nodeLayer.level >= layer.source.zoom.min) {
@@ -185,7 +173,7 @@ function updateLayeredMaterialNodeElevation(context, layer, node, parent) {
     return;
   }
   const failureParams = node.layerUpdateState[layer.id].failureParams;
-  const targetLevel = (0, _LayerUpdateStrategy.chooseNextLevelToFetch)(layer.updateStrategy.type, node, extentsDestination[0].zoom, nodeLayer.level, layer, failureParams);
+  const targetLevel = chooseNextLevelToFetch(layer.updateStrategy.type, node, extentsDestination[0].zoom, nodeLayer.level, layer, failureParams);
   if (targetLevel <= nodeLayer.level || targetLevel > extentsDestination[0].zoom) {
     node.layerUpdateState[layer.id].noMoreUpdatePossible();
     return;
@@ -215,19 +203,22 @@ function updateLayeredMaterialNodeElevation(context, layer, node, parent) {
     const pitchs = extentsDestination.map((ext, i) => ext.offsetToParent(result[i].extent, nodeLayer.offsetScales[i]));
     nodeLayer.setTextures(result, pitchs);
     node.layerUpdateState[layer.id].success();
-  }, err => (0, _handlerNodeError.default)(err, node, layer, targetLevel, context.view));
+  }, err => handlingError(err, node, layer, targetLevel, context.view));
 }
-function removeLayeredMaterialNodeLayer(layerId) {
+export function removeLayeredMaterialNodeLayer(layerId) {
+  /**
+   * @param {TileMesh} node - The node to udpate.
+   */
   return function (node) {
     var _node$material;
     if ((_node$material = node.material) !== null && _node$material !== void 0 && _node$material.removeLayer) {
-      node.material.removeLayer(layerId);
-      if (node.material.elevationLayerIds[0] == layerId) {
+      if (node.material.elevationLayerIds.indexOf(layerId) > -1) {
         node.setBBoxZ({
           min: 0,
           max: 0
         });
       }
+      node.material.removeLayer(layerId);
     }
     if (node.layerUpdateState && node.layerUpdateState[layerId]) {
       delete node.layerUpdateState[layerId];

package/lib/Process/ObjectRemovalHelper.js

@@ -1,9 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
 function disposeSingleMaterialAndTextures(material) {
   material.dispose();
   // dispose textures
@@ -14,7 +8,7 @@ function disposeSingleMaterialAndTextures(material) {
     }
   }
 }
-var _default = {
+export default {
   /**
    * Cleanup obj to release three.js allocated resources
    * @param {Object3D} obj object to release
@@ -101,5 +95,4 @@ var _default = {
     }
     return toRemove;
   }
-};
-exports.default = _default;
+};

package/lib/Process/handlerNodeError.js

@@ -1,12 +1,6 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = handlingError;
 // max retry loading before changing the status to definitiveError
 const MAX_RETRY = 4;
-function handlingError(err, node, layer, targetLevel, view) {
+export default function handlingError(err, node, layer, targetLevel, view) {
   // Cancel error handling if the layer was removed between command scheduling and its execution
   if (!node.layerUpdateState[layer.id]) {
     return;

package/lib/Provider/3dTilesProvider.js

@@ -1,19 +1,10 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.configureTile = configureTile;
-exports.default = void 0;
-var THREE = _interopRequireWildcard(require("three"));
-var _B3dmParser = _interopRequireDefault(require("../Parser/B3dmParser"));
-var _PntsParser = _interopRequireDefault(require("../Parser/PntsParser"));
-var _Fetcher = _interopRequireDefault(require("./Fetcher"));
-var _ReferencingLayerProperties = _interopRequireDefault(require("../Layer/ReferencingLayerProperties"));
-var _PointsMaterial = _interopRequireDefault(require("../Renderer/PointsMaterial"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+import * as THREE from 'three';
+import B3dmParser from "../Parser/B3dmParser.js";
+import PntsParser from "../Parser/PntsParser.js";
+import GLTFParser from "../Parser/GLTFParser.js";
+import Fetcher from "./Fetcher.js";
+import ReferLayerProperties from "../Layer/ReferencingLayerProperties.js";
+import PointsMaterial from "../Renderer/PointsMaterial.js";
 const utf8Decoder = new TextDecoder();
 function b3dmToMesh(data, layer, url) {
   const urlBase = THREE.LoaderUtils.extractUrlBase(url);
@@ -22,11 +13,10 @@ function b3dmToMesh(data, layer, url) {
     urlBase,
     overrideMaterials: layer.overrideMaterials,
     doNotPatchMaterial: layer.doNotPatchMaterial,
-    opacity: layer.opacity,
     registeredExtensions: layer.registeredExtensions,
     layer
   };
-  return _B3dmParser.default.parse(data, options).then(result => {
+  return B3dmParser.parse(data, options).then(result => {
     const batchTable = result.batchTable;
     // object3d is actually a THREE.Scene
     const object3d = result.gltf.scene;
@@ -36,9 +26,15 @@ function b3dmToMesh(data, layer, url) {
     };
   });
 }
+function gltfToMesh(data, layer, url) {
+  const urlBase = THREE.LoaderUtils.extractUrlBase(url);
+  return GLTFParser.parse(data, urlBase).then(result => ({
+    object3d: result.scene
+  }));
+}
 function pntsParse(data, layer) {
-  return _PntsParser.default.parse(data, layer.registeredExtensions).then(result => {
-    const material = layer.material ? layer.material.clone() : new _PointsMaterial.default({
+  return PntsParser.parse(data, layer.registeredExtensions).then(result => {
+    const material = layer.material ? layer.material.clone() : new PointsMaterial({
       size: 0.05,
       mode: layer.pntsMode,
       shape: layer.pntsShape,
@@ -50,7 +46,7 @@ function pntsParse(data, layer) {
 
     // refer material properties in the layer so when layers opacity and visibility is updated, the material is
     // automatically updated
-    (0, _ReferencingLayerProperties.default)(material, layer);
+    ReferLayerProperties(material, layer);
 
     // creation points with geometry and material
     const points = new THREE.Points(result.point.geometry, material);
@@ -63,7 +59,7 @@ function pntsParse(data, layer) {
     };
   });
 }
-function configureTile(tile, layer, metadata, parent) {
+export function configureTile(tile, layer, metadata, parent) {
   tile.frustumCulled = false;
   tile.layer = layer;
 
@@ -96,23 +92,31 @@ function executeCommand(command) {
   };
   if (path) {
     // Check if we have relative or absolute url (with tileset's lopocs for example)
-    const url = path.startsWith('http') ? path : metadata.baseURL + path;
+    let url = path.startsWith('http') ? path : metadata.baseURL + path;
+    if (layer.source.isC3DTilesGoogleSource) {
+      url = layer.source.getTileUrl(url);
+    }
     const supportedFormats = {
       b3dm: b3dmToMesh,
-      pnts: pntsParse
+      pnts: pntsParse,
+      gltf: gltfToMesh
     };
-    return _Fetcher.default.arrayBuffer(url, layer.source.networkOptions).then(result => {
+    return Fetcher.arrayBuffer(url, layer.source.networkOptions).then(result => {
       if (result !== undefined) {
         let func;
         const magic = utf8Decoder.decode(new Uint8Array(result, 0, 4));
         if (magic[0] === '{') {
           result = JSON.parse(utf8Decoder.decode(new Uint8Array(result)));
-          const newPrefix = url.slice(0, url.lastIndexOf('/') + 1);
+          // Another specifics of 3D tiles from Google: tilesets in tilesets are required from the root base
+          // url and not from their parent base url
+          const newPrefix = layer.source.isC3DTilesGoogleSource ? layer.source.baseUrl : url.slice(0, url.lastIndexOf('/') + 1);
           layer.tileset.extendTileset(result, metadata.tileId, newPrefix, layer.registeredExtensions);
         } else if (magic == 'b3dm') {
           func = supportedFormats.b3dm;
         } else if (magic == 'pnts') {
           func = supportedFormats.pnts;
+        } else if (magic == 'glTF') {
+          func = supportedFormats.gltf;
         } else {
           return Promise.reject(`Unsupported magic code ${magic}`);
         }
@@ -137,7 +141,6 @@ function executeCommand(command) {
     return Promise.resolve(tile);
   }
 }
-var _default = {
+export default {
   executeCommand
-};
-exports.default = _default;
+};

package/lib/Provider/DataSourceProvider.js

@@ -1,15 +1,8 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
+export default {
   executeCommand(command) {
     const layer = command.layer;
     const src = command.extentsSource;
     const dst = command.extentsDestination || src;
     return Promise.all(src.map((from, i) => layer.getData(from, dst[i])));
   }
-};
-exports.default = _default;
+};

package/lib/Provider/Fetcher.js

@@ -1,11 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _three = require("three");
-const textureLoader = new _three.TextureLoader();
+import { TextureLoader, DataTexture, RedFormat, FloatType } from 'three';
+const textureLoader = new TextureLoader();
 const SIZE_TEXTURE_TILE = 256;
 function checkResponse(response) {
   if (!response.ok) {
@@ -22,16 +16,10 @@ const arrayBuffer = function (url) {
   });
 };
 function getTextureFloat(buffer) {
-  let isWebGL2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  if (isWebGL2) {
-    const texture = new _three.DataTexture(buffer, SIZE_TEXTURE_TILE, SIZE_TEXTURE_TILE, _three.RedFormat, _three.FloatType);
-    texture.internalFormat = 'R32F';
-    texture.needsUpdate = true;
-    return texture;
-  } else {
-    const texture = new _three.DataTexture(buffer, SIZE_TEXTURE_TILE, SIZE_TEXTURE_TILE, _three.AlphaFormat, _three.FloatType);
-    return texture;
-  }
+  const texture = new DataTexture(buffer, SIZE_TEXTURE_TILE, SIZE_TEXTURE_TILE, RedFormat, FloatType);
+  texture.internalFormat = 'R32F';
+  texture.needsUpdate = true;
+  return texture;
 }
 
 /**
@@ -40,7 +28,7 @@ function getTextureFloat(buffer) {
  *
  * @module Fetcher
  */
-var _default = {
+export default {
   /**
    * Wrapper over fetch to get some text.
    *
@@ -142,7 +130,7 @@ var _default = {
     let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     return arrayBuffer(url, options).then(buffer => {
       const floatArray = new Float32Array(buffer);
-      const texture = getTextureFloat(floatArray, options.isWebGL2);
+      const texture = getTextureFloat(floatArray);
       return texture;
     });
   },
@@ -205,6 +193,36 @@ var _default = {
       }
       return Promise.resolve(all);
     });
+  },
+  get() {
+    let format = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    const [type, subtype] = format.split('/');
+    switch (type) {
+      case 'application':
+        switch (subtype) {
+          case 'geo+json':
+          case 'json':
+            return this.json;
+          case 'kml':
+          case 'gpx':
+            return this.xml;
+          case 'x-protobuf;type=mapbox-vector':
+          case 'gtx':
+            return this.arrayBuffer;
+          case 'isg':
+          case 'gdf':
+          default:
+            return this.text;
+        }
+      case 'image':
+        switch (subtype) {
+          case 'x-bil;bits=32':
+            return this.textureFloat;
+          default:
+            return this.texture;
+        }
+      default:
+        return this.texture;
+    }
   }
-};
-exports.default = _default;
+};