@loaders.gl/tile-converter 4.0.0-alpha.23 → 4.0.0-alpha.24

package/dist/es5/i3s-converter/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":["GLTFPrimitiveModeString","exports"],"sources":["../../../src/i3s-converter/types.ts"],"sourcesContent":["import {GLTFImagePostprocessed, GLTFNodePostprocessed} from '@loaders.gl/gltf';\nimport {\n  BoundingVolumes,\n  I3SMaterialDefinition,\n  MaterialDefinitionInfo,\n  TextureDefinitionInfo\n} from '@loaders.gl/i3s';\nimport {Matrix4, Vector3} from '@math.gl/core';\n\n/** Converted resources for specific node */\nexport type I3SConvertedResources = {\n  /**\n   * Node id\n   */\n  nodeId?: number;\n  /** Non-compressed geometry buffer that have structure met\n   * https://github.com/Esri/i3s-spec/blob/master/docs/1.8/defaultGeometrySchema.cmn.md\n   * (Geometry buffer)\n   */\n  geometry: ArrayBuffer | null;\n  /**\n   * Draco compressed geometry\n   */\n  compressedGeometry?: Promise<ArrayBuffer> | null;\n  /**\n   * Texture image content\n   */\n  texture: any | null;\n  /**\n   * If the resource has uvRegions geometry attribute\n   */\n  hasUvRegions: boolean;\n  /**\n   * Shared resources built from GLTF material\n   */\n  sharedResources: SharedResourcesArrays | null;\n  /**\n   * Material definition of the node\n   */\n  meshMaterial?: I3SMaterialDefinition | null;\n  /**\n   * Number of vertices in the node\n   */\n  vertexCount: number | null;\n  /**\n   * Feature attributes contents\n   */\n  attributes: ArrayBuffer[] | null;\n  /**\n   * Number of features in the node\n   */\n  featureCount: number | null;\n  /**\n   * MBS and/or OBB bounding volumes of the node\n   */\n  boundingVolumes: BoundingVolumes | null;\n};\n\n/**\n * Geometry and feature attributes converted from GLTF primitives\n */\nexport type ConvertedAttributes = {\n  /** POSITION attribute value */\n  positions: Float32Array;\n  /** NORMAL attribute value */\n  normals: Float32Array;\n  /** TEXCOORD_0 attribute value */\n  texCoords: Float32Array;\n  /** COLOR_0 attribute value */\n  colors: Uint8Array;\n  /** uvRegion attribute for a texture atlas */\n  uvRegions: Uint16Array;\n  /** Feature indices grouped by ...\n   * converted from \"batch ids\" of GLTF\n   */\n  featureIndicesGroups?: number[][];\n  /** Feature indices converted from \"batch ids\" */\n  featureIndices: number[];\n  /**\n   * MBS and/or OBB bounding volumes of the node\n   */\n  boundingVolumes: null | BoundingVolumes;\n  /** merged materials data */\n  mergedMaterials: MergedMaterial[];\n};\n\n/** Postprocessed geometry and feature attributes\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.8/defaultGeometrySchema.cmn.md\n */\nexport type GeometryAttributes = {\n  /** POSITION attribute value */\n  positions: Float32Array;\n  /** NORMAL attribute value */\n  normals: Float32Array;\n  /** TEXCOORD_0 attribute value */\n  texCoords: Float32Array;\n  /** COLOR_0 attribute value */\n  colors: Uint8Array;\n  /** uvRegion attribute for a texture atlas */\n  uvRegions: Uint16Array;\n  /** faceRanges attribute value  */\n  faceRange: Uint32Array;\n  /** feature Ids attribute value */\n  featureIds: number[];\n  /** number of features in the node */\n  featureCount: number;\n};\n\n/** Geometry attributes specific for the particular feature */\nexport type GroupedByFeatureIdAttributes = {\n  /** Feature Id */\n  featureId: number;\n  /** POSITION attribute value */\n  positions: Float32Array;\n  /** NORMAL attribute value */\n  normals: Float32Array;\n  /** COLOR_0 attribute value */\n  colors: Uint8Array;\n  /** uvRegion attribute for a texture atlas */\n  uvRegions: Uint16Array;\n  /** TEXCOORD_0 attribute value */\n  texCoords: Float32Array;\n};\n\n/** Shared resources made from GLTF material */\nexport type SharedResourcesArrays = {\n  /** material definitions list https://github.com/Esri/i3s-spec/blob/master/docs/1.8/materialDefinitionInfo.cmn.md */\n  materialDefinitionInfos?: MaterialDefinitionInfo[];\n  /** texture definitions list  https://github.com/Esri/i3s-spec/blob/master/docs/1.8/textureDefinitionInfo.cmn.md*/\n  textureDefinitionInfos?: TextureDefinitionInfo[];\n  /** node id to make unique SharedResource ids */\n  nodePath?: string;\n};\n\n/** I3S material definition and texture content taken from GLTF material */\nexport type I3SMaterialWithTexture = {\n  /** Material definition https://github.com/Esri/i3s-spec/blob/master/docs/1.8/materialDefinitions.cmn.md */\n  material: I3SMaterialDefinition;\n  /** Texture content (image) */\n  texture?: GLTFImagePostprocessed;\n  /** Metadata of all merged materials */\n  mergedMaterials: MergedMaterial[];\n};\n\n/** Metadata of some original texture */\nexport type MergedMaterial = {\n  /** Gltf material Id */\n  originalMaterialId: string;\n  /** Original texture size */\n  textureSize?: {\n    width: number;\n    height: number;\n  };\n  /** Uint16Array of 4 elements https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md */\n  uvRegion?: Uint16Array;\n};\n\nexport type TypedArrayConstructor =\n  | Uint8ArrayConstructor\n  | Int8ArrayConstructor\n  | Uint16ArrayConstructor\n  | Int16ArrayConstructor\n  | Int32ArrayConstructor\n  | Uint32ArrayConstructor\n  | Float32ArrayConstructor\n  | Float64ArrayConstructor;\n\n/**\n * glTF primitive modes (mesh topology types)\n * @see https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#_mesh_primitive_mode\n */\nexport enum GLTFPrimitiveModeString {\n  POINTS = 'POINTS',\n  LINES = 'LINES',\n  LINE_LOOP = 'LINE_LOOP',\n  LINE_STRIP = 'LINE_STRIP',\n  TRIANGLES = 'TRIANGLES',\n  TRIANGLE_STRIP = 'TRIANGLE_STRIP',\n  TRIANGLE_FAN = 'TRIANGLE_FAN'\n}\n\n/** Preprocessed data gathered from child tiles binary content */\nexport type PreprocessData = {\n  /** Mesh topology types used in gltf primitives of the tileset */\n  meshTopologyTypes: Set<GLTFPrimitiveModeString>;\n  /** Featrue metadata classes found in glTF extensions */\n  metadataClasses: Set<string>;\n};\n\n/** Texture image properties required for conversion */\nexport type TextureImageProperties = {\n  /** Array with image data */\n  data: Uint8Array;\n  /** Is the texture compressed */\n  compressed?: boolean;\n  /** Height of the texture's image */\n  height?: number;\n  /** Width of the texture's image */\n  width?: number;\n  /** Number of components (3 for RGB, 4 for RGBA) */\n  components?: number;\n  /** Mime type of the texture's image */\n  mimeType?: string;\n};\n\n/** glTF attributes data, prepared for conversion */\nexport type GLTFAttributesData = {\n  /** glTF PBR materials (only id is required) */\n  gltfMaterials?: {id: string}[];\n  /** glTF geometry nodes */\n  nodes: GLTFNodePostprocessed[];\n  /** glTF texture images (set to null for compressed textures) */\n  images: (null | TextureImageProperties)[];\n  /** Source tile origin coordinates in cartographic coordinate system */\n  cartographicOrigin: Vector3;\n  /** Model matrix to convert coordinate system of POSITION and NORMAL attributes from METER_OFFSETS to CARTESIAN  */\n  cartesianModelMatrix: Matrix4;\n};\n"],"mappings":";;;;;;IA2KYA,uBAAuB,aAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAA,OAAvBA,uBAAuB;AAAA;AAAAC,OAAA,CAAAD,uBAAA,GAAAA,uBAAA"}
+{"version":3,"file":"types.js","names":["GLTFPrimitiveModeString","exports"],"sources":["../../../src/i3s-converter/types.ts"],"sourcesContent":["import {GLTFImagePostprocessed, GLTFNodePostprocessed} from '@loaders.gl/gltf';\nimport {\n  BoundingVolumes,\n  I3SMaterialDefinition,\n  MaterialDefinitionInfo,\n  TextureDefinitionInfo\n} from '@loaders.gl/i3s';\nimport {Matrix4, Vector3} from '@math.gl/core';\n\n/** Converted resources for specific node */\nexport type I3SConvertedResources = {\n  /**\n   * Node id\n   */\n  nodeId?: number;\n  /** Non-compressed geometry buffer that have structure met\n   * https://github.com/Esri/i3s-spec/blob/master/docs/1.8/defaultGeometrySchema.cmn.md\n   * (Geometry buffer)\n   */\n  geometry: ArrayBuffer | null;\n  /**\n   * Draco compressed geometry\n   */\n  compressedGeometry?: Promise<ArrayBuffer> | null;\n  /**\n   * Texture image content\n   */\n  texture: any | null;\n  /**\n   * If the resource has uvRegions geometry attribute\n   */\n  hasUvRegions: boolean;\n  /**\n   * Shared resources built from GLTF material\n   */\n  sharedResources: SharedResourcesArrays | null;\n  /**\n   * Material definition of the node\n   */\n  meshMaterial?: I3SMaterialDefinition | null;\n  /**\n   * Number of vertices in the node\n   */\n  vertexCount: number | null;\n  /**\n   * Feature attributes contents\n   */\n  attributes: ArrayBuffer[] | null;\n  /**\n   * Number of features in the node\n   */\n  featureCount: number | null;\n  /**\n   * MBS and/or OBB bounding volumes of the node\n   */\n  boundingVolumes: BoundingVolumes | null;\n};\n\n/**\n * Geometry and feature attributes converted from GLTF primitives\n */\nexport type ConvertedAttributes = {\n  /** POSITION attribute value */\n  positions: Float32Array;\n  /** NORMAL attribute value */\n  normals: Float32Array;\n  /** TEXCOORD_0 attribute value */\n  texCoords: Float32Array;\n  /** COLOR_0 attribute value */\n  colors: Uint8Array;\n  /** uvRegion attribute for a texture atlas */\n  uvRegions: Uint16Array;\n  /** Feature indices grouped by ...\n   * converted from \"batch ids\" of GLTF\n   */\n  featureIndicesGroups?: number[][];\n  /** Feature indices converted from \"batch ids\" */\n  featureIndices: number[];\n  /**\n   * MBS and/or OBB bounding volumes of the node\n   */\n  boundingVolumes: null | BoundingVolumes;\n  /** merged materials data */\n  mergedMaterials: MergedMaterial[];\n};\n\n/** Postprocessed geometry and feature attributes\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.8/defaultGeometrySchema.cmn.md\n */\nexport type GeometryAttributes = {\n  /** POSITION attribute value */\n  positions: Float32Array;\n  /** NORMAL attribute value */\n  normals: Float32Array;\n  /** TEXCOORD_0 attribute value */\n  texCoords: Float32Array;\n  /** COLOR_0 attribute value */\n  colors: Uint8Array;\n  /** uvRegion attribute for a texture atlas */\n  uvRegions: Uint16Array;\n  /** faceRanges attribute value  */\n  faceRange: Uint32Array;\n  /** feature Ids attribute value */\n  featureIds: number[];\n  /** number of features in the node */\n  featureCount: number;\n};\n\n/** Geometry attributes applicable for reordering by featureId */\nexport type GroupedAttributes = {\n  /** POSITION attribute value */\n  positions: Float32Array;\n  /** NORMAL attribute value */\n  normals: Float32Array;\n  /** COLOR_0 attribute value */\n  colors: Uint8Array;\n  /** uvRegion attribute for a texture atlas */\n  uvRegions: Uint16Array;\n  /** TEXCOORD_0 attribute value */\n  texCoords: Float32Array;\n};\n\n/** Geometry attributes specific for the particular feature */\nexport type GroupedByFeatureIdAttributes = GroupedAttributes & {\n  /** Feature Id */\n  featureId: number;\n};\n\n/** Shared resources made from GLTF material */\nexport type SharedResourcesArrays = {\n  /** material definitions list https://github.com/Esri/i3s-spec/blob/master/docs/1.8/materialDefinitionInfo.cmn.md */\n  materialDefinitionInfos?: MaterialDefinitionInfo[];\n  /** texture definitions list  https://github.com/Esri/i3s-spec/blob/master/docs/1.8/textureDefinitionInfo.cmn.md*/\n  textureDefinitionInfos?: TextureDefinitionInfo[];\n  /** node id to make unique SharedResource ids */\n  nodePath?: string;\n};\n\n/** I3S material definition and texture content taken from GLTF material */\nexport type I3SMaterialWithTexture = {\n  /** Material definition https://github.com/Esri/i3s-spec/blob/master/docs/1.8/materialDefinitions.cmn.md */\n  material: I3SMaterialDefinition;\n  /** Texture content (image) */\n  texture?: GLTFImagePostprocessed;\n  /** Metadata of all merged materials */\n  mergedMaterials: MergedMaterial[];\n};\n\n/** Metadata of some original texture */\nexport type MergedMaterial = {\n  /** Gltf material Id */\n  originalMaterialId: string;\n  /** Original texture size */\n  textureSize?: {\n    width: number;\n    height: number;\n  };\n  /** Uint16Array of 4 elements https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md */\n  uvRegion?: Uint16Array;\n};\n\nexport type TypedArrayConstructor =\n  | Uint8ArrayConstructor\n  | Int8ArrayConstructor\n  | Uint16ArrayConstructor\n  | Int16ArrayConstructor\n  | Int32ArrayConstructor\n  | Uint32ArrayConstructor\n  | Float32ArrayConstructor\n  | Float64ArrayConstructor;\n\n/**\n * glTF primitive modes (mesh topology types)\n * @see https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#_mesh_primitive_mode\n */\nexport enum GLTFPrimitiveModeString {\n  POINTS = 'POINTS',\n  LINES = 'LINES',\n  LINE_LOOP = 'LINE_LOOP',\n  LINE_STRIP = 'LINE_STRIP',\n  TRIANGLES = 'TRIANGLES',\n  TRIANGLE_STRIP = 'TRIANGLE_STRIP',\n  TRIANGLE_FAN = 'TRIANGLE_FAN'\n}\n\n/** Preprocessed data gathered from child tiles binary content */\nexport type PreprocessData = {\n  /** Mesh topology types used in gltf primitives of the tileset */\n  meshTopologyTypes: Set<GLTFPrimitiveModeString>;\n  /** Featrue metadata classes found in glTF extensions */\n  metadataClasses: Set<string>;\n};\n\n/** Texture image properties required for conversion */\nexport type TextureImageProperties = {\n  /** Array with image data */\n  data: Uint8Array;\n  /** Is the texture compressed */\n  compressed?: boolean;\n  /** Height of the texture's image */\n  height?: number;\n  /** Width of the texture's image */\n  width?: number;\n  /** Number of components (3 for RGB, 4 for RGBA) */\n  components?: number;\n  /** Mime type of the texture's image */\n  mimeType?: string;\n};\n\n/** glTF attributes data, prepared for conversion */\nexport type GLTFAttributesData = {\n  /** glTF PBR materials (only id is required) */\n  gltfMaterials?: {id: string}[];\n  /** glTF geometry nodes */\n  nodes: GLTFNodePostprocessed[];\n  /** glTF texture images (set to null for compressed textures) */\n  images: (null | TextureImageProperties)[];\n  /** Source tile origin coordinates in cartographic coordinate system */\n  cartographicOrigin: Vector3;\n  /** Model matrix to convert coordinate system of POSITION and NORMAL attributes from METER_OFFSETS to CARTESIAN  */\n  cartesianModelMatrix: Matrix4;\n};\n"],"mappings":";;;;;;IA+KYA,uBAAuB,aAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAvBA,uBAAuB;EAAA,OAAvBA,uBAAuB;AAAA;AAAAC,OAAA,CAAAD,uBAAA,GAAAA,uBAAA"}

