imerss-bioinfo 1.12.0 → 1.14.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 (151) hide show
  1. package/README.md +2 -2
  2. package/build.js +204 -100
  3. package/docs/css/OSU-overrides.css +99 -0
  4. package/docs/css/OSU-superfish.css +2 -0
  5. package/docs/css/OSU.css +1 -0
  6. package/docs/css/data-table.css +176 -0
  7. package/docs/css/imerss-bbea.css +384 -51
  8. package/docs/css/imerss-blitz.css +106 -0
  9. package/docs/css/imerss-core.css +654 -106
  10. package/docs/css/imerss-viz-all.css +766 -242
  11. package/docs/css/imerss-viz-lib.css +859 -1
  12. package/docs/css/imerss-viz-new-core.css +796 -0
  13. package/docs/css/imerss-viz-new.css +474 -0
  14. package/docs/css/imerss-viz-wp-overrides.css +30 -9
  15. package/docs/css/imerss-viz.css +73 -408
  16. package/docs/css/mapbox-gl-draw.css +87 -0
  17. package/docs/css/maplibre-gl.css +796 -0
  18. package/docs/css/pepiowelh.css +13 -13
  19. package/docs/css/resize-bar.css +56 -0
  20. package/docs/css/xetthecum-core.css +54 -0
  21. package/docs/css/xetthecum-external.css +13 -11
  22. package/docs/css/xetthecum-shared.css +18 -11
  23. package/docs/css/xetthecum.css +162 -72
  24. package/docs/js/bipartitePP.js +179 -0
  25. package/docs/js/brightsign-keyboard.js +122 -0
  26. package/docs/js/imerss-bbea.js +1307 -0
  27. package/docs/js/imerss-blitz.js +266 -0
  28. package/docs/js/imerss-plants.js +84 -0
  29. package/docs/js/imerss-viz-all.js +26 -11
  30. package/docs/js/imerss-viz-all.js.map +1 -1
  31. package/docs/js/imerss-viz-lib.js +25 -34
  32. package/docs/js/imerss-viz-lib.js.map +1 -1
  33. package/docs/js/imerss-viz-new-core.js +15 -0
  34. package/docs/js/imerss-viz-new-core.js.map +1 -0
  35. package/docs/js/imerss-viz-new.js +18 -1
  36. package/docs/js/imerss-viz-new.js.map +1 -1
  37. package/docs/js/imerss-viz.js +161 -0
  38. package/docs/js/vizjs.js +1 -0
  39. package/indexBeas.html +34 -34
  40. package/indexBeasBCBA.html +264 -0
  41. package/indexBeasOBA.html +158 -47
  42. package/indexBeasWaBA.html +254 -0
  43. package/indexBlitz.html +198 -0
  44. package/indexDiatoms.html +200 -0
  45. package/indexWithJustMap.html +6 -6
  46. package/indexWithMap.html +3 -2
  47. package/indexWithMapHoweSoundGridded.html +3 -3
  48. package/indexWithMapHoweSoundScrolly.html +3 -3
  49. package/indexWithMapPepiowelh.html +5 -4
  50. package/indexWithMapValdes.html +4 -3
  51. package/{indexWithMapXetthecum.html → indexWithMapXetthecumII.html} +5 -3
  52. package/{index.html → indexWoL.html} +4 -3
  53. package/package.json +14 -8
  54. package/src/Wikipedia/wikipedia.js +3 -0
  55. package/src/assignBNames.js +198 -36
  56. package/src/assignNames.js +81 -17
  57. package/src/assigniNatImages.js +39 -3
  58. package/src/buildSource/Comprehensive Lists.html +2 -2
  59. package/src/buildSource/Data Paper Part I Visualisation.html +6 -6
  60. package/src/buildSource/Galiano Life List.html +2 -2
  61. package/src/buildSource/Metchosin/index.html +2 -2
  62. package/src/buildSource/Pe'pi'ow'elh.html +8 -4
  63. package/src/buildSource/Squamish Life List.html +2 -2
  64. package/src/buildSource/Valdes Island Biodiversity.html +5 -5
  65. package/src/buildSource/Xetthecum WoL.html +3 -3
  66. package/src/buildSource/Xetthecum.html +4 -3
  67. package/src/buildSource/dataPaperSunburstAndMap.html +2 -2
  68. package/src/buildSource/indexBeasBCBA.html +261 -0
  69. package/src/buildSource/indexBeasOBA.html +204 -49
  70. package/src/buildSource/indexBeasWaBA.html +251 -0
  71. package/src/buildSource/indexBlitz.html +146 -0
  72. package/src/buildSource/indexDiatoms.html +126 -0
  73. package/src/client/css/OSU-overrides.css +99 -0
  74. package/src/client/css/OSU-superfish.css +2 -0
  75. package/src/client/css/OSU.css +1 -0
  76. package/src/client/css/data-table.css +176 -0
  77. package/src/client/css/imerss-bbea.css +384 -51
  78. package/src/client/css/imerss-blitz.css +106 -0
  79. package/src/client/css/imerss-core.css +654 -106
  80. package/src/client/css/imerss-viz-wp-overrides.css +30 -9
  81. package/src/client/css/imerss-viz.css +73 -408
  82. package/src/client/css/mapbox-gl-draw.css +87 -0
  83. package/src/client/css/maplibre-gl.css +796 -0
  84. package/src/client/css/pepiowelh.css +13 -13
  85. package/src/client/css/resize-bar.css +56 -0
  86. package/src/client/css/xetthecum-core.css +54 -0
  87. package/src/client/css/xetthecum-external.css +13 -11
  88. package/src/client/css/xetthecum-shared.css +18 -11
  89. package/src/client/css/xetthecum.css +162 -72
  90. package/src/client/fonts/OSU/Stratum2WebBold.woff2 +0 -0
  91. package/src/client/fonts/OSU/Stratum2WebLight.woff2 +0 -0
  92. package/src/client/html/imerss-viz-map-only.html +30 -30
  93. package/src/client/html/imerss-viz-map-pepi.html +31 -31
  94. package/src/client/html/imerss-viz-map-xetthecum.html +41 -41
  95. package/src/client/html/imerss-viz-map.html +30 -30
  96. package/src/client/html/imerss-viz-nomap-wol.html +33 -31
  97. package/src/client/html/imerss-viz-scrolly.html +31 -31
  98. package/src/client/html/imerss-viz.html +46 -33
  99. package/src/client/img/OSU/OSU-logo.png +0 -0
  100. package/src/client/img/download.svg +20 -0
  101. package/src/client/img/x-circle-close.svg +5 -0
  102. package/src/client/js/autocomplete.js +3 -1
  103. package/src/client/js/checklist.js +32 -13
  104. package/src/client/js/datasetControls.js +19 -19
  105. package/src/client/js/imerss-viz.js +93 -72
  106. package/src/client/js/leafletMap.js +8 -8
  107. package/src/client/js/leafletMapWithGrid.js +6 -6
  108. package/src/client/js/leafletMapWithRegions.js +31 -31
  109. package/src/client/js/new/bipartitePP.js +179 -0
  110. package/src/client/js/new/data-table.js +483 -0
  111. package/src/client/js/new/dual-range-input.js +195 -0
  112. package/src/client/js/new/filters.js +582 -0
  113. package/src/client/js/new/fluidNew.js +302 -0
  114. package/src/client/js/new/imerss-bbea.js +1307 -0
  115. package/src/client/js/new/imerss-blitz.js +266 -0
  116. package/src/client/js/new/imerss-new.js +773 -856
  117. package/src/client/js/new/imerss-plants.js +84 -0
  118. package/src/client/js/new/imerss-viz.js +161 -0
  119. package/src/client/js/new/newChecklist.js +586 -146
  120. package/src/client/js/new/polygon-draw.js +85 -0
  121. package/src/client/js/new/resize-bar.js +289 -0
  122. package/src/client/js/new/taxonDisplay.js +451 -0
  123. package/src/client/js/tabs.js +2 -0
  124. package/src/client/js/xetthecum.js +3 -3
  125. package/src/copyBeasOut.js +70 -0
  126. package/src/copyMelitOut.js +76 -0
  127. package/src/dataProcessing/coordinatePatch.js +19 -17
  128. package/src/dataProcessing/featureFilters.js +71 -0
  129. package/src/dataProcessing/readCSV.js +1 -1
  130. package/src/dataProcessing/sqlite.js +2 -1
  131. package/src/dataProcessing/taxonScrape.js +7 -4
  132. package/src/descrolly.js +5 -1
  133. package/src/geom/geoJSON.js +13 -71
  134. package/src/iNaturalist/obsAPI.js +3 -1
  135. package/src/iNaturalist/taxonAPI.js +97 -20
  136. package/src/inatObs.js +75 -0
  137. package/src/landlocked.js +1 -0
  138. package/src/lib/brightsign-keyboard.js +122 -0
  139. package/src/lib/dual-range-input.js +99 -0
  140. package/src/lib/point-in-polygon.js +1 -1
  141. package/src/lib/provenance.txt +4 -0
  142. package/src/lib/vizjs.js +1 -0
  143. package/src/loadVizSqlite.js +89 -0
  144. package/src/taxonomise.js +1 -0
  145. package/src/utils/utils.js +4 -2
  146. package/src/validateUTF8.js +226 -0
  147. package/src/xetthecum/xetthecumFilters.js +31 -13
  148. package/src/zlib.js +44 -0
  149. package/test/testAnnote.js +2 -2
  150. package/test/testiNatDisambig.js +18 -2
  151. package/test/testiNatSource.js +3 -2
