@loaders.gl/tile-converter 3.2.0-alpha.3 → 3.2.1

package/dist/i3s-converter/json-templates/layers.js

@@ -113,6 +113,26 @@ const NODE_PAGES = () => ({
         default: 'maxScreenThresholdSQ'
     }
 });
+const FULL_EXTENT = () => ({
+    xmin: {
+        path: 'xmin'
+    },
+    ymin: {
+        path: 'ymin'
+    },
+    xmax: {
+        path: 'xmax'
+    },
+    ymax: {
+        path: 'ymax'
+    },
+    zmin: {
+        path: 'zmin'
+    },
+    zmax: {
+        path: 'zmax'
+    }
+});
 const LAYERS = () => ({
     version: {
         path: 'version',
@@ -145,6 +165,10 @@ const LAYERS = () => ({
         path: 'store',
         transform: (val) => (0, json_map_transform_1.default)(val, store_1.STORE)
     },
+    fullExtent: {
+        path: 'fullExtent',
+        transform: (val) => (0, json_map_transform_1.default)(val, FULL_EXTENT())
+    },
     heightModelInfo: {
         path: 'heightModelInfo',
         transform: (val) => (0, json_map_transform_1.default)(val, HEIGHT_MODEL_INFO())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.2.0-alpha.3",
+  "version": "3.2.1",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -30,7 +30,10 @@
     "README.md"
   ],
   "browser": {
-    "fs": false
+    "fs": false,
+    "path": false,
+    "process": false,
+    "archiver": false
   },
   "scripts": {
     "pre-build": "npm run build-bundle && npm run build-converter-bundle && npm run build-i3s-attributes-worker && npm run build-3d-tiles-attributes-worker",
@@ -40,19 +43,19 @@
     "build-3d-tiles-attributes-worker": "esbuild src/workers/3d-tiles-attributes-worker.ts --outfile=dist/3d-tiles-attributes-worker.js --platform=node --target=esnext,node12 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "3.2.0-alpha.3",
-    "@loaders.gl/crypto": "3.2.0-alpha.3",
-    "@loaders.gl/draco": "3.2.0-alpha.3",
-    "@loaders.gl/gltf": "3.2.0-alpha.3",
-    "@loaders.gl/i3s": "3.2.0-alpha.3",
-    "@loaders.gl/images": "3.2.0-alpha.3",
-    "@loaders.gl/loader-utils": "3.2.0-alpha.3",
-    "@loaders.gl/polyfills": "3.2.0-alpha.3",
-    "@loaders.gl/schema": "3.2.0-alpha.3",
-    "@loaders.gl/textures": "3.2.0-alpha.3",
-    "@loaders.gl/tiles": "3.2.0-alpha.3",
-    "@loaders.gl/worker-utils": "3.2.0-alpha.3",
-    "@loaders.gl/zip": "3.2.0-alpha.3",
+    "@loaders.gl/3d-tiles": "3.2.1",
+    "@loaders.gl/crypto": "3.2.1",
+    "@loaders.gl/draco": "3.2.1",
+    "@loaders.gl/gltf": "3.2.1",
+    "@loaders.gl/i3s": "3.2.1",
+    "@loaders.gl/images": "3.2.1",
+    "@loaders.gl/loader-utils": "3.2.1",
+    "@loaders.gl/polyfills": "3.2.1",
+    "@loaders.gl/schema": "3.2.1",
+    "@loaders.gl/textures": "3.2.1",
+    "@loaders.gl/tiles": "3.2.1",
+    "@loaders.gl/worker-utils": "3.2.1",
+    "@loaders.gl/zip": "3.2.1",
     "@luma.gl/engine": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -70,7 +73,7 @@
     "uuid": "^8.1.0"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "3.2.0-alpha.2"
+    "@loaders.gl/core": "3.2.0"
   },
-  "gitHead": "f0d4b801efeb7094283106352ee759eccfb21f10"
+  "gitHead": "463753213a7de56060d879a70ca934d0165f5897"
 }

package/src/3d-tiles-converter/3d-tiles-converter.ts

@@ -4,7 +4,7 @@ import type {Node3D} from '@loaders.gl/3d-tiles';
 import {join} from 'path';
 import process from 'process';
 import transform from 'json-map-transform';
-import {fetchFile, getLoaderOptions, load} from '@loaders.gl/core';
+import {fetchFile, getLoaderOptions, load, isBrowser} from '@loaders.gl/core';
 import {I3SLoader, I3SAttributeLoader, COORDINATE_SYSTEM} from '@loaders.gl/i3s';
 import {Tileset3D, Tile3D} from '@loaders.gl/tiles';
 import {Geoid} from '@math.gl/geoid';
@@ -23,6 +23,7 @@ import {
   /*transform3DTilesAttributesOnWorker*/
 } from '../3d-tiles-attributes-worker';
 import {getWorkerURL, WorkerFarm} from '@loaders.gl/worker-utils';
+import {BROWSER_ERROR_MESSAGE} from '../constants';
 
 const I3S = 'I3S';
 
@@ -66,6 +67,10 @@ export default class Tiles3DConverter {
     maxDepth?: number;
     egmFilePath: string;
   }): Promise<any> {
+    if (isBrowser) {
+      console.log(BROWSER_ERROR_MESSAGE);
+      return BROWSER_ERROR_MESSAGE;
+    }
     const {inputUrl, outputPath, tilesetName, maxDepth, egmFilePath} = options;
     this.conversionStartTime = process.hrtime();
     this.options = {maxDepth};

package/src/constants.ts

@@ -0,0 +1,2 @@
+export const BROWSER_ERROR_MESSAGE =
+  'Tile converter does not work in browser, only in node js environment';

package/src/i3s-converter/i3s-converter.ts

@@ -16,7 +16,7 @@ import type {
   PopupInfo,
   FieldInfo
 } from '@loaders.gl/i3s';
-import {load, encode, fetchFile, getLoaderOptions} from '@loaders.gl/core';
+import {load, encode, fetchFile, getLoaderOptions, isBrowser} from '@loaders.gl/core';
 import {Tileset3D} from '@loaders.gl/tiles';
 import {CesiumIonLoader, Tiles3DLoader} from '@loaders.gl/3d-tiles';
 import {Geoid} from '@math.gl/geoid';
@@ -58,9 +58,10 @@ import {getWorkerURL, WorkerFarm} from '@loaders.gl/worker-utils';
 import {DracoWriterWorker} from '@loaders.gl/draco';
 import WriteQueue from '../lib/utils/write-queue';
 import {I3SAttributesWorker} from '../i3s-attributes-worker';
+import {BROWSER_ERROR_MESSAGE} from '../constants';
 
 const ION_DEFAULT_TOKEN =
-  process.env.IonToken || // eslint-disable-line
+  process.env?.IonToken || // eslint-disable-line
   'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlYWMxMzcyYy0zZjJkLTQwODctODNlNi01MDRkZmMzMjIxOWIiLCJpZCI6OTYyMCwic2NvcGVzIjpbImFzbCIsImFzciIsImdjIl0sImlhdCI6MTU2Mjg2NjI3M30.1FNiClUyk00YH_nWfSGpiQAjR5V2OvREDq1PJ5QMjWQ'; // eslint-disable-line
 const HARDCODED_NODES_PER_PAGE = 64;
 const _3D_TILES = '3DTILES';
@@ -149,6 +150,10 @@ export default class I3SConverter {
     generateTextures?: boolean;
     generateBoundingVolumes?: boolean;
   }): Promise<any> {
+    if (isBrowser) {
+      console.log(BROWSER_ERROR_MESSAGE);
+      return BROWSER_ERROR_MESSAGE;
+    }
     this.conversionStartTime = process.hrtime();
     const {
       tilesetName,
@@ -279,9 +284,9 @@ export default class I3SConverter {
       nodePages: {
         nodesPerPage: HARDCODED_NODES_PER_PAGE
       },
-      compressGeometry: this.options.draco
+      compressGeometry: this.options.draco,
+      fullExtent
     };
-
     this.layers0 = transform(layers0data, layersTemplate());
   }
 

package/src/i3s-converter/json-templates/layers.ts

@@ -115,6 +115,27 @@ const NODE_PAGES = () => ({
   }
 });
 
+const FULL_EXTENT = () => ({
+  xmin: {
+    path: 'xmin'
+  },
+  ymin: {
+    path: 'ymin'
+  },
+  xmax: {
+    path: 'xmax'
+  },
+  ymax: {
+    path: 'ymax'
+  },
+  zmin: {
+    path: 'zmin'
+  },
+  zmax: {
+    path: 'zmax'
+  }
+});
+
 export const LAYERS = () => ({
   version: {
     path: 'version',
@@ -147,6 +168,10 @@ export const LAYERS = () => ({
     path: 'store',
     transform: (val) => transform(val, STORE)
   },
+  fullExtent: {
+    path: 'fullExtent',
+    transform: (val) => transform(val, FULL_EXTENT())
+  },
   heightModelInfo: {
     path: 'heightModelInfo',
     transform: (val) => transform(val, HEIGHT_MODEL_INFO())