package/dist/es5/pgm-loader.js

@@ -4,11 +4,17 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "Geoid", {
+  enumerable: true,
+  get: function get() {
+    return _geoid.Geoid;
+  }
+});
 exports.PGMLoader = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _geoid = require("@math.gl/geoid");
-var VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'latest';
+var VERSION = typeof "4.0.0-alpha.24" !== 'undefined' ? "4.0.0-alpha.24" : 'latest';
 var PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',
   id: 'pgm',
@@ -20,7 +26,7 @@ var PGMLoader = {
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            return _context.abrupt("return", (0, _geoid.parsePGM)(new Uint8Array(arrayBuffer), options));
+            return _context.abrupt("return", (0, _geoid.parsePGM)(new Uint8Array(arrayBuffer), (options === null || options === void 0 ? void 0 : options.pgm) || {}));
           case 1:
           case "end":
             return _context.stop();
@@ -34,7 +40,9 @@ var PGMLoader = {
   }(),
   extensions: ['pgm'],
   options: {
-    cubic: false
+    pgm: {
+      cubic: false
+    }
   }
 };
 exports.PGMLoader = PGMLoader;

package/dist/es5/pgm-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"pgm-loader.js","names":["_geoid","require","VERSION","PGMLoader","name","id","module","version","mimeTypes","parse","_parse","_asyncToGenerator2","default","_regenerator","mark","_callee","arrayBuffer","options","wrap","_callee$","_context","prev","next","abrupt","parsePGM","Uint8Array","stop","_x","_x2","apply","arguments","extensions","cubic","exports"],"sources":["../../src/pgm-loader.ts"],"sourcesContent":["import type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport {parsePGM} from '@math.gl/geoid';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\n/**\n * Loader for PGM - Netpbm grayscale image format\n */\nexport const PGMLoader: LoaderWithParser = {\n  name: 'PGM - Netpbm grayscale image format',\n  id: 'pgm',\n  module: 'tile-converter',\n  version: VERSION,\n  mimeTypes: ['image/x-portable-graymap'],\n  // @ts-expect-error LoaderOptions does not have cubic parameter\n  parse: async (arrayBuffer, options) => parsePGM(new Uint8Array(arrayBuffer), options),\n  extensions: ['pgm'],\n  options: {\n    // TODO - use pgm namespace\n    cubic: false\n  }\n};\n"],"mappings":";;;;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AAIA,IAAMC,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;AAKpE,IAAMC,SAA2B,GAAG;EACzCC,IAAI,EAAE,qCAAqC;EAC3CC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,gBAAgB;EACxBC,OAAO,EAAEL,OAAO;EAChBM,SAAS,EAAE,CAAC,0BAA0B,CAAC;EAEvCC,KAAK;IAAA,IAAAC,MAAA,OAAAC,kBAAA,CAAAC,OAAA,EAAAC,YAAA,CAAAD,OAAA,CAAAE,IAAA,CAAE,SAAAC,QAAOC,WAAW,EAAEC,OAAO;MAAA,OAAAJ,YAAA,CAAAD,OAAA,CAAAM,IAAA,UAAAC,SAAAC,QAAA;QAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;UAAA;YAAA,OAAAF,QAAA,CAAAG,MAAA,WAAK,IAAAC,eAAQ,EAAC,IAAIC,UAAU,CAACT,WAAW,CAAC,EAAEC,OAAO,CAAC;UAAA;UAAA;YAAA,OAAAG,QAAA,CAAAM,IAAA;QAAA;MAAA,GAAAX,OAAA;IAAA;IAAA,SAAAN,MAAAkB,EAAA,EAAAC,GAAA;MAAA,OAAAlB,MAAA,CAAAmB,KAAA,OAAAC,SAAA;IAAA;IAAA,OAAArB,KAAA;EAAA;EACrFsB,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBd,OAAO,EAAE;IAEPe,KAAK,EAAE;EACT;AACF,CAAC;AAACC,OAAA,CAAA9B,SAAA,GAAAA,SAAA"}
+{"version":3,"file":"pgm-loader.js","names":["_geoid","require","VERSION","PGMLoader","name","id","module","version","mimeTypes","parse","_parse","_asyncToGenerator2","default","_regenerator","mark","_callee","arrayBuffer","options","wrap","_callee$","_context","prev","next","abrupt","parsePGM","Uint8Array","pgm","stop","_x","_x2","apply","arguments","extensions","cubic","exports"],"sources":["../../src/pgm-loader.ts"],"sourcesContent":["import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';\nimport {Geoid, parsePGM} from '@math.gl/geoid';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport {Geoid};\n\nexport type PGMLoaderOptions = LoaderOptions & {\n  pgm?: {\n    cubic?: boolean;\n  };\n};\n\n/**\n * Loader for PGM - Netpbm grayscale image format\n */\nexport const PGMLoader: LoaderWithParser<Geoid, never, PGMLoaderOptions> = {\n  name: 'PGM - Netpbm grayscale image format',\n  id: 'pgm',\n  module: 'tile-converter',\n  version: VERSION,\n  mimeTypes: ['image/x-portable-graymap'],\n  parse: async (arrayBuffer, options) => parsePGM(new Uint8Array(arrayBuffer), options?.pgm || {}),\n  extensions: ['pgm'],\n  options: {\n    pgm: {\n      cubic: false\n    }\n  }\n};\n"],"mappings":";;;;;;;;;;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AAIA,IAAMC,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiB,QAAQ;AAapE,IAAMC,SAA2D,GAAG;EACzEC,IAAI,EAAE,qCAAqC;EAC3CC,EAAE,EAAE,KAAK;EACTC,MAAM,EAAE,gBAAgB;EACxBC,OAAO,EAAEL,OAAO;EAChBM,SAAS,EAAE,CAAC,0BAA0B,CAAC;EACvCC,KAAK;IAAA,IAAAC,MAAA,OAAAC,kBAAA,CAAAC,OAAA,EAAAC,YAAA,CAAAD,OAAA,CAAAE,IAAA,CAAE,SAAAC,QAAOC,WAAW,EAAEC,OAAO;MAAA,OAAAJ,YAAA,CAAAD,OAAA,CAAAM,IAAA,UAAAC,SAAAC,QAAA;QAAA,kBAAAA,QAAA,CAAAC,IAAA,GAAAD,QAAA,CAAAE,IAAA;UAAA;YAAA,OAAAF,QAAA,CAAAG,MAAA,WAAK,IAAAC,eAAQ,EAAC,IAAIC,UAAU,CAACT,WAAW,CAAC,EAAE,CAAAC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAES,GAAG,KAAI,CAAC,CAAC,CAAC;UAAA;UAAA;YAAA,OAAAN,QAAA,CAAAO,IAAA;QAAA;MAAA,GAAAZ,OAAA;IAAA;IAAA,SAAAN,MAAAmB,EAAA,EAAAC,GAAA;MAAA,OAAAnB,MAAA,CAAAoB,KAAA,OAAAC,SAAA;IAAA;IAAA,OAAAtB,KAAA;EAAA;EAChGuB,UAAU,EAAE,CAAC,KAAK,CAAC;EACnBf,OAAO,EAAE;IACPS,GAAG,EAAE;MACHO,KAAK,EAAE;IACT;EACF;AACF,CAAC;AAACC,OAAA,CAAA/B,SAAA,GAAAA,SAAA"}

