@loaders.gl/tile-converter 3.3.0-alpha.1 → 3.3.0-alpha.11

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.
Files changed (252) hide show
  1. package/dist/3d-tiles-attributes-worker.d.ts +3 -3
  2. package/dist/3d-tiles-attributes-worker.d.ts.map +1 -1
  3. package/dist/3d-tiles-attributes-worker.js +2 -3
  4. package/dist/3d-tiles-attributes-worker.js.map +3 -3
  5. package/dist/3d-tiles-converter/3d-tiles-converter.d.ts +8 -0
  6. package/dist/3d-tiles-converter/3d-tiles-converter.d.ts.map +1 -1
  7. package/dist/3d-tiles-converter/3d-tiles-converter.js +57 -43
  8. package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts +5 -5
  9. package/dist/3d-tiles-converter/helpers/b3dm-converter.d.ts.map +1 -1
  10. package/dist/3d-tiles-converter/helpers/b3dm-converter.js +21 -17
  11. package/dist/converter-cli.js +29 -4
  12. package/dist/converter.min.js +24 -21
  13. package/dist/deps-installer/deps-installer.d.ts +5 -1
  14. package/dist/deps-installer/deps-installer.d.ts.map +1 -1
  15. package/dist/deps-installer/deps-installer.js +29 -1
  16. package/dist/dist.min.js +42714 -45782
  17. package/dist/es5/3d-tiles-attributes-worker.js +4 -7
  18. package/dist/es5/3d-tiles-attributes-worker.js.map +1 -1
  19. package/dist/es5/3d-tiles-converter/3d-tiles-converter.js +125 -210
  20. package/dist/es5/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
  21. package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.js +53 -85
  22. package/dist/es5/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
  23. package/dist/es5/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js +0 -8
  24. package/dist/es5/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js.map +1 -1
  25. package/dist/es5/3d-tiles-converter/helpers/texture-atlas.js +0 -5
  26. package/dist/es5/3d-tiles-converter/helpers/texture-atlas.js.map +1 -1
  27. package/dist/es5/3d-tiles-converter/json-templates/tileset.js +0 -6
  28. package/dist/es5/3d-tiles-converter/json-templates/tileset.js.map +1 -1
  29. package/dist/es5/bundle.js +0 -1
  30. package/dist/es5/bundle.js.map +1 -1
  31. package/dist/es5/constants.js.map +1 -1
  32. package/dist/es5/converter-cli.js +25 -58
  33. package/dist/es5/converter-cli.js.map +1 -1
  34. package/dist/es5/deps-installer/deps-installer.js +73 -28
  35. package/dist/es5/deps-installer/deps-installer.js.map +1 -1
  36. package/dist/es5/i3s-attributes-worker.js +3 -6
  37. package/dist/es5/i3s-attributes-worker.js.map +1 -1
  38. package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js +18 -29
  39. package/dist/es5/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
  40. package/dist/es5/i3s-converter/helpers/coordinate-converter.js +8 -25
  41. package/dist/es5/i3s-converter/helpers/coordinate-converter.js.map +1 -1
  42. package/dist/es5/i3s-converter/helpers/create-scene-server-path.js +0 -11
  43. package/dist/es5/i3s-converter/helpers/create-scene-server-path.js.map +1 -1
  44. package/dist/es5/i3s-converter/helpers/feature-attributes.js +184 -0
  45. package/dist/es5/i3s-converter/helpers/feature-attributes.js.map +1 -0
  46. package/dist/es5/i3s-converter/helpers/geometry-attributes.js +60 -51
  47. package/dist/es5/i3s-converter/helpers/geometry-attributes.js.map +1 -1
  48. package/dist/es5/i3s-converter/helpers/geometry-converter.js +504 -350
  49. package/dist/es5/i3s-converter/helpers/geometry-converter.js.map +1 -1
  50. package/dist/es5/i3s-converter/helpers/gltf-attributes.js +57 -57
  51. package/dist/es5/i3s-converter/helpers/gltf-attributes.js.map +1 -1
  52. package/dist/es5/i3s-converter/helpers/node-debug.js +4 -23
  53. package/dist/es5/i3s-converter/helpers/node-debug.js.map +1 -1
  54. package/dist/es5/i3s-converter/helpers/node-index-document.js +517 -0
  55. package/dist/es5/i3s-converter/helpers/node-index-document.js.map +1 -0
  56. package/dist/es5/i3s-converter/helpers/node-pages.js +478 -168
  57. package/dist/es5/i3s-converter/helpers/node-pages.js.map +1 -1
  58. package/dist/es5/i3s-converter/i3s-converter.js +770 -1131
  59. package/dist/es5/i3s-converter/i3s-converter.js.map +1 -1
  60. package/dist/es5/i3s-converter/json-templates/geometry-definitions.js +107 -0
  61. package/dist/es5/i3s-converter/json-templates/geometry-definitions.js.map +1 -0
  62. package/dist/es5/i3s-converter/json-templates/layers.js +2 -107
  63. package/dist/es5/i3s-converter/json-templates/layers.js.map +1 -1
  64. package/dist/es5/i3s-converter/json-templates/metadata.js +0 -2
  65. package/dist/es5/i3s-converter/json-templates/metadata.js.map +1 -1
  66. package/dist/es5/i3s-converter/json-templates/node.js +2 -12
  67. package/dist/es5/i3s-converter/json-templates/node.js.map +1 -1
  68. package/dist/es5/i3s-converter/json-templates/scene-server.js +0 -2
  69. package/dist/es5/i3s-converter/json-templates/scene-server.js.map +1 -1
  70. package/dist/es5/i3s-converter/json-templates/shared-resources.js +9 -32
  71. package/dist/es5/i3s-converter/json-templates/shared-resources.js.map +1 -1
  72. package/dist/es5/i3s-converter/json-templates/store.js.map +1 -1
  73. package/dist/es5/i3s-converter/types.js.map +1 -1
  74. package/dist/es5/i3s-server/app.js +0 -5
  75. package/dist/es5/i3s-server/app.js.map +1 -1
  76. package/dist/es5/i3s-server/controllers/index-controller.js +0 -16
  77. package/dist/es5/i3s-server/controllers/index-controller.js.map +1 -1
  78. package/dist/es5/i3s-server/routes/index.js +1 -10
  79. package/dist/es5/i3s-server/routes/index.js.map +1 -1
  80. package/dist/es5/index.js +0 -3
  81. package/dist/es5/index.js.map +1 -1
  82. package/dist/es5/lib/utils/compress-util.js +19 -74
  83. package/dist/es5/lib/utils/compress-util.js.map +1 -1
  84. package/dist/es5/lib/utils/file-utils.js +103 -47
  85. package/dist/es5/lib/utils/file-utils.js.map +1 -1
  86. package/dist/es5/lib/utils/lod-conversion-utils.js +0 -7
  87. package/dist/es5/lib/utils/lod-conversion-utils.js.map +1 -1
  88. package/dist/es5/lib/utils/queue.js +0 -14
  89. package/dist/es5/lib/utils/queue.js.map +1 -1
  90. package/dist/es5/lib/utils/statistic-utills.js +1 -46
  91. package/dist/es5/lib/utils/statistic-utills.js.map +1 -1
  92. package/dist/es5/lib/utils/write-queue.js +86 -87
  93. package/dist/es5/lib/utils/write-queue.js.map +1 -1
  94. package/dist/es5/pgm-loader.js +1 -8
  95. package/dist/es5/pgm-loader.js.map +1 -1
  96. package/dist/es5/workers/3d-tiles-attributes-worker.js +2 -9
  97. package/dist/es5/workers/3d-tiles-attributes-worker.js.map +1 -1
  98. package/dist/es5/workers/i3s-attributes-worker.js +2 -10
  99. package/dist/es5/workers/i3s-attributes-worker.js.map +1 -1
  100. package/dist/esm/3d-tiles-attributes-worker.js +4 -2
  101. package/dist/esm/3d-tiles-attributes-worker.js.map +1 -1
  102. package/dist/esm/3d-tiles-converter/3d-tiles-converter.js +60 -77
  103. package/dist/esm/3d-tiles-converter/3d-tiles-converter.js.map +1 -1
  104. package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js +29 -50
  105. package/dist/esm/3d-tiles-converter/helpers/b3dm-converter.js.map +1 -1
  106. package/dist/esm/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js +1 -0
  107. package/dist/esm/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.js.map +1 -1
  108. package/dist/esm/3d-tiles-converter/helpers/texture-atlas.js +1 -4
  109. package/dist/esm/3d-tiles-converter/helpers/texture-atlas.js.map +1 -1
  110. package/dist/esm/3d-tiles-converter/json-templates/tileset.js +0 -3
  111. package/dist/esm/3d-tiles-converter/json-templates/tileset.js.map +1 -1
  112. package/dist/esm/bundle.js +1 -1
  113. package/dist/esm/bundle.js.map +1 -1
  114. package/dist/esm/constants.js.map +1 -1
  115. package/dist/esm/converter-cli.js +26 -43
  116. package/dist/esm/converter-cli.js.map +1 -1
  117. package/dist/esm/deps-installer/deps-installer.js +30 -4
  118. package/dist/esm/deps-installer/deps-installer.js.map +1 -1
  119. package/dist/esm/i3s-attributes-worker.js +3 -1
  120. package/dist/esm/i3s-attributes-worker.js.map +1 -1
  121. package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js +20 -24
  122. package/dist/esm/i3s-converter/helpers/batch-ids-extensions.js.map +1 -1
  123. package/dist/esm/i3s-converter/helpers/coordinate-converter.js +11 -12
  124. package/dist/esm/i3s-converter/helpers/coordinate-converter.js.map +1 -1
  125. package/dist/esm/i3s-converter/helpers/create-scene-server-path.js +1 -0
  126. package/dist/esm/i3s-converter/helpers/create-scene-server-path.js.map +1 -1
  127. package/dist/esm/i3s-converter/helpers/feature-attributes.js +158 -0
  128. package/dist/esm/i3s-converter/helpers/feature-attributes.js.map +1 -0
  129. package/dist/esm/i3s-converter/helpers/geometry-attributes.js +39 -33
  130. package/dist/esm/i3s-converter/helpers/geometry-attributes.js.map +1 -1
  131. package/dist/esm/i3s-converter/helpers/geometry-converter.js +286 -192
  132. package/dist/esm/i3s-converter/helpers/geometry-converter.js.map +1 -1
  133. package/dist/esm/i3s-converter/helpers/gltf-attributes.js +59 -48
  134. package/dist/esm/i3s-converter/helpers/gltf-attributes.js.map +1 -1
  135. package/dist/esm/i3s-converter/helpers/node-debug.js +3 -13
  136. package/dist/esm/i3s-converter/helpers/node-debug.js.map +1 -1
  137. package/dist/esm/i3s-converter/helpers/node-index-document.js +202 -0
  138. package/dist/esm/i3s-converter/helpers/node-index-document.js.map +1 -0
  139. package/dist/esm/i3s-converter/helpers/node-pages.js +161 -87
  140. package/dist/esm/i3s-converter/helpers/node-pages.js.map +1 -1
  141. package/dist/esm/i3s-converter/i3s-converter.js +217 -509
  142. package/dist/esm/i3s-converter/i3s-converter.js.map +1 -1
  143. package/dist/esm/i3s-converter/json-templates/geometry-definitions.js +89 -0
  144. package/dist/esm/i3s-converter/json-templates/geometry-definitions.js.map +1 -0
  145. package/dist/esm/i3s-converter/json-templates/layers.js +2 -95
  146. package/dist/esm/i3s-converter/json-templates/layers.js.map +1 -1
  147. package/dist/esm/i3s-converter/json-templates/metadata.js.map +1 -1
  148. package/dist/esm/i3s-converter/json-templates/node.js +0 -4
  149. package/dist/esm/i3s-converter/json-templates/node.js.map +1 -1
  150. package/dist/esm/i3s-converter/json-templates/scene-server.js.map +1 -1
  151. package/dist/esm/i3s-converter/json-templates/shared-resources.js +3 -15
  152. package/dist/esm/i3s-converter/json-templates/shared-resources.js.map +1 -1
  153. package/dist/esm/i3s-converter/json-templates/store.js.map +1 -1
  154. package/dist/esm/i3s-converter/types.js.map +1 -1
  155. package/dist/esm/i3s-server/app.js +0 -5
  156. package/dist/esm/i3s-server/app.js.map +1 -1
  157. package/dist/esm/i3s-server/controllers/index-controller.js +0 -5
  158. package/dist/esm/i3s-server/controllers/index-controller.js.map +1 -1
  159. package/dist/esm/i3s-server/routes/index.js +0 -3
  160. package/dist/esm/i3s-server/routes/index.js.map +1 -1
  161. package/dist/esm/index.js.map +1 -1
  162. package/dist/esm/lib/utils/compress-util.js +19 -12
  163. package/dist/esm/lib/utils/compress-util.js.map +1 -1
  164. package/dist/esm/lib/utils/file-utils.js +54 -11
  165. package/dist/esm/lib/utils/file-utils.js.map +1 -1
  166. package/dist/esm/lib/utils/lod-conversion-utils.js +2 -6
  167. package/dist/esm/lib/utils/lod-conversion-utils.js.map +1 -1
  168. package/dist/esm/lib/utils/queue.js +0 -4
  169. package/dist/esm/lib/utils/queue.js.map +1 -1
  170. package/dist/esm/lib/utils/statistic-utills.js +0 -11
  171. package/dist/esm/lib/utils/statistic-utills.js.map +1 -1
  172. package/dist/esm/lib/utils/write-queue.js +29 -28
  173. package/dist/esm/lib/utils/write-queue.js.map +1 -1
  174. package/dist/esm/pgm-loader.js +3 -1
  175. package/dist/esm/pgm-loader.js.map +1 -1
  176. package/dist/esm/workers/3d-tiles-attributes-worker.js +4 -1
  177. package/dist/esm/workers/3d-tiles-attributes-worker.js.map +1 -1
  178. package/dist/esm/workers/i3s-attributes-worker.js +4 -1
  179. package/dist/esm/workers/i3s-attributes-worker.js.map +1 -1
  180. package/dist/i3s-attributes-worker.d.ts +7 -3
  181. package/dist/i3s-attributes-worker.d.ts.map +1 -1
  182. package/dist/i3s-attributes-worker.js +2 -3
  183. package/dist/i3s-attributes-worker.js.map +3 -3
  184. package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts +5 -6
  185. package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts.map +1 -1
  186. package/dist/i3s-converter/helpers/batch-ids-extensions.js +18 -4
  187. package/dist/i3s-converter/helpers/coordinate-converter.d.ts +2 -2
  188. package/dist/i3s-converter/helpers/coordinate-converter.d.ts.map +1 -1
  189. package/dist/i3s-converter/helpers/coordinate-converter.js +8 -6
  190. package/dist/i3s-converter/helpers/feature-attributes.d.ts +56 -0
  191. package/dist/i3s-converter/helpers/feature-attributes.d.ts.map +1 -0
  192. package/dist/i3s-converter/helpers/feature-attributes.js +216 -0
  193. package/dist/i3s-converter/helpers/geometry-attributes.d.ts.map +1 -1
  194. package/dist/i3s-converter/helpers/geometry-attributes.js +42 -17
  195. package/dist/i3s-converter/helpers/geometry-converter.d.ts +18 -6
  196. package/dist/i3s-converter/helpers/geometry-converter.d.ts.map +1 -1
  197. package/dist/i3s-converter/helpers/geometry-converter.js +337 -92
  198. package/dist/i3s-converter/helpers/gltf-attributes.d.ts.map +1 -1
  199. package/dist/i3s-converter/helpers/gltf-attributes.js +51 -32
  200. package/dist/i3s-converter/helpers/node-index-document.d.ts +95 -0
  201. package/dist/i3s-converter/helpers/node-index-document.d.ts.map +1 -0
  202. package/dist/i3s-converter/helpers/node-index-document.js +250 -0
  203. package/dist/i3s-converter/helpers/node-pages.d.ts +81 -42
  204. package/dist/i3s-converter/helpers/node-pages.d.ts.map +1 -1
  205. package/dist/i3s-converter/helpers/node-pages.js +201 -93
  206. package/dist/i3s-converter/i3s-converter.d.ts +52 -108
  207. package/dist/i3s-converter/i3s-converter.d.ts.map +1 -1
  208. package/dist/i3s-converter/i3s-converter.js +223 -421
  209. package/dist/i3s-converter/json-templates/geometry-definitions.d.ts +7 -0
  210. package/dist/i3s-converter/json-templates/geometry-definitions.d.ts.map +1 -0
  211. package/dist/i3s-converter/json-templates/geometry-definitions.js +87 -0
  212. package/dist/i3s-converter/json-templates/layers.d.ts +1 -30
  213. package/dist/i3s-converter/json-templates/layers.d.ts.map +1 -1
  214. package/dist/i3s-converter/json-templates/layers.js +2 -86
  215. package/dist/i3s-converter/json-templates/shared-resources.js +3 -3
  216. package/dist/i3s-converter/types.d.ts +37 -55
  217. package/dist/i3s-converter/types.d.ts.map +1 -1
  218. package/dist/lib/utils/file-utils.d.ts +17 -1
  219. package/dist/lib/utils/file-utils.d.ts.map +1 -1
  220. package/dist/lib/utils/file-utils.js +64 -7
  221. package/dist/lib/utils/write-queue.d.ts +19 -2
  222. package/dist/lib/utils/write-queue.d.ts.map +1 -1
  223. package/dist/lib/utils/write-queue.js +26 -7
  224. package/dist/pgm-loader.d.ts.map +1 -1
  225. package/dist/pgm-loader.js +2 -1
  226. package/dist/workers/3d-tiles-attributes-worker.js +1 -1
  227. package/dist/workers/i3s-attributes-worker.js +1 -1
  228. package/package.json +18 -16
  229. package/src/3d-tiles-attributes-worker.ts +1 -1
  230. package/src/3d-tiles-converter/3d-tiles-converter.ts +71 -55
  231. package/src/3d-tiles-converter/helpers/b3dm-converter.ts +25 -18
  232. package/src/converter-cli.ts +38 -4
  233. package/src/deps-installer/deps-installer.ts +38 -2
  234. package/src/i3s-attributes-worker.ts +5 -1
  235. package/src/i3s-converter/helpers/batch-ids-extensions.ts +38 -14
  236. package/src/i3s-converter/helpers/coordinate-converter.ts +10 -8
  237. package/src/i3s-converter/helpers/feature-attributes.ts +247 -0
  238. package/src/i3s-converter/helpers/geometry-attributes.ts +46 -18
  239. package/src/i3s-converter/helpers/geometry-converter.ts +405 -108
  240. package/src/i3s-converter/helpers/gltf-attributes.ts +55 -35
  241. package/src/i3s-converter/helpers/node-index-document.ts +315 -0
  242. package/src/i3s-converter/helpers/node-pages.ts +222 -109
  243. package/src/i3s-converter/i3s-converter.ts +269 -500
  244. package/src/i3s-converter/json-templates/geometry-definitions.ts +83 -0
  245. package/src/i3s-converter/json-templates/layers.ts +2 -91
  246. package/src/i3s-converter/json-templates/shared-resources.ts +3 -3
  247. package/src/i3s-converter/types.ts +31 -51
  248. package/src/lib/utils/file-utils.ts +62 -7
  249. package/src/lib/utils/write-queue.ts +43 -10
  250. package/src/pgm-loader.ts +2 -2
  251. package/src/workers/3d-tiles-attributes-worker.ts +1 -1
  252. package/src/workers/i3s-attributes-worker.ts +2 -1
