diff --git a/assets/gui/bess.svg b/assets/gui/bess.svg index dd172ee..1372f9c 100644 --- a/assets/gui/bess.svg +++ b/assets/gui/bess.svg @@ -1,43 +1,5 @@ - - - - - - - image/svg+xml - - - - - - - - - + + + + diff --git a/assets/gui/biogas_plant.svg b/assets/gui/biogas_plant.svg new file mode 100644 index 0000000..c240fbc --- /dev/null +++ b/assets/gui/biogas_plant.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/assets/gui/bus_electricity.svg b/assets/gui/bus_electricity.svg new file mode 100644 index 0000000..76e3544 --- /dev/null +++ b/assets/gui/bus_electricity.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/gui/bus_gas.svg b/assets/gui/bus_gas.svg new file mode 100644 index 0000000..75e6631 --- /dev/null +++ b/assets/gui/bus_gas.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/gui/bus_h2.svg b/assets/gui/bus_h2.svg new file mode 100644 index 0000000..6b36dfa --- /dev/null +++ b/assets/gui/bus_h2.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/gui/bus_heat.svg b/assets/gui/bus_heat.svg new file mode 100644 index 0000000..000c433 --- /dev/null +++ b/assets/gui/bus_heat.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/gui/chp.svg b/assets/gui/chp.svg new file mode 100644 index 0000000..a92429f --- /dev/null +++ b/assets/gui/chp.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/assets/gui/chp_fixed_ratio.svg b/assets/gui/chp_fixed_ratio.svg new file mode 100644 index 0000000..b56f63c --- /dev/null +++ b/assets/gui/chp_fixed_ratio.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/assets/gui/demand.svg b/assets/gui/demand.svg index 2c0b9a1..562b249 100644 --- a/assets/gui/demand.svg +++ b/assets/gui/demand.svg @@ -1,67 +1,3 @@ - - - - - - - - - - image/svg+xml - - - - - - - - + + diff --git a/assets/gui/diesel.svg b/assets/gui/diesel.svg index d3ec905..b2b7dc5 100644 --- a/assets/gui/diesel.svg +++ b/assets/gui/diesel.svg @@ -1,75 +1,13 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/gui/dso.svg b/assets/gui/dso.svg index 57ae9f0..2b7c90c 100644 --- a/assets/gui/dso.svg +++ b/assets/gui/dso.svg @@ -1,35 +1,11 @@ - - - - - - - image/svg+xml - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/assets/gui/electrolyzer.svg b/assets/gui/electrolyzer.svg index c2b3ac9..fee2653 100644 --- a/assets/gui/electrolyzer.svg +++ b/assets/gui/electrolyzer.svg @@ -1,71 +1,12 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/assets/gui/fuel_cell.svg b/assets/gui/fuel_cell.svg index f18df60..3847fb3 100644 --- a/assets/gui/fuel_cell.svg +++ b/assets/gui/fuel_cell.svg @@ -1,47 +1,6 @@ - - - - - - - image/svg+xml - - - - - - - - - - - + + + + + diff --git a/assets/gui/gas_boiler.svg b/assets/gui/gas_boiler.svg index ad2be65..492a4c0 100644 --- a/assets/gui/gas_boiler.svg +++ b/assets/gui/gas_boiler.svg @@ -1,57 +1,4 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - + + + diff --git a/assets/gui/gas_dso.svg b/assets/gui/gas_dso.svg index d3ac711..42d459c 100644 --- a/assets/gui/gas_dso.svg +++ b/assets/gui/gas_dso.svg @@ -1,85 +1,13 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/gui/geothermal_conversion.svg b/assets/gui/geothermal_conversion.svg index 267b217..349f0e0 100644 --- a/assets/gui/geothermal_conversion.svg +++ b/assets/gui/geothermal_conversion.svg @@ -1,101 +1,9 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/assets/gui/h2_demand.svg b/assets/gui/h2_demand.svg index 4bc10f9..3a0da4b 100644 --- a/assets/gui/h2_demand.svg +++ b/assets/gui/h2_demand.svg @@ -1,72 +1,11 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/assets/gui/h2_dso.svg b/assets/gui/h2_dso.svg index 16724b4..169e417 100644 --- a/assets/gui/h2_dso.svg +++ b/assets/gui/h2_dso.svg @@ -1,52 +1,6 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/assets/gui/h2ess.svg b/assets/gui/h2ess.svg index a1158af..0868786 100644 --- a/assets/gui/h2ess.svg +++ b/assets/gui/h2ess.svg @@ -1,91 +1,11 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/assets/gui/heat_demand.svg b/assets/gui/heat_demand.svg index 0b1bfa3..988e5a1 100644 --- a/assets/gui/heat_demand.svg +++ b/assets/gui/heat_demand.svg @@ -1,52 +1,6 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - + + + + + diff --git a/assets/gui/heat_dso.svg b/assets/gui/heat_dso.svg index 8b55607..3a2e520 100644 --- a/assets/gui/heat_dso.svg +++ b/assets/gui/heat_dso.svg @@ -1,47 +1,6 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - + + + + + + \ No newline at end of file diff --git a/assets/gui/heat_pump.svg b/assets/gui/heat_pump.svg index 31c8220..61b9cf9 100644 --- a/assets/gui/heat_pump.svg +++ b/assets/gui/heat_pump.svg @@ -1,60 +1,10 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/assets/gui/hess.svg b/assets/gui/hess.svg index 439593d..d68d848 100644 --- a/assets/gui/hess.svg +++ b/assets/gui/hess.svg @@ -1,94 +1,14 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/assets/gui/port-electricity.svg b/assets/gui/port-electricity.svg new file mode 100644 index 0000000..dcaa2b6 --- /dev/null +++ b/assets/gui/port-electricity.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/assets/gui/port-empty.svg b/assets/gui/port-empty.svg new file mode 100644 index 0000000..2651d9e --- /dev/null +++ b/assets/gui/port-empty.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/assets/gui/port-fuel.svg b/assets/gui/port-fuel.svg new file mode 100644 index 0000000..26451ef --- /dev/null +++ b/assets/gui/port-fuel.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/assets/gui/port-h2.svg b/assets/gui/port-h2.svg new file mode 100644 index 0000000..1123db0 --- /dev/null +++ b/assets/gui/port-h2.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/assets/gui/port-heat.svg b/assets/gui/port-heat.svg new file mode 100644 index 0000000..a8ad2db --- /dev/null +++ b/assets/gui/port-heat.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/gui/production_biogas.svg b/assets/gui/production_biogas.svg deleted file mode 100644 index 8a358ee..0000000 --- a/assets/gui/production_biogas.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/assets/gui/pv_plant.svg b/assets/gui/pv_plant.svg index 74af44b..69e0961 100644 --- a/assets/gui/pv_plant.svg +++ b/assets/gui/pv_plant.svg @@ -1,59 +1,3 @@ - - - - - - - - image/svg+xml - - - - - - - - + + diff --git a/assets/gui/solar_inverter.svg b/assets/gui/solar_inverter.svg index 0707d52..eb87f48 100644 --- a/assets/gui/solar_inverter.svg +++ b/assets/gui/solar_inverter.svg @@ -1,35 +1,3 @@ - - - - - - - image/svg+xml - - - - - - - - + + diff --git a/assets/gui/solar_thermal_plant.svg b/assets/gui/solar_thermal_plant.svg index cf134f0..dd0b47b 100644 --- a/assets/gui/solar_thermal_plant.svg +++ b/assets/gui/solar_thermal_plant.svg @@ -1,98 +1,17 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/gui/storage_charge_controller_in.svg b/assets/gui/storage_charge_controller_in.svg index 064dd6d..49963c6 100644 --- a/assets/gui/storage_charge_controller_in.svg +++ b/assets/gui/storage_charge_controller_in.svg @@ -1,60 +1,3 @@ - - - - - - - - image/svg+xml - - - - - - - - + + diff --git a/assets/gui/storage_charge_controller_out.svg b/assets/gui/storage_charge_controller_out.svg index ca02ed5..52411f4 100644 --- a/assets/gui/storage_charge_controller_out.svg +++ b/assets/gui/storage_charge_controller_out.svg @@ -1,35 +1,3 @@ - - - - - - - image/svg+xml - - - - - - - - + + diff --git a/assets/gui/transformer_station_in.svg b/assets/gui/transformer_station_in.svg index ae25e66..d5e6505 100644 --- a/assets/gui/transformer_station_in.svg +++ b/assets/gui/transformer_station_in.svg @@ -1,72 +1,5 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - + + + + diff --git a/assets/gui/transformer_station_out.svg b/assets/gui/transformer_station_out.svg index bd8820d..33c97b6 100644 --- a/assets/gui/transformer_station_out.svg +++ b/assets/gui/transformer_station_out.svg @@ -1,40 +1,3 @@ - - - - - - - image/svg+xml - - - - - - - - - - + + diff --git a/assets/gui/wind_plant.svg b/assets/gui/wind_plant.svg index 9025988..aa21107 100644 --- a/assets/gui/wind_plant.svg +++ b/assets/gui/wind_plant.svg @@ -1,35 +1,13 @@ - - - - - - - image/svg+xml - - - - - - - - + + + + + + + + + + + + diff --git a/pages/scenario-creation-2.html b/pages/scenario-creation-2.html index a4a9036..07f4eea 100644 --- a/pages/scenario-creation-2.html +++ b/pages/scenario-creation-2.html @@ -10,6 +10,7 @@ + @@ -215,9 +216,30 @@

