marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-19 15:30:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Trim trailing spaces

Browse Source
This commit is contained in:
Nikolay Rozhkov
2023-06-21 01:37:06 +03:00
parent a2c055ba5d
commit 362648b74b
4 changed files with 76 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
demos/sankey.html
View File

@@ -19,74 +19,75 @@
<pre class="mermaid"> <pre class="mermaid">
sankey sankey
Agricultural 'waste',Bio-conversion,124.729 Agricultural 'waste',Bio-conversion,124.729
Bio-conversion,Liquid,0.597 Bio-conversion,Liquid,0.597
Bio-conversion,Losses,26.862 Bio-conversion,Losses,26.862
Bio-conversion,Solid,280.322 Bio-conversion,Solid,280.322
Bio-conversion,Gas,81.144 Bio-conversion,Gas,81.144
Biofuel imports,Liquid,35 Biofuel imports,Liquid,35
Biomass imports,Solid,35 Biomass imports,Solid,35
Coal imports,Coal,11.606 Coal imports,Coal,11.606
Coal reserves,Coal,63.965 Coal reserves,Coal,63.965
Coal,Solid,75.571 Coal,Solid,75.571
District heating,Industry,10.639 District heating,Industry,10.639
District heating,Heating and cooling - commercial,22.505 District heating,Heating and cooling - commercial,22.505
District heating,Heating and cooling - homes,46.184 District heating,Heating and cooling - homes,46.184
Electricity grid,Over generation / exports,104.453 Electricity grid,Over generation / exports,104.453
Electricity grid,Heating and cooling - homes,113.726 Electricity grid,Heating and cooling - homes,113.726
Electricity grid,H2 conversion,27.14 Electricity grid,H2 conversion,27.14
Electricity grid,Industry,342.165 Electricity grid,Industry,342.165
Electricity grid,Road transport,37.797 Electricity grid,Road transport,37.797
Electricity grid,Agriculture,4.412 Electricity grid,Agriculture,4.412
Electricity grid,Heating and cooling - commercial,40.858 Electricity grid,Heating and cooling - commercial,40.858
Electricity grid,Losses,56.691 Electricity grid,Losses,56.691
Electricity grid,Rail transport,7.863 Electricity grid,Rail transport,7.863
Electricity grid,Lighting & appliances - commercial,90.008 Electricity grid,Lighting & appliances - commercial,90.008
Electricity grid,Lighting & appliances - homes,93.494 Electricity grid,Lighting & appliances - homes,93.494
Gas imports,Ngas,40.719 Gas imports,Ngas,40.719
Gas reserves,Ngas,82.233 Gas reserves,Ngas,82.233
Gas,Heating and cooling - commercial,0.129 Gas,Heating and cooling - commercial,0.129
Gas,Losses,1.401 Gas,Losses,1.401
Gas,Thermal generation,151.891 Gas,Thermal generation,151.891
Gas,Agriculture,2.096 Gas,Agriculture,2.096
Gas,Industry,48.58 Gas,Industry,48.58
Geothermal,Electricity grid,7.013 Geothermal,Electricity grid,7.013
H2 conversion,H2,20.897 H2 conversion,H2,20.897
H2 conversion,Losses,6.242 H2 conversion,Losses,6.242
H2,Road transport,20.897 H2,Road transport,20.897
Hydro,Electricity grid,6.995 Hydro,Electricity grid,6.995
Liquid,Industry,121.066 Liquid,Industry,121.066
Liquid,International shipping,128.69 Liquid,International shipping,128.69
Liquid,Road transport,135.835 Liquid,Road transport,135.835
Liquid,Domestic aviation,14.458 Liquid,Domestic aviation,14.458
Liquid,International aviation,206.267 Liquid,International aviation,206.267
Liquid,Agriculture,3.64 Liquid,Agriculture,3.64
Liquid,National navigation,33.218 Liquid,National navigation,33.218
Liquid,Rail transport,4.413 Liquid,Rail transport,4.413
Marine algae,Bio-conversion,4.375 Marine algae,Bio-conversion,4.375
Ngas,Gas,122.952 Ngas,Gas,122.952
Nuclear,Thermal generation,839.978 Nuclear,Thermal generation,839.978
Oil imports,Oil,504.287 Oil imports,Oil,504.287
Oil reserves,Oil,107.703 Oil reserves,Oil,107.703
Oil,Liquid,611.99 Oil,Liquid,611.99
Other waste,Solid,56.587 Other waste,Solid,56.587
Other waste,Bio-conversion,77.81 Other waste,Bio-conversion,77.81
Pumped heat,Heating and cooling - homes,193.026 Pumped heat,Heating and cooling - homes,193.026
Pumped heat,Heating and cooling - commercial,70.672 Pumped heat,Heating and cooling - commercial,70.672
Solar PV,Electricity grid,59.901 Solar PV,Electricity grid,59.901
Solar Thermal,Heating and cooling - homes,19.263 Solar Thermal,Heating and cooling - homes,19.263
Solar,Solar Thermal,19.263 Solar,Solar Thermal,19.263
Solar,Solar PV,59.901 Solar,Solar PV,59.901
Solid,Agriculture,0.882 Solid,Agriculture,0.882
Solid,Thermal generation,400.12 Solid,Thermal generation,400.12
Solid,Industry,46.477 Solid,Industry,46.477
Thermal generation,Electricity grid,525.531 Thermal generation,Electricity grid,525.531
Thermal generation,Losses,787.129 Thermal generation,Losses,787.129
Thermal generation,District heating,79.329 Thermal generation,District heating,79.329
Tidal,Electricity grid,9.452 Tidal,Electricity grid,9.452
UK land based bioenergy,Bio-conversion,182.01 UK land based bioenergy,Bio-conversion,182.01
Wave,Electricity grid,19.013 Wave,Electricity grid,19.013
Wind,Electricity grid,289.366 Wind,Electricity grid,289.366
</pre </pre
> >