@@ -32,6 +32,14 @@ export default class Tiles3DConverter {
32
32
  maxDepth?: number;
33
33
  egmFilePath: string;
34
34
  }): Promise<any>;
35
+ /**
36
+ * Convert particular I3S Node
37
+ * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)
38
+ * @param parentNode object in resulting tileset
39
+ * @param level a current level of a tree depth
40
+ * @param childNodeInfo child node to convert
41
+ */
42
+ private convertChildNode;
35
43
  /**
36
44
  * The recursive function of traversal of a nodes tree
37
45
  * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)
@@ -1 +1 @@
1
- {"version":3,"file":"3d-tiles-converter.d.ts","sourceRoot":"","sources":["../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,oBAAoB,EAAkC,MAAM,iBAAiB,CAAC;AAQ3F,OAAO,EAAC,SAAS,EAAS,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAoBrC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,KAAK,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,SAAS,GAAG,IAAI,CAAC;IAChC,oBAAoB,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAClD,YAAY,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;;IAa3C;;;;;;;;OAQG;IACU,OAAO,CAAC,OAAO,EAAE;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,GAAG,CAAC;IA0DhB;;;;;OAKG;YACW,YAAY;IAgE1B;;;;;OAKG;YACW,cAAc;IAyB5B;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAiB7B;;;;;OAKG;YACW,oBAAoB;IAsBlC;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IASzB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAU5B;;;OAGG;YACW,iBAAiB;YAiBjB,WAAW;CAS1B"}
1
+ {"version":3,"file":"3d-tiles-converter.d.ts","sourceRoot":"","sources":["../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,oBAAoB,EAAkC,MAAM,iBAAiB,CAAC;AAQ3F,OAAO,EAAC,SAAS,EAAS,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAmBrC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,KAAK,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,SAAS,GAAG,IAAI,CAAC;IAChC,oBAAoB,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAClD,YAAY,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;;IAa3C;;;;;;;;OAQG;IACU,OAAO,CAAC,OAAO,EAAE;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,GAAG,CAAC;IA+DhB;;;;;;OAMG;YACW,gBAAgB;IAsD9B;;;;;OAKG;YACW,YAAY;IAe1B;;;;;OAKG;YACW,cAAc;IAyB5B;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAiB7B;;;;;OAKG;YACW,oBAAoB;IAsBlC;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IASzB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAU5B;;;OAGG;YACW,iBAAiB;YAiBjB,WAAW;CAS1B"}
@@ -15,7 +15,6 @@ const lod_conversion_utils_1 = require("../lib/utils/lod-conversion-utils");
15
15
  const file_utils_1 = require("../lib/utils/file-utils");
16
16
  const statistic_utills_1 = require("../lib/utils/statistic-utills");
17
17
  const tileset_1 = require("./json-templates/tileset");
18
- const b3dm_converter_1 = __importDefault(require("./helpers/b3dm-converter"));
19
18
  const coordinate_converter_1 = require("../i3s-converter/helpers/coordinate-converter");
20
19
  const _3d_tiles_attributes_worker_1 = require("../3d-tiles-attributes-worker");
21
20
  const worker_utils_1 = require("@loaders.gl/worker-utils");
@@ -60,6 +59,11 @@ class Tiles3DConverter {
60
59
  const sourceTilesetJson = await (0, core_1.load)(inputUrl, i3s_1.I3SLoader, {});
61
60
  this.sourceTileset = new tiles_1.Tileset3D(sourceTilesetJson, {
62
61
  loadOptions: {
62
+ _nodeWorkers: true,
63
+ reuseWorkers: true,
64
+ 'i3s-content-nodejs': {
65
+ workerUrl: './modules/i3s/dist/i3s-content-nodejs-worker.js'
66
+ },
63
67
  i3s: { coordinateSystem: i3s_1.COORDINATE_SYSTEM.LNGLAT_OFFSETS, decodeTextures: false }
64
68
  }
65
69
  });
@@ -92,6 +96,55 @@ class Tiles3DConverter {
92
96
  const workerFarm = worker_utils_1.WorkerFarm.getWorkerFarm({});
93
97
  workerFarm.destroy();
94
98
  }
99
+ /**
100
+ * Convert particular I3S Node
101
+ * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)
102
+ * @param parentNode object in resulting tileset
103
+ * @param level a current level of a tree depth
104
+ * @param childNodeInfo child node to convert
105
+ */
106
+ async convertChildNode(parentSourceNode, parentNode, level, childNodeInfo) {
107
+ const sourceChild = await this._loadChildNode(parentSourceNode, childNodeInfo);
108
+ parentSourceNode.children.push(sourceChild);
109
+ if (sourceChild.contentUrl) {
110
+ await this.sourceTileset._loadTile(sourceChild);
111
+ this.vertexCounter += sourceChild.content.vertexCount;
112
+ let featureAttributes = null;
113
+ if (this.attributeStorageInfo) {
114
+ featureAttributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
115
+ }
116
+ if (!sourceChild.header.obb) {
117
+ sourceChild.header.obb = (0, coordinate_converter_1.createObbFromMbs)(sourceChild.header.mbs);
118
+ }
119
+ const boundingVolume = {
120
+ box: (0, i3s_obb_to_3d_tiles_obb_1.i3sObbTo3dTilesObb)(sourceChild.header.obb, this.geoidHeightModel)
121
+ };
122
+ const child = {
123
+ boundingVolume,
124
+ geometricError: (0, lod_conversion_utils_1.convertScreenThresholdToGeometricError)(sourceChild),
125
+ children: []
126
+ };
127
+ const i3sAttributesData = {
128
+ tileContent: sourceChild.content,
129
+ textureFormat: sourceChild?.header?.textureFormat
130
+ };
131
+ const b3dm = await (0, _3d_tiles_attributes_worker_1.transform3DTilesAttributesOnWorker)(i3sAttributesData, {
132
+ source: this.workerSource.tile3dWorkerSource,
133
+ featureAttributes
134
+ });
135
+ child.content = {
136
+ uri: `${sourceChild.id}.b3dm`,
137
+ boundingVolume
138
+ };
139
+ await (0, file_utils_1.writeFile)(this.tilesetPath, new Uint8Array(b3dm), `${sourceChild.id}.b3dm`);
140
+ parentNode.children.push(child);
141
+ sourceChild.unloadContent();
142
+ await this._addChildren(sourceChild, child, level + 1);
143
+ }
144
+ else {
145
+ await this._addChildren(sourceChild, parentNode, level + 1);
146
+ }
147
+ }
95
148
  /**
96
149
  * The recursive function of traversal of a nodes tree
97
150
  * @param parentSourceNode the parent node tile object (@loaders.gl/tiles/Tile3D)
@@ -102,50 +155,11 @@ class Tiles3DConverter {
102
155
  if (this.options.maxDepth && level > this.options.maxDepth) {
103
156
  return;
104
157
  }
158
+ const promises = [];
105
159
  for (const childNodeInfo of parentSourceNode.header.children || []) {
106
- const sourceChild = await this._loadChildNode(parentSourceNode, childNodeInfo);
107
- parentSourceNode.children.push(sourceChild);
108
- if (sourceChild.contentUrl) {
109
- await this.sourceTileset._loadTile(sourceChild);
110
- this.vertexCounter += sourceChild.content.vertexCount;
111
- let featureAttributes = null;
112
- if (this.attributeStorageInfo) {
113
- featureAttributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
114
- }
115
- if (!sourceChild.header.obb) {
116
- sourceChild.header.obb = (0, coordinate_converter_1.createObbFromMbs)(sourceChild.header.mbs);
117
- }
118
- const boundingVolume = {
119
- box: (0, i3s_obb_to_3d_tiles_obb_1.i3sObbTo3dTilesObb)(sourceChild.header.obb, this.geoidHeightModel)
120
- };
121
- const child = {
122
- boundingVolume,
123
- geometricError: (0, lod_conversion_utils_1.convertScreenThresholdToGeometricError)(sourceChild),
124
- children: []
125
- };
126
- const i3sAttributesData = {
127
- tileContent: sourceChild.content,
128
- textureFormat: sourceChild?.header?.textureFormat
129
- };
130
- // TODO Uncomment when 3d-tiles-attributes-worker will be published on CDN.
131
- // const b3dm = await transform3DTilesAttributesOnWorker(i3sAttributesData, {
132
- // source: this.workerSource.tile3dWorkerSource,
133
- // featureAttributes
134
- // });
135
- const b3dm = await new b3dm_converter_1.default().convert(i3sAttributesData, featureAttributes);
136
- child.content = {
137
- uri: `${sourceChild.id}.b3dm`,
138
- boundingVolume
139
- };
140
- await (0, file_utils_1.writeFile)(this.tilesetPath, new Uint8Array(b3dm), `${sourceChild.id}.b3dm`);
141
- parentNode.children.push(child);
142
- sourceChild.unloadContent();
143
- await this._addChildren(sourceChild, child, level + 1);
144
- }
145
- else {
146
- await this._addChildren(sourceChild, parentNode, level + 1);
147
- }
160
+ promises.push(this.convertChildNode(parentSourceNode, parentNode, level, childNodeInfo));
148
161
  }
162
+ await Promise.all(promises);
149
163
  }
150
164
  /**
151
165
  * Load a child node having information from the node header
@@ -17,7 +17,7 @@ export default class B3dmConverter {
17
17
  * @param i3sTile - Tile3D instance for I3S node
18
18
  * @returns - encoded glb content
19
19
  */
