@macrostrat/column-views 2.2.1 → 2.3.0

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 (295) hide show
  1. package/CHANGELOG.md +19 -0
  2. package/dist/esm/{column-views.c2fbcba8.js → column-views.04636815.js} +4 -4
  3. package/dist/esm/{column-views.c2fbcba8.js.map → column-views.04636815.js.map} +1 -1
  4. package/dist/esm/{column-views.54f8b909.js → column-views.052498a6.js} +37 -4
  5. package/dist/esm/column-views.052498a6.js.map +1 -0
  6. package/dist/esm/{column-views.60365cdb.js → column-views.0da4503a.js} +2 -2
  7. package/dist/esm/{column-views.60365cdb.js.map → column-views.0da4503a.js.map} +1 -1
  8. package/dist/esm/{column-views.53722d0a.js → column-views.107b47b4.js} +9 -9
  9. package/dist/esm/{column-views.53722d0a.js.map → column-views.107b47b4.js.map} +1 -1
  10. package/dist/esm/column-views.17a70358.js +16 -0
  11. package/dist/esm/column-views.17a70358.js.map +1 -0
  12. package/dist/esm/{column-views.073c42da.js → column-views.1b5bf0c6.js} +3 -3
  13. package/dist/esm/{column-views.073c42da.js.map → column-views.1b5bf0c6.js.map} +1 -1
  14. package/dist/esm/{column-views.29a551f6.js → column-views.2708e176.js} +22 -16
  15. package/dist/esm/column-views.2708e176.js.map +1 -0
  16. package/dist/esm/{column-views.88d63dd0.js → column-views.275ba52b.js} +3 -3
  17. package/dist/esm/{column-views.88d63dd0.js.map → column-views.275ba52b.js.map} +1 -1
  18. package/dist/esm/{column-views.d86555b0.js → column-views.2bac03a2.js} +2 -2
  19. package/dist/esm/{column-views.d86555b0.js.map → column-views.2bac03a2.js.map} +1 -1
  20. package/dist/esm/column-views.322790f3.js +138 -0
  21. package/dist/esm/column-views.322790f3.js.map +1 -0
  22. package/dist/esm/{column-views.6698b95a.js → column-views.343fc926.js} +9 -18
  23. package/dist/esm/column-views.343fc926.js.map +1 -0
  24. package/dist/esm/column-views.3c9cba65.js +13 -0
  25. package/dist/esm/{column-views.418f948f.js.map → column-views.3c9cba65.js.map} +1 -1
  26. package/dist/esm/{column-views.c3495702.js → column-views.3d3e00be.js} +2 -2
  27. package/dist/esm/{column-views.c3495702.js.map → column-views.3d3e00be.js.map} +1 -1
  28. package/dist/esm/{column-views.e1bc3cfa.js → column-views.40094dd9.js} +3 -3
  29. package/dist/esm/{column-views.e1bc3cfa.js.map → column-views.40094dd9.js.map} +1 -1
  30. package/dist/esm/{column-views.787d7696.js → column-views.44373a90.js} +8 -7
  31. package/dist/esm/column-views.44373a90.js.map +1 -0
  32. package/dist/esm/{column-views.8b623b27.js → column-views.488f24b6.js} +2 -2
  33. package/dist/esm/{column-views.8b623b27.js.map → column-views.488f24b6.js.map} +1 -1
  34. package/dist/esm/{column-views.4ed90896.js → column-views.4b259f9e.js} +42 -11
  35. package/dist/esm/column-views.4b259f9e.js.map +1 -0
  36. package/dist/esm/{column-views.1151416d.css → column-views.54c1f382.css} +6 -5
  37. package/dist/esm/column-views.54c1f382.css.map +1 -0
  38. package/dist/esm/{column-views.382c486d.js → column-views.565b193a.js} +3 -3
  39. package/dist/esm/{column-views.382c486d.js.map → column-views.565b193a.js.map} +1 -1
  40. package/dist/esm/{column-views.df34441c.js → column-views.5ca2b219.js} +5 -5
  41. package/dist/esm/{column-views.df34441c.js.map → column-views.5ca2b219.js.map} +1 -1
  42. package/dist/esm/{column-views.8284c3a9.js → column-views.5eb4e6ff.js} +5 -5
  43. package/dist/esm/{column-views.8284c3a9.js.map → column-views.5eb4e6ff.js.map} +1 -1
  44. package/dist/esm/{column-views.2e854496.js → column-views.5fff0716.js} +3 -3
  45. package/dist/esm/{column-views.2e854496.js.map → column-views.5fff0716.js.map} +1 -1
  46. package/dist/esm/{column-views.05586d1f.js → column-views.60e97132.js} +2 -4
  47. package/dist/esm/column-views.60e97132.js.map +1 -0
  48. package/dist/esm/{column-views.7683bb52.js → column-views.63d40878.js} +5 -5
  49. package/dist/esm/{column-views.7683bb52.js.map → column-views.63d40878.js.map} +1 -1
  50. package/dist/esm/{column-views.abeab9aa.js → column-views.6c9e5069.js} +40 -62
  51. package/dist/esm/column-views.6c9e5069.js.map +1 -0
  52. package/dist/esm/column-views.6df65dab.js +9 -0
  53. package/dist/esm/column-views.6df65dab.js.map +1 -0
  54. package/dist/esm/column-views.7fa0d026.js +62 -0
  55. package/dist/esm/column-views.7fa0d026.js.map +1 -0
  56. package/dist/esm/{column-views.3a7179c4.js → column-views.82eb5026.js} +12 -7
  57. package/dist/esm/column-views.82eb5026.js.map +1 -0
  58. package/dist/esm/{column-views.adec2e4c.js → column-views.92575b87.js} +3 -3
  59. package/dist/esm/column-views.92575b87.js.map +1 -0
  60. package/dist/esm/{column-views.41e5f0dc.js → column-views.9d51a5ab.js} +3 -3
  61. package/dist/esm/{column-views.41e5f0dc.js.map → column-views.9d51a5ab.js.map} +1 -1
  62. package/dist/esm/{column-views.0ce9b697.js → column-views.9ffc089b.js} +3 -3
  63. package/dist/esm/{column-views.0ce9b697.js.map → column-views.9ffc089b.js.map} +1 -1
  64. package/dist/esm/{column-views.70164236.js → column-views.aa9ede4d.js} +2 -2
  65. package/dist/esm/{column-views.70164236.js.map → column-views.aa9ede4d.js.map} +1 -1
  66. package/dist/esm/{column-views.413217dc.js → column-views.ad2fe46c.js} +2 -2
  67. package/dist/esm/{column-views.413217dc.js.map → column-views.ad2fe46c.js.map} +1 -1
  68. package/dist/esm/{column-views.0265cf7f.js → column-views.afe0bb48.js} +15 -10
  69. package/dist/esm/column-views.afe0bb48.js.map +1 -0
  70. package/dist/esm/{column-views.aecf25bc.js → column-views.b4e1236d.js} +2 -2
  71. package/dist/esm/{column-views.aecf25bc.js.map → column-views.b4e1236d.js.map} +1 -1
  72. package/dist/esm/{column-views.469a4952.js → column-views.c149f7a5.js} +3 -3
  73. package/dist/esm/{column-views.469a4952.js.map → column-views.c149f7a5.js.map} +1 -1
  74. package/dist/esm/column-views.c3c7901a.js +149 -0
  75. package/dist/esm/column-views.c3c7901a.js.map +1 -0
  76. package/dist/esm/{column-views.a3fabf0f.js → column-views.c44febd0.js} +9 -6
  77. package/dist/esm/column-views.c44febd0.js.map +1 -0
  78. package/dist/esm/{column-views.b7016f82.css → column-views.cb6fc808.css} +10 -10
  79. package/dist/esm/column-views.cb6fc808.css.map +1 -0
  80. package/dist/esm/column-views.cc733361.js.map +1 -1
  81. package/dist/esm/{column-views.f0b0fc56.js → column-views.ce3a3ac8.js} +2 -2
  82. package/dist/esm/{column-views.f0b0fc56.js.map → column-views.ce3a3ac8.js.map} +1 -1
  83. package/dist/esm/{column-views.b08d82e6.js → column-views.d1b49f5c.js} +2 -2
  84. package/dist/esm/{column-views.b08d82e6.js.map → column-views.d1b49f5c.js.map} +1 -1
  85. package/dist/esm/{column-views.2aef5df8.js → column-views.d524075b.js} +4 -4
  86. package/dist/esm/{column-views.2aef5df8.js.map → column-views.d524075b.js.map} +1 -1
  87. package/dist/esm/column-views.d5e788e8.js +31 -0
  88. package/dist/esm/column-views.d5e788e8.js.map +1 -0
  89. package/dist/esm/{column-views.bbc77227.js → column-views.d6c0b7bc.js} +2 -2
  90. package/dist/esm/{column-views.bbc77227.js.map → column-views.d6c0b7bc.js.map} +1 -1
  91. package/dist/esm/{column-views.b29f8718.js → column-views.dc195174.js} +2 -2
  92. package/dist/esm/{column-views.b29f8718.js.map → column-views.dc195174.js.map} +1 -1
  93. package/dist/esm/column-views.de433f18.js +139 -0
  94. package/dist/esm/column-views.de433f18.js.map +1 -0
  95. package/dist/esm/{column-views.2eceafb5.js → column-views.e075af15.js} +2 -2
  96. package/dist/esm/{column-views.2eceafb5.js.map → column-views.e075af15.js.map} +1 -1
  97. package/dist/esm/{column-views.e33ac5c9.css → column-views.e93478c3.css} +7 -2
  98. package/dist/esm/column-views.e93478c3.css.map +1 -0
  99. package/dist/esm/{column-views.cae1a6a1.js → column-views.f7cdf6be.js} +3 -3
  100. package/dist/esm/{column-views.cae1a6a1.js.map → column-views.f7cdf6be.js.map} +1 -1
  101. package/dist/esm/{column-views.81bddbee.js → column-views.faa7e52e.js} +4 -4
  102. package/dist/esm/{column-views.81bddbee.js.map → column-views.faa7e52e.js.map} +1 -1
  103. package/dist/esm/index.d.ts +43 -20
  104. package/dist/esm/index.d.ts.map +1 -1
  105. package/dist/esm/index.js +12 -12
  106. package/dist/node/column-views.012fa10c.js +2 -0
  107. package/dist/node/column-views.012fa10c.js.map +1 -0
  108. package/dist/node/{column-views.edb4ba54.js → column-views.021a6961.js} +2 -2
  109. package/dist/node/{column-views.edb4ba54.js.map → column-views.021a6961.js.map} +1 -1
  110. package/dist/node/{column-views.f1ad131a.js → column-views.08bef1f6.js} +2 -2
  111. package/dist/node/{column-views.f1ad131a.js.map → column-views.08bef1f6.js.map} +1 -1
  112. package/dist/node/column-views.0beae29d.js +2 -0
  113. package/dist/node/column-views.0beae29d.js.map +1 -0
  114. package/dist/node/{column-views.6b8424fd.js → column-views.0f401891.js} +2 -2
  115. package/dist/node/{column-views.6b8424fd.js.map → column-views.0f401891.js.map} +1 -1
  116. package/dist/node/column-views.1d064426.js +2 -0
  117. package/dist/node/column-views.1d064426.js.map +1 -0
  118. package/dist/node/{column-views.ce5904a6.js → column-views.2577dec0.js} +2 -2
  119. package/dist/node/{column-views.ce5904a6.js.map → column-views.2577dec0.js.map} +1 -1
  120. package/dist/node/{column-views.45a03acc.js → column-views.2fe8feb9.js} +2 -2
  121. package/dist/node/{column-views.45a03acc.js.map → column-views.2fe8feb9.js.map} +1 -1
  122. package/dist/node/{column-views.ebe61439.js → column-views.42bc66a8.js} +2 -2
  123. package/dist/node/{column-views.ebe61439.js.map → column-views.42bc66a8.js.map} +1 -1
  124. package/dist/node/{column-views.ae9536b3.js → column-views.465e593b.js} +2 -2
  125. package/dist/node/{column-views.ae9536b3.js.map → column-views.465e593b.js.map} +1 -1
  126. package/dist/node/column-views.46efb749.js +2 -0
  127. package/dist/node/column-views.46efb749.js.map +1 -0
  128. package/dist/node/{column-views.554d44a7.js → column-views.47440961.js} +2 -2
  129. package/dist/node/{column-views.554d44a7.js.map → column-views.47440961.js.map} +1 -1
  130. package/dist/node/column-views.5361f0e2.js +2 -0
  131. package/dist/node/column-views.5361f0e2.js.map +1 -0
  132. package/dist/node/{column-views.f0f5cefd.js → column-views.5559de6a.js} +2 -2
  133. package/dist/node/{column-views.f0f5cefd.js.map → column-views.5559de6a.js.map} +1 -1
  134. package/dist/node/column-views.56f88b8c.js +2 -0
  135. package/dist/node/column-views.56f88b8c.js.map +1 -0
  136. package/dist/node/{column-views.0b3a384e.js → column-views.5a9331a9.js} +2 -2
  137. package/dist/node/{column-views.0b3a384e.js.map → column-views.5a9331a9.js.map} +1 -1
  138. package/dist/node/column-views.5fd6e11a.js +2 -0
  139. package/dist/node/column-views.5fd6e11a.js.map +1 -0
  140. package/dist/node/column-views.672b683c.js +2 -0
  141. package/dist/node/column-views.672b683c.js.map +1 -0
  142. package/dist/node/{column-views.07c503d3.js → column-views.6c7f9245.js} +2 -2
  143. package/dist/node/column-views.6c7f9245.js.map +1 -0
  144. package/dist/node/{column-views.4b4c214a.js → column-views.75456275.js} +2 -2
  145. package/dist/node/{column-views.4b4c214a.js.map → column-views.75456275.js.map} +1 -1
  146. package/dist/node/column-views.75ba0464.css +2 -0
  147. package/dist/node/column-views.75ba0464.css.map +1 -0
  148. package/dist/node/column-views.777b9bb6.js +2 -0
  149. package/dist/node/column-views.777b9bb6.js.map +1 -0
  150. package/dist/node/{column-views.93febe9b.js → column-views.7c322202.js} +2 -2
  151. package/dist/node/{column-views.93febe9b.js.map → column-views.7c322202.js.map} +1 -1
  152. package/dist/node/column-views.7cc1a14f.js +2 -0
  153. package/dist/node/column-views.7cc1a14f.js.map +1 -0
  154. package/dist/node/{column-views.fcdc74c4.js → column-views.8e846c57.js} +2 -2
  155. package/dist/node/{column-views.fcdc74c4.js.map → column-views.8e846c57.js.map} +1 -1
  156. package/dist/node/{column-views.6919fd2a.js → column-views.8ee8469d.js} +2 -2
  157. package/dist/node/{column-views.6919fd2a.js.map → column-views.8ee8469d.js.map} +1 -1
  158. package/dist/node/{column-views.588b02a1.js → column-views.93bde6c1.js} +2 -2
  159. package/dist/node/{column-views.588b02a1.js.map → column-views.93bde6c1.js.map} +1 -1
  160. package/dist/node/{column-views.94c84716.js → column-views.a14f0134.js} +2 -2
  161. package/dist/node/{column-views.94c84716.js.map → column-views.a14f0134.js.map} +1 -1
  162. package/dist/node/{column-views.aef76eee.js → column-views.a596b1f5.js} +2 -2
  163. package/dist/node/{column-views.aef76eee.js.map → column-views.a596b1f5.js.map} +1 -1
  164. package/dist/node/column-views.af480651.js +2 -0
  165. package/dist/node/column-views.af480651.js.map +1 -0
  166. package/dist/node/column-views.b103acbc.js +2 -0
  167. package/dist/node/column-views.b103acbc.js.map +1 -0
  168. package/dist/node/column-views.b40c1b9c.js +2 -0
  169. package/dist/node/column-views.b40c1b9c.js.map +1 -0
  170. package/dist/node/column-views.b6e86cf0.js +2 -0
  171. package/dist/node/column-views.b6e86cf0.js.map +1 -0
  172. package/dist/node/{column-views.6099a3a9.js → column-views.c007152b.js} +2 -2
  173. package/dist/node/{column-views.6099a3a9.js.map → column-views.c007152b.js.map} +1 -1
  174. package/dist/node/{column-views.db4ccacc.js → column-views.c921fa1a.js} +2 -2
  175. package/dist/node/{column-views.db4ccacc.js.map → column-views.c921fa1a.js.map} +1 -1
  176. package/dist/node/{column-views.a1e29a15.js → column-views.c9880a4d.js} +2 -2
  177. package/dist/node/{column-views.a1e29a15.js.map → column-views.c9880a4d.js.map} +1 -1
  178. package/dist/node/column-views.ccfb9afb.css +2 -0
  179. package/dist/node/column-views.ccfb9afb.css.map +1 -0
  180. package/dist/node/{column-views.32344397.js → column-views.cd54f1b1.js} +2 -2
  181. package/dist/node/{column-views.32344397.js.map → column-views.cd54f1b1.js.map} +1 -1
  182. package/dist/node/{column-views.0201566d.js → column-views.d77d260b.js} +2 -2
  183. package/dist/node/{column-views.0201566d.js.map → column-views.d77d260b.js.map} +1 -1
  184. package/dist/node/{column-views.54363c13.js → column-views.d818b387.js} +2 -2
  185. package/dist/node/{column-views.54363c13.js.map → column-views.d818b387.js.map} +1 -1
  186. package/dist/node/{column-views.29483479.js → column-views.d8821a96.js} +2 -2
  187. package/dist/node/{column-views.29483479.js.map → column-views.d8821a96.js.map} +1 -1
  188. package/dist/node/column-views.dbb4a46b.js +2 -0
  189. package/dist/node/column-views.dbb4a46b.js.map +1 -0
  190. package/dist/node/{column-views.e803e4ae.css → column-views.ddc6184e.css} +2 -2
  191. package/dist/node/column-views.ddc6184e.css.map +1 -0
  192. package/dist/node/{column-views.44952ae6.js → column-views.e264a767.js} +2 -2
  193. package/dist/node/{column-views.44952ae6.js.map → column-views.e264a767.js.map} +1 -1
  194. package/dist/node/column-views.e93b3bdb.js +2 -0
  195. package/dist/node/column-views.e93b3bdb.js.map +1 -0
  196. package/dist/node/{column-views.57dd069c.js → column-views.ec691859.js} +2 -2
  197. package/dist/node/{column-views.57dd069c.js.map → column-views.ec691859.js.map} +1 -1
  198. package/dist/node/column-views.ec7cc7cc.js +2 -0
  199. package/dist/node/column-views.ec7cc7cc.js.map +1 -0
  200. package/dist/node/{column-views.aae09aca.js → column-views.eecdc727.js} +2 -2
  201. package/dist/node/{column-views.aae09aca.js.map → column-views.eecdc727.js.map} +1 -1
  202. package/dist/node/{column-views.108db52e.js → column-views.f577d065.js} +2 -2
  203. package/dist/node/{column-views.108db52e.js.map → column-views.f577d065.js.map} +1 -1
  204. package/dist/node/column-views.fac4baff.js +2 -0
  205. package/dist/node/column-views.fac4baff.js.map +1 -0
  206. package/dist/node/index.js +1 -1
  207. package/dist/node/index.js.map +1 -1
  208. package/package.json +2 -2
  209. package/src/age-axis.ts +1 -1
  210. package/src/column.module.sass +7 -5
  211. package/src/column.ts +29 -7
  212. package/src/correlation-chart/stories/correlation-chart.stories.ts +1 -1
  213. package/src/data-provider/store.ts +48 -5
  214. package/src/data-provider/unit-selection.ts +1 -0
  215. package/src/facets/detrital-zircon/index.ts +78 -11
  216. package/src/facets/detrital-zircon/provider.ts +1 -1
  217. package/src/facets/fossils/index.ts +145 -215
  218. package/src/facets/fossils/provider.ts +18 -25
  219. package/src/facets/fossils/taxon-ranges.ts +220 -0
  220. package/src/facets/index.ts +0 -1
  221. package/src/facets/{base-sample-column.module.sass → measurements/base.module.sass} +1 -0
  222. package/src/facets/measurements/base.ts +215 -0
  223. package/src/facets/measurements/index.ts +2 -38
  224. package/src/facets/measurements/sgp.ts +91 -0
  225. package/src/notes.ts +6 -3
  226. package/src/prepare-units/index.ts +8 -2
  227. package/src/prepare-units/utils.ts +55 -9
  228. package/src/section.ts +9 -4
  229. package/src/unit-details/panel.ts +2 -1
  230. package/dist/esm/column-views.0265cf7f.js.map +0 -1
  231. package/dist/esm/column-views.05586d1f.js.map +0 -1
  232. package/dist/esm/column-views.1151416d.css.map +0 -1
  233. package/dist/esm/column-views.29a551f6.js.map +0 -1
  234. package/dist/esm/column-views.3a7179c4.js.map +0 -1
  235. package/dist/esm/column-views.418f948f.js +0 -15
  236. package/dist/esm/column-views.4ed90896.js.map +0 -1
  237. package/dist/esm/column-views.54f8b909.js.map +0 -1
  238. package/dist/esm/column-views.6698b95a.js.map +0 -1
  239. package/dist/esm/column-views.6e7082db.js +0 -16
  240. package/dist/esm/column-views.6e7082db.js.map +0 -1
  241. package/dist/esm/column-views.748dce47.js +0 -95
  242. package/dist/esm/column-views.748dce47.js.map +0 -1
  243. package/dist/esm/column-views.787d7696.js.map +0 -1
  244. package/dist/esm/column-views.a3fabf0f.js.map +0 -1
  245. package/dist/esm/column-views.abeab9aa.js.map +0 -1
  246. package/dist/esm/column-views.adec2e4c.js.map +0 -1
  247. package/dist/esm/column-views.b7016f82.css.map +0 -1
  248. package/dist/esm/column-views.e17f00d3.js +0 -37
  249. package/dist/esm/column-views.e17f00d3.js.map +0 -1
  250. package/dist/esm/column-views.e33ac5c9.css.map +0 -1
  251. package/dist/esm/column-views.ea4ebbb7.js +0 -31
  252. package/dist/esm/column-views.ea4ebbb7.js.map +0 -1
  253. package/dist/esm/column-views.faacfc3c.js +0 -92
  254. package/dist/esm/column-views.faacfc3c.js.map +0 -1
  255. package/dist/node/column-views.07c503d3.js.map +0 -1
  256. package/dist/node/column-views.0e7ac946.js +0 -2
  257. package/dist/node/column-views.0e7ac946.js.map +0 -1
  258. package/dist/node/column-views.16f336ee.js +0 -2
  259. package/dist/node/column-views.16f336ee.js.map +0 -1
  260. package/dist/node/column-views.18d54bbb.js +0 -2
  261. package/dist/node/column-views.18d54bbb.js.map +0 -1
  262. package/dist/node/column-views.19a84c01.js +0 -2
  263. package/dist/node/column-views.19a84c01.js.map +0 -1
  264. package/dist/node/column-views.1a3c399e.js +0 -2
  265. package/dist/node/column-views.1a3c399e.js.map +0 -1
  266. package/dist/node/column-views.29eb25bd.css +0 -2
  267. package/dist/node/column-views.29eb25bd.css.map +0 -1
  268. package/dist/node/column-views.312db572.js +0 -2
  269. package/dist/node/column-views.312db572.js.map +0 -1
  270. package/dist/node/column-views.573cb29d.js +0 -2
  271. package/dist/node/column-views.573cb29d.js.map +0 -1
  272. package/dist/node/column-views.5a8bc8e3.js +0 -2
  273. package/dist/node/column-views.5a8bc8e3.js.map +0 -1
  274. package/dist/node/column-views.5f3b0b04.js +0 -2
  275. package/dist/node/column-views.5f3b0b04.js.map +0 -1
  276. package/dist/node/column-views.77ace3a2.js +0 -2
  277. package/dist/node/column-views.77ace3a2.js.map +0 -1
  278. package/dist/node/column-views.8f54691f.js +0 -2
  279. package/dist/node/column-views.8f54691f.js.map +0 -1
  280. package/dist/node/column-views.92e29010.js +0 -2
  281. package/dist/node/column-views.92e29010.js.map +0 -1
  282. package/dist/node/column-views.a16cd1f2.js +0 -2
  283. package/dist/node/column-views.a16cd1f2.js.map +0 -1
  284. package/dist/node/column-views.abe0a664.js +0 -2
  285. package/dist/node/column-views.abe0a664.js.map +0 -1
  286. package/dist/node/column-views.cd7b223b.css +0 -2
  287. package/dist/node/column-views.cd7b223b.css.map +0 -1
  288. package/dist/node/column-views.d4545f9f.js +0 -2
  289. package/dist/node/column-views.d4545f9f.js.map +0 -1
  290. package/dist/node/column-views.e803e4ae.css.map +0 -1
  291. package/dist/node/column-views.f7d72702.js +0 -2
  292. package/dist/node/column-views.f7d72702.js.map +0 -1
  293. package/src/facets/base-sample-column.ts +0 -114
  294. package/src/facets/measurements/provider.ts +0 -80
  295. /package/src/facets/fossils/{index.module.sass → taxon-ranges.module.sass} +0 -0
