@loaders.gl/tile-converter 4.0.0-alpha.21 → 4.0.0-alpha.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/constants.d.ts +0 -2
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +1 -3
- package/dist/converter.min.js +114 -114
- package/dist/dist.min.js +2409 -1161
- package/dist/es5/constants.js +1 -5
- package/dist/es5/constants.js.map +1 -1
- package/dist/es5/deps-installer/deps-installer.js +1 -1
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js +26 -11
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/feature-attributes.js +14 -12
- package/dist/es5/i3s-converter/helpers/feature-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-converter.js +61 -10
- package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/load-3d-tiles.js +70 -4
- package/dist/es5/i3s-converter/helpers/load-3d-tiles.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/node-index-document.js +3 -2
- package/dist/es5/i3s-converter/helpers/node-index-document.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/preprocess-3d-tiles.js +1 -2
- package/dist/es5/i3s-converter/helpers/preprocess-3d-tiles.js.map +1 -1
- package/dist/es5/i3s-converter/i3s-converter.js +70 -58
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/i3s-server/controllers/slpk-controller.js +2 -2
- package/dist/es5/i3s-server/controllers/slpk-controller.js.map +1 -1
- package/dist/es5/pgm-loader.js +1 -1
- package/dist/es5/slpk-extractor/slpk-extractor.js +1 -1
- package/dist/es5/slpk-extractor/slpk-extractor.js.map +1 -1
- package/dist/esm/constants.js +0 -2
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/deps-installer/deps-installer.js +1 -1
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js +21 -6
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/feature-attributes.js +6 -4
- package/dist/esm/i3s-converter/helpers/feature-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-converter.js +59 -8
- package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/load-3d-tiles.js +33 -4
- package/dist/esm/i3s-converter/helpers/load-3d-tiles.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-index-document.js +2 -1
- package/dist/esm/i3s-converter/helpers/node-index-document.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/preprocess-3d-tiles.js +1 -1
- package/dist/esm/i3s-converter/helpers/preprocess-3d-tiles.js.map +1 -1
- package/dist/esm/i3s-converter/i3s-converter.js +27 -22
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/i3s-server/bin/i3s-server.min.js +71 -71
- package/dist/esm/i3s-server/controllers/slpk-controller.js +1 -1
- package/dist/esm/i3s-server/controllers/slpk-controller.js.map +1 -1
- package/dist/esm/pgm-loader.js +1 -1
- package/dist/esm/slpk-extractor/slpk-extractor.js +2 -1
- package/dist/esm/slpk-extractor/slpk-extractor.js.map +1 -1
- package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/batch-ids-extensions.js +37 -16
- package/dist/i3s-converter/helpers/feature-attributes.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/feature-attributes.js +6 -4
- package/dist/i3s-converter/helpers/geometry-converter.d.ts +2 -2
- package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.js +93 -12
- package/dist/i3s-converter/helpers/load-3d-tiles.d.ts +15 -0
- package/dist/i3s-converter/helpers/load-3d-tiles.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/load-3d-tiles.js +51 -5
- package/dist/i3s-converter/helpers/node-index-document.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/node-index-document.js +4 -1
- package/dist/i3s-converter/helpers/preprocess-3d-tiles.js +2 -2
- package/dist/i3s-converter/i3s-converter.d.ts +1 -1
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +38 -17
- package/dist/i3s-server/controllers/slpk-controller.js +2 -2
- package/dist/slpk-extractor/slpk-extractor.d.ts.map +1 -1
- package/dist/slpk-extractor/slpk-extractor.js +2 -1
- package/dist/slpk-extractor.min.js +38 -38
- package/package.json +14 -14
- package/src/constants.ts +0 -3
- package/src/i3s-converter/helpers/batch-ids-extensions.ts +53 -14
- package/src/i3s-converter/helpers/feature-attributes.ts +8 -6
- package/src/i3s-converter/helpers/geometry-converter.ts +135 -12
- package/src/i3s-converter/helpers/load-3d-tiles.ts +61 -5
- package/src/i3s-converter/helpers/node-index-document.ts +5 -1
- package/src/i3s-converter/helpers/preprocess-3d-tiles.ts +1 -1
- package/src/i3s-converter/i3s-converter.ts +54 -22
- package/src/i3s-server/controllers/slpk-controller.ts +1 -1
- package/src/slpk-extractor/slpk-extractor.ts +2 -1
package/dist/es5/constants.js
CHANGED
|
@@ -3,11 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.
|
|
6
|
+
exports.BROWSER_ERROR_MESSAGE = void 0;
|
|
7
7
|
var BROWSER_ERROR_MESSAGE = 'Tile converter does not work in browser, only in node js environment';
|
|
8
8
|
exports.BROWSER_ERROR_MESSAGE = BROWSER_ERROR_MESSAGE;
|
|
9
|
-
var EXT_MESH_FEATURES = 'EXT_mesh_features';
|
|
10
|
-
exports.EXT_MESH_FEATURES = EXT_MESH_FEATURES;
|
|
11
|
-
var EXT_FEATURE_METADATA = 'EXT_feature_metadata';
|
|
12
|
-
exports.EXT_FEATURE_METADATA = EXT_FEATURE_METADATA;
|
|
13
9
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","names":["BROWSER_ERROR_MESSAGE","exports"
|
|
1
|
+
{"version":3,"file":"constants.js","names":["BROWSER_ERROR_MESSAGE","exports"],"sources":["../../src/constants.ts"],"sourcesContent":["export const BROWSER_ERROR_MESSAGE =\n 'Tile converter does not work in browser, only in node js environment';\n"],"mappings":";;;;;;AAAO,IAAMA,qBAAqB,GAChC,sEAAsE;AAACC,OAAA,CAAAD,qBAAA,GAAAA,qBAAA"}
|
|
@@ -16,7 +16,7 @@ var _path = require("path");
|
|
|
16
16
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
17
17
|
var _draco = require("@loaders.gl/draco");
|
|
18
18
|
var _textures = require("@loaders.gl/textures");
|
|
19
|
-
var VERSION = typeof "4.0.0-alpha.
|
|
19
|
+
var VERSION = typeof "4.0.0-alpha.23" !== 'undefined' ? "4.0.0-alpha.23" : 'beta';
|
|
20
20
|
var PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
|
|
21
21
|
var DepsInstaller = function () {
|
|
22
22
|
function DepsInstaller() {
|
|
@@ -7,10 +7,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.getTextureByMetadataClass = getTextureByMetadataClass;
|
|
8
8
|
exports.handleBatchIdsExtensions = handleBatchIdsExtensions;
|
|
9
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
10
|
-
var
|
|
10
|
+
var _math = require("@loaders.gl/math");
|
|
11
|
+
var _gltf = require("@loaders.gl/gltf");
|
|
11
12
|
function getTextureByMetadataClass(tileContent, metadataClass) {
|
|
12
13
|
var _tileContent$gltf, _tileContent$gltf$ext;
|
|
13
|
-
var extFeatureMetadata = (_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : (_tileContent$gltf$ext = _tileContent$gltf.extensions) === null || _tileContent$gltf$ext === void 0 ? void 0 : _tileContent$gltf$ext[
|
|
14
|
+
var extFeatureMetadata = (_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : (_tileContent$gltf$ext = _tileContent$gltf.extensions) === null || _tileContent$gltf$ext === void 0 ? void 0 : _tileContent$gltf$ext[_gltf.EXT_FEATURE_METADATA];
|
|
14
15
|
if (!(extFeatureMetadata !== null && extFeatureMetadata !== void 0 && extFeatureMetadata.featureTextures)) {
|
|
15
16
|
return null;
|
|
16
17
|
}
|
|
@@ -32,17 +33,34 @@ function handleBatchIdsExtensions(attributes, primitive, images, featureTexture)
|
|
|
32
33
|
extensionName = _Object$entries$_i[0],
|
|
33
34
|
extensionData = _Object$entries$_i[1];
|
|
34
35
|
switch (extensionName) {
|
|
35
|
-
case
|
|
36
|
+
case _gltf.EXT_FEATURE_METADATA:
|
|
36
37
|
return handleExtFeatureMetadataExtension(attributes, extensionData, images, featureTexture);
|
|
37
|
-
case
|
|
38
|
-
|
|
39
|
-
|
|
38
|
+
case _gltf.EXT_MESH_FEATURES:
|
|
39
|
+
return handleExtMeshFeaturesExtension(attributes, extensionData);
|
|
40
|
+
case _gltf.EXT_STRUCTURAL_METADATA:
|
|
41
|
+
return handleExtStructuralMetadataExtension(attributes, extensionData);
|
|
40
42
|
default:
|
|
41
43
|
return [];
|
|
42
44
|
}
|
|
43
45
|
}
|
|
44
46
|
return [];
|
|
45
47
|
}
|
|
48
|
+
function handleExtStructuralMetadataExtension(attributes, extStructuralMetadata) {
|
|
49
|
+
var dataAttributeNames = extStructuralMetadata === null || extStructuralMetadata === void 0 ? void 0 : extStructuralMetadata.dataAttributeNames;
|
|
50
|
+
if (dataAttributeNames !== null && dataAttributeNames !== void 0 && dataAttributeNames.length) {
|
|
51
|
+
var batchIdsAttribute = attributes[dataAttributeNames[0]];
|
|
52
|
+
return batchIdsAttribute.value;
|
|
53
|
+
}
|
|
54
|
+
return [];
|
|
55
|
+
}
|
|
56
|
+
function handleExtMeshFeaturesExtension(attributes, extMeshFeatures) {
|
|
57
|
+
var dataAttributeNames = extMeshFeatures === null || extMeshFeatures === void 0 ? void 0 : extMeshFeatures.dataAttributeNames;
|
|
58
|
+
if (dataAttributeNames !== null && dataAttributeNames !== void 0 && dataAttributeNames.length) {
|
|
59
|
+
var batchIdsAttribute = attributes[dataAttributeNames[0]];
|
|
60
|
+
return batchIdsAttribute.value;
|
|
61
|
+
}
|
|
62
|
+
return [];
|
|
63
|
+
}
|
|
46
64
|
function handleExtFeatureMetadataExtension(attributes, extFeatureMetadata, images, featureTexture) {
|
|
47
65
|
var _extFeatureMetadata$f, _featureIdAttribute$f, _featureIdAttribute$f2, _featureIdAttribute$f3;
|
|
48
66
|
var featureIdAttribute = extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : (_extFeatureMetadata$f = extFeatureMetadata.featureIdAttributes) === null || _extFeatureMetadata$f === void 0 ? void 0 : _extFeatureMetadata$f[0];
|
|
@@ -112,8 +130,8 @@ function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, image
|
|
|
112
130
|
for (var index = 0; index < textureCoordinates.length; index += 2) {
|
|
113
131
|
var u = textureCoordinates[index];
|
|
114
132
|
var v = textureCoordinates[index + 1];
|
|
115
|
-
var tx = Math.min(emod(u) * image.width | 0, image.width - 1);
|
|
116
|
-
var ty = Math.min(emod(v) * image.height | 0, image.height - 1);
|
|
133
|
+
var tx = Math.min((0, _math.emod)(u) * image.width | 0, image.width - 1);
|
|
134
|
+
var ty = Math.min((0, _math.emod)(v) * image.height | 0, image.height - 1);
|
|
117
135
|
var offset = (ty * image.width + tx) * image.components + channels;
|
|
118
136
|
var batchId = new Uint8Array(image.data)[offset];
|
|
119
137
|
batchIds.push(batchId);
|
|
@@ -123,7 +141,4 @@ function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, image
|
|
|
123
141
|
}
|
|
124
142
|
return batchIds;
|
|
125
143
|
}
|
|
126
|
-
function emod(n) {
|
|
127
|
-
return (n % 1 + 1) % 1;
|
|
128
|
-
}
|
|
129
144
|
//# sourceMappingURL=batch-ids-extensions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-ids-extensions.js","names":["_constants","require","getTextureByMetadataClass","tileContent","metadataClass","_tileContent$gltf","_tileContent$gltf$ext","extFeatureMetadata","gltf","extensions","EXT_FEATURE_METADATA","featureTextures","textureKey","texture","class","handleBatchIdsExtensions","attributes","primitive","images","featureTexture","_i","_Object$entries","Object","entries","length","_Object$entries$_i","_slicedToArray2","default","extensionName","extensionData","handleExtFeatureMetadataExtension","EXT_MESH_FEATURES","console","warn","_extFeatureMetadata$f","_featureIdAttribute$f","_featureIdAttribute$f2","_featureIdAttribute$f3","featureIdAttribute","featureIdAttributes","featureIds","attribute","batchIdsAttribute","value","hasOwnProperty","_attributes$POSITIONS","featuresCount","POSITIONS","generateImplicitFeatureIds","constant","divisor","featureIdTexture","featureIdTextures","_featureIdTexture$fea","_featureIdTexture$fea2","textureAttributeIndex","texCoord","textCoordAttribute","concat","textureCoordinates","generateBatchIdsFromTexture","arguments","undefined","currentValue","devisorCounter","index","push","Array","fill","_featureIdTexture$fea3","_featureIdTexture$fea4","_featureIdTexture$fea5","CHANNELS_MAP","r","g","b","a","textureIndex","featureChannel","channels","image","batchIds","width","height","components","u","v","tx","Math","min","emod","ty","offset","batchId","Uint8Array","data","mimeType","n"],"sources":["../../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"sourcesContent":["import {GLTFAccessorPostprocessed, GLTFMeshPrimitivePostprocessed} from '@loaders.gl/gltf';\nimport type {NumericArray} from '@loaders.gl/loader-utils';\nimport type {\n GLTF_EXT_feature_metadata_FeatureIdTexture,\n GLTF_EXT_feature_metadata_GLTF,\n GLTF_EXT_feature_metadata_Primitive\n} from '@loaders.gl/gltf';\nimport {TypedArray} from '@math.gl/core';\nimport {TextureImageProperties} from '../types';\nimport {EXT_FEATURE_METADATA, EXT_MESH_FEATURES} from '../../constants';\nimport {Tiles3DTileContent} from '@loaders.gl/3d-tiles';\n\n/**\n * Get featureTexture by metadataClass\n * @param tileContent - 3d tile content\n * @param metadataClass - user selected feature metadata class name\n * @returns featureTexture key\n */\nexport function getTextureByMetadataClass(\n tileContent: Tiles3DTileContent,\n metadataClass?: string\n): string | null {\n const extFeatureMetadata = tileContent.gltf?.extensions?.[\n EXT_FEATURE_METADATA\n ] as GLTF_EXT_feature_metadata_GLTF;\n if (!extFeatureMetadata?.featureTextures) {\n return null;\n }\n for (const textureKey in extFeatureMetadata.featureTextures) {\n const texture = extFeatureMetadata.featureTextures[textureKey];\n if (texture.class === metadataClass) {\n return textureKey;\n }\n }\n return null;\n}\n\n/**\n * Getting batchIds from 3DTilesNext extensions.\n * @param attributes - gltf accessors\n * @param primitive - gltf primitive data\n * @param images - gltf texture images\n * @param featureTexture - feature texture key\n * @return array of batch IDs\n */\nexport function handleBatchIdsExtensions(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n primitive: GLTFMeshPrimitivePostprocessed,\n images: (TextureImageProperties | null)[],\n featureTexture: string | null\n): NumericArray {\n const extensions = primitive?.extensions;\n\n if (!extensions) {\n return [];\n }\n\n for (const [extensionName, extensionData] of Object.entries(extensions || {})) {\n switch (extensionName) {\n case EXT_FEATURE_METADATA:\n return handleExtFeatureMetadataExtension(\n attributes,\n extensionData as GLTF_EXT_feature_metadata_Primitive,\n images,\n featureTexture\n );\n case EXT_MESH_FEATURES:\n console.warn('EXT_mesh_features extension is not supported yet');\n return [];\n default:\n return [];\n }\n }\n\n return [];\n}\n\n/**\n * Get batchIds from EXT_feature_metadata extension.\n * Docs - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata\n * @param attributes - glTF attributes\n * @param extFeatureMetadata - primitive-level EXT_FEATURE_METADATA extension data\n * @param textures - texture images\n * @param featureTexture - feature texture key\n */\nfunction handleExtFeatureMetadataExtension(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n extFeatureMetadata: GLTF_EXT_feature_metadata_Primitive,\n images: (TextureImageProperties | null)[],\n featureTexture: string | null\n): NumericArray {\n // Take only first extension object to get batchIds attribute name.\n const featureIdAttribute = extFeatureMetadata?.featureIdAttributes?.[0];\n\n if (featureIdAttribute?.featureIds?.attribute) {\n const batchIdsAttribute = attributes[featureIdAttribute.featureIds.attribute];\n return batchIdsAttribute.value;\n }\n\n if (\n featureIdAttribute?.featureIds?.hasOwnProperty('constant') &&\n featureIdAttribute?.featureIds?.hasOwnProperty('divisor')\n ) {\n const featuresCount = attributes?.POSITIONS?.value.length / 3 || 0;\n return generateImplicitFeatureIds(\n featuresCount,\n featureIdAttribute.featureIds.constant,\n featureIdAttribute.featureIds.divisor\n );\n }\n\n // Take only first extension object to get batchIds attribute name.\n const featureIdTexture =\n extFeatureMetadata?.featureIdTextures && extFeatureMetadata?.featureIdTextures[0];\n\n if (featureIdTexture) {\n const textureAttributeIndex = featureIdTexture?.featureIds?.texture?.texCoord || 0;\n const textCoordAttribute = `TEXCOORD_${textureAttributeIndex}`;\n const textureCoordinates = attributes[textCoordAttribute].value;\n return generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images);\n }\n\n if (featureTexture) {\n const batchIdsAttribute = attributes[featureTexture];\n return batchIdsAttribute.value;\n }\n\n return [];\n}\n\n/**\n * Generates implicit feature ids\n * Spec - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata#implicit-feature-ids\n * @param featuresCount\n * @param constant\n * @param devisor\n */\nfunction generateImplicitFeatureIds(\n featuresCount: number,\n constant: number = 0,\n divisor: number = 0\n): number[] {\n let featureIds: number[] = [];\n\n if (divisor > 0) {\n let currentValue = constant;\n let devisorCounter = divisor;\n\n for (let index = 0; index < featuresCount; index++) {\n featureIds.push(currentValue);\n\n devisorCounter -= 1;\n\n if (devisorCounter === 0) {\n currentValue++;\n devisorCounter = divisor;\n }\n }\n } else {\n featureIds = Array<number>(featuresCount).fill(constant, 0, featuresCount);\n }\n\n return featureIds;\n}\n\n/**\n * Get batchIds from texture.\n * @param primitive\n * @param featureIdTextures\n */\nfunction generateBatchIdsFromTexture(\n featureIdTexture: GLTF_EXT_feature_metadata_FeatureIdTexture,\n textureCoordinates: TypedArray,\n images: (TextureImageProperties | null)[]\n) {\n if (!images?.length) {\n return [];\n }\n\n const CHANNELS_MAP = {\n r: 0,\n g: 1,\n b: 2,\n a: 3\n };\n\n const textureIndex = featureIdTexture?.featureIds?.texture?.index;\n const featureChannel = featureIdTexture?.featureIds?.channels;\n\n if (!featureChannel || textureIndex === undefined) {\n return [];\n }\n\n const image = images[textureIndex];\n const batchIds: number[] = [];\n const channels = CHANNELS_MAP[featureChannel];\n\n if (image && image?.width && image?.height && image?.components) {\n for (let index = 0; index < textureCoordinates.length; index += 2) {\n const u = textureCoordinates[index];\n const v = textureCoordinates[index + 1];\n\n const tx = Math.min((emod(u) * image.width) | 0, image.width - 1);\n const ty = Math.min((emod(v) * image.height) | 0, image.height - 1);\n\n const offset = (ty * image.width + tx) * image.components + channels;\n const batchId = new Uint8Array(image.data)[offset];\n\n batchIds.push(batchId);\n }\n } else {\n console.warn(`Can't get batch Ids from ${image?.mimeType || ''} compressed texture`);\n }\n\n return batchIds;\n}\n\n/**\n * Handle UVs if they are out of range [0,1].\n * @param n\n * @param m\n */\nfunction emod(n: number): number {\n return ((n % 1) + 1) % 1;\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"batch-ids-extensions.js","names":["_math","require","_gltf","getTextureByMetadataClass","tileContent","metadataClass","_tileContent$gltf","_tileContent$gltf$ext","extFeatureMetadata","gltf","extensions","EXT_FEATURE_METADATA","featureTextures","textureKey","texture","class","handleBatchIdsExtensions","attributes","primitive","images","featureTexture","_i","_Object$entries","Object","entries","length","_Object$entries$_i","_slicedToArray2","default","extensionName","extensionData","handleExtFeatureMetadataExtension","EXT_MESH_FEATURES","handleExtMeshFeaturesExtension","EXT_STRUCTURAL_METADATA","handleExtStructuralMetadataExtension","extStructuralMetadata","dataAttributeNames","batchIdsAttribute","value","extMeshFeatures","_extFeatureMetadata$f","_featureIdAttribute$f","_featureIdAttribute$f2","_featureIdAttribute$f3","featureIdAttribute","featureIdAttributes","featureIds","attribute","hasOwnProperty","_attributes$POSITIONS","featuresCount","POSITIONS","generateImplicitFeatureIds","constant","divisor","featureIdTexture","featureIdTextures","_featureIdTexture$fea","_featureIdTexture$fea2","textureAttributeIndex","texCoord","textCoordAttribute","concat","textureCoordinates","generateBatchIdsFromTexture","arguments","undefined","currentValue","devisorCounter","index","push","Array","fill","_featureIdTexture$fea3","_featureIdTexture$fea4","_featureIdTexture$fea5","CHANNELS_MAP","r","g","b","a","textureIndex","featureChannel","channels","image","batchIds","width","height","components","u","v","tx","Math","min","emod","ty","offset","batchId","Uint8Array","data","console","warn","mimeType"],"sources":["../../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"sourcesContent":["import {GLTFAccessorPostprocessed, GLTFMeshPrimitivePostprocessed} from '@loaders.gl/gltf';\nimport type {NumericArray} from '@loaders.gl/loader-utils';\nimport type {\n GLTF_EXT_feature_metadata_FeatureIdTexture,\n GLTF_EXT_feature_metadata_GLTF,\n GLTF_EXT_feature_metadata_Primitive,\n GLTF_EXT_structural_metadata\n} from '@loaders.gl/gltf';\n\nimport type {GLTF_EXT_mesh_features} from '@loaders.gl/gltf';\n\nimport {TypedArray} from '@math.gl/core';\nimport {TextureImageProperties} from '../types';\nimport {emod} from '@loaders.gl/math';\nimport {EXT_STRUCTURAL_METADATA, EXT_MESH_FEATURES, EXT_FEATURE_METADATA} from '@loaders.gl/gltf';\nimport {Tiles3DTileContent} from '@loaders.gl/3d-tiles';\n\n/**\n * Get featureTexture by metadataClass\n * @param tileContent - 3d tile content\n * @param metadataClass - user selected feature metadata class name\n * @returns featureTexture key\n */\nexport function getTextureByMetadataClass(\n tileContent: Tiles3DTileContent,\n metadataClass?: string\n): string | null {\n const extFeatureMetadata = tileContent.gltf?.extensions?.[\n EXT_FEATURE_METADATA\n ] as GLTF_EXT_feature_metadata_GLTF;\n if (!extFeatureMetadata?.featureTextures) {\n return null;\n }\n for (const textureKey in extFeatureMetadata.featureTextures) {\n const texture = extFeatureMetadata.featureTextures[textureKey];\n if (texture.class === metadataClass) {\n return textureKey;\n }\n }\n return null;\n}\n\n/**\n * Getting batchIds from 3DTilesNext extensions.\n * @param attributes - gltf accessors\n * @param primitive - gltf primitive data\n * @param images - gltf texture images\n * @param featureTexture - feature texture key\n * @return array of batch IDs\n */\nexport function handleBatchIdsExtensions(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n primitive: GLTFMeshPrimitivePostprocessed,\n images: (TextureImageProperties | null)[],\n featureTexture: string | null\n): NumericArray {\n const extensions = primitive?.extensions;\n if (!extensions) {\n return [];\n }\n\n for (const [extensionName, extensionData] of Object.entries(extensions || {})) {\n switch (extensionName) {\n case EXT_FEATURE_METADATA:\n return handleExtFeatureMetadataExtension(\n attributes,\n extensionData as GLTF_EXT_feature_metadata_Primitive,\n images,\n featureTexture\n );\n case EXT_MESH_FEATURES:\n return handleExtMeshFeaturesExtension(attributes, extensionData as GLTF_EXT_mesh_features);\n case EXT_STRUCTURAL_METADATA:\n return handleExtStructuralMetadataExtension(\n attributes,\n extensionData as GLTF_EXT_structural_metadata\n );\n\n default:\n return [];\n }\n }\n\n return [];\n}\n\nfunction handleExtStructuralMetadataExtension(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n extStructuralMetadata: GLTF_EXT_structural_metadata\n): NumericArray {\n // Take only first extension object to get batchIds attribute name.\n const dataAttributeNames = extStructuralMetadata?.dataAttributeNames;\n if (dataAttributeNames?.length) {\n // Let's use the first element of the array\n // TODO: What to do with others if any?\n const batchIdsAttribute = attributes[dataAttributeNames[0]];\n return batchIdsAttribute.value;\n }\n return [];\n}\n\n/**\n * Getting batchIds from EXT_mesh_features extensions.\n * @param attributes - gltf accessors\n * @param extMeshFeatures - EXT_mesh_features extension\n * @returns an array of attribute values\n */\nfunction handleExtMeshFeaturesExtension(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n extMeshFeatures: GLTF_EXT_mesh_features\n): NumericArray {\n const dataAttributeNames = extMeshFeatures?.dataAttributeNames;\n if (dataAttributeNames?.length) {\n // Let's use the first element of the array\n // TODO: What to do with others if any?\n const batchIdsAttribute = attributes[dataAttributeNames[0]];\n return batchIdsAttribute.value;\n }\n return [];\n}\n\n/**\n * Get batchIds from EXT_feature_metadata extension.\n * Docs - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata\n * @param attributes - glTF attributes\n * @param extFeatureMetadata - primitive-level EXT_FEATURE_METADATA extension data\n * @param textures - texture images\n * @param featureTexture - feature texture key\n */\nfunction handleExtFeatureMetadataExtension(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n extFeatureMetadata: GLTF_EXT_feature_metadata_Primitive,\n images: (TextureImageProperties | null)[],\n featureTexture: string | null\n): NumericArray {\n // Take only first extension object to get batchIds attribute name.\n const featureIdAttribute = extFeatureMetadata?.featureIdAttributes?.[0];\n\n if (featureIdAttribute?.featureIds?.attribute) {\n const batchIdsAttribute = attributes[featureIdAttribute.featureIds.attribute];\n return batchIdsAttribute.value;\n }\n\n if (\n featureIdAttribute?.featureIds?.hasOwnProperty('constant') &&\n featureIdAttribute?.featureIds?.hasOwnProperty('divisor')\n ) {\n const featuresCount = attributes?.POSITIONS?.value.length / 3 || 0;\n return generateImplicitFeatureIds(\n featuresCount,\n featureIdAttribute.featureIds.constant,\n featureIdAttribute.featureIds.divisor\n );\n }\n\n // Take only first extension object to get batchIds attribute name.\n const featureIdTexture =\n extFeatureMetadata?.featureIdTextures && extFeatureMetadata?.featureIdTextures[0];\n\n if (featureIdTexture) {\n const textureAttributeIndex = featureIdTexture?.featureIds?.texture?.texCoord || 0;\n const textCoordAttribute = `TEXCOORD_${textureAttributeIndex}`;\n const textureCoordinates = attributes[textCoordAttribute].value;\n return generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images);\n }\n\n if (featureTexture) {\n const batchIdsAttribute = attributes[featureTexture];\n return batchIdsAttribute.value;\n }\n\n return [];\n}\n\n/**\n * Generates implicit feature ids\n * Spec - https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_feature_metadata#implicit-feature-ids\n * @param featuresCount\n * @param constant\n * @param devisor\n */\nfunction generateImplicitFeatureIds(\n featuresCount: number,\n constant: number = 0,\n divisor: number = 0\n): number[] {\n let featureIds: number[] = [];\n\n if (divisor > 0) {\n let currentValue = constant;\n let devisorCounter = divisor;\n\n for (let index = 0; index < featuresCount; index++) {\n featureIds.push(currentValue);\n\n devisorCounter -= 1;\n\n if (devisorCounter === 0) {\n currentValue++;\n devisorCounter = divisor;\n }\n }\n } else {\n featureIds = Array<number>(featuresCount).fill(constant, 0, featuresCount);\n }\n\n return featureIds;\n}\n\n/**\n * Get batchIds from texture.\n * @param primitive\n * @param featureIdTextures\n */\nfunction generateBatchIdsFromTexture(\n featureIdTexture: GLTF_EXT_feature_metadata_FeatureIdTexture,\n textureCoordinates: TypedArray,\n images: (TextureImageProperties | null)[]\n) {\n if (!images?.length) {\n return [];\n }\n\n const CHANNELS_MAP = {\n r: 0,\n g: 1,\n b: 2,\n a: 3\n };\n\n const textureIndex = featureIdTexture?.featureIds?.texture?.index;\n const featureChannel = featureIdTexture?.featureIds?.channels;\n\n if (!featureChannel || textureIndex === undefined) {\n return [];\n }\n\n const image = images[textureIndex];\n const batchIds: number[] = [];\n const channels = CHANNELS_MAP[featureChannel];\n\n if (image && image?.width && image?.height && image?.components) {\n for (let index = 0; index < textureCoordinates.length; index += 2) {\n const u = textureCoordinates[index];\n const v = textureCoordinates[index + 1];\n\n const tx = Math.min((emod(u) * image.width) | 0, image.width - 1);\n const ty = Math.min((emod(v) * image.height) | 0, image.height - 1);\n\n const offset = (ty * image.width + tx) * image.components + channels;\n const batchId = new Uint8Array(image.data)[offset];\n\n batchIds.push(batchId);\n }\n } else {\n console.warn(`Can't get batch Ids from ${image?.mimeType || ''} compressed texture`);\n }\n\n return batchIds;\n}\n"],"mappings":"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"}
|
|
@@ -25,18 +25,20 @@ function flattenPropertyTableByFeatureIds(featureIds, propertyTable) {
|
|
|
25
25
|
}
|
|
26
26
|
function getPropertiesByFeatureIds(properties, featureIds) {
|
|
27
27
|
var resultProperties = [];
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
28
|
+
if (properties) {
|
|
29
|
+
var _iterator = _createForOfIteratorHelper(featureIds),
|
|
30
|
+
_step;
|
|
31
|
+
try {
|
|
32
|
+
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
33
|
+
var featureId = _step.value;
|
|
34
|
+
var property = properties[featureId] || null;
|
|
35
|
+
resultProperties.push(property);
|
|
36
|
+
}
|
|
37
|
+
} catch (err) {
|
|
38
|
+
_iterator.e(err);
|
|
39
|
+
} finally {
|
|
40
|
+
_iterator.f();
|
|
35
41
|
}
|
|
36
|
-
} catch (err) {
|
|
37
|
-
_iterator.e(err);
|
|
38
|
-
} finally {
|
|
39
|
-
_iterator.f();
|
|
40
42
|
}
|
|
41
43
|
return resultProperties;
|
|
42
44
|
}
|
|
@@ -44,7 +46,7 @@ function checkPropertiesLength(featureIds, propertyTable) {
|
|
|
44
46
|
var needFlatten = false;
|
|
45
47
|
for (var _i = 0, _Object$values = Object.values(propertyTable); _i < _Object$values.length; _i++) {
|
|
46
48
|
var attribute = _Object$values[_i];
|
|
47
|
-
if (featureIds.length !== attribute.length) {
|
|
49
|
+
if (!featureIds || !attribute || featureIds.length !== attribute.length) {
|
|
48
50
|
needFlatten = true;
|
|
49
51
|
}
|
|
50
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature-attributes.js","names":["flattenPropertyTableByFeatureIds","featureIds","propertyTable","resultPropertyTable","propertyName","properties","getPropertiesByFeatureIds","resultProperties","_iterator","_createForOfIteratorHelper","_step","s","n","done","featureId","value","property","push","err","e","f","checkPropertiesLength","needFlatten","_i","_Object$values","Object","values","length","attribute","STRING_TYPE","SHORT_INT_TYPE","DOUBLE_TYPE","OBJECT_ID_TYPE","getAttributeType","key","_typeof2","default","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: any[], featureIds: number[]): any[] {\n const resultProperties: any = [];\n\n for (const featureId of featureIds) {\n const property = properties[featureId] || null;\n resultProperties.push(property);\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.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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"}
|
|
1
|
+
{"version":3,"file":"feature-attributes.js","names":["flattenPropertyTableByFeatureIds","featureIds","propertyTable","resultPropertyTable","propertyName","properties","getPropertiesByFeatureIds","resultProperties","_iterator","_createForOfIteratorHelper","_step","s","n","done","featureId","value","property","push","err","e","f","checkPropertiesLength","needFlatten","_i","_Object$values","Object","values","length","attribute","STRING_TYPE","SHORT_INT_TYPE","DOUBLE_TYPE","OBJECT_ID_TYPE","getAttributeType","key","_typeof2","default","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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"}
|
|
@@ -25,7 +25,7 @@ var _batchIdsExtensions = require("./batch-ids-extensions");
|
|
|
25
25
|
var _featureAttributes = require("./feature-attributes");
|
|
26
26
|
var _math = require("@loaders.gl/math");
|
|
27
27
|
var _geometryUtils = require("../../lib/utils/geometry-utils");
|
|
28
|
-
var
|
|
28
|
+
var _gltf = require("@loaders.gl/gltf");
|
|
29
29
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
30
30
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
31
31
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
@@ -974,9 +974,11 @@ function convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attri
|
|
|
974
974
|
}, properties);
|
|
975
975
|
for (var propertyName in propertyTableWithObjectIds) {
|
|
976
976
|
var type = getAttributeType(propertyName, attributeStorageInfo);
|
|
977
|
-
|
|
978
|
-
|
|
979
|
-
|
|
977
|
+
if (type) {
|
|
978
|
+
var value = propertyTableWithObjectIds[propertyName];
|
|
979
|
+
var attributeBuffer = generateAttributeBuffer(type, value);
|
|
980
|
+
attributeBuffers.push(attributeBuffer);
|
|
981
|
+
}
|
|
980
982
|
}
|
|
981
983
|
return attributeBuffers;
|
|
982
984
|
}
|
|
@@ -1002,6 +1004,14 @@ function getAttributeType(key, attributeStorageInfo) {
|
|
|
1002
1004
|
var attribute = attributeStorageInfo.find(function (attr) {
|
|
1003
1005
|
return attr.name === key;
|
|
1004
1006
|
});
|
|
1007
|
+
if (!attribute) {
|
|
1008
|
+
console.error("attribute is null, key=".concat(key, ", attributeStorageInfo=").concat(JSON.stringify(attributeStorageInfo, null, 2)));
|
|
1009
|
+
return '';
|
|
1010
|
+
}
|
|
1011
|
+
if (!attribute.attributeValues) {
|
|
1012
|
+
console.error("attributeValues is null, attribute=".concat(attribute));
|
|
1013
|
+
return '';
|
|
1014
|
+
}
|
|
1005
1015
|
return attribute.attributeValues.valueType;
|
|
1006
1016
|
}
|
|
1007
1017
|
function generateShortIntegerAttributeBuffer(featureIds) {
|
|
@@ -1114,6 +1124,7 @@ function getPropertyTable(tileContent, metadataClass) {
|
|
|
1114
1124
|
if (!tileContent) {
|
|
1115
1125
|
return null;
|
|
1116
1126
|
}
|
|
1127
|
+
var propertyTable;
|
|
1117
1128
|
var batchTableJson = tileContent === null || tileContent === void 0 ? void 0 : tileContent.batchTableJson;
|
|
1118
1129
|
if (batchTableJson) {
|
|
1119
1130
|
return batchTableJson;
|
|
@@ -1122,14 +1133,20 @@ function getPropertyTable(tileContent, metadataClass) {
|
|
|
1122
1133
|
extensionName = _getPropertyTableExte.extensionName,
|
|
1123
1134
|
extension = _getPropertyTableExte.extension;
|
|
1124
1135
|
switch (extensionName) {
|
|
1125
|
-
case
|
|
1136
|
+
case _gltf.EXT_MESH_FEATURES:
|
|
1126
1137
|
{
|
|
1127
|
-
|
|
1128
|
-
return
|
|
1138
|
+
propertyTable = getPropertyTableFromExtMeshFeatures(extension, metadataClass);
|
|
1139
|
+
return propertyTable;
|
|
1129
1140
|
}
|
|
1130
|
-
case
|
|
1141
|
+
case _gltf.EXT_STRUCTURAL_METADATA:
|
|
1131
1142
|
{
|
|
1132
|
-
|
|
1143
|
+
propertyTable = getPropertyTableFromExtStructuralMetadata(extension, metadataClass);
|
|
1144
|
+
return propertyTable;
|
|
1145
|
+
}
|
|
1146
|
+
case _gltf.EXT_FEATURE_METADATA:
|
|
1147
|
+
{
|
|
1148
|
+
propertyTable = getPropertyTableFromExtFeatureMetadata(extension, metadataClass);
|
|
1149
|
+
return propertyTable;
|
|
1133
1150
|
}
|
|
1134
1151
|
default:
|
|
1135
1152
|
return null;
|
|
@@ -1137,7 +1154,7 @@ function getPropertyTable(tileContent, metadataClass) {
|
|
|
1137
1154
|
}
|
|
1138
1155
|
function getPropertyTableExtension(tileContent) {
|
|
1139
1156
|
var _tileContent$gltf, _tileContent$gltf2, _tileContent$gltf2$ex, _tileContent$gltf3;
|
|
1140
|
-
var extensionsWithPropertyTables = [
|
|
1157
|
+
var extensionsWithPropertyTables = [_gltf.EXT_FEATURE_METADATA, _gltf.EXT_STRUCTURAL_METADATA, _gltf.EXT_MESH_FEATURES];
|
|
1141
1158
|
var extensionsUsed = tileContent === null || tileContent === void 0 ? void 0 : (_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : _tileContent$gltf.extensionsUsed;
|
|
1142
1159
|
if (!extensionsUsed) {
|
|
1143
1160
|
return {
|
|
@@ -1206,4 +1223,38 @@ function getPropertyTableFromExtFeatureMetadata(extension, metadataClass) {
|
|
|
1206
1223
|
console.warn("The I3S converter couldn't handle EXT_feature_metadata extension: There is neither featureTables, no featureTextures in the extension.");
|
|
1207
1224
|
return null;
|
|
1208
1225
|
}
|
|
1226
|
+
function getPropertyTableFromExtStructuralMetadata(extension, metadataClass) {
|
|
1227
|
+
if (extension !== null && extension !== void 0 && extension.propertyTables) {
|
|
1228
|
+
var firstPropertyTable = extension === null || extension === void 0 ? void 0 : extension.propertyTables[0];
|
|
1229
|
+
var propertyTableWithData = {};
|
|
1230
|
+
for (var propertyName in firstPropertyTable.properties) {
|
|
1231
|
+
propertyTableWithData[propertyName] = firstPropertyTable.properties[propertyName].data;
|
|
1232
|
+
}
|
|
1233
|
+
return propertyTableWithData;
|
|
1234
|
+
}
|
|
1235
|
+
if (extension !== null && extension !== void 0 && extension.propertyTextures) {
|
|
1236
|
+
if (extension !== null && extension !== void 0 && extension.propertyTextures) {
|
|
1237
|
+
var firstPropertyTexture = extension === null || extension === void 0 ? void 0 : extension.propertyTextures[0];
|
|
1238
|
+
var _propertyTableWithData = {};
|
|
1239
|
+
for (var _propertyName2 in firstPropertyTexture.properties) {
|
|
1240
|
+
_propertyTableWithData[_propertyName2] = firstPropertyTexture.properties[_propertyName2].data;
|
|
1241
|
+
}
|
|
1242
|
+
return _propertyTableWithData;
|
|
1243
|
+
}
|
|
1244
|
+
}
|
|
1245
|
+
console.warn("The I3S converter couldn't handle EXT_structural_metadata extension: There is neither propertyTables, no propertyTextures in the extension.");
|
|
1246
|
+
return null;
|
|
1247
|
+
}
|
|
1248
|
+
function getPropertyTableFromExtMeshFeatures(extension, metadataClass) {
|
|
1249
|
+
if (extension !== null && extension !== void 0 && extension.featureIds) {
|
|
1250
|
+
var firstFeatureId = extension === null || extension === void 0 ? void 0 : extension.featureIds[0];
|
|
1251
|
+
var propertyTableWithData = {};
|
|
1252
|
+
if (!firstFeatureId.propertyTable) {
|
|
1253
|
+
console.warn('Should be implemented as we have the tileset with Ext_mesh_features not linked with EXT_structural_metadata extension');
|
|
1254
|
+
}
|
|
1255
|
+
return propertyTableWithData;
|
|
1256
|
+
}
|
|
1257
|
+
console.warn("The I3S converter couldn't handle EXT_mesh_features extension: There is no featureIds in the extension.");
|
|
1258
|
+
return null;
|
|
1259
|
+
}
|
|
1209
1260
|
//# sourceMappingURL=geometry-converter.js.map
|