@loaders.gl/tile-converter 4.0.0-alpha.22 → 4.0.0-alpha.24
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/3d-tiles-converter/helpers/load-i3s.d.ts.map +1 -1
- package/dist/constants.d.ts +0 -2
- package/dist/constants.d.ts.map +1 -1
- package/dist/converter.min.js +106 -106
- package/dist/dist.min.js +1883 -1241
- package/dist/es5/3d-tiles-converter/helpers/load-i3s.js.map +1 -1
- 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 +7 -17
- package/dist/es5/i3s-converter/helpers/feature-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js +83 -44
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-converter.js +70 -17
- package/dist/es5/i3s-converter/helpers/geometry-converter.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 +36 -26
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/i3s-converter/types.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 +11 -3
- package/dist/es5/pgm-loader.js.map +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/3d-tiles-converter/helpers/load-i3s.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 +9 -7
- package/dist/esm/i3s-converter/helpers/feature-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-attributes.js +76 -34
- package/dist/esm/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-converter.js +66 -13
- package/dist/esm/i3s-converter/helpers/geometry-converter.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 +20 -17
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/i3s-converter/types.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 +7 -4
- package/dist/esm/pgm-loader.js.map +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/feature-attributes.d.ts +6 -6
- package/dist/i3s-converter/helpers/feature-attributes.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-attributes.d.ts.map +1 -1
- 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/node-index-document.d.ts.map +1 -1
- 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/types.d.ts +7 -4
- package/dist/i3s-converter/types.d.ts.map +1 -1
- package/dist/pgm-loader.d.ts +9 -2
- package/dist/pgm-loader.d.ts.map +1 -1
- package/dist/slpk-extractor/slpk-extractor.d.ts.map +1 -1
- package/dist/slpk-extractor.min.js +38 -38
- package/package.json +14 -14
- package/src/3d-tiles-converter/helpers/load-i3s.ts +1 -0
- 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 +20 -15
- package/src/i3s-converter/helpers/geometry-attributes.ts +80 -50
- package/src/i3s-converter/helpers/geometry-converter.ts +153 -21
- 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 +42 -17
- package/src/i3s-converter/types.ts +8 -4
- package/src/i3s-server/controllers/slpk-controller.ts +1 -1
- package/src/pgm-loader.ts +15 -7
- package/src/slpk-extractor/slpk-extractor.ts +2 -1
- package/dist/3d-tiles-converter/3d-tiles-converter.js +0 -279
- package/dist/3d-tiles-converter/helpers/b3dm-converter.js +0 -271
- package/dist/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js +0 -23
- package/dist/3d-tiles-converter/helpers/load-i3s.js +0 -42
- package/dist/3d-tiles-converter/helpers/texture-atlas.js +0 -54
- package/dist/3d-tiles-converter/json-templates/tileset.js +0 -43
- package/dist/bundle.js +0 -5
- package/dist/constants.js +0 -6
- package/dist/converter-cli.js +0 -222
- package/dist/deps-installer/deps-installer.js +0 -89
- package/dist/i3s-converter/helpers/batch-ids-extensions.js +0 -158
- package/dist/i3s-converter/helpers/coordinate-converter.js +0 -122
- package/dist/i3s-converter/helpers/create-scene-server-path.js +0 -28
- package/dist/i3s-converter/helpers/feature-attributes.js +0 -216
- package/dist/i3s-converter/helpers/geometry-attributes.js +0 -203
- package/dist/i3s-converter/helpers/geometry-converter.js +0 -1240
- package/dist/i3s-converter/helpers/gltf-attributes.js +0 -129
- package/dist/i3s-converter/helpers/load-3d-tiles.js +0 -99
- package/dist/i3s-converter/helpers/node-debug.js +0 -120
- package/dist/i3s-converter/helpers/node-index-document.js +0 -268
- package/dist/i3s-converter/helpers/node-pages.js +0 -316
- package/dist/i3s-converter/helpers/preprocess-3d-tiles.js +0 -100
- package/dist/i3s-converter/helpers/tileset-traversal.js +0 -29
- package/dist/i3s-converter/i3s-converter.js +0 -945
- package/dist/i3s-converter/json-templates/geometry-definitions.js +0 -87
- package/dist/i3s-converter/json-templates/layers.js +0 -139
- package/dist/i3s-converter/json-templates/metadata.js +0 -25
- package/dist/i3s-converter/json-templates/node.js +0 -89
- package/dist/i3s-converter/json-templates/scene-server.js +0 -31
- package/dist/i3s-converter/json-templates/shared-resources.js +0 -129
- package/dist/i3s-converter/json-templates/store.js +0 -103
- package/dist/i3s-converter/types.js +0 -17
- package/dist/i3s-server/app.js +0 -29
- package/dist/i3s-server/bin/www.js +0 -37
- package/dist/i3s-server/controllers/index-controller.js +0 -31
- package/dist/i3s-server/controllers/slpk-controller.js +0 -33
- package/dist/i3s-server/routes/index.js +0 -20
- package/dist/i3s-server/routes/slpk-router.js +0 -34
- package/dist/i3s-server/utils/create-scene-server.js +0 -22
- package/dist/i3s-server/utils/server-utils.js +0 -66
- package/dist/index.js +0 -10
- package/dist/lib/utils/cli-utils.js +0 -82
- package/dist/lib/utils/compress-util.js +0 -257
- package/dist/lib/utils/file-utils.js +0 -139
- package/dist/lib/utils/geometry-utils.js +0 -18
- package/dist/lib/utils/lod-conversion-utils.js +0 -76
- package/dist/lib/utils/queue.js +0 -18
- package/dist/lib/utils/statistic-utills.js +0 -64
- package/dist/lib/utils/write-queue.js +0 -80
- package/dist/pgm-loader.js +0 -24
- package/dist/slpk-extractor/slpk-extractor.js +0 -74
- package/dist/slpk-extractor-cli.js +0 -102
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-i3s.js","names":["_core","require","_i3s","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","loadI3SContent","_ref","_asyncToGenerator2","_regenerator","mark","_callee","sourceTileset","sourceTile","tilesetLoadOptions","loadOptions","tileContent","wrap","_callee$","_context","prev","next","contentUrl","abrupt","i3s","isTileset","isTileHeader","_tileOptions","attributeUrls","textureUrl","textureFormat","textureLoaderOptions","materialDefinition","isDracoGeometry","mbs","_tilesetOptions","store","attributeStorageInfo","fields","load","I3SLoader","sent","stop","_x","_x2","_x3","exports"],"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":"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
|
|
1
|
+
{"version":3,"file":"load-i3s.js","names":["_core","require","_i3s","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","loadI3SContent","_ref","_asyncToGenerator2","_regenerator","mark","_callee","sourceTileset","sourceTile","tilesetLoadOptions","loadOptions","tileContent","wrap","_callee$","_context","prev","next","contentUrl","abrupt","i3s","isTileset","isTileHeader","_tileOptions","attributeUrls","textureUrl","textureFormat","textureLoaderOptions","materialDefinition","isDracoGeometry","mbs","_tilesetOptions","store","attributeStorageInfo","fields","load","I3SLoader","sent","stop","_x","_x2","_x3","exports"],"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":"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"}
|
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.24" !== 'undefined' ? "4.0.0-alpha.24" : '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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"}
|
|
@@ -12,31 +12,21 @@ exports.flattenPropertyTableByFeatureIds = flattenPropertyTableByFeatureIds;
|
|
|
12
12
|
exports.getAttributeType = getAttributeType;
|
|
13
13
|
exports.getFieldAttributeType = getFieldAttributeType;
|
|
14
14
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
15
|
-
function
|
|
16
|
-
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
17
|
-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
18
|
-
function flattenPropertyTableByFeatureIds(featureIds, propertyTable) {
|
|
15
|
+
function flattenPropertyTableByFeatureIds(featureIdsMap, propertyTable) {
|
|
19
16
|
var resultPropertyTable = {};
|
|
20
17
|
for (var propertyName in propertyTable) {
|
|
21
18
|
var properties = propertyTable[propertyName];
|
|
22
|
-
resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties,
|
|
19
|
+
resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties, featureIdsMap);
|
|
23
20
|
}
|
|
24
21
|
return resultPropertyTable;
|
|
25
22
|
}
|
|
26
|
-
function getPropertiesByFeatureIds(properties,
|
|
23
|
+
function getPropertiesByFeatureIds(properties, featureIdsMap) {
|
|
27
24
|
var resultProperties = [];
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
32
|
-
var featureId = _step.value;
|
|
33
|
-
var property = properties[featureId] || null;
|
|
25
|
+
if (properties) {
|
|
26
|
+
for (var featureIdKey in featureIdsMap) {
|
|
27
|
+
var property = properties[featureIdKey] || null;
|
|
34
28
|
resultProperties.push(property);
|
|
35
29
|
}
|
|
36
|
-
} catch (err) {
|
|
37
|
-
_iterator.e(err);
|
|
38
|
-
} finally {
|
|
39
|
-
_iterator.f();
|
|
40
30
|
}
|
|
41
31
|
return resultProperties;
|
|
42
32
|
}
|
|
@@ -44,7 +34,7 @@ function checkPropertiesLength(featureIds, propertyTable) {
|
|
|
44
34
|
var needFlatten = false;
|
|
45
35
|
for (var _i = 0, _Object$values = Object.values(propertyTable); _i < _Object$values.length; _i++) {
|
|
46
36
|
var attribute = _Object$values[_i];
|
|
47
|
-
if (featureIds.length !== attribute.length) {
|
|
37
|
+
if (!featureIds || !attribute || featureIds.length !== attribute.length) {
|
|
48
38
|
needFlatten = true;
|
|
49
39
|
}
|
|
50
40
|
}
|
|
@@ -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":";;;;;;;;;;;;;;;;;AAuBO,SAASA,gCAAgCA,CAC9CC,UAAoB,EACpBC,aAA+B,EACb;EAClB,IAAMC,mBAAqC,GAAG,CAAC,CAAC;EAChD,KAAK,IAAMC,YAAY,IAAIF,aAAa,EAAE;IACxC,IAAMG,UAAU,GAAGH,aAAa,CAACE,YAAY,CAAC;IAC9CD,mBAAmB,CAACC,YAAY,CAAC,GAAGE,yBAAyB,CAACD,UAAU,EAAEJ,UAAU,CAAC;EACvF;EAEA,OAAOE,mBAAmB;AAC5B;AAOA,SAASG,yBAAyBA,CAACD,UAAiB,EAAEJ,UAAoB,EAAS;EACjF,IAAMM,gBAAqB,GAAG,EAAE;EAAC,IAAAC,SAAA,GAAAC,0BAAA,CAETR,UAAU;IAAAS,KAAA;EAAA;IAAlC,KAAAF,SAAA,CAAAG,CAAA,MAAAD,KAAA,GAAAF,SAAA,CAAAI,CAAA,IAAAC,IAAA,GAAoC;MAAA,IAAzBC,SAAS,GAAAJ,KAAA,CAAAK,KAAA;MAClB,IAAMC,QAAQ,GAAGX,UAAU,CAACS,SAAS,CAAC,IAAI,IAAI;MAC9CP,gBAAgB,CAACU,IAAI,CAACD,QAAQ,CAAC;IACjC;EAAC,SAAAE,GAAA;IAAAV,SAAA,CAAAW,CAAA,CAAAD,GAAA;EAAA;IAAAV,SAAA,CAAAY,CAAA;EAAA;EAED,OAAOb,gBAAgB;AACzB;AASO,SAASc,qBAAqBA,CACnCpB,UAAoB,EACpBC,aAA+B,EACtB;EACT,IAAIoB,WAAW,GAAG,KAAK;EAEvB,SAAAC,EAAA,MAAAC,cAAA,GAAwBC,MAAM,CAACC,MAAM,CAACxB,aAAa,CAAC,EAAAqB,EAAA,GAAAC,cAAA,CAAAG,MAAA,EAAAJ,EAAA,IAAE;IAAjD,IAAMK,SAAS,GAAAJ,cAAA,CAAAD,EAAA;IAClB,IAAItB,UAAU,CAAC0B,MAAM,KAAKC,SAAS,CAACD,MAAM,EAAE;MAC1CL,WAAW,GAAG,IAAI;IACpB;EACF;EAEA,OAAOA,WAAW;AACpB;AAGA,IAAMO,WAAW,GAAG,QAAQ;AAE5B,IAAMC,cAAc,GAAG,OAAO;AAE9B,IAAMC,WAAW,GAAG,QAAQ;AAE5B,IAAMC,cAAc,GAAG,UAAU;AAM1B,SAASC,gBAAgBA,CAACC,GAAW,EAAEN,SAAiB,EAAU;EACvE,IAAIM,GAAG,KAAKF,cAAc,EAAE;IAC1B,OAAOA,cAAc;EACvB;EACA,IAAI,IAAAG,QAAA,CAAAC,OAAA,EAAOR,SAAS,MAAKC,WAAW,EAAE;IACpC,OAAOA,WAAW;EACpB,CAAC,MAAM,IAAI,OAAOD,SAAS,KAAK,QAAQ,EAAE;IACxC,OAAOS,MAAM,CAACC,SAAS,CAACV,SAAS,CAAC,GAAGE,cAAc,GAAGC,WAAW;EACnE;EACA,OAAOF,WAAW;AACpB;AASO,SAASU,uBAAuBA,CACrCC,cAAsB,EACtBN,GAAW,EACXO,aAAwB,EACF;EACtB,IAAMC,gBAAgB,GAAG;IACvBR,GAAG,OAAAS,MAAA,CAAOH,cAAc,CAAE;IAC1BI,IAAI,EAAEV,GAAG;IACTW,QAAQ,EAAE,CAAC,iBAAiB,CAAC;IAC7BC,MAAM,EAAE,CAAC;MAAC9B,QAAQ,EAAE,OAAO;MAAE+B,SAAS,EAAE;IAAQ,CAAC,CAAC;IAClDC,eAAe,EAAE;MAACD,SAAS,EAAE,OAAO;MAAEE,gBAAgB,EAAE;IAAC;EAC3D,CAAC;EAED,QAAQR,aAAa;IACnB,KAAKT,cAAc;MACjBkB,gBAAgB,CAACR,gBAAgB,CAAC;MAClC;IACF,KAAKb,WAAW;MACdsB,oBAAoB,CAACT,gBAAgB,CAAC;MACtC;IACF,KAAKX,WAAW;MACdqB,oBAAoB,CAACV,gBAAgB,CAAC;MACtC;IACF,KAAKZ,cAAc;MACjB;IACF;MACEqB,oBAAoB,CAACT,gBAAgB,CAAC;EAC1C;EAEA,OAAOA,gBAAgB;AACzB;AAMO,SAASW,qBAAqBA,CAACZ,aAAwB,EAAa;EACzE,QAAQA,aAAa;IACnB,KAAKT,cAAc;MACjB,OAAO,kBAAkB;IAC3B,KAAKH,WAAW;MACd,OAAO,qBAAqB;IAC9B,KAAKC,cAAc;MACjB,OAAO,sBAAsB;IAC/B,KAAKC,WAAW;MACd,OAAO,qBAAqB;IAC9B;MACE,OAAO,qBAAqB;EAChC;AACF;AAOO,SAASuB,oBAAoBA,CAACpB,GAAW,EAAEqB,kBAA6B,EAAS;EACtF,OAAO;IACLX,IAAI,EAAEV,GAAG;IACTsB,IAAI,EAAED,kBAAkB;IACxBE,KAAK,EAAEvB;EACT,CAAC;AACH;AAOO,SAASwB,eAAeA,CAACxD,aAA+B,EAAa;EAC1E,IAAMyD,KAAK,GAAG,YAAY;EAC1B,IAAMC,UAAU,GAAG,EAAE;EACrB,IAAMC,UAAuB,GAAG,EAAE;EAClC,IAAMC,aAGH,GAAG,EAAE;EACR,IAAMC,eAAe,GAAG,EAAE;EAE1B,KAAK,IAAM7B,GAAG,IAAIhC,aAAa,EAAE;IAC/B2D,UAAU,CAAC5C,IAAI,CAAC;MACd+C,SAAS,EAAE9B,GAAG;MACd+B,OAAO,EAAE,IAAI;MACbC,UAAU,EAAE,KAAK;MACjBC,KAAK,EAAEjC;IACT,CAAC,CAAC;EACJ;EACA4B,aAAa,CAAC7C,IAAI,CAAC;IACjB4C,UAAU,EAAVA,UAAU;IACVL,IAAI,EAAE;EACR,CAAC,CAAC;EAEF,OAAO;IACLG,KAAK,EAALA,KAAK;IACLC,UAAU,EAAVA,UAAU;IACVE,aAAa,EAAbA,aAAa;IACbD,UAAU,EAAVA,UAAU;IACVE,eAAe,EAAfA;EACF,CAAC;AACH;AAMA,SAASZ,oBAAoBA,CAACT,gBAAsC,EAAQ;EAE1EA,gBAAgB,CAACG,QAAQ,CAACuB,OAAO,CAAC,qBAAqB,CAAC;EACxD1B,gBAAgB,CAACI,MAAM,CAAC7B,IAAI,CAAC;IAACD,QAAQ,EAAE,0BAA0B;IAAE+B,SAAS,EAAE;EAAQ,CAAC,CAAC;EACzFL,gBAAgB,CAACM,eAAe,GAAG;IACjCD,SAAS,EAAE,QAAQ;IACnBsB,QAAQ,EAAE,OAAO;IACjBpB,gBAAgB,EAAE;EACpB,CAAC;EACDP,gBAAgB,CAAC4B,mBAAmB,GAAG;IACrCvB,SAAS,EAAE,QAAQ;IACnBE,gBAAgB,EAAE;EACpB,CAAC;AACH;AAMA,SAASC,gBAAgBA,CAACR,gBAAsC,EAAQ;EACtEA,gBAAgB,CAACM,eAAe,GAAG;IACjCD,SAAS,EAAE,OAAO;IAClBE,gBAAgB,EAAE;EACpB,CAAC;AACH;AAMA,SAASG,oBAAoBA,CAACV,gBAAsC,EAAQ;EAC1EA,gBAAgB,CAACM,eAAe,GAAG;IACjCD,SAAS,EAAE,SAAS;IACpBE,gBAAgB,EAAE;EACpB,CAAC;AACH"}
|
|
1
|
+
{"version":3,"file":"feature-attributes.js","names":["flattenPropertyTableByFeatureIds","featureIdsMap","propertyTable","resultPropertyTable","propertyName","properties","getPropertiesByFeatureIds","resultProperties","featureIdKey","property","push","checkPropertiesLength","featureIds","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 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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"}
|
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.generateAttributes = generateAttributes;
|
|
8
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
8
9
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
10
|
var _loaderUtils = require("@loaders.gl/loader-utils");
|
|
10
11
|
function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
|
|
@@ -107,6 +108,11 @@ function makeAttributeObjects(attributes) {
|
|
|
107
108
|
var colorsList = new Uint8Array(colors);
|
|
108
109
|
var texCoordsList = new Float32Array(texCoords);
|
|
109
110
|
var uvRegionsList = new Uint16Array(uvRegions);
|
|
111
|
+
var positionsOffset = 0;
|
|
112
|
+
var normalsOffset = 0;
|
|
113
|
+
var colorsOffset = 0;
|
|
114
|
+
var uvRegionsOffset = 0;
|
|
115
|
+
var texCoordsOffset = 0;
|
|
110
116
|
for (var index = 0; index < featureIds.length; index++) {
|
|
111
117
|
var startIndex = faceRange[index * 2];
|
|
112
118
|
var endIndex = faceRange[index * 2 + 1];
|
|
@@ -117,21 +123,19 @@ function makeAttributeObjects(attributes) {
|
|
|
117
123
|
var texCoordsCount = getSliceAttributeCount('texCoords', startIndex, endIndex);
|
|
118
124
|
groupedData.push({
|
|
119
125
|
featureId: featureIds[index],
|
|
120
|
-
positions: positionsList.
|
|
121
|
-
normals: normalsList.
|
|
122
|
-
colors: colorsList.
|
|
123
|
-
uvRegions: uvRegionsList.
|
|
124
|
-
texCoords: texCoordsList.
|
|
126
|
+
positions: positionsList.subarray(positionsOffset, positionsOffset + positionsCount),
|
|
127
|
+
normals: normalsList.subarray(normalsOffset, normalsOffset + normalsCount),
|
|
128
|
+
colors: colorsList.subarray(colorsOffset, colorsOffset + colorsCount),
|
|
129
|
+
uvRegions: uvRegionsList.subarray(uvRegionsOffset, uvRegionsOffset + uvRegionsCount),
|
|
130
|
+
texCoords: texCoordsList.subarray(texCoordsOffset, texCoordsOffset + texCoordsCount)
|
|
125
131
|
});
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
132
|
+
positionsOffset += positionsCount;
|
|
133
|
+
normalsOffset += normalsCount;
|
|
134
|
+
colorsOffset += colorsCount;
|
|
135
|
+
uvRegionsOffset += uvRegionsCount;
|
|
136
|
+
texCoordsOffset += texCoordsCount;
|
|
131
137
|
}
|
|
132
|
-
return groupedData
|
|
133
|
-
return first.featureId - second.featureId;
|
|
134
|
-
});
|
|
138
|
+
return groupedData;
|
|
135
139
|
}
|
|
136
140
|
function getSliceAttributeCount(attributeName, startIndex, endIndex) {
|
|
137
141
|
var itemsPerVertex4 = 4;
|
|
@@ -152,63 +156,98 @@ function getSliceAttributeCount(attributeName, startIndex, endIndex) {
|
|
|
152
156
|
}
|
|
153
157
|
}
|
|
154
158
|
function unifyObjectsByFeatureId(sortedData) {
|
|
155
|
-
var
|
|
156
|
-
var
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
159
|
+
var groupedMetadata = [];
|
|
160
|
+
var _iterator2 = _createForOfIteratorHelper(sortedData),
|
|
161
|
+
_step2;
|
|
162
|
+
try {
|
|
163
|
+
var _loop = function _loop() {
|
|
164
|
+
var data = _step2.value;
|
|
165
|
+
var existingObject = groupedMetadata.find(function (obj) {
|
|
166
|
+
return obj.featureId === data.featureId;
|
|
167
|
+
});
|
|
168
|
+
if (existingObject) {
|
|
169
|
+
existingObject.attributes.push(data);
|
|
170
|
+
} else {
|
|
171
|
+
groupedMetadata.push({
|
|
172
|
+
featureId: data.featureId,
|
|
173
|
+
attributes: [data]
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
};
|
|
177
|
+
for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
|
|
178
|
+
_loop();
|
|
169
179
|
}
|
|
170
|
-
}
|
|
171
|
-
|
|
172
|
-
|
|
180
|
+
} catch (err) {
|
|
181
|
+
_iterator2.e(err);
|
|
182
|
+
} finally {
|
|
183
|
+
_iterator2.f();
|
|
184
|
+
}
|
|
185
|
+
var uniqueObjects = [];
|
|
186
|
+
for (var _i = 0, _groupedMetadata = groupedMetadata; _i < _groupedMetadata.length; _i++) {
|
|
187
|
+
var metatada = _groupedMetadata[_i];
|
|
188
|
+
var attributes = concatenateAttributes(metatada.attributes);
|
|
189
|
+
uniqueObjects.push(_objectSpread({
|
|
190
|
+
featureId: metatada.featureId
|
|
191
|
+
}, attributes));
|
|
173
192
|
}
|
|
174
193
|
return uniqueObjects;
|
|
175
194
|
}
|
|
176
195
|
function groupAttributesAndRangesByFeatureId(unifiedObjects, featureCount) {
|
|
177
196
|
var firstAttributeObject = unifiedObjects[0];
|
|
178
197
|
var featureIds = [firstAttributeObject.featureId || 0];
|
|
179
|
-
var positions = new Float32Array(firstAttributeObject.positions);
|
|
180
|
-
var normals = new Float32Array(firstAttributeObject.normals);
|
|
181
|
-
var colors = new Uint8Array(firstAttributeObject.colors);
|
|
182
|
-
var uvRegions = new Uint16Array(firstAttributeObject.uvRegions);
|
|
183
|
-
var texCoords = new Float32Array(firstAttributeObject.texCoords);
|
|
184
198
|
var range = [0];
|
|
185
199
|
var objIndex = 0;
|
|
186
200
|
var sum = 0;
|
|
187
201
|
for (var index = 1; index < unifiedObjects.length; index++) {
|
|
188
202
|
var currentAttributesObject = unifiedObjects[index];
|
|
189
203
|
featureIds.push(currentAttributesObject.featureId || 0);
|
|
190
|
-
positions = (0, _loaderUtils.concatenateTypedArrays)(positions, currentAttributesObject.positions);
|
|
191
|
-
normals = (0, _loaderUtils.concatenateTypedArrays)(normals, currentAttributesObject.normals);
|
|
192
|
-
colors = (0, _loaderUtils.concatenateTypedArrays)(colors, currentAttributesObject.colors);
|
|
193
|
-
uvRegions = (0, _loaderUtils.concatenateTypedArrays)(uvRegions, currentAttributesObject.uvRegions);
|
|
194
|
-
texCoords = (0, _loaderUtils.concatenateTypedArrays)(texCoords, currentAttributesObject.texCoords);
|
|
195
204
|
var groupedObject = unifiedObjects[objIndex];
|
|
196
205
|
range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1 + sum);
|
|
197
206
|
range.push(groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE + sum);
|
|
198
207
|
sum += groupedObject.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE;
|
|
199
208
|
objIndex += 1;
|
|
200
209
|
}
|
|
201
|
-
|
|
210
|
+
var attributes = concatenateAttributes(unifiedObjects);
|
|
211
|
+
range.push(attributes.positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1);
|
|
202
212
|
var faceRange = new Uint32Array(range);
|
|
203
|
-
return {
|
|
213
|
+
return _objectSpread({
|
|
204
214
|
faceRange: faceRange,
|
|
205
215
|
featureIds: featureIds,
|
|
216
|
+
featureCount: featureCount
|
|
217
|
+
}, attributes);
|
|
218
|
+
}
|
|
219
|
+
function concatenateAttributes(attributes) {
|
|
220
|
+
var positionGroups = attributes.map(function (_ref) {
|
|
221
|
+
var positions = _ref.positions;
|
|
222
|
+
return positions;
|
|
223
|
+
});
|
|
224
|
+
var positions = positionGroups.length > 1 ? _loaderUtils.concatenateTypedArrays.apply(void 0, (0, _toConsumableArray2.default)(positionGroups)) : positionGroups[0];
|
|
225
|
+
var normalGroups = attributes.map(function (_ref2) {
|
|
226
|
+
var normals = _ref2.normals;
|
|
227
|
+
return normals;
|
|
228
|
+
});
|
|
229
|
+
var normals = normalGroups.length > 1 ? _loaderUtils.concatenateTypedArrays.apply(void 0, (0, _toConsumableArray2.default)(normalGroups)) : normalGroups[0];
|
|
230
|
+
var colorGroups = attributes.map(function (_ref3) {
|
|
231
|
+
var colors = _ref3.colors;
|
|
232
|
+
return colors;
|
|
233
|
+
});
|
|
234
|
+
var colors = colorGroups.length > 1 ? _loaderUtils.concatenateTypedArrays.apply(void 0, (0, _toConsumableArray2.default)(colorGroups)) : colorGroups[0];
|
|
235
|
+
var texCoordGroups = attributes.map(function (_ref4) {
|
|
236
|
+
var texCoords = _ref4.texCoords;
|
|
237
|
+
return texCoords;
|
|
238
|
+
});
|
|
239
|
+
var texCoords = texCoordGroups.length > 1 ? _loaderUtils.concatenateTypedArrays.apply(void 0, (0, _toConsumableArray2.default)(texCoordGroups)) : texCoordGroups[0];
|
|
240
|
+
var uvRegionGroups = attributes.map(function (_ref5) {
|
|
241
|
+
var uvRegions = _ref5.uvRegions;
|
|
242
|
+
return uvRegions;
|
|
243
|
+
});
|
|
244
|
+
var uvRegions = uvRegionGroups.length > 1 ? _loaderUtils.concatenateTypedArrays.apply(void 0, (0, _toConsumableArray2.default)(uvRegionGroups)) : uvRegionGroups[0];
|
|
245
|
+
return {
|
|
206
246
|
positions: positions,
|
|
207
247
|
normals: normals,
|
|
208
248
|
colors: colors,
|
|
209
|
-
uvRegions: uvRegions,
|
|
210
249
|
texCoords: texCoords,
|
|
211
|
-
|
|
250
|
+
uvRegions: uvRegions
|
|
212
251
|
};
|
|
213
252
|
}
|
|
214
253
|
//# sourceMappingURL=geometry-attributes.js.map
|