package/CHANGELOG.md CHANGED
@@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file. The format
4
4
  is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
5
5
  project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6
6
 
7
+ ## [2.3.0] - 2025-12-10
8
+
9
+ - Streamline column facet components
10
+ - Create a mode for facets that allows focusing a single column-associated
11
+ measurement
12
+ - Improve scale calculations in some edge cases
13
+ - Condense notes that are close together
14
+ - Add explicitly defined height where available from PBDB (eODP columns, mostly)
15
+ - Fixed axis label spacing
16
+ - Small bug fixes for unit selection
17
+
18
+ ## [2.2.2] - 2025-12-04
19
+
20
+ - Fix a bug with unit deselection
21
+ - Fix missed updates in state management code
22
+ - Add a 'minimal' option to `unconformityLabels`
23
+ - Reduce precision of gap age labels
24
+ - Improvements to stories
25
+
7
26
  ## [2.2.1] - 2025-11-29
8
27
 
9
28
  - Start unifying state management components
@@ -1,8 +1,8 @@
1
1
  import {fetchAllColumns as $33a46f9423c8104a$export$45bd78cd093090fa, useColumnFeatures as $33a46f9423c8104a$export$e3270a4e30e40ff9, fetchLithologies as $33a46f9423c8104a$export$1aa679bd5e605f82, fetchIntervals as $33a46f9423c8104a$export$5d2ec2e733dfe6c7, fetchEnvironments as $33a46f9423c8104a$export$780b4b253712916c, fetchRefs as $33a46f9423c8104a$export$cd7bfa0860f58b96, fetchStratNames as $33a46f9423c8104a$export$8ea8f45a7ffe4183, fetchUnits as $33a46f9423c8104a$export$b97b9bdd6a521298, fetchColumnUnits as $33a46f9423c8104a$export$d3d8b0fabcc76c5d} from "./column-views.8c296309.js";
2
- import {useMacrostratStore as $774a5efa27d1c77b$export$fb98d5bae3a6800, useMacrostratBaseURL as $774a5efa27d1c77b$export$33b1392d23dde04, useMacrostratDefs as $774a5efa27d1c77b$export$89dd4e5ae4a82373, useMacrostratColumns as $774a5efa27d1c77b$export$81eaae0b474404fd, useMacrostratData as $774a5efa27d1c77b$export$b9c9fc603d74a555, MacrostratDataProvider as $774a5efa27d1c77b$export$690613f93cdc5576, MacrostratAPIProvider as $774a5efa27d1c77b$export$3098013bc6cc316d, MacrostratColumnProvider as $774a5efa27d1c77b$export$9e42f9b6e0d67c7d, LithologiesProvider as $774a5efa27d1c77b$export$8492a5cae82b6a70, useLithologies as $774a5efa27d1c77b$export$4d18a90c945d129f, useEnvironments as $774a5efa27d1c77b$export$c6b216bf4c71b61f} from "./column-views.2eceafb5.js";
2
+ import {useMacrostratStore as $774a5efa27d1c77b$export$fb98d5bae3a6800, useMacrostratBaseURL as $774a5efa27d1c77b$export$33b1392d23dde04, useMacrostratDefs as $774a5efa27d1c77b$export$89dd4e5ae4a82373, useMacrostratColumns as $774a5efa27d1c77b$export$81eaae0b474404fd, useMacrostratData as $774a5efa27d1c77b$export$b9c9fc603d74a555, MacrostratDataProvider as $774a5efa27d1c77b$export$690613f93cdc5576, MacrostratAPIProvider as $774a5efa27d1c77b$export$3098013bc6cc316d, MacrostratColumnProvider as $774a5efa27d1c77b$export$9e42f9b6e0d67c7d, LithologiesProvider as $774a5efa27d1c77b$export$8492a5cae82b6a70, useLithologies as $774a5efa27d1c77b$export$4d18a90c945d129f, useEnvironments as $774a5efa27d1c77b$export$c6b216bf4c71b61f} from "./column-views.e075af15.js";
3
3
  import {useColumnNav as $b8de97dfa82f4910$export$91cb5ac808759b34, ColumnNavProvider as $b8de97dfa82f4910$export$36fed9e0f93a8fde} from "./column-views.6d6b73b4.js";
4
- import {MacrostratColumnStateProvider as $d5074f164411387e$export$ef5395089200109b, MacrostratColumnDataProvider as $d5074f164411387e$export$7fec7bd80ff9c10e, useMacrostratColumnData as $d5074f164411387e$export$f8509b7cce386c7d, useMacrostratUnits as $d5074f164411387e$export$6fb40844db555b2, useColumnUnitsMap as $d5074f164411387e$export$7513be0cfd10d9cc, useCompositeScale as $d5074f164411387e$export$a7fc62995ec4f76} from "./column-views.4ed90896.js";
5
- import {useUnitSelectionDispatch as $61771df184788970$export$77a278d5ca56e309, useUnitSelectionStore as $61771df184788970$export$b220b1d3591dc9e5, useSelectedUnit as $61771df184788970$export$f0dd93f90aa8e5da, UnitSelectionProvider as $61771df184788970$export$f19d75b1d4b676a4, useUnitSelectionTarget as $61771df184788970$export$cbbec12b1451fe7d, UnitKeyboardNavigation as $61771df184788970$export$70f5ee19650fc7d1} from "./column-views.a3fabf0f.js";
4
+ import {MacrostratColumnStateProvider as $d5074f164411387e$export$ef5395089200109b, MacrostratColumnDataProvider as $d5074f164411387e$export$7fec7bd80ff9c10e, useMacrostratColumnData as $d5074f164411387e$export$f8509b7cce386c7d, useMacrostratUnits as $d5074f164411387e$export$6fb40844db555b2, useColumnUnitsMap as $d5074f164411387e$export$7513be0cfd10d9cc, useCompositeScale as $d5074f164411387e$export$a7fc62995ec4f76} from "./column-views.4b259f9e.js";
5
+ import {useUnitSelectionDispatch as $61771df184788970$export$77a278d5ca56e309, useUnitSelectionStore as $61771df184788970$export$b220b1d3591dc9e5, useSelectedUnit as $61771df184788970$export$f0dd93f90aa8e5da, UnitSelectionProvider as $61771df184788970$export$f19d75b1d4b676a4, useUnitSelectionTarget as $61771df184788970$export$cbbec12b1451fe7d, UnitKeyboardNavigation as $61771df184788970$export$70f5ee19650fc7d1} from "./column-views.c44febd0.js";
6
6
 
7
7
 
8
8
 