20
- buildGltf(i3sAttributesData: I3SAttributesData): Promise<ArrayBuffer>;
20
+ buildGltf(i3sAttributesData: I3SAttributesData, featureAttributes: any): Promise<ArrayBuffer>;
21
21
  /**
22
22
  * Update gltfBuilder with texture from I3S tile
23
23
  * @param {object} i3sTile - Tile3D object
@@ -44,11 +44,11 @@ export default class B3dmConverter {
44
44
  */
45
45
  _generateTransformMatrix(cartesianOrigin: any): Matrix4;
46
46
  /**
47
- * Generate batchId attribute from faceRanges.
48
- * @param {Uint32Array} faceRanges - the source array
49
- * @returns {Float32Array} batchId list.
47
+ * Create _BATCHID attribute
48
+ * @param {Object} i3sContent - the source object
49
+ * @returns {void}
50
50
  */
51
- _generateBatchId(faceRanges: any): Float32Array;
51
+ _createBatchIds(i3sContent: any, featureAttributes: any): void;
52
52
  /**
53
53
  * luma.gl can not work without indices now:
54
54
  * https://github.com/visgl/luma.gl/blob/d8cad75b9f8ca3e578cf078ed9d19e619c2ddbc9/modules/experimental/src/gltf/gltf-instantiator.js#L115
@@ -1 +1 @@
1
- {"version":3,"file":"b3dm-converter.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/b3dm-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AAKxE,OAAO,EAAC,OAAO,EAAU,MAAM,eAAe,CAAC;AAO/C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAEhC,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,GAAG,CAAC;IAEb;;;;OAIG;IACG,OAAO,CACX,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,GAAE,GAAU,GAC5B,OAAO,CAAC,WAAW,CAAC;IAcvB;;;;OAIG;IACG,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC;IAuD3E;;;;;OAKG;IACG,oBAAoB,CAAC,WAAW,KAAA,EAAE,aAAa,KAAA,EAAE,WAAW,KAAA;IAmBlE;;;;;;;OAOG;IACH,mBAAmB,CAAC,cAAc,KAAA,EAAE,eAAe,KAAA,EAAE,kBAAkB,KAAA,EAAE,WAAW,KAAA;IAepF;;;;;;;OAOG;IACH,wBAAwB,CAAC,eAAe,KAAA;IAMxC;;;;OAIG;IACH,gBAAgB,CAAC,UAAU,KAAA;IAiB3B;;;;;;OAMG;IACH,wBAAwB,CAAC,WAAW,KAAA;IAQpC;;;;;OAKG;IACH,yBAAyB,CAAC,MAAM,KAAA;IAchC;;;;;OAKG;IACH,iCAAiC,CAAC,QAAQ,KAAA,EAAE,YAAY,KAAA;IAgCxD;;;;;OAKG;IACH,eAAe,CAAC,kBAAkB,KAAA,EAAE,YAAY,KAAA;IA+ChD,kBAAkB,CAAC,UAAU,KAAA;IAY7B,aAAa,CAAC,OAAO,KAAA;CAItB"}
1
+ {"version":3,"file":"b3dm-converter.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/b3dm-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AAKxE,OAAO,EAAC,OAAO,EAAU,MAAM,eAAe,CAAC;AAO/C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,aAAa;IAEhC,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,GAAG,CAAC;IAEb;;;;OAIG;IACG,OAAO,CACX,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,GAAE,GAAU,GAC5B,OAAO,CAAC,WAAW,CAAC;IAcvB;;;;OAIG;IACG,SAAS,CACb,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,GAAG,GACrB,OAAO,CAAC,WAAW,CAAC;IAwDvB;;;;;OAKG;IACG,oBAAoB,CAAC,WAAW,KAAA,EAAE,aAAa,KAAA,EAAE,WAAW,KAAA;IAmBlE;;;;;;;OAOG;IACH,mBAAmB,CAAC,cAAc,KAAA,EAAE,eAAe,KAAA,EAAE,kBAAkB,KAAA,EAAE,WAAW,KAAA;IAepF;;;;;;;OAOG;IACH,wBAAwB,CAAC,eAAe,KAAA;IAMxC;;;;OAIG;IACH,eAAe,CAAC,UAAU,KAAA,EAAE,iBAAiB,KAAA;IAoB7C;;;;;;OAMG;IACH,wBAAwB,CAAC,WAAW,KAAA;IAQpC;;;;;OAKG;IACH,yBAAyB,CAAC,MAAM,KAAA;IAchC;;;;;OAKG;IACH,iCAAiC,CAAC,QAAQ,KAAA,EAAE,YAAY,KAAA;IAgCxD;;;;;OAKG;IACH,eAAe,CAAC,kBAAkB,KAAA,EAAE,YAAY,KAAA;IA+ChD,kBAAkB,CAAC,UAAU,KAAA;IAY7B,aAAa,CAAC,OAAO,KAAA;CAItB"}
@@ -18,7 +18,7 @@ class B3dmConverter {
18
18
  * @returns - encoded content
19
19
  */