Energy components

Providers

-
- Electric grid icon - System DSO +
+ + Electricity DSO + + Drag element + +
+
+ + Gas DSO + + Drag element + +
+
+ + H2 DSO + + Drag element + +
+
+ + Heat DSO Drag element @@ -227,16 +249,37 @@

Providers

Production

-
- PV plant icon - PV plant +
+ + PV Plant Drag element
-
- Wind turbine icon - Wind plant +
+ + Wind Plant + + Drag element + +
+
+ + Biogas Plant + + Drag element + +
+
+ + Geothermal Conversion + + Drag element + +
+
+ + Solar Thermal Plant Drag element @@ -246,37 +289,79 @@

Production

Conversion

-
- Transformer station (in) icon - Transformer station (in) +
+ + Transformer Station (in) + + Drag element + +
+
+ + Transformer Station (out) + + Drag element + +
+
+ + Storage Charge Controller (in) + + Drag element + +
+
+ + Storage Charge Controller (out) + + Drag element + +
+
+ + Solar Inverter + + Drag element + +
+
+ + Diesel Generator Drag element
-
- Transformer station (out) icon - Transformer station (out) +
+ + Fuel Cell Drag element
-
- Storage charge controller (in) icon - Storage charge controller (in) +
+ + Gas Boiler Drag element
-
- Storage charge controller (out) icon - Storage charge controller (out) +
+ + Heat Pump Drag element
-
- Solar inverter icon - Solar inverter +
+ + Combined Heat and Power + + Drag element + +
+
+ + CHP Fixed Ratio Drag element @@ -286,9 +371,23 @@

Conversion

Storage

-
- Battery icon - Storage +
+ + Electricity Storage + + Drag element + +
+
+ + H2 Storage + + Drag element + +
+
+ + Heat Storage Drag element @@ -296,11 +395,25 @@

Storage

-

Consumption

+

Demand

+
+
+ + Electricity Demand + + Drag element + +
+
+ + H2 Demand + + Drag element +
-
- House with electricity and person icon - Demand +
+ + Heat Demand Drag element @@ -310,9 +423,30 @@

Consumption

Bus

-
- Bus icon - Bus +
+ + Electricity Bus + + Drag element + +
+
+ + Heat Bus + + Drag element + +
+
+ + Fuel Bus + + Drag element + +
+
+ + H2 Bus Drag element @@ -320,7 +454,7 @@

Bus

-
+