package/dist/esm/3d-tiles-converter/helpers/load-i3s.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-i3s.js","names":["load","I3SLoader","loadI3SContent","sourceTileset","sourceTile","tilesetLoadOptions","contentUrl","loadOptions","i3s","isTileset","isTileHeader","_tileOptions","attributeUrls","textureUrl","textureFormat","textureLoaderOptions","materialDefinition","isDracoGeometry","mbs","_tilesetOptions","store","attributeStorageInfo","fields","tileContent"],"sources":["../../../../src/3d-tiles-converter/helpers/load-i3s.ts"],"sourcesContent":["import {load} from '@loaders.gl/core';\nimport {\n  I3STileContent,\n  I3STileHeader,\n  I3STilesetHeader,\n  I3SLoader,\n  I3SLoaderOptions\n} from '@loaders.gl/i3s';\n\n/**\n * Load I3S node content\n * @param sourceTileset - source layer JSON\n * @param sourceTile - source I3S node metadata\n * @param tilesetLoadOptions - load options for Tiles3DLoader\n * @returns - 3DTiles tile content or null\n */\nexport const loadI3SContent = async (\n  sourceTileset: I3STilesetHeader | null,\n  sourceTile: I3STileHeader,\n  tilesetLoadOptions: I3SLoaderOptions\n): Promise<I3STileContent | null> => {\n  if (!sourceTileset || !sourceTile.contentUrl) {\n    return null;\n  }\n\n  const loadOptions = {\n    ...tilesetLoadOptions,\n    i3s: {\n      ...tilesetLoadOptions.i3s,\n      isTileset: false,\n      isTileHeader: false,\n      _tileOptions: {\n        attributeUrls: sourceTile.attributeUrls,\n        textureUrl: sourceTile.textureUrl,\n        textureFormat: sourceTile.textureFormat,\n        textureLoaderOptions: sourceTile.textureLoaderOptions,\n        materialDefinition: sourceTile.materialDefinition,\n        isDracoGeometry: sourceTile.isDracoGeometry,\n        mbs: sourceTile.mbs\n      },\n      _tilesetOptions: {\n        store: sourceTileset.store,\n        attributeStorageInfo: sourceTileset.attributeStorageInfo,\n        fields: sourceTileset.fields\n      }\n    }\n  };\n  const tileContent = await load(sourceTile.contentUrl, I3SLoader, loadOptions);\n\n  return tileContent;\n};\n"],"mappings":"AAAA,SAAQA,IAAI,QAAO,kBAAkB;AACrC,SAIEC,SAAS,QAEJ,iBAAiB;AASxB,OAAO,MAAMC,cAAc,GAAG,MAAAA,CAC5BC,aAAsC,EACtCC,UAAyB,EACzBC,kBAAoC,KACD;EACnC,IAAI,CAACF,aAAa,IAAI,CAACC,UAAU,CAACE,UAAU,EAAE;IAC5C,OAAO,IAAI;EACb;EAEA,MAAMC,WAAW,GAAG;IAClB,GAAGF,kBAAkB;IACrBG,GAAG,EAAE;MACH,GAAGH,kBAAkB,CAACG,GAAG;MACzBC,SAAS,EAAE,KAAK;MAChBC,YAAY,EAAE,KAAK;MACnBC,YAAY,EAAE;QACZC,aAAa,EAAER,UAAU,CAACQ,aAAa;QACvCC,UAAU,EAAET,UAAU,CAACS,UAAU;QACjCC,aAAa,EAAEV,UAAU,CAACU,aAAa;QACvCC,oBAAoB,EAAEX,UAAU,CAACW,oBAAoB;QACrDC,kBAAkB,EAAEZ,UAAU,CAACY,kBAAkB;QACjDC,eAAe,EAAEb,UAAU,CAACa,eAAe;QAC3CC,GAAG,EAAEd,UAAU,CAACc;MAClB,CAAC;MACDC,eAAe,EAAE;QACfC,KAAK,EAAEjB,aAAa,CAACiB,KAAK;QAC1BC,oBAAoB,EAAElB,aAAa,CAACkB,oBAAoB;QACxDC,MAAM,EAAEnB,aAAa,CAACmB;MACxB;IACF;EACF,CAAC;EACD,MAAMC,WAAW,GAAG,MAAMvB,IAAI,CAACI,UAAU,CAACE,UAAU,EAAEL,SAAS,EAAEM,WAAW,CAAC;EAE7E,OAAOgB,WAAW;AACpB,CAAC"}
+{"version":3,"file":"load-i3s.js","names":["load","I3SLoader","loadI3SContent","sourceTileset","sourceTile","tilesetLoadOptions","contentUrl","loadOptions","i3s","isTileset","isTileHeader","_tileOptions","attributeUrls","textureUrl","textureFormat","textureLoaderOptions","materialDefinition","isDracoGeometry","mbs","_tilesetOptions","store","attributeStorageInfo","fields","tileContent"],"sources":["../../../../src/3d-tiles-converter/helpers/load-i3s.ts"],"sourcesContent":["import {load} from '@loaders.gl/core';\nimport {\n  I3STileContent,\n  I3STileHeader,\n  I3STilesetHeader,\n  I3SLoader,\n  I3SLoaderOptions\n} from '@loaders.gl/i3s';\n\n/**\n * Load I3S node content\n * @param sourceTileset - source layer JSON\n * @param sourceTile - source I3S node metadata\n * @param tilesetLoadOptions - load options for Tiles3DLoader\n * @returns - 3DTiles tile content or null\n */\nexport const loadI3SContent = async (\n  sourceTileset: I3STilesetHeader | null,\n  sourceTile: I3STileHeader,\n  tilesetLoadOptions: I3SLoaderOptions\n): Promise<I3STileContent | null> => {\n  if (!sourceTileset || !sourceTile.contentUrl) {\n    return null;\n  }\n\n  const loadOptions = {\n    ...tilesetLoadOptions,\n    i3s: {\n      ...tilesetLoadOptions.i3s,\n      isTileset: false,\n      isTileHeader: false,\n      _tileOptions: {\n        attributeUrls: sourceTile.attributeUrls,\n        textureUrl: sourceTile.textureUrl,\n        textureFormat: sourceTile.textureFormat,\n        textureLoaderOptions: sourceTile.textureLoaderOptions,\n        materialDefinition: sourceTile.materialDefinition,\n        isDracoGeometry: sourceTile.isDracoGeometry,\n        mbs: sourceTile.mbs\n      },\n      _tilesetOptions: {\n        store: sourceTileset.store,\n        attributeStorageInfo: sourceTileset.attributeStorageInfo,\n        fields: sourceTileset.fields\n      }\n    }\n  };\n  const tileContent = await load(sourceTile.contentUrl, I3SLoader, loadOptions);\n\n  // @ts-expect-error\n  return tileContent;\n};\n"],"mappings":"AAAA,SAAQA,IAAI,QAAO,kBAAkB;AACrC,SAIEC,SAAS,QAEJ,iBAAiB;AASxB,OAAO,MAAMC,cAAc,GAAG,MAAAA,CAC5BC,aAAsC,EACtCC,UAAyB,EACzBC,kBAAoC,KACD;EACnC,IAAI,CAACF,aAAa,IAAI,CAACC,UAAU,CAACE,UAAU,EAAE;IAC5C,OAAO,IAAI;EACb;EAEA,MAAMC,WAAW,GAAG;IAClB,GAAGF,kBAAkB;IACrBG,GAAG,EAAE;MACH,GAAGH,kBAAkB,CAACG,GAAG;MACzBC,SAAS,EAAE,KAAK;MAChBC,YAAY,EAAE,KAAK;MACnBC,YAAY,EAAE;QACZC,aAAa,EAAER,UAAU,CAACQ,aAAa;QACvCC,UAAU,EAAET,UAAU,CAACS,UAAU;QACjCC,aAAa,EAAEV,UAAU,CAACU,aAAa;QACvCC,oBAAoB,EAAEX,UAAU,CAACW,oBAAoB;QACrDC,kBAAkB,EAAEZ,UAAU,CAACY,kBAAkB;QACjDC,eAAe,EAAEb,UAAU,CAACa,eAAe;QAC3CC,GAAG,EAAEd,UAAU,CAACc;MAClB,CAAC;MACDC,eAAe,EAAE;QACfC,KAAK,EAAEjB,aAAa,CAACiB,KAAK;QAC1BC,oBAAoB,EAAElB,aAAa,CAACkB,oBAAoB;QACxDC,MAAM,EAAEnB,aAAa,CAACmB;MACxB;IACF;EACF,CAAC;EACD,MAAMC,WAAW,GAAG,MAAMvB,IAAI,CAACI,UAAU,CAACE,UAAU,EAAEL,SAAS,EAAEM,WAAW,CAAC;EAG7E,OAAOgB,WAAW;AACpB,CAAC"}