@@ -12,4 +12,4 @@ import {useUnitSelectionDispatch as $61771df184788970$export$77a278d5ca56e309, u
12
12
 
13
13
 
14
14
  export {$33a46f9423c8104a$export$45bd78cd093090fa as fetchAllColumns, $33a46f9423c8104a$export$e3270a4e30e40ff9 as useColumnFeatures, $33a46f9423c8104a$export$1aa679bd5e605f82 as fetchLithologies, $33a46f9423c8104a$export$5d2ec2e733dfe6c7 as fetchIntervals, $33a46f9423c8104a$export$780b4b253712916c as fetchEnvironments, $33a46f9423c8104a$export$cd7bfa0860f58b96 as fetchRefs, $33a46f9423c8104a$export$8ea8f45a7ffe4183 as fetchStratNames, $33a46f9423c8104a$export$b97b9bdd6a521298 as fetchUnits, $33a46f9423c8104a$export$d3d8b0fabcc76c5d as fetchColumnUnits, $774a5efa27d1c77b$export$fb98d5bae3a6800 as useMacrostratStore, $774a5efa27d1c77b$export$33b1392d23dde04 as useMacrostratBaseURL, $774a5efa27d1c77b$export$89dd4e5ae4a82373 as useMacrostratDefs, $774a5efa27d1c77b$export$81eaae0b474404fd as useMacrostratColumns, $774a5efa27d1c77b$export$b9c9fc603d74a555 as useMacrostratData, $774a5efa27d1c77b$export$690613f93cdc5576 as MacrostratDataProvider, $774a5efa27d1c77b$export$3098013bc6cc316d as MacrostratAPIProvider, $774a5efa27d1c77b$export$9e42f9b6e0d67c7d as MacrostratColumnProvider, $774a5efa27d1c77b$export$8492a5cae82b6a70 as LithologiesProvider, $774a5efa27d1c77b$export$4d18a90c945d129f as useLithologies, $774a5efa27d1c77b$export$c6b216bf4c71b61f as useEnvironments, $b8de97dfa82f4910$export$91cb5ac808759b34 as useColumnNav, $b8de97dfa82f4910$export$36fed9e0f93a8fde as ColumnNavProvider, $d5074f164411387e$export$ef5395089200109b as MacrostratColumnStateProvider, $d5074f164411387e$export$7fec7bd80ff9c10e as MacrostratColumnDataProvider, $d5074f164411387e$export$f8509b7cce386c7d as useMacrostratColumnData, $d5074f164411387e$export$6fb40844db555b2 as useMacrostratUnits, $d5074f164411387e$export$7513be0cfd10d9cc as useColumnUnitsMap, $d5074f164411387e$export$a7fc62995ec4f76 as useCompositeScale, $61771df184788970$export$77a278d5ca56e309 as useUnitSelectionDispatch, $61771df184788970$export$b220b1d3591dc9e5 as useUnitSelectionStore, $61771df184788970$export$f0dd93f90aa8e5da as useSelectedUnit, $61771df184788970$export$f19d75b1d4b676a4 as UnitSelectionProvider, $61771df184788970$export$cbbec12b1451fe7d as useUnitSelectionTarget, $61771df184788970$export$70f5ee19650fc7d1 as UnitKeyboardNavigation};
15
- //# sourceMappingURL=column-views.c2fbcba8.js.map
15
+ //# sourceMappingURL=column-views.04636815.js.map
@@ -1 +1 @@
1
- {"mappings":"","sources":["packages/column-views/src/data-provider/index.ts"],"sourcesContent":["export * from \"./fetch\";\nexport * from \"./base\";\nexport * from \"./column-nav\";\nexport * from \"./store\";\nexport * from \"./unit-selection\";\n"],"names":[],"version":3,"file":"column-views.c2fbcba8.js.map"}
1
+ {"mappings":"","sources":["packages/column-views/src/data-provider/index.ts"],"sourcesContent":["export * from \"./fetch\";\nexport * from \"./base\";\nexport * from \"./column-nav\";\nexport * from \"./store\";\nexport * from \"./unit-selection\";\n"],"names":[],"version":3,"file":"column-views.04636815.js.map"}
@@ -16,8 +16,8 @@ const $b6657fba8924a702$export$f1a15f539858307 = function(a, b, axisType = (0, $
16
16
  function $b6657fba8924a702$export$d92a67740c050efb(a, b, tolerance = $b6657fba8924a702$var$dt) {
17
17
  return $b6657fba8924a702$export$f1a15f539858307(a, b, (0, $1qVxh$ColumnAxisType).AGE, tolerance);
18
18
  }
19
- function $b6657fba8924a702$export$70e712e2ac0237a(unit, axisType) {
20
- switch(axisType){
19
+ function $b6657fba8924a702$export$70e712e2ac0237a(unit, axisType, clipped = true) {
20
+ if (clipped) switch(axisType){
21
21
  case (0, $1qVxh$ColumnAxisType).AGE:
22
22
  return [
23
23
  unit.b_clip_pos ?? unit.b_age,
@@ -33,6 +33,39 @@ function $b6657fba8924a702$export$70e712e2ac0237a(unit, axisType) {
33
33
  default:
34
34
  throw new Error(`Unknown axis type: ${axisType}`);
35
35
  }
36
+ else switch(axisType){
37
+ case (0, $1qVxh$ColumnAxisType).AGE:
38
+ return [
39
+ unit.b_age,
40
+ unit.t_age
41
+ ];
42
+ case (0, $1qVxh$ColumnAxisType).DEPTH:
43
+ case (0, $1qVxh$ColumnAxisType).ORDINAL:
44
+ case (0, $1qVxh$ColumnAxisType).HEIGHT:
45
+ return [
46
+ unit.b_pos,
47
+ unit.t_pos
48
+ ];
49
+ default:
50
+ throw new Error(`Unknown axis type: ${axisType}`);
51
+ }
52
+ }
53
+ function $b6657fba8924a702$export$441710fb21b4ae09(position, unit, axisType) {
54
+ /** Translate a relative position (0-1) within a unit to an absolute position
55
+ * within the unit's height range. If the unit is clipped, null values will be
56
+ * returned for positions outside the clip range
57
+ */ if (position < 0 || position > 1) throw new Error(`Position must be between 0 and 1: ${position}`);
58
+ const [pos_bottom, pos_top] = $b6657fba8924a702$export$70e712e2ac0237a(unit, axisType, false);
59
+ const abs_pos = pos_bottom + position * (pos_top - pos_bottom);
60
+ // If clipped, check if abs_pos is within the clipped range
61
+ const [clip_bottom, clip_top] = $b6657fba8924a702$export$70e712e2ac0237a(unit, axisType, true);
62
+ if (axisType === (0, $1qVxh$ColumnAxisType).AGE || axisType === (0, $1qVxh$ColumnAxisType).DEPTH) {
63
+ // Invert for age/depth axes
64
+ if (abs_pos > clip_bottom || abs_pos < clip_top) return null;
65
+ } else {
66
+ if (abs_pos < clip_bottom || abs_pos > clip_top) return null;
67
+ }
68
+ return abs_pos;
36
69
  }
37
70
  const $b6657fba8924a702$export$ab14c04795685c55 = (axisType)=>{
38
71
  return (a, b)=>{
@@ -56,5 +89,5 @@ function $b6657fba8924a702$export$97de5b0a6b4e4dac(x) {
56
89
  }
57
90
 
58
91
 
59
- export {$b6657fba8924a702$export$e1644389ce074058 as MergeSectionsMode, $b6657fba8924a702$export$f1a15f539858307 as unitsOverlap, $b6657fba8924a702$export$70e712e2ac0237a as getUnitHeightRange, $b6657fba8924a702$export$d92a67740c050efb as agesOverlap, $b6657fba8924a702$export$ab14c04795685c55 as createUnitSorter, $b6657fba8924a702$export$d0c8ecbd4ed8940c as ensureArray, $b6657fba8924a702$export$97de5b0a6b4e4dac as ensureRealFloat};
60
- //# sourceMappingURL=column-views.54f8b909.js.map
92
+ export {$b6657fba8924a702$export$e1644389ce074058 as MergeSectionsMode, $b6657fba8924a702$export$f1a15f539858307 as unitsOverlap, $b6657fba8924a702$export$70e712e2ac0237a as getUnitHeightRange, $b6657fba8924a702$export$d92a67740c050efb as agesOverlap, $b6657fba8924a702$export$441710fb21b4ae09 as getPositionWithinUnit, $b6657fba8924a702$export$ab14c04795685c55 as createUnitSorter, $b6657fba8924a702$export$d0c8ecbd4ed8940c as ensureArray, $b6657fba8924a702$export$97de5b0a6b4e4dac as ensureRealFloat};
93
+ //# sourceMappingURL=column-views.052498a6.js.map
@@ -0,0 +1 @@
1
+ {"mappings":";;;;;AAeA,MAAM,2BAAK;AAaJ,IAAA,AAAK,mEAAA;;;WAAA;;AAyBL,MAAM,2CAA6B,SACxC,CAAC,EACD,CAAC,EACD,WAA2B,CAAA,GAAA,qBAAa,EAAE,GAAG,EAC7C,YAAoB,KAAK;IAEzB,MAAM,MAAM,CAAA,GAAA,uBAAe,EACzB,yCAAmB,GAAG,WACtB,yCAAmB,GAAG,WACtB;IAEF,OAAO,OAAO,CAAA,GAAA,2BAAmB,EAAE,QAAQ;AAC7C;AAGO,SAAS,0CACd,CAAuB,EACvB,CAAuB,EACvB,YAAoB,wBAAE;IAEtB,OAAO,yCAAa,GAAG,GAAG,CAAA,GAAA,qBAAa,EAAE,GAAG,EAAE;AAChD;AAQO,SAAS,yCACd,IAAyB,EACzB,QAAwB,EACxB,UAAmB,IAAI;IAEvB,IAAI,SACF,OAAQ;QACN,KAAK,CAAA,GAAA,qBAAa,EAAE,GAAG;YACrB,OAAO;gBAAC,KAAK,UAAU,IAAI,KAAK,KAAK;gBAAE,KAAK,UAAU,IAAI,KAAK,KAAK;aAAC;QACvE,KAAK,CAAA,GAAA,qBAAa,EAAE,KAAK;QACzB,KAAK,CAAA,GAAA,qBAAa,EAAE,OAAO;QAC3B,KAAK,CAAA,GAAA,qBAAa,EAAE,MAAM;YACxB,OAAO;gBAAC,KAAK,UAAU,IAAI,KAAK,KAAK;gBAAE,KAAK,UAAU,IAAI,KAAK,KAAK;aAAC;QACvE;YACE,MAAM,IAAI,MAAM,CAAC,mBAAmB,EAAE,UAAU;IACpD;SAEA,OAAQ;QACN,KAAK,CAAA,GAAA,qBAAa,EAAE,GAAG;YACrB,OAAO;gBAAC,KAAK,KAAK;gBAAE,KAAK,KAAK;aAAC;QACjC,KAAK,CAAA,GAAA,qBAAa,EAAE,KAAK;QACzB,KAAK,CAAA,GAAA,qBAAa,EAAE,OAAO;QAC3B,KAAK,CAAA,GAAA,qBAAa,EAAE,MAAM;YACxB,OAAO;gBAAC,KAAK,KAAK;gBAAE,KAAK,KAAK;aAAC;QACjC;YACE,MAAM,IAAI,MAAM,CAAC,mBAAmB,EAAE,UAAU;IACpD;AAEJ;AAEO,SAAS,0CACd,QAAgB,EAChB,IAAyB,EACzB,QAAwB;IAExB;;;GAGC,GACD,IAAI,WAAW,KAAK,WAAW,GAC7B,MAAM,IAAI,MAAM,CAAC,kCAAkC,EAAE,UAAU;IAGjE,MAAM,CAAC,YAAY,QAAQ,GAAG,yCAAmB,MAAM,UAAU;IACjE,MAAM,UAAU,aAAa,WAAY,CAAA,UAAU,UAAS;IAE5D,2DAA2D;IAC3D,MAAM,CAAC,aAAa,SAAS,GAAG,yCAAmB,MAAM,UAAU;IACnE,IAAI,aAAa,CAAA,GAAA,qBAAa,EAAE,GAAG,IAAI,aAAa,CAAA,GAAA,qBAAa,EAAE,KAAK,EAAE;QACxE,4BAA4B;QAC5B,IAAI,UAAU,eAAe,UAAU,UACrC,OAAO;IAEX,OAAO;QACL,IAAI,UAAU,eAAe,UAAU,UACrC,OAAO;IAEX;IAEA,OAAO;AACT;AAEO,MAAM,4CAAmB,CAAC;IAC/B,OAAO,CAAC,GAAa;QACnB,MAAM,QAAQ,yCAAmB,GAAG;QACpC,MAAM,QAAQ,yCAAmB,GAAG;QACpC,MAAM,QAAQ,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE;QACjC,IAAI,SAAS,GACX,OAAO;QAET,OAAO,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE;IAC5B;AACF;AAEO,SAAS,0CAAe,CAAU;IACvC,IAAI,MAAM,OAAO,CAAC,IAChB,OAAO;IAET,OAAO;QAAC;KAAE;AACZ;AAEO,SAAS,0CAAgB,CAAyB;IACvD,IAAI,OAAO,KAAK,UACd,IAAI,WAAW;IAEjB,IAAI,MAAM,IACR,OAAO;IAET,OAAO;AACT","sources":["packages/column-views/src/prepare-units/utils.ts"],"sourcesContent":["import type { BaseUnit } from \"@macrostrat/api-types\";\nimport {\n AgeRangeRelationship,\n compareAgeRanges,\n} from \"@macrostrat/stratigraphy-utils\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\nimport { ScaleContinuousNumeric } from \"d3-scale\";\nimport type {\n ColumnScaleOptions,\n CompositeColumnData,\n ExtUnit,\n PackageLayoutData,\n StratigraphicPackage,\n} from \"./types\";\n\nconst dt = 0.001;\n\nexport interface PrepareColumnOptions extends ColumnScaleOptions {\n axisType: ColumnAxisType;\n t_age?: number;\n b_age?: number;\n t_pos?: number;\n b_pos?: number;\n mergeSections?: MergeSectionsMode;\n collapseSmallUnconformities?: boolean | number;\n scale?: ScaleContinuousNumeric<any, any>;\n}\n\nexport enum MergeSectionsMode {\n ALL = \"all\",\n OVERLAPPING = \"overlapping\",\n}\n\nexport interface PreparedColumnData extends CompositeColumnData {\n sections: PackageLayoutData[];\n units: ExtUnit[];\n}\n\ninterface UnitsOverlap {\n (\n a: StratigraphicPackage,\n b: StratigraphicPackage,\n axisType?: ColumnAxisType.AGE,\n tolerance?: number,\n ): boolean;\n (\n a: BaseUnit,\n b: BaseUnit,\n axisType: ColumnAxisType,\n tolerance?: number,\n ): boolean;\n}\n\nexport const unitsOverlap: UnitsOverlap = function (\n a,\n b,\n axisType: ColumnAxisType = ColumnAxisType.AGE,\n tolerance: number = 0.001,\n): boolean {\n const rel = compareAgeRanges(\n getUnitHeightRange(a, axisType),\n getUnitHeightRange(b, axisType),\n tolerance,\n );\n return rel != AgeRangeRelationship.Disjoint;\n};\n\n/** A more permissive overlap function in the age space */\nexport function agesOverlap(\n a: StratigraphicPackage,\n b: StratigraphicPackage,\n tolerance: number = dt,\n): boolean {\n return unitsOverlap(a, b, ColumnAxisType.AGE, tolerance);\n}\n\nexport interface PossiblyClippedUnit extends BaseUnit {\n // Internally created clipped positions\n t_clip_pos?: number;\n b_clip_pos?: number;\n}\n\nexport function getUnitHeightRange(\n unit: PossiblyClippedUnit,\n axisType: ColumnAxisType,\n clipped: boolean = true,\n): [number, number] {\n if (clipped) {\n switch (axisType) {\n case ColumnAxisType.AGE:\n return [unit.b_clip_pos ?? unit.b_age, unit.t_clip_pos ?? unit.t_age];\n case ColumnAxisType.DEPTH:\n case ColumnAxisType.ORDINAL:\n case ColumnAxisType.HEIGHT:\n return [unit.b_clip_pos ?? unit.b_pos, unit.t_clip_pos ?? unit.t_pos];\n default:\n throw new Error(`Unknown axis type: ${axisType}`);\n }\n } else {\n switch (axisType) {\n case ColumnAxisType.AGE:\n return [unit.b_age, unit.t_age];\n case ColumnAxisType.DEPTH:\n case ColumnAxisType.ORDINAL:\n case ColumnAxisType.HEIGHT:\n return [unit.b_pos, unit.t_pos];\n default:\n throw new Error(`Unknown axis type: ${axisType}`);\n }\n }\n}\n\nexport function getPositionWithinUnit(\n position: number,\n unit: PossiblyClippedUnit,\n axisType: ColumnAxisType,\n): number | null {\n /** Translate a relative position (0-1) within a unit to an absolute position\n * within the unit's height range. If the unit is clipped, null values will be\n * returned for positions outside the clip range\n */\n if (position < 0 || position > 1) {\n throw new Error(`Position must be between 0 and 1: ${position}`);\n }\n\n const [pos_bottom, pos_top] = getUnitHeightRange(unit, axisType, false);\n const abs_pos = pos_bottom + position * (pos_top - pos_bottom);\n\n // If clipped, check if abs_pos is within the clipped range\n const [clip_bottom, clip_top] = getUnitHeightRange(unit, axisType, true);\n if (axisType === ColumnAxisType.AGE || axisType === ColumnAxisType.DEPTH) {\n // Invert for age/depth axes\n if (abs_pos > clip_bottom || abs_pos < clip_top) {\n return null;\n }\n } else {\n if (abs_pos < clip_bottom || abs_pos > clip_top) {\n return null;\n }\n }\n\n return abs_pos;\n}\n\nexport const createUnitSorter = (axisType: ColumnAxisType) => {\n return (a: BaseUnit, b: BaseUnit) => {\n const a_pos = getUnitHeightRange(a, axisType);\n const b_pos = getUnitHeightRange(b, axisType);\n const d_top = a_pos[1] - b_pos[1];\n if (d_top != 0) {\n return d_top;\n }\n return a_pos[0] - b_pos[0];\n };\n};\n\nexport function ensureArray<T>(x: T | T[]): T[] {\n if (Array.isArray(x)) {\n return x;\n }\n return [x];\n}\n\nexport function ensureRealFloat(x: number | string | null): number | null {\n if (typeof x == \"string\") {\n x = parseFloat(x);\n }\n if (isNaN(x)) {\n return null;\n }\n return x;\n}\n"],"names":[],"version":3,"file":"column-views.052498a6.js.map"}
@@ -1,4 +1,4 @@
1
- import {IsotopesDataset as $d71d096cfe00860f$export$c69bd0285aa5d775, IsotopesColumn as $d71d096cfe00860f$export$5d8aa8022c284748} from "./column-views.0ce9b697.js";
1
+ import {IsotopesDataset as $d71d096cfe00860f$export$c69bd0285aa5d775, IsotopesColumn as $d71d096cfe00860f$export$5d8aa8022c284748} from "./column-views.9ffc089b.js";
2
2
  import {MeasurementDataContext as $5dbb619f2c7bef60$export$c644ef985ce7a4c4, MeasurementDataProvider as $5dbb619f2c7bef60$export$5f01d5b342a89841, useMeasurementData as $5dbb619f2c7bef60$export$8a0335fd9ff72150} from "./column-views.a7c5ae16.js";
3
3
 
4
4
 
@@ -6,4 +6,4 @@ import {MeasurementDataContext as $5dbb619f2c7bef60$export$c644ef985ce7a4c4, Mea
6
6
 
7
7
 
8
8
  export {$d71d096cfe00860f$export$c69bd0285aa5d775 as IsotopesDataset, $d71d096cfe00860f$export$5d8aa8022c284748 as IsotopesColumn, $5dbb619f2c7bef60$export$c644ef985ce7a4c4 as MeasurementDataContext, $5dbb619f2c7bef60$export$5f01d5b342a89841 as MeasurementDataProvider, $5dbb619f2c7bef60$export$8a0335fd9ff72150 as useMeasurementData};
9
- //# sourceMappingURL=column-views.60365cdb.js.map
9
+ //# sourceMappingURL=column-views.0da4503a.js.map
@@ -1 +1 @@
1
- {"mappings":"","sources":["packages/column-views/src/facets/carbon-isotopes/index.ts"],"sourcesContent":["export * from \"./isotopes-column\";\nexport * from \"./data-provider\";\n"],"names":[],"version":3,"file":"column-views.60365cdb.js.map"}
1
+ {"mappings":"","sources":["packages/column-views/src/facets/carbon-isotopes/index.ts"],"sourcesContent":["export * from \"./isotopes-column\";\nexport * from \"./data-provider\";\n"],"names":[],"version":3,"file":"column-views.0da4503a.js.map"}
@@ -1,13 +1,13 @@
1
- import {UnitKeyboardNavigation as $61771df184788970$export$70f5ee19650fc7d1, UnitSelectionProvider as $61771df184788970$export$f19d75b1d4b676a4, useUnitSelectionStore as $61771df184788970$export$b220b1d3591dc9e5} from "./column-views.a3fabf0f.js";
2
- import {UnitSelectionPopover as $a9bcb536274d1bf9$export$db1115efab13710d} from "./column-views.382c486d.js";
1
+ import {UnitKeyboardNavigation as $61771df184788970$export$70f5ee19650fc7d1, UnitSelectionProvider as $61771df184788970$export$f19d75b1d4b676a4, useUnitSelectionStore as $61771df184788970$export$b220b1d3591dc9e5} from "./column-views.c44febd0.js";
2
+ import {UnitSelectionPopover as $a9bcb536274d1bf9$export$db1115efab13710d} from "./column-views.565b193a.js";
3
3
  import "./column-views.338a7a83.css";
4
4
  import $2d5zd$columnviews6a954628js from "./column-views.6a954628.js";
5
- import {CompositeTimescaleCore as $7d0f52717c0de7e1$export$463f46772c64d403} from "./column-views.0265cf7f.js";
6
- import {buildCorrelationChartData as $2c6a8e6a98a077ae$export$7f21dc14b8199dc0, findLaterallyExtensiveUnits as $2c6a8e6a98a077ae$export$cc5d9b95e199a6de, splitStratIntoBoxes as $2c6a8e6a98a077ae$export$3e71a3125322d04b} from "./column-views.88d63dd0.js";
7
- import {CompositeAgeAxisCore as $43794af7643cdf40$export$ac30ca3cf5df959d} from "./column-views.adec2e4c.js";
8
- import {ColoredUnitComponent as $4c8184c4a7317749$export$6012fd1584b5d0c0} from "./column-views.df34441c.js";
9
- import {UnitBoxes as $d254716a820e9c85$export$5d1cdfabe8dc8085} from "./column-views.81bddbee.js";
10
- import {ColumnContainer as $2118f0266dc7e955$export$2194471aa3d52446} from "./column-views.29a551f6.js";
5
+ import {CompositeTimescaleCore as $7d0f52717c0de7e1$export$463f46772c64d403} from "./column-views.afe0bb48.js";
6
+ import {buildCorrelationChartData as $2c6a8e6a98a077ae$export$7f21dc14b8199dc0, findLaterallyExtensiveUnits as $2c6a8e6a98a077ae$export$cc5d9b95e199a6de, splitStratIntoBoxes as $2c6a8e6a98a077ae$export$3e71a3125322d04b} from "./column-views.275ba52b.js";
7
+ import {CompositeAgeAxisCore as $43794af7643cdf40$export$ac30ca3cf5df959d} from "./column-views.92575b87.js";
8
+ import {ColoredUnitComponent as $4c8184c4a7317749$export$6012fd1584b5d0c0} from "./column-views.5ca2b219.js";
9
+ import {UnitBoxes as $d254716a820e9c85$export$5d1cdfabe8dc8085} from "./column-views.faa7e52e.js";
10
+ import {ColumnContainer as $2118f0266dc7e955$export$2194471aa3d52446} from "./column-views.2708e176.js";
11
11
  import $2d5zd$macrostrathyper from "@macrostrat/hyper";
12
12
  import {useMemo as $2d5zd$useMemo, useRef as $2d5zd$useRef} from "react";
13
13
  import {useInDarkMode as $2d5zd$useInDarkMode} from "@macrostrat/ui-components";
@@ -225,4 +225,4 @@ function $ed7dc56184962590$var$TimescaleColumn(props) {
225
225
 
226
226
 
227
227
  export {$ed7dc56184962590$export$9ebf875c09445bec as CorrelationChart};
228
- //# sourceMappingURL=column-views.53722d0a.js.map
228
+ //# sourceMappingURL=column-views.107b47b4.js.map
@@ -1 +1 @@
1
- {"mappings":"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","sources":["packages/column-views/src/correlation-chart/main.ts"],"sourcesContent":["/** Correlation chart */\nimport {\n UnitSelectionProvider,\n UnitKeyboardNavigation,\n useUnitSelectionStore,\n} from \"../data-provider\";\nimport { UnitSelectionPopover } from \"../unit-details\";\nimport hyper from \"@macrostrat/hyper\";\nimport styles from \"./main.module.sass\";\nimport { useMemo, useRef } from \"react\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport { CompositeTimescaleCore } from \"../section\";\nimport classNames from \"classnames\";\nimport {\n findLaterallyExtensiveUnits,\n splitStratIntoBoxes,\n UnitGroupBox,\n CorrelationChartSettings,\n buildCorrelationChartData,\n} from \"./prepare-data\";\nimport {\n CompositeAgeAxisCore,\n CompositeStratigraphicScaleInfo,\n} from \"../age-axis\";\nimport {\n ColumnAxisType,\n ColumnProvider,\n SVG,\n} from \"@macrostrat/column-components\";\nimport { ColoredUnitComponent } from \"../units\";\nimport { UnitBoxes } from \"../units/boxes\";\nimport { ColumnContainer } from \"../column\";\nimport { ColumnData } from \"../data-provider\";\nimport { BaseUnit } from \"@macrostrat/api-types\";\nimport { ScaleContinuousNumeric } from \"d3-scale\";\nimport { ExtUnit } from \"../prepare-units/types\";\n\nconst h = hyper.styled(styles);\n\nexport interface CorrelationChartProps extends CorrelationChartSettings {\n data: ColumnData[];\n columnWidth?: number;\n columnSpacing?: number;\n targetUnitHeight?: number;\n unconformityLabels?: boolean;\n selectedUnit?: number | null;\n showUnitPopover?: boolean;\n unitComponent?: any;\n onUnitSelected?: (unitID: number | null, unit: BaseUnit | null) => void;\n}\n\nexport function CorrelationChart({\n data,\n columnSpacing = 0,\n columnWidth = 130,\n unconformityLabels = true,\n showUnitPopover = true,\n selectedUnit,\n onUnitSelected,\n unitComponent,\n ...scaleProps\n}: CorrelationChartProps) {\n const defaultScaleProps = {\n targetUnitHeight: 10,\n unconformityHeight: 60,\n minSectionHeight: 60,\n collapseSmallUnconformities: true,\n };\n\n const chartData = useMemo(() => {\n if (!data) return null;\n return buildCorrelationChartData(data, {\n ...defaultScaleProps,\n ...scaleProps,\n });\n }, [data, ...Object.values(scaleProps)]);\n\n const columnRef = useRef(null);\n\n // A flattened units array is used to support keyboard navigation\n const units = useMemo(() => {\n return data?.map((d0) => d0.units).flat() ?? [];\n }, [data]);\n\n const inDarkMode = useInDarkMode();\n\n const className = classNames({\n \"dark-mode\": inDarkMode,\n });\n\n if (chartData == null) {\n return null;\n }\n\n const { packages, scaleInfo, nColumns } = chartData;\n\n const mainWidth = (columnWidth + columnSpacing) * nColumns;\n\n return h(\n ColumnContainer,\n { className: \"correlation-diagram\" },\n h(\n UnitSelectionProvider,\n { columnRef, selectedUnit, onUnitSelected, units },\n h(ChartArea, [\n h(TimescaleColumn, {\n key: \"timescale\",\n scaleInfo,\n unconformityLabels,\n }),\n h(\"div.main-chart\", { ref: columnRef }, [\n h(\n SVG,\n {\n className,\n innerWidth: mainWidth,\n height: scaleInfo.totalHeight,\n paddingH: 4,\n },\n packages.map((pkg, i) => {\n const { offset, domain, pixelScale, scale, key } =\n scaleInfo.packages[i];\n return h(Package, {\n columnData: pkg.columnData,\n key,\n columnWidth,\n columnSpacing,\n offset,\n domain,\n pixelScale,\n scale,\n unitComponent,\n });\n }),\n ),\n h.if(showUnitPopover)(UnitSelectionPopover),\n // Navigation only works within a column for now...\n h(UnitKeyboardNavigation, { units }),\n ]),\n ]),\n ),\n );\n}\n\nfunction Package({\n columnData,\n columnSpacing,\n columnWidth,\n unitComponent,\n offset,\n domain,\n pixelScale,\n scale,\n}) {\n return h(\"g.package\", { transform: `translate(0 ${offset})` }, [\n // Disable the SVG overlay for now\n //h(PackageSVGOverlay, { data, columnSpacing }),\n h(\"g.column-units\", [\n columnData.map((data, i) => {\n return h(Column, {\n units: data.units,\n unitComponent,\n width: columnWidth,\n key: i,\n domain,\n pixelScale,\n scale,\n offsetLeft: i * (columnWidth + columnSpacing),\n });\n }),\n ]),\n ]);\n}\n\ninterface ColumnProps {\n units: ExtUnit[];\n unitComponent?: React.FunctionComponent<any>;\n unitComponentProps?: any;\n showLabels?: boolean;\n width?: number;\n columnWidth?: number;\n columnSpacing?: number;\n targetUnitHeight?: number;\n offsetLeft?: number;\n domain: [number, number];\n pixelScale: number;\n scale?: ScaleContinuousNumeric<number, number>;\n}\n\nfunction Column(props: ColumnProps) {\n const {\n units,\n width = 150,\n offsetLeft,\n domain,\n pixelScale,\n scale,\n unitComponent = ColoredUnitComponent,\n } = props;\n\n const columnWidth = width;\n\n if (units.length == 0) {\n return null;\n }\n\n return h(\n \"g.section\",\n {\n transform: `translate(${offsetLeft} 0)`,\n },\n h(\n ColumnProvider,\n {\n // Need to tighten up types here...\n divisions: units as any[],\n range: domain,\n scale,\n pixelsPerMeter: pixelScale, // Actually pixels per myr\n axisType: ColumnAxisType.AGE,\n },\n h(UnitBoxes, {\n unitComponent,\n unitComponentProps: {\n nColumns: 2,\n width: columnWidth,\n showLabel: false,\n },\n }),\n ),\n );\n}\n\nfunction PackageSVGOverlay({ data, columnWidth = 100, columnSpacing = 0 }) {\n const { b_age, t_age, bestPixelScale, columnData } = data;\n\n const width = (columnWidth + columnSpacing) * columnData.length;\n const height = Math.ceil((b_age - t_age) * bestPixelScale) + 2;\n\n const extensiveUnits = findLaterallyExtensiveUnits(data);\n\n const scale = (val: number) => {\n return (val - t_age) * bestPixelScale;\n };\n\n return h(\n \"div.package-overlay\",\n { style: { width, height } },\n extensiveUnits.map((d) => {\n return h(LaterallyExtensiveUnit, {\n data: d,\n scale,\n pixelScale: bestPixelScale,\n columnSpacing,\n });\n }),\n );\n}\n\nfunction LaterallyExtensiveUnit({ data, scale, pixelScale, columnSpacing }) {\n const { b_age, t_age, strat_name_long, units } = data;\n // Build boxes by column groups\n const boxes: UnitGroupBox[] = splitStratIntoBoxes(data);\n\n return h(\n \"div.laterally-extensive-unit\",\n boxes.map((d, i) => {\n return h(StratColSpan, {\n scale,\n data: d,\n pixelScale,\n key: i,\n columnSpacing,\n });\n }),\n );\n}\n\nfunction StratColSpan({\n data,\n scale,\n columnWidth = 100,\n columnSpacing = 0,\n pixelScale = 1,\n}) {\n const { startCol, endCol, strat_name_long, t_age, b_age } = data;\n const top = scale(t_age);\n const left = startCol * (columnWidth + columnSpacing);\n const width = (endCol - startCol + 1) * (columnWidth + columnSpacing);\n const height = (b_age - t_age) * pixelScale;\n return h(\n \"div.strat-col-span\",\n { style: { top, height, width, left } },\n strat_name_long,\n );\n}\n\nfunction ChartArea({ children }) {\n const setSelectedUnit = useUnitSelectionStore(\n (state) => state.setSelectedUnit,\n );\n\n return h(\n \"div.correlation-chart-inner\",\n {\n onClick() {\n setSelectedUnit(null);\n },\n },\n children,\n );\n}\n\ninterface TimescaleColumnProps {\n scaleInfo: CompositeStratigraphicScaleInfo;\n showLabels?: boolean;\n unconformityLabels?: boolean;\n}\n\nfunction TimescaleColumn(props: TimescaleColumnProps) {\n const { scaleInfo, unconformityLabels = true } = props;\n return h(\"div.column-container.age-axis-container\", [\n h(CompositeAgeAxisCore, { ...scaleInfo }),\n h(CompositeTimescaleCore, { ...scaleInfo, unconformityLabels }),\n ]);\n}\n"],"names":[],"version":3,"file":"column-views.53722d0a.js.map"}
1
+ {"mappings":"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","sources":["packages/column-views/src/correlation-chart/main.ts"],"sourcesContent":["/** Correlation chart */\nimport {\n UnitSelectionProvider,\n UnitKeyboardNavigation,\n useUnitSelectionStore,\n} from \"../data-provider\";\nimport { UnitSelectionPopover } from \"../unit-details\";\nimport hyper from \"@macrostrat/hyper\";\nimport styles from \"./main.module.sass\";\nimport { useMemo, useRef } from \"react\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport { CompositeTimescaleCore } from \"../section\";\nimport classNames from \"classnames\";\nimport {\n findLaterallyExtensiveUnits,\n splitStratIntoBoxes,\n UnitGroupBox,\n CorrelationChartSettings,\n buildCorrelationChartData,\n} from \"./prepare-data\";\nimport {\n CompositeAgeAxisCore,\n CompositeStratigraphicScaleInfo,\n} from \"../age-axis\";\nimport {\n ColumnAxisType,\n ColumnProvider,\n SVG,\n} from \"@macrostrat/column-components\";\nimport { ColoredUnitComponent } from \"../units\";\nimport { UnitBoxes } from \"../units/boxes\";\nimport { ColumnContainer } from \"../column\";\nimport { ColumnData } from \"../data-provider\";\nimport { BaseUnit } from \"@macrostrat/api-types\";\nimport { ScaleContinuousNumeric } from \"d3-scale\";\nimport { ExtUnit } from \"../prepare-units/types\";\n\nconst h = hyper.styled(styles);\n\nexport interface CorrelationChartProps extends CorrelationChartSettings {\n data: ColumnData[];\n columnWidth?: number;\n columnSpacing?: number;\n targetUnitHeight?: number;\n unconformityLabels?: boolean;\n selectedUnit?: number | null;\n showUnitPopover?: boolean;\n unitComponent?: any;\n onUnitSelected?: (unitID: number | null, unit: BaseUnit | null) => void;\n}\n\nexport function CorrelationChart({\n data,\n columnSpacing = 0,\n columnWidth = 130,\n unconformityLabels = true,\n showUnitPopover = true,\n selectedUnit,\n onUnitSelected,\n unitComponent,\n ...scaleProps\n}: CorrelationChartProps) {\n const defaultScaleProps = {\n targetUnitHeight: 10,\n unconformityHeight: 60,\n minSectionHeight: 60,\n collapseSmallUnconformities: true,\n };\n\n const chartData = useMemo(() => {\n if (!data) return null;\n return buildCorrelationChartData(data, {\n ...defaultScaleProps,\n ...scaleProps,\n });\n }, [data, ...Object.values(scaleProps)]);\n\n const columnRef = useRef(null);\n\n // A flattened units array is used to support keyboard navigation\n const units = useMemo(() => {\n return data?.map((d0) => d0.units).flat() ?? [];\n }, [data]);\n\n const inDarkMode = useInDarkMode();\n\n const className = classNames({\n \"dark-mode\": inDarkMode,\n });\n\n if (chartData == null) {\n return null;\n }\n\n const { packages, scaleInfo, nColumns } = chartData;\n\n const mainWidth = (columnWidth + columnSpacing) * nColumns;\n\n return h(\n ColumnContainer,\n { className: \"correlation-diagram\" },\n h(\n UnitSelectionProvider,\n { columnRef, selectedUnit, onUnitSelected, units },\n h(ChartArea, [\n h(TimescaleColumn, {\n key: \"timescale\",\n scaleInfo,\n unconformityLabels,\n }),\n h(\"div.main-chart\", { ref: columnRef }, [\n h(\n SVG,\n {\n className,\n innerWidth: mainWidth,\n height: scaleInfo.totalHeight,\n paddingH: 4,\n },\n packages.map((pkg, i) => {\n const { offset, domain, pixelScale, scale, key } =\n scaleInfo.packages[i];\n return h(Package, {\n columnData: pkg.columnData,\n key,\n columnWidth,\n columnSpacing,\n offset,\n domain,\n pixelScale,\n scale,\n unitComponent,\n });\n }),\n ),\n h.if(showUnitPopover)(UnitSelectionPopover),\n // Navigation only works within a column for now...\n h(UnitKeyboardNavigation, { units }),\n ]),\n ]),\n ),\n );\n}\n\nfunction Package({\n columnData,\n columnSpacing,\n columnWidth,\n unitComponent,\n offset,\n domain,\n pixelScale,\n scale,\n}) {\n return h(\"g.package\", { transform: `translate(0 ${offset})` }, [\n // Disable the SVG overlay for now\n //h(PackageSVGOverlay, { data, columnSpacing }),\n h(\"g.column-units\", [\n columnData.map((data, i) => {\n return h(Column, {\n units: data.units,\n unitComponent,\n width: columnWidth,\n key: i,\n domain,\n pixelScale,\n scale,\n offsetLeft: i * (columnWidth + columnSpacing),\n });\n }),\n ]),\n ]);\n}\n\ninterface ColumnProps {\n units: ExtUnit[];\n unitComponent?: React.FunctionComponent<any>;\n unitComponentProps?: any;\n showLabels?: boolean;\n width?: number;\n columnWidth?: number;\n columnSpacing?: number;\n targetUnitHeight?: number;\n offsetLeft?: number;\n domain: [number, number];\n pixelScale: number;\n scale?: ScaleContinuousNumeric<number, number>;\n}\n\nfunction Column(props: ColumnProps) {\n const {\n units,\n width = 150,\n offsetLeft,\n domain,\n pixelScale,\n scale,\n unitComponent = ColoredUnitComponent,\n } = props;\n\n const columnWidth = width;\n\n if (units.length == 0) {\n return null;\n }\n\n return h(\n \"g.section\",\n {\n transform: `translate(${offsetLeft} 0)`,\n },\n h(\n ColumnProvider,\n {\n // Need to tighten up types here...\n divisions: units as any[],\n range: domain,\n scale,\n pixelsPerMeter: pixelScale, // Actually pixels per myr\n axisType: ColumnAxisType.AGE,\n },\n h(UnitBoxes, {\n unitComponent,\n unitComponentProps: {\n nColumns: 2,\n width: columnWidth,\n showLabel: false,\n },\n }),\n ),\n );\n}\n\nfunction PackageSVGOverlay({ data, columnWidth = 100, columnSpacing = 0 }) {\n const { b_age, t_age, bestPixelScale, columnData } = data;\n\n const width = (columnWidth + columnSpacing) * columnData.length;\n const height = Math.ceil((b_age - t_age) * bestPixelScale) + 2;\n\n const extensiveUnits = findLaterallyExtensiveUnits(data);\n\n const scale = (val: number) => {\n return (val - t_age) * bestPixelScale;\n };\n\n return h(\n \"div.package-overlay\",\n { style: { width, height } },\n extensiveUnits.map((d) => {\n return h(LaterallyExtensiveUnit, {\n data: d,\n scale,\n pixelScale: bestPixelScale,\n columnSpacing,\n });\n }),\n );\n}\n\nfunction LaterallyExtensiveUnit({ data, scale, pixelScale, columnSpacing }) {\n const { b_age, t_age, strat_name_long, units } = data;\n // Build boxes by column groups\n const boxes: UnitGroupBox[] = splitStratIntoBoxes(data);\n\n return h(\n \"div.laterally-extensive-unit\",\n boxes.map((d, i) => {\n return h(StratColSpan, {\n scale,\n data: d,\n pixelScale,\n key: i,\n columnSpacing,\n });\n }),\n );\n}\n\nfunction StratColSpan({\n data,\n scale,\n columnWidth = 100,\n columnSpacing = 0,\n pixelScale = 1,\n}) {\n const { startCol, endCol, strat_name_long, t_age, b_age } = data;\n const top = scale(t_age);\n const left = startCol * (columnWidth + columnSpacing);\n const width = (endCol - startCol + 1) * (columnWidth + columnSpacing);\n const height = (b_age - t_age) * pixelScale;\n return h(\n \"div.strat-col-span\",\n { style: { top, height, width, left } },\n strat_name_long,\n );\n}\n\nfunction ChartArea({ children }) {\n const setSelectedUnit = useUnitSelectionStore(\n (state) => state.setSelectedUnit,\n );\n\n return h(\n \"div.correlation-chart-inner\",\n {\n onClick() {\n setSelectedUnit(null);\n },\n },\n children,\n );\n}\n\ninterface TimescaleColumnProps {\n scaleInfo: CompositeStratigraphicScaleInfo;\n showLabels?: boolean;\n unconformityLabels?: boolean;\n}\n\nfunction TimescaleColumn(props: TimescaleColumnProps) {\n const { scaleInfo, unconformityLabels = true } = props;\n return h(\"div.column-container.age-axis-container\", [\n h(CompositeAgeAxisCore, { ...scaleInfo }),\n h(CompositeTimescaleCore, { ...scaleInfo, unconformityLabels }),\n ]);\n}\n"],"names":[],"version":3,"file":"column-views.107b47b4.js.map"}
@@ -0,0 +1,16 @@
1
+
2
+ function $parcel$export(e, n, v, s) {
3
+ Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});
4
+ }
5
+ var $93950c7d6664dc2b$exports = {};
6
+
7
+ $parcel$export($93950c7d6664dc2b$exports, "too-many", () => $93950c7d6664dc2b$export$76144d85d033d82a, (v) => $93950c7d6664dc2b$export$76144d85d033d82a = v);
8
+ $parcel$export($93950c7d6664dc2b$exports, "truncated-list", () => $93950c7d6664dc2b$export$12f42f335e4f5e49, (v) => $93950c7d6664dc2b$export$12f42f335e4f5e49 = v);
9
+ var $93950c7d6664dc2b$export$76144d85d033d82a;
10
+ var $93950c7d6664dc2b$export$12f42f335e4f5e49;
11
+ $93950c7d6664dc2b$export$76144d85d033d82a = `_2-5Cia_too-many`;
12
+ $93950c7d6664dc2b$export$12f42f335e4f5e49 = `_2-5Cia_truncated-list`;
13
+
14
+
15
+ export {$93950c7d6664dc2b$exports as default};
16
+ //# sourceMappingURL=column-views.17a70358.js.map
@@ -0,0 +1 @@
1
+ {"mappings":";;;;;;;;AAAA,IAAA;AACA,IAAA;AADA,4CAA6B,CAAC,gBAAgB,CAAC;AAC/C,4CAAmC,CAAC,sBAAsB,CAAC","sources":["packages/column-views/src/facets/measurements/base.module.sass"],"sourcesContent":[".truncated-list\n padding-left: 0.2em\n font-size: 0.9em\n list-style: none\n border-left: 1px solid var(--column-stroke-color)\n margin: 1px 0\n background-color: var(--column-background-color)\n li\n display: inline\n &:not(:last-child):after\n content: \", \"\n color: var(--secondary-color)\n li.too-many\n color: var(--secondary-color)\n font-style: italic\n"],"names":[],"version":3,"file":"column-views.17a70358.js.map"}
@@ -1,5 +1,5 @@
1
- import {ensureArray as $b6657fba8924a702$export$d0c8ecbd4ed8940c, getUnitHeightRange as $b6657fba8924a702$export$70e712e2ac0237a} from "./column-views.54f8b909.js";
2
- import {buildHybridScale as $90d6b105908858a7$export$6b39f1b6356d94b6} from "./column-views.70164236.js";
1
+ import {ensureArray as $b6657fba8924a702$export$d0c8ecbd4ed8940c, getUnitHeightRange as $b6657fba8924a702$export$70e712e2ac0237a} from "./column-views.052498a6.js";
2
+ import {buildHybridScale as $90d6b105908858a7$export$6b39f1b6356d94b6} from "./column-views.aa9ede4d.js";
3
3
  import {HybridScaleType as $1254c5929638d7f9$export$45e8e2d7a1794c23} from "./column-views.079119f4.js";
4
4
  import {ColumnAxisType as $egi9E$ColumnAxisType} from "@macrostrat/column-components";
5
5
  import {scaleLinear as $egi9E$scaleLinear} from "d3-scale";
@@ -316,4 +316,4 @@ function $728f6cf6c12cd490$export$edbf01b435c75274(sections, threshold, opts) {
316
316
 
317
317
 
318
318
  export {$728f6cf6c12cd490$export$e7184dd8bb3302ed as buildCompositeScaleInfo, $728f6cf6c12cd490$export$d6235b492bceb8c5 as createPackageScale, $728f6cf6c12cd490$export$67442a0f5bef147b as finalizeSectionHeights, $728f6cf6c12cd490$export$7d3f3129a1a4b84e as computeSectionHeights, $728f6cf6c12cd490$export$3ada7641926a616d as createCompositeScale, $728f6cf6c12cd490$export$edbf01b435c75274 as collapseUnconformitiesByPixelHeight};
319
- //# sourceMappingURL=column-views.073c42da.js.map
319
+ //# sourceMappingURL=column-views.1b5bf0c6.js.map
@@ -1 +1 @@
1
- {"mappings":"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","sources":["packages/column-views/src/prepare-units/composite-scale.ts"],"sourcesContent":["import { ColumnAxisType } from \"@macrostrat/column-components\";\nimport { ensureArray, getUnitHeightRange } from \"./utils\";\nimport { ScaleContinuousNumeric, scaleLinear } from \"d3-scale\";\nimport { UnitLong } from \"@macrostrat/api-types\";\nimport { buildHybridScale } from \"./dynamic-scales\";\nimport { ExtUnit, HybridScaleType, SectionInfo } from \"./types\";\nimport type {\n ColumnScaleOptions,\n CompositeColumnData,\n CompositeScaleData,\n PackageLayoutData,\n PackageScaleInfo,\n PackageScaleLayoutData,\n SectionScaleOptions,\n} from \"./types\";\n\n// Composite scale information augmented with units in each package\n\nexport function buildCompositeScaleInfo(\n inputScales: PackageScaleInfo[],\n unconformityHeight: number,\n): CompositeScaleData {\n /** Finalize the heights of sections, including the heights of unconformities\n * between them.\n */\n\n let totalHeight = unconformityHeight / 2;\n let lastSectionTopHeight = 0;\n\n const packages2: PackageScaleLayoutData[] = [];\n for (const group of inputScales) {\n const { domain, scale } = group;\n const [b_age, t_age] = domain;\n const key = `package-${b_age}-${t_age}`;\n\n packages2.push({\n ...createPackageScale(group, totalHeight),\n key,\n offset: totalHeight,\n // Unconformity height above this particular section\n paddingTop: totalHeight - lastSectionTopHeight,\n });\n\n const pixelHeight = Math.abs(scale(b_age) - scale(t_age));\n lastSectionTopHeight = totalHeight + pixelHeight;\n totalHeight = lastSectionTopHeight + unconformityHeight;\n }\n totalHeight += unconformityHeight / 2;\n return {\n totalHeight,\n sections: packages2,\n };\n}\n\nexport function finalizeSectionHeights<T extends UnitLong>(\n sections: SectionInfoWithScale<T>[],\n unconformityHeight: number,\n): CompositeColumnData<T> {\n /** Finalize the heights of sections, including the heights of unconformities\n * between them.\n */\n\n const sectionScales = sections.map((d) => d.scaleInfo);\n\n const { totalHeight, sections: packages } = buildCompositeScaleInfo(\n sectionScales,\n unconformityHeight,\n );\n\n // This could perhaps be simplified.\n const sections1: PackageLayoutData<T>[] = [];\n for (const i in sections) {\n const group = sections[i];\n const scaleInfo = packages[i];\n sections1.push({\n ...group,\n key: scaleInfo.key,\n scaleInfo,\n });\n }\n return {\n totalHeight,\n sections: sections1,\n };\n}\n\nexport interface SectionInfoWithScale<\n T extends UnitLong = ExtUnit,\n> extends SectionInfo<T> {\n scaleInfo: PackageScaleInfo;\n}\n\nexport function computeSectionHeights<T extends UnitLong>(\n sections: SectionInfo<T>[],\n opts: ColumnScaleOptions,\n): SectionInfoWithScale<T>[] {\n return sections.map((group) => {\n return addScaleToSection<T>(group, opts);\n });\n}\n\nfunction addScaleToSection<T extends UnitLong = ExtUnit>(\n group: SectionInfo<T>,\n opts: ColumnScaleOptions,\n): SectionInfoWithScale<T> {\n const { t_age, b_age, t_pos, b_pos, units } = group;\n let _range = null;\n // if t_age and b_age are set for a group, use them to define the range...\n if (opts.axisType == ColumnAxisType.AGE) {\n _range = [b_age, t_age];\n } else {\n _range = [b_pos, t_pos];\n }\n\n const scaleInfo = buildSectionScale<T>(units, {\n ...opts,\n domain: _range,\n });\n\n return {\n ...group,\n scaleInfo,\n };\n}\n\nfunction buildSectionScale<T extends UnitLong>(\n data: T[],\n opts: SectionScaleOptions,\n): PackageScaleInfo {\n const {\n targetUnitHeight = 20,\n minPixelScale = 0.2,\n axisType,\n minSectionHeight,\n scale,\n hybridScale,\n } = opts;\n const domain = opts.domain ?? findSectionHeightRange(data, axisType);\n\n const dAge = Math.abs(domain[0] - domain[1]);\n\n let _pixelScale = opts.pixelScale;\n let pixelHeight: number;\n\n if (hybridScale != null) {\n /** In an equidistant surfaces scale, we want to determine the heights of surfaces\n * and then distribute units evenly between them.\n * This is somewhat like an ordinal scale\n */\n if (hybridScale.type === HybridScaleType.EquidistantSurfaces) {\n _pixelScale ??= targetUnitHeight;\n }\n\n return buildHybridScale(hybridScale, data, domain, {\n pixelOffset: 0,\n pixelScale: _pixelScale,\n });\n }\n\n if (scale == null) {\n if (_pixelScale == null) {\n const avgAgeRange = findAverageUnitHeight(data, axisType);\n // Get pixel height necessary to render average unit at target height\n _pixelScale = Math.max(targetUnitHeight / avgAgeRange, minPixelScale);\n\n // OLD METHOD that cares about overall section height vs. individual unit height\n // 0.2 pixel per myr is the floor scale\n //const targetHeight = targetUnitHeight * data.length;\n // 1 pixel per myr is the floor scale\n //_pixelScale = Math.max(targetHeight / dAge, minPixelScale);\n }\n\n let height = dAge * _pixelScale;\n // If height is less than minSectionHeight, set it to minSectionHeight\n const _minSectionHeight = minSectionHeight ?? targetUnitHeight ?? 0;\n pixelHeight = Math.max(height, _minSectionHeight);\n _pixelScale = pixelHeight / dAge;\n } else {\n // If a scale is provided, use it to compute pixel height\n pixelHeight = Math.abs(scale(domain[0]) - scale(domain[1]));\n }\n\n return createPackageScale(\n { scale, domain, pixelHeight, pixelScale: _pixelScale },\n 0,\n );\n}\n\nexport function createPackageScale(\n def: PackageScaleInfo,\n offset: number = 0,\n): PackageScaleInfo {\n /** Build a section scale */\n // Domain should be oriented from bottom to top, but scale is oriented from top to bottom\n const { domain, pixelScale, pixelHeight, scale, heightScale } = def;\n\n if (scale == null && pixelScale == null) {\n throw new Error(\"Either scale or pixelScale must be provided\");\n }\n\n let _scale: ScaleContinuousNumeric<number, number>;\n if (scale == null) {\n _scale = scaleLinear()\n .domain([domain[1], domain[0]])\n .range([offset, pixelHeight + offset]);\n } else {\n const domain0 = scale.domain();\n const range0 = scale.range();\n _scale = scale\n .copy()\n .domain(domain0)\n .range(range0.map((d) => d + offset));\n }\n\n _scale.clamp();\n\n let _heightScale = null;\n if (heightScale != null) {\n // Adjust height scale as well\n const range0 = scale.range();\n _heightScale = heightScale.copy().range(range0.map((d) => d + offset));\n _heightScale.clamp();\n }\n\n return {\n domain,\n pixelScale,\n pixelHeight,\n scale: _scale,\n // Internal details for hybrid scales. TODO: improve this\n heightScale: _heightScale,\n };\n}\n\nfunction findSectionHeightRange(\n data: UnitLong[],\n axisType: ColumnAxisType,\n): [number, number] {\n if (axisType == null) {\n throw new Error(\"Axis type is not set\");\n }\n if (axisType === ColumnAxisType.AGE) {\n const t_age = Math.min(...data.map((d) => d.t_age));\n const b_age = Math.max(...data.map((d) => d.b_age));\n return [b_age, t_age];\n } else if (\n axisType == ColumnAxisType.DEPTH ||\n axisType == ColumnAxisType.ORDINAL\n ) {\n const t_pos = Math.min(...data.map((d) => d.t_pos));\n const b_pos = Math.max(...data.map((d) => d.b_pos));\n return [b_pos, t_pos];\n } else if (axisType == ColumnAxisType.HEIGHT) {\n const t_pos = Math.max(...data.map((d) => d.t_pos));\n const b_pos = Math.min(...data.map((d) => d.b_pos));\n return [b_pos, t_pos];\n }\n}\n\nfunction findAverageUnitHeight(\n data: UnitLong[],\n axisType: ColumnAxisType,\n): number {\n const unitHeights = data.map((d) => {\n const [b_pos, t_pos] = getUnitHeightRange(d, axisType);\n return Math.abs(b_pos - t_pos);\n });\n return unitHeights.reduce((a, b) => a + b, 0) / unitHeights.length;\n}\n\nexport interface CompositeColumnScale {\n (age: number): number | null;\n copy(): CompositeColumnScale;\n domain(): [number, number];\n invert(pixelHeight: number): number | null;\n clamp(clamp: boolean): void;\n}\n\nexport function createCompositeScale(\n sections: PackageLayoutData[],\n interpolateUnconformities: boolean = false,\n): CompositeColumnScale {\n /** Create a scale that works across multiple packages */\n\n const scales: ScaleContinuousNumeric<number, number>[] = [];\n\n let lastScale: ScaleContinuousNumeric<number, number> | null = null;\n for (const section of sections) {\n const _scale = section.scaleInfo.scale.copy().clamp(true);\n scales.push(_scale);\n if (lastScale != null && interpolateUnconformities) {\n // Add a new scale that interpolates between lastScale and _scale\n const lastDomain = lastScale.domain();\n const lastRange = lastScale.range();\n const currentDomain = _scale.domain();\n const currentRange = _scale.range();\n\n const interpScale = scaleLinear()\n .domain([lastDomain[lastDomain.length - 1], currentDomain[0]])\n .range([lastRange[lastRange.length - 1], currentRange[0]])\n .clamp(true);\n scales.push(interpScale);\n }\n lastScale = _scale;\n }\n\n const scale: CompositeColumnScale = (age) => {\n for (const s of scales) {\n const domain = s.domain();\n if (age >= domain[0] && age <= domain[domain.length - 1]) {\n return s(age);\n }\n }\n return null;\n };\n\n scale.copy = () => {\n return createCompositeScale(sections, interpolateUnconformities);\n };\n\n scale.domain = () => {\n /** Return the domain of the scale */\n const vals = sections.flatMap((d) => d.scaleInfo.domain);\n if (vals[0] < vals[vals.length - 1]) {\n // age axes\n return [Math.min(...vals), Math.max(...vals)];\n }\n // Normal axes like height\n return [Math.max(...vals), Math.min(...vals)];\n };\n\n scale.invert = (pixelHeight) => {\n /** Invert the scale to get the age at a given pixel height */\n // Iterate through the sections to find the correct one\n for (const scale of scales) {\n const range = scale.range();\n if (\n pixelHeight > Math.min(...range) &&\n pixelHeight <= Math.max(...range)\n ) {\n console.log(\"Inverting scale at pixel height\", pixelHeight);\n return scale.invert(pixelHeight);\n }\n }\n return null;\n };\n\n scale.clamp = (clamp: boolean) => {\n /** Clamp all constituent scales */\n for (const s of scales) {\n s.clamp(clamp);\n }\n };\n\n return scale;\n}\n\n/** Collapse sections separated by unconformities that are smaller than a given pixel height. */\nexport function collapseUnconformitiesByPixelHeight<T extends UnitLong>(\n sections: SectionInfoWithScale<T>[],\n threshold: number,\n opts: ColumnScaleOptions,\n): SectionInfoWithScale<T>[] {\n const newSections = [];\n let currentSection: SectionInfoWithScale<T> | null = null;\n for (const nextSection of sections) {\n if (currentSection == null) {\n currentSection = nextSection;\n continue;\n }\n let heights: [number, number];\n let pxHeights: [number, number];\n if (opts.axisType !== ColumnAxisType.AGE) {\n heights = [nextSection.t_pos, currentSection.b_pos];\n } else {\n heights = [nextSection.t_age, currentSection.b_age];\n }\n\n const _diff = (vals: number[]) => {\n return Math.abs(vals[0] - vals[1]);\n };\n\n pxHeights = [\n _diff(heights.map(nextSection.scaleInfo.scale)),\n _diff(heights.map(currentSection.scaleInfo.scale)),\n ];\n\n const pxHeight = Math.min(...pxHeights);\n\n if (pxHeight < threshold) {\n let t_pos: number;\n let b_pos: number;\n if (\n opts.axisType == ColumnAxisType.AGE ||\n opts.axisType == ColumnAxisType.DEPTH\n ) {\n t_pos = Math.min(currentSection.t_pos, nextSection.t_pos);\n b_pos = Math.max(currentSection.b_pos, nextSection.b_pos);\n } else {\n t_pos = Math.max(currentSection.t_pos, nextSection.t_pos);\n b_pos = Math.min(currentSection.b_pos, nextSection.b_pos);\n }\n\n // We need to merge the sections\n const compositeSection0: SectionInfo<T> = {\n units: [...currentSection.units, ...nextSection.units],\n section_id: [\n ...ensureArray(currentSection.section_id),\n ...ensureArray(nextSection.section_id),\n ],\n t_age: Math.min(currentSection.t_age, nextSection.t_age),\n b_age: Math.max(currentSection.b_age, nextSection.b_age),\n t_pos,\n b_pos,\n };\n\n currentSection = addScaleToSection(compositeSection0, opts);\n } else {\n // We need to keep the section\n newSections.push(currentSection);\n currentSection = nextSection;\n }\n }\n if (currentSection != null) {\n newSections.push(currentSection);\n }\n\n return newSections;\n}\n"],"names":[],"version":3,"file":"column-views.073c42da.js.map"}
1
+ {"mappings":"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","sources":["packages/column-views/src/prepare-units/composite-scale.ts"],"sourcesContent":["import { ColumnAxisType } from \"@macrostrat/column-components\";\nimport { ensureArray, getUnitHeightRange } from \"./utils\";\nimport { ScaleContinuousNumeric, scaleLinear } from \"d3-scale\";\nimport { UnitLong } from \"@macrostrat/api-types\";\nimport { buildHybridScale } from \"./dynamic-scales\";\nimport { ExtUnit, HybridScaleType, SectionInfo } from \"./types\";\nimport type {\n ColumnScaleOptions,\n CompositeColumnData,\n CompositeScaleData,\n PackageLayoutData,\n PackageScaleInfo,\n PackageScaleLayoutData,\n SectionScaleOptions,\n} from \"./types\";\n\n// Composite scale information augmented with units in each package\n\nexport function buildCompositeScaleInfo(\n inputScales: PackageScaleInfo[],\n unconformityHeight: number,\n): CompositeScaleData {\n /** Finalize the heights of sections, including the heights of unconformities\n * between them.\n */\n\n let totalHeight = unconformityHeight / 2;\n let lastSectionTopHeight = 0;\n\n const packages2: PackageScaleLayoutData[] = [];\n for (const group of inputScales) {\n const { domain, scale } = group;\n const [b_age, t_age] = domain;\n const key = `package-${b_age}-${t_age}`;\n\n packages2.push({\n ...createPackageScale(group, totalHeight),\n key,\n offset: totalHeight,\n // Unconformity height above this particular section\n paddingTop: totalHeight - lastSectionTopHeight,\n });\n\n const pixelHeight = Math.abs(scale(b_age) - scale(t_age));\n lastSectionTopHeight = totalHeight + pixelHeight;\n totalHeight = lastSectionTopHeight + unconformityHeight;\n }\n totalHeight += unconformityHeight / 2;\n return {\n totalHeight,\n sections: packages2,\n };\n}\n\nexport function finalizeSectionHeights<T extends UnitLong>(\n sections: SectionInfoWithScale<T>[],\n unconformityHeight: number,\n): CompositeColumnData<T> {\n /** Finalize the heights of sections, including the heights of unconformities\n * between them.\n */\n\n const sectionScales = sections.map((d) => d.scaleInfo);\n\n const { totalHeight, sections: packages } = buildCompositeScaleInfo(\n sectionScales,\n unconformityHeight,\n );\n\n // This could perhaps be simplified.\n const sections1: PackageLayoutData<T>[] = [];\n for (const i in sections) {\n const group = sections[i];\n const scaleInfo = packages[i];\n sections1.push({\n ...group,\n key: scaleInfo.key,\n scaleInfo,\n });\n }\n return {\n totalHeight,\n sections: sections1,\n };\n}\n\nexport interface SectionInfoWithScale<\n T extends UnitLong = ExtUnit,\n> extends SectionInfo<T> {\n scaleInfo: PackageScaleInfo;\n}\n\nexport function computeSectionHeights<T extends UnitLong>(\n sections: SectionInfo<T>[],\n opts: ColumnScaleOptions,\n): SectionInfoWithScale<T>[] {\n return sections.map((group) => {\n return addScaleToSection<T>(group, opts);\n });\n}\n\nfunction addScaleToSection<T extends UnitLong = ExtUnit>(\n group: SectionInfo<T>,\n opts: ColumnScaleOptions,\n): SectionInfoWithScale<T> {\n const { t_age, b_age, t_pos, b_pos, units } = group;\n let _range = null;\n // if t_age and b_age are set for a group, use them to define the range...\n if (opts.axisType == ColumnAxisType.AGE) {\n _range = [b_age, t_age];\n } else {\n _range = [b_pos, t_pos];\n }\n\n const scaleInfo = buildSectionScale<T>(units, {\n ...opts,\n domain: _range,\n });\n\n return {\n ...group,\n scaleInfo,\n };\n}\n\nfunction buildSectionScale<T extends UnitLong>(\n data: T[],\n opts: SectionScaleOptions,\n): PackageScaleInfo {\n const {\n targetUnitHeight = 20,\n minPixelScale = 0.2,\n axisType,\n minSectionHeight,\n scale,\n hybridScale,\n } = opts;\n const domain = opts.domain ?? findSectionHeightRange(data, axisType);\n\n const dAge = Math.abs(domain[0] - domain[1]);\n\n let _pixelScale = opts.pixelScale;\n let pixelHeight: number;\n\n if (hybridScale != null) {\n /** In an equidistant surfaces scale, we want to determine the heights of surfaces\n * and then distribute units evenly between them.\n * This is somewhat like an ordinal scale\n */\n if (hybridScale.type === HybridScaleType.EquidistantSurfaces) {\n _pixelScale ??= targetUnitHeight;\n }\n\n return buildHybridScale(hybridScale, data, domain, {\n pixelOffset: 0,\n pixelScale: _pixelScale,\n });\n }\n\n if (scale == null) {\n if (_pixelScale == null) {\n const avgAgeRange = findAverageUnitHeight(data, axisType);\n // Get pixel height necessary to render average unit at target height\n _pixelScale = Math.max(targetUnitHeight / avgAgeRange, minPixelScale);\n\n // OLD METHOD that cares about overall section height vs. individual unit height\n // 0.2 pixel per myr is the floor scale\n //const targetHeight = targetUnitHeight * data.length;\n // 1 pixel per myr is the floor scale\n //_pixelScale = Math.max(targetHeight / dAge, minPixelScale);\n }\n\n let height = dAge * _pixelScale;\n // If height is less than minSectionHeight, set it to minSectionHeight\n const _minSectionHeight = minSectionHeight ?? targetUnitHeight ?? 0;\n pixelHeight = Math.max(height, _minSectionHeight);\n _pixelScale = pixelHeight / dAge;\n } else {\n // If a scale is provided, use it to compute pixel height\n pixelHeight = Math.abs(scale(domain[0]) - scale(domain[1]));\n }\n\n return createPackageScale(\n { scale, domain, pixelHeight, pixelScale: _pixelScale },\n 0,\n );\n}\n\nexport function createPackageScale(\n def: PackageScaleInfo,\n offset: number = 0,\n): PackageScaleInfo {\n /** Build a section scale */\n // Domain should be oriented from bottom to top, but scale is oriented from top to bottom\n const { domain, pixelScale, pixelHeight, scale, heightScale } = def;\n\n if (scale == null && pixelScale == null) {\n throw new Error(\"Either scale or pixelScale must be provided\");\n }\n\n let _scale: ScaleContinuousNumeric<number, number>;\n if (scale == null) {\n _scale = scaleLinear()\n .domain([domain[1], domain[0]])\n .range([offset, pixelHeight + offset]);\n } else {\n const domain0 = scale.domain();\n const range0 = scale.range();\n _scale = scale\n .copy()\n .domain(domain0)\n .range(range0.map((d) => d + offset));\n }\n\n _scale.clamp();\n\n let _heightScale = null;\n if (heightScale != null) {\n // Adjust height scale as well\n const range0 = scale.range();\n _heightScale = heightScale.copy().range(range0.map((d) => d + offset));\n _heightScale.clamp();\n }\n\n return {\n domain,\n pixelScale,\n pixelHeight,\n scale: _scale,\n // Internal details for hybrid scales. TODO: improve this\n heightScale: _heightScale,\n };\n}\n\nfunction findSectionHeightRange(\n data: UnitLong[],\n axisType: ColumnAxisType,\n): [number, number] {\n if (axisType == null) {\n throw new Error(\"Axis type is not set\");\n }\n if (axisType === ColumnAxisType.AGE) {\n const t_age = Math.min(...data.map((d) => d.t_age));\n const b_age = Math.max(...data.map((d) => d.b_age));\n return [b_age, t_age];\n } else if (\n axisType == ColumnAxisType.DEPTH ||\n axisType == ColumnAxisType.ORDINAL\n ) {\n const t_pos = Math.min(...data.map((d) => d.t_pos));\n const b_pos = Math.max(...data.map((d) => d.b_pos));\n return [b_pos, t_pos];\n } else if (axisType == ColumnAxisType.HEIGHT) {\n const t_pos = Math.max(...data.map((d) => d.t_pos));\n const b_pos = Math.min(...data.map((d) => d.b_pos));\n return [b_pos, t_pos];\n }\n}\n\nfunction findAverageUnitHeight(\n data: UnitLong[],\n axisType: ColumnAxisType,\n): number {\n const unitHeights = data.map((d) => {\n const [b_pos, t_pos] = getUnitHeightRange(d, axisType);\n return Math.abs(b_pos - t_pos);\n });\n return unitHeights.reduce((a, b) => a + b, 0) / unitHeights.length;\n}\n\nexport interface CompositeColumnScale {\n (age: number): number | null;\n copy(): CompositeColumnScale;\n domain(): [number, number];\n invert(pixelHeight: number): number | null;\n clamp(clamp: boolean): void;\n}\n\nexport function createCompositeScale(\n sections: PackageLayoutData[],\n interpolateUnconformities: boolean = false,\n): CompositeColumnScale {\n /** Create a scale that works across multiple packages */\n\n const scales: ScaleContinuousNumeric<number, number>[] = [];\n\n let lastScale: ScaleContinuousNumeric<number, number> | null = null;\n for (const section of sections) {\n const _scale = section.scaleInfo.scale.copy().clamp(true);\n scales.push(_scale);\n if (lastScale != null && interpolateUnconformities) {\n // Add a new scale that interpolates between lastScale and _scale\n const lastDomain = lastScale.domain();\n const lastRange = lastScale.range();\n const currentDomain = _scale.domain();\n const currentRange = _scale.range();\n\n const interpScale = scaleLinear()\n .domain([lastDomain[lastDomain.length - 1], currentDomain[0]])\n .range([lastRange[lastRange.length - 1], currentRange[0]])\n .clamp(true);\n scales.push(interpScale);\n }\n lastScale = _scale;\n }\n\n const scale: CompositeColumnScale = (age) => {\n for (const s of scales) {\n const domain = s.domain();\n if (age >= domain[0] && age <= domain[domain.length - 1]) {\n return s(age);\n }\n }\n return null;\n };\n\n scale.copy = () => {\n return createCompositeScale(sections, interpolateUnconformities);\n };\n\n scale.domain = () => {\n /** Return the domain of the scale */\n const vals = sections.flatMap((d) => d.scaleInfo.domain);\n if (vals[0] < vals[vals.length - 1]) {\n // age axes\n return [Math.min(...vals), Math.max(...vals)];\n }\n // Normal axes like height\n return [Math.max(...vals), Math.min(...vals)];\n };\n\n scale.invert = (pixelHeight) => {\n /** Invert the scale to get the age at a given pixel height */\n // Iterate through the sections to find the correct one\n for (const scale of scales) {\n const range = scale.range();\n if (\n pixelHeight > Math.min(...range) &&\n pixelHeight <= Math.max(...range)\n ) {\n console.log(\"Inverting scale at pixel height\", pixelHeight);\n return scale.invert(pixelHeight);\n }\n }\n return null;\n };\n\n scale.clamp = (clamp: boolean) => {\n /** Clamp all constituent scales */\n for (const s of scales) {\n s.clamp(clamp);\n }\n };\n\n return scale;\n}\n\n/** Collapse sections separated by unconformities that are smaller than a given pixel height. */\nexport function collapseUnconformitiesByPixelHeight<T extends UnitLong>(\n sections: SectionInfoWithScale<T>[],\n threshold: number,\n opts: ColumnScaleOptions,\n): SectionInfoWithScale<T>[] {\n const newSections = [];\n let currentSection: SectionInfoWithScale<T> | null = null;\n for (const nextSection of sections) {\n if (currentSection == null) {\n currentSection = nextSection;\n continue;\n }\n let heights: [number, number];\n let pxHeights: [number, number];\n if (opts.axisType !== ColumnAxisType.AGE) {\n heights = [nextSection.t_pos, currentSection.b_pos];\n } else {\n heights = [nextSection.t_age, currentSection.b_age];\n }\n\n const _diff = (vals: number[]) => {\n return Math.abs(vals[0] - vals[1]);\n };\n\n pxHeights = [\n _diff(heights.map(nextSection.scaleInfo.scale)),\n _diff(heights.map(currentSection.scaleInfo.scale)),\n ];\n\n const pxHeight = Math.min(...pxHeights);\n\n if (pxHeight < threshold) {\n let t_pos: number;\n let b_pos: number;\n if (\n opts.axisType == ColumnAxisType.AGE ||\n opts.axisType == ColumnAxisType.DEPTH\n ) {\n t_pos = Math.min(currentSection.t_pos, nextSection.t_pos);\n b_pos = Math.max(currentSection.b_pos, nextSection.b_pos);\n } else {\n t_pos = Math.max(currentSection.t_pos, nextSection.t_pos);\n b_pos = Math.min(currentSection.b_pos, nextSection.b_pos);\n }\n\n // We need to merge the sections\n const compositeSection0: SectionInfo<T> = {\n units: [...currentSection.units, ...nextSection.units],\n section_id: [\n ...ensureArray(currentSection.section_id),\n ...ensureArray(nextSection.section_id),\n ],\n t_age: Math.min(currentSection.t_age, nextSection.t_age),\n b_age: Math.max(currentSection.b_age, nextSection.b_age),\n t_pos,\n b_pos,\n };\n\n currentSection = addScaleToSection(compositeSection0, opts);\n } else {\n // We need to keep the section\n newSections.push(currentSection);\n currentSection = nextSection;\n }\n }\n if (currentSection != null) {\n newSections.push(currentSection);\n }\n\n return newSections;\n}\n"],"names":[],"version":3,"file":"column-views.1b5bf0c6.js.map"}
@@ -1,14 +1,14 @@
1
1
  import $bTsJU$columnviewscc733361js from "./column-views.cc733361.js";
2
- import "./column-views.e33ac5c9.css";
3
- import {UnitComponent as $4c8184c4a7317749$export$48a4cacf2b7a4441} from "./column-views.df34441c.js";
4
- import {MacrostratColumnDataProvider as $d5074f164411387e$export$7fec7bd80ff9c10e, useCompositeScale as $d5074f164411387e$export$a7fc62995ec4f76, useMacrostratColumnData as $d5074f164411387e$export$f8509b7cce386c7d} from "./column-views.4ed90896.js";
5
- import {UnitKeyboardNavigation as $61771df184788970$export$70f5ee19650fc7d1, UnitSelectionProvider as $61771df184788970$export$f19d75b1d4b676a4, useUnitSelectionDispatch as $61771df184788970$export$77a278d5ca56e309} from "./column-views.a3fabf0f.js";
6
- import {Identifier as $448b24baeef3b229$export$989167234458594d, ReferencesField as $448b24baeef3b229$export$895d4931dd696e25} from "./column-views.8284c3a9.js";
7
- import {UnitSelectionPopover as $a9bcb536274d1bf9$export$db1115efab13710d} from "./column-views.382c486d.js";
8
- import {CompositeTimescale as $7d0f52717c0de7e1$export$db2df5a73a6fbe10, SectionsColumn as $7d0f52717c0de7e1$export$38cb0ab5af8f50d7} from "./column-views.0265cf7f.js";
9
- import {ApproximateHeightAxis as $43794af7643cdf40$export$82731b9607850ca6, CompositeAgeAxis as $43794af7643cdf40$export$40b6b0e4520eeb34} from "./column-views.adec2e4c.js";
2
+ import "./column-views.e93478c3.css";
3
+ import {UnitComponent as $4c8184c4a7317749$export$48a4cacf2b7a4441} from "./column-views.5ca2b219.js";
4
+ import {MacrostratColumnDataProvider as $d5074f164411387e$export$7fec7bd80ff9c10e, useCompositeScale as $d5074f164411387e$export$a7fc62995ec4f76, useMacrostratColumnData as $d5074f164411387e$export$f8509b7cce386c7d} from "./column-views.4b259f9e.js";
5
+ import {UnitKeyboardNavigation as $61771df184788970$export$70f5ee19650fc7d1, UnitSelectionProvider as $61771df184788970$export$f19d75b1d4b676a4, useUnitSelectionDispatch as $61771df184788970$export$77a278d5ca56e309} from "./column-views.c44febd0.js";
6
+ import {Identifier as $448b24baeef3b229$export$989167234458594d, ReferencesField as $448b24baeef3b229$export$895d4931dd696e25} from "./column-views.5eb4e6ff.js";
7
+ import {UnitSelectionPopover as $a9bcb536274d1bf9$export$db1115efab13710d} from "./column-views.565b193a.js";
8
+ import {CompositeTimescale as $7d0f52717c0de7e1$export$db2df5a73a6fbe10, SectionsColumn as $7d0f52717c0de7e1$export$38cb0ab5af8f50d7} from "./column-views.afe0bb48.js";
9
+ import {ApproximateHeightAxis as $43794af7643cdf40$export$82731b9607850ca6, CompositeAgeAxis as $43794af7643cdf40$export$40b6b0e4520eeb34} from "./column-views.92575b87.js";
10
10
  import {HybridScaleType as $1254c5929638d7f9$export$45e8e2d7a1794c23} from "./column-views.079119f4.js";
11
- import {usePreparedColumnUnits as $76e92a964ee11b97$export$206a0cb85295e433} from "./column-views.3a7179c4.js";
11
+ import {usePreparedColumnUnits as $76e92a964ee11b97$export$206a0cb85295e433} from "./column-views.82eb5026.js";
12
12
  import {ColumnAxisType as $bTsJU$ColumnAxisType} from "@macrostrat/column-components";
13
13
  import {hyperStyled as $bTsJU$hyperStyled} from "@macrostrat/hyper";
14
14
  import {extractPadding as $bTsJU$extractPadding, useDarkMode as $bTsJU$useDarkMode, Box as $bTsJU$Box} from "@macrostrat/ui-components";
@@ -116,8 +116,13 @@ function $2118f0266dc7e955$var$ColumnInner(props) {
116
116
  "--column-padding-left": `${padding.paddingLeft}px`,
117
117
  "--column-padding-right": `${padding.paddingRight}px`
118
118
  };
119
- const { unitComponent: unitComponent = (0, $4c8184c4a7317749$export$48a4cacf2b7a4441), unconformityLabels: unconformityLabels = true, showLabels: showLabels = true, width: _width = 300, columnWidth: _columnWidth = 150, showLabelColumn: _showLabelColumn = true, className: className, columnRef: columnRef, clipUnits: clipUnits = false, children: children, showTimescale: showTimescale, timescaleLevels: timescaleLevels, maxInternalColumns: maxInternalColumns, onMouseOver: onMouseOver, ageAxisComponent: ageAxisComponent = (0, $43794af7643cdf40$export$40b6b0e4520eeb34) } = props;
119
+ const { unitComponent: unitComponent = (0, $4c8184c4a7317749$export$48a4cacf2b7a4441), unconformityLabels: unconformityLabels = "minimal", showLabels: showLabels = true, width: _width = 300, columnWidth: _columnWidth = 150, showLabelColumn: _showLabelColumn = true, className: className, columnRef: columnRef, clipUnits: clipUnits = false, children: children, showTimescale: showTimescale, timescaleLevels: timescaleLevels, maxInternalColumns: maxInternalColumns, onMouseOver: onMouseOver, ageAxisComponent: ageAxisComponent = (0, $43794af7643cdf40$export$40b6b0e4520eeb34) } = props;
120
120
  const { axisType: axisType } = (0, $d5074f164411387e$export$f8509b7cce386c7d)();
121
+ // Coalesce unconformity label setting to a boolean
122
+ let _timescaleUnconformityLabels = false;
123
+ let _sectionUnconformityLabels = false;
124
+ if (unconformityLabels === true || unconformityLabels === "prominent") _sectionUnconformityLabels = true;
125
+ else if (unconformityLabels === "minimal") _timescaleUnconformityLabels = true;
121
126
  let width = _width;
122
127
  let columnWidth = _columnWidth;
123
128
  if (columnWidth > width) columnWidth = width;
@@ -135,7 +140,8 @@ function $2118f0266dc7e955$var$ColumnInner(props) {
135
140
  }, [
136
141
  $2118f0266dc7e955$var$h(ageAxisComponent),
137
142
  $2118f0266dc7e955$var$h.if(_showTimescale)((0, $7d0f52717c0de7e1$export$db2df5a73a6fbe10), {
138
- levels: timescaleLevels
143
+ levels: timescaleLevels,
144
+ unconformityLabels: _timescaleUnconformityLabels
139
145
  }),
140
146
  $2118f0266dc7e955$var$h((0, $7d0f52717c0de7e1$export$38cb0ab5af8f50d7), {
141
147
  unitComponent: unitComponent,
@@ -144,7 +150,7 @@ function $2118f0266dc7e955$var$ColumnInner(props) {
144
150
  columnWidth: columnWidth,
145
151
  showLabelColumn: showLabelColumn,
146
152
  clipUnits: clipUnits,
147
- unconformityLabels: unconformityLabels,
153
+ unconformityLabels: _sectionUnconformityLabels,
148
154
  maxInternalColumns: maxInternalColumns
149
155
  }),
150
156
  children
@@ -194,7 +200,7 @@ function $2118f0266dc7e955$export$2194471aa3d52446(props) {
194
200
  ...rest
195
201
  });
196
202
  }
197
- function $2118f0266dc7e955$export$fcdf79c491a4504f({ data: data, showColumnID: showColumnID = true }) {
203
+ function $2118f0266dc7e955$export$fcdf79c491a4504f({ data: data, showColumnID: showColumnID = true, showReferences: showReferences = true }) {
198
204
  if (data == null) return null;
199
205
  return $2118f0266dc7e955$var$h("div.column-info", [
200
206
  $2118f0266dc7e955$var$h("div.column-title-row", [
@@ -208,10 +214,10 @@ function $2118f0266dc7e955$export$fcdf79c491a4504f({ data: data, showColumnID: s
208
214
  label: "Group",
209
215
  value: data.col_group
210
216
  }),
211
- $2118f0266dc7e955$var$h((0, $448b24baeef3b229$export$895d4931dd696e25), {
217
+ $2118f0266dc7e955$var$h.if(showReferences)((0, $448b24baeef3b229$export$895d4931dd696e25), {
212
218
  refs: data.refs,
213
219
  inline: false,
214
- row: true,
220
+ row: false,
215
221
  className: "column-refs"
216
222
  })
217
223
  ]);
@@ -219,4 +225,4 @@ function $2118f0266dc7e955$export$fcdf79c491a4504f({ data: data, showColumnID: s
219
225
 
220
226
 
221
227
  export {$2118f0266dc7e955$export$816b5d811295e6bc as Column, $2118f0266dc7e955$export$2194471aa3d52446 as ColumnContainer, $2118f0266dc7e955$export$fcdf79c491a4504f as ColumnBasicInfo};
222
- //# sourceMappingURL=column-views.29a551f6.js.map
228
+ //# sourceMappingURL=column-views.2708e176.js.map
@@ -0,0 +1 @@
1
+ {"mappings":"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","sources":["packages/column-views/src/column.ts"],"sourcesContent":["import { ColumnAxisType } from \"@macrostrat/column-components\";\nimport { hyperStyled } from \"@macrostrat/hyper\";\nimport {\n Box,\n extractPadding,\n Padding,\n useDarkMode,\n} from \"@macrostrat/ui-components\";\nimport classNames from \"classnames\";\nimport {\n RefObject,\n useRef,\n HTMLAttributes,\n useCallback,\n CSSProperties,\n ComponentType,\n} from \"react\";\nimport styles from \"./column.module.sass\";\nimport { UnitComponent } from \"./units\";\nimport {\n UnitSelectionProvider,\n UnitKeyboardNavigation,\n useUnitSelectionDispatch,\n} from \"./data-provider\";\n\nimport {\n Identifier,\n ReferencesField,\n UnitSelectionPopover,\n} from \"./unit-details\";\nimport {\n MacrostratColumnDataProvider,\n useCompositeScale,\n useMacrostratColumnData,\n} from \"./data-provider\";\nimport {\n SectionSharedProps,\n CompositeTimescale,\n SectionsColumn,\n} from \"./section\";\nimport { ApproximateHeightAxis, CompositeAgeAxis } from \"./age-axis\";\nimport {\n MergeSectionsMode,\n usePreparedColumnUnits,\n HybridScaleType,\n ColumnHeightScaleOptions,\n} from \"./prepare-units\";\nimport { UnitLong } from \"@macrostrat/api-types\";\nimport { NonIdealState } from \"@blueprintjs/core\";\nimport { DataField } from \"@macrostrat/data-components\";\nimport { ScaleContinuousNumeric } from \"d3-scale\";\n\nconst h = hyperStyled(styles);\n\ninterface BaseColumnProps extends Omit<\n SectionSharedProps,\n \"unconformityLabels\"\n> {\n className?: string;\n showLabelColumn?: boolean;\n keyboardNavigation?: boolean;\n showLabels?: boolean;\n maxInternalColumns?: number;\n // Timescale properties\n showTimescale?: boolean;\n timescaleLevels?: number | [number, number];\n unconformityLabels?: boolean | UnconformityLabelPlacement;\n onMouseOver?: (\n unit: UnitLong | null,\n height: number | null,\n evt: MouseEvent,\n ) => void;\n}\n\nexport type UnconformityLabelPlacement = \"minimal\" | \"prominent\" | \"none\";\n\nexport interface ColumnProps\n extends Padding, BaseColumnProps, ColumnHeightScaleOptions {\n // Macrostrat units\n units: UnitLong[];\n t_age?: number;\n b_age?: number;\n t_pos?: number;\n b_pos?: number;\n mergeSections?: MergeSectionsMode;\n showUnitPopover?: boolean;\n allowUnitSelection?: boolean;\n selectedUnit?: number | null;\n onUnitSelected?: (unitID: number | null, unit: any) => void;\n // Unconformity height in pixels\n unconformityHeight?: number;\n scale?: ScaleContinuousNumeric<number, number>;\n}\n\nexport function Column(props: ColumnProps) {\n const {\n showUnitPopover = false,\n keyboardNavigation = false,\n mergeSections,\n onUnitSelected,\n selectedUnit,\n children,\n units: rawUnits,\n t_age,\n b_age,\n t_pos,\n b_pos,\n unconformityHeight = 30,\n targetUnitHeight = 20,\n pixelScale,\n minPixelScale = 0.2,\n minSectionHeight = 50,\n collapseSmallUnconformities = true,\n allowUnitSelection,\n hybridScale,\n scale,\n axisType,\n ...rest\n } = props;\n const ref = useRef<HTMLElement>();\n // Selected item position\n\n /* Make pixelScale and targetUnitHeight mutually exclusive. PixelScale implies\n * standardization of scales in all sections */\n let _targetUnitHeight = targetUnitHeight;\n let _minSectionHeight = minSectionHeight;\n let _minPixelScale = minPixelScale;\n if (pixelScale != null) {\n _targetUnitHeight = null;\n _minSectionHeight = 0;\n _minPixelScale = pixelScale;\n }\n\n // Handle special cases for hybrid scales (WIP, we need to regularize this)\n let _axisType = axisType ?? ColumnAxisType.AGE;\n let ageAxisComponent = CompositeAgeAxis;\n if (\n hybridScale?.type === HybridScaleType.ApproximateHeight &&\n _axisType != ColumnAxisType.AGE\n ) {\n // Use approximate height axis for non-age columns if a non-age axis type is requested\n ageAxisComponent = ApproximateHeightAxis;\n _axisType = ColumnAxisType.AGE;\n }\n\n const { sections, units, totalHeight } = usePreparedColumnUnits(rawUnits, {\n axisType: _axisType,\n t_age,\n b_age,\n t_pos,\n b_pos,\n mergeSections,\n targetUnitHeight: _targetUnitHeight,\n unconformityHeight,\n pixelScale,\n minPixelScale: _minPixelScale,\n minSectionHeight: _minSectionHeight,\n collapseSmallUnconformities,\n // TODO: consider unifying scale and hybridScale options\n scale,\n hybridScale,\n });\n\n if (sections.length === 0) {\n return h(\n \"div.column-container.empty\",\n h(NonIdealState, {\n title: \"Empty column\",\n description: \"No sections found in this column.\",\n icon: \"warning-sign\",\n }),\n );\n }\n\n let main: any = h(\n ColumnInner,\n { columnRef: ref, ageAxisComponent, ...rest },\n [\n children,\n h.if(showUnitPopover)(UnitSelectionPopover),\n h.if(keyboardNavigation)(UnitKeyboardNavigation, { units }),\n ],\n );\n\n /* By default, unit selection is disabled. However, if any related props are passed,\n we enable it.\n */\n let _allowUnitSelection = allowUnitSelection ?? false;\n if (showUnitPopover || selectedUnit != null || onUnitSelected != null) {\n _allowUnitSelection = true;\n }\n\n if (_allowUnitSelection) {\n main = h(\n UnitSelectionProvider,\n {\n columnRef: ref,\n onUnitSelected,\n selectedUnit,\n units,\n },\n main,\n );\n }\n\n return h(\n MacrostratColumnDataProvider,\n { units, sections, totalHeight, axisType: _axisType },\n main,\n );\n}\n\ninterface ColumnInnerProps extends BaseColumnProps {\n columnRef: RefObject<HTMLElement>;\n ageAxisComponent?: ComponentType;\n}\n\nfunction ColumnInner(props: ColumnInnerProps) {\n const padding = extractPadding(props);\n\n // TODO: integrate padding vars more closely with the rest of the spacing (right now padding is a bit ad-hoc)\n const paddingVars: any = {\n \"--column-padding-top\": `${padding.paddingTop}px`,\n \"--column-padding-bottom\": `${padding.paddingBottom}px`,\n \"--column-padding-left\": `${padding.paddingLeft}px`,\n \"--column-padding-right\": `${padding.paddingRight}px`,\n };\n\n const {\n unitComponent = UnitComponent,\n unconformityLabels = \"minimal\",\n showLabels = true,\n width: _width = 300,\n columnWidth: _columnWidth = 150,\n showLabelColumn: _showLabelColumn = true,\n className,\n columnRef,\n clipUnits = false,\n children,\n showTimescale,\n timescaleLevels,\n maxInternalColumns,\n onMouseOver,\n ageAxisComponent = CompositeAgeAxis,\n } = props;\n\n const { axisType } = useMacrostratColumnData();\n\n // Coalesce unconformity label setting to a boolean\n let _timescaleUnconformityLabels = false;\n let _sectionUnconformityLabels = false;\n if (unconformityLabels === true || unconformityLabels === \"prominent\") {\n _sectionUnconformityLabels = true;\n } else if (unconformityLabels === \"minimal\") {\n _timescaleUnconformityLabels = true;\n }\n\n let width = _width;\n let columnWidth = _columnWidth;\n if (columnWidth > width) {\n columnWidth = width;\n }\n let showLabelColumn = _showLabelColumn;\n if (columnWidth > width - 10) {\n showLabelColumn = false;\n }\n\n let _showTimescale = showTimescale ?? true;\n if (timescaleLevels != null) {\n _showTimescale = true;\n }\n _showTimescale = axisType == ColumnAxisType.AGE && _showTimescale;\n\n return h(\n ColumnContainer,\n {\n ...useMouseEventHandlers(onMouseOver),\n style: paddingVars,\n className,\n },\n h(\"div.column\", { ref: columnRef }, [\n h(ageAxisComponent),\n h.if(_showTimescale)(CompositeTimescale, {\n levels: timescaleLevels,\n unconformityLabels: _timescaleUnconformityLabels,\n }),\n h(SectionsColumn, {\n unitComponent,\n showLabels,\n width,\n columnWidth,\n showLabelColumn,\n clipUnits,\n unconformityLabels: _sectionUnconformityLabels,\n maxInternalColumns,\n }),\n children,\n ]),\n );\n}\n\ntype ColumnMouseOverHandler = (\n unit: UnitLong | null,\n height: number | null,\n evt: MouseEvent,\n) => void;\n\nfunction useMouseEventHandlers(\n _onMouseOver: ColumnMouseOverHandler | null = null,\n) {\n /** Click event handler */\n\n // Click handler for unit selection\n const dispatch = useUnitSelectionDispatch();\n const onClick = useCallback(\n (evt) => {\n dispatch?.(null, null, evt as any);\n },\n [dispatch],\n );\n\n /** Hover event handlers */\n const scale = useCompositeScale();\n\n const onMouseOver = useCallback(\n (evt) => {\n const height = scale.invert(\n evt.clientY - evt.currentTarget.getBoundingClientRect().top,\n );\n _onMouseOver?.(null, height, evt);\n },\n [scale, _onMouseOver],\n );\n\n const onMouseOut = useCallback(() => {\n _onMouseOver?.(null, null, null);\n }, [_onMouseOver]);\n\n if (_onMouseOver == null) {\n return {\n onClick,\n onMouseOver: undefined,\n onMouseMove: undefined,\n onMouseOut: undefined,\n };\n }\n\n return { onMouseOver, onMouseMove: onMouseOver, onMouseOut, onClick };\n}\n\nexport interface ColumnContainerProps extends HTMLAttributes<HTMLDivElement> {\n className?: string;\n style?: CSSProperties;\n}\n\nexport function ColumnContainer(props: ColumnContainerProps) {\n const { className, ...rest } = props;\n const darkMode = useDarkMode();\n\n return h(Box, {\n className: classNames(\n className,\n {\n \"dark-mode\": darkMode?.isEnabled ?? false,\n },\n \"column-container\",\n ),\n ...rest,\n });\n}\n\nexport function ColumnBasicInfo({\n data,\n showColumnID = true,\n showReferences = true,\n}) {\n if (data == null) return null;\n return h(\"div.column-info\", [\n h(\"div.column-title-row\", [\n h(\"h2\", data.col_name),\n h.if(showColumnID)(\"h4\", h(Identifier, { id: data.col_id })),\n ]),\n h(DataField, { row: true, label: \"Group\", value: data.col_group }),\n h.if(showReferences)(ReferencesField, {\n refs: data.refs,\n inline: false,\n row: false,\n className: \"column-refs\",\n }),\n ]);\n}\n"],"names":[],"version":3,"file":"column-views.2708e176.js.map"}
@@ -1,5 +1,5 @@
1
- import {MergeSectionsMode as $b6657fba8924a702$export$e1644389ce074058} from "./column-views.54f8b909.js";
2
- import {prepareColumnUnits as $76e92a964ee11b97$export$be8c5a449df4bde4, preprocessUnits as $a52J6$preprocessUnits} from "./column-views.3a7179c4.js";
1
+ import {MergeSectionsMode as $b6657fba8924a702$export$e1644389ce074058} from "./column-views.052498a6.js";
2
+ import {prepareColumnUnits as $76e92a964ee11b97$export$be8c5a449df4bde4, preprocessUnits as $a52J6$preprocessUnits} from "./column-views.82eb5026.js";
3
3
  import {ColumnAxisType as $a52J6$ColumnAxisType} from "@macrostrat/column-components";
4
4
  import {mergeAgeRanges as $a52J6$mergeAgeRanges} from "@macrostrat/stratigraphy-utils";
5
5
 
@@ -124,4 +124,4 @@ function $2c6a8e6a98a077ae$export$63b33da9b6dd754c(col) {
124
124
 
125
125
 
126
126
  export {$2c6a8e6a98a077ae$export$7f21dc14b8199dc0 as buildCorrelationChartData, $2c6a8e6a98a077ae$export$cc5d9b95e199a6de as findLaterallyExtensiveUnits, $2c6a8e6a98a077ae$export$3e71a3125322d04b as splitStratIntoBoxes, $2c6a8e6a98a077ae$export$63b33da9b6dd754c as columnGeoJSONRecordToColumnIdentifier};
127
- //# sourceMappingURL=column-views.88d63dd0.js.map
127
+ //# sourceMappingURL=column-views.275ba52b.js.map
@@ -1 +1 @@
1
- {"mappings":"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","sources":["packages/column-views/src/correlation-chart/prepare-data.ts"],"sourcesContent":["import { CompositeStratigraphicScaleInfo } from \"../age-axis\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\nimport { type ColumnGeoJSONRecord, UnitLong } from \"@macrostrat/api-types\";\nimport {\n MergeSectionsMode,\n PrepareColumnOptions,\n prepareColumnUnits,\n preprocessUnits,\n} from \"../prepare-units\";\nimport { mergeAgeRanges } from \"@macrostrat/stratigraphy-utils\";\nimport { PackageLayoutData } from \"../prepare-units/types\";\n\nexport interface ColumnIdentifier {\n col_id: number;\n col_name: string;\n project_id: number;\n}\n\ninterface ColumnData {\n columnID: number;\n units: UnitLong[];\n}\n\nexport interface CorrelationChartSettings extends Omit<\n PrepareColumnOptions,\n \"axisType\"\n> {\n targetUnitHeight?: number;\n}\n\nexport interface CorrelationChartData {\n packages: MultiColumnPackageData[];\n scaleInfo: CompositeStratigraphicScaleInfo;\n nColumns: number;\n}\n\nexport interface ColumnIdentifier {\n col_id: number;\n col_name: string;\n project_id: number;\n}\n\nexport function buildCorrelationChartData(\n columns: ColumnData[],\n settings: CorrelationChartSettings,\n): CorrelationChartData {\n console.log(settings);\n const {\n mergeSections = MergeSectionsMode.OVERLAPPING,\n targetUnitHeight,\n ...rest\n } = settings;\n\n const opts: PrepareColumnOptions = {\n axisType: ColumnAxisType.AGE,\n targetUnitHeight,\n mergeSections,\n ...rest,\n };\n\n if (columns.length == 0) {\n return null;\n }\n\n // Flatten the units array to pretend that all units are in the same column\n const _units = columns.map((d) => d.units).flat();\n\n const columnIDs = columns.map((d) => d.columnID);\n\n const preparedUnits = prepareColumnUnits(_units, opts);\n\n const { sections, totalHeight } = preparedUnits;\n\n const scaleInfo: CompositeStratigraphicScaleInfo = {\n axisType: ColumnAxisType.AGE,\n totalHeight,\n packages: sections.map((d) => d.scaleInfo),\n };\n\n const packages = sections.map((d) => {\n return separateColumns(d, columnIDs);\n });\n\n return { scaleInfo, packages, nColumns: columnIDs.length };\n}\n\ninterface UnitGroup {\n b_age: number;\n t_age: number;\n strat_name_id: number;\n strat_name_long: string;\n units: (UnitLong | null)[];\n}\n\nexport interface UnitGroupBox extends UnitGroup {\n units: UnitLong[];\n startCol: number;\n endCol: number;\n}\n\ninterface ColumnExt {\n columnID: number;\n units: UnitLong[];\n}\n\ninterface MultiColumnPackageData {\n columnData: ColumnExt[];\n bestPixelScale?: number;\n b_age: number;\n t_age: number;\n}\n\nexport function findLaterallyExtensiveUnits(\n pkg: MultiColumnPackageData,\n): UnitGroup[] {\n const { columnData, b_age, t_age } = pkg;\n // Group units by strat_name_id\n const unitIndex = new Map<number, Map<number, UnitLong>>();\n for (const column of columnData) {\n const { units } = column;\n for (const unit of units) {\n if (unit.strat_name_id == null) continue;\n if (!unitIndex.has(unit.strat_name_id)) {\n unitIndex.set(unit.strat_name_id, new Map());\n }\n unitIndex.get(unit.strat_name_id).set(column.columnID, unit);\n }\n }\n\n // Prepare grouped units for rendering\n const unitGroups: UnitGroup[] = [];\n for (const [strat_name_id, unitIndex0] of unitIndex) {\n const units = columnData.map((d) => unitIndex0.get(d.columnID) ?? null);\n const filteredUnits = units.filter((d) => d != null);\n const [t_age, b_age] = mergeAgeRanges(\n filteredUnits.map((d) => [d.t_age, d.b_age]),\n );\n if (filteredUnits.length <= 1) continue;\n\n unitGroups.push({\n b_age,\n t_age,\n strat_name_id,\n strat_name_long: filteredUnits[0].strat_name_long,\n units,\n });\n }\n\n return unitGroups;\n}\n\nexport function splitStratIntoBoxes(pkg: UnitGroup): UnitGroupBox[] {\n const { strat_name_long, strat_name_id, units } = pkg;\n const boxes: UnitGroupBox[] = [];\n let currentBox: UnitGroupBox = null;\n for (let i = 0; i < units.length; i++) {\n const unit = units[i];\n if (unit == null) {\n if (currentBox != null) {\n boxes.push(currentBox);\n currentBox = null;\n }\n continue;\n }\n if (currentBox == null) {\n currentBox = {\n startCol: i,\n endCol: i,\n strat_name_id,\n strat_name_long,\n t_age: unit.t_age,\n b_age: unit.b_age,\n units: [],\n };\n } else {\n currentBox.endCol = i;\n }\n currentBox.units.push(unit);\n }\n return boxes;\n}\n\nfunction separateColumns(\n pkg: PackageLayoutData,\n columnIDs: number[],\n): MultiColumnPackageData {\n /** Separate columns by col_id */\n const { units, t_age, b_age } = pkg;\n\n return {\n columnData: columnIDs.map((d) => {\n const u1 = units.filter((unit) => unit.col_id == d);\n u1.sort((a, b) => a.t_age - b.t_age);\n return {\n columnID: d,\n // Ensure that the units correctly show overlap\n units: preprocessUnits(\n {\n ...pkg,\n units: u1,\n },\n ColumnAxisType.AGE,\n ),\n };\n }),\n bestPixelScale: pkg.scaleInfo.pixelScale,\n t_age,\n b_age,\n };\n}\n\nexport function columnGeoJSONRecordToColumnIdentifier(\n col: ColumnGeoJSONRecord,\n): ColumnIdentifier {\n return {\n col_id: col.properties.col_id,\n col_name: col.properties.col_name,\n project_id: col.properties.project_id,\n };\n}\n"],"names":[],"version":3,"file":"column-views.88d63dd0.js.map"}
1
+ {"mappings":"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","sources":["packages/column-views/src/correlation-chart/prepare-data.ts"],"sourcesContent":["import { CompositeStratigraphicScaleInfo } from \"../age-axis\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\nimport { type ColumnGeoJSONRecord, UnitLong } from \"@macrostrat/api-types\";\nimport {\n MergeSectionsMode,\n PrepareColumnOptions,\n prepareColumnUnits,\n preprocessUnits,\n} from \"../prepare-units\";\nimport { mergeAgeRanges } from \"@macrostrat/stratigraphy-utils\";\nimport { PackageLayoutData } from \"../prepare-units/types\";\n\nexport interface ColumnIdentifier {\n col_id: number;\n col_name: string;\n project_id: number;\n}\n\ninterface ColumnData {\n columnID: number;\n units: UnitLong[];\n}\n\nexport interface CorrelationChartSettings extends Omit<\n PrepareColumnOptions,\n \"axisType\"\n> {\n targetUnitHeight?: number;\n}\n\nexport interface CorrelationChartData {\n packages: MultiColumnPackageData[];\n scaleInfo: CompositeStratigraphicScaleInfo;\n nColumns: number;\n}\n\nexport interface ColumnIdentifier {\n col_id: number;\n col_name: string;\n project_id: number;\n}\n\nexport function buildCorrelationChartData(\n columns: ColumnData[],\n settings: CorrelationChartSettings,\n): CorrelationChartData {\n console.log(settings);\n const {\n mergeSections = MergeSectionsMode.OVERLAPPING,\n targetUnitHeight,\n ...rest\n } = settings;\n\n const opts: PrepareColumnOptions = {\n axisType: ColumnAxisType.AGE,\n targetUnitHeight,\n mergeSections,\n ...rest,\n };\n\n if (columns.length == 0) {\n return null;\n }\n\n // Flatten the units array to pretend that all units are in the same column\n const _units = columns.map((d) => d.units).flat();\n\n const columnIDs = columns.map((d) => d.columnID);\n\n const preparedUnits = prepareColumnUnits(_units, opts);\n\n const { sections, totalHeight } = preparedUnits;\n\n const scaleInfo: CompositeStratigraphicScaleInfo = {\n axisType: ColumnAxisType.AGE,\n totalHeight,\n packages: sections.map((d) => d.scaleInfo),\n };\n\n const packages = sections.map((d) => {\n return separateColumns(d, columnIDs);\n });\n\n return { scaleInfo, packages, nColumns: columnIDs.length };\n}\n\ninterface UnitGroup {\n b_age: number;\n t_age: number;\n strat_name_id: number;\n strat_name_long: string;\n units: (UnitLong | null)[];\n}\n\nexport interface UnitGroupBox extends UnitGroup {\n units: UnitLong[];\n startCol: number;\n endCol: number;\n}\n\ninterface ColumnExt {\n columnID: number;\n units: UnitLong[];\n}\n\ninterface MultiColumnPackageData {\n columnData: ColumnExt[];\n bestPixelScale?: number;\n b_age: number;\n t_age: number;\n}\n\nexport function findLaterallyExtensiveUnits(\n pkg: MultiColumnPackageData,\n): UnitGroup[] {\n const { columnData, b_age, t_age } = pkg;\n // Group units by strat_name_id\n const unitIndex = new Map<number, Map<number, UnitLong>>();\n for (const column of columnData) {\n const { units } = column;\n for (const unit of units) {\n if (unit.strat_name_id == null) continue;\n if (!unitIndex.has(unit.strat_name_id)) {\n unitIndex.set(unit.strat_name_id, new Map());\n }\n unitIndex.get(unit.strat_name_id).set(column.columnID, unit);\n }\n }\n\n // Prepare grouped units for rendering\n const unitGroups: UnitGroup[] = [];\n for (const [strat_name_id, unitIndex0] of unitIndex) {\n const units = columnData.map((d) => unitIndex0.get(d.columnID) ?? null);\n const filteredUnits = units.filter((d) => d != null);\n const [t_age, b_age] = mergeAgeRanges(\n filteredUnits.map((d) => [d.t_age, d.b_age]),\n );\n if (filteredUnits.length <= 1) continue;\n\n unitGroups.push({\n b_age,\n t_age,\n strat_name_id,\n strat_name_long: filteredUnits[0].strat_name_long,\n units,\n });\n }\n\n return unitGroups;\n}\n\nexport function splitStratIntoBoxes(pkg: UnitGroup): UnitGroupBox[] {\n const { strat_name_long, strat_name_id, units } = pkg;\n const boxes: UnitGroupBox[] = [];\n let currentBox: UnitGroupBox = null;\n for (let i = 0; i < units.length; i++) {\n const unit = units[i];\n if (unit == null) {\n if (currentBox != null) {\n boxes.push(currentBox);\n currentBox = null;\n }\n continue;\n }\n if (currentBox == null) {\n currentBox = {\n startCol: i,\n endCol: i,\n strat_name_id,\n strat_name_long,\n t_age: unit.t_age,\n b_age: unit.b_age,\n units: [],\n };\n } else {\n currentBox.endCol = i;\n }\n currentBox.units.push(unit);\n }\n return boxes;\n}\n\nfunction separateColumns(\n pkg: PackageLayoutData,\n columnIDs: number[],\n): MultiColumnPackageData {\n /** Separate columns by col_id */\n const { units, t_age, b_age } = pkg;\n\n return {\n columnData: columnIDs.map((d) => {\n const u1 = units.filter((unit) => unit.col_id == d);\n u1.sort((a, b) => a.t_age - b.t_age);\n return {\n columnID: d,\n // Ensure that the units correctly show overlap\n units: preprocessUnits(\n {\n ...pkg,\n units: u1,\n },\n ColumnAxisType.AGE,\n ),\n };\n }),\n bestPixelScale: pkg.scaleInfo.pixelScale,\n t_age,\n b_age,\n };\n}\n\nexport function columnGeoJSONRecordToColumnIdentifier(\n col: ColumnGeoJSONRecord,\n): ColumnIdentifier {\n return {\n col_id: col.properties.col_id,\n col_name: col.properties.col_name,\n project_id: col.properties.project_id,\n };\n}\n"],"names":[],"version":3,"file":"column-views.275ba52b.js.map"}
@@ -1,4 +1,4 @@
1
- import {UnitDetailsPanel as $448b24baeef3b229$export$fbd245232df17557} from "./column-views.8284c3a9.js";
1
+ import {UnitDetailsPanel as $448b24baeef3b229$export$fbd245232df17557} from "./column-views.5eb4e6ff.js";
2
2
  import {Button as $fodo6$Button} from "@blueprintjs/core";
3
3
  import {useKeyHandler as $fodo6$useKeyHandler} from "@macrostrat/ui-components";
4
4
  import $fodo6$macrostrathyper from "@macrostrat/hyper";
@@ -57,4 +57,4 @@ function $d418ca9cbe9b0f3c$export$cfdbe8496aa51962(props) {
57
57
 
58
58
 
59
59
  export {$d418ca9cbe9b0f3c$export$cfdbe8496aa51962 as UnitDetailsPanelWithNavigation};
60
- //# sourceMappingURL=column-views.d86555b0.js.map
60
+ //# sourceMappingURL=column-views.2bac03a2.js.map