@loaders.gl/i3s 4.0.0-alpha.5 → 4.0.0-alpha.7

package/dist/lib/parsers/parse-arcgis-webscene.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseWebscene = void 0;
+const core_1 = require("@loaders.gl/core");
+/**
+ * WKID, or Well-Known ID, of the CRS. Specify either WKID or WKT of the CRS.
+ * Spec - https://github.com/Esri/i3s-spec/blob/master/docs/1.8/spatialReference.cmn.md
+ */
+const SUPPORTED_WKID = 4326;
+const ARCGIS_SCENE_SERVER_LAYER_TYPE = 'ArcGISSceneServiceLayer';
+const BUILDING_SCENE_LAYER = 'BuildingSceneLayer';
+const INTEGRATED_MESH_LAYER = 'IntegratedMeshLayer';
+const GROUP_LAYER = 'GroupLayer';
+/**
+ * Supported layers list
+ * Possible operational layers in WebScene: https://developers.arcgis.com/web-scene-specification/objects/operationalLayers/
+ */
+const SUPPORTED_LAYERS_TYPES = [
+    ARCGIS_SCENE_SERVER_LAYER_TYPE,
+    INTEGRATED_MESH_LAYER,
+    BUILDING_SCENE_LAYER,
+    GROUP_LAYER
+];
+const NO_AVAILABLE_SUPPORTED_LAYERS_ERROR = 'NO_AVAILABLE_SUPPORTED_LAYERS_ERROR';
+const NOT_SUPPORTED_CRS_ERROR = 'NOT_SUPPORTED_CRS_ERROR';
+/**
+ * Parses ArcGIS WebScene
+ * @param data
+ */
+async function parseWebscene(data) {
+    const layer0 = JSON.parse(new TextDecoder().decode(data));
+    const { operationalLayers } = layer0;
+    const { layers, unsupportedLayers } = await parseOperationalLayers(operationalLayers, true);
+    if (!layers.length) {
+        throw new Error(NO_AVAILABLE_SUPPORTED_LAYERS_ERROR);
+    }
+    return {
+        header: layer0,
+        layers,
+        unsupportedLayers
+    };
+}
+exports.parseWebscene = parseWebscene;
+/**
+ * Recursively parses WebScene operational layers.
+ * @param layersList
+ */
+async function parseOperationalLayers(layersList, needToCheckCRS) {
+    const layers = [];
+    let unsupportedLayers = [];
+    for (let index = 0; index < layersList.length; index++) {
+        const layer = layersList[index];
+        const isLayerSupported = SUPPORTED_LAYERS_TYPES.includes(layer.layerType);
+        if (isLayerSupported) {
+            if (needToCheckCRS && layer.layerType !== GROUP_LAYER) {
+                await checkSupportedIndexCRS(layer);
+                needToCheckCRS = false;
+            }
+            layers.push(layer);
+        }
+        else {
+            unsupportedLayers.push(layer);
+        }
+        if (layer.layers?.length) {
+            const { layers: childLayers, unsupportedLayers: childUnsupportedLayers } = await parseOperationalLayers(layer.layers, needToCheckCRS);
+            layer.layers = childLayers;
+            unsupportedLayers = [...unsupportedLayers, ...childUnsupportedLayers];
+        }
+    }
+    return { layers, unsupportedLayers };
+}
+/**
+ * Check if layer has supported CRS
+ * @param layer
+ */
+async function checkSupportedIndexCRS(layer) {
+    try {
+        const layerJson = await (0, core_1.load)(layer.url, core_1.JSONLoader);
+        // @ts-expect-error
+        const wkid = layerJson?.spatialReference?.wkid;
+        if (wkid !== SUPPORTED_WKID) {
+            throw new Error(NOT_SUPPORTED_CRS_ERROR);
+        }
+    }
+    catch (error) {
+        throw error;
+    }
+}

package/dist/lib/parsers/parse-i3s-attribute.d.ts