20
20
  async convert(i3sAttributesData, featureAttributes = null) {
21
- const gltf = await this.buildGltf(i3sAttributesData);
21
+ const gltf = await this.buildGltf(i3sAttributesData, featureAttributes);
22
22
  const b3dm = (0, core_1.encodeSync)({
23
23
  gltfEncoded: new Uint8Array(gltf),
24
24
  type: 'b3dm',
@@ -32,7 +32,7 @@ class B3dmConverter {
32
32
  * @param i3sTile - Tile3D instance for I3S node
33
33
  * @returns - encoded glb content
34
34
  */
35
- async buildGltf(i3sAttributesData) {
35
+ async buildGltf(i3sAttributesData, featureAttributes) {
36
36
  const { tileContent, textureFormat } = i3sAttributesData;
37
37
  const { material, attributes, indices: originalIndices, cartesianOrigin, cartographicOrigin, modelMatrix } = tileContent;
38
38
  const gltfBuilder = new gltf_1.GLTFScenegraph();
@@ -45,6 +45,7 @@ class B3dmConverter {
45
45
  attributes.texCoords.value = (0, texture_atlas_1.convertTextureAtlas)(attributes.texCoords.value, attributes.uvRegions.value);
46
46
  }
47
47
  attributes.positions.value = this._normalizePositions(positionsValue, cartesianOrigin, cartographicOrigin, modelMatrix);
48
+ this._createBatchIds(tileContent, featureAttributes);
48
49
  if (attributes.normals && !this._checkNormals(attributes.normals.value)) {
49
50
  delete attributes.normals;
50
51
  }
@@ -123,23 +124,26 @@ class B3dmConverter {
123
124
  return result;
124
125
  }
125
126
  /**
126
- * Generate batchId attribute from faceRanges.
127
- * @param {Uint32Array} faceRanges - the source array
128
- * @returns {Float32Array} batchId list.
127
+ * Create _BATCHID attribute
128
+ * @param {Object} i3sContent - the source object
129
+ * @returns {void}
129
130
  */
130
- _generateBatchId(faceRanges) {
131
- const batchIdArraySize = (faceRanges[faceRanges.length - 1] + 1) * 3;
132
- const batchId = new Float32Array(batchIdArraySize);
133
- let rangeIndex = 0;
134
- let currentBatchId = 0;
135
- for (let index = 0; index < faceRanges.length / 2; index++) {
136
- const fromIndex = faceRanges[rangeIndex] * 3;
137
- const untilPosition = (faceRanges[rangeIndex + 1] + 1) * 3;
138
- batchId.fill(currentBatchId, fromIndex, untilPosition);
139
- rangeIndex += 2;
140
- currentBatchId += 1;
131
+ _createBatchIds(i3sContent, featureAttributes) {
132
+ const { featureIds } = i3sContent;
133
+ const { OBJECTID: objectIds } = featureAttributes || {};
134
+ if (!featureIds || !objectIds) {
135
+ return;
136
+ }
137
+ for (let i = 0; i < featureIds.length; i++) {
138
+ const featureId = featureIds[i];
139
+ const batchId = objectIds.indexOf(featureId);
140
+ featureIds[i] = batchId;
141
141
  }
142
- return batchId;
142
+ i3sContent.attributes._BATCHID = {
143
+ size: 1,
144
+ byteOffset: 0,
145
+ value: featureIds
146
+ };
143
147
  }
144
148
  /**
145
149
  * luma.gl can not work without indices now:
@@ -41,6 +41,8 @@ function printHelp() {
41
41
  console.log('--max-depth [Maximal depth of hierarchical tiles tree traversal, default: infinite]');
42
42
  console.log('--name [Tileset name]');
43
43
  console.log('--output [Output folder, default: "data" folder]');
44
+ console.log('--instant-node-writing [Keep created 3DNodeIndexDocument files on disk instead of memory. This option reduce memory usage but decelerates conversion speed]');
45
+ console.log('--split-nodes [Prevent to merge similar materials that could lead to incorrect visualization (I3S to 3DTiles conversion only)]');
44
46
  console.log('--slpk [Generate slpk (Scene Layer Packages) I3S output file]');
45
47
  console.log('--tileset [tileset.json file (3DTiles) / http://..../SceneServer/layers/0 resource (I3S)]');
46
48
  console.log('--input-type [tileset input type: I3S or 3DTILES]');
@@ -85,9 +87,11 @@ async function convert(options) {
85
87
  egmFilePath: options.egm,
86
88
  token: options.token,
87
89
  draco: options.draco,
90
+ mergeMaterials: options.mergeMaterials,
88
91
  generateTextures: options.generateTextures,
89
92
  generateBoundingVolumes: options.generateBoundingVolumes,
90
- validate: options.validate
93
+ validate: options.validate,
94
+ instantNodeWriting: options.instantNodeWriting
91
95
  });
92
96
  break;
93
97
  default:
@@ -121,7 +125,7 @@ function validateOptions(options) {
121
125
  }
122
126
  if (exceptions.length) {
123
127
  exceptions.forEach((exeption) => exeption());
124
- process.exit(0); // eslint-disable-line
128
+ process.exit(1);
125
129
  }
126
130
  return options;
127
131
  }
@@ -145,6 +149,8 @@ function validateOptionsWithEqual(args) {
145
149
  function parseOptions(args) {
146
150
  const opts = {
147
151
  output: 'data',
152
+ instantNodeWriting: false,
153
+ mergeMaterials: true,
148
154
  sevenZipExe: 'C:\\Program Files\\7-Zip\\7z.exe',
149
155
  egm: (0, path_1.join)(process.cwd(), 'deps', 'egm2008-5.pgm'),
150
156
  draco: true,
@@ -162,7 +168,7 @@ function parseOptions(args) {
162
168
  opts.inputType = getStringValue(index, args);
163
169
  break;
164
170
  case '--tileset':
165
- opts.tileset = getStringValue(index, args);
171
+ opts.tileset = getURLValue(index, args);
166
172
  break;
167
173
  case '--name':
168
174
  opts.name = getStringValue(index, args);
@@ -170,6 +176,12 @@ function parseOptions(args) {
170
176
  case '--output':
171
177
  opts.output = getStringValue(index, args);
172
178
  break;
179
+ case '--instant-node-writing':
180
+ opts.instantNodeWriting = getBooleanValue(index, args);
181
+ break;
182
+ case '--split-nodes':
183
+ opts.mergeMaterials = getBooleanValue(index, args);
184
+ break;
173
185
  case '--max-depth':
174
186
  opts.maxDepth = getIntegerValue(index, args);
175
187
  break;
@@ -228,6 +240,19 @@ function getStringValue(index, args) {
228
240
  }
229
241
  return value;
230
242
  }
243
+ /**
244
+ * Modyfy URL path to be compatible with fetch
245
+ * @param index - option's name index in the argument's array.
246
+ * The value of the option should be next to name of the option.
247
+ * @param args - cli arguments array
248
+ * @returns - string value of the option
249
+ */
250
+ function getURLValue(index, args) {
251
+ const value = getStringValue(index, args);
252
+ console.log(`Input tileset value: ${value}`);
253
+ console.log(`Modified tileset value: ${value.replace(/\\/g, '/')}`);
254
+ return value.replace(/\\/g, '/');
255
+ }
231
256
  /**
232
257
  * Get integer option value from cli arguments
233
258
  * @param index - option's name index in the argument's array
@@ -245,7 +270,7 @@ function getIntegerValue(index, args) {
245
270
  }
246
271
  function getBooleanValue(index, args) {
247
272
  const stringValue = getStringValue(index, args).toLowerCase().trim();
248
- if (args[index] === '--no-draco' && !stringValue) {
273
+ if (['--no-draco', '--split-nodes'].includes(args[index]) && !stringValue) {
249
274
  return false;
250
275
  }
251
276
  if (!stringValue || stringValue === 'true') {