@deck.gl/geo-layers - npm Package Compare versions

Comparing version 7.3.0-beta.2 to 7.3.0-beta.3

dist/es5/tile-3d-layer/tile-3d-layer.js

@@ -32,6 +32,2 @@ "use strict";
 
-var _core2 = require("@loaders.gl/core");
-
-var _gltf = require("@loaders.gl/gltf");
-
 var _dTiles = require("@loaders.gl/3d-tiles");
@@ -61,34 +57,2 @@
 
-function unpackTile(tileHeader, dracoLoader) {
-  var content = tileHeader.content;
-
-  if (content) {
-    switch (content.type) {
-      case 'pnts':
-        break;
-
-      case 'i3dm':
-      case 'b3dm':
-        unpackGLTF(tileHeader, dracoLoader);
-        break;
-
-      default:
-        throw new Error("Tile3DLayer: Error unpacking 3D tile ".concat(content.type));
-    }
-  }
-}
-
-function unpackGLTF(tileHeader, dracoLoader) {
-  if (tileHeader.content.gltfArrayBuffer) {
-    tileHeader.userData.gltf = (0, _core2.parse)(tileHeader.content.gltfArrayBuffer, [_gltf.GLTFLoader], {
-      DracoLoader: dracoLoader,
-      decompress: true
-    });
-  }
-
-  if (tileHeader.content.gltfUrl) {
-    tileHeader.userData.gltf = tileHeader.tileset.getTileUrl(tileHeader.content.gltfUrl);
-  }
-}
-
 var Tile3DLayer = function (_CompositeLayer) {
@@ -199,3 +163,2 @@ (0, _inherits2["default"])(Tile3DLayer, _CompositeLayer);
                   onTileLoadFail: this.props.onTileLoadFail,
-                  DracoLoader: this._getDracoLoader(),
                   fetchOptions: fetchOptions
@@ -297,3 +260,2 @@ }, ionMetadata, {}, loadOptions));
           tileset3d.addTileToCache(tile);
