@loaders.gl/tile-converter 4.0.0-alpha.16 → 4.0.0-alpha.18

package/dist/esm/lib/utils/lod-conversion-utils.js

@@ -21,10 +21,12 @@ export function convertGeometricErrorToScreenThreshold(tile, coordinates) {
   return lodSelection;
 }
 export function convertScreenThresholdToGeometricError(node) {
-  const metricData = node.header.lodSelection.maxScreenThreshold || {};
-  let maxError = metricData.maxError;
+  var _node$lodSelection;
+  const metricData = (_node$lodSelection = node.lodSelection) === null || _node$lodSelection === void 0 ? void 0 : _node$lodSelection.find(metric => metric.metricType === 'maxScreenThreshold');
+  let maxError = metricData === null || metricData === void 0 ? void 0 : metricData.maxError;
   if (!maxError) {
-    const sqMetricData = node.header.lodSelection.maxScreenThresholdSQ;
+    var _node$lodSelection2;
+    const sqMetricData = (_node$lodSelection2 = node.lodSelection) === null || _node$lodSelection2 === void 0 ? void 0 : _node$lodSelection2.find(metric => metric.metricType === 'maxScreenThresholdSQ');
     if (sqMetricData) {
       maxError = Math.sqrt(sqMetricData.maxError / (Math.PI * 0.25));
     }
@@ -32,6 +34,6 @@ export function convertScreenThresholdToGeometricError(node) {
   if (!maxError) {
     maxError = DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR;
   }
-  return node.header.mbs[3] * 2 * DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR / maxError;
+  return node.mbs[3] * 2 * DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR / maxError;
 }
 //# sourceMappingURL=lod-conversion-utils.js.map

package/dist/esm/lib/utils/lod-conversion-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"lod-conversion-utils.js","names":["DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR","convertGeometricErrorToScreenThreshold","tile","coordinates","lodSelection","boundingVolume","lodMetricValue","maxScreenThreshold","metricType","maxError","mbs","maxScreenThresholdSQ","Math","PI","constructor","name","push","convertScreenThresholdToGeometricError","node","metricData","header","sqMetricData","sqrt"],"sources":["../../../../src/lib/utils/lod-conversion-utils.ts"],"sourcesContent":["import {Tiles3DTileJSONPostprocessed} from '@loaders.gl/3d-tiles';\nimport {BoundingVolumes} from '@loaders.gl/i3s';\nimport {Tile3D} from '@loaders.gl/tiles';\n\n// https://cesium.com/docs/cesiumjs-ref-doc/Cesium3DTileset.html\nconst DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR = 16;\n/**\n * Do conversion from geometric error to screen threshold\n * \n * In 3DTiles we have HLOD logic and parent tile also has bigger lodMetric value then its children.\n * In I3s we have reverse logic related to maxError. Parent has lower maxError than its child.\n * In nodes where are no children tile.lodMetricValue is 0. This is because of logic of HLOD in 3DTiles\n * 3DTiles spec:\n * https://github.com/CesiumGS/3d-tiles/tree/master/specification#geometric-error\n * I3S spec:\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.7/lodSelection.cmn.md\n * To avoid infinity values when we do calculations of maxError we shold replace 0 with value which allows us\n * to make child maxError bigger than his parent maxError.\n * \n * @param tile - 3d-tiles tile JSON\n * @param coordinates - node converted coordinates\n * @returns An array of LOD metrics in format compatible with i3s 3DNodeIndexDocument.lodSelection\n * @example \n *  [\n        {\n            \"metricType\": \"maxScreenThresholdSQ\",\n            \"maxError\": 870638.071285568\n        },\n        {\n            \"metricType\": \"maxScreenThreshold\",\n            \"maxError\": 1052.8679031638949\n        }\n    ]\n */\nexport function convertGeometricErrorToScreenThreshold(\n  tile: Tiles3DTileJSONPostprocessed,\n  coordinates: BoundingVolumes\n) {\n  const lodSelection: {metricType: string; maxError: number}[] = [];\n  const boundingVolume = tile.boundingVolume;\n  const lodMetricValue = tile.lodMetricValue || 0.1;\n  const maxScreenThreshold = {\n    metricType: 'maxScreenThreshold',\n    maxError: (coordinates.mbs[3] * 2 * DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR) / lodMetricValue\n  };\n  const maxScreenThresholdSQ = {\n    metricType: 'maxScreenThresholdSQ',\n    maxError: Math.PI * 0.25 * maxScreenThreshold.maxError * maxScreenThreshold.maxError\n  };\n\n  if (boundingVolume.constructor.name === 'OrientedBoundingBox') {\n    lodSelection.push(maxScreenThresholdSQ);\n    lodSelection.push(maxScreenThreshold);\n  } else {\n    lodSelection.push(maxScreenThreshold);\n    lodSelection.push(maxScreenThresholdSQ);\n  }\n\n  return lodSelection;\n}\n\n/**\n * Convert LOD metric from \"Screen Threshold\" to \"Screen Space Error\"\n * @param node - i3s node data\n * @returns lod metric in 3d-tiles format\n */\nexport function convertScreenThresholdToGeometricError(node: Tile3D): number {\n  const metricData = node.header.lodSelection.maxScreenThreshold || {};\n  let maxError = metricData.maxError;\n  if (!maxError) {\n    const sqMetricData = node.header.lodSelection.maxScreenThresholdSQ;\n    if (sqMetricData) {\n      maxError = Math.sqrt(sqMetricData.maxError / (Math.PI * 0.25));\n    }\n  }\n\n  if (!maxError) {\n    maxError = DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR;\n  }\n\n  return (node.header.mbs[3] * 2 * DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR) / maxError;\n}\n"],"mappings":"AAKA,MAAMA,kCAAkC,GAAG,EAAE;AA6B7C,OAAO,SAASC,sCAAsCA,CACpDC,IAAkC,EAClCC,WAA4B,EAC5B;EACA,MAAMC,YAAsD,GAAG,EAAE;EACjE,MAAMC,cAAc,GAAGH,IAAI,CAACG,cAAc;EAC1C,MAAMC,cAAc,GAAGJ,IAAI,CAACI,cAAc,IAAI,GAAG;EACjD,MAAMC,kBAAkB,GAAG;IACzBC,UAAU,EAAE,oBAAoB;IAChCC,QAAQ,EAAGN,WAAW,CAACO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAGV,kCAAkC,GAAIM;EAC5E,CAAC;EACD,MAAMK,oBAAoB,GAAG;IAC3BH,UAAU,EAAE,sBAAsB;IAClCC,QAAQ,EAAEG,IAAI,CAACC,EAAE,GAAG,IAAI,GAAGN,kBAAkB,CAACE,QAAQ,GAAGF,kBAAkB,CAACE;EAC9E,CAAC;EAED,IAAIJ,cAAc,CAACS,WAAW,CAACC,IAAI,KAAK,qBAAqB,EAAE;IAC7DX,YAAY,CAACY,IAAI,CAACL,oBAAoB,CAAC;IACvCP,YAAY,CAACY,IAAI,CAACT,kBAAkB,CAAC;EACvC,CAAC,MAAM;IACLH,YAAY,CAACY,IAAI,CAACT,kBAAkB,CAAC;IACrCH,YAAY,CAACY,IAAI,CAACL,oBAAoB,CAAC;EACzC;EAEA,OAAOP,YAAY;AACrB;AAOA,OAAO,SAASa,sCAAsCA,CAACC,IAAY,EAAU;EAC3E,MAAMC,UAAU,GAAGD,IAAI,CAACE,MAAM,CAAChB,YAAY,CAACG,kBAAkB,IAAI,CAAC,CAAC;EACpE,IAAIE,QAAQ,GAAGU,UAAU,CAACV,QAAQ;EAClC,IAAI,CAACA,QAAQ,EAAE;IACb,MAAMY,YAAY,GAAGH,IAAI,CAACE,MAAM,CAAChB,YAAY,CAACO,oBAAoB;IAClE,IAAIU,YAAY,EAAE;MAChBZ,QAAQ,GAAGG,IAAI,CAACU,IAAI,CAACD,YAAY,CAACZ,QAAQ,IAAIG,IAAI,CAACC,EAAE,GAAG,IAAI,CAAC,CAAC;IAChE;EACF;EAEA,IAAI,CAACJ,QAAQ,EAAE;IACbA,QAAQ,GAAGT,kCAAkC;EAC/C;EAEA,OAAQkB,IAAI,CAACE,MAAM,CAACV,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAGV,kCAAkC,GAAIS,QAAQ;AACjF"}
+{"version":3,"file":"lod-conversion-utils.js","names":["DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR","convertGeometricErrorToScreenThreshold","tile","coordinates","lodSelection","boundingVolume","lodMetricValue","maxScreenThreshold","metricType","maxError","mbs","maxScreenThresholdSQ","Math","PI","constructor","name","push","convertScreenThresholdToGeometricError","node","_node$lodSelection","metricData","find","metric","_node$lodSelection2","sqMetricData","sqrt"],"sources":["../../../../src/lib/utils/lod-conversion-utils.ts"],"sourcesContent":["import {Tiles3DTileJSONPostprocessed} from '@loaders.gl/3d-tiles';\nimport {BoundingVolumes} from '@loaders.gl/i3s';\nimport {I3STileHeader} from '@loaders.gl/i3s/src/types';\n\n// https://cesium.com/docs/cesiumjs-ref-doc/Cesium3DTileset.html\nconst DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR = 16;\n/**\n * Do conversion from geometric error to screen threshold\n * \n * In 3DTiles we have HLOD logic and parent tile also has bigger lodMetric value then its children.\n * In I3s we have reverse logic related to maxError. Parent has lower maxError than its child.\n * In nodes where are no children tile.lodMetricValue is 0. This is because of logic of HLOD in 3DTiles\n * 3DTiles spec:\n * https://github.com/CesiumGS/3d-tiles/tree/master/specification#geometric-error\n * I3S spec:\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.7/lodSelection.cmn.md\n * To avoid infinity values when we do calculations of maxError we shold replace 0 with value which allows us\n * to make child maxError bigger than his parent maxError.\n * \n * @param tile - 3d-tiles tile JSON\n * @param coordinates - node converted coordinates\n * @returns An array of LOD metrics in format compatible with i3s 3DNodeIndexDocument.lodSelection\n * @example \n *  [\n        {\n            \"metricType\": \"maxScreenThresholdSQ\",\n            \"maxError\": 870638.071285568\n        },\n        {\n            \"metricType\": \"maxScreenThreshold\",\n            \"maxError\": 1052.8679031638949\n        }\n    ]\n */\nexport function convertGeometricErrorToScreenThreshold(\n  tile: Tiles3DTileJSONPostprocessed,\n  coordinates: BoundingVolumes\n) {\n  const lodSelection: {metricType: string; maxError: number}[] = [];\n  const boundingVolume = tile.boundingVolume;\n  const lodMetricValue = tile.lodMetricValue || 0.1;\n  const maxScreenThreshold = {\n    metricType: 'maxScreenThreshold',\n    maxError: (coordinates.mbs[3] * 2 * DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR) / lodMetricValue\n  };\n  const maxScreenThresholdSQ = {\n    metricType: 'maxScreenThresholdSQ',\n    maxError: Math.PI * 0.25 * maxScreenThreshold.maxError * maxScreenThreshold.maxError\n  };\n\n  if (boundingVolume.constructor.name === 'OrientedBoundingBox') {\n    lodSelection.push(maxScreenThresholdSQ);\n    lodSelection.push(maxScreenThreshold);\n  } else {\n    lodSelection.push(maxScreenThreshold);\n    lodSelection.push(maxScreenThresholdSQ);\n  }\n\n  return lodSelection;\n}\n\n/**\n * Convert LOD metric from \"Screen Threshold\" to \"Screen Space Error\"\n * @param node - i3s node data\n * @returns lod metric in 3d-tiles format\n */\nexport function convertScreenThresholdToGeometricError(node: I3STileHeader): number {\n  const metricData = node.lodSelection?.find(\n    (metric) => metric.metricType === 'maxScreenThreshold'\n  );\n  let maxError = metricData?.maxError;\n  if (!maxError) {\n    const sqMetricData = node.lodSelection?.find(\n      (metric) => metric.metricType === 'maxScreenThresholdSQ'\n    );\n    if (sqMetricData) {\n      maxError = Math.sqrt(sqMetricData.maxError / (Math.PI * 0.25));\n    }\n  }\n\n  if (!maxError) {\n    maxError = DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR;\n  }\n\n  return (node.mbs[3] * 2 * DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR) / maxError;\n}\n"],"mappings":"AAKA,MAAMA,kCAAkC,GAAG,EAAE;AA6B7C,OAAO,SAASC,sCAAsCA,CACpDC,IAAkC,EAClCC,WAA4B,EAC5B;EACA,MAAMC,YAAsD,GAAG,EAAE;EACjE,MAAMC,cAAc,GAAGH,IAAI,CAACG,cAAc;EAC1C,MAAMC,cAAc,GAAGJ,IAAI,CAACI,cAAc,IAAI,GAAG;EACjD,MAAMC,kBAAkB,GAAG;IACzBC,UAAU,EAAE,oBAAoB;IAChCC,QAAQ,EAAGN,WAAW,CAACO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAGV,kCAAkC,GAAIM;EAC5E,CAAC;EACD,MAAMK,oBAAoB,GAAG;IAC3BH,UAAU,EAAE,sBAAsB;IAClCC,QAAQ,EAAEG,IAAI,CAACC,EAAE,GAAG,IAAI,GAAGN,kBAAkB,CAACE,QAAQ,GAAGF,kBAAkB,CAACE;EAC9E,CAAC;EAED,IAAIJ,cAAc,CAACS,WAAW,CAACC,IAAI,KAAK,qBAAqB,EAAE;IAC7DX,YAAY,CAACY,IAAI,CAACL,oBAAoB,CAAC;IACvCP,YAAY,CAACY,IAAI,CAACT,kBAAkB,CAAC;EACvC,CAAC,MAAM;IACLH,YAAY,CAACY,IAAI,CAACT,kBAAkB,CAAC;IACrCH,YAAY,CAACY,IAAI,CAACL,oBAAoB,CAAC;EACzC;EAEA,OAAOP,YAAY;AACrB;AAOA,OAAO,SAASa,sCAAsCA,CAACC,IAAmB,EAAU;EAAA,IAAAC,kBAAA;EAClF,MAAMC,UAAU,IAAAD,kBAAA,GAAGD,IAAI,CAACd,YAAY,cAAAe,kBAAA,uBAAjBA,kBAAA,CAAmBE,IAAI,CACvCC,MAAM,IAAKA,MAAM,CAACd,UAAU,KAAK,oBACpC,CAAC;EACD,IAAIC,QAAQ,GAAGW,UAAU,aAAVA,UAAU,uBAAVA,UAAU,CAAEX,QAAQ;EACnC,IAAI,CAACA,QAAQ,EAAE;IAAA,IAAAc,mBAAA;IACb,MAAMC,YAAY,IAAAD,mBAAA,GAAGL,IAAI,CAACd,YAAY,cAAAmB,mBAAA,uBAAjBA,mBAAA,CAAmBF,IAAI,CACzCC,MAAM,IAAKA,MAAM,CAACd,UAAU,KAAK,sBACpC,CAAC;IACD,IAAIgB,YAAY,EAAE;MAChBf,QAAQ,GAAGG,IAAI,CAACa,IAAI,CAACD,YAAY,CAACf,QAAQ,IAAIG,IAAI,CAACC,EAAE,GAAG,IAAI,CAAC,CAAC;IAChE;EACF;EAEA,IAAI,CAACJ,QAAQ,EAAE;IACbA,QAAQ,GAAGT,kCAAkC;EAC/C;EAEA,OAAQkB,IAAI,CAACR,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAGV,kCAAkC,GAAIS,QAAQ;AAC1E"}

package/dist/esm/pgm-loader.js

@@ -1,5 +1,5 @@
 import { parsePGM } from '@math.gl/geoid';
-const VERSION = typeof "4.0.0-alpha.16" !== 'undefined' ? "4.0.0-alpha.16" : 'latest';
+const VERSION = typeof "4.0.0-alpha.18" !== 'undefined' ? "4.0.0-alpha.18" : 'latest';
 export const PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',
   id: 'pgm',

package/dist/lib/utils/lod-conversion-utils.d.ts

@@ -1,6 +1,6 @@
 import { Tiles3DTileJSONPostprocessed } from '@loaders.gl/3d-tiles';
 import { BoundingVolumes } from '@loaders.gl/i3s';
-import { Tile3D } from '@loaders.gl/tiles';
+import { I3STileHeader } from '@loaders.gl/i3s/src/types';
 /**
  * Do conversion from geometric error to screen threshold
  *
@@ -38,5 +38,5 @@ export declare function convertGeometricErrorToScreenThreshold(tile: Tiles3DTile
  * @param node - i3s node data
  * @returns lod metric in 3d-tiles format
  */
-export declare function convertScreenThresholdToGeometricError(node: Tile3D): number;
+export declare function convertScreenThresholdToGeometricError(node: I3STileHeader): number;
 //# sourceMappingURL=lod-conversion-utils.d.ts.map

package/dist/lib/utils/lod-conversion-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lod-conversion-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/lod-conversion-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,4BAA4B,EAAC,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AAIzC;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,4BAA4B,EAClC,WAAW,EAAE,eAAe;gBAEK,MAAM;cAAY,MAAM;IAqB1D;AAED;;;;GAIG;AACH,wBAAgB,sCAAsC,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAe3E"}
+{"version":3,"file":"lod-conversion-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/lod-conversion-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,4BAA4B,EAAC,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AAIxD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,sCAAsC,CACpD,IAAI,EAAE,4BAA4B,EAClC,WAAW,EAAE,eAAe;gBAEK,MAAM;cAAY,MAAM;IAqB1D;AAED;;;;GAIG;AACH,wBAAgB,sCAAsC,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAmBlF"}

package/dist/lib/utils/lod-conversion-utils.js

@@ -60,10 +60,10 @@ exports.convertGeometricErrorToScreenThreshold = convertGeometricErrorToScreenTh
  * @returns lod metric in 3d-tiles format
  */
 function convertScreenThresholdToGeometricError(node) {
-    const metricData = node.header.lodSelection.maxScreenThreshold || {};
-    let maxError = metricData.maxError;
+    const metricData = node.lodSelection?.find((metric) => metric.metricType === 'maxScreenThreshold');
+    let maxError = metricData?.maxError;
     if (!maxError) {
-        const sqMetricData = node.header.lodSelection.maxScreenThresholdSQ;
+        const sqMetricData = node.lodSelection?.find((metric) => metric.metricType === 'maxScreenThresholdSQ');
         if (sqMetricData) {
             maxError = Math.sqrt(sqMetricData.maxError / (Math.PI * 0.25));
         }
@@ -71,6 +71,6 @@ function convertScreenThresholdToGeometricError(node) {
     if (!maxError) {
         maxError = DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR;
     }
-    return (node.header.mbs[3] * 2 * DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR) / maxError;
+    return (node.mbs[3] * 2 * DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR) / maxError;
 }
 exports.convertScreenThresholdToGeometricError = convertScreenThresholdToGeometricError;