@loaders.gl/tile-converter 4.0.0-alpha.6 → 4.0.0-alpha.8

package/src/i3s-server/controllers/slpk-controller.js

@@ -0,0 +1,38 @@
+require('@loaders.gl/polyfills');
+const {fetchFile, parse} = require('@loaders.gl/core');
+const {SLPKLoader} = require('@loaders.gl/i3s');
+const path = require('path');
+
+let slpkArchive;
+
+const loadArchive = async (fullLayerPath) => {
+  slpkArchive = await (await fetchFile(fullLayerPath)).arrayBuffer();
+};
+
+const I3S_LAYER_PATH = process.env.I3sLayerPath || ''; // eslint-disable-line no-process-env, no-undef
+const FULL_LAYER_PATH = path.join(process.cwd(), I3S_LAYER_PATH); // eslint-disable-line no-undef
+
+loadArchive(FULL_LAYER_PATH);
+
+async function getFileByUrl(url) {
+  const trimmedPath = /^\/?(.*)\/?$/.exec(url);
+  let uncompressedFile;
+  if (trimmedPath) {
+    try {
+      uncompressedFile = Buffer.from(
+        await parse(slpkArchive, SLPKLoader, {
+          slpk: {
+            path: trimmedPath[1],
+            pathMode: 'http'
+          }
+        })
+      );
+    } catch (e) {}
+  }
+  return uncompressedFile;
+}
+
+module.exports = {
+  loadArchive,
+  getFileByUrl
+};

package/src/i3s-server/routes/slpk-router.js

@@ -0,0 +1,33 @@
+const express = require('express');
+const {getFileByUrl} = require('../controllers/slpk-controller');
+const createSceneServer = require('../utils/create-scene-server');
+
+const sceneServerRouter = express.Router();
+sceneServerRouter.get('*', async function (req, res, next) {
+  const file = await getFileByUrl('/');
+  if (file) {
+    const layer = JSON.parse(file.toString());
+    const sceneServerResponse = createSceneServer(layer.name, layer);
+    res.send(sceneServerResponse);
+  } else {
+    res.status(404);
+    res.send('File not found');
+  }
+});
+
+const router = express.Router();
+router.get('*', async function (req, res, next) {
+  console.log(req.path);
+  const file = await getFileByUrl(req.path);
+  if (file) {
+    res.send(file);
+  } else {
+    res.status(404);
+    res.send('File not found');
+  }
+});
+
+module.exports = {
+  sceneServerRouter,
+  router
+};

package/src/i3s-server/utils/create-scene-server.js

@@ -0,0 +1,15 @@
+const {v4: uuidv4} = require('uuid');
+
+const createSceneServer = (name, layer) => {
+  return {
+    serviceItemId: uuidv4().replace(/-/gi, ''),
+    serviceName: name,
+    name,
+    currentVersion: '10.7',
+    serviceVersion: '1.8',
+    supportedBindings: ['REST'],
+    layers: [layer]
+  };
+};
+
+module.exports = createSceneServer;

package/src/lib/utils/file-utils.ts

@@ -118,7 +118,8 @@ export async function isFileExists(fileName: string): Promise<boolean> {
  * @param path
  */
 export function removeDir(path: string) {
-  return fs.rmdir(path, {recursive: true});
+  // (node:35607) [DEP0147] DeprecationWarning: In future versions of Node.js, fs.rmdir(path, { recursive: true }) will be removed. Use fs.rm(path, { recursive: true }) instead
+  return fs.rm(path, {recursive: true});
 }
 
 /**

package/src/lib/utils/geometry-utils.ts

@@ -0,0 +1,14 @@
+/**
+ * luma.gl can not work without indices now:
+ * https://github.com/visgl/luma.gl/blob/d8cad75b9f8ca3e578cf078ed9d19e619c2ddbc9/modules/experimental/src/gltf/gltf-instantiator.js#L115
+ * This method generates syntetic indices array: [0, 1, 2, 3, .... , vertexCount-1]
+ * @param {number} vertexCount - vertex count in the geometry
+ * @returns {Uint32Array} indices array.
+ */
+export const generateSyntheticIndices = (vertexCount: number): Uint32Array => {
+  const result = new Uint32Array(vertexCount);
+  for (let index = 0; index < vertexCount; index++) {
+    result[index] = index;
+  }
+  return result;
+};

package/src/lib/utils/lod-conversion-utils.ts

@@ -1,3 +1,4 @@
+import {Tiles3DTileJSONPostprocessed} from '@loaders.gl/3d-tiles';
 import {BoundingVolumes} from '@loaders.gl/i3s';
 import {Tile3D} from '@loaders.gl/tiles';
 
@@ -16,7 +17,7 @@ const DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR = 16;
  * To avoid infinity values when we do calculations of maxError we shold replace 0 with value which allows us
  * to make child maxError bigger than his parent maxError.
  * 
- * @param tile - 3d-tiles tile Object
+ * @param tile - 3d-tiles tile JSON
  * @param coordinates - node converted coordinates
  * @returns An array of LOD metrics in format compatible with i3s 3DNodeIndexDocument.lodSelection
  * @example 
@@ -31,7 +32,10 @@ const DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR = 16;
         }
     ]
  */
-export function convertGeometricErrorToScreenThreshold(tile: Tile3D, coordinates: BoundingVolumes) {
+export function convertGeometricErrorToScreenThreshold(
+  tile: Tiles3DTileJSONPostprocessed,
+  coordinates: BoundingVolumes
+) {
   const lodSelection: {metricType: string; maxError: number}[] = [];
   const boundingVolume = tile.boundingVolume;
   const lodMetricValue = tile.lodMetricValue || 0.1;