@@ -1,10 +1,12 @@
+import { TypedArray } from '@loaders.gl/schema';
+type Attribute = string[] | TypedArray | null;
+export type I3STileAttributes = Record<string, Attribute>;
 /**
  * Get particular tile and creates attribute object inside.
- * @param {ArrayBuffer} arrayBuffer
+ * @param  arrayBuffer
  * @param {Object} options
  * @returns {Promise<object>}
  */
-export declare function parseI3STileAttribute(arrayBuffer: any, options: any): Promise<{
-    [x: number]: string[] | Int16Array | Uint32Array | Float64Array | null;
-}>;
+export declare function parseI3STileAttribute(arrayBuffer: ArrayBuffer, options: any): I3STileAttributes;
+export {};
 //# sourceMappingURL=parse-i3s-attribute.d.ts.map

package/dist/lib/parsers/parse-i3s-attribute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-i3s-attribute.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-i3s-attribute.ts"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,WAAW,KAAA,EAAE,OAAO,KAAA;;GAS/D"}
+{"version":3,"file":"parse-i3s-attribute.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-i3s-attribute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAS9C,KAAK,SAAS,GAAG,MAAM,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC;AAC9C,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AAE1D;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,KAAA,GAAG,iBAAiB,CAS1F"}

package/dist/lib/parsers/parse-i3s-attribute.js