package/README.md CHANGED
@@ -122,7 +122,7 @@ To convert a CSV file, run `marmalise.js` e.g. via a line such as
122
122
  node src/marmalise.js data/dataPaper-I/reintegrated.csv --map data/dataPaper-I/combinedOutMap.json
123
123
 
124
124
  By default this will produce a `Life.json.lz4` file which can be copied into a suitable location, e.g. in the </data>
125
- directories and then referred to in the JavaScript initialisation block seen, e.g. in the various [index.html](index.html)
125
+ directories and then referred to in the JavaScript initialisation block seen, e.g. in the various [index.html](indexWoL.html)
126
126
  files in this root. You can supply a `-o` option to output a file of a chosen name at a chosen path.
127
127
 
128
128
  To preview the web UI, host this project via some suitable static web server and then access its `index.html`.
@@ -143,7 +143,7 @@ and injecting an initialisation block into the markup such as
143
143
 
144
144
  ````html
145
145
  <script>
146
- hortis.sunburstLoader(".fl-imerss-container", {
146
+ hortis.sunburstLoader(".imerss-container", {
147
147
  colourCount: "undocumentedCount",
148
148
  selectOnStartup: "Life",
149
149
  vizFile: "data/Galiano/Galiano-Life.json.lz4",
package/build.js CHANGED
@@ -1,27 +1,62 @@
1
1
  /* eslint-env node */
2
2
  "use strict";
3
3
 
4
- const readline = require("readline"),
5
- glob = require("glob"),
4
+ const glob = require("glob"),
6
5
  fs = require("fs-extra");
7
6
 
8
7
  const fluid = require("infusion");
9
8
  const terser = require("terser");
10
9
  const path = require("path");
11
10
 
11
+ // const fluid6 = require("./infusion-6.js");
12
+ // console.log(fluid6);
13
+
12
14
  const buildIndex = {
13
- excludes: [
14
- "jquery.js"
15
+ libSource: [
16
+ "node_modules/infusion/src/framework/core/css/fluid.css",
17
+ "node_modules/infusion/src/lib/jquery/ui/css/default-theme/core.css",
18
+ "node_modules/infusion/src/lib/jquery/ui/css/default-theme/tooltip.css",
19
+ "node_modules/infusion/src/lib/jquery/ui/css/default-theme/theme.css",
20
+ "node_modules/jquery-ui/themes/base/tabs.css",
21
+ "node_modules/accessible-autocomplete/dist/accessible-autocomplete.min.js",
22
+ "node_modules/accessible-autocomplete/dist/accessible-autocomplete.min.css",
23
+ // "node_modules/infusion/src/lib/jquery/core/js/jquery.js",
24
+ "src/client/css/imerss-core.css",
25
+ "src/lib/signals-core.min.js",
26
+ "node_modules/infusion/src/lib/jquery/ui/js/version.js",
27
+ "node_modules/infusion/src/lib/jquery/ui/js/keycode.js",
28
+ "node_modules/jquery-ui/ui/safe-active-element.js",
29
+ "node_modules/jquery-ui/ui/widget.js",
30
+ "node_modules/jquery-ui/ui/unique-id.js",
31
+ "node_modules/jquery-ui/ui/position.js",
32
+ "node_modules/jquery-ui/ui/widgets/tooltip.js",
33
+ "node_modules/infusion/src/framework/core/js/jquery.keyboard-a11y.js",
34
+ "node_modules/infusion/src/framework/core/js/Fluid.js",
35
+ "node_modules/infusion/src/framework/core/js/FluidPromises.js",
36
+ "node_modules/infusion/src/framework/core/js/FluidDebugging.js",
37
+ "node_modules/infusion/src/framework/core/js/FluidDocument.js",
38
+ "node_modules/infusion/src/framework/core/js/FluidIoC.js",
39
+ "node_modules/infusion/src/framework/core/js/DataBinding.js",
40
+ "node_modules/infusion/src/framework/core/js/ModelTransformation.js",
41
+ "node_modules/infusion/src/framework/core/js/ModelTransformationTransforms.js",
42
+ "node_modules/infusion/src/framework/enhancement/js/ContextAwareness.js",
43
+ "node_modules/infusion/src/framework/enhancement/js/ProgressiveEnhancement.js",
44
+ "node_modules/infusion/src/framework/core/js/FluidView.js",
45
+ "node_modules/infusion/src/framework/core/js/FluidView-browser.js",
46
+ "node_modules/infusion/src/framework/core/js/NewViewSupport.js",
47
+ "node_modules/infusion/src/framework/core/js/DataSource.js",
48
+ "node_modules/infusion/src/framework/core/js/ResourceLoader.js",
49
+ "node_modules/infusion/src/framework/core/js/ResourceLoader-browser.js",
50
+ "src/client/js/new/fluidNew.js",
51
+ "src/client/js/colour.js"
15
52
  ],
16
- localSource: [
53
+ oldSource: [
17
54
  "src/client/css/imerss-viz.css",
18
55
  "src/auxBuild/restoreJQuery.js",
19
56
  "src/lib/jquery-ui-widgets-tabs.js",
20
57
  "src/lib/lz4.js",
21
- "src/lib/signals-core.min.js",
22
58
  "src/client/js/imerss-viz.js",
23
59
  "src/client/js/autocomplete.js",
24
- "src/client/js/colour.js",
25
60
  "src/client/js/leafletMap.js",
26
61
  "src/client/js/datasetControls.js",
27
62
  "src/client/js/leafletMapWithGrid.js",
@@ -32,16 +67,37 @@ const buildIndex = {
32
67
  "src/client/js/checklist.js",
33
68
  "src/client/js/xetthecum.js"
34
69
  ],
35
- newSource: [
36
- "src/lib/hash-table.js",
37
- "src/lib/signals-core.min.js",
38
- "src/client/js/colour.js",
39
- "src/client/js/renderSVG.js",
70
+ // Source for simplified environments such as Xetthecum without features like tabs, polygon drawing, etc.
71
+ newCoreSource: [
72
+ "src/utils/utils.js",
73
+ "node_modules/papaparse/papaparse.min.js",
74
+ "src/client/css/maplibre-gl.css",
75
+ "node_modules/maplibre-gl/dist/maplibre-gl-dev.js",
76
+ "src/client/js/new/taxonDisplay.js",
40
77
  "src/client/js/new/imerss-new.js",
41
- "src/client/js/autocomplete.js",
42
- "src/client/js/tabs.js",
43
78
  "src/client/js/new/newChecklist.js"
44
79
  ],
80
+ // Full source for environments with strong focus on biodiversity info
81
+ newSource: [
82
+ "node_modules/@mapbox/mapbox-gl-draw/dist/mapbox-gl-draw.js",
83
+ "src/client/css/mapbox-gl-draw.css", // has our own overrides
84
+ "src/client/css/data-table.css",
85
+ "src/client/css/resize-bar.css",
86
+ "node_modules/papaparse/papaparse.min.js",
87
+ "node_modules/pako/dist/pako_inflate.min.js",
88
+ "node_modules/pretty-checkbox/dist/pretty-checkbox.min.css",
89
+ "node_modules/@stanko/dual-range-input/dist/index.css",
90
+ "src/lib/jquery-ui-widgets-tabs.js",
91
+ "src/lib/point-in-polygon.js",
92
+ "src/geom/geoJSON.js",
93
+ "src/client/js/new/filters.js",
94
+ "src/client/js/new/polygon-draw.js",
95
+ "src/client/js/new/dual-range-input.js",
96
+ "src/client/js/new/data-table.js",
97
+ "src/client/js/new/resize-bar.js",
98
+ "src/client/js/autocomplete.js",
99
+ "src/client/js/tabs.js"
100
+ ],
45
101
  codeHeader: "",
46
102
  codeFooter: "", // "\njQuery.noConflict()",
47
103
  copy: [{
@@ -59,6 +115,27 @@ const buildIndex = {
59
115
  }, {
60
116
  src: "src/client/css/*.css",
61
117
  dest: "docs/css"
118
+ }, {
119
+ src: "src/client/fonts",
120
+ dest: "docs/fonts"
121
+ }, {
122
+ src: "src/client/js/new/bipartitePP.js",
123
+ dest: "docs/js/bipartitePP.js"
124
+ }, {
125
+ src: "src/client/js/new/imerss-bbea.js",
126
+ dest: "docs/js/imerss-bbea.js"
127
+ }, {
128
+ src: "src/client/js/new/imerss-viz.js",
129
+ dest: "docs/js/imerss-viz.js"
130
+ }, {
131
+ src: "src/client/js/new/imerss-blitz.js",
132
+ dest: "docs/js/imerss-blitz.js"
133
+ }, {
134
+ src: "src/client/js/new/imerss-plants.js",
135
+ dest: "docs/js/imerss-plants.js"
136
+ }, {
137
+ src: "src/lib/vizjs.js",
138
+ dest: "docs/js/vizjs.js"
62
139
  }, {
63
140
  src: "src/buildSource/*.html",
64
141
  dest: "docs/"
@@ -90,32 +167,55 @@ const buildIndex = {
90
167
  src: "data/Pepiowelh/Life.json.lz4",
91
168
  dest: "docs/data/Pepiowelh/Life.json.lz4"
92
169
  }, {
93
- src: "data/b-team/plant-pollinators-OBA-assigned-subset.csv",
94
- dest: "docs/data/b-team/plant-pollinators-OBA-assigned-subset.csv"
170
+ src: "src/lib/brightsign-keyboard.js",
171
+ dest: "docs/js/brightsign-keyboard.js"
95
172
  }, {
96
- src: "data/b-team/plant-pollinators-OBA-assigned-taxa.csv",
97
- dest: "docs/data/b-team/plant-pollinators-OBA-assigned-taxa.csv"
98
- }]
99
- };
100
-
101
-
102
- const readLines = function (filename) {
103
- const lines = [];
104
- const togo = fluid.promise();
105
- const rl = readline.createInterface({
106
- input: fs.createReadStream(filename),
107
- terminal: false
108
- });
109
- rl.on("line", function (line) {
110
- lines.push(line);
111
- });
112
- rl.on("close", function () {
113
- togo.resolve(lines);
114
- });
115
- rl.on("error", function (error) {
116
- togo.reject(error);
117
- });
118
- return togo;
173
+ src: "data/b-team/plant-pollinators-OBA-2025-labels.viz",
174
+ dest: "docs/data/b-team/plant-pollinators-OBA-2025-labels.viz"
175
+ }, {
176
+ src: "data/b-team/plant-pollinators-OBA-2025-assigned-taxa.viz",
177
+ dest: "docs/data/b-team/plant-pollinators-OBA-2025-assigned-taxa.viz"
178
+ }, {
179
+ src: "data/b-team/plant-pollinators-OBA-2025-regionIndirection.csv",
180
+ dest: "docs/data/b-team/plant-pollinators-OBA-2025-regionIndirection.csv"
181
+ }, {
182
+ src: "data/b-team/plant-pollinators-WaBA-2025-labels.viz",
183
+ dest: "docs/data/b-team/plant-pollinators-WaBA-2025-labels.viz"
184
+ }, {
185
+ src: "data/b-team/plant-pollinators-WaBA-2025-assigned-taxa.viz",
186
+ dest: "docs/data/b-team/plant-pollinators-WaBA-2025-assigned-taxa.viz"
187
+ }, {
188
+ src: "data/b-team/plant-pollinators-WaBA-2025-regionIndirection.csv",
189
+ dest: "docs/data/b-team/plant-pollinators-WaBA-2025-regionIndirection.csv"
190
+ }, {
191
+ src: "data/b-team/plant-pollinators-BCBA-labels.viz",
192
+ dest: "docs/data/b-team/plant-pollinators-BCBA-labels.viz"
193
+ }, {
194
+ src: "data/b-team/plant-pollinators-BCBA-assigned-taxa.viz",
195
+ dest: "docs/data/b-team/plant-pollinators-BCBA-assigned-taxa.viz"
196
+ }, {
197
+ src: "data/b-team/plant-pollinators-BCBA-regionIndirection.csv",
198
+ dest: "docs/data/b-team/plant-pollinators-BCBA-regionIndirection.csv"
199
+ }, {
200
+ src: "data/Galiano 2023 BioBlitz/Galiano_Island_vascular_plant_records_consolidated-prepared.csv",
201
+ dest: "docs/data/Galiano 2023 BioBlitz/Galiano_Island_vascular_plant_records_consolidated-prepared.csv"
202
+ }, {
203
+ src: "data/Galiano 2023 BioBlitz/Galiano_Island_vascular_plant_records_consolidated-prepared-taxa.csv",
204
+ dest: "docs/data/Galiano 2023 BioBlitz/Galiano_Island_vascular_plant_records_consolidated-prepared-taxa.csv"
205
+ }, {
206
+ src: "data/Galiano 2023 BioBlitz/regionIndirection.csv",
207
+ dest: "docs/data/Galiano 2023 BioBlitz/regionIndirection.csv"
208
+ }, {
209
+ src: "data/dataPaper-II/Salish_Sea_marine_diatom_records_consolidated_aligned_2025-03-prepared.csv",
210
+ dest: "docs/data/dataPaper-II/Salish_Sea_marine_diatom_records_consolidated_aligned_2025-03-prepared.csv"
211
+ }, {
212
+ src: "data/dataPaper-II/Salish_Sea_marine_diatom_records_consolidated_aligned_2025-03-assigned-taxa.csv",
213
+ dest: "docs/data/dataPaper-II/Salish_Sea_marine_diatom_records_consolidated_aligned_2025-03-assigned-taxa.csv"
214
+ }, {
215
+ src: "data/dataPaper-II/regionIndirection.csv",
216
+ dest: "docs/data/dataPaper-II/regionIndirection.csv"
217
+ }
218
+ ]
119
219
  };
120
220
 
121
221
  // These two taken from reknit.js
@@ -162,91 +262,95 @@ const filesToContentHash = function (allFiles, extension) {
162
262
  const extFiles = allFiles.filter(function (file) {
163
263
  return file.endsWith(extension);
164
264
  });
165
- const hash = fluid.transform(fluid.arrayToHash(extFiles), function (troo, filename) {
166
- return fs.readFileSync(filename, "utf8");
167
- });
265
+ // console.log("Computed content hash ", extFiles, " for extension ", extension);
266
+ const hash = Object.fromEntries(
267
+ extFiles.map(filename => [filename, fs.readFileSync(filename, "utf8")])
268
+ );
168
269
  return hash;
169
270
  };
170
271
 
171
- const computeAllFiles = function (buildIndex, nodeFiles) {
172
- const withExcludes = nodeFiles.filter(function (oneFile) {
173
- return !buildIndex.excludes.some(function (oneExclude) {
174
- return oneFile.indexOf(oneExclude) !== -1;
175
- });
176
- });
177
- return withExcludes.concat(buildIndex.localSource);
178
- };
179
-
180
- const buildFromFiles = async function (buildIndex, nodeFiles) {
181
- const allFiles = computeAllFiles(buildIndex, nodeFiles);
182
- console.log("allFiles ", allFiles);
183
- nodeFiles.concat(buildIndex.localSource);
184
-
185
- const jsHash = filesToContentHash(allFiles, ".js");
186
- const fullJsHash = fluid.extend({header: buildIndex.codeHeader}, jsHash, {footer: buildIndex.codeFooter});
187
- fluid.log("Minifying " + Object.keys(fullJsHash).length + " JS files ... ");
188
- const minifiedAll = await terser.minify(fullJsHash, {
272
+ const minify = async function (hash, filename) {
273
+ fluid.log("Minifying " + Object.keys(hash).length + " JS files to " + filename);
274
+ return await terser.minify(hash, {
189
275
  mangle: false,
276
+ compress: false, // https://github.com/terser/terser?tab=readme-ov-file#terser-fast-minify-mode
190
277
  sourceMap: {
191
- filename: "imerss-viz-all.js",
192
- url: "imerss-viz-all.js.map",
278
+ filename,
279
+ url: filename + ".map",
193
280
  root: "../.."
194
281
  }
195
282
  });
283
+ };
284
+
285
+ const buildStory = async function (buildIndex) {
286
+
196
287
  // imerss-viz-lib.js contains just upstream libraries we depend on, to support reasonably easy deploy of "new" framework
197
- const libJsHash = filesToContentHash(nodeFiles, ".js");
198
- console.log("nodeFiles ", nodeFiles);
199
- fluid.log("Minifying " + Object.keys(libJsHash).length + " JS files ... ");
200
- const minifiedLib = await terser.minify(libJsHash, {
201
- mangle: false,
202
- sourceMap: {
203
- filename: "imerss-viz-lib.js",
204
- url: "imerss-viz-lib.js.map",
205
- root: "../.."
206
- }
207
- });
288
+ const libJsHash = filesToContentHash(buildIndex.libSource, ".js");
289
+ console.log("libFiles ", buildIndex.libSource);
290
+ const minifiedLib = await minify(libJsHash, "imerss-viz-lib.js");
291
+
292
+ const newCoreJsHash = filesToContentHash(buildIndex.newCoreSource, ".js");
293
+ console.log("newCoreFiles ", buildIndex.newCoreSource);
294
+ const newCoreJs = await minify(newCoreJsHash, "imerss-viz-new-core.js");
295
+
208
296
  const newJsHash = filesToContentHash(buildIndex.newSource, ".js");
209
- console.log("newFiles " + buildIndex.newSource);
210
- fluid.log("Minifying " + Object.keys(newJsHash).length + " JS files ... ");
211
- const newLib = await terser.minify(newJsHash, {
212
- mangle: false,
213
- sourceMap: {
214
- filename: "imerss-viz-new.js",
215
- url: "imerss-viz-new.js.map",
216
- root: "../.."
217
- }
218
- });
297
+ console.log("newFiles ", buildIndex.newSource);
298
+ const newJs = await minify(newJsHash, "imerss-viz-new.js");
219
299
 
220
- fs.removeSync("docs");
221
- fs.ensureDirSync("docs/js");
222
- fs.writeFileSync("docs/js/imerss-viz-all.js", minifiedAll.code, "utf8");
223
- fs.writeFileSync("docs/js/imerss-viz-all.js.map", minifiedAll.map);
224
300
  fs.writeFileSync("docs/js/imerss-viz-lib.js", minifiedLib.code, "utf8");
225
301
  fs.writeFileSync("docs/js/imerss-viz-lib.js.map", minifiedLib.map);
226
- fs.writeFileSync("docs/js/imerss-viz-new.js", newLib.code, "utf8");
227
- fs.writeFileSync("docs/js/imerss-viz-new.js.map", newLib.map);
228
-
229
- const cssHash = filesToContentHash(allFiles, ".css");
230
- const cssConcat = String.prototype.concat.apply("", Object.values(cssHash));
302
+ fs.writeFileSync("docs/js/imerss-viz-new-core.js", newCoreJs.code, "utf8");
303
+ fs.writeFileSync("docs/js/imerss-viz-new-core.js.map", newCoreJs.map);
304
+ fs.writeFileSync("docs/js/imerss-viz-new.js", newJs.code, "utf8");
305
+ fs.writeFileSync("docs/js/imerss-viz-new.js.map", newJs.map);
231
306
 
232
- const cssLibHash = filesToContentHash(nodeFiles, ".css");
307
+ const cssLibHash = filesToContentHash(buildIndex.libSource, ".css");
233
308
  const cssLibConcat = String.prototype.concat.apply("", Object.values(cssLibHash));
234
309
 
235
- fs.ensureDirSync("docs/css");
236
- fs.writeFileSync("docs/css/imerss-viz-all.css", cssConcat);
310
+ const cssNewCoreHash = filesToContentHash(buildIndex.newCoreSource, ".css");
311
+ const cssNewCoreConcat = String.prototype.concat.apply("", Object.values(cssNewCoreHash));
312
+
313
+ const cssNewHash = filesToContentHash(buildIndex.newSource, ".css");
314
+ const cssNewConcat = String.prototype.concat.apply("", Object.values(cssNewHash));
315
+
237
316
  fs.writeFileSync("docs/css/imerss-viz-lib.css", cssLibConcat);
317
+ fs.writeFileSync("docs/css/imerss-viz-new-core.css", cssNewCoreConcat);
318
+ fs.writeFileSync("docs/css/imerss-viz-new.css", cssNewConcat);
319
+
320
+ };
321
+
322
+ const buildFromFiles = async function (buildIndex) {
323
+ const allOldFiles = buildIndex.libSource.concat(buildIndex.oldSource);
324
+ console.log("allOldFiles ", allOldFiles);
325
+
326
+ const oldJsHash = filesToContentHash(allOldFiles, ".js");
327
+ const allOldJsHash = fluid.extend({header: buildIndex.codeHeader}, oldJsHash, {footer: buildIndex.codeFooter});
328
+ const minifiedAllOld = await minify(allOldJsHash, "imerss-viz-all.js");
329
+
330
+ fs.removeSync("docs");
331
+ fs.ensureDirSync("docs/js");
332
+ fs.writeFileSync("docs/js/imerss-viz-all.js", minifiedAllOld.code, "utf8");
333
+ fs.writeFileSync("docs/js/imerss-viz-all.js.map", minifiedAllOld.map);
334
+
335
+
336
+ const allOldCssHash = filesToContentHash(allOldFiles, ".css");
337
+ const allOldCssConcat = String.prototype.concat.apply("", Object.values(allOldCssHash));
338
+
339
+ fs.ensureDirSync("docs/css");
340
+ fs.writeFileSync("docs/css/imerss-viz-all.css", allOldCssConcat);
341
+
342
+ await buildStory(buildIndex);
343
+
238
344
  buildIndex.copy.forEach(function (oneCopy) {
239
345
  copyDep(oneCopy.src, oneCopy.dest);
240
346
  });
241
- fluid.log("Copied " + (buildIndex.copy.length + 3) + " files to " + fs.realpathSync("docs"));
347
+ fluid.log("Copied " + (buildIndex.copy.length + 2) + " files to " + fs.realpathSync("docs"));
242
348
  };
243
349
 
244
350
  fluid.setLogging(true);
245
351
 
246
- const linesPromise = readLines("gh-pages-nm.txt");
352
+ const buildFn = process.argv[2] === "story" ? buildStory : buildFromFiles;
247
353
 
248
- linesPromise.then(async function (lines) {
249
- await buildFromFiles(buildIndex, lines);
250
- }, function (error) {
354
+ buildFn(buildIndex).then(null, function (error) {
251
355
  console.log(error);
252
356
  });
@@ -0,0 +1,99 @@
1
+ #navbar {
2
+ width: 100%;
3
+ /** Weird height definitions are required to reduce jank on startup - perhaps viz content is oversized **/
4
+ min-height: 130px;
5
+ max-height: 130px;
6
+ display: flex;
7
+ flex-direction: column;
8
+ }
9
+
10
+ /** This is the cutpoint taken from OSU.css **/
11
+ @media screen and (max-width: 1020px) {
12
+ #navbar {
13
+ min-height: 202px;
14
+ max-height: 202px;
15
+ }
16
+
17
+ .imerss-fullscreen {
18
+ display: none;
19
+ }
20
+ }
21
+
22
+ .breadcrumb {
23
+ margin-bottom: 5px;
24
+ }
25
+
26
+ #content-main {
27
+ margin-top: 4px;
28
+ margin-left: 10px;
29
+ margin-right: 10px;
30
+ height: 100%;
31
+ }
32
+
33
+ .imerss-filters:first-child {
34
+ margin-top: -2px;
35
+ }
36
+
37
+ .imerss-record-reporter {
38
+ padding-top: 0;
39
+ }
40
+
41
+ .imerss-copy-checklist {
42
+ top: 7px;
43
+ }
44
+
45
+ /** Account for slightly higher base font */
46
+
47
+ .imerss-checklist .pretty {
48
+ line-height: 1;
49
+ }
50
+
51
+ .pretty {
52
+ line-height: 0.95;
53
+ }
54
+
55
+ /** Override boguss definition from OSU core styles */
56
+
57
+ input[type="radio"], input[type="checkbox"] {
58
+ margin: 0;
59
+ }
60
+
61
+ label {
62
+ display: revert;
63
+ font-weight: revert;
64
+ }
65
+
66
+ body {
67
+ font-size: unset;
68
+ line-height: unset;
69
+ }
70
+
71
+ html {
72
+ font-size: unset;
73
+ }
74
+
75
+
76
+ @font-face {
77
+ font-family: 'Stratum2Web';
78
+ src: url(../fonts/OSU/Stratum2WebBold.woff2) format('woff2'),url(../fonts/OSU/Stratum2WebBold.woff) format('woff');
79
+ }
80
+
81
+ @font-face {
82
+ font-family: 'Stratum2Light';
83
+ src: url(../fonts/OSU/Stratum2WebLight.woff2) format('woff2'),url(../fonts/OSU/Stratum2WebLight.woff) format('woff');
84
+ }
85
+
86
+ @font-face {
87
+ font-family: 'Stratum2Regular';
88
+ src: url(../fonts/OSU/Stratum2WebRegular.woff2) format('woff2'),url(../fonts/OSU/Stratum2WebRegular.woff) format('woff');
89
+ }
90
+
91
+ @media screen and (max-width: 1058px) {
92
+ #navbar .navbar-main-menu {
93
+ display: none;
94
+ }
95
+ }
96
+
97
+ .imerss-fullscreen-mode #navbar, .imerss-fullscreen-mode .breadcrumb {
98
+ display: none;
99
+ }
@@ -0,0 +1,2 @@
1
+ .sf-menu,.sf-menu *{list-style:none;margin:0;padding:0;}.sf-menu{line-height:1.0;z-index:497;}.sf-menu ul{left:0;position:absolute;top:-99999em;width:12em;}.sf-menu ul li{width:100%;}.sf-menu li{float:left;position:relative;z-index:498;}.sf-menu a,.sf-menu span.nolink{display:block;position:relative;}.sf-menu li:hover,.sf-menu li.sfHover,.sf-menu li:hover ul,.sf-menu li.sfHover ul{z-index:499;}.sf-menu li:hover > ul,.sf-menu li.sfHover > ul{left:0;top:2.5em;}.sf-menu li li:hover > ul,.sf-menu li li.sfHover > ul{left:12em;top:0;}.sf-menu.menu,.sf-menu.menu ul,.sf-menu.menu li{margin:0;}.sf-hidden{left:-99999em !important;top:-99999em !important;}.sf-menu a.sf-with-ul,.sf-menu span.nolink.sf-with-ul{min-width:1px;}.sf-sub-indicator{background:url(/sites/all/libraries/superfish/images/arrows-ffffff.png) no-repeat -10px -100px;display:block;height:10px;overflow:hidden;position:absolute;right:0.75em;text-indent:-999em;top:1.05em;width:10px;}a > .sf-sub-indicator,span.nolink > .sf-sub-indicator{top:0.8em;background-position:0 -100px;}a:focus > .sf-sub-indicator,a:hover > .sf-sub-indicator,a:active > .sf-sub-indicator,li:hover > a > .sf-sub-indicator,li.sfHover > a > .sf-sub-indicator,span.nolink:hover > .sf-sub-indicator,li:hover > span.nolink > .sf-sub-indicator,li.sfHover > span.nolink > .sf-sub-indicator{background-position:-10px -100px;}.sf-menu ul .sf-sub-indicator{background-position:-10px 0;}.sf-menu ul a > .sf-sub-indicator,.sf-menu ul span.nolink > .sf-sub-indicator{background-position:0 0;}.sf-menu ul a:focus > .sf-sub-indicator,.sf-menu ul a:hover > .sf-sub-indicator,.sf-menu ul a:active > .sf-sub-indicator,.sf-menu ul li:hover > a > .sf-sub-indicator,.sf-menu ul li.sfHover > a > .sf-sub-indicator,.sf-menu ul span.nolink:hover > .sf-sub-indicator,.sf-menu ul li:hover > span.nolink > .sf-sub-indicator,.sf-menu ul li.sfHover > span.nolink > .sf-sub-indicator{background-position:-10px 0;}.sf-menu.sf-horizontal.sf-shadow ul,.sf-menu.sf-vertical.sf-shadow ul,.sf-menu.sf-navbar.sf-shadow ul ul{background:url(/sites/all/libraries/superfish/images/shadow.png) no-repeat right bottom;padding:0 8px 9px 0 !important;-webkit-border-top-right-radius:8px;-webkit-border-bottom-left-radius:8px;-moz-border-radius-topright:8px;-moz-border-radius-bottomleft:8px;border-top-right-radius:8px;border-bottom-left-radius:8px;}.sf-shadow ul.sf-shadow-off{background:transparent;}.sf-menu.rtl,.sf-menu.rtl li{float:right;}.sf-menu.rtl li:hover > ul,.sf-menu.rtl li.sfHover > ul{left:auto;right:0;}.sf-menu.rtl li li:hover > ul,.sf-menu.rtl li li.sfHover > ul{left:auto;right:12em;}.sf-menu.rtl ul{left:auto;right:0;}.sf-menu.rtl .sf-sub-indicator{left:0.75em;right:auto;background:url(/sites/all/libraries/superfish/images/arrows-ffffff-rtl.png) no-repeat -10px -100px;}.sf-menu.rtl a > .sf-sub-indicator,.sf-menu.rtl span.nolink > .sf-sub-indicator{top:0.8em;background-position:-10px -100px;}.sf-menu.rtl a:focus > .sf-sub-indicator,.sf-menu.rtl a:hover > .sf-sub-indicator,.sf-menu.rtl a:active > .sf-sub-indicator,.sf-menu.rtl li:hover > a > .sf-sub-indicator,.sf-menu.rtl li.sfHover > a > .sf-sub-indicator,.sf-menu.rtl span.nolink:hover > .sf-sub-indicator,.sf-menu.rtl li:hover > span.nolink > .sf-sub-indicator,.sf-menu.rtl li.sfHover > span.nolink > .sf-sub-indicator{background-position:0 -100px;}.sf-menu.rtl ul .sf-sub-indicator{background-position:0 0;}.sf-menu.rtl ul a > .sf-sub-indicator,.sf-menu.rtl ul span.nolink > .sf-sub-indicator{background-position:-10px 0;}.sf-menu.rtl ul a:focus > .sf-sub-indicator,.sf-menu.rtl ul a:hover > .sf-sub-indicator,.sf-menu.rtl ul a:active > .sf-sub-indicator,.sf-menu.rtl ul li:hover > a > .sf-sub-indicator,.sf-menu.rtl ul li.sfHover > a > .sf-sub-indicator,.sf-menu.rtl ul span.nolink:hover > .sf-sub-indicator,.sf-menu.rtl ul li:hover > span.nolink > .sf-sub-indicator,.sf-menu.rtl ul li.sfHover > span.nolink > .sf-sub-indicator{background-position:0 0;}.sf-menu.rtl .sf-hidden,.sf-menu.rtl.sf-hidden{left:auto !important;right:-99999em !important;}.sf-menu.rtl.sf-horizontal.sf-shadow ul,.sf-menu.rtl.sf-vertical.sf-shadow ul,.sf-menu.rtl.sf-navbar.sf-shadow ul ul{background-position:bottom left;padding:0 0 9px 8px !important;-webkit-border-radius:8px;-webkit-border-top-right-radius:0;-webkit-border-bottom-left-radius:0;-moz-border-radius:8px;-moz-border-radius-topright:0;-moz-border-radius-bottomleft:0;border-radius:8px;border-top-right-radius:0;border-bottom-left-radius:0;}.sf-vertical.rtl li:hover > ul,.sf-vertical.rtl li.sfHover > ul{left:auto;right:12em;}.sf-vertical.rtl .sf-sub-indicator{background-position:-10px 0;}.sf-vertical.rtl a > .sf-sub-indicator,.sf-vertical.rtl span.nolink > .sf-sub-indicator{background-position:0 0;}.sf-vertical.rtl a:focus > .sf-sub-indicator,.sf-vertical.rtl a:hover > .sf-sub-indicator,.sf-vertical.rtl a:active > .sf-sub-indicator,.sf-vertical.rtl li:hover > a > .sf-sub-indicator,.sf-vertical.rtl li.sfHover > a > .sf-sub-indicator,.sf-vertical.rtl span.nolink:hover > .sf-sub-indicator,.sf-vertical.rtl li:hover > span.nolink > .sf-sub-indicator,.sf-vertical.rtl li.sfHover > span.nolink > .sf-sub-indicator{background-position:-10px 0;}.sf-navbar.rtl li li{float:right;}.sf-navbar.rtl ul .sf-sub-indicator{background-position:0 -100px;}.sf-navbar.rtl ul a > .sf-sub-indicator{background-position:-10px -100px;}.sf-navbar.rtl ul a:focus > .sf-sub-indicator,.sf-navbar.rtl ul a:hover > .sf-sub-indicator,.sf-navbar.rtl ul a:active > .sf-sub-indicator,.sf-navbar.rtl ul li:hover > a > .sf-sub-indicator,.sf-navbar.rtl ul li.sfHover > a > .sf-sub-indicator,.sf-navbar.rtl ul span.nolink:hover > .sf-sub-indicator,.sf-navbar.rtl ul li:hover > span.nolink > .sf-sub-indicator,.sf-navbar.rtl ul li.sfHover > span.nolink > .sf-sub-indicator{background-position:0 -100px;}.sf-navbar.rtl ul ul .sf-sub-indicator{background-position:0 0;}.sf-navbar.rtl ul ul a > .sf-sub-indicator,.sf-navbar.rtl ul ul span.nolink > .sf-sub-indicator{background-position:-10px 0;}.sf-navbar.rtl ul ul a:focus > .sf-sub-indicator,.sf-navbar.rtl ul ul a:hover > .sf-sub-indicator,.sf-navbar.rtl ul ul a:active > .sf-sub-indicator,.sf-navbar.rtl ul ul li:hover > a > .sf-sub-indicator,.sf-navbar.rtl ul ul li.sfHover > a > .sf-sub-indicator,.sf-navbar.rtl ul ul span.nolink:hover > .sf-sub-indicator,.sf-navbar.rtl ul ul li:hover > span.nolink > .sf-sub-indicator,.sf-navbar.rtl ul ul li.sfHover > span.nolink > .sf-sub-indicator{background-position:0 0;}.sf-navbar.rtl li li:hover > ul,.sf-navbar.rtl li li.sfHover > ul{left:auto;right:0;}.sf-navbar.rtl li li li:hover > ul,.sf-navbar.rtl li li li.sfHover > ul{left:auto;right:12em;}.sf-navbar.rtl > li > ul{background:transparent;padding:0;-moz-border-radius-bottomright:0;-moz-border-radius-topleft:0;-webkit-border-top-left-radius:0;-webkit-border-bottom-right-radius:0;}
2
+ ul.sf-menu.sf-accordion{display:none;position:absolute;}ul.sf-menu.sf-accordion,ul.sf-menu.sf-accordion ul,ul.sf-menu.sf-accordion li{float:left;width:100%;}ul.sf-menu.sf-accordion ul{margin:0;padding:0;}ul.sf-menu.sf-accordion.sf-expanded,ul.sf-menu.sf-accordion li.sf-expanded > ul{left:auto !important;position:relative;top:auto !important;}