@loaders.gl/tile-converter 3.3.0-alpha.4 → 3.3.0-alpha.6
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.d.ts +1 -1
- package/dist/3d-tiles-attributes-worker.js +2 -3
- package/dist/3d-tiles-attributes-worker.js.map +3 -3
- package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts +5 -5
- package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts.map +1 -1
- package/dist/3d-tiles-converter/helpers/b3dm-converter.js +21 -17
- package/dist/converter.min.js +23 -20
- package/dist/dist.min.js +38223 -46900
- package/dist/es5/3d-tiles-attributes-worker.js +4 -7
- 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 +53 -85
- 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 +2 -53
- 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 +2 -20
- 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 +43 -360
- 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 +2 -9
- 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 +4 -2
- 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 +29 -50
- 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 +3 -38
- 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 +4 -6
- 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 +49 -137
- 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/geometry-converter.d.ts.map +1 -1
- package/dist/i3s-converter/helpers/geometry-converter.js +2 -0
- package/dist/i3s-converter/i3s-converter.js +5 -1
- package/dist/pgm-loader.d.ts.map +1 -1
- package/dist/pgm-loader.js +2 -1
- package/dist/workers/3d-tiles-attributes-worker.js +1 -1
- package/package.json +15 -15
- package/src/3d-tiles-attributes-worker.ts +1 -1
- package/src/3d-tiles-converter/helpers/b3dm-converter.ts +25 -18
- package/src/i3s-converter/helpers/geometry-converter.ts +2 -0
- package/src/pgm-loader.ts +2 -2
- package/src/workers/3d-tiles-attributes-worker.ts +1 -1
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import transform from 'json-map-transform';
|
|
2
|
-
|
|
3
2
|
const MATERIAL_DEFINITION_INFO_PARAMS = () => ({
|
|
4
3
|
renderMode: {
|
|
5
4
|
path: 'renderMode',
|
|
@@ -38,7 +37,6 @@ const MATERIAL_DEFINITION_INFO_PARAMS = () => ({
|
|
|
38
37
|
default: true
|
|
39
38
|
}
|
|
40
39
|
});
|
|
41
|
-
|
|
42
40
|
const MATERIAL_DEFINITION_INFO = () => ({
|
|
43
41
|
name: {
|
|
44
42
|
path: 'name',
|
|
@@ -53,7 +51,6 @@ const MATERIAL_DEFINITION_INFO = () => ({
|
|
|
53
51
|
transform: (val, thisObject, originalObject) => transform(originalObject, MATERIAL_DEFINITION_INFO_PARAMS())
|
|
54
52
|
}
|
|
55
53
|
});
|
|
56
|
-
|
|
57
54
|
const TEXTURE_DEFINITION_IMAGE = () => ({
|
|
58
55
|
id: {
|
|
59
56
|
path: 'id'
|
|
@@ -69,7 +66,6 @@ const TEXTURE_DEFINITION_IMAGE = () => ({
|
|
|
69
66
|
path: 'length'
|
|
70
67
|
}
|
|
71
68
|
});
|
|
72
|
-
|
|
73
69
|
const TEXTURE_DEFINITION_INFO = () => ({
|
|
74
70
|
encoding: {
|
|
75
71
|
path: 'encoding'
|
|
@@ -95,7 +91,6 @@ const TEXTURE_DEFINITION_INFO = () => ({
|
|
|
95
91
|
transform: (val, thisObject, originalObject) => val.map(image => transform(image, TEXTURE_DEFINITION_IMAGE()))
|
|
96
92
|
}
|
|
97
93
|
});
|
|
98
|
-
|
|
99
94
|
export const SHARED_RESOURCES = () => ({
|
|
100
95
|
materialDefinitions: {
|
|
101
96
|
path: 'materialDefinitionInfos',
|
|
@@ -106,30 +101,23 @@ export const SHARED_RESOURCES = () => ({
|
|
|
106
101
|
transform: transfromTextureDefinitions
|
|
107
102
|
}
|
|
108
103
|
});
|
|
109
|
-
|
|
110
104
|
function transfromMaterialDefinitions(materialDefinitionInfos, thisObject, originalObject) {
|
|
111
105
|
const result = {};
|
|
112
|
-
|
|
113
106
|
for (const [index, materialDefinitionInfo] of materialDefinitionInfos.entries()) {
|
|
114
107
|
result["Mat".concat(originalObject.nodePath).concat(index)] = transform(materialDefinitionInfo, MATERIAL_DEFINITION_INFO());
|
|
115
108
|
}
|
|
116
|
-
|
|
117
109
|
return result;
|
|
118
110
|
}
|
|
119
|
-
|
|
120
111
|
function transfromTextureDefinitions(textureDefinitionInfos, thisObject, originalObject) {
|
|
121
112
|
if (!textureDefinitionInfos) {
|
|
122
113
|
return null;
|
|
123
114
|
}
|
|
124
|
-
|
|
125
115
|
const result = {};
|
|
126
|
-
|
|
127
116
|
for (const [index, textureDefinitionInfo] of textureDefinitionInfos.entries()) {
|
|
128
117
|
const imageIndex = "".concat(originalObject.nodePath).concat(index);
|
|
129
118
|
textureDefinitionInfo.imageIndex = imageIndex;
|
|
130
119
|
result[imageIndex] = transform(textureDefinitionInfo, TEXTURE_DEFINITION_INFO());
|
|
131
120
|
}
|
|
132
|
-
|
|
133
121
|
return result;
|
|
134
122
|
}
|
|
135
123
|
//# sourceMappingURL=shared-resources.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"shared-resources.js","names":["transform","MATERIAL_DEFINITION_INFO_PARAMS","renderMode","path","default","shininess","reflectivity","ambient","diffuse","specular","useVertexColorAlpha","vertexRegions","vertexColors","MATERIAL_DEFINITION_INFO","name","type","params","val","thisObject","originalObject","TEXTURE_DEFINITION_IMAGE","id","size","href","length","TEXTURE_DEFINITION_INFO","encoding","wrap","atlas","uvSet","channels","images","map","image","SHARED_RESOURCES","materialDefinitions","transfromMaterialDefinitions","textureDefinitions","transfromTextureDefinitions","materialDefinitionInfos","result","index","materialDefinitionInfo","entries","nodePath","textureDefinitionInfos","textureDefinitionInfo","imageIndex"],"sources":["../../../../src/i3s-converter/json-templates/shared-resources.ts"],"sourcesContent":["import transform from 'json-map-transform';\n\nconst MATERIAL_DEFINITION_INFO_PARAMS = () => ({\n renderMode: {\n path: 'renderMode',\n default: 'solid'\n },\n shininess: {\n path: 'shininess',\n default: 1\n },\n reflectivity: {\n path: 'reflectivity',\n default: 0\n },\n ambient: {\n path: 'ambient',\n default: [1, 1, 1, 1]\n },\n diffuse: {\n path: 'diffuse',\n default: [1, 1, 1, 1]\n },\n specular: {\n path: 'specular',\n default: [0, 0, 0, 0]\n },\n useVertexColorAlpha: {\n path: 'useVertexColorAlpha',\n default: false\n },\n vertexRegions: {\n path: 'vertexRegions',\n default: false\n },\n vertexColors: {\n path: 'vertexColors',\n default: true\n }\n});\n\nconst MATERIAL_DEFINITION_INFO = () => ({\n name: {\n path: 'name',\n default: 'standard'\n },\n type: {\n path: 'type',\n default: 'standard'\n },\n params: {\n path: 'params',\n transform: (val, thisObject, originalObject) =>\n transform(originalObject, MATERIAL_DEFINITION_INFO_PARAMS())\n }\n});\n\nconst TEXTURE_DEFINITION_IMAGE = () => ({\n id: {\n path: 'id'\n },\n size: {\n path: 'size'\n },\n href: {\n path: 'href',\n default: ['../textures/0']\n },\n length: {\n path: 'length'\n }\n});\n\nconst TEXTURE_DEFINITION_INFO = () => ({\n encoding: {\n path: 'encoding'\n },\n wrap: {\n path: 'wrap',\n default: ['none']\n },\n atlas: {\n path: 'atlas',\n default: false\n },\n uvSet: {\n path: 'uvSet',\n default: 'uv0'\n },\n channels: {\n path: 'channels',\n default: 'rgb'\n },\n images: {\n path: 'images',\n transform: (val, thisObject, originalObject) =>\n val.map((image) => transform(image, TEXTURE_DEFINITION_IMAGE()))\n }\n});\n\nexport const SHARED_RESOURCES = () => ({\n materialDefinitions: {\n path: 'materialDefinitionInfos',\n transform: transfromMaterialDefinitions\n },\n textureDefinitions: {\n path: 'textureDefinitionInfos',\n transform: transfromTextureDefinitions\n }\n});\n\nfunction transfromMaterialDefinitions(materialDefinitionInfos, thisObject, originalObject) {\n const result = {};\n for (const [index, materialDefinitionInfo] of materialDefinitionInfos.entries()) {\n result[`Mat${originalObject.nodePath}${index}`] = transform(\n materialDefinitionInfo,\n MATERIAL_DEFINITION_INFO()\n );\n }\n return result;\n}\n\nfunction transfromTextureDefinitions(textureDefinitionInfos, thisObject, originalObject) {\n if (!textureDefinitionInfos) {\n return null;\n }\n const result = {};\n for (const [index, textureDefinitionInfo] of textureDefinitionInfos.entries()) {\n const imageIndex = `${originalObject.nodePath}${index}`;\n textureDefinitionInfo.imageIndex = imageIndex;\n result[imageIndex] = transform(textureDefinitionInfo, TEXTURE_DEFINITION_INFO());\n }\n return result;\n}\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"store.js","names":["STORE","id","path","transform","val","toUpperCase","profile","default","version","resourcePattern","rootNode","extent","indexCRS","vertexCRS","normalReferenceFrame","attributeEncoding","textureEncoding","lodType","lodModel","defaultGeometrySchema","geometryType","header","property","type","topology","ordering","vertexAttributes","position","valueType","valuesPerElement","normal","uv0","color","featureAttributeOrder","featureAttributes","faceRange"],"sources":["../../../../src/i3s-converter/json-templates/store.ts"],"sourcesContent":["export const STORE = {\n id: {\n path: 'id',\n transform: (val) => val.toUpperCase()\n },\n profile: {\n path: 'profile',\n default: 'meshpyramids'\n },\n version: {\n path: 'version',\n default: '1.8'\n },\n resourcePattern: {\n path: 'resourcePattern',\n default: ['3dNodeIndexDocument', 'Attributes', 'SharedResource', 'Geometry']\n },\n rootNode: {\n path: 'rootNode',\n default: './nodes/root'\n },\n extent: {\n path: 'extent'\n },\n indexCRS: {\n path: 'indexCRS',\n default: 'http://www.opengis.net/def/crs/EPSG/0/4326'\n },\n vertexCRS: {\n path: 'vertexCRS',\n default: 'http://www.opengis.net/def/crs/EPSG/0/4326'\n },\n normalReferenceFrame: {\n path: 'normalReferenceFrame',\n default: 'east-north-up'\n },\n attributeEncoding: {\n path: 'attributeEncoding',\n default: 'application/octet-stream; version=1.6'\n },\n textureEncoding: {\n path: 'textureEncoding',\n default: ['image/jpeg', 'image/ktx2']\n },\n lodType: {\n path: 'lodType',\n default: 'MeshPyramid'\n },\n lodModel: {\n path: 'lodModel',\n default: 'node-switching'\n },\n defaultGeometrySchema: {\n path: 'defaultGeometrySchema',\n default: {\n geometryType: 'triangles',\n header: [\n {\n property: 'vertexCount',\n type: 'UInt32'\n },\n {\n property: 'featureCount',\n type: 'UInt32'\n }\n ],\n topology: 'PerAttributeArray',\n ordering: ['position', 'normal', 'uv0', 'color'],\n vertexAttributes: {\n position: {\n valueType: 'Float32',\n valuesPerElement: 3\n },\n normal: {\n valueType: 'Float32',\n valuesPerElement: 3\n },\n uv0: {\n valueType: 'Float32',\n valuesPerElement: 2\n },\n color: {\n valueType: 'UInt8',\n valuesPerElement: 4\n }\n },\n featureAttributeOrder: ['id', 'faceRange'],\n featureAttributes: {\n id: {\n valueType: 'UInt64',\n valuesPerElement: 1\n },\n faceRange: {\n valueType: 'UInt32',\n valuesPerElement: 2\n }\n }\n }\n }\n};\n"],"mappings":"AAAA,OAAO,MAAMA,KAAK,GAAG;EACnBC,EAAE,EAAE;IACFC,IAAI,EAAE,IAAI;IACVC,SAAS,EAAGC,GAAG,IAAKA,GAAG,CAACC,WAAW;EACrC,CAAC;EACDC,OAAO,EAAE;IACPJ,IAAI,EAAE,SAAS;IACfK,OAAO,EAAE;EACX,CAAC;EACDC,OAAO,EAAE;IACPN,IAAI,EAAE,SAAS;IACfK,OAAO,EAAE;EACX,CAAC;EACDE,eAAe,EAAE;IACfP,IAAI,EAAE,iBAAiB;IACvBK,OAAO,EAAE,CAAC,qBAAqB,EAAE,YAAY,EAAE,gBAAgB,EAAE,UAAU;EAC7E,CAAC;EACDG,QAAQ,EAAE;IACRR,IAAI,EAAE,UAAU;IAChBK,OAAO,EAAE;EACX,CAAC;EACDI,MAAM,EAAE;IACNT,IAAI,EAAE;EACR,CAAC;EACDU,QAAQ,EAAE;IACRV,IAAI,EAAE,UAAU;IAChBK,OAAO,EAAE;EACX,CAAC;EACDM,SAAS,EAAE;IACTX,IAAI,EAAE,WAAW;IACjBK,OAAO,EAAE;EACX,CAAC;EACDO,oBAAoB,EAAE;IACpBZ,IAAI,EAAE,sBAAsB;IAC5BK,OAAO,EAAE;EACX,CAAC;EACDQ,iBAAiB,EAAE;IACjBb,IAAI,EAAE,mBAAmB;IACzBK,OAAO,EAAE;EACX,CAAC;EACDS,eAAe,EAAE;IACfd,IAAI,EAAE,iBAAiB;IACvBK,OAAO,EAAE,CAAC,YAAY,EAAE,YAAY;EACtC,CAAC;EACDU,OAAO,EAAE;IACPf,IAAI,EAAE,SAAS;IACfK,OAAO,EAAE;EACX,CAAC;EACDW,QAAQ,EAAE;IACRhB,IAAI,EAAE,UAAU;IAChBK,OAAO,EAAE;EACX,CAAC;EACDY,qBAAqB,EAAE;IACrBjB,IAAI,EAAE,uBAAuB;IAC7BK,OAAO,EAAE;MACPa,YAAY,EAAE,WAAW;MACzBC,MAAM,EAAE,CACN;QACEC,QAAQ,EAAE,aAAa;QACvBC,IAAI,EAAE;MACR,CAAC,EACD;QACED,QAAQ,EAAE,cAAc;QACxBC,IAAI,EAAE;MACR,CAAC,CACF;MACDC,QAAQ,EAAE,mBAAmB;MAC7BC,QAAQ,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC;MAChDC,gBAAgB,EAAE;QAChBC,QAAQ,EAAE;UACRC,SAAS,EAAE,SAAS;UACpBC,gBAAgB,EAAE;QACpB,CAAC;QACDC,MAAM,EAAE;UACNF,SAAS,EAAE,SAAS;UACpBC,gBAAgB,EAAE;QACpB,CAAC;QACDE,GAAG,EAAE;UACHH,SAAS,EAAE,SAAS;UACpBC,gBAAgB,EAAE;QACpB,CAAC;QACDG,KAAK,EAAE;UACLJ,SAAS,EAAE,OAAO;UAClBC,gBAAgB,EAAE;QACpB;MACF,CAAC;MACDI,qBAAqB,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC;MAC1CC,iBAAiB,EAAE;QACjBjC,EAAE,EAAE;UACF2B,SAAS,EAAE,QAAQ;UACnBC,gBAAgB,EAAE;QACpB,CAAC;QACDM,SAAS,EAAE;UACTP,SAAS,EAAE,QAAQ;UACnBC,gBAAgB,EAAE;QACpB;MACF;IACF;EACF;AACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"types.js","names":[],"sources":["../../../src/i3s-converter/types.ts"],"sourcesContent":["import {\n BoundingVolumes,\n I3SMaterialDefinition,\n MaterialDefinitionInfo,\n TextureDefinitionInfo\n} from '@loaders.gl/i3s';\nimport {ImageDataType} from '@loaders.gl/images';\n\n/** Converted resources for specific node */\nexport type I3SConvertedResources = {\n /**\n * Node id\n */\n nodeId?: number;\n /** Non-compressed geometry buffer that have structure met\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.8/defaultGeometrySchema.cmn.md\n * (Geometry buffer)\n */\n geometry: ArrayBuffer | null;\n /**\n * Draco compressed geometry\n */\n compressedGeometry?: Promise<ArrayBuffer> | null;\n /**\n * Texture image content\n */\n texture: any | null;\n /**\n * Shared resources built from GLTF material\n */\n sharedResources: SharedResourcesArrays | null;\n /**\n * Material definition of the node\n */\n meshMaterial?: I3SMaterialDefinition | null;\n /**\n * Number of vertices in the node\n */\n vertexCount: number | null;\n /**\n * Feature attributes contents\n */\n attributes: ArrayBuffer[] | null;\n /**\n * Number of features in the node\n */\n featureCount: number | null;\n /**\n * MBS and/or OBB bounding volumes of the node\n */\n boundingVolumes: BoundingVolumes | null;\n};\n\n/**\n * Geometry and feature attributes converted from GLTF primitives\n */\nexport type ConvertedAttributes = {\n /** POSITION attribute value */\n positions: Float32Array;\n /** NORMAL attribute value */\n normals: Float32Array;\n /** TEXCOORD_0 attribute value */\n texCoords: Float32Array;\n /** COLOR_0 attribute value */\n colors: Uint8Array;\n /** Feature indices grouped by ...\n * converted from \"batch ids\" of GLTF\n */\n featureIndicesGroups?: number[][];\n /** Feature indices converted from \"batch ids\" */\n featureIndices: number[];\n /**\n * MBS and/or OBB bounding volumes of the node\n */\n boundingVolumes: null | BoundingVolumes;\n};\n\n/** Postprocessed geometry and feature attributes\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.8/defaultGeometrySchema.cmn.md\n */\nexport type GeometryAttributes = {\n /** POSITION attribute value */\n positions: Float32Array;\n /** NORMAL attribute value */\n normals: Float32Array;\n /** TEXCOORD_0 attribute value */\n texCoords: Float32Array;\n /** COLOR_0 attribute value */\n colors: Uint8Array;\n /** faceRanges attribute value */\n faceRange: Uint32Array;\n /** feature Ids attribute value */\n featureIds: number[];\n /** number of features in the node */\n featureCount: number;\n};\n\n/** Geometry attributes specific for the particular feature */\nexport type GroupedByFeatureIdAttributes = {\n /** Feature Id */\n featureId: number;\n /** POSITION attribute value */\n positions: Float32Array;\n /** NORMAL attribute value */\n normals: Float32Array;\n /** COLOR_0 attribute value */\n colors: Uint8Array;\n /** TEXCOORD_0 attribute value */\n texCoords: Float32Array;\n};\n\n/** Shared resources made from GLTF material */\nexport type SharedResourcesArrays = {\n /** material definitions list https://github.com/Esri/i3s-spec/blob/master/docs/1.8/materialDefinitionInfo.cmn.md */\n materialDefinitionInfos?: MaterialDefinitionInfo[];\n /** texture definitions list https://github.com/Esri/i3s-spec/blob/master/docs/1.8/textureDefinitionInfo.cmn.md*/\n textureDefinitionInfos?: TextureDefinitionInfo[];\n /** node id to make unique SharedResource ids */\n nodePath?: string;\n};\n\n/** I3S material definition and texture content taken from GLTF material */\nexport type I3SMaterialWithTexture = {\n /** Material definition https://github.com/Esri/i3s-spec/blob/master/docs/1.8/materialDefinitions.cmn.md */\n material: I3SMaterialDefinition;\n /** Texture content (image) */\n texture?: ImageDataType;\n};\n"],"mappings":""}
|
|
@@ -1,13 +1,8 @@
|
|
|
1
1
|
const express = require('express');
|
|
2
|
-
|
|
3
2
|
const path = require('path');
|
|
4
|
-
|
|
5
3
|
const logger = require('morgan');
|
|
6
|
-
|
|
7
4
|
const cors = require('cors');
|
|
8
|
-
|
|
9
5
|
const indexRouter = require('./routes/index');
|
|
10
|
-
|
|
11
6
|
const app = express();
|
|
12
7
|
app.use(logger('dev'));
|
|
13
8
|
app.use(express.json());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"app.js","names":["express","require","path","logger","cors","indexRouter","app","use","json","urlencoded","extended","static","join","__dirname","module","exports"],"sources":["../../../src/i3s-server/app.js"],"sourcesContent":["const express = require('express');\nconst path = require('path');\nconst logger = require('morgan');\nconst cors = require('cors');\n\nconst indexRouter = require('./routes/index');\n\nconst app = express();\n\napp.use(logger('dev'));\napp.use(express.json());\napp.use(express.urlencoded({extended: false}));\napp.use(express.static(path.join(__dirname, 'public')));\napp.use(cors());\n\napp.use('/', indexRouter);\n\nmodule.exports = app;\n"],"mappings":"AAAA,MAAMA,OAAO,GAAGC,OAAO,CAAC,SAAS,CAAC;AAClC,MAAMC,IAAI,GAAGD,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAME,MAAM,GAAGF,OAAO,CAAC,QAAQ,CAAC;AAChC,MAAMG,IAAI,GAAGH,OAAO,CAAC,MAAM,CAAC;AAE5B,MAAMI,WAAW,GAAGJ,OAAO,CAAC,gBAAgB,CAAC;AAE7C,MAAMK,GAAG,GAAGN,OAAO,EAAE;AAErBM,GAAG,CAACC,GAAG,CAACJ,MAAM,CAAC,KAAK,CAAC,CAAC;AACtBG,GAAG,CAACC,GAAG,CAACP,OAAO,CAACQ,IAAI,EAAE,CAAC;AACvBF,GAAG,CAACC,GAAG,CAACP,OAAO,CAACS,UAAU,CAAC;EAACC,QAAQ,EAAE;AAAK,CAAC,CAAC,CAAC;AAC9CJ,GAAG,CAACC,GAAG,CAACP,OAAO,CAACW,MAAM,CAACT,IAAI,CAACU,IAAI,CAACC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;AACvDP,GAAG,CAACC,GAAG,CAACH,IAAI,EAAE,CAAC;AAEfE,GAAG,CAACC,GAAG,CAAC,GAAG,EAAEF,WAAW,CAAC;AAEzBS,MAAM,CAACC,OAAO,GAAGT,GAAG"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
const path = require('path');
|
|
2
|
-
|
|
3
2
|
const fs = require('fs');
|
|
4
|
-
|
|
5
3
|
const {
|
|
6
4
|
promises
|
|
7
5
|
} = fs;
|
|
@@ -10,10 +8,8 @@ const FULL_LAYER_PATH = path.join(process.cwd(), I3S_LAYER_PATH);
|
|
|
10
8
|
|
|
11
9
|
async function getFileNameByUrl(url) {
|
|
12
10
|
const extensions = ['json', 'bin', 'jpg', 'jpeg', 'png', 'bin.dds', 'ktx2'];
|
|
13
|
-
|
|
14
11
|
for (const ext of extensions) {
|
|
15
12
|
const fileName = "".concat(FULL_LAYER_PATH).concat(url, "/index.").concat(ext);
|
|
16
|
-
|
|
17
13
|
try {
|
|
18
14
|
await promises.access(fileName);
|
|
19
15
|
return fileName;
|
|
@@ -24,7 +20,6 @@ async function getFileNameByUrl(url) {
|
|
|
24
20
|
|
|
25
21
|
return null;
|
|
26
22
|
}
|
|
27
|
-
|
|
28
23
|
module.exports = {
|
|
29
24
|
getFileNameByUrl
|
|
30
25
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"index-controller.js","names":["path","require","fs","promises","I3S_LAYER_PATH","process","env","I3sLayerPath","FULL_LAYER_PATH","join","cwd","getFileNameByUrl","url","extensions","ext","fileName","access","module","exports"],"sources":["../../../../src/i3s-server/controllers/index-controller.js"],"sourcesContent":["const path = require('path');\nconst fs = require('fs');\n\nconst {promises} = fs;\n\nconst I3S_LAYER_PATH = process.env.I3sLayerPath || ''; // eslint-disable-line no-process-env, no-undef\nconst FULL_LAYER_PATH = path.join(process.cwd(), I3S_LAYER_PATH); // eslint-disable-line no-undef\n\nasync function getFileNameByUrl(url) {\n const extensions = ['json', 'bin', 'jpg', 'jpeg', 'png', 'bin.dds', 'ktx2'];\n for (const ext of extensions) {\n const fileName = `${FULL_LAYER_PATH}${url}/index.${ext}`;\n try {\n await promises.access(fileName);\n return fileName;\n } catch {\n continue; // eslint-disable-line no-continue\n }\n }\n return null;\n}\n\nmodule.exports = {\n getFileNameByUrl\n};\n"],"mappings":"AAAA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAMC,EAAE,GAAGD,OAAO,CAAC,IAAI,CAAC;AAExB,MAAM;EAACE;AAAQ,CAAC,GAAGD,EAAE;AAErB,MAAME,cAAc,GAAGC,OAAO,CAACC,GAAG,CAACC,YAAY,IAAI,EAAE;AACrD,MAAMC,eAAe,GAAGR,IAAI,CAACS,IAAI,CAACJ,OAAO,CAACK,GAAG,EAAE,EAAEN,cAAc,CAAC;;AAEhE,eAAeO,gBAAgB,CAACC,GAAG,EAAE;EACnC,MAAMC,UAAU,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC;EAC3E,KAAK,MAAMC,GAAG,IAAID,UAAU,EAAE;IAC5B,MAAME,QAAQ,aAAMP,eAAe,SAAGI,GAAG,oBAAUE,GAAG,CAAE;IACxD,IAAI;MACF,MAAMX,QAAQ,CAACa,MAAM,CAACD,QAAQ,CAAC;MAC/B,OAAOA,QAAQ;IACjB,CAAC,CAAC,MAAM;MACN;IACF;EACF;;EACA,OAAO,IAAI;AACb;AAEAE,MAAM,CAACC,OAAO,GAAG;EACfP;AACF,CAAC"}
|
|
@@ -1,14 +1,11 @@
|
|
|
1
1
|
const express = require('express');
|
|
2
|
-
|
|
3
2
|
const router = express.Router();
|
|
4
|
-
|
|
5
3
|
const {
|
|
6
4
|
getFileNameByUrl
|
|
7
5
|
} = require('../controllers/index-controller');
|
|
8
6
|
|
|
9
7
|
router.get('*', async function (req, res, next) {
|
|
10
8
|
const fileName = await getFileNameByUrl(req.path);
|
|
11
|
-
|
|
12
9
|
if (fileName) {
|
|
13
10
|
res.sendFile(fileName);
|
|
14
11
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"index.js","names":["express","require","router","Router","getFileNameByUrl","get","req","res","next","fileName","path","sendFile","status","send","module","exports"],"sources":["../../../../src/i3s-server/routes/index.js"],"sourcesContent":["const express = require('express');\nconst router = express.Router();\nconst {getFileNameByUrl} = require('../controllers/index-controller');\n\n/* GET home page. */\nrouter.get('*', async function (req, res, next) {\n const fileName = await getFileNameByUrl(req.path);\n if (fileName) {\n res.sendFile(fileName);\n } else {\n res.status(404);\n res.send('File not found');\n }\n});\n\nmodule.exports = router;\n"],"mappings":"AAAA,MAAMA,OAAO,GAAGC,OAAO,CAAC,SAAS,CAAC;AAClC,MAAMC,MAAM,GAAGF,OAAO,CAACG,MAAM,EAAE;AAC/B,MAAM;EAACC;AAAgB,CAAC,GAAGH,OAAO,CAAC,iCAAiC,CAAC;;AAGrEC,MAAM,CAACG,GAAG,CAAC,GAAG,EAAE,gBAAgBC,GAAG,EAAEC,GAAG,EAAEC,IAAI,EAAE;EAC9C,MAAMC,QAAQ,GAAG,MAAML,gBAAgB,CAACE,GAAG,CAACI,IAAI,CAAC;EACjD,IAAID,QAAQ,EAAE;IACZF,GAAG,CAACI,QAAQ,CAACF,QAAQ,CAAC;EACxB,CAAC,MAAM;IACLF,GAAG,CAACK,MAAM,CAAC,GAAG,CAAC;IACfL,GAAG,CAACM,IAAI,CAAC,gBAAgB,CAAC;EAC5B;AACF,CAAC,CAAC;AAEFC,MAAM,CAACC,OAAO,GAAGb,MAAM"}
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"index.js","names":["default","I3SConverter","Tiles3DConverter"],"sources":["../../src/index.ts"],"sourcesContent":["export {default as I3SConverter} from './i3s-converter/i3s-converter';\nexport {default as Tiles3DConverter} from './3d-tiles-converter/3d-tiles-converter';\n"],"mappings":"AAAA,SAAQA,OAAO,IAAIC,YAAY,QAAO,+BAA+B;AACrE,SAAQD,OAAO,IAAIE,gBAAgB,QAAO,yCAAyC"}
|
|
@@ -8,6 +8,7 @@ import JSZip from 'jszip';
|
|
|
8
8
|
import { MD5Hash } from '@loaders.gl/crypto';
|
|
9
9
|
import crypt from 'crypt';
|
|
10
10
|
import { getAbsoluteFilePath } from './file-utils';
|
|
11
|
+
|
|
11
12
|
export function compressFileWithGzip(pathFile) {
|
|
12
13
|
const compressedPathFile = "".concat(pathFile, ".gz");
|
|
13
14
|
const gzip = createGzip();
|
|
@@ -25,36 +26,42 @@ export function compressFileWithGzip(pathFile) {
|
|
|
25
26
|
input.pipe(gzip).pipe(output);
|
|
26
27
|
});
|
|
27
28
|
}
|
|
28
|
-
|
|
29
|
+
|
|
30
|
+
export async function compressFilesWithZip(fileMap, outputFile) {
|
|
31
|
+
let level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
29
32
|
try {
|
|
30
33
|
await removeFile(outputFile);
|
|
31
|
-
} catch (e) {
|
|
32
|
-
|
|
34
|
+
} catch (e) {
|
|
35
|
+
}
|
|
33
36
|
const output = createWriteStream(outputFile);
|
|
34
37
|
const archive = archiver('zip', {
|
|
35
38
|
zlib: {
|
|
36
39
|
level
|
|
37
40
|
}
|
|
38
41
|
});
|
|
42
|
+
|
|
39
43
|
return new Promise(async (resolve, reject) => {
|
|
40
44
|
output.on('close', function () {
|
|
41
45
|
console.log("".concat(outputFile, " saved."));
|
|
42
46
|
console.log("".concat(archive.pointer(), " total bytes"));
|
|
43
47
|
resolve(null);
|
|
44
48
|
});
|
|
49
|
+
|
|
45
50
|
output.on('end', function () {
|
|
46
51
|
console.log('Data has been drained');
|
|
47
52
|
resolve(null);
|
|
48
53
|
});
|
|
54
|
+
|
|
49
55
|
archive.on('warning', function (err) {
|
|
50
56
|
console.log(err);
|
|
51
57
|
reject(err);
|
|
52
58
|
});
|
|
59
|
+
|
|
53
60
|
archive.on('error', function (err) {
|
|
54
61
|
reject(err);
|
|
55
62
|
});
|
|
56
|
-
archive.pipe(output);
|
|
57
63
|
|
|
64
|
+
archive.pipe(output);
|
|
58
65
|
for (const subFileName in fileMap) {
|
|
59
66
|
const subFileData = fileMap[subFileName];
|
|
60
67
|
await appendFileToArchive(archive, subFileName, subFileData);
|
|
@@ -63,6 +70,7 @@ export async function compressFilesWithZip(fileMap, outputFile, level = 0) {
|
|
|
63
70
|
archive.finalize();
|
|
64
71
|
});
|
|
65
72
|
}
|
|
73
|
+
|
|
66
74
|
export async function compressWithChildProcess(inputFolder, outputFile, level, inputFiles, sevenZipExe) {
|
|
67
75
|
if (process.platform === 'win32') {
|
|
68
76
|
await compressWithChildProcessWindows(inputFolder, outputFile, level, inputFiles, sevenZipExe);
|
|
@@ -71,7 +79,9 @@ export async function compressWithChildProcess(inputFolder, outputFile, level, i
|
|
|
71
79
|
}
|
|
72
80
|
}
|
|
73
81
|
|
|
74
|
-
async function compressWithChildProcessUnix(inputFolder, outputFile
|
|
82
|
+
async function compressWithChildProcessUnix(inputFolder, outputFile) {
|
|
83
|
+
let level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
84
|
+
let inputFiles = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '.';
|
|
75
85
|
const fullOutputFile = getAbsoluteFilePath(outputFile);
|
|
76
86
|
const args = ["-".concat(level), '-r', fullOutputFile, inputFiles];
|
|
77
87
|
const childProcess = new ChildProcessProxy();
|
|
@@ -85,11 +95,13 @@ async function compressWithChildProcessUnix(inputFolder, outputFile, level = 0,
|
|
|
85
95
|
});
|
|
86
96
|
}
|
|
87
97
|
|
|
88
|
-
async function compressWithChildProcessWindows(inputFolder, outputFile
|
|
98
|
+
async function compressWithChildProcessWindows(inputFolder, outputFile) {
|
|
99
|
+
let level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
100
|
+
let inputFiles = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : join('.', '*');
|
|
101
|
+
let sevenZipExe = arguments.length > 4 ? arguments[4] : undefined;
|
|
89
102
|
if (inputFiles[0] === '@') {
|
|
90
103
|
inputFiles = "*".concat(inputFiles.substr(1));
|
|
91
104
|
}
|
|
92
|
-
|
|
93
105
|
const fullOutputFile = getAbsoluteFilePath(outputFile);
|
|
94
106
|
const args = ['a', '-tzip', "-mx=".concat(level), fullOutputFile, inputFiles];
|
|
95
107
|
const childProcess = new ChildProcessProxy();
|
|
@@ -108,7 +120,6 @@ export async function generateHash128FromZip(inputZipFile, outputFile) {
|
|
|
108
120
|
const zip = await JSZip.loadAsync(input);
|
|
109
121
|
const hashTable = [];
|
|
110
122
|
const zipFiles = zip.files;
|
|
111
|
-
|
|
112
123
|
for (const relativePath in zipFiles) {
|
|
113
124
|
const zipEntry = zipFiles[relativePath];
|
|
114
125
|
const _data = '_data';
|
|
@@ -120,12 +131,10 @@ export async function generateHash128FromZip(inputZipFile, outputFile) {
|
|
|
120
131
|
value: content.byteOffset
|
|
121
132
|
});
|
|
122
133
|
}
|
|
123
|
-
|
|
124
134
|
hashTable.sort((prev, next) => {
|
|
125
135
|
if (prev.key === next.key) {
|
|
126
136
|
return prev.value < next.value ? -1 : 1;
|
|
127
137
|
}
|
|
128
|
-
|
|
129
138
|
return prev.key < next.key ? -1 : 1;
|
|
130
139
|
});
|
|
131
140
|
const output = createWriteStream(outputFile);
|
|
@@ -138,13 +147,11 @@ export async function generateHash128FromZip(inputZipFile, outputFile) {
|
|
|
138
147
|
console.log(err);
|
|
139
148
|
reject(err);
|
|
140
149
|
});
|
|
141
|
-
|
|
142
150
|
for (const key in hashTable) {
|
|
143
151
|
const item = hashTable[key];
|
|
144
152
|
const value = longToByteArray(item.value);
|
|
145
153
|
output.write(Buffer.from(crypt.hexToBytes(item.key).concat(value)));
|
|
146
154
|
}
|
|
147
|
-
|
|
148
155
|
output.close();
|
|
149
156
|
});
|
|
150
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/utils/compress-util.ts"],"names":["createGzip","join","promises","fs","createReadStream","createWriteStream","archiver","removeFile","ChildProcessProxy","JSZip","MD5Hash","crypt","getAbsoluteFilePath","compressFileWithGzip","pathFile","compressedPathFile","gzip","input","output","Promise","resolve","reject","on","console","log","error","pipe","compressFilesWithZip","fileMap","outputFile","level","e","archive","zlib","pointer","err","subFileName","subFileData","appendFileToArchive","finalize","compressWithChildProcess","inputFolder","inputFiles","sevenZipExe","process","platform","compressWithChildProcessWindows","compressWithChildProcessUnix","fullOutputFile","args","childProcess","start","command","arguments","spawn","cwd","wait","substr","generateHash128FromZip","inputZipFile","readFile","zip","loadAsync","hashTable","zipFiles","files","relativePath","zipEntry","_data","content","compressedContent","dir","hash","Buffer","from","toLowerCase","push","key","atob","value","byteOffset","sort","prev","next","item","longToByteArray","write","hexToBytes","concat","close","long","buffer","ArrayBuffer","longNum","Float64Array","parseInt","Array","Uint8Array","reverse","addFileToZip","fileName","zipFile","fileStream","append","name"],"mappings":"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","sourcesContent":["import {createGzip} from 'zlib';\nimport {join} from 'path';\nimport {promises as fs, createReadStream, createWriteStream} from 'fs';\nimport archiver from 'archiver';\nimport {removeFile} from './file-utils';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\nimport JSZip from 'jszip';\nimport {MD5Hash} from '@loaders.gl/crypto';\nimport crypt from 'crypt';\nimport {getAbsoluteFilePath} from './file-utils';\n\n/**\n * Compress file to gzip file\n *\n * @param pathFile - the path to the file\n * @return the path to the gzip file\n */\nexport function compressFileWithGzip(pathFile: string): Promise<string> {\n const compressedPathFile = `${pathFile}.gz`;\n const gzip = createGzip();\n const input = createReadStream(pathFile);\n const output = createWriteStream(compressedPathFile);\n\n return new Promise((resolve, reject) => {\n input.on('end', () => {\n console.log(`${compressedPathFile} compressed and saved.`); // eslint-disable-line no-undef,no-console\n resolve(compressedPathFile);\n });\n input.on('error', (error) => {\n console.log(`${compressedPathFile}: compression error!`); // eslint-disable-line no-undef,no-console\n reject(error);\n });\n input.pipe(gzip).pipe(output);\n });\n}\n\n/**\n * Compress files from map into slpk file\n *\n * @param fileMap - map with file paths (key: output path, value: input path)\n * @param outputFile - output slpk file\n * @param level - compression level\n */\nexport async function compressFilesWithZip(\n fileMap: {[key: string]: string},\n outputFile: string,\n level: number = 0\n) {\n // Before creating a new file, we need to delete the old file\n try {\n await removeFile(outputFile);\n } catch (e) {\n // Do nothing if old file doesn't exist\n }\n\n const output = createWriteStream(outputFile);\n const archive = archiver('zip', {\n zlib: {level} // Sets the compression level.\n });\n\n return new Promise(async (resolve, reject) => {\n // listen for all archive data to be writte\n // 'close' event is fired only when a file descriptor is involved\n output.on('close', function () {\n console.log(`${outputFile} saved.`); // eslint-disable-line no-undef,no-console\n console.log(`${archive.pointer()} total bytes`); // eslint-disable-line no-undef,no-console\n resolve(null);\n });\n\n // This event is fired when the data source is drained no matter what was the data source.\n // It is not part of this library but rather from the NodeJS Stream API.\n // @see: https://nodejs.org/api/stream.html#stream_event_end\n output.on('end', function () {\n console.log('Data has been drained'); // eslint-disable-line no-undef,no-console\n resolve(null);\n });\n\n // good practice to catch warnings (ie stat failures and other non-blocking errors)\n archive.on('warning', function (err) {\n console.log(err); // eslint-disable-line no-undef,no-console\n reject(err);\n });\n\n // good practice to catch this error explicitly\n archive.on('error', function (err) {\n reject(err);\n });\n\n // pipe archive data to the file\n archive.pipe(output);\n\n for (const subFileName in fileMap) {\n const subFileData = fileMap[subFileName];\n await appendFileToArchive(archive, subFileName, subFileData);\n }\n\n // finalize the archive (ie we are done appending files but streams have to finish yet)\n archive.finalize();\n });\n}\n\n/**\n * Compress files using external tool 'zip'/'7z'\n *\n * @param inputFolder - folder to archive - for cwd option\n * @param outputFile - output slpk file\n * @param level - compression level\n * @param inputFiles - input files path to pass to the executable as option\n * @param sevenZipExe - path to 7z.exe executable\n */\nexport async function compressWithChildProcess(\n inputFolder: string,\n outputFile: string,\n level: number,\n inputFiles: string,\n sevenZipExe: string\n) {\n // eslint-disable-next-line no-undef\n if (process.platform === 'win32') {\n await compressWithChildProcessWindows(inputFolder, outputFile, level, inputFiles, sevenZipExe);\n } else {\n await compressWithChildProcessUnix(inputFolder, outputFile, level, inputFiles);\n }\n}\n\n/**\n * Compress files using external linux tool 'zip'\n *\n * @param inputFolder - folder to archive - for cwd option\n * @param outputFile - output slpk file\n * @param level - compression level\n * @param inputFiles - input files path to pass to the executable as option\n */\nasync function compressWithChildProcessUnix(\n inputFolder: string,\n outputFile: string,\n level: number = 0,\n inputFiles: string = '.'\n) {\n const fullOutputFile = getAbsoluteFilePath(outputFile);\n const args = [`-${level}`, '-r', fullOutputFile, inputFiles];\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: 'zip',\n arguments: args,\n spawn: {\n cwd: inputFolder\n },\n wait: 0\n });\n}\n\n/**\n * Compress files using windows external tool '7z'\n *\n * @param inputFolder - folder to archive - for cwd option\n * @param outputFile - output slpk file\n * @param level - compression level\n * @param inputFiles - input files path to pass to the executable as option\n * @param sevenZipExe - path to 7z.exe executable\n */\nasync function compressWithChildProcessWindows(\n inputFolder: string,\n outputFile: string,\n level: number = 0,\n inputFiles: string = join('.', '*'),\n sevenZipExe: string\n) {\n // Workaround for @listfile issue. In 7z.exe @-leading files are handled as listfiles\n // https://sevenzip.osdn.jp/chm/cmdline/syntax.htm\n if (inputFiles[0] === '@') {\n inputFiles = `*${inputFiles.substr(1)}`;\n }\n\n const fullOutputFile = getAbsoluteFilePath(outputFile);\n const args = ['a', '-tzip', `-mx=${level}`, fullOutputFile, inputFiles];\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: sevenZipExe,\n arguments: args,\n spawn: {\n cwd: `${inputFolder}`\n },\n wait: 0\n });\n}\n\n/**\n * Generate hash file from zip archive\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.7/slpk_hashtable.cmn.md\n *\n * @param inputZipFile\n * @param outputFile\n */\nexport async function generateHash128FromZip(inputZipFile: string, outputFile: string) {\n const input = await fs.readFile(inputZipFile);\n const zip = await JSZip.loadAsync(input);\n const hashTable: {key: string; value: string}[] = [];\n const zipFiles = zip.files;\n for (const relativePath in zipFiles) {\n const zipEntry = zipFiles[relativePath];\n // Had to use a workaround because the correct string is getting the wrong data\n // const content = await zipEntry.async('nodebuffer');\n // _data isn't described in the interface, so lint thought it was wrong\n const _data = '_data';\n const content = zipEntry[_data].compressedContent;\n if (zipEntry.dir) continue; // eslint-disable-line no-continue\n // eslint-disable-next-line no-undef\n const hash = await new MD5Hash().hash(Buffer.from(relativePath.toLowerCase()));\n // eslint-disable-next-line no-undef\n hashTable.push({key: atob(hash), value: content.byteOffset});\n }\n\n hashTable.sort((prev, next) => {\n if (prev.key === next.key) {\n return prev.value < next.value ? -1 : 1;\n }\n return prev.key < next.key ? -1 : 1;\n });\n\n const output = createWriteStream(outputFile);\n return new Promise((resolve, reject) => {\n output.on('close', function () {\n console.log(`${outputFile} generated and saved`); // eslint-disable-line\n resolve(null);\n });\n output.on('error', function (err) {\n console.log(err); // eslint-disable-line\n reject(err);\n });\n for (const key in hashTable) {\n const item = hashTable[key];\n const value = longToByteArray(item.value);\n // TODO: perhaps you need to wait for the 'drain' event if the write returns 'false'\n // eslint-disable-next-line no-undef\n output.write(Buffer.from(crypt.hexToBytes(item.key).concat(value)));\n }\n output.close();\n });\n}\n\n/**\n * Encode 64 bit value to byte array\n *\n * @param long - stringified number\n * @returns\n */\nfunction longToByteArray(long: string): number[] {\n const buffer = new ArrayBuffer(8); // JS numbers are 8 bytes long, or 64 bits\n const longNum = new Float64Array(buffer); // so equivalent to Float64\n longNum[0] = parseInt(long);\n return Array.from(new Uint8Array(buffer)).reverse(); // reverse to get little endian\n}\n\n/**\n * Add file to zip archive\n *\n * @param inputFile\n * @param fileName\n * @param zipFile\n * @param sevenZipExe\n */\nexport async function addFileToZip(\n inputFolder: string,\n fileName: string,\n zipFile: string,\n sevenZipExe: string\n) {\n await compressWithChildProcess(inputFolder, zipFile, 0, fileName, sevenZipExe);\n console.log(`${fileName} added to ${zipFile}.`); // eslint-disable-line\n}\n\n/**\n *\n * @param archive zip archive instance\n * @param subFileName file path inside archive\n * @param subFileData source file path\n * @returns\n */\nfunction appendFileToArchive(archive: any, subFileName: string, subFileData: string) {\n return new Promise((resolve) => {\n const fileStream = createReadStream(subFileData);\n console.log(`Compression start: ${subFileName}`); // eslint-disable-line no-undef,no-console\n fileStream.on('close', () => {\n console.log(`Compression finish: ${subFileName}`); // eslint-disable-line no-undef,no-console\n resolve(null);\n });\n archive.append(fileStream, {name: subFileName});\n });\n}\n"],"file":"compress-util.js"}
|
|
1
|
+
{"version":3,"file":"compress-util.js","names":["createGzip","join","promises","fs","createReadStream","createWriteStream","archiver","removeFile","ChildProcessProxy","JSZip","MD5Hash","crypt","getAbsoluteFilePath","compressFileWithGzip","pathFile","compressedPathFile","gzip","input","output","Promise","resolve","reject","on","console","log","error","pipe","compressFilesWithZip","fileMap","outputFile","level","e","archive","zlib","pointer","err","subFileName","subFileData","appendFileToArchive","finalize","compressWithChildProcess","inputFolder","inputFiles","sevenZipExe","process","platform","compressWithChildProcessWindows","compressWithChildProcessUnix","fullOutputFile","args","childProcess","start","command","arguments","spawn","cwd","wait","substr","generateHash128FromZip","inputZipFile","readFile","zip","loadAsync","hashTable","zipFiles","files","relativePath","zipEntry","_data","content","compressedContent","dir","hash","Buffer","from","toLowerCase","push","key","atob","value","byteOffset","sort","prev","next","item","longToByteArray","write","hexToBytes","concat","close","long","buffer","ArrayBuffer","longNum","Float64Array","parseInt","Array","Uint8Array","reverse","addFileToZip","fileName","zipFile","fileStream","append","name"],"sources":["../../../../src/lib/utils/compress-util.ts"],"sourcesContent":["import {createGzip} from 'zlib';\nimport {join} from 'path';\nimport {promises as fs, createReadStream, createWriteStream} from 'fs';\nimport archiver from 'archiver';\nimport {removeFile} from './file-utils';\nimport {ChildProcessProxy} from '@loaders.gl/worker-utils';\nimport JSZip from 'jszip';\nimport {MD5Hash} from '@loaders.gl/crypto';\nimport crypt from 'crypt';\nimport {getAbsoluteFilePath} from './file-utils';\n\n/**\n * Compress file to gzip file\n *\n * @param pathFile - the path to the file\n * @return the path to the gzip file\n */\nexport function compressFileWithGzip(pathFile: string): Promise<string> {\n const compressedPathFile = `${pathFile}.gz`;\n const gzip = createGzip();\n const input = createReadStream(pathFile);\n const output = createWriteStream(compressedPathFile);\n\n return new Promise((resolve, reject) => {\n input.on('end', () => {\n console.log(`${compressedPathFile} compressed and saved.`); // eslint-disable-line no-undef,no-console\n resolve(compressedPathFile);\n });\n input.on('error', (error) => {\n console.log(`${compressedPathFile}: compression error!`); // eslint-disable-line no-undef,no-console\n reject(error);\n });\n input.pipe(gzip).pipe(output);\n });\n}\n\n/**\n * Compress files from map into slpk file\n *\n * @param fileMap - map with file paths (key: output path, value: input path)\n * @param outputFile - output slpk file\n * @param level - compression level\n */\nexport async function compressFilesWithZip(\n fileMap: {[key: string]: string},\n outputFile: string,\n level: number = 0\n) {\n // Before creating a new file, we need to delete the old file\n try {\n await removeFile(outputFile);\n } catch (e) {\n // Do nothing if old file doesn't exist\n }\n\n const output = createWriteStream(outputFile);\n const archive = archiver('zip', {\n zlib: {level} // Sets the compression level.\n });\n\n return new Promise(async (resolve, reject) => {\n // listen for all archive data to be writte\n // 'close' event is fired only when a file descriptor is involved\n output.on('close', function () {\n console.log(`${outputFile} saved.`); // eslint-disable-line no-undef,no-console\n console.log(`${archive.pointer()} total bytes`); // eslint-disable-line no-undef,no-console\n resolve(null);\n });\n\n // This event is fired when the data source is drained no matter what was the data source.\n // It is not part of this library but rather from the NodeJS Stream API.\n // @see: https://nodejs.org/api/stream.html#stream_event_end\n output.on('end', function () {\n console.log('Data has been drained'); // eslint-disable-line no-undef,no-console\n resolve(null);\n });\n\n // good practice to catch warnings (ie stat failures and other non-blocking errors)\n archive.on('warning', function (err) {\n console.log(err); // eslint-disable-line no-undef,no-console\n reject(err);\n });\n\n // good practice to catch this error explicitly\n archive.on('error', function (err) {\n reject(err);\n });\n\n // pipe archive data to the file\n archive.pipe(output);\n\n for (const subFileName in fileMap) {\n const subFileData = fileMap[subFileName];\n await appendFileToArchive(archive, subFileName, subFileData);\n }\n\n // finalize the archive (ie we are done appending files but streams have to finish yet)\n archive.finalize();\n });\n}\n\n/**\n * Compress files using external tool 'zip'/'7z'\n *\n * @param inputFolder - folder to archive - for cwd option\n * @param outputFile - output slpk file\n * @param level - compression level\n * @param inputFiles - input files path to pass to the executable as option\n * @param sevenZipExe - path to 7z.exe executable\n */\nexport async function compressWithChildProcess(\n inputFolder: string,\n outputFile: string,\n level: number,\n inputFiles: string,\n sevenZipExe: string\n) {\n // eslint-disable-next-line no-undef\n if (process.platform === 'win32') {\n await compressWithChildProcessWindows(inputFolder, outputFile, level, inputFiles, sevenZipExe);\n } else {\n await compressWithChildProcessUnix(inputFolder, outputFile, level, inputFiles);\n }\n}\n\n/**\n * Compress files using external linux tool 'zip'\n *\n * @param inputFolder - folder to archive - for cwd option\n * @param outputFile - output slpk file\n * @param level - compression level\n * @param inputFiles - input files path to pass to the executable as option\n */\nasync function compressWithChildProcessUnix(\n inputFolder: string,\n outputFile: string,\n level: number = 0,\n inputFiles: string = '.'\n) {\n const fullOutputFile = getAbsoluteFilePath(outputFile);\n const args = [`-${level}`, '-r', fullOutputFile, inputFiles];\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: 'zip',\n arguments: args,\n spawn: {\n cwd: inputFolder\n },\n wait: 0\n });\n}\n\n/**\n * Compress files using windows external tool '7z'\n *\n * @param inputFolder - folder to archive - for cwd option\n * @param outputFile - output slpk file\n * @param level - compression level\n * @param inputFiles - input files path to pass to the executable as option\n * @param sevenZipExe - path to 7z.exe executable\n */\nasync function compressWithChildProcessWindows(\n inputFolder: string,\n outputFile: string,\n level: number = 0,\n inputFiles: string = join('.', '*'),\n sevenZipExe: string\n) {\n // Workaround for @listfile issue. In 7z.exe @-leading files are handled as listfiles\n // https://sevenzip.osdn.jp/chm/cmdline/syntax.htm\n if (inputFiles[0] === '@') {\n inputFiles = `*${inputFiles.substr(1)}`;\n }\n\n const fullOutputFile = getAbsoluteFilePath(outputFile);\n const args = ['a', '-tzip', `-mx=${level}`, fullOutputFile, inputFiles];\n const childProcess = new ChildProcessProxy();\n await childProcess.start({\n command: sevenZipExe,\n arguments: args,\n spawn: {\n cwd: `${inputFolder}`\n },\n wait: 0\n });\n}\n\n/**\n * Generate hash file from zip archive\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.7/slpk_hashtable.cmn.md\n *\n * @param inputZipFile\n * @param outputFile\n */\nexport async function generateHash128FromZip(inputZipFile: string, outputFile: string) {\n const input = await fs.readFile(inputZipFile);\n const zip = await JSZip.loadAsync(input);\n const hashTable: {key: string; value: string}[] = [];\n const zipFiles = zip.files;\n for (const relativePath in zipFiles) {\n const zipEntry = zipFiles[relativePath];\n // Had to use a workaround because the correct string is getting the wrong data\n // const content = await zipEntry.async('nodebuffer');\n // _data isn't described in the interface, so lint thought it was wrong\n const _data = '_data';\n const content = zipEntry[_data].compressedContent;\n if (zipEntry.dir) continue; // eslint-disable-line no-continue\n // eslint-disable-next-line no-undef\n const hash = await new MD5Hash().hash(Buffer.from(relativePath.toLowerCase()));\n // eslint-disable-next-line no-undef\n hashTable.push({key: atob(hash), value: content.byteOffset});\n }\n\n hashTable.sort((prev, next) => {\n if (prev.key === next.key) {\n return prev.value < next.value ? -1 : 1;\n }\n return prev.key < next.key ? -1 : 1;\n });\n\n const output = createWriteStream(outputFile);\n return new Promise((resolve, reject) => {\n output.on('close', function () {\n console.log(`${outputFile} generated and saved`); // eslint-disable-line\n resolve(null);\n });\n output.on('error', function (err) {\n console.log(err); // eslint-disable-line\n reject(err);\n });\n for (const key in hashTable) {\n const item = hashTable[key];\n const value = longToByteArray(item.value);\n // TODO: perhaps you need to wait for the 'drain' event if the write returns 'false'\n // eslint-disable-next-line no-undef\n output.write(Buffer.from(crypt.hexToBytes(item.key).concat(value)));\n }\n output.close();\n });\n}\n\n/**\n * Encode 64 bit value to byte array\n *\n * @param long - stringified number\n * @returns\n */\nfunction longToByteArray(long: string): number[] {\n const buffer = new ArrayBuffer(8); // JS numbers are 8 bytes long, or 64 bits\n const longNum = new Float64Array(buffer); // so equivalent to Float64\n longNum[0] = parseInt(long);\n return Array.from(new Uint8Array(buffer)).reverse(); // reverse to get little endian\n}\n\n/**\n * Add file to zip archive\n *\n * @param inputFile\n * @param fileName\n * @param zipFile\n * @param sevenZipExe\n */\nexport async function addFileToZip(\n inputFolder: string,\n fileName: string,\n zipFile: string,\n sevenZipExe: string\n) {\n await compressWithChildProcess(inputFolder, zipFile, 0, fileName, sevenZipExe);\n console.log(`${fileName} added to ${zipFile}.`); // eslint-disable-line\n}\n\n/**\n *\n * @param archive zip archive instance\n * @param subFileName file path inside archive\n * @param subFileData source file path\n * @returns\n */\nfunction appendFileToArchive(archive: any, subFileName: string, subFileData: string) {\n return new Promise((resolve) => {\n const fileStream = createReadStream(subFileData);\n console.log(`Compression start: ${subFileName}`); // eslint-disable-line no-undef,no-console\n fileStream.on('close', () => {\n console.log(`Compression finish: ${subFileName}`); // eslint-disable-line no-undef,no-console\n resolve(null);\n });\n archive.append(fileStream, {name: subFileName});\n });\n}\n"],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { promises as fs } from 'fs';
|
|
2
2
|
import { isAbsolute, join } from 'path';
|
|
3
3
|
import { compressFileWithGzip } from './compress-util';
|
|
4
|
-
export async function writeFile(path, data, fileName = 'index.json') {
|
|
5
|
-
let toWriteData;
|
|
6
4
|
|
|
5
|
+
export async function writeFile(path, data) {
|
|
6
|
+
let fileName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'index.json';
|
|
7
|
+
let toWriteData;
|
|
7
8
|
if (data instanceof Promise) {
|
|
8
9
|
toWriteData = new Uint8Array(await data);
|
|
9
10
|
} else if (data instanceof ArrayBuffer) {
|
|
@@ -11,40 +12,41 @@ export async function writeFile(path, data, fileName = 'index.json') {
|
|
|
11
12
|
} else {
|
|
12
13
|
toWriteData = data;
|
|
13
14
|
}
|
|
14
|
-
|
|
15
15
|
await fs.mkdir(path, {
|
|
16
16
|
recursive: true
|
|
17
17
|
});
|
|
18
18
|
const pathFile = join(path, fileName);
|
|
19
|
-
|
|
20
19
|
try {
|
|
21
20
|
await fs.writeFile(pathFile, toWriteData);
|
|
22
21
|
} catch (err) {
|
|
23
22
|
throw err;
|
|
24
23
|
}
|
|
25
|
-
|
|
26
24
|
console.log("".concat(pathFile, " saved."));
|
|
27
25
|
return pathFile;
|
|
28
26
|
}
|
|
29
|
-
export async function writeFileForSlpk(path, data, fileName = 'index.json', compress = true) {
|
|
30
|
-
const pathFile = await writeFile(path, data, fileName);
|
|
31
27
|
|
|
28
|
+
export async function writeFileForSlpk(path, data) {
|
|
29
|
+
let fileName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'index.json';
|
|
30
|
+
let compress = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
31
|
+
const pathFile = await writeFile(path, data, fileName);
|
|
32
32
|
if (compress) {
|
|
33
33
|
const pathGzFile = await compressFileWithGzip(pathFile);
|
|
34
34
|
await removeFile(pathFile);
|
|
35
35
|
return pathGzFile;
|
|
36
36
|
}
|
|
37
|
-
|
|
38
37
|
return pathFile;
|
|
39
38
|
}
|
|
39
|
+
|
|
40
40
|
export function removeDir(path) {
|
|
41
41
|
return fs.rmdir(path, {
|
|
42
42
|
recursive: true
|
|
43
43
|
});
|
|
44
44
|
}
|
|
45
|
+
|
|
45
46
|
export function removeFile(path) {
|
|
46
47
|
return fs.unlink(path);
|
|
47
48
|
}
|
|
49
|
+
|
|
48
50
|
export function getAbsoluteFilePath(filePath) {
|
|
49
51
|
return isAbsolute(filePath) ? filePath : join(process.cwd(), filePath);
|
|
50
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"file-utils.js","names":["promises","fs","isAbsolute","join","compressFileWithGzip","writeFile","path","data","fileName","toWriteData","Promise","Uint8Array","ArrayBuffer","mkdir","recursive","pathFile","err","console","log","writeFileForSlpk","compress","pathGzFile","removeFile","removeDir","rmdir","unlink","getAbsoluteFilePath","filePath","process","cwd"],"sources":["../../../../src/lib/utils/file-utils.ts"],"sourcesContent":["import {promises as fs} from 'fs';\nimport {isAbsolute, join} from 'path';\nimport {compressFileWithGzip} from './compress-util';\n\n/**\n * Write a file with data and name fileName to path\n *\n * @param path - output path\n * @param data - file content\n * @param fileName - name of output file (default: index.json)\n */\nexport async function writeFile(\n path: string,\n data: string | Uint8Array | ArrayBuffer | Promise<ArrayBuffer>,\n fileName: string = 'index.json'\n): Promise<string> {\n let toWriteData: string | Uint8Array;\n if (data instanceof Promise) {\n toWriteData = new Uint8Array(await data);\n } else if (data instanceof ArrayBuffer) {\n toWriteData = new Uint8Array(data as ArrayBuffer);\n } else {\n toWriteData = data;\n }\n await fs.mkdir(path, {recursive: true});\n const pathFile = join(path, fileName);\n try {\n await fs.writeFile(pathFile, toWriteData);\n } catch (err) {\n throw err;\n }\n console.log(`${pathFile} saved.`); // eslint-disable-line\n return pathFile;\n}\n\n/**\n * Write a file with data and name fileName to path - specific one for further packaging into slpk\n *\n * @param path - output path\n * @param data - file content\n * @param fileName - name of output file (default: index.json)\n * @param compress - if need to compress file with gzip (default: true)\n */\nexport async function writeFileForSlpk(\n path: string,\n data: string | Uint8Array | ArrayBuffer | Promise<ArrayBuffer>,\n fileName: string = 'index.json',\n compress: boolean = true\n): Promise<string> {\n const pathFile = await writeFile(path, data, fileName);\n if (compress) {\n const pathGzFile = await compressFileWithGzip(pathFile);\n // After compression, we don't need an uncompressed file\n await removeFile(pathFile);\n return pathGzFile;\n }\n return pathFile;\n}\n\n/**\n * Remove dir with path\n *\n * @param path\n */\nexport function removeDir(path: string) {\n return fs.rmdir(path, {recursive: true});\n}\n\n/**\n * Remove file with path\n *\n * @param path\n */\nexport function removeFile(path: string) {\n return fs.unlink(path);\n}\n\n/**\n * Generates absolute file path\n * @param filePath\n */\nexport function getAbsoluteFilePath(filePath: string) {\n return isAbsolute(filePath) ? filePath : join(process.cwd(), filePath); // eslint-disable-line no-undef\n}\n"],"mappings":"AAAA,SAAQA,QAAQ,IAAIC,EAAE,QAAO,IAAI;AACjC,SAAQC,UAAU,EAAEC,IAAI,QAAO,MAAM;AACrC,SAAQC,oBAAoB,QAAO,iBAAiB;;AASpD,OAAO,eAAeC,SAAS,CAC7BC,IAAY,EACZC,IAA8D,EAE7C;EAAA,IADjBC,QAAgB,uEAAG,YAAY;EAE/B,IAAIC,WAAgC;EACpC,IAAIF,IAAI,YAAYG,OAAO,EAAE;IAC3BD,WAAW,GAAG,IAAIE,UAAU,CAAC,MAAMJ,IAAI,CAAC;EAC1C,CAAC,MAAM,IAAIA,IAAI,YAAYK,WAAW,EAAE;IACtCH,WAAW,GAAG,IAAIE,UAAU,CAACJ,IAAI,CAAgB;EACnD,CAAC,MAAM;IACLE,WAAW,GAAGF,IAAI;EACpB;EACA,MAAMN,EAAE,CAACY,KAAK,CAACP,IAAI,EAAE;IAACQ,SAAS,EAAE;EAAI,CAAC,CAAC;EACvC,MAAMC,QAAQ,GAAGZ,IAAI,CAACG,IAAI,EAAEE,QAAQ,CAAC;EACrC,IAAI;IACF,MAAMP,EAAE,CAACI,SAAS,CAACU,QAAQ,EAAEN,WAAW,CAAC;EAC3C,CAAC,CAAC,OAAOO,GAAG,EAAE;IACZ,MAAMA,GAAG;EACX;EACAC,OAAO,CAACC,GAAG,WAAIH,QAAQ,aAAU;EACjC,OAAOA,QAAQ;AACjB;;AAUA,OAAO,eAAeI,gBAAgB,CACpCb,IAAY,EACZC,IAA8D,EAG7C;EAAA,IAFjBC,QAAgB,uEAAG,YAAY;EAAA,IAC/BY,QAAiB,uEAAG,IAAI;EAExB,MAAML,QAAQ,GAAG,MAAMV,SAAS,CAACC,IAAI,EAAEC,IAAI,EAAEC,QAAQ,CAAC;EACtD,IAAIY,QAAQ,EAAE;IACZ,MAAMC,UAAU,GAAG,MAAMjB,oBAAoB,CAACW,QAAQ,CAAC;IAEvD,MAAMO,UAAU,CAACP,QAAQ,CAAC;IAC1B,OAAOM,UAAU;EACnB;EACA,OAAON,QAAQ;AACjB;;AAOA,OAAO,SAASQ,SAAS,CAACjB,IAAY,EAAE;EACtC,OAAOL,EAAE,CAACuB,KAAK,CAAClB,IAAI,EAAE;IAACQ,SAAS,EAAE;EAAI,CAAC,CAAC;AAC1C;;AAOA,OAAO,SAASQ,UAAU,CAAChB,IAAY,EAAE;EACvC,OAAOL,EAAE,CAACwB,MAAM,CAACnB,IAAI,CAAC;AACxB;;AAMA,OAAO,SAASoB,mBAAmB,CAACC,QAAgB,EAAE;EACpD,OAAOzB,UAAU,CAACyB,QAAQ,CAAC,GAAGA,QAAQ,GAAGxB,IAAI,CAACyB,OAAO,CAACC,GAAG,EAAE,EAAEF,QAAQ,CAAC;AACxE"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
|
|
1
2
|
const DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR = 16;
|
|
2
3
|
export function convertGeometricErrorToScreenThreshold(tile, coordinates) {
|
|
3
4
|
const lodSelection = [];
|
|
@@ -11,7 +12,6 @@ export function convertGeometricErrorToScreenThreshold(tile, coordinates) {
|
|
|
11
12
|
metricType: 'maxScreenThresholdSQ',
|
|
12
13
|
maxError: Math.PI * 0.25 * maxScreenThreshold.maxError * maxScreenThreshold.maxError
|
|
13
14
|
};
|
|
14
|
-
|
|
15
15
|
if (boundingVolume.constructor.name === 'OrientedBoundingBox') {
|
|
16
16
|
lodSelection.push(maxScreenThresholdSQ);
|
|
17
17
|
lodSelection.push(maxScreenThreshold);
|
|
@@ -19,25 +19,21 @@ export function convertGeometricErrorToScreenThreshold(tile, coordinates) {
|
|
|
19
19
|
lodSelection.push(maxScreenThreshold);
|
|
20
20
|
lodSelection.push(maxScreenThresholdSQ);
|
|
21
21
|
}
|
|
22
|
-
|
|
23
22
|
return lodSelection;
|
|
24
23
|
}
|
|
24
|
+
|
|
25
25
|
export function convertScreenThresholdToGeometricError(node) {
|
|
26
26
|
const metricData = node.header.lodSelection.maxScreenThreshold || {};
|
|
27
27
|
let maxError = metricData.maxError;
|
|
28
|
-
|
|
29
28
|
if (!maxError) {
|
|
30
29
|
const sqMetricData = node.header.lodSelection.maxScreenThresholdSQ;
|
|
31
|
-
|
|
32
30
|
if (sqMetricData) {
|
|
33
31
|
maxError = Math.sqrt(sqMetricData.maxError / (Math.PI * 0.25));
|
|
34
32
|
}
|
|
35
33
|
}
|
|
36
|
-
|
|
37
34
|
if (!maxError) {
|
|
38
35
|
maxError = DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR;
|
|
39
36
|
}
|
|
40
|
-
|
|
41
37
|
return node.header.mbs[3] * 2 * DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR / maxError;
|
|
42
38
|
}
|
|
43
39
|
//# sourceMappingURL=lod-conversion-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"lod-conversion-utils.js","names":["DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR","convertGeometricErrorToScreenThreshold","tile","coordinates","lodSelection","boundingVolume","lodMetricValue","maxScreenThreshold","metricType","maxError","mbs","maxScreenThresholdSQ","Math","PI","constructor","name","push","convertScreenThresholdToGeometricError","node","metricData","header","sqMetricData","sqrt"],"sources":["../../../../src/lib/utils/lod-conversion-utils.ts"],"sourcesContent":["import {BoundingVolumes} from '@loaders.gl/i3s';\nimport {Tile3D} from '@loaders.gl/tiles';\n\n// https://cesium.com/docs/cesiumjs-ref-doc/Cesium3DTileset.html\nconst DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR = 16;\n/**\n * Do conversion from geometric error to screen threshold\n * \n * In 3DTiles we have HLOD logic and parent tile also has bigger lodMetric value then its children.\n * In I3s we have reverse logic related to maxError. Parent has lower maxError than its child.\n * In nodes where are no children tile.lodMetricValue is 0. This is because of logic of HLOD in 3DTiles\n * 3DTiles spec:\n * https://github.com/CesiumGS/3d-tiles/tree/master/specification#geometric-error\n * I3S spec:\n * https://github.com/Esri/i3s-spec/blob/master/docs/1.7/lodSelection.cmn.md\n * To avoid infinity values when we do calculations of maxError we shold replace 0 with value which allows us\n * to make child maxError bigger than his parent maxError.\n * \n * @param tile - 3d-tiles tile Object\n * @param coordinates - node converted coordinates\n * @returns An array of LOD metrics in format compatible with i3s 3DNodeIndexDocument.lodSelection\n * @example \n * [\n {\n \"metricType\": \"maxScreenThresholdSQ\",\n \"maxError\": 870638.071285568\n },\n {\n \"metricType\": \"maxScreenThreshold\",\n \"maxError\": 1052.8679031638949\n }\n ]\n */\nexport function convertGeometricErrorToScreenThreshold(tile: Tile3D, coordinates: BoundingVolumes) {\n const lodSelection: {metricType: string; maxError: number}[] = [];\n const boundingVolume = tile.boundingVolume;\n const lodMetricValue = tile.lodMetricValue || 0.1;\n const maxScreenThreshold = {\n metricType: 'maxScreenThreshold',\n maxError: (coordinates.mbs[3] * 2 * DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR) / lodMetricValue\n };\n const maxScreenThresholdSQ = {\n metricType: 'maxScreenThresholdSQ',\n maxError: Math.PI * 0.25 * maxScreenThreshold.maxError * maxScreenThreshold.maxError\n };\n\n if (boundingVolume.constructor.name === 'OrientedBoundingBox') {\n lodSelection.push(maxScreenThresholdSQ);\n lodSelection.push(maxScreenThreshold);\n } else {\n lodSelection.push(maxScreenThreshold);\n lodSelection.push(maxScreenThresholdSQ);\n }\n\n return lodSelection;\n}\n\n/**\n * Convert LOD metric from \"Screen Threshold\" to \"Screen Space Error\"\n * @param node - i3s node data\n * @returns lod metric in 3d-tiles format\n */\nexport function convertScreenThresholdToGeometricError(node: Tile3D): number {\n const metricData = node.header.lodSelection.maxScreenThreshold || {};\n let maxError = metricData.maxError;\n if (!maxError) {\n const sqMetricData = node.header.lodSelection.maxScreenThresholdSQ;\n if (sqMetricData) {\n maxError = Math.sqrt(sqMetricData.maxError / (Math.PI * 0.25));\n }\n }\n\n if (!maxError) {\n maxError = DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR;\n }\n\n return (node.header.mbs[3] * 2 * DEFAULT_MAXIMUM_SCREEN_SPACE_ERROR) / maxError;\n}\n"],"mappings":";AAIA,MAAMA,kCAAkC,GAAG,EAAE;AA6B7C,OAAO,SAASC,sCAAsC,CAACC,IAAY,EAAEC,WAA4B,EAAE;EACjG,MAAMC,YAAsD,GAAG,EAAE;EACjE,MAAMC,cAAc,GAAGH,IAAI,CAACG,cAAc;EAC1C,MAAMC,cAAc,GAAGJ,IAAI,CAACI,cAAc,IAAI,GAAG;EACjD,MAAMC,kBAAkB,GAAG;IACzBC,UAAU,EAAE,oBAAoB;IAChCC,QAAQ,EAAGN,WAAW,CAACO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAGV,kCAAkC,GAAIM;EAC5E,CAAC;EACD,MAAMK,oBAAoB,GAAG;IAC3BH,UAAU,EAAE,sBAAsB;IAClCC,QAAQ,EAAEG,IAAI,CAACC,EAAE,GAAG,IAAI,GAAGN,kBAAkB,CAACE,QAAQ,GAAGF,kBAAkB,CAACE;EAC9E,CAAC;EAED,IAAIJ,cAAc,CAACS,WAAW,CAACC,IAAI,KAAK,qBAAqB,EAAE;IAC7DX,YAAY,CAACY,IAAI,CAACL,oBAAoB,CAAC;IACvCP,YAAY,CAACY,IAAI,CAACT,kBAAkB,CAAC;EACvC,CAAC,MAAM;IACLH,YAAY,CAACY,IAAI,CAACT,kBAAkB,CAAC;IACrCH,YAAY,CAACY,IAAI,CAACL,oBAAoB,CAAC;EACzC;EAEA,OAAOP,YAAY;AACrB;;AAOA,OAAO,SAASa,sCAAsC,CAACC,IAAY,EAAU;EAC3E,MAAMC,UAAU,GAAGD,IAAI,CAACE,MAAM,CAAChB,YAAY,CAACG,kBAAkB,IAAI,CAAC,CAAC;EACpE,IAAIE,QAAQ,GAAGU,UAAU,CAACV,QAAQ;EAClC,IAAI,CAACA,QAAQ,EAAE;IACb,MAAMY,YAAY,GAAGH,IAAI,CAACE,MAAM,CAAChB,YAAY,CAACO,oBAAoB;IAClE,IAAIU,YAAY,EAAE;MAChBZ,QAAQ,GAAGG,IAAI,CAACU,IAAI,CAACD,YAAY,CAACZ,QAAQ,IAAIG,IAAI,CAACC,EAAE,GAAG,IAAI,CAAC,CAAC;IAChE;EACF;EAEA,IAAI,CAACJ,QAAQ,EAAE;IACbA,QAAQ,GAAGT,kCAAkC;EAC/C;EAEA,OAAQkB,IAAI,CAACE,MAAM,CAACV,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAGV,kCAAkC,GAAIS,QAAQ;AACjF"}
|