@@ -1,74 +1,99 @@
-import { STRING_ATTRIBUTE_TYPE, OBJECT_ID_ATTRIBUTE_TYPE, FLOAT_64_TYPE, INT_16_ATTRIBUTE_TYPE } from './constants';
-export async function parseI3STileAttribute(arrayBuffer, options) {
-  const {
-    attributeName,
-    attributeType
-  } = options;
-
-  if (!attributeName) {
-    return {};
-  }
-
-  return {
-    [attributeName]: attributeType ? parseAttribute(attributeType, arrayBuffer) : null
-  };
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseI3STileAttribute = void 0;
+const constants_1 = require("./constants");
+/**
+ * Get particular tile and creates attribute object inside.
+ * @param  arrayBuffer
+ * @param {Object} options
+ * @returns {Promise<object>}
+ */
+function parseI3STileAttribute(arrayBuffer, options) {
+    const { attributeName, attributeType } = options;
+    if (!attributeName) {
+        return {};
+    }
+    return {
+        [attributeName]: attributeType ? parseAttribute(attributeType, arrayBuffer) : null
+    };
 }
-
+exports.parseI3STileAttribute = parseI3STileAttribute;
+/**
+ * Parse attributes based on attribute type.
+ * @param {String} attributeType
+ * @param  arrayBuffer
+ * @returns
+ */
 function parseAttribute(attributeType, arrayBuffer) {
-  switch (attributeType) {
-    case STRING_ATTRIBUTE_TYPE:
-      return parseStringsAttribute(arrayBuffer);
-
-    case OBJECT_ID_ATTRIBUTE_TYPE:
-      return parseShortNumberAttribute(arrayBuffer);
-
-    case FLOAT_64_TYPE:
-      return parseFloatAttribute(arrayBuffer);
-
-    case INT_16_ATTRIBUTE_TYPE:
-      return parseInt16ShortNumberAttribute(arrayBuffer);
-
-    default:
-      return parseShortNumberAttribute(arrayBuffer);
-  }
+    switch (attributeType) {
+        case constants_1.STRING_ATTRIBUTE_TYPE:
+            return parseStringsAttribute(arrayBuffer);
+        case constants_1.OBJECT_ID_ATTRIBUTE_TYPE:
+            return parseShortNumberAttribute(arrayBuffer);
+        case constants_1.FLOAT_64_TYPE:
+            return parseFloatAttribute(arrayBuffer);
+        case constants_1.INT_16_ATTRIBUTE_TYPE:
+            return parseInt16ShortNumberAttribute(arrayBuffer);
+        default:
+            return parseShortNumberAttribute(arrayBuffer);
+    }
 }
-
+/**
+ * Parse short number attribute.
+ * Short Integer spec - https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md
+ * @param  arrayBuffer
+ * @returns
+ */
 function parseShortNumberAttribute(arrayBuffer) {
-  const countOffset = 4;
-  return new Uint32Array(arrayBuffer, countOffset);
+    const countOffset = 4;
+    return new Uint32Array(arrayBuffer, countOffset);
 }
-
+/**
+ * Parse Int16 short number attribute.
+ * Parsing of such data is not documented. Added to handle Building Scene Layer Tileset attributes data.
+ * @param  arrayBuffer
+ * @returns
+ */
 function parseInt16ShortNumberAttribute(arrayBuffer) {
-  const countOffset = 4;
-  return new Int16Array(arrayBuffer, countOffset);
+    const countOffset = 4;
+    return new Int16Array(arrayBuffer, countOffset);
 }
-
+/**
+ * Parse float attribute.
+ * Double Spec - https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md
+ * @param  arrayBuffer
+ * @returns
+ */
 function parseFloatAttribute(arrayBuffer) {
-  const countOffset = 8;
-  return new Float64Array(arrayBuffer, countOffset);
+    const countOffset = 8;
+    return new Float64Array(arrayBuffer, countOffset);
 }
-
+/**
+ * Parse string attribute.
+ * String spec - https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md
+ * @param arrayBuffer
+ * @returns list of strings
+ */
 function parseStringsAttribute(arrayBuffer) {
-  const stringsCountOffset = 0;
-  const dataOffset = 8;
-  const bytesPerStringSize = 4;
-  const stringsArray = [];
-
-  try {
-    const stringsCount = new DataView(arrayBuffer, stringsCountOffset, bytesPerStringSize).getUint32(stringsCountOffset, true);
-    const stringSizes = new Uint32Array(arrayBuffer, dataOffset, stringsCount);
-    let stringOffset = dataOffset + stringsCount * bytesPerStringSize;
-
-    for (const stringByteSize of stringSizes) {
-      const textDecoder = new TextDecoder('utf-8');
-      const stringAttribute = new Uint8Array(arrayBuffer, stringOffset, stringByteSize);
-      stringsArray.push(textDecoder.decode(stringAttribute));
-      stringOffset += stringByteSize;
+    const stringsCountOffset = 0;
+    const dataOffset = 8;
+    const bytesPerStringSize = 4;
+    const stringsArray = [];
+    try {
+        // Use DataView to avoid multiple of 4 error on Uint32Array constructor
+        const stringsCount = new DataView(arrayBuffer, stringsCountOffset, bytesPerStringSize).getUint32(stringsCountOffset, true);
+        const stringSizes = new Uint32Array(arrayBuffer, dataOffset, stringsCount);
+        let stringOffset = dataOffset + stringsCount * bytesPerStringSize;
+        for (const stringByteSize of stringSizes) {
+            const textDecoder = new TextDecoder('utf-8');
+            const stringAttribute = new Uint8Array(arrayBuffer, stringOffset, stringByteSize);
+            stringsArray.push(textDecoder.decode(stringAttribute));
+            stringOffset += stringByteSize;
+        }
+    }
+    catch (error) {
+        console.error('Parse string attribute error: ', error.message); // eslint-disable-line
     }
-  } catch (error) {
-    console.error('Parse string attribute error: ', error.message);
-  }
-
-  return stringsArray;
+    return stringsArray;
 }
-//# sourceMappingURL=parse-i3s-attribute.js.map

package/dist/lib/parsers/parse-i3s-building-scene-layer.js

@@ -1,45 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseBuildingSceneLayer = void 0;
 const OBJECT_3D_LAYER_TYPE = '3DObject';
-export async function parseBuildingSceneLayer(data, url) {
-  const layer0 = JSON.parse(new TextDecoder().decode(data));
-  const {
-    sublayers
-  } = layer0;
-  return {
-    header: layer0,
-    sublayers: parseSublayersTree(sublayers, url)
-  };
+/**
+ * Parses Builiding Scene Layer and creates tileset
+ * @param data
+ * @param options
+ * @param context
+ */
+async function parseBuildingSceneLayer(data, url) {
+    const layer0 = JSON.parse(new TextDecoder().decode(data));
+    const { sublayers } = layer0;
+    return {
+        header: layer0,
+        sublayers: parseSublayersTree(sublayers, url)
+    };
 }
-
+exports.parseBuildingSceneLayer = parseBuildingSceneLayer;
+/**
+ * Recursively parses Building Scene Layer sublayers.
+ * @param sublayers
+ * @param url
+ */
 function parseSublayersTree(sublayers, url) {
-  let layers = [];
-
-  for (let index = 0; index < sublayers.length; index++) {
-    var _subLayer$sublayers;
-
-    const subLayer = sublayers[index];
-    const {
-      id,
-      layerType,
-      visibility = true,
-      ...rest
-    } = subLayer;
-
-    if (layerType === OBJECT_3D_LAYER_TYPE) {
-      const sublayerUrl = "".concat(url, "/sublayers/").concat(id);
-      layers.push({
-        url: sublayerUrl,
-        id,
-        layerType,
-        visibility,
-        ...rest
-      });
+    let layers = [];
+    for (let index = 0; index < sublayers.length; index++) {
+        const subLayer = sublayers[index];
+        const { id, layerType, visibility = true, ...rest } = subLayer;
+        // Add support only for 3DObject layer type for I3S purposes.
+        if (layerType === OBJECT_3D_LAYER_TYPE) {
+            const sublayerUrl = `${url}/sublayers/${id}`;
+            layers.push({
+                url: sublayerUrl,
+                id,
+                layerType,
+                visibility,
+                ...rest
+            });
+        }
+        if (subLayer?.sublayers?.length) {
+            layers = [...layers, ...parseSublayersTree(subLayer.sublayers, url)];
+        }
     }
-
-    if (subLayer !== null && subLayer !== void 0 && (_subLayer$sublayers = subLayer.sublayers) !== null && _subLayer$sublayers !== void 0 && _subLayer$sublayers.length) {
-      layers = [...layers, ...parseSublayersTree(subLayer.sublayers, url)];
-    }
-  }
-
-  return layers;
+    return layers;
 }
-//# sourceMappingURL=parse-i3s-building-scene-layer.js.map

package/dist/lib/parsers/parse-i3s-tile-content.d.ts

@@ -1,4 +1,4 @@
 import type { LoaderOptions, LoaderContext } from '@loaders.gl/loader-utils';
-import { I3STilesetHeader, I3STileHeader } from '../../types';
-export declare function parseI3STileContent(arrayBuffer: ArrayBuffer, tile: I3STileHeader, tileset: I3STilesetHeader, options?: LoaderOptions, context?: LoaderContext): Promise<I3STileHeader>;
+import { I3STileContent, I3STileOptions, I3STilesetOptions } from '../../types';
+export declare function parseI3STileContent(arrayBuffer: ArrayBuffer, tileOptions: I3STileOptions, tilesetOptions: I3STilesetOptions, options?: LoaderOptions, context?: LoaderContext): Promise<I3STileContent>;
 //# sourceMappingURL=parse-i3s-tile-content.d.ts.map

package/dist/lib/parsers/parse-i3s-tile-content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-i3s-tile-content.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-i3s-tile-content.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAK3E,OAAO,EACL,gBAAgB,EAChB,aAAa,EAQd,MAAM,aAAa,CAAC;AAuBrB,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,gBAAgB,EACzB,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,0BAkDxB"}
+{"version":3,"file":"parse-i3s-tile-content.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-i3s-tile-content.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAK3E,OAAO,EAQL,cAAc,EACd,cAAc,EACd,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAyBrB,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,cAAc,EAC3B,cAAc,EAAE,iBAAiB,EACjC,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,cAAc,CAAC,CA8DzB"}