-          unpackTile(tile, this._getDracoLoader());
           layerMap[tile.fullUri] = {
@@ -322,7 +284,2 @@ layer: this._create3DTileLayer(tile),
   }, {
-    key: "_getDracoLoader",
-    value: function _getDracoLoader() {
-      return this.props.DracoWorkerLoader || this.props.DracoLoader;
-    }
-  }, {
     key: "_selectLayers",
@@ -383,4 +340,4 @@ value: function _selectLayers(frameNumber) {
     value: function _create3DModelTileLayer(tileHeader) {
-      var gltf = tileHeader.userData.gltf;
       var _tileHeader$content = tileHeader.content,
+          gltf = _tileHeader$content.gltf,
           instances = _tileHeader$content.instances,
@@ -387,0 +344,0 @@ cartographicOrigin = _tileHeader$content.cartographicOrigin,

dist/es6/tile-3d-layer/tile-3d-layer.js

@@ -10,4 +10,2 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { ScenegraphLayer } from '@deck.gl/mesh-layers';
-import { parse } from '@loaders.gl/core';
-import { GLTFLoader } from '@loaders.gl/gltf';
 import { Tileset3D, _getIonTilesetMetadata } from '@loaders.gl/3d-tiles';
@@ -30,35 +28,2 @@ import { getFrameState } from './get-frame-state';
 };
-
-function unpackTile(tileHeader, dracoLoader) {
-  const content = tileHeader.content;
-
-  if (content) {
-    switch (content.type) {
-      case 'pnts':
-        break;
-
-      case 'i3dm':
-      case 'b3dm':
-        unpackGLTF(tileHeader, dracoLoader);
-        break;
-
-      default:
-        throw new Error("Tile3DLayer: Error unpacking 3D tile ".concat(content.type));
-    }
-  }
-}
-
-function unpackGLTF(tileHeader, dracoLoader) {
-  if (tileHeader.content.gltfArrayBuffer) {
-    tileHeader.userData.gltf = parse(tileHeader.content.gltfArrayBuffer, [GLTFLoader], {
-      DracoLoader: dracoLoader,
-      decompress: true
-    });
-  }
-
-  if (tileHeader.content.gltfUrl) {
-    tileHeader.userData.gltf = tileHeader.tileset.getTileUrl(tileHeader.content.gltfUrl);
-  }
-}
-
 export default class Tile3DLayer extends CompositeLayer {
@@ -108,3 +73,2 @@ initializeState() {
       onTileLoadFail: this.props.onTileLoadFail,
-      DracoLoader: this._getDracoLoader(),
       fetchOptions
@@ -161,3 +125,2 @@ }, ionMetadata, {}, loadOptions));
       tileset3d.addTileToCache(tile);
-      unpackTile(tile, this._getDracoLoader());
       layerMap[tile.fullUri] = {
@@ -172,6 +135,2 @@ layer: this._create3DTileLayer(tile),
 
-  _getDracoLoader() {
-    return this.props.DracoWorkerLoader || this.props.DracoLoader;
-  }
-
   _selectLayers(frameNumber) {
@@ -233,5 +192,3 @@ const {
     const {
-      gltf
-    } = tileHeader.userData;
-    const {
+      gltf,
       instances,
@@ -238,0 +195,0 @@ cartographicOrigin,

dist/esm/tile-3d-layer/tile-3d-layer.js

@@ -17,4 +17,2 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { ScenegraphLayer } from '@deck.gl/mesh-layers';
-import { parse } from '@loaders.gl/core';
-import { GLTFLoader } from '@loaders.gl/gltf';
 import { Tileset3D, _getIonTilesetMetadata } from '@loaders.gl/3d-tiles';
@@ -38,34 +36,2 @@ import { getFrameState } from './get-frame-state';
 
-function unpackTile(tileHeader, dracoLoader) {
-  var content = tileHeader.content;
-
-  if (content) {
-    switch (content.type) {
-      case 'pnts':
-        break;
-
-      case 'i3dm':
-      case 'b3dm':
-        unpackGLTF(tileHeader, dracoLoader);
-        break;
-
-      default:
-        throw new Error("Tile3DLayer: Error unpacking 3D tile ".concat(content.type));
-    }
-  }
-}
-
-function unpackGLTF(tileHeader, dracoLoader) {
-  if (tileHeader.content.gltfArrayBuffer) {
-    tileHeader.userData.gltf = parse(tileHeader.content.gltfArrayBuffer, [GLTFLoader], {
-      DracoLoader: dracoLoader,
-      decompress: true
-    });
-  }
-
-  if (tileHeader.content.gltfUrl) {
-    tileHeader.userData.gltf = tileHeader.tileset.getTileUrl(tileHeader.content.gltfUrl);
-  }
-}
-
 var Tile3DLayer = function (_CompositeLayer) {
@@ -177,3 +143,2 @@ _inherits(Tile3DLayer, _CompositeLayer);
                   onTileLoadFail: this.props.onTileLoadFail,
-                  DracoLoader: this._getDracoLoader(),
                   fetchOptions: fetchOptions
@@ -275,3 +240,2 @@ }, ionMetadata, {}, loadOptions));
           tileset3d.addTileToCache(tile);
-          unpackTile(tile, this._getDracoLoader());
           layerMap[tile.fullUri] = {
@@ -300,7 +264,2 @@ layer: this._create3DTileLayer(tile),
   }, {
-    key: "_getDracoLoader",
-    value: function _getDracoLoader() {
-      return this.props.DracoWorkerLoader || this.props.DracoLoader;
-    }
-  }, {
     key: "_selectLayers",
@@ -361,4 +320,4 @@ value: function _selectLayers(frameNumber) {
     value: function _create3DModelTileLayer(tileHeader) {
-      var gltf = tileHeader.userData.gltf;
       var _tileHeader$content = tileHeader.content,
+          gltf = _tileHeader$content.gltf,
           instances = _tileHeader$content.instances,
@@ -365,0 +324,0 @@ cartographicOrigin = _tileHeader$content.cartographicOrigin,

package.json

@@ -5,3 +5,3 @@ {
   "license": "MIT",
-  "version": "7.3.0-beta.2",
+  "version": "7.3.0-beta.3",
   "publishConfig": {
@@ -34,5 +34,5 @@ "access": "public"
   "dependencies": {
-    "@loaders.gl/3d-tiles": "^1.3.0",
-    "@loaders.gl/core": "^1.3.0",
-    "@loaders.gl/gltf": "^1.3.0",
+    "@loaders.gl/3d-tiles": "^1.3.1",
+    "@loaders.gl/core": "^1.3.1",
+    "@loaders.gl/gltf": "^1.3.1",
     "@math.gl/culling": "^3.0.0",
@@ -49,3 +49,3 @@ "@math.gl/geospatial": "^3.0.0",
   },
-  "gitHead": "56eae697d8004beb7cdd0d6f86dff5036791f899"
+  "gitHead": "4dfb7fd3ff478408e4ac0256d9b34674e7955ac1"
 }

src/tile-3d-layer/tile-3d-layer.js

@@ -7,4 +7,2 @@ /* global fetch */
 
-import {parse} from '@loaders.gl/core';
-import {GLTFLoader} from '@loaders.gl/gltf';
 import {Tileset3D, _getIonTilesetMetadata} from '@loaders.gl/3d-tiles';
@@ -30,33 +28,2 @@
 
-function unpackTile(tileHeader, dracoLoader) {
-  const content = tileHeader.content;
-  if (content) {
-    switch (content.type) {
-      case 'pnts':
-        // Nothing to do;
-        break;
-      case 'i3dm':
-      case 'b3dm':
-        unpackGLTF(tileHeader, dracoLoader);
-        break;
-      default:
-        throw new Error(`Tile3DLayer: Error unpacking 3D tile ${content.type}`);
-    }
-  }
-}
-
-// TODO - move glTF + Draco parsing into the Tile3DLoader
-// DracoLoading is typically async on worker, better keep it in the top-level `parse` promise...
-function unpackGLTF(tileHeader, dracoLoader) {
-  if (tileHeader.content.gltfArrayBuffer) {
-    tileHeader.userData.gltf = parse(tileHeader.content.gltfArrayBuffer, [GLTFLoader], {
-      DracoLoader: dracoLoader,
-      decompress: true
-    });
-  }
-  if (tileHeader.content.gltfUrl) {
-    tileHeader.userData.gltf = tileHeader.tileset.getTileUrl(tileHeader.content.gltfUrl);
-  }
-}
-
 export default class Tile3DLayer extends CompositeLayer {
@@ -104,3 +71,2 @@ initializeState() {
       // TODO: explicit passing should not be needed, registerLoaders should suffice
-      DracoLoader: this._getDracoLoader(),
       fetchOptions,
@@ -150,3 +116,2 @@ ...ionMetadata,
       tileset3d.addTileToCache(tile);
-      unpackTile(tile, this._getDracoLoader());
 
@@ -163,6 +128,2 @@ layerMap[tile.fullUri] = {
 
-  _getDracoLoader() {
-    return this.props.DracoWorkerLoader || this.props.DracoLoader;
-  }
-
   // Grab only those layers who were selected this frame.
@@ -213,4 +174,3 @@ _selectLayers(frameNumber) {
   _create3DModelTileLayer(tileHeader) {
-    const {gltf} = tileHeader.userData;
-    const {instances, cartographicOrigin, modelMatrix} = tileHeader.content;
+    const {gltf, instances, cartographicOrigin, modelMatrix} = tileHeader.content;
 
@@ -217,0 +177,0 @@ const SubLayerClass = this.getSubLayerClass('scenegraph', ScenegraphLayer);

No alert changes

Worsened metrics

Total package byte prevSize

2421600

decreased by-8.83%

Number of package files

102

decreased by-0.97%

Lines of code

40980

decreased by-9.64%

Dependency changes

• [e-mail]/3d-tiles@^1.3.1

• [e-mail]/core@^1.3.1

• [e-mail]/gltf@^1.3.1