@loaders.gl/tile-converter 3.3.0-alpha.5 → 3.3.0-alpha.7
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-attributes-worker.js +2 -3
- package/dist/3d-tiles-attributes-worker.js.map +3 -3
- package/dist/converter-cli.js +15 -2
- package/dist/converter.min.js +23 -20
- package/dist/dist.min.js +38236 -46911
- package/dist/es5/3d-tiles-attributes-worker.js +3 -6
- package/dist/es5/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/es5/3d-tiles-converter/3d-tiles-converter.js +12 -111
- package/dist/es5/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.js +32 -72
- package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
- package/dist/es5/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js +0 -8
- package/dist/es5/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js.map +1 -1
- package/dist/es5/3d-tiles-converter/helpers/texture-atlas.js +0 -5
- package/dist/es5/3d-tiles-converter/helpers/texture-atlas.js.map +1 -1
- package/dist/es5/3d-tiles-converter/json-templates/tileset.js +0 -6
- package/dist/es5/3d-tiles-converter/json-templates/tileset.js.map +1 -1
- package/dist/es5/bundle.js +0 -1
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/constants.js.map +1 -1
- package/dist/es5/converter-cli.js +11 -56
- package/dist/es5/converter-cli.js.map +1 -1
- package/dist/es5/deps-installer/deps-installer.js +5 -35
- package/dist/es5/deps-installer/deps-installer.js.map +1 -1
- package/dist/es5/i3s-attributes-worker.js +3 -6
- package/dist/es5/i3s-attributes-worker.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js +2 -28
- package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/coordinate-converter.js +8 -25
- package/dist/es5/i3s-converter/helpers/coordinate-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/create-scene-server-path.js +0 -11
- package/dist/es5/i3s-converter/helpers/create-scene-server-path.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/feature-attributes.js +5 -34
- package/dist/es5/i3s-converter/helpers/feature-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js +13 -45
- package/dist/es5/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/geometry-converter.js +26 -221
- package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/gltf-attributes.js +2 -16
- package/dist/es5/i3s-converter/helpers/gltf-attributes.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/node-debug.js +4 -23
- package/dist/es5/i3s-converter/helpers/node-debug.js.map +1 -1
- package/dist/es5/i3s-converter/helpers/node-pages.js +50 -86
- package/dist/es5/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/es5/i3s-converter/i3s-converter.js +69 -384
- package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/layers.js +1 -15
- package/dist/es5/i3s-converter/json-templates/layers.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/metadata.js +0 -2
- package/dist/es5/i3s-converter/json-templates/metadata.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/node.js +2 -12
- package/dist/es5/i3s-converter/json-templates/node.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/scene-server.js +0 -2
- package/dist/es5/i3s-converter/json-templates/scene-server.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/shared-resources.js +6 -29
- package/dist/es5/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/es5/i3s-converter/json-templates/store.js.map +1 -1
- package/dist/es5/i3s-converter/types.js.map +1 -1
- package/dist/es5/i3s-server/app.js +0 -5
- package/dist/es5/i3s-server/app.js.map +1 -1
- package/dist/es5/i3s-server/controllers/index-controller.js +0 -16
- package/dist/es5/i3s-server/controllers/index-controller.js.map +1 -1
- package/dist/es5/i3s-server/routes/index.js +1 -10
- package/dist/es5/i3s-server/routes/index.js.map +1 -1
- package/dist/es5/index.js +0 -3
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/utils/compress-util.js +19 -74
- package/dist/es5/lib/utils/compress-util.js.map +1 -1
- package/dist/es5/lib/utils/file-utils.js +10 -38
- package/dist/es5/lib/utils/file-utils.js.map +1 -1
- package/dist/es5/lib/utils/lod-conversion-utils.js +0 -7
- package/dist/es5/lib/utils/lod-conversion-utils.js.map +1 -1
- package/dist/es5/lib/utils/queue.js +0 -14
- package/dist/es5/lib/utils/queue.js.map +1 -1
- package/dist/es5/lib/utils/statistic-utills.js +1 -46
- package/dist/es5/lib/utils/statistic-utills.js.map +1 -1
- package/dist/es5/lib/utils/write-queue.js +0 -52
- package/dist/es5/lib/utils/write-queue.js.map +1 -1
- package/dist/es5/pgm-loader.js +1 -8
- package/dist/es5/pgm-loader.js.map +1 -1
- package/dist/es5/workers/3d-tiles-attributes-worker.js +1 -8
- package/dist/es5/workers/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/es5/workers/i3s-attributes-worker.js +1 -9
- package/dist/es5/workers/i3s-attributes-worker.js.map +1 -1
- package/dist/esm/3d-tiles-attributes-worker.js +3 -1
- package/dist/esm/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js +8 -40
- package/dist/esm/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js +7 -38
- package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js +1 -0
- package/dist/esm/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js.map +1 -1
- package/dist/esm/3d-tiles-converter/helpers/texture-atlas.js +1 -4
- package/dist/esm/3d-tiles-converter/helpers/texture-atlas.js.map +1 -1
- package/dist/esm/3d-tiles-converter/json-templates/tileset.js +0 -3
- package/dist/esm/3d-tiles-converter/json-templates/tileset.js.map +1 -1
- package/dist/esm/bundle.js +1 -1
- package/dist/esm/bundle.js.map +1 -1
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/converter-cli.js +12 -41
- package/dist/esm/converter-cli.js.map +1 -1
- package/dist/esm/deps-installer/deps-installer.js +6 -7
- package/dist/esm/deps-installer/deps-installer.js.map +1 -1
- package/dist/esm/i3s-attributes-worker.js +3 -1
- package/dist/esm/i3s-attributes-worker.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js +4 -23
- package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/coordinate-converter.js +11 -12
- package/dist/esm/i3s-converter/helpers/coordinate-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/create-scene-server-path.js +1 -0
- package/dist/esm/i3s-converter/helpers/create-scene-server-path.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/feature-attributes.js +6 -20
- package/dist/esm/i3s-converter/helpers/feature-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-attributes.js +3 -22
- package/dist/esm/i3s-converter/helpers/geometry-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/geometry-converter.js +28 -139
- package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/gltf-attributes.js +7 -12
- package/dist/esm/i3s-converter/helpers/gltf-attributes.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-debug.js +3 -13
- package/dist/esm/i3s-converter/helpers/node-debug.js.map +1 -1
- package/dist/esm/i3s-converter/helpers/node-pages.js +2 -21
- package/dist/esm/i3s-converter/helpers/node-pages.js.map +1 -1
- package/dist/esm/i3s-converter/i3s-converter.js +59 -144
- package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/layers.js +1 -11
- package/dist/esm/i3s-converter/json-templates/layers.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/metadata.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/node.js +0 -4
- package/dist/esm/i3s-converter/json-templates/node.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/scene-server.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/shared-resources.js +0 -12
- package/dist/esm/i3s-converter/json-templates/shared-resources.js.map +1 -1
- package/dist/esm/i3s-converter/json-templates/store.js.map +1 -1
- package/dist/esm/i3s-converter/types.js.map +1 -1
- package/dist/esm/i3s-server/app.js +0 -5
- package/dist/esm/i3s-server/app.js.map +1 -1
- package/dist/esm/i3s-server/controllers/index-controller.js +0 -5
- package/dist/esm/i3s-server/controllers/index-controller.js.map +1 -1
- package/dist/esm/i3s-server/routes/index.js +0 -3
- package/dist/esm/i3s-server/routes/index.js.map +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib/utils/compress-util.js +19 -12
- package/dist/esm/lib/utils/compress-util.js.map +1 -1
- package/dist/esm/lib/utils/file-utils.js +10 -8
- package/dist/esm/lib/utils/file-utils.js.map +1 -1
- package/dist/esm/lib/utils/lod-conversion-utils.js +2 -6
- package/dist/esm/lib/utils/lod-conversion-utils.js.map +1 -1
- package/dist/esm/lib/utils/queue.js +0 -4
- package/dist/esm/lib/utils/queue.js.map +1 -1
- package/dist/esm/lib/utils/statistic-utills.js +0 -11
- package/dist/esm/lib/utils/statistic-utills.js.map +1 -1
- package/dist/esm/lib/utils/write-queue.js +5 -23
- package/dist/esm/lib/utils/write-queue.js.map +1 -1
- package/dist/esm/pgm-loader.js +3 -1
- package/dist/esm/pgm-loader.js.map +1 -1
- package/dist/esm/workers/3d-tiles-attributes-worker.js +4 -1
- package/dist/esm/workers/3d-tiles-attributes-worker.js.map +1 -1
- package/dist/esm/workers/i3s-attributes-worker.js +4 -1
- package/dist/esm/workers/i3s-attributes-worker.js.map +1 -1
- package/dist/i3s-attributes-worker.js +2 -3
- package/dist/i3s-attributes-worker.js.map +3 -3
- package/dist/i3s-converter/helpers/coordinate-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/coordinate-converter.js +8 -6
- package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.js +2 -0
- package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
- package/dist/i3s-converter/i3s-converter.js +14 -8
- package/dist/pgm-loader.d.ts.map +1 -1
- package/dist/pgm-loader.js +2 -1
- package/package.json +15 -15
- package/src/converter-cli.ts +16 -2
- package/src/i3s-converter/helpers/coordinate-converter.ts +8 -6
- package/src/i3s-converter/helpers/geometry-converter.ts +2 -0
- package/src/i3s-converter/i3s-converter.ts +17 -7
- package/src/pgm-loader.ts +2 -2
|
@@ -3,12 +3,10 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.transformI3SAttributesOnWorker = transformI3SAttributesOnWorker;
|
|
7
6
|
exports._typecheckI3SAttributesWorker = exports.I3SAttributesWorker = void 0;
|
|
8
|
-
|
|
7
|
+
exports.transformI3SAttributesOnWorker = transformI3SAttributesOnWorker;
|
|
9
8
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
10
|
-
|
|
11
|
-
var VERSION = typeof "3.3.0-alpha.5" !== 'undefined' ? "3.3.0-alpha.5" : 'latest';
|
|
9
|
+
var VERSION = typeof "3.3.0-alpha.7" !== 'undefined' ? "3.3.0-alpha.7" : 'latest';
|
|
12
10
|
var I3SAttributesWorker = {
|
|
13
11
|
id: 'i3s-attributes',
|
|
14
12
|
name: 'I3S Attributes Worker',
|
|
@@ -18,12 +16,11 @@ var I3SAttributesWorker = {
|
|
|
18
16
|
useCartesianPositions: false
|
|
19
17
|
}
|
|
20
18
|
};
|
|
21
|
-
exports.I3SAttributesWorker = I3SAttributesWorker;
|
|
22
19
|
|
|
20
|
+
exports.I3SAttributesWorker = I3SAttributesWorker;
|
|
23
21
|
function transformI3SAttributesOnWorker(attributesData, options) {
|
|
24
22
|
return (0, _workerUtils.processOnWorker)(I3SAttributesWorker, attributesData, options);
|
|
25
23
|
}
|
|
26
|
-
|
|
27
24
|
var _typecheckI3SAttributesWorker = I3SAttributesWorker;
|
|
28
25
|
exports._typecheckI3SAttributesWorker = _typecheckI3SAttributesWorker;
|
|
29
26
|
//# sourceMappingURL=i3s-attributes-worker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"i3s-attributes-worker.js","names":["VERSION","I3SAttributesWorker","id","name","module","version","options","useCartesianPositions","transformI3SAttributesOnWorker","attributesData","processOnWorker","_typecheckI3SAttributesWorker"],"sources":["../../src/i3s-attributes-worker.ts"],"sourcesContent":["import type {WorkerObject} from '@loaders.gl/worker-utils';\nimport type {ConvertedAttributes} from './i3s-converter/types';\nimport type {Matrix4, Vector3} from '@math.gl/core';\nimport type {GLTFImagePostprocessed, GLTFNodePostprocessed} from '@loaders.gl/gltf';\n\nimport {processOnWorker} from '@loaders.gl/worker-utils';\n\n// __VERSION__ is injected by babel-plugin-version-inline\n// @ts-ignore TS2304: Cannot find name '__VERSION__'.\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';\n\nexport type I3SAttributesWorkerOptions = {\n _nodeWorkers: boolean;\n reuseWorkers: boolean;\n useCartesianPositions: boolean;\n source: string;\n};\n\nexport type B3DMAttributesData = {\n gltfMaterials?: {id: string}[];\n nodes: GLTFNodePostprocessed[];\n images: GLTFImagePostprocessed[];\n cartographicOrigin: Vector3;\n cartesianModelMatrix: Matrix4;\n};\n\n/**\n * I3S Attributes Worker to handle B3DM object\n */\nexport const I3SAttributesWorker = {\n id: 'i3s-attributes',\n name: 'I3S Attributes Worker',\n module: 'tile-converter',\n version: VERSION,\n options: {\n useCartesianPositions: false\n }\n};\n\n/**\n * Performs I3S attributes transformation\n */\nexport function transformI3SAttributesOnWorker(\n attributesData: B3DMAttributesData,\n options: I3SAttributesWorkerOptions\n): Promise<Map<string, ConvertedAttributes>> {\n return processOnWorker(I3SAttributesWorker, attributesData, options);\n}\n\nexport const _typecheckI3SAttributesWorker: WorkerObject = I3SAttributesWorker;\n"],"mappings":";;;;;;;AAKA;AAIA,IAAMA,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiB,QAAQ;AAoBpE,IAAMC,mBAAmB,GAAG;EACjCC,EAAE,EAAE,gBAAgB;EACpBC,IAAI,EAAE,uBAAuB;EAC7BC,MAAM,EAAE,gBAAgB;EACxBC,OAAO,EAAEL,OAAO;EAChBM,OAAO,EAAE;IACPC,qBAAqB,EAAE;EACzB;AACF,CAAC;;AAAC;AAKK,SAASC,8BAA8B,CAC5CC,cAAkC,EAClCH,OAAmC,EACQ;EAC3C,OAAO,IAAAI,4BAAe,EAACT,mBAAmB,EAAEQ,cAAc,EAAEH,OAAO,CAAC;AACtE;AAEO,IAAMK,6BAA2C,GAAGV,mBAAmB;AAAC"}
|
|
@@ -1,67 +1,52 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.handleBatchIdsExtensions = handleBatchIdsExtensions;
|
|
9
|
-
|
|
10
8
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
11
|
-
|
|
12
9
|
var EXT_MESH_FEATURES = 'EXT_mesh_features';
|
|
13
10
|
var EXT_FEATURE_METADATA = 'EXT_feature_metadata';
|
|
14
11
|
|
|
15
12
|
function handleBatchIdsExtensions(attributes, primitive, images) {
|
|
16
13
|
var extensions = primitive === null || primitive === void 0 ? void 0 : primitive.extensions;
|
|
17
|
-
|
|
18
14
|
if (!extensions) {
|
|
19
15
|
return [];
|
|
20
16
|
}
|
|
21
|
-
|
|
22
17
|
for (var _i = 0, _Object$entries = Object.entries(extensions || {}); _i < _Object$entries.length; _i++) {
|
|
23
18
|
var _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2),
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
19
|
+
extensionName = _Object$entries$_i[0],
|
|
20
|
+
extensionData = _Object$entries$_i[1];
|
|
27
21
|
switch (extensionName) {
|
|
28
22
|
case EXT_FEATURE_METADATA:
|
|
29
23
|
return handleExtFeatureMetadataExtension(attributes, extensionData, images);
|
|
30
|
-
|
|
31
24
|
case EXT_MESH_FEATURES:
|
|
32
25
|
console.warn('EXT_mesh_features extension is not supported yet');
|
|
33
26
|
return [];
|
|
34
|
-
|
|
35
27
|
default:
|
|
36
28
|
return [];
|
|
37
29
|
}
|
|
38
30
|
}
|
|
39
|
-
|
|
40
31
|
return [];
|
|
41
32
|
}
|
|
42
33
|
|
|
43
34
|
function handleExtFeatureMetadataExtension(attributes, extFeatureMetadata, images) {
|
|
44
35
|
var _extFeatureMetadata$f, _featureIdAttribute$f, _featureIdAttribute$f2, _featureIdAttribute$f3;
|
|
45
|
-
|
|
46
36
|
var featureIdAttribute = extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : (_extFeatureMetadata$f = extFeatureMetadata.featureIdAttributes) === null || _extFeatureMetadata$f === void 0 ? void 0 : _extFeatureMetadata$f[0];
|
|
47
|
-
|
|
48
37
|
if (featureIdAttribute !== null && featureIdAttribute !== void 0 && (_featureIdAttribute$f = featureIdAttribute.featureIds) !== null && _featureIdAttribute$f !== void 0 && _featureIdAttribute$f.attribute) {
|
|
49
38
|
var batchIdsAttribute = attributes[featureIdAttribute.featureIds.attribute];
|
|
50
39
|
return batchIdsAttribute.value;
|
|
51
40
|
}
|
|
52
|
-
|
|
53
41
|
if (featureIdAttribute !== null && featureIdAttribute !== void 0 && (_featureIdAttribute$f2 = featureIdAttribute.featureIds) !== null && _featureIdAttribute$f2 !== void 0 && _featureIdAttribute$f2.hasOwnProperty('constant') && featureIdAttribute !== null && featureIdAttribute !== void 0 && (_featureIdAttribute$f3 = featureIdAttribute.featureIds) !== null && _featureIdAttribute$f3 !== void 0 && _featureIdAttribute$f3.hasOwnProperty('divisor')) {
|
|
54
42
|
var _attributes$POSITIONS;
|
|
55
|
-
|
|
56
43
|
var featuresCount = (attributes === null || attributes === void 0 ? void 0 : (_attributes$POSITIONS = attributes.POSITIONS) === null || _attributes$POSITIONS === void 0 ? void 0 : _attributes$POSITIONS.value.length) / 3 || 0;
|
|
57
44
|
return generateImplicitFeatureIds(featuresCount, featureIdAttribute.featureIds.constant, featureIdAttribute.featureIds.divisor);
|
|
58
45
|
}
|
|
59
46
|
|
|
60
47
|
var featureIdTexture = (extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : extFeatureMetadata.featureIdTextures) && (extFeatureMetadata === null || extFeatureMetadata === void 0 ? void 0 : extFeatureMetadata.featureIdTextures[0]);
|
|
61
|
-
|
|
62
48
|
if (featureIdTexture) {
|
|
63
49
|
var _featureIdTexture$fea, _featureIdTexture$fea2;
|
|
64
|
-
|
|
65
50
|
var textureAttributeIndex = (featureIdTexture === null || featureIdTexture === void 0 ? void 0 : (_featureIdTexture$fea = featureIdTexture.featureIds) === null || _featureIdTexture$fea === void 0 ? void 0 : (_featureIdTexture$fea2 = _featureIdTexture$fea.texture) === null || _featureIdTexture$fea2 === void 0 ? void 0 : _featureIdTexture$fea2.texCoord) || 0;
|
|
66
51
|
var textCoordAttribute = "TEXCOORD_".concat(textureAttributeIndex);
|
|
67
52
|
var textureCoordinates = attributes[textCoordAttribute].value;
|
|
@@ -74,7 +59,6 @@ function handleExtFeatureMetadataExtension(attributes, extFeatureMetadata, image
|
|
|
74
59
|
console.warn("EXT_feature_metadata doesn't yet support featureTextures in primitive");
|
|
75
60
|
return [];
|
|
76
61
|
}
|
|
77
|
-
|
|
78
62
|
return [];
|
|
79
63
|
}
|
|
80
64
|
|
|
@@ -82,15 +66,12 @@ function generateImplicitFeatureIds(featuresCount) {
|
|
|
82
66
|
var constant = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
|
|
83
67
|
var divisor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
84
68
|
var featureIds = [];
|
|
85
|
-
|
|
86
69
|
if (divisor > 0) {
|
|
87
70
|
var currentValue = constant;
|
|
88
71
|
var devisorCounter = divisor;
|
|
89
|
-
|
|
90
72
|
for (var index = 0; index < featuresCount; index++) {
|
|
91
73
|
featureIds.push(currentValue);
|
|
92
74
|
devisorCounter -= 1;
|
|
93
|
-
|
|
94
75
|
if (devisorCounter === 0) {
|
|
95
76
|
currentValue++;
|
|
96
77
|
devisorCounter = divisor;
|
|
@@ -99,17 +80,14 @@ function generateImplicitFeatureIds(featuresCount) {
|
|
|
99
80
|
} else {
|
|
100
81
|
featureIds = Array(featuresCount).fill(constant, 0, featuresCount);
|
|
101
82
|
}
|
|
102
|
-
|
|
103
83
|
return featureIds;
|
|
104
84
|
}
|
|
105
85
|
|
|
106
86
|
function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images) {
|
|
107
87
|
var _featureIdTexture$fea3, _featureIdTexture$fea4, _featureIdTexture$fea5;
|
|
108
|
-
|
|
109
88
|
if (!(images !== null && images !== void 0 && images.length)) {
|
|
110
89
|
return [];
|
|
111
90
|
}
|
|
112
|
-
|
|
113
91
|
var CHANNELS_MAP = {
|
|
114
92
|
r: 0,
|
|
115
93
|
g: 1,
|
|
@@ -118,15 +96,12 @@ function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, image
|
|
|
118
96
|
};
|
|
119
97
|
var textureIndex = featureIdTexture === null || featureIdTexture === void 0 ? void 0 : (_featureIdTexture$fea3 = featureIdTexture.featureIds) === null || _featureIdTexture$fea3 === void 0 ? void 0 : (_featureIdTexture$fea4 = _featureIdTexture$fea3.texture) === null || _featureIdTexture$fea4 === void 0 ? void 0 : _featureIdTexture$fea4.index;
|
|
120
98
|
var featureChannel = featureIdTexture === null || featureIdTexture === void 0 ? void 0 : (_featureIdTexture$fea5 = featureIdTexture.featureIds) === null || _featureIdTexture$fea5 === void 0 ? void 0 : _featureIdTexture$fea5.channels;
|
|
121
|
-
|
|
122
99
|
if (!featureChannel || textureIndex === undefined) {
|
|
123
100
|
return [];
|
|
124
101
|
}
|
|
125
|
-
|
|
126
102
|
var image = images[textureIndex];
|
|
127
103
|
var batchIds = [];
|
|
128
104
|
var channels = CHANNELS_MAP[featureChannel];
|
|
129
|
-
|
|
130
105
|
if (!image.compressed) {
|
|
131
106
|
for (var index = 0; index < textureCoordinates.length; index += 2) {
|
|
132
107
|
var u = textureCoordinates[index];
|
|
@@ -140,7 +115,6 @@ function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, image
|
|
|
140
115
|
} else {
|
|
141
116
|
console.warn("Can't get batch Ids from ".concat(image.mimeType, " compressed texture"));
|
|
142
117
|
}
|
|
143
|
-
|
|
144
118
|
return batchIds;
|
|
145
119
|
}
|
|
146
120
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"names":["EXT_MESH_FEATURES","EXT_FEATURE_METADATA","handleBatchIdsExtensions","attributes","primitive","images","extensions","Object","entries","extensionName","extensionData","handleExtFeatureMetadataExtension","console","warn","extFeatureMetadata","featureIdAttribute","featureIdAttributes","featureIds","attribute","batchIdsAttribute","value","hasOwnProperty","featuresCount","POSITIONS","length","generateImplicitFeatureIds","constant","divisor","featureIdTexture","featureIdTextures","textureAttributeIndex","texture","texCoord","textCoordAttribute","textureCoordinates","generateBatchIdsFromTexture","featureTexture","featureTextures","currentValue","devisorCounter","index","push","Array","fill","CHANNELS_MAP","r","g","b","a","textureIndex","featureChannel","channels","undefined","image","batchIds","compressed","u","v","tx","Math","min","emod","width","ty","height","offset","components","batchId","Uint8Array","data","mimeType","n"],"mappings":";;;;;;;;;;;AAUA,IAAMA,iBAAiB,GAAG,mBAA1B;AACA,IAAMC,oBAAoB,GAAG,sBAA7B;;AAQO,SAASC,wBAAT,CACLC,UADK,EAILC,SAJK,EAKLC,MALK,EAMK;AACV,MAAMC,UAAU,GAAGF,SAAH,aAAGA,SAAH,uBAAGA,SAAS,CAAEE,UAA9B;;AAEA,MAAI,CAACA,UAAL,EAAiB;AACf,WAAO,EAAP;AACD;;AAED,qCAA6CC,MAAM,CAACC,OAAP,CAAeF,UAAU,IAAI,EAA7B,CAA7C,qCAA+E;AAA1E;AAAA,QAAOG,aAAP;AAAA,QAAsBC,aAAtB;;AACH,YAAQD,aAAR;AACE,WAAKR,oBAAL;AACE,eAAOU,iCAAiC,CACtCR,UADsC,EAEtCO,aAFsC,EAGtCL,MAHsC,CAAxC;;AAKF,WAAKL,iBAAL;AACEY,QAAAA,OAAO,CAACC,IAAR,CAAa,kDAAb;AACA,eAAO,EAAP;;AACF;AACE,eAAO,EAAP;AAXJ;AAaD;;AAED,SAAO,EAAP;AACD;;AASD,SAASF,iCAAT,CACER,UADF,EAIEW,kBAJF,EAKET,MALF,EAMY;AAAA;;AAEV,MAAMU,kBAAkB,GAAGD,kBAAH,aAAGA,kBAAH,gDAAGA,kBAAkB,CAAEE,mBAAvB,0DAAG,sBAA0C,CAA1C,CAA3B;;AAEA,MAAID,kBAAJ,aAAIA,kBAAJ,wCAAIA,kBAAkB,CAAEE,UAAxB,kDAAI,sBAAgCC,SAApC,EAA+C;AAC7C,QAAMC,iBAAiB,GAAGhB,UAAU,CAACY,kBAAkB,CAACE,UAAnB,CAA8BC,SAA/B,CAApC;AACA,WAAOC,iBAAiB,CAACC,KAAzB;AACD;;AAED,MACEL,kBAAkB,SAAlB,IAAAA,kBAAkB,WAAlB,8BAAAA,kBAAkB,CAAEE,UAApB,0EAAgCI,cAAhC,CAA+C,UAA/C,KACAN,kBADA,aACAA,kBADA,yCACAA,kBAAkB,CAAEE,UADpB,mDACA,uBAAgCI,cAAhC,CAA+C,SAA/C,CAFF,EAGE;AAAA;;AACA,QAAMC,aAAa,GAAG,CAAAnB,UAAU,SAAV,IAAAA,UAAU,WAAV,qCAAAA,UAAU,CAAEoB,SAAZ,gFAAuBH,KAAvB,CAA6BI,MAA7B,IAAsC,CAAtC,IAA2C,CAAjE;AACA,WAAOC,0BAA0B,CAC/BH,aAD+B,EAE/BP,kBAAkB,CAACE,UAAnB,CAA8BS,QAFC,EAG/BX,kBAAkB,CAACE,UAAnB,CAA8BU,OAHC,CAAjC;AAKD;;AAGD,MAAMC,gBAAgB,GACpB,CAAAd,kBAAkB,SAAlB,IAAAA,kBAAkB,WAAlB,YAAAA,kBAAkB,CAAEe,iBAApB,MAAyCf,kBAAzC,aAAyCA,kBAAzC,uBAAyCA,kBAAkB,CAAEe,iBAApB,CAAsC,CAAtC,CAAzC,CADF;;AAGA,MAAID,gBAAJ,EAAsB;AAAA;;AACpB,QAAME,qBAAqB,GAAG,CAAAF,gBAAgB,SAAhB,IAAAA,gBAAgB,WAAhB,qCAAAA,gBAAgB,CAAEX,UAAlB,0GAA8Bc,OAA9B,kFAAuCC,QAAvC,KAAmD,CAAjF;AACA,QAAMC,kBAAkB,sBAAeH,qBAAf,CAAxB;AACA,QAAMI,kBAAkB,GAAG/B,UAAU,CAAC8B,kBAAD,CAAV,CAA+Bb,KAA1D;AACA,WAAOe,2BAA2B,CAACP,gBAAD,EAAmBM,kBAAnB,EAAuC7B,MAAvC,CAAlC;AACD;;AAGD,MAAM+B,cAAc,GAClB,CAAAtB,kBAAkB,SAAlB,IAAAA,kBAAkB,WAAlB,YAAAA,kBAAkB,CAAEuB,eAApB,MAAuCvB,kBAAvC,aAAuCA,kBAAvC,uBAAuCA,kBAAkB,CAAEuB,eAApB,CAAoC,CAApC,CAAvC,CADF;;AAMA,MAAID,cAAJ,EAAoB;AAClBxB,IAAAA,OAAO,CAACC,IAAR,CAAa,uEAAb;AACA,WAAO,EAAP;AACD;;AAED,SAAO,EAAP;AACD;;AASD,SAASY,0BAAT,CACEH,aADF,EAIY;AAAA,MAFVI,QAEU,uEAFS,CAET;AAAA,MADVC,OACU,uEADQ,CACR;AACV,MAAIV,UAAoB,GAAG,EAA3B;;AAEA,MAAIU,OAAO,GAAG,CAAd,EAAiB;AACf,QAAIW,YAAY,GAAGZ,QAAnB;AACA,QAAIa,cAAc,GAAGZ,OAArB;;AAEA,SAAK,IAAIa,KAAK,GAAG,CAAjB,EAAoBA,KAAK,GAAGlB,aAA5B,EAA2CkB,KAAK,EAAhD,EAAoD;AAClDvB,MAAAA,UAAU,CAACwB,IAAX,CAAgBH,YAAhB;AAEAC,MAAAA,cAAc,IAAI,CAAlB;;AAEA,UAAIA,cAAc,KAAK,CAAvB,EAA0B;AACxBD,QAAAA,YAAY;AACZC,QAAAA,cAAc,GAAGZ,OAAjB;AACD;AACF;AACF,GAdD,MAcO;AACLV,IAAAA,UAAU,GAAGyB,KAAK,CAASpB,aAAT,CAAL,CAA6BqB,IAA7B,CAAkCjB,QAAlC,EAA4C,CAA5C,EAA+CJ,aAA/C,CAAb;AACD;;AAED,SAAOL,UAAP;AACD;;AAOD,SAASkB,2BAAT,CACEP,gBADF,EAEEM,kBAFF,EAGE7B,MAHF,EAIE;AAAA;;AACA,MAAI,EAACA,MAAD,aAACA,MAAD,eAACA,MAAM,CAAEmB,MAAT,CAAJ,EAAqB;AACnB,WAAO,EAAP;AACD;;AAED,MAAMoB,YAAY,GAAG;AACnBC,IAAAA,CAAC,EAAE,CADgB;AAEnBC,IAAAA,CAAC,EAAE,CAFgB;AAGnBC,IAAAA,CAAC,EAAE,CAHgB;AAInBC,IAAAA,CAAC,EAAE;AAJgB,GAArB;AAOA,MAAMC,YAAY,GAAGrB,gBAAH,aAAGA,gBAAH,iDAAGA,gBAAgB,CAAEX,UAArB,qFAAG,uBAA8Bc,OAAjC,2DAAG,uBAAuCS,KAA5D;AACA,MAAMU,cAAc,GAAGtB,gBAAH,aAAGA,gBAAH,iDAAGA,gBAAgB,CAAEX,UAArB,2DAAG,uBAA8BkC,QAArD;;AAEA,MAAI,CAACD,cAAD,IAAmBD,YAAY,KAAKG,SAAxC,EAAmD;AACjD,WAAO,EAAP;AACD;;AAED,MAAMC,KAAK,GAAGhD,MAAM,CAAC4C,YAAD,CAApB;AACA,MAAMK,QAAkB,GAAG,EAA3B;AACA,MAAMH,QAAQ,GAAGP,YAAY,CAACM,cAAD,CAA7B;;AAEA,MAAI,CAACG,KAAK,CAACE,UAAX,EAAuB;AACrB,SAAK,IAAIf,KAAK,GAAG,CAAjB,EAAoBA,KAAK,GAAGN,kBAAkB,CAACV,MAA/C,EAAuDgB,KAAK,IAAI,CAAhE,EAAmE;AACjE,UAAMgB,CAAC,GAAGtB,kBAAkB,CAACM,KAAD,CAA5B;AACA,UAAMiB,CAAC,GAAGvB,kBAAkB,CAACM,KAAK,GAAG,CAAT,CAA5B;AAEA,UAAMkB,EAAE,GAAGC,IAAI,CAACC,GAAL,CAAUC,IAAI,CAACL,CAAD,CAAJ,GAAUH,KAAK,CAACS,KAAjB,GAA0B,CAAnC,EAAsCT,KAAK,CAACS,KAAN,GAAc,CAApD,CAAX;AACA,UAAMC,EAAE,GAAGJ,IAAI,CAACC,GAAL,CAAUC,IAAI,CAACJ,CAAD,CAAJ,GAAUJ,KAAK,CAACW,MAAjB,GAA2B,CAApC,EAAuCX,KAAK,CAACW,MAAN,GAAe,CAAtD,CAAX;AAEA,UAAMC,MAAM,GAAG,CAACF,EAAE,GAAGV,KAAK,CAACS,KAAX,GAAmBJ,EAApB,IAA0BL,KAAK,CAACa,UAAhC,GAA6Cf,QAA5D;AACA,UAAMgB,OAAO,GAAG,IAAIC,UAAJ,CAAef,KAAK,CAACgB,IAArB,EAA2BJ,MAA3B,CAAhB;AAEAX,MAAAA,QAAQ,CAACb,IAAT,CAAc0B,OAAd;AACD;AACF,GAbD,MAaO;AACLvD,IAAAA,OAAO,CAACC,IAAR,oCAAyCwC,KAAK,CAACiB,QAA/C;AACD;;AAED,SAAOhB,QAAP;AACD;;AAOD,SAASO,IAAT,CAAcU,CAAd,EAAiC;AAC/B,SAAO,CAAEA,CAAC,GAAG,CAAL,GAAU,CAAX,IAAgB,CAAvB;AACD","sourcesContent":["import {\n GLTFAccessorPostprocessed,\n GLTFImagePostprocessed,\n GLTFMeshPrimitivePostprocessed\n} from '@loaders.gl/gltf';\nimport type {\n GLTF_EXT_feature_metadata_attribute,\n GLTF_EXT_feature_metadata_primitive\n} from 'modules/gltf/src/lib/types/gltf-json-schema';\n\nconst EXT_MESH_FEATURES = 'EXT_mesh_features';\nconst EXT_FEATURE_METADATA = 'EXT_feature_metadata';\n\n/**\n * Getting batchIds from 3DTilesNext extensions.\n * @param attributes\n * @param primitive\n * @param textures\n */\nexport function handleBatchIdsExtensions(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n primitive: GLTFMeshPrimitivePostprocessed,\n images: GLTFImagePostprocessed[]\n): number[] {\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 );\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\n * @param extFeatureMetadata\n * @param textures\n */\nfunction handleExtFeatureMetadataExtension(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n extFeatureMetadata: GLTF_EXT_feature_metadata_primitive,\n images: GLTFImagePostprocessed[]\n): number[] {\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 // Take only first extension texture to get batchIds from the root EXT_feature_metadata object.\n const featureTexture =\n extFeatureMetadata?.featureTextures && extFeatureMetadata?.featureTextures[0];\n\n /**\n * TODO need to get batchIds from root extension\n */\n if (featureTexture) {\n console.warn(\"EXT_feature_metadata doesn't yet support featureTextures in primitive\");\n return [];\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_attribute,\n textureCoordinates: Float32Array,\n images: GLTFImagePostprocessed[]\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.compressed) {\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"],"file":"batch-ids-extensions.js"}
|
|
1
|
+
{"version":3,"file":"batch-ids-extensions.js","names":["EXT_MESH_FEATURES","EXT_FEATURE_METADATA","handleBatchIdsExtensions","attributes","primitive","images","extensions","Object","entries","extensionName","extensionData","handleExtFeatureMetadataExtension","console","warn","extFeatureMetadata","featureIdAttribute","featureIdAttributes","featureIds","attribute","batchIdsAttribute","value","hasOwnProperty","featuresCount","POSITIONS","length","generateImplicitFeatureIds","constant","divisor","featureIdTexture","featureIdTextures","textureAttributeIndex","texture","texCoord","textCoordAttribute","textureCoordinates","generateBatchIdsFromTexture","featureTexture","featureTextures","currentValue","devisorCounter","index","push","Array","fill","CHANNELS_MAP","r","g","b","a","textureIndex","featureChannel","channels","undefined","image","batchIds","compressed","u","v","tx","Math","min","emod","width","ty","height","offset","components","batchId","Uint8Array","data","mimeType","n"],"sources":["../../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"sourcesContent":["import {\n GLTFAccessorPostprocessed,\n GLTFImagePostprocessed,\n GLTFMeshPrimitivePostprocessed\n} from '@loaders.gl/gltf';\nimport type {\n GLTF_EXT_feature_metadata_attribute,\n GLTF_EXT_feature_metadata_primitive\n} from 'modules/gltf/src/lib/types/gltf-json-schema';\n\nconst EXT_MESH_FEATURES = 'EXT_mesh_features';\nconst EXT_FEATURE_METADATA = 'EXT_feature_metadata';\n\n/**\n * Getting batchIds from 3DTilesNext extensions.\n * @param attributes\n * @param primitive\n * @param textures\n */\nexport function handleBatchIdsExtensions(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n primitive: GLTFMeshPrimitivePostprocessed,\n images: GLTFImagePostprocessed[]\n): number[] {\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 );\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\n * @param extFeatureMetadata\n * @param textures\n */\nfunction handleExtFeatureMetadataExtension(\n attributes: {\n [key: string]: GLTFAccessorPostprocessed;\n },\n extFeatureMetadata: GLTF_EXT_feature_metadata_primitive,\n images: GLTFImagePostprocessed[]\n): number[] {\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 // Take only first extension texture to get batchIds from the root EXT_feature_metadata object.\n const featureTexture =\n extFeatureMetadata?.featureTextures && extFeatureMetadata?.featureTextures[0];\n\n /**\n * TODO need to get batchIds from root extension\n */\n if (featureTexture) {\n console.warn(\"EXT_feature_metadata doesn't yet support featureTextures in primitive\");\n return [];\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_attribute,\n textureCoordinates: Float32Array,\n images: GLTFImagePostprocessed[]\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.compressed) {\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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"}
|
|
@@ -3,28 +3,21 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
+
exports.convertBoundingVolumeToI3SFullExtent = convertBoundingVolumeToI3SFullExtent;
|
|
7
|
+
exports.convertPositionsToVectors = convertPositionsToVectors;
|
|
6
8
|
exports.createBoundingVolumes = createBoundingVolumes;
|
|
7
9
|
exports.createBoundingVolumesFromGeometry = createBoundingVolumesFromGeometry;
|
|
8
|
-
exports.convertPositionsToVectors = convertPositionsToVectors;
|
|
9
|
-
exports.convertBoundingVolumeToI3SFullExtent = convertBoundingVolumeToI3SFullExtent;
|
|
10
10
|
exports.createObbFromMbs = createObbFromMbs;
|
|
11
|
-
|
|
12
11
|
var _core = require("@math.gl/core");
|
|
13
|
-
|
|
14
12
|
var _geospatial = require("@math.gl/geospatial");
|
|
15
|
-
|
|
16
13
|
var _culling = require("@math.gl/culling");
|
|
17
|
-
|
|
18
14
|
function createBoundingVolumes(tile, geoidHeightModel) {
|
|
19
15
|
var radius;
|
|
20
16
|
var halfSize;
|
|
21
17
|
var quaternion;
|
|
22
18
|
var boundingVolume = tile.boundingVolume;
|
|
23
|
-
|
|
24
19
|
var cartographicCenter = _geospatial.Ellipsoid.WGS84.cartesianToCartographic(boundingVolume.center, new _core.Vector3());
|
|
25
|
-
|
|
26
20
|
cartographicCenter[2] = cartographicCenter[2] - geoidHeightModel.getHeight(cartographicCenter[1], cartographicCenter[0]);
|
|
27
|
-
|
|
28
21
|
if (boundingVolume instanceof _culling.OrientedBoundingBox) {
|
|
29
22
|
halfSize = boundingVolume.halfSize;
|
|
30
23
|
radius = new _core.Vector3(halfSize[0], halfSize[1], halfSize[2]).len();
|
|
@@ -34,7 +27,6 @@ function createBoundingVolumes(tile, geoidHeightModel) {
|
|
|
34
27
|
halfSize = [radius, radius, radius];
|
|
35
28
|
quaternion = new _core.Quaternion().fromMatrix3(new _core.Matrix3([halfSize[0], 0, 0, 0, halfSize[1], 0, 0, 0, halfSize[2]])).normalize();
|
|
36
29
|
}
|
|
37
|
-
|
|
38
30
|
return {
|
|
39
31
|
mbs: [cartographicCenter[0], cartographicCenter[1], cartographicCenter[2], radius],
|
|
40
32
|
obb: {
|
|
@@ -49,11 +41,8 @@ function createBoundingVolumesFromGeometry(cartesianPositions, geoidHeightModel)
|
|
|
49
41
|
var positionVectors = convertPositionsToVectors(cartesianPositions);
|
|
50
42
|
var geometryObb = (0, _culling.makeOrientedBoundingBoxFromPoints)(positionVectors);
|
|
51
43
|
var geometryMbs = (0, _culling.makeBoundingSphereFromPoints)(positionVectors);
|
|
52
|
-
|
|
53
44
|
var mbsCenter = _geospatial.Ellipsoid.WGS84.cartesianToCartographic(geometryMbs.center, new _core.Vector3());
|
|
54
|
-
|
|
55
45
|
var obbCenter = _geospatial.Ellipsoid.WGS84.cartesianToCartographic(geometryObb.center, new _core.Vector3());
|
|
56
|
-
|
|
57
46
|
mbsCenter[2] = mbsCenter[2] - geoidHeightModel.getHeight(mbsCenter[1], mbsCenter[0]);
|
|
58
47
|
obbCenter[2] = obbCenter[2] - geoidHeightModel.getHeight(obbCenter[1], obbCenter[0]);
|
|
59
48
|
return {
|
|
@@ -68,38 +57,32 @@ function createBoundingVolumesFromGeometry(cartesianPositions, geoidHeightModel)
|
|
|
68
57
|
|
|
69
58
|
function convertPositionsToVectors(positions) {
|
|
70
59
|
var result = [];
|
|
71
|
-
|
|
72
60
|
for (var i = 0; i < positions.length; i += 3) {
|
|
73
61
|
var positionVector = new _core.Vector3([positions[i], positions[i + 1], positions[i + 2]]);
|
|
74
62
|
result.push(positionVector);
|
|
75
63
|
}
|
|
76
|
-
|
|
77
64
|
return result;
|
|
78
65
|
}
|
|
79
66
|
|
|
80
67
|
function convertBoundingVolumeToI3SFullExtent(boundingVolume) {
|
|
81
68
|
var sphere;
|
|
82
|
-
|
|
83
69
|
if (boundingVolume instanceof _culling.BoundingSphere) {
|
|
84
70
|
sphere = boundingVolume;
|
|
85
71
|
} else {
|
|
86
72
|
sphere = boundingVolume.getBoundingSphere();
|
|
87
73
|
}
|
|
88
|
-
|
|
89
74
|
var center = sphere.center;
|
|
90
75
|
var radius = sphere.radius;
|
|
91
|
-
|
|
92
76
|
var vertexMax = _geospatial.Ellipsoid.WGS84.cartesianToCartographic(new _core.Vector3(center[0] + radius, center[1] + radius, center[2] + radius), new _core.Vector3());
|
|
93
|
-
|
|
94
77
|
var vertexMin = _geospatial.Ellipsoid.WGS84.cartesianToCartographic(new _core.Vector3(center[0] - radius, center[1] - radius, center[2] - radius), new _core.Vector3());
|
|
95
78
|
|
|
96
79
|
return {
|
|
97
|
-
xmin: vertexMin[0],
|
|
98
|
-
xmax: vertexMax[0],
|
|
99
|
-
ymin: vertexMin[1],
|
|
100
|
-
ymax: vertexMax[1],
|
|
101
|
-
zmin: vertexMin[2],
|
|
102
|
-
zmax: vertexMax[2]
|
|
80
|
+
xmin: Math.min(vertexMin[0], vertexMax[0]),
|
|
81
|
+
xmax: Math.max(vertexMin[0], vertexMax[0]),
|
|
82
|
+
ymin: Math.min(vertexMin[1], vertexMax[1]),
|
|
83
|
+
ymax: Math.max(vertexMin[1], vertexMax[1]),
|
|
84
|
+
zmin: Math.min(vertexMin[2], vertexMax[2]),
|
|
85
|
+
zmax: Math.max(vertexMin[2], vertexMax[2])
|
|
103
86
|
};
|
|
104
87
|
}
|
|
105
88
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/i3s-converter/helpers/coordinate-converter.ts"],"names":["createBoundingVolumes","tile","geoidHeightModel","radius","halfSize","quaternion","boundingVolume","cartographicCenter","Ellipsoid","WGS84","cartesianToCartographic","center","Vector3","getHeight","OrientedBoundingBox","len","Quaternion","fromMatrix3","Matrix3","normalize","mbs","obb","createBoundingVolumesFromGeometry","cartesianPositions","positionVectors","convertPositionsToVectors","geometryObb","geometryMbs","mbsCenter","obbCenter","positions","result","i","length","positionVector","push","convertBoundingVolumeToI3SFullExtent","sphere","BoundingSphere","getBoundingSphere","vertexMax","vertexMin","xmin","xmax","ymin","ymax","zmin","zmax","createObbFromMbs","halfAxex"],"mappings":"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","sourcesContent":["import type {BoundingVolumes, FullExtent, Mbs, Obb} from '@loaders.gl/i3s';\n\nimport {Matrix3, Quaternion, Vector3} from '@math.gl/core';\nimport {Ellipsoid} from '@math.gl/geospatial';\nimport {\n OrientedBoundingBox,\n makeOrientedBoundingBoxFromPoints,\n makeBoundingSphereFromPoints,\n BoundingSphere\n} from '@math.gl/culling';\nimport {Tile3D} from '@loaders.gl/tiles';\nimport {Geoid} from '@math.gl/geoid';\n\n/**\n * Create bounding volumes object from tile and geoid height model.\n * @param tile\n * @param geoidHeightModel\n * @returns - Bounding volumes object\n */\nexport function createBoundingVolumes(tile: Tile3D, geoidHeightModel: Geoid): BoundingVolumes {\n let radius;\n let halfSize;\n let quaternion;\n\n const boundingVolume = tile.boundingVolume;\n const cartographicCenter = Ellipsoid.WGS84.cartesianToCartographic(\n boundingVolume.center,\n new Vector3()\n );\n cartographicCenter[2] =\n cartographicCenter[2] -\n geoidHeightModel.getHeight(cartographicCenter[1], cartographicCenter[0]);\n if (boundingVolume instanceof OrientedBoundingBox) {\n halfSize = boundingVolume.halfSize;\n radius = new Vector3(halfSize[0], halfSize[1], halfSize[2]).len();\n quaternion = boundingVolume.quaternion;\n } else {\n radius = tile.boundingVolume.radius;\n halfSize = [radius, radius, radius];\n quaternion = new Quaternion()\n .fromMatrix3(new Matrix3([halfSize[0], 0, 0, 0, halfSize[1], 0, 0, 0, halfSize[2]]))\n .normalize();\n }\n\n return {\n mbs: [cartographicCenter[0], cartographicCenter[1], cartographicCenter[2], radius],\n obb: {\n center: [cartographicCenter[0], cartographicCenter[1], cartographicCenter[2]],\n halfSize,\n quaternion\n }\n };\n}\n\n/**\n * Generates bounding volumes from geometry positions\n * @param cartesianPositions\n * @param geoidHeightModel\n */\nexport function createBoundingVolumesFromGeometry(\n cartesianPositions: Float32Array,\n geoidHeightModel: Geoid\n): {mbs: Mbs; obb: Obb} {\n const positionVectors = convertPositionsToVectors(cartesianPositions);\n\n const geometryObb = makeOrientedBoundingBoxFromPoints(positionVectors);\n const geometryMbs = makeBoundingSphereFromPoints(positionVectors);\n\n let mbsCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryMbs.center, new Vector3());\n let obbCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryObb.center, new Vector3());\n\n mbsCenter[2] = mbsCenter[2] - geoidHeightModel.getHeight(mbsCenter[1], mbsCenter[0]);\n obbCenter[2] = obbCenter[2] - geoidHeightModel.getHeight(obbCenter[1], obbCenter[0]);\n\n return {\n mbs: [mbsCenter[0], mbsCenter[1], mbsCenter[2], geometryMbs.radius],\n obb: {\n center: obbCenter,\n halfSize: geometryObb.halfSize,\n quaternion: geometryObb.quaternion\n }\n };\n}\n\n/**\n * Create array of posisitons where each vertex is vector\n * @param {array} positions\n * @returns {Vector3[]}\n */\nexport function convertPositionsToVectors(positions: Float32Array): Vector3[] {\n const result: Vector3[] = [];\n\n for (let i = 0; i < positions.length; i += 3) {\n // TODO: (perf) new Vector3 is not optimal but required in `makeOrientedBoundingBoxFromPoints`.\n // modify `makeOrientedBoundingBoxFromPoints` to use scratch vectors\n const positionVector = new Vector3([positions[i], positions[i + 1], positions[i + 2]]);\n result.push(positionVector);\n }\n\n return result;\n}\n\n/**\n * Convert common coordinate to fullExtent https://github.com/Esri/i3s-spec/blob/master/docs/1.8/fullExtent.cmn.md\n * @param\n * @param boundingVolume\n * @returns - fullExtent object\n */\nexport function convertBoundingVolumeToI3SFullExtent(\n boundingVolume: OrientedBoundingBox | BoundingSphere\n): FullExtent {\n let sphere: BoundingSphere;\n if (boundingVolume instanceof BoundingSphere) {\n sphere = boundingVolume;\n } else {\n sphere = boundingVolume.getBoundingSphere();\n }\n const center: Vector3 = sphere.center;\n const radius: number = sphere.radius;\n const vertexMax = Ellipsoid.WGS84.cartesianToCartographic(\n new Vector3(center[0] + radius, center[1] + radius, center[2] + radius),\n new Vector3()\n );\n const vertexMin = Ellipsoid.WGS84.cartesianToCartographic(\n new Vector3(center[0] - radius, center[1] - radius, center[2] - radius),\n new Vector3()\n );\n\n return {\n xmin: vertexMin[0],\n xmax: vertexMax[0],\n ymin: vertexMin[1],\n ymax: vertexMax[1],\n zmin: vertexMin[2],\n zmax: vertexMax[2]\n };\n}\n\n/**\n * Creates oriented boundinb box from mbs.\n * @param mbs - Minimum Bounding Sphere\n * @returns - Oriented BOunding Box\n */\nexport function createObbFromMbs(mbs: Mbs): Obb {\n const radius = mbs[3];\n const center = new Vector3(mbs[0], mbs[1], mbs[2]);\n const halfAxex = new Matrix3([radius, 0, 0, 0, radius, 0, 0, 0, radius]);\n return new OrientedBoundingBox(center, halfAxex);\n}\n"],"file":"coordinate-converter.js"}
|
|
1
|
+
{"version":3,"file":"coordinate-converter.js","names":["createBoundingVolumes","tile","geoidHeightModel","radius","halfSize","quaternion","boundingVolume","cartographicCenter","Ellipsoid","WGS84","cartesianToCartographic","center","Vector3","getHeight","OrientedBoundingBox","len","Quaternion","fromMatrix3","Matrix3","normalize","mbs","obb","createBoundingVolumesFromGeometry","cartesianPositions","positionVectors","convertPositionsToVectors","geometryObb","makeOrientedBoundingBoxFromPoints","geometryMbs","makeBoundingSphereFromPoints","mbsCenter","obbCenter","positions","result","i","length","positionVector","push","convertBoundingVolumeToI3SFullExtent","sphere","BoundingSphere","getBoundingSphere","vertexMax","vertexMin","xmin","Math","min","xmax","max","ymin","ymax","zmin","zmax","createObbFromMbs","halfAxex"],"sources":["../../../../src/i3s-converter/helpers/coordinate-converter.ts"],"sourcesContent":["import type {BoundingVolumes, FullExtent, Mbs, Obb} from '@loaders.gl/i3s';\n\nimport {Matrix3, Quaternion, Vector3} from '@math.gl/core';\nimport {Ellipsoid} from '@math.gl/geospatial';\nimport {\n OrientedBoundingBox,\n makeOrientedBoundingBoxFromPoints,\n makeBoundingSphereFromPoints,\n BoundingSphere\n} from '@math.gl/culling';\nimport {Tile3D} from '@loaders.gl/tiles';\nimport {Geoid} from '@math.gl/geoid';\n\n/**\n * Create bounding volumes object from tile and geoid height model.\n * @param tile\n * @param geoidHeightModel\n * @returns - Bounding volumes object\n */\nexport function createBoundingVolumes(tile: Tile3D, geoidHeightModel: Geoid): BoundingVolumes {\n let radius;\n let halfSize;\n let quaternion;\n\n const boundingVolume = tile.boundingVolume;\n const cartographicCenter = Ellipsoid.WGS84.cartesianToCartographic(\n boundingVolume.center,\n new Vector3()\n );\n cartographicCenter[2] =\n cartographicCenter[2] -\n geoidHeightModel.getHeight(cartographicCenter[1], cartographicCenter[0]);\n if (boundingVolume instanceof OrientedBoundingBox) {\n halfSize = boundingVolume.halfSize;\n radius = new Vector3(halfSize[0], halfSize[1], halfSize[2]).len();\n quaternion = boundingVolume.quaternion;\n } else {\n radius = tile.boundingVolume.radius;\n halfSize = [radius, radius, radius];\n quaternion = new Quaternion()\n .fromMatrix3(new Matrix3([halfSize[0], 0, 0, 0, halfSize[1], 0, 0, 0, halfSize[2]]))\n .normalize();\n }\n\n return {\n mbs: [cartographicCenter[0], cartographicCenter[1], cartographicCenter[2], radius],\n obb: {\n center: [cartographicCenter[0], cartographicCenter[1], cartographicCenter[2]],\n halfSize,\n quaternion\n }\n };\n}\n\n/**\n * Generates bounding volumes from geometry positions\n * @param cartesianPositions\n * @param geoidHeightModel\n */\nexport function createBoundingVolumesFromGeometry(\n cartesianPositions: Float32Array,\n geoidHeightModel: Geoid\n): {mbs: Mbs; obb: Obb} {\n const positionVectors = convertPositionsToVectors(cartesianPositions);\n\n const geometryObb = makeOrientedBoundingBoxFromPoints(positionVectors);\n const geometryMbs = makeBoundingSphereFromPoints(positionVectors);\n\n let mbsCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryMbs.center, new Vector3());\n let obbCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryObb.center, new Vector3());\n\n mbsCenter[2] = mbsCenter[2] - geoidHeightModel.getHeight(mbsCenter[1], mbsCenter[0]);\n obbCenter[2] = obbCenter[2] - geoidHeightModel.getHeight(obbCenter[1], obbCenter[0]);\n\n return {\n mbs: [mbsCenter[0], mbsCenter[1], mbsCenter[2], geometryMbs.radius],\n obb: {\n center: obbCenter,\n halfSize: geometryObb.halfSize,\n quaternion: geometryObb.quaternion\n }\n };\n}\n\n/**\n * Create array of posisitons where each vertex is vector\n * @param {array} positions\n * @returns {Vector3[]}\n */\nexport function convertPositionsToVectors(positions: Float32Array): Vector3[] {\n const result: Vector3[] = [];\n\n for (let i = 0; i < positions.length; i += 3) {\n // TODO: (perf) new Vector3 is not optimal but required in `makeOrientedBoundingBoxFromPoints`.\n // modify `makeOrientedBoundingBoxFromPoints` to use scratch vectors\n const positionVector = new Vector3([positions[i], positions[i + 1], positions[i + 2]]);\n result.push(positionVector);\n }\n\n return result;\n}\n\n/**\n * Convert common coordinate to fullExtent https://github.com/Esri/i3s-spec/blob/master/docs/1.8/fullExtent.cmn.md\n * @param\n * @param boundingVolume\n * @returns - fullExtent object\n */\nexport function convertBoundingVolumeToI3SFullExtent(\n boundingVolume: OrientedBoundingBox | BoundingSphere\n): FullExtent {\n let sphere: BoundingSphere;\n if (boundingVolume instanceof BoundingSphere) {\n sphere = boundingVolume;\n } else {\n sphere = boundingVolume.getBoundingSphere();\n }\n const center: Vector3 = sphere.center;\n const radius: number = sphere.radius;\n const vertexMax = Ellipsoid.WGS84.cartesianToCartographic(\n new Vector3(center[0] + radius, center[1] + radius, center[2] + radius),\n new Vector3()\n );\n const vertexMin = Ellipsoid.WGS84.cartesianToCartographic(\n new Vector3(center[0] - radius, center[1] - radius, center[2] - radius),\n new Vector3()\n );\n\n // Converter sometimes returns min values that are bigger then max,\n // so we should check and take bigger value from max and smaller for nim\n return {\n xmin: Math.min(vertexMin[0], vertexMax[0]),\n xmax: Math.max(vertexMin[0], vertexMax[0]),\n ymin: Math.min(vertexMin[1], vertexMax[1]),\n ymax: Math.max(vertexMin[1], vertexMax[1]),\n zmin: Math.min(vertexMin[2], vertexMax[2]),\n zmax: Math.max(vertexMin[2], vertexMax[2])\n };\n}\n\n/**\n * Creates oriented boundinb box from mbs.\n * @param mbs - Minimum Bounding Sphere\n * @returns - Oriented BOunding Box\n */\nexport function createObbFromMbs(mbs: Mbs): Obb {\n const radius = mbs[3];\n const center = new Vector3(mbs[0], mbs[1], mbs[2]);\n const halfAxex = new Matrix3([radius, 0, 0, 0, radius, 0, 0, 0, radius]);\n return new OrientedBoundingBox(center, halfAxex);\n}\n"],"mappings":"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"}
|
|
@@ -1,30 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.createSceneServerPath = createSceneServerPath;
|
|
9
|
-
|
|
10
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
|
-
|
|
12
9
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
13
|
-
|
|
14
10
|
var _uuid = require("uuid");
|
|
15
|
-
|
|
16
11
|
var _jsonMapTransform = _interopRequireDefault(require("json-map-transform"));
|
|
17
|
-
|
|
18
12
|
var _path = require("path");
|
|
19
|
-
|
|
20
13
|
var _sceneServer = require("../json-templates/scene-server");
|
|
21
|
-
|
|
22
14
|
var _fileUtils = require("../../lib/utils/file-utils");
|
|
23
|
-
|
|
24
15
|
function createSceneServerPath(_x, _x2, _x3) {
|
|
25
16
|
return _createSceneServerPath.apply(this, arguments);
|
|
26
17
|
}
|
|
27
|
-
|
|
28
18
|
function _createSceneServerPath() {
|
|
29
19
|
_createSceneServerPath = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(layerName, layers0, rootPath) {
|
|
30
20
|
var sceneServerData, sceneServer, nodePagePath;
|
|
@@ -41,7 +31,6 @@ function _createSceneServerPath() {
|
|
|
41
31
|
nodePagePath = (0, _path.join)(rootPath, 'SceneServer');
|
|
42
32
|
_context.next = 5;
|
|
43
33
|
return (0, _fileUtils.writeFile)(nodePagePath, JSON.stringify(sceneServer));
|
|
44
|
-
|
|
45
34
|
case 5:
|
|
46
35
|
case "end":
|
|
47
36
|
return _context.stop();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"create-scene-server-path.js","names":["createSceneServerPath","layerName","layers0","rootPath","sceneServerData","serviceItemId","uuidv4","replace","sceneServer","transform","sceneServerTemplate","nodePagePath","join","writeFile","JSON","stringify"],"sources":["../../../../src/i3s-converter/helpers/create-scene-server-path.ts"],"sourcesContent":["import type {SceneLayer3D} from '@loaders.gl/i3s';\nimport {v4 as uuidv4} from 'uuid';\nimport transform from 'json-map-transform';\nimport {join} from 'path';\n\nimport {SCENE_SERVER as sceneServerTemplate} from '../json-templates/scene-server';\nimport {writeFile} from '../../lib/utils/file-utils';\n\n/**\n * Form and save sceneServer meta data into a file\n * @param layerName - layer name to display\n * @param layers0 - layer object embedded into sceneServer meta data\n * @param rootPath - root path of new converted tileset\n */\nexport async function createSceneServerPath(\n layerName: string,\n layers0: SceneLayer3D,\n rootPath: string\n): Promise<void> {\n const sceneServerData = {\n serviceItemId: uuidv4().replace(/-/gi, ''),\n layerName,\n layers0\n };\n\n const sceneServer = transform(sceneServerData, sceneServerTemplate());\n const nodePagePath = join(rootPath, 'SceneServer');\n await writeFile(nodePagePath, JSON.stringify(sceneServer));\n}\n"],"mappings":";;;;;;;;;AACA;AACA;AACA;AAEA;AACA;AAAqD,SAQ/BA,qBAAqB;EAAA;AAAA;AAAA;EAAA,mFAApC,iBACLC,SAAiB,EACjBC,OAAqB,EACrBC,QAAgB;IAAA;IAAA;MAAA;QAAA;UAAA;YAEVC,eAAe,GAAG;cACtBC,aAAa,EAAE,IAAAC,QAAM,GAAE,CAACC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;cAC1CN,SAAS,EAATA,SAAS;cACTC,OAAO,EAAPA;YACF,CAAC;YAEKM,WAAW,GAAG,IAAAC,yBAAS,EAACL,eAAe,EAAE,IAAAM,yBAAmB,GAAE,CAAC;YAC/DC,YAAY,GAAG,IAAAC,UAAI,EAACT,QAAQ,EAAE,aAAa,CAAC;YAAA;YAAA,OAC5C,IAAAU,oBAAS,EAACF,YAAY,EAAEG,IAAI,CAACC,SAAS,CAACP,WAAW,CAAC,CAAC;UAAA;UAAA;YAAA;QAAA;MAAA;IAAA;EAAA,CAC3D;EAAA;AAAA"}
|
|
@@ -1,43 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
|
-
exports.flattenPropertyTableByFeatureIds = flattenPropertyTableByFeatureIds;
|
|
9
7
|
exports.checkPropertiesLength = checkPropertiesLength;
|
|
10
|
-
exports.getAttributeType = getAttributeType;
|
|
11
|
-
exports.createdStorageAttribute = createdStorageAttribute;
|
|
12
|
-
exports.getFieldAttributeType = getFieldAttributeType;
|
|
13
8
|
exports.createFieldAttribute = createFieldAttribute;
|
|
14
9
|
exports.createPopupInfo = createPopupInfo;
|
|
15
|
-
|
|
10
|
+
exports.createdStorageAttribute = createdStorageAttribute;
|
|
11
|
+
exports.flattenPropertyTableByFeatureIds = flattenPropertyTableByFeatureIds;
|
|
12
|
+
exports.getAttributeType = getAttributeType;
|
|
13
|
+
exports.getFieldAttributeType = getFieldAttributeType;
|
|
16
14
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
17
|
-
|
|
18
15
|
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; } } }; }
|
|
19
|
-
|
|
20
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); }
|
|
21
|
-
|
|
22
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; }
|
|
23
|
-
|
|
24
18
|
function flattenPropertyTableByFeatureIds(featureIds, propertyTable) {
|
|
25
19
|
var resultPropertyTable = {};
|
|
26
|
-
|
|
27
20
|
for (var propertyName in propertyTable) {
|
|
28
21
|
var properties = propertyTable[propertyName];
|
|
29
22
|
resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties, featureIds);
|
|
30
23
|
}
|
|
31
|
-
|
|
32
24
|
return resultPropertyTable;
|
|
33
25
|
}
|
|
34
26
|
|
|
35
27
|
function getPropertiesByFeatureIds(properties, featureIds) {
|
|
36
28
|
var resultProperties = [];
|
|
37
|
-
|
|
38
29
|
var _iterator = _createForOfIteratorHelper(featureIds),
|
|
39
|
-
|
|
40
|
-
|
|
30
|
+
_step;
|
|
41
31
|
try {
|
|
42
32
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
43
33
|
var featureId = _step.value;
|
|
@@ -49,21 +39,17 @@ function getPropertiesByFeatureIds(properties, featureIds) {
|
|
|
49
39
|
} finally {
|
|
50
40
|
_iterator.f();
|
|
51
41
|
}
|
|
52
|
-
|
|
53
42
|
return resultProperties;
|
|
54
43
|
}
|
|
55
44
|
|
|
56
45
|
function checkPropertiesLength(featureIds, propertyTable) {
|
|
57
46
|
var needFlatten = false;
|
|
58
|
-
|
|
59
47
|
for (var _i = 0, _Object$values = Object.values(propertyTable); _i < _Object$values.length; _i++) {
|
|
60
48
|
var attribute = _Object$values[_i];
|
|
61
|
-
|
|
62
49
|
if (featureIds.length !== attribute.length) {
|
|
63
50
|
needFlatten = true;
|
|
64
51
|
}
|
|
65
52
|
}
|
|
66
|
-
|
|
67
53
|
return needFlatten;
|
|
68
54
|
}
|
|
69
55
|
|
|
@@ -71,18 +57,15 @@ var STRING_TYPE = 'string';
|
|
|
71
57
|
var SHORT_INT_TYPE = 'Int32';
|
|
72
58
|
var DOUBLE_TYPE = 'double';
|
|
73
59
|
var OBJECT_ID_TYPE = 'OBJECTID';
|
|
74
|
-
|
|
75
60
|
function getAttributeType(key, attribute) {
|
|
76
61
|
if (key === OBJECT_ID_TYPE) {
|
|
77
62
|
return OBJECT_ID_TYPE;
|
|
78
63
|
}
|
|
79
|
-
|
|
80
64
|
if ((0, _typeof2.default)(attribute) === STRING_TYPE) {
|
|
81
65
|
return STRING_TYPE;
|
|
82
66
|
} else if (typeof attribute === 'number') {
|
|
83
67
|
return Number.isInteger(attribute) ? SHORT_INT_TYPE : DOUBLE_TYPE;
|
|
84
68
|
}
|
|
85
|
-
|
|
86
69
|
return STRING_TYPE;
|
|
87
70
|
}
|
|
88
71
|
|
|
@@ -100,27 +83,21 @@ function createdStorageAttribute(attributeIndex, key, attributeType) {
|
|
|
100
83
|
valuesPerElement: 1
|
|
101
84
|
}
|
|
102
85
|
};
|
|
103
|
-
|
|
104
86
|
switch (attributeType) {
|
|
105
87
|
case OBJECT_ID_TYPE:
|
|
106
88
|
setupIdAttribute(storageAttribute);
|
|
107
89
|
break;
|
|
108
|
-
|
|
109
90
|
case STRING_TYPE:
|
|
110
91
|
setupStringAttribute(storageAttribute);
|
|
111
92
|
break;
|
|
112
|
-
|
|
113
93
|
case DOUBLE_TYPE:
|
|
114
94
|
setupDoubleAttribute(storageAttribute);
|
|
115
95
|
break;
|
|
116
|
-
|
|
117
96
|
case SHORT_INT_TYPE:
|
|
118
97
|
break;
|
|
119
|
-
|
|
120
98
|
default:
|
|
121
99
|
setupStringAttribute(storageAttribute);
|
|
122
100
|
}
|
|
123
|
-
|
|
124
101
|
return storageAttribute;
|
|
125
102
|
}
|
|
126
103
|
|
|
@@ -128,16 +105,12 @@ function getFieldAttributeType(attributeType) {
|
|
|
128
105
|
switch (attributeType) {
|
|
129
106
|
case OBJECT_ID_TYPE:
|
|
130
107
|
return 'esriFieldTypeOID';
|
|
131
|
-
|
|
132
108
|
case STRING_TYPE:
|
|
133
109
|
return 'esriFieldTypeString';
|
|
134
|
-
|
|
135
110
|
case SHORT_INT_TYPE:
|
|
136
111
|
return 'esriFieldTypeInteger';
|
|
137
|
-
|
|
138
112
|
case DOUBLE_TYPE:
|
|
139
113
|
return 'esriFieldTypeDouble';
|
|
140
|
-
|
|
141
114
|
default:
|
|
142
115
|
return 'esriFieldTypeString';
|
|
143
116
|
}
|
|
@@ -157,7 +130,6 @@ function createPopupInfo(propertyTable) {
|
|
|
157
130
|
var fieldInfos = [];
|
|
158
131
|
var popupElements = [];
|
|
159
132
|
var expressionInfos = [];
|
|
160
|
-
|
|
161
133
|
for (var key in propertyTable) {
|
|
162
134
|
fieldInfos.push({
|
|
163
135
|
fieldName: key,
|
|
@@ -166,7 +138,6 @@ function createPopupInfo(propertyTable) {
|
|
|
166
138
|
label: key
|
|
167
139
|
});
|
|
168
140
|
}
|
|
169
|
-
|
|
170
141
|
popupElements.push({
|
|
171
142
|
fieldInfos: fieldInfos,
|
|
172
143
|
type: 'fields'
|