1
packages/mermaid/src/diagrams/sankey/parser/energy.csv
View File

@@ -64,5 +64,6 @@ Thermal generation,Losses,787.129
Thermal generation,District heating,79.329 Thermal generation,District heating,79.329
Tidal,Electricity grid,9.452 Tidal,Electricity grid,9.452
UK land based bioenergy,Bio-conversion,182.01 UK land based bioenergy,Bio-conversion,182.01
Wave,Electricity grid,19.013 Wave,Electricity grid,19.013
Wind,Electricity grid,289.366 Wind,Electricity grid,289.366
1 Agricultural 'waste' Bio-conversion 124.729
64 Thermal generation District heating 79.329
65 Tidal Electricity grid 9.452
66 UK land based bioenergy Bio-conversion 182.01
67 Wave Electricity grid 19.013
68 Wave Wind Electricity grid 19.013 289.366
69

4
packages/mermaid/src/diagrams/sankey/parser/sankey-arrow.spec.js
View File

@@ -1,5 +1,5 @@
import diagram from './sankey.jison'; import diagram from './sankey-arrow.jison';
import { parser } from './sankey.jison'; import { parser } from './sankey-arrow.jison';
import db from '../sankeyDB.js'; import db from '../sankeyDB.js';
// import { fail } from 'assert'; // import { fail } from 'assert';

6
packages/mermaid/src/diagrams/sankey/parser/sankey.jison
View File

@@ -62,9 +62,9 @@ opt_eof
record record
: field\[source] COMMA field\[target] COMMA field\[value] { : field\[source] COMMA field\[target] COMMA field\[value] {
const source = yy.findOrCreateNode($source); const source = yy.findOrCreateNode($source.trim());
const target = yy.findOrCreateNode($target); const target = yy.findOrCreateNode($target.trim());
const value = parseFloat($value); const value = parseFloat($value.trim());
$$ = yy.addLink(source,target,value); $$ = yy.addLink(source,target,value);
} // parse only 3 fields, this is not part of standard } // parse only 3 fields, this is not part of standard
| // allow empty record to handle empty lines, this is not part of csv standard either | // allow empty record to handle empty lines, this is not part of csv standard either