package/dist/esm/deps-installer/deps-installer.js

@@ -5,7 +5,7 @@ import { join } from 'path';
 import { ChildProcessProxy } from '@loaders.gl/worker-utils';
 import { DRACO_EXTERNAL_LIBRARIES, DRACO_EXTERNAL_LIBRARY_URLS } from '@loaders.gl/draco';
 import { BASIS_EXTERNAL_LIBRARIES } from '@loaders.gl/textures';
-const VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'beta';
+const VERSION = typeof "4.0.0-alpha.24" !== 'undefined' ? "4.0.0-alpha.24" : 'beta';
 const PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 export class DepsInstaller {
   async install() {

package/dist/esm/i3s-converter/helpers/feature-attributes.js

@@ -1,16 +1,16 @@
-export function flattenPropertyTableByFeatureIds(featureIds, propertyTable) {
+export function flattenPropertyTableByFeatureIds(featureIdsMap, propertyTable) {
   const resultPropertyTable = {};
   for (const propertyName in propertyTable) {
     const properties = propertyTable[propertyName];
-    resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties, featureIds);
+    resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties, featureIdsMap);
   }
   return resultPropertyTable;
 }
-function getPropertiesByFeatureIds(properties, featureIds) {
+function getPropertiesByFeatureIds(properties, featureIdsMap) {
   const resultProperties = [];
   if (properties) {
-    for (const featureId of featureIds) {
-      const property = properties[featureId] || null;
+    for (const featureIdKey in featureIdsMap) {
+      const property = properties[featureIdKey] || null;
       resultProperties.push(property);
     }
   }

package/dist/esm/i3s-converter/helpers/feature-attributes.js.map

@@ -1 +1 @@
-{"version":3,"file":"feature-attributes.js","names":["flattenPropertyTableByFeatureIds","featureIds","propertyTable","resultPropertyTable","propertyName","properties","getPropertiesByFeatureIds","resultProperties","featureId","property","push","checkPropertiesLength","needFlatten","attribute","Object","values","length","STRING_TYPE","SHORT_INT_TYPE","DOUBLE_TYPE","OBJECT_ID_TYPE","getAttributeType","key","Number","isInteger","createdStorageAttribute","attributeIndex","attributeType","storageAttribute","concat","name","ordering","header","valueType","attributeValues","valuesPerElement","setupIdAttribute","setupStringAttribute","setupDoubleAttribute","getFieldAttributeType","createFieldAttribute","fieldAttributeType","type","alias","createPopupInfo","title","mediaInfos","fieldInfos","popupElements","expressionInfos","fieldName","visible","isEditable","label","unshift","encoding","attributeByteCounts"],"sources":["../../../../src/i3s-converter/helpers/feature-attributes.ts"],"sourcesContent":["import type {FeatureTableJson} from '@loaders.gl/3d-tiles';\nimport {\n  Attribute,\n  AttributeStorageInfo,\n  ESRIField,\n  Field,\n  FieldInfo,\n  PopupInfo\n} from '@loaders.gl/i3s';\n\n/**\n * Takes attributes from property table based on featureIds.\n * If there is no property value for particular featureId (index) the property will be null.\n * Example:\n * Initial data:\n *   OBJECTID: [0, 1, 5]\n *   component: ['Windows', 'Frames', 'Wall', 'Roof', 'Skylight']\n * Result:\n *   OBJECTID: [0, 1, 5]\n *   component: ['Windows', 'Frames', 'null']\n * @param featureIds\n * @param propertyTable\n */\nexport function flattenPropertyTableByFeatureIds(\n  featureIds: number[],\n  propertyTable: FeatureTableJson\n): FeatureTableJson {\n  const resultPropertyTable: FeatureTableJson = {};\n  for (const propertyName in propertyTable) {\n    const properties = propertyTable[propertyName];\n    resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties, featureIds);\n  }\n\n  return resultPropertyTable;\n}\n\n/**\n * Getting properties by featureId index\n * @param properties\n * @param featureIds\n */\nfunction getPropertiesByFeatureIds(properties: unknown[], featureIds: number[]): unknown[] {\n  const resultProperties: unknown[] = [];\n\n  if (properties) {\n    for (const featureId of featureIds) {\n      const property = properties[featureId] || null;\n      resultProperties.push(property);\n    }\n  }\n\n  return resultProperties;\n}\n\n/**\n * Check that all attributes in propertyTable have the same length as FeatureIds.\n * If there are differencies between lengths we should flatten property table based on exiesting featureIds.\n * @param featureIds\n * @param propertyTable\n * @returns\n */\nexport function checkPropertiesLength(\n  featureIds: number[],\n  propertyTable: FeatureTableJson\n): boolean {\n  let needFlatten = false;\n\n  for (const attribute of Object.values(propertyTable)) {\n    if (!featureIds || !attribute || featureIds.length !== attribute.length) {\n      needFlatten = true;\n    }\n  }\n\n  return needFlatten;\n}\n\n/** String data type name for feature attributes */\nconst STRING_TYPE = 'string';\n/** Integer data type name for feature attributes */\nconst SHORT_INT_TYPE = 'Int32';\n/** Double data type name for feature attributes */\nconst DOUBLE_TYPE = 'double';\n/** Type of attribute that is linked with feature ids */\nconst OBJECT_ID_TYPE = 'OBJECTID';\n/**\n * Get the attribute type for attributeStorageInfo https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md\n * @param key - attribute's key\n * @param attribute - attribute's type in propertyTable\n */\nexport function getAttributeType(key: string, attribute: string): string {\n  if (key === OBJECT_ID_TYPE) {\n    return OBJECT_ID_TYPE;\n  }\n  if (typeof attribute === STRING_TYPE) {\n    return STRING_TYPE;\n  } else if (typeof attribute === 'number') {\n    return Number.isInteger(attribute) ? SHORT_INT_TYPE : DOUBLE_TYPE;\n  }\n  return STRING_TYPE;\n}\n\n/**\n * Generate storage attribute for map segmentation.\n * @param attributeIndex - order index of attribute (f_0, f_1 ...).\n * @param key - attribute key from propertyTable.\n * @param attributeType - attribute type.\n * @return Updated storageAttribute.\n */\nexport function createdStorageAttribute(\n  attributeIndex: number,\n  key: string,\n  attributeType: Attribute\n): AttributeStorageInfo {\n  const storageAttribute = {\n    key: `f_${attributeIndex}`,\n    name: key,\n    ordering: ['attributeValues'],\n    header: [{property: 'count', valueType: 'UInt32'}],\n    attributeValues: {valueType: 'Int32', valuesPerElement: 1}\n  };\n\n  switch (attributeType) {\n    case OBJECT_ID_TYPE:\n      setupIdAttribute(storageAttribute);\n      break;\n    case STRING_TYPE:\n      setupStringAttribute(storageAttribute);\n      break;\n    case DOUBLE_TYPE:\n      setupDoubleAttribute(storageAttribute);\n      break;\n    case SHORT_INT_TYPE:\n      break;\n    default:\n      setupStringAttribute(storageAttribute);\n  }\n\n  return storageAttribute;\n}\n\n/**\n * Find and return attribute type based on key form propertyTable.\n * @param attributeType\n */\nexport function getFieldAttributeType(attributeType: Attribute): ESRIField {\n  switch (attributeType) {\n    case OBJECT_ID_TYPE:\n      return 'esriFieldTypeOID';\n    case STRING_TYPE:\n      return 'esriFieldTypeString';\n    case SHORT_INT_TYPE:\n      return 'esriFieldTypeInteger';\n    case DOUBLE_TYPE:\n      return 'esriFieldTypeDouble';\n    default:\n      return 'esriFieldTypeString';\n  }\n}\n\n/**\n * Setup field attribute for map segmentation.\n * @param key - attribute for map segmentation.\n * @param fieldAttributeType - esri attribute type ('esriFieldTypeString' or 'esriFieldTypeOID').\n */\nexport function createFieldAttribute(key: string, fieldAttributeType: ESRIField): Field {\n  return {\n    name: key,\n    type: fieldAttributeType,\n    alias: key\n  };\n}\n\n/**\n * Generate popup info to show metadata on the map.\n * @param propertyTable - table data with OBJECTID.\n * @return data for correct rendering of popup.\n */\nexport function createPopupInfo(propertyTable: FeatureTableJson): PopupInfo {\n  const title = '{OBJECTID}';\n  const mediaInfos = [];\n  const fieldInfos: FieldInfo[] = [];\n  const popupElements: {\n    fieldInfos: FieldInfo[];\n    type: string;\n  }[] = [];\n  const expressionInfos = [];\n\n  for (const key in propertyTable) {\n    fieldInfos.push({\n      fieldName: key,\n      visible: true,\n      isEditable: false,\n      label: key\n    });\n  }\n  popupElements.push({\n    fieldInfos,\n    type: 'fields'\n  });\n\n  return {\n    title,\n    mediaInfos,\n    popupElements,\n    fieldInfos,\n    expressionInfos\n  };\n}\n\n/**\n * Setup storage attribute as string.\n * @param storageAttribute - attribute for map segmentation.\n */\nfunction setupStringAttribute(storageAttribute: AttributeStorageInfo): void {\n  // @ts-expect-error\n  storageAttribute.ordering.unshift('attributeByteCounts');\n  storageAttribute.header.push({property: 'attributeValuesByteCount', valueType: 'UInt32'});\n  storageAttribute.attributeValues = {\n    valueType: 'String',\n    encoding: 'UTF-8',\n    valuesPerElement: 1\n  };\n  storageAttribute.attributeByteCounts = {\n    valueType: 'UInt32',\n    valuesPerElement: 1\n  };\n}\n\n/**\n * Setup Id attribute for map segmentation.\n * @param storageAttribute - attribute for map segmentation .\n */\nfunction setupIdAttribute(storageAttribute: AttributeStorageInfo): void {\n  storageAttribute.attributeValues = {\n    valueType: 'Oid32',\n    valuesPerElement: 1\n  };\n}\n\n/**\n * Setup double attribute for map segmentation.\n * @param storageAttribute - attribute for map segmentation .\n */\nfunction setupDoubleAttribute(storageAttribute: AttributeStorageInfo): void {\n  storageAttribute.attributeValues = {\n    valueType: 'Float64',\n    valuesPerElement: 1\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"feature-attributes.js","names":["flattenPropertyTableByFeatureIds","featureIdsMap","propertyTable","resultPropertyTable","propertyName","properties","getPropertiesByFeatureIds","resultProperties","featureIdKey","property","push","checkPropertiesLength","featureIds","needFlatten","attribute","Object","values","length","STRING_TYPE","SHORT_INT_TYPE","DOUBLE_TYPE","OBJECT_ID_TYPE","getAttributeType","key","Number","isInteger","createdStorageAttribute","attributeIndex","attributeType","storageAttribute","concat","name","ordering","header","valueType","attributeValues","valuesPerElement","setupIdAttribute","setupStringAttribute","setupDoubleAttribute","getFieldAttributeType","createFieldAttribute","fieldAttributeType","type","alias","createPopupInfo","title","mediaInfos","fieldInfos","popupElements","expressionInfos","fieldName","visible","isEditable","label","unshift","encoding","attributeByteCounts"],"sources":["../../../../src/i3s-converter/helpers/feature-attributes.ts"],"sourcesContent":["import type {FeatureTableJson} from '@loaders.gl/3d-tiles';\nimport {\n  Attribute,\n  AttributeStorageInfo,\n  ESRIField,\n  Field,\n  FieldInfo,\n  PopupInfo\n} from '@loaders.gl/i3s';\n\n/**\n * Takes attributes from property table based on featureIdsMap.\n * If there is no property value for particular featureId (index) the property will be null.\n * Example:\n * Initial data:\n *   OBJECTID: {0: 0, 3: 33, 4: 333}\n *   component: ['Windows', 'Frames', 'Wall', 'Roof', 'Skylight']\n * Result:\n *   OBJECTID: [0, 33, 333]\n *   component: ['Windows', 'Roof', 'Skylight']\n * @param featureIdsMap\n * @param propertyTable\n */\nexport function flattenPropertyTableByFeatureIds(\n  featureIdsMap: Record<string, number>,\n  propertyTable: FeatureTableJson\n): FeatureTableJson {\n  const resultPropertyTable: FeatureTableJson = {};\n  for (const propertyName in propertyTable) {\n    const properties = propertyTable[propertyName];\n    resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties, featureIdsMap);\n  }\n\n  return resultPropertyTable;\n}\n\n/**\n * Getting properties by featureId index\n * @param properties\n * @param featureIdsMap\n */\nfunction getPropertiesByFeatureIds(\n  properties: unknown[],\n  featureIdsMap: Record<string, number>\n): unknown[] {\n  const resultProperties: unknown[] = [];\n\n  if (properties) {\n    for (const featureIdKey in featureIdsMap) {\n      const property = properties[featureIdKey] || null;\n      resultProperties.push(property);\n    }\n  }\n\n  return resultProperties;\n}\n\n/**\n * Check that all attributes in propertyTable have the same length as FeatureIds.\n * If there are differencies between lengths we should flatten property table based on exiesting featureIds.\n * @param featureIds\n * @param propertyTable\n * @returns\n */\nexport function checkPropertiesLength(\n  featureIds: number[],\n  propertyTable: FeatureTableJson\n): boolean {\n  let needFlatten = false;\n\n  for (const attribute of Object.values(propertyTable)) {\n    if (!featureIds || !attribute || featureIds.length !== attribute.length) {\n      needFlatten = true;\n    }\n  }\n\n  return needFlatten;\n}\n\n/** String data type name for feature attributes */\nconst STRING_TYPE = 'string';\n/** Integer data type name for feature attributes */\nconst SHORT_INT_TYPE = 'Int32';\n/** Double data type name for feature attributes */\nconst DOUBLE_TYPE = 'double';\n/** Type of attribute that is linked with feature ids */\nconst OBJECT_ID_TYPE = 'OBJECTID';\n/**\n * Get the attribute type for attributeStorageInfo https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md\n * @param key - attribute's key\n * @param attribute - attribute's type in propertyTable\n */\nexport function getAttributeType(key: string, attribute: string): string {\n  if (key === OBJECT_ID_TYPE) {\n    return OBJECT_ID_TYPE;\n  }\n  if (typeof attribute === STRING_TYPE) {\n    return STRING_TYPE;\n  } else if (typeof attribute === 'number') {\n    return Number.isInteger(attribute) ? SHORT_INT_TYPE : DOUBLE_TYPE;\n  }\n  return STRING_TYPE;\n}\n\n/**\n * Generate storage attribute for map segmentation.\n * @param attributeIndex - order index of attribute (f_0, f_1 ...).\n * @param key - attribute key from propertyTable.\n * @param attributeType - attribute type.\n * @return Updated storageAttribute.\n */\nexport function createdStorageAttribute(\n  attributeIndex: number,\n  key: string,\n  attributeType: Attribute\n): AttributeStorageInfo {\n  const storageAttribute = {\n    key: `f_${attributeIndex}`,\n    name: key,\n    ordering: ['attributeValues'],\n    header: [{property: 'count', valueType: 'UInt32'}],\n    attributeValues: {valueType: 'Int32', valuesPerElement: 1}\n  };\n\n  switch (attributeType) {\n    case OBJECT_ID_TYPE:\n      setupIdAttribute(storageAttribute);\n      break;\n    case STRING_TYPE:\n      setupStringAttribute(storageAttribute);\n      break;\n    case DOUBLE_TYPE:\n      setupDoubleAttribute(storageAttribute);\n      break;\n    case SHORT_INT_TYPE:\n      break;\n    default:\n      setupStringAttribute(storageAttribute);\n  }\n\n  return storageAttribute;\n}\n\n/**\n * Find and return attribute type based on key form propertyTable.\n * @param attributeType\n */\nexport function getFieldAttributeType(attributeType: Attribute): ESRIField {\n  switch (attributeType) {\n    case OBJECT_ID_TYPE:\n      return 'esriFieldTypeOID';\n    case STRING_TYPE:\n      return 'esriFieldTypeString';\n    case SHORT_INT_TYPE:\n      return 'esriFieldTypeInteger';\n    case DOUBLE_TYPE:\n      return 'esriFieldTypeDouble';\n    default:\n      return 'esriFieldTypeString';\n  }\n}\n\n/**\n * Setup field attribute for map segmentation.\n * @param key - attribute for map segmentation.\n * @param fieldAttributeType - esri attribute type ('esriFieldTypeString' or 'esriFieldTypeOID').\n */\nexport function createFieldAttribute(key: string, fieldAttributeType: ESRIField): Field {\n  return {\n    name: key,\n    type: fieldAttributeType,\n    alias: key\n  };\n}\n\n/**\n * Generate popup info to show metadata on the map.\n * @param propertyTable - table data with OBJECTID.\n * @return data for correct rendering of popup.\n */\nexport function createPopupInfo(propertyTable: FeatureTableJson): PopupInfo {\n  const title = '{OBJECTID}';\n  const mediaInfos = [];\n  const fieldInfos: FieldInfo[] = [];\n  const popupElements: {\n    fieldInfos: FieldInfo[];\n    type: string;\n  }[] = [];\n  const expressionInfos = [];\n\n  for (const key in propertyTable) {\n    fieldInfos.push({\n      fieldName: key,\n      visible: true,\n      isEditable: false,\n      label: key\n    });\n  }\n  popupElements.push({\n    fieldInfos,\n    type: 'fields'\n  });\n\n  return {\n    title,\n    mediaInfos,\n    popupElements,\n    fieldInfos,\n    expressionInfos\n  };\n}\n\n/**\n * Setup storage attribute as string.\n * @param storageAttribute - attribute for map segmentation.\n */\nfunction setupStringAttribute(storageAttribute: AttributeStorageInfo): void {\n  // @ts-expect-error\n  storageAttribute.ordering.unshift('attributeByteCounts');\n  storageAttribute.header.push({property: 'attributeValuesByteCount', valueType: 'UInt32'});\n  storageAttribute.attributeValues = {\n    valueType: 'String',\n    encoding: 'UTF-8',\n    valuesPerElement: 1\n  };\n  storageAttribute.attributeByteCounts = {\n    valueType: 'UInt32',\n    valuesPerElement: 1\n  };\n}\n\n/**\n * Setup Id attribute for map segmentation.\n * @param storageAttribute - attribute for map segmentation .\n */\nfunction setupIdAttribute(storageAttribute: AttributeStorageInfo): void {\n  storageAttribute.attributeValues = {\n    valueType: 'Oid32',\n    valuesPerElement: 1\n  };\n}\n\n/**\n * Setup double attribute for map segmentation.\n * @param storageAttribute - attribute for map segmentation .\n */\nfunction setupDoubleAttribute(storageAttribute: AttributeStorageInfo): void {\n  storageAttribute.attributeValues = {\n    valueType: 'Float64',\n    valuesPerElement: 1\n  };\n}\n"],"mappings":"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"}

package/dist/esm/i3s-converter/helpers/geometry-attributes.js

@@ -91,6 +91,11 @@ function makeAttributeObjects(attributes) {
   let colorsList = new Uint8Array(colors);
   let texCoordsList = new Float32Array(texCoords);
   let uvRegionsList = new Uint16Array(uvRegions);
+  let positionsOffset = 0;
+  let normalsOffset = 0;
+  let colorsOffset = 0;
+  let uvRegionsOffset = 0;
+  let texCoordsOffset = 0;
   for (let index = 0; index < featureIds.length; index++) {
     const startIndex = faceRange[index * 2];
     const endIndex = faceRange[index * 2 + 1];
@@ -101,19 +106,19 @@ function makeAttributeObjects(attributes) {
     const texCoordsCount = getSliceAttributeCount('texCoords', startIndex, endIndex);
     groupedData.push({
       featureId: featureIds[index],
-      positions: positionsList.slice(0, positionsCount),
-      normals: normalsList.slice(0, normalsCount),
-      colors: colorsList.slice(0, colorsCount),
-      uvRegions: uvRegionsList.slice(0, uvRegionsCount),
-      texCoords: texCoordsList.slice(0, texCoordsCount)
+      positions: positionsList.subarray(positionsOffset, positionsOffset + positionsCount),
+      normals: normalsList.subarray(normalsOffset, normalsOffset + normalsCount),
+      colors: colorsList.subarray(colorsOffset, colorsOffset + colorsCount),
+      uvRegions: uvRegionsList.subarray(uvRegionsOffset, uvRegionsOffset + uvRegionsCount),
+      texCoords: texCoordsList.subarray(texCoordsOffset, texCoordsOffset + texCoordsCount)
     });
-    positionsList = positionsList.slice(positionsCount);
-    normalsList = normalsList.slice(normalsCount);
-    colorsList = colorsList.slice(colorsCount);
-    uvRegionsList = uvRegionsList.slice(uvRegionsCount);
-    texCoordsList = texCoordsList.slice(texCoordsCount);
+    positionsOffset += positionsCount;
+    normalsOffset += normalsCount;
+    colorsOffset += colorsCount;
+    uvRegionsOffset += uvRegionsCount;
+    texCoordsOffset += texCoordsCount;
   }
-  return groupedData.sort((first, second) => first.featureId - second.featureId);
+  return groupedData;
 }
 function getSliceAttributeCount(attributeName, startIndex, endIndex) {
   const itemsPerVertex4 = 4;
@@ -134,58 +139,95 @@ function getSliceAttributeCount(attributeName, startIndex, endIndex) {
   }
 }
 function unifyObjectsByFeatureId(sortedData) {
-  const uniqueObjects = [];
-  for (let index = 0; index < sortedData.length; index++) {
-    const currentObject = sortedData[index];
-    const existingObject = uniqueObjects.find(obj => obj.featureId === currentObject.featureId);
+  const groupedMetadata = [];
+  for (const data of sortedData) {
+    const existingObject = groupedMetadata.find(obj => obj.featureId === data.featureId);
     if (existingObject) {
-      existingObject.positions = concatenateTypedArrays(existingObject.positions, currentObject.positions);
-      existingObject.normals = concatenateTypedArrays(existingObject.normals, currentObject.normals);
-      existingObject.colors = concatenateTypedArrays(existingObject.colors, currentObject.colors);
-      existingObject.texCoords = concatenateTypedArrays(existingObject.texCoords, currentObject.texCoords);
-      existingObject.uvRegions = concatenateTypedArrays(existingObject.uvRegions, currentObject.uvRegions);
+      existingObject.attributes.push(data);
     } else {
-      uniqueObjects.push(currentObject);
+      groupedMetadata.push({
+        featureId: data.featureId,
+        attributes: [data]
+      });
     }
   }
+  const uniqueObjects = [];
+  for (const metatada of groupedMetadata) {
+    const attributes = concatenateAttributes(metatada.attributes);
+    uniqueObjects.push({
+      featureId: metatada.featureId,
+      ...attributes
+    });
+  }
   return uniqueObjects;
 }
 function groupAttributesAndRangesByFeatureId(unifiedObjects, featureCount) {
   const firstAttributeObject = unifiedObjects[0];
   const featureIds = [firstAttributeObject.featureId || 0];
-  let positions = new Float32Array(firstAttributeObject.positions);
-  let normals = new Float32Array(firstAttributeObject.normals);
-  let colors = new Uint8Array(firstAttributeObject.colors);
-  let uvRegions = new Uint16Array(firstAttributeObject.uvRegions);
-  let texCoords = new Float32Array(firstAttributeObject.texCoords);
   const range = [0];
   let objIndex = 0;
   let sum = 0;
   for (let index = 1; index < unifiedObjects.length; index++) {
     const currentAttributesObject = unifiedObjects[index];
     featureIds.push(currentAttributesObject.featureId || 0);
-    positions = concatenateTypedArrays(positions, currentAttributesObject.positions);
-    normals = concatenateTypedArrays(normals, currentAttributesObject.normals);
-    colors = concatenateTypedArrays(colors, currentAttributesObject.colors);
-    uvRegions = concatenateTypedArrays(uvRegions, currentAttributesObject.uvRegions);
-    texCoords = concatenateTypedArrays(texCoords, currentAttributesObject.texCoords);
     const groupedObject = unifiedObjects[objIndex];
     range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1 + sum);
     range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE + sum);
     sum += groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;
     objIndex += 1;
   }
-  range.push(positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1);
+  const attributes = concatenateAttributes(unifiedObjects);
+  range.push(attributes.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1);
   const faceRange = new Uint32Array(range);
   return {
     faceRange,
     featureIds,
+    featureCount,
+    ...attributes
+  };
+}
+function concatenateAttributes(attributes) {
+  const positionGroups = attributes.map(_ref => {
+    let {
+      positions
+    } = _ref;
+    return positions;
+  });
+  const positions = positionGroups.length > 1 ? concatenateTypedArrays(...positionGroups) : positionGroups[0];
+  const normalGroups = attributes.map(_ref2 => {
+    let {
+      normals
+    } = _ref2;
+    return normals;
+  });
+  const normals = normalGroups.length > 1 ? concatenateTypedArrays(...normalGroups) : normalGroups[0];
+  const colorGroups = attributes.map(_ref3 => {
+    let {
+      colors
+    } = _ref3;
+    return colors;
+  });
+  const colors = colorGroups.length > 1 ? concatenateTypedArrays(...colorGroups) : colorGroups[0];
+  const texCoordGroups = attributes.map(_ref4 => {
+    let {
+      texCoords
+    } = _ref4;
+    return texCoords;
+  });
+  const texCoords = texCoordGroups.length > 1 ? concatenateTypedArrays(...texCoordGroups) : texCoordGroups[0];
+  const uvRegionGroups = attributes.map(_ref5 => {
+    let {
+      uvRegions
+    } = _ref5;
+    return uvRegions;
+  });
+  const uvRegions = uvRegionGroups.length > 1 ? concatenateTypedArrays(...uvRegionGroups) : uvRegionGroups[0];
+  return {
     positions,
     normals,
     colors,
-    uvRegions,
     texCoords,
-    featureCount
+    uvRegions
   };
 }
 //# sourceMappingURL=geometry-attributes.js.map

package/dist/esm/i3s-converter/helpers/geometry-attributes.js.map

@@ -1 +1 @@
-{"version":3,"file":"geometry-attributes.js","names":["concatenateTypedArrays","VALUES_PER_VERTEX","POSITIONS_AND_NORMALS_PER_TRIANGLE","generateAttributes","attributes","positions","normals","texCoords","colors","uvRegions","featureIndices","triangleCount","length","faceRange","Uint32Array","featureIds","featureCount","data","calculateFaceRangesAndFeaturesCount","attributeObjects","makeAttributeObjects","unifiedAttributeObjectsByFeatureIds","unifyObjectsByFeatureId","groupedAttributes","groupAttributesAndRangesByFeatureId","rangeIndex","featureIndex","currentFeatureId","getFrequentValue","slice","faceRangeList","uniqueFeatureIds","index","newFeatureId","includes","push","values","map","mostFrequentValue","maxCount","value","groupedData","positionsList","Float32Array","normalsList","colorsList","Uint8Array","texCoordsList","uvRegionsList","Uint16Array","startIndex","endIndex","positionsCount","getSliceAttributeCount","normalsCount","colorsCount","uvRegionsCount","texCoordsCount","featureId","sort","first","second","attributeName","itemsPerVertex4","texCoordsPerVertex","trianglesCount","vertexCount","sortedData","uniqueObjects","currentObject","existingObject","find","obj","unifiedObjects","firstAttributeObject","range","objIndex","sum","currentAttributesObject","groupedObject"],"sources":["../../../../src/i3s-converter/helpers/geometry-attributes.ts"],"sourcesContent":["import type {GeometryAttributes, ConvertedAttributes, GroupedByFeatureIdAttributes} from '../types';\nimport {concatenateTypedArrays} from '@loaders.gl/loader-utils';\n\nconst VALUES_PER_VERTEX = 3;\nconst POSITIONS_AND_NORMALS_PER_TRIANGLE = 9;\n\n/**\n * Generate geometry attributes with faceRange and featureCount\n * @param attributes\n * @returns attirbutes with featureCount, featureIds and changed faceRange.\n */\nexport function generateAttributes(attributes: ConvertedAttributes): GeometryAttributes {\n  const {positions, normals, texCoords, colors, uvRegions, featureIndices} = attributes;\n  const triangleCount = positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;\n\n  if (!featureIndices.length) {\n    return {\n      faceRange: new Uint32Array([0, triangleCount - 1]),\n      featureIds: [0],\n      featureCount: 1,\n      positions,\n      normals,\n      texCoords,\n      colors,\n      uvRegions\n    };\n  }\n\n  const data = calculateFaceRangesAndFeaturesCount(featureIndices);\n  const attributeObjects = makeAttributeObjects({...data, ...attributes});\n  const unifiedAttributeObjectsByFeatureIds = unifyObjectsByFeatureId(attributeObjects);\n  const groupedAttributes = groupAttributesAndRangesByFeatureId(\n    unifiedAttributeObjectsByFeatureIds,\n    data.featureCount\n  );\n  return groupedAttributes;\n}\n\n/**\n * Calculates face Ranges and feature count based on featureIndices.\n * @param featureIndices\n * @returns Object with featureCount, reordered attributes and changed faceRange.\n */\nfunction calculateFaceRangesAndFeaturesCount(featureIndices: number[]): {\n  faceRange: Uint32Array;\n  featureCount: number;\n  featureIds: number[];\n} {\n  let rangeIndex = 1;\n  let featureIndex = 1;\n  let currentFeatureId = getFrequentValue(featureIndices.slice(0, VALUES_PER_VERTEX));\n  const faceRangeList: any[] = [];\n  const featureIds: any[] = [];\n  const uniqueFeatureIds = [currentFeatureId];\n\n  faceRangeList[0] = 0;\n  featureIds[0] = currentFeatureId;\n\n  for (let index = VALUES_PER_VERTEX; index < featureIndices.length; index += VALUES_PER_VERTEX) {\n    const newFeatureId = getFrequentValue(featureIndices.slice(index, index + VALUES_PER_VERTEX));\n    if (currentFeatureId !== newFeatureId) {\n      faceRangeList[rangeIndex] = index / VALUES_PER_VERTEX - 1;\n      faceRangeList[rangeIndex + 1] = index / VALUES_PER_VERTEX;\n      featureIds[featureIndex] = newFeatureId;\n\n      if (!uniqueFeatureIds.includes(newFeatureId)) {\n        uniqueFeatureIds.push(newFeatureId);\n      }\n\n      rangeIndex += 2;\n      featureIndex += 1;\n    }\n    currentFeatureId = newFeatureId;\n  }\n\n  faceRangeList[rangeIndex] = featureIndices.length / VALUES_PER_VERTEX - 1;\n\n  const faceRange = new Uint32Array(faceRangeList);\n  const featureCount = uniqueFeatureIds.length;\n\n  return {faceRange, featureCount, featureIds};\n}\n\n/**\n * Find most frequent value to avoid situation where one vertex can be part of multiple features (objects).\n * @param values\n */\nfunction getFrequentValue(values: number[]): number {\n  const map: {[key: number]: number} = {};\n\n  let mostFrequentValue = values[0];\n  let maxCount = 1;\n\n  for (const value of values) {\n    // Save item and it's frequency count to the map.\n    map[value] = (map[value] || 0) + 1;\n    // Find max count of frequency.\n    maxCount = maxCount > map[value] ? maxCount : map[value];\n    // Find the most frequent value.\n    mostFrequentValue = maxCount > map[value] ? mostFrequentValue : value;\n  }\n\n  return mostFrequentValue;\n}\n\n/**\n * Generate list of attribute object grouped by feature ids.\n * @param  attributes\n * @returns sorted list of attribute objects.\n */\nfunction makeAttributeObjects(attributes: GeometryAttributes): GroupedByFeatureIdAttributes[] {\n  const {\n    featureIds,\n    positions,\n    normals,\n    colors,\n    uvRegions,\n    texCoords,\n    faceRange = new Uint32Array(0)\n  } = attributes;\n  const groupedData: GroupedByFeatureIdAttributes[] = [];\n\n  let positionsList = new Float32Array(positions);\n  let normalsList = new Float32Array(normals);\n  let colorsList = new Uint8Array(colors);\n  let texCoordsList = new Float32Array(texCoords);\n  let uvRegionsList = new Uint16Array(uvRegions);\n\n  for (let index = 0; index < featureIds.length; index++) {\n    const startIndex = faceRange[index * 2];\n    const endIndex = faceRange[index * 2 + 1];\n\n    const positionsCount = getSliceAttributeCount('positions', startIndex, endIndex);\n    const normalsCount = getSliceAttributeCount('normals', startIndex, endIndex);\n    const colorsCount = getSliceAttributeCount('colors', startIndex, endIndex);\n    const uvRegionsCount = getSliceAttributeCount('uvRegions', startIndex, endIndex);\n    const texCoordsCount = getSliceAttributeCount('texCoords', startIndex, endIndex);\n\n    groupedData.push({\n      featureId: featureIds[index],\n      positions: positionsList.slice(0, positionsCount),\n      normals: normalsList.slice(0, normalsCount),\n      colors: colorsList.slice(0, colorsCount),\n      uvRegions: uvRegionsList.slice(0, uvRegionsCount),\n      texCoords: texCoordsList.slice(0, texCoordsCount)\n    });\n\n    positionsList = positionsList.slice(positionsCount);\n    normalsList = normalsList.slice(normalsCount);\n    colorsList = colorsList.slice(colorsCount);\n    uvRegionsList = uvRegionsList.slice(uvRegionsCount);\n    texCoordsList = texCoordsList.slice(texCoordsCount);\n  }\n\n  return groupedData.sort((first, second) => first.featureId - second.featureId);\n}\n\n/**\n * Generate sliced count for generating attribute objects depends on attribute name and range.\n * @param attributeName\n * @param startIndex\n * @param endIndex\n * @returns sliced count\n */\nfunction getSliceAttributeCount(\n  attributeName: string,\n  startIndex: number,\n  endIndex: number\n): number {\n  const itemsPerVertex4 = 4;\n  const texCoordsPerVertex = 2;\n\n  const trianglesCount = endIndex - startIndex + 1;\n  const vertexCount = trianglesCount * 3;\n\n  switch (attributeName) {\n    case 'positions':\n    case 'normals':\n      return trianglesCount * POSITIONS_AND_NORMALS_PER_TRIANGLE;\n    case 'colors':\n    case 'uvRegions':\n      return vertexCount * itemsPerVertex4;\n    case 'texCoords':\n      return vertexCount * texCoordsPerVertex;\n    default:\n      return 0;\n  }\n}\n\n/**\n * Generates unique object list depends on feature ids and concantenate their attributes.\n * @param sortedData\n * @returns unique list of objects\n */\nfunction unifyObjectsByFeatureId(\n  sortedData: GroupedByFeatureIdAttributes[]\n): GroupedByFeatureIdAttributes[] {\n  const uniqueObjects: GroupedByFeatureIdAttributes[] = [];\n\n  for (let index = 0; index < sortedData.length; index++) {\n    const currentObject = sortedData[index];\n    const existingObject = uniqueObjects.find((obj) => obj.featureId === currentObject.featureId);\n\n    if (existingObject) {\n      existingObject.positions = concatenateTypedArrays(\n        existingObject.positions,\n        currentObject.positions\n      );\n      existingObject.normals = concatenateTypedArrays(\n        existingObject.normals,\n        currentObject.normals\n      );\n      existingObject.colors = concatenateTypedArrays(existingObject.colors, currentObject.colors);\n      existingObject.texCoords = concatenateTypedArrays(\n        existingObject.texCoords,\n        currentObject.texCoords\n      );\n      existingObject.uvRegions = concatenateTypedArrays(\n        existingObject.uvRegions,\n        currentObject.uvRegions\n      );\n    } else {\n      uniqueObjects.push(currentObject);\n    }\n  }\n\n  return uniqueObjects;\n}\n\n/**\n * Generates attribute objects with new faceRange and reordered attributes.\n * @param unifiedObjects\n * @returns generated attributes with new faceRange.\n */\nfunction groupAttributesAndRangesByFeatureId(\n  unifiedObjects: GroupedByFeatureIdAttributes[],\n  featureCount: number\n): GeometryAttributes {\n  const firstAttributeObject = unifiedObjects[0];\n  const featureIds = [firstAttributeObject.featureId || 0];\n\n  let positions = new Float32Array(firstAttributeObject.positions);\n  let normals = new Float32Array(firstAttributeObject.normals);\n  let colors = new Uint8Array(firstAttributeObject.colors);\n  let uvRegions = new Uint16Array(firstAttributeObject.uvRegions);\n  let texCoords = new Float32Array(firstAttributeObject.texCoords);\n  const range = [0];\n\n  let objIndex = 0;\n  let sum = 0;\n\n  for (let index = 1; index < unifiedObjects.length; index++) {\n    const currentAttributesObject = unifiedObjects[index];\n    featureIds.push(currentAttributesObject.featureId || 0);\n\n    positions = concatenateTypedArrays(positions, currentAttributesObject.positions);\n    normals = concatenateTypedArrays(normals, currentAttributesObject.normals);\n    colors = concatenateTypedArrays(colors, currentAttributesObject.colors);\n    uvRegions = concatenateTypedArrays(uvRegions, currentAttributesObject.uvRegions);\n    texCoords = concatenateTypedArrays(texCoords, currentAttributesObject.texCoords);\n\n    const groupedObject = unifiedObjects[objIndex];\n    range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1 + sum);\n    range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE + sum);\n\n    sum += groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;\n    objIndex += 1;\n  }\n\n  range.push(positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1);\n\n  const faceRange = new Uint32Array(range);\n  return {faceRange, featureIds, positions, normals, colors, uvRegions, texCoords, featureCount};\n}\n"],"mappings":"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"}
+{"version":3,"file":"geometry-attributes.js","names":["concatenateTypedArrays","VALUES_PER_VERTEX","POSITIONS_AND_NORMALS_PER_TRIANGLE","generateAttributes","attributes","positions","normals","texCoords","colors","uvRegions","featureIndices","triangleCount","length","faceRange","Uint32Array","featureIds","featureCount","data","calculateFaceRangesAndFeaturesCount","attributeObjects","makeAttributeObjects","unifiedAttributeObjectsByFeatureIds","unifyObjectsByFeatureId","groupedAttributes","groupAttributesAndRangesByFeatureId","rangeIndex","featureIndex","currentFeatureId","getFrequentValue","slice","faceRangeList","uniqueFeatureIds","index","newFeatureId","includes","push","values","map","mostFrequentValue","maxCount","value","groupedData","positionsList","Float32Array","normalsList","colorsList","Uint8Array","texCoordsList","uvRegionsList","Uint16Array","positionsOffset","normalsOffset","colorsOffset","uvRegionsOffset","texCoordsOffset","startIndex","endIndex","positionsCount","getSliceAttributeCount","normalsCount","colorsCount","uvRegionsCount","texCoordsCount","featureId","subarray","attributeName","itemsPerVertex4","texCoordsPerVertex","trianglesCount","vertexCount","sortedData","groupedMetadata","existingObject","find","obj","uniqueObjects","metatada","concatenateAttributes","unifiedObjects","firstAttributeObject","range","objIndex","sum","currentAttributesObject","groupedObject","positionGroups","_ref","normalGroups","_ref2","colorGroups","_ref3","texCoordGroups","_ref4","uvRegionGroups","_ref5"],"sources":["../../../../src/i3s-converter/helpers/geometry-attributes.ts"],"sourcesContent":["import type {\n  GeometryAttributes,\n  ConvertedAttributes,\n  GroupedByFeatureIdAttributes,\n  GroupedAttributes\n} from '../types';\nimport {concatenateTypedArrays} from '@loaders.gl/loader-utils';\n\nconst VALUES_PER_VERTEX = 3;\nconst POSITIONS_AND_NORMALS_PER_TRIANGLE = 9;\n\n/**\n * Generate geometry attributes with faceRange and featureCount\n * @param attributes\n * @returns attirbutes with featureCount, featureIds and changed faceRange.\n */\nexport function generateAttributes(attributes: ConvertedAttributes): GeometryAttributes {\n  const {positions, normals, texCoords, colors, uvRegions, featureIndices} = attributes;\n  const triangleCount = positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;\n\n  if (!featureIndices.length) {\n    return {\n      faceRange: new Uint32Array([0, triangleCount - 1]),\n      featureIds: [0],\n      featureCount: 1,\n      positions,\n      normals,\n      texCoords,\n      colors,\n      uvRegions\n    };\n  }\n\n  const data = calculateFaceRangesAndFeaturesCount(featureIndices);\n  const attributeObjects = makeAttributeObjects({...data, ...attributes});\n  const unifiedAttributeObjectsByFeatureIds = unifyObjectsByFeatureId(attributeObjects);\n  const groupedAttributes = groupAttributesAndRangesByFeatureId(\n    unifiedAttributeObjectsByFeatureIds,\n    data.featureCount\n  );\n  return groupedAttributes;\n}\n\n/**\n * Calculates face Ranges and feature count based on featureIndices.\n * @param featureIndices\n * @returns Object with featureCount, reordered attributes and changed faceRange.\n */\nfunction calculateFaceRangesAndFeaturesCount(featureIndices: number[]): {\n  faceRange: Uint32Array;\n  featureCount: number;\n  featureIds: number[];\n} {\n  let rangeIndex = 1;\n  let featureIndex = 1;\n  let currentFeatureId = getFrequentValue(featureIndices.slice(0, VALUES_PER_VERTEX));\n  const faceRangeList: any[] = [];\n  const featureIds: any[] = [];\n  const uniqueFeatureIds = [currentFeatureId];\n\n  faceRangeList[0] = 0;\n  featureIds[0] = currentFeatureId;\n\n  for (let index = VALUES_PER_VERTEX; index < featureIndices.length; index += VALUES_PER_VERTEX) {\n    const newFeatureId = getFrequentValue(featureIndices.slice(index, index + VALUES_PER_VERTEX));\n    if (currentFeatureId !== newFeatureId) {\n      faceRangeList[rangeIndex] = index / VALUES_PER_VERTEX - 1;\n      faceRangeList[rangeIndex + 1] = index / VALUES_PER_VERTEX;\n      featureIds[featureIndex] = newFeatureId;\n\n      if (!uniqueFeatureIds.includes(newFeatureId)) {\n        uniqueFeatureIds.push(newFeatureId);\n      }\n\n      rangeIndex += 2;\n      featureIndex += 1;\n    }\n    currentFeatureId = newFeatureId;\n  }\n\n  faceRangeList[rangeIndex] = featureIndices.length / VALUES_PER_VERTEX - 1;\n\n  const faceRange = new Uint32Array(faceRangeList);\n  const featureCount = uniqueFeatureIds.length;\n\n  return {faceRange, featureCount, featureIds};\n}\n\n/**\n * Find most frequent value to avoid situation where one vertex can be part of multiple features (objects).\n * @param values\n */\nfunction getFrequentValue(values: number[]): number {\n  const map: {[key: number]: number} = {};\n\n  let mostFrequentValue = values[0];\n  let maxCount = 1;\n\n  for (const value of values) {\n    // Save item and it's frequency count to the map.\n    map[value] = (map[value] || 0) + 1;\n    // Find max count of frequency.\n    maxCount = maxCount > map[value] ? maxCount : map[value];\n    // Find the most frequent value.\n    mostFrequentValue = maxCount > map[value] ? mostFrequentValue : value;\n  }\n\n  return mostFrequentValue;\n}\n\n/**\n * Generate list of attribute object grouped by feature ids.\n * @param  attributes\n * @returns sorted list of attribute objects.\n */\nfunction makeAttributeObjects(attributes: GeometryAttributes): GroupedByFeatureIdAttributes[] {\n  const {\n    featureIds,\n    positions,\n    normals,\n    colors,\n    uvRegions,\n    texCoords,\n    faceRange = new Uint32Array(0)\n  } = attributes;\n  const groupedData: GroupedByFeatureIdAttributes[] = [];\n\n  let positionsList = new Float32Array(positions);\n  let normalsList = new Float32Array(normals);\n  let colorsList = new Uint8Array(colors);\n  let texCoordsList = new Float32Array(texCoords);\n  let uvRegionsList = new Uint16Array(uvRegions);\n  let positionsOffset = 0;\n  let normalsOffset = 0;\n  let colorsOffset = 0;\n  let uvRegionsOffset = 0;\n  let texCoordsOffset = 0;\n\n  for (let index = 0; index < featureIds.length; index++) {\n    const startIndex = faceRange[index * 2];\n    const endIndex = faceRange[index * 2 + 1];\n\n    const positionsCount = getSliceAttributeCount('positions', startIndex, endIndex);\n    const normalsCount = getSliceAttributeCount('normals', startIndex, endIndex);\n    const colorsCount = getSliceAttributeCount('colors', startIndex, endIndex);\n    const uvRegionsCount = getSliceAttributeCount('uvRegions', startIndex, endIndex);\n    const texCoordsCount = getSliceAttributeCount('texCoords', startIndex, endIndex);\n\n    groupedData.push({\n      featureId: featureIds[index],\n      positions: positionsList.subarray(positionsOffset, positionsOffset + positionsCount),\n      normals: normalsList.subarray(normalsOffset, normalsOffset + normalsCount),\n      colors: colorsList.subarray(colorsOffset, colorsOffset + colorsCount),\n      uvRegions: uvRegionsList.subarray(uvRegionsOffset, uvRegionsOffset + uvRegionsCount),\n      texCoords: texCoordsList.subarray(texCoordsOffset, texCoordsOffset + texCoordsCount)\n    });\n\n    positionsOffset += positionsCount;\n    normalsOffset += normalsCount;\n    colorsOffset += colorsCount;\n    uvRegionsOffset += uvRegionsCount;\n    texCoordsOffset += texCoordsCount;\n  }\n\n  return groupedData;\n}\n\n/**\n * Generate sliced count for generating attribute objects depends on attribute name and range.\n * @param attributeName\n * @param startIndex\n * @param endIndex\n * @returns sliced count\n */\nfunction getSliceAttributeCount(\n  attributeName: string,\n  startIndex: number,\n  endIndex: number\n): number {\n  const itemsPerVertex4 = 4;\n  const texCoordsPerVertex = 2;\n\n  const trianglesCount = endIndex - startIndex + 1;\n  const vertexCount = trianglesCount * 3;\n\n  switch (attributeName) {\n    case 'positions':\n    case 'normals':\n      return trianglesCount * POSITIONS_AND_NORMALS_PER_TRIANGLE;\n    case 'colors':\n    case 'uvRegions':\n      return vertexCount * itemsPerVertex4;\n    case 'texCoords':\n      return vertexCount * texCoordsPerVertex;\n    default:\n      return 0;\n  }\n}\n\n/**\n * Generates unique object list depends on feature ids and concantenate their attributes.\n * @param sortedData\n * @returns unique list of objects\n */\nfunction unifyObjectsByFeatureId(\n  sortedData: GroupedByFeatureIdAttributes[]\n): GroupedByFeatureIdAttributes[] {\n  const groupedMetadata: {\n    featureId: number;\n    attributes: GroupedByFeatureIdAttributes[];\n  }[] = [];\n  for (const data of sortedData) {\n    const existingObject = groupedMetadata.find((obj) => obj.featureId === data.featureId);\n    if (existingObject) {\n      existingObject.attributes.push(data);\n    } else {\n      groupedMetadata.push({\n        featureId: data.featureId,\n        attributes: [data]\n      });\n    }\n  }\n\n  const uniqueObjects: GroupedByFeatureIdAttributes[] = [];\n  for (const metatada of groupedMetadata) {\n    const attributes = concatenateAttributes(metatada.attributes);\n\n    uniqueObjects.push({\n      featureId: metatada.featureId,\n      ...attributes\n    });\n  }\n\n  return uniqueObjects;\n}\n\n/**\n * Generates attribute objects with new faceRange and reordered attributes.\n * @param unifiedObjects\n * @returns generated attributes with new faceRange.\n */\nfunction groupAttributesAndRangesByFeatureId(\n  unifiedObjects: GroupedByFeatureIdAttributes[],\n  featureCount: number\n): GeometryAttributes {\n  const firstAttributeObject = unifiedObjects[0];\n  const featureIds = [firstAttributeObject.featureId || 0];\n  const range = [0];\n\n  let objIndex = 0;\n  let sum = 0;\n\n  for (let index = 1; index < unifiedObjects.length; index++) {\n    const currentAttributesObject = unifiedObjects[index];\n    featureIds.push(currentAttributesObject.featureId || 0);\n\n    const groupedObject = unifiedObjects[objIndex];\n    range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1 + sum);\n    range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE + sum);\n\n    sum += groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;\n    objIndex += 1;\n  }\n\n  const attributes = concatenateAttributes(unifiedObjects);\n\n  range.push(attributes.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1);\n\n  const faceRange = new Uint32Array(range);\n  return {faceRange, featureIds, featureCount, ...attributes};\n}\n\n/**\n * Concatenate attributes typed arrays\n * @param attributes - grouped by featureId typed arrays\n * @returns - concatenated typed array list\n */\nfunction concatenateAttributes(attributes: GroupedByFeatureIdAttributes[]): GroupedAttributes {\n  const positionGroups = attributes.map(({positions}) => positions);\n  const positions =\n    positionGroups.length > 1 ? concatenateTypedArrays(...positionGroups) : positionGroups[0];\n\n  const normalGroups = attributes.map(({normals}) => normals);\n  const normals =\n    normalGroups.length > 1 ? concatenateTypedArrays(...normalGroups) : normalGroups[0];\n\n  const colorGroups = attributes.map(({colors}) => colors);\n  const colors = colorGroups.length > 1 ? concatenateTypedArrays(...colorGroups) : colorGroups[0];\n\n  const texCoordGroups = attributes.map(({texCoords}) => texCoords);\n  const texCoords =\n    texCoordGroups.length > 1 ? concatenateTypedArrays(...texCoordGroups) : texCoordGroups[0];\n\n  const uvRegionGroups = attributes.map(({uvRegions}) => uvRegions);\n  const uvRegions =\n    uvRegionGroups.length > 1 ? concatenateTypedArrays(...uvRegionGroups) : uvRegionGroups[0];\n  return {\n    positions,\n    normals,\n    colors,\n    texCoords,\n    uvRegions\n  };\n}\n"],"mappings":"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"}

package/dist/esm/i3s-converter/helpers/geometry-converter.js

@@ -107,8 +107,9 @@ async function _makeNodeResources(_ref) {
     texCoords,
     featureCount
   } = generateAttributes(convertedAttributes);
-  if (tileContent.batchTableJson) {
-    makeFeatureIdsUnique(featureIds, convertedAttributes.featureIndices, featuresHashArray, tileContent.batchTableJson);
+  let featureIdsMap = {};
+  if (propertyTable) {
+    featureIdsMap = makeFeatureIdsUnique(featureIds, convertedAttributes.featureIndices, featuresHashArray, propertyTable);
   }
   const header = new Uint32Array(2);
   const typedFeatureIds = generateBigUint64Array(featureIds);
@@ -125,7 +126,7 @@ async function _makeNodeResources(_ref) {
   }, libraries) : null;
   let attributes = [];
   if (attributeStorageInfo && propertyTable) {
-    attributes = convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo);
+    attributes = convertPropertyTableToAttributeBuffers(featureIds, featureIdsMap, propertyTable, attributeStorageInfo);
   }
   return {
     nodeId,
@@ -663,6 +664,7 @@ function makeFeatureIdsUnique(featureIds, featureIndices, featuresHashArray, bat
   const replaceMap = getFeaturesReplaceMap(featureIds, batchTable, featuresHashArray);
   replaceIndicesByUnique(featureIndices, replaceMap);
   replaceIndicesByUnique(featureIds, replaceMap);
+  return replaceMap;
 }
 function getFeaturesReplaceMap(featureIds, batchTable, featuresHashArray) {
   const featureMap = {};
@@ -693,10 +695,10 @@ function replaceIndicesByUnique(indicesArray, featureMap) {
     indicesArray[index] = featureMap[indicesArray[index]];
   }
 }
-function convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo) {
+function convertPropertyTableToAttributeBuffers(featureIds, featureIdsMap, propertyTable, attributeStorageInfo) {
   const attributeBuffers = [];
   const needFlattenPropertyTable = checkPropertiesLength(featureIds, propertyTable);
-  const properties = needFlattenPropertyTable ? flattenPropertyTableByFeatureIds(featureIds, propertyTable) : propertyTable;
+  const properties = needFlattenPropertyTable ? flattenPropertyTableByFeatureIds(featureIdsMap, propertyTable) : propertyTable;
   const propertyTableWithObjectIds = {
     OBJECTID: featureIds,
     ...properties