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

package/dist/esm/workers/i3s-content-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"i3s-content-worker.js","names":["createLoaderWorker","I3SContentLoader"],"sources":["../../../src/workers/i3s-content-worker.ts"],"sourcesContent":["import {createLoaderWorker} from '@loaders.gl/loader-utils';\nimport {I3SContentLoader} from '../i3s-content-loader';\n\ncreateLoaderWorker(I3SContentLoader);\n"],"mappings":"AAAA,SAAQA,kBAAkB,QAAO,0BAA0B;AAC3D,SAAQC,gBAAgB,QAAO,uBAAuB;AAEtDD,kBAAkB,CAACC,gBAAgB,CAAC"}

package/dist/i3s-attribute-loader.d.ts

@@ -1,8 +1,9 @@
-import type { LoaderWithParser } from '@loaders.gl/loader-utils';
+import type { LoaderOptions, LoaderWithParser } from '@loaders.gl/loader-utils';
+import type { I3STileAttributes } from './lib/parsers/parse-i3s-attribute';
 /**
  * Loader for I3S attributes
  */
-export declare const I3SAttributeLoader: LoaderWithParser;
+export declare const I3SAttributeLoader: LoaderWithParser<I3STileAttributes, never, LoaderOptions>;
 /**
  * Load attributes based on feature id
  * @param {Object} tile
@@ -11,4 +12,10 @@ export declare const I3SAttributeLoader: LoaderWithParser;
  * @returns {Promise}
  */
 export declare function loadFeatureAttributes(tile: any, featureId: any, options?: {}): Promise<{} | null>;
+/**
+ * Get attribute value type based on property names
+ * @param {Object} attribute
+ * @returns {String}
+ */
+export declare function getAttributeValueType(attribute: any): any;
 //# sourceMappingURL=i3s-attribute-loader.d.ts.map

package/dist/i3s-attribute-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i3s-attribute-loader.d.ts","sourceRoot":"","sources":["../src/i3s-attribute-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAU/D;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,gBAUhC,CAAC;AAOF;;;;;;GAMG;AAEH,wBAAsB,qBAAqB,CAAC,IAAI,KAAA,EAAE,SAAS,KAAA,EAAE,OAAO,KAAK,sBA+BxE"}
+{"version":3,"file":"i3s-attribute-loader.d.ts","sourceRoot":"","sources":["../src/i3s-attribute-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAE9E,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,mCAAmC,CAAC;AAUzE;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,KAAK,EAAE,aAAa,CAUxF,CAAC;AAKF;;;;;;GAMG;AAEH,wBAAsB,qBAAqB,CAAC,IAAI,KAAA,EAAE,SAAS,KAAA,EAAE,OAAO,KAAK,sBA+BxE;AAeD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,KAAA,OAO9C"}

package/dist/i3s-attribute-loader.js

@@ -1,152 +1,175 @@
-import { load } from '@loaders.gl/core';
-import { parseI3STileAttribute } from './lib/parsers/parse-i3s-attribute';
-import { getUrlWithToken } from './lib/utils/url-utils';
-const VERSION = typeof "4.0.0-alpha.5" !== 'undefined' ? "4.0.0-alpha.5" : 'latest';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAttributeValueType = exports.loadFeatureAttributes = exports.I3SAttributeLoader = void 0;
+const core_1 = require("@loaders.gl/core");
+const parse_i3s_attribute_1 = require("./lib/parsers/parse-i3s-attribute");
+const url_utils_1 = require("./lib/utils/url-utils");
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 const EMPTY_VALUE = '';
 const REJECTED_STATUS = 'rejected';
-export const I3SAttributeLoader = {
-  name: 'I3S Attribute',
-  id: 'i3s-attribute',
-  module: 'i3s',
-  version: VERSION,
-  mimeTypes: ['application/binary'],
-  parse,
-  extensions: ['bin'],
-  options: {},
-  binary: true
+/**
+ * Loader for I3S attributes
+ */
+exports.I3SAttributeLoader = {
+    name: 'I3S Attribute',
+    id: 'i3s-attribute',
+    module: 'i3s',
+    version: VERSION,
+    mimeTypes: ['application/binary'],
+    parse: async (arrayBuffer, options) => (0, parse_i3s_attribute_1.parseI3STileAttribute)(arrayBuffer, options),
+    extensions: ['bin'],
+    options: {},
+    binary: true
 };
-
-async function parse(data, options) {
-  data = parseI3STileAttribute(data, options);
-  return data;
+// TODO - these seem to use the loader rather than being part of the loader. Move to different file...
+/**
+ * Load attributes based on feature id
+ * @param {Object} tile
+ * @param {number} featureId
+ * @param {Object} options
+ * @returns {Promise}
+ */
+// eslint-disable-next-line complexity
+async function loadFeatureAttributes(tile, featureId, options = {}) {
+    const { attributeStorageInfo, attributeUrls, tilesetFields } = getAttributesData(tile);
+    if (!attributeStorageInfo || !attributeUrls || featureId < 0) {
+        return null;
+    }
+    let attributes = [];
+    const attributeLoadPromises = [];
+    for (let index = 0; index < attributeStorageInfo.length; index++) {
+        // @ts-ignore
+        const url = (0, url_utils_1.getUrlWithToken)(attributeUrls[index], options.i3s?.token);
+        const attributeName = attributeStorageInfo[index].name;
+        const attributeType = getAttributeValueType(attributeStorageInfo[index]);
+        const loadOptions = { ...options, attributeName, attributeType };
+        const promise = (0, core_1.load)(url, exports.I3SAttributeLoader, loadOptions);
+        attributeLoadPromises.push(promise);
+    }
+    try {
+        attributes = await Promise.allSettled(attributeLoadPromises);
+    }
+    catch (error) {
+        // do nothing
+    }
+    if (!attributes.length) {
+        return null;
+    }
+    return generateAttributesByFeatureId(attributes, attributeStorageInfo, featureId, tilesetFields);
 }
-
-export async function loadFeatureAttributes(tile, featureId, options = {}) {
-  const {
-    attributeStorageInfo,
-    attributeUrls,
-    tilesetFields
-  } = getAttributesData(tile);
-
-  if (!attributeStorageInfo || !attributeUrls || !featureId) {
-    return null;
-  }
-
-  let attributes = [];
-  const attributeLoadPromises = [];
-
-  for (let index = 0; index < attributeStorageInfo.length; index++) {
-    var _options$i3s;
-
-    const url = getUrlWithToken(attributeUrls[index], (_options$i3s = options.i3s) === null || _options$i3s === void 0 ? void 0 : _options$i3s.token);
-    const attributeName = attributeStorageInfo[index].name;
-    const attributeType = getAttributeValueType(attributeStorageInfo[index]);
-    const loadOptions = { ...options,
-      attributeName,
-      attributeType
-    };
-    const promise = load(url, I3SAttributeLoader, loadOptions);
-    attributeLoadPromises.push(promise);
-  }
-
-  try {
-    attributes = await Promise.allSettled(attributeLoadPromises);
-  } catch (error) {}
-
-  if (!attributes.length) {
-    return null;
-  }
-
-  return generateAttributesByFeatureId(attributes, attributeStorageInfo, featureId, tilesetFields);
-}
-
+exports.loadFeatureAttributes = loadFeatureAttributes;
+/**
+ * Gets attributes data from tile.
+ * @param tile
+ * @returns
+ */
 function getAttributesData(tile) {
-  var _tile$tileset, _tile$tileset$tileset, _tile$header, _tile$tileset2, _tile$tileset2$tilese;
-
-  const attributeStorageInfo = (_tile$tileset = tile.tileset) === null || _tile$tileset === void 0 ? void 0 : (_tile$tileset$tileset = _tile$tileset.tileset) === null || _tile$tileset$tileset === void 0 ? void 0 : _tile$tileset$tileset.attributeStorageInfo;
-  const attributeUrls = (_tile$header = tile.header) === null || _tile$header === void 0 ? void 0 : _tile$header.attributeUrls;
-  const tilesetFields = ((_tile$tileset2 = tile.tileset) === null || _tile$tileset2 === void 0 ? void 0 : (_tile$tileset2$tilese = _tile$tileset2.tileset) === null || _tile$tileset2$tilese === void 0 ? void 0 : _tile$tileset2$tilese.fields) || [];
-  return {
-    attributeStorageInfo,
-    attributeUrls,
-    tilesetFields
-  };
+    const attributeStorageInfo = tile.tileset?.tileset?.attributeStorageInfo;
+    const attributeUrls = tile.header?.attributeUrls;
+    const tilesetFields = tile.tileset?.tileset?.fields || [];
+    return { attributeStorageInfo, attributeUrls, tilesetFields };
 }
-
+/**
+ * Get attribute value type based on property names
+ * @param {Object} attribute
+ * @returns {String}
+ */
 function getAttributeValueType(attribute) {
-  if (attribute.hasOwnProperty('objectIds')) {
-    return 'Oid32';
-  } else if (attribute.hasOwnProperty('attributeValues')) {
-    return attribute.attributeValues.valueType;
-  }
-
-  return '';
+    if (attribute.hasOwnProperty('objectIds')) {
+        return 'Oid32';
+    }
+    else if (attribute.hasOwnProperty('attributeValues')) {
+        return attribute.attributeValues.valueType;
+    }
+    return '';
 }
-
+exports.getAttributeValueType = getAttributeValueType;
+/**
+ * Find in attributeStorageInfo attribute name responsible for feature ids list.
+ * @param attributeStorageInfo
+ * @returns Feature ids attribute name
+ */
 function getFeatureIdsAttributeName(attributeStorageInfo) {
-  const objectIdsAttribute = attributeStorageInfo.find(attribute => attribute.name.includes('OBJECTID'));
-  return objectIdsAttribute === null || objectIdsAttribute === void 0 ? void 0 : objectIdsAttribute.name;
+    const objectIdsAttribute = attributeStorageInfo.find(attribute => attribute.name.includes('OBJECTID'));
+    return objectIdsAttribute?.name;
 }
-
+/**
+ * Generates mapping featureId to feature attributes
+ * @param {Array} attributes
+ * @param {Object} attributeStorageInfo
+ * @param {number} featureId
+ * @returns {Object}
+ */
 function generateAttributesByFeatureId(attributes, attributeStorageInfo, featureId, tilesetFields) {
-  const objectIdsAttributeName = getFeatureIdsAttributeName(attributeStorageInfo);
-  const objectIds = attributes.find(attribute => attribute.value[objectIdsAttributeName]);
-
-  if (!objectIds) {
-    return null;
-  }
-
-  const attributeIndex = objectIds.value[objectIdsAttributeName].indexOf(featureId);
-
-  if (attributeIndex < 0) {
-    return null;
-  }
-
-  return getFeatureAttributesByIndex(attributes, attributeIndex, attributeStorageInfo, tilesetFields);
+    const objectIdsAttributeName = getFeatureIdsAttributeName(attributeStorageInfo);
+    const objectIds = attributes.find((attribute) => attribute.value[objectIdsAttributeName]);
+    if (!objectIds) {
+        return null;
+    }
+    const attributeIndex = objectIds.value[objectIdsAttributeName].indexOf(featureId);
+    if (attributeIndex < 0) {
+        return null;
+    }
+    return getFeatureAttributesByIndex(attributes, attributeIndex, attributeStorageInfo, tilesetFields);
 }
-
+/**
+ * Generates attribute object for feature mapping by feature id
+ * @param {Array} attributes
+ * @param {Number} featureIdIndex
+ * @param {Object} attributeStorageInfo
+ * @returns {Object}
+ */
 function getFeatureAttributesByIndex(attributes, featureIdIndex, attributeStorageInfo, tilesetFields) {
-  const attributesObject = {};
-
-  for (let index = 0; index < attributeStorageInfo.length; index++) {
-    const attributeName = attributeStorageInfo[index].name;
-    const codedValues = getAttributeCodedValues(attributeName, tilesetFields);
-    const attribute = getAttributeByIndexAndAttributeName(attributes, index, attributeName);
-    attributesObject[attributeName] = formatAttributeValue(attribute, featureIdIndex, codedValues);
-  }
-
-  return attributesObject;
+    const attributesObject = {};
+    for (let index = 0; index < attributeStorageInfo.length; index++) {
+        const attributeName = attributeStorageInfo[index].name;
+        const codedValues = getAttributeCodedValues(attributeName, tilesetFields);
+        const attribute = getAttributeByIndexAndAttributeName(attributes, index, attributeName);
+        attributesObject[attributeName] = formatAttributeValue(attribute, featureIdIndex, codedValues);
+    }
+    return attributesObject;
 }
-
+/**
+ * Get coded values list from tileset.
+ * @param attributeName
+ * @param tilesetFields
+ */
 function getAttributeCodedValues(attributeName, tilesetFields) {
-  var _attributeField$domai;
-
-  const attributeField = tilesetFields.find(field => field.name === attributeName || field.alias === attributeName);
-  return (attributeField === null || attributeField === void 0 ? void 0 : (_attributeField$domai = attributeField.domain) === null || _attributeField$domai === void 0 ? void 0 : _attributeField$domai.codedValues) || [];
+    const attributeField = tilesetFields
+        .find(field => field.name === attributeName || field.alias === attributeName);
+    return attributeField?.domain?.codedValues || [];
 }
-
+/**
+ * Return attribute value if it presents in atrributes list
+ * @param {array} attributes
+ * @param {number} index
+ * @param {string} attributesName
+ */
 function getAttributeByIndexAndAttributeName(attributes, index, attributesName) {
-  const attributeObject = attributes[index];
-
-  if (attributeObject.status === REJECTED_STATUS) {
-    return null;
-  }
-
-  return attributeObject.value[attributesName];
+    const attributeObject = attributes[index];
+    if (attributeObject.status === REJECTED_STATUS) {
+        return null;
+    }
+    return attributeObject.value[attributesName];
 }
-
+/**
+ * Do formatting of attribute values or return empty string.
+ * @param {Array} attribute
+ * @param {Number} featureIdIndex
+ * @returns {String}
+ */
 function formatAttributeValue(attribute, featureIdIndex, codedValues) {
-  let value = EMPTY_VALUE;
-
-  if (attribute && featureIdIndex in attribute) {
-    value = String(attribute[featureIdIndex]).replace(/\u0000|NaN/g, '').trim();
-  }
-
-  if (codedValues.length) {
-    const codeValue = codedValues.find(codedValue => codedValue.code === Number(value));
-    value = (codeValue === null || codeValue === void 0 ? void 0 : codeValue.name) || EMPTY_VALUE;
-  }
-
-  return value;
+    let value = EMPTY_VALUE;
+    if (attribute && (featureIdIndex in attribute)) {
+        // eslint-disable-next-line no-control-regex
+        value = String(attribute[featureIdIndex]).replace(/\u0000|NaN/g, '').trim();
+    }
+    // Check if coded values are existed. If so we use them.
+    if (codedValues.length) {
+        const codeValue = codedValues.find(codedValue => codedValue.code === Number(value));
+        value = codeValue?.name || EMPTY_VALUE;
+    }
+    return value;
 }
-//# sourceMappingURL=i3s-attribute-loader.js.map

package/dist/i3s-building-scene-layer-loader.js

@@ -1,21 +1,26 @@
-import { parseBuildingSceneLayer } from './lib/parsers/parse-i3s-building-scene-layer';
-const VERSION = typeof "4.0.0-alpha.5" !== 'undefined' ? "4.0.0-alpha.5" : 'beta';
-export const I3SBuildingSceneLayerLoader = {
-  name: 'I3S Building Scene Layer',
-  id: 'i3s-building-scene-layer',
-  module: 'i3s',
-  version: VERSION,
-  mimeTypes: ['application/json'],
-  parse,
-  extensions: ['json'],
-  options: {}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.I3SBuildingSceneLayerLoader = void 0;
+const parse_i3s_building_scene_layer_1 = require("./lib/parsers/parse-i3s-building-scene-layer");
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'beta';
+/**
+ * Loader for I3S - Building Scene Layer
+ */
+exports.I3SBuildingSceneLayerLoader = {
+    name: 'I3S Building Scene Layer',
+    id: 'i3s-building-scene-layer',
+    module: 'i3s',
+    version: VERSION,
+    mimeTypes: ['application/json'],
+    parse,
+    extensions: ['json'],
+    options: {}
 };
-
 async function parse(data, options, context) {
-  if (!(context !== null && context !== void 0 && context.url)) {
-    throw new Error('Url is not provided');
-  }
-
-  return parseBuildingSceneLayer(data, context.url);
+    if (!context?.url) {
+        throw new Error('Url is not provided');
+    }
+    return (0, parse_i3s_building_scene_layer_1.parseBuildingSceneLayer)(data, context.url);
 }
-//# sourceMappingURL=i3s-building-scene-layer-loader.js.map

package/dist/i3s-content-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i3s-content-loader.d.ts","sourceRoot":"","sources":["../src/i3s-content-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAA+B,MAAM,0BAA0B,CAAC;AAO7F;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,gBAY9B,CAAC"}
+{"version":3,"file":"i3s-content-loader.d.ts","sourceRoot":"","sources":["../src/i3s-content-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAgB,MAAM,0BAA0B,CAAC;AAS9E;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,gBAY9B,CAAC"}

package/dist/i3s-content-loader.js

@@ -1,25 +1,32 @@
-import { parseI3STileContent } from './lib/parsers/parse-i3s-tile-content';
-const VERSION = typeof "4.0.0-alpha.5" !== 'undefined' ? "4.0.0-alpha.5" : 'beta';
-export const I3SContentLoader = {
-  name: 'I3S Content (Indexed Scene Layers)',
-  id: 'i3s-content',
-  module: 'i3s',
-  worker: true,
-  version: VERSION,
-  mimeTypes: ['application/octet-stream'],
-  parse,
-  extensions: ['bin'],
-  options: {
-    'i3s-content': {}
-  }
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.I3SContentLoader = void 0;
+const parse_i3s_tile_content_1 = require("./lib/parsers/parse-i3s-tile-content");
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'beta';
+/**
+ * Loader for I3S - Indexed 3D Scene Layer
+ */
+exports.I3SContentLoader = {
+    name: 'I3S Content (Indexed Scene Layers)',
+    id: 'i3s-content',
+    module: 'i3s',
+    worker: true,
+    version: VERSION,
+    mimeTypes: ['application/octet-stream'],
+    parse,
+    extensions: ['bin'],
+    options: {
+        'i3s-content': {}
+    }
 };
-
 async function parse(data, options, context) {
-  const {
-    tile,
-    tileset
-  } = (options === null || options === void 0 ? void 0 : options.i3s) || {};
-  await parseI3STileContent(data, tile, tileset, options, context);
-  return tile.content;
+    const { tile, _tileOptions, tileset, _tilesetOptions } = options?.i3s || {};
+    const tileOptions = _tileOptions || tile;
+    const tilesetOptions = _tilesetOptions || tileset;
+    if (!tileOptions || !tilesetOptions) {
+        return null;
+    }
+    return await (0, parse_i3s_tile_content_1.parseI3STileContent)(data, tileOptions, tilesetOptions, options, context);
 }
-//# sourceMappingURL=i3s-content-loader.js.map