Skip to content

Custom EA loading into map feature #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AteZenmo merged 38 commits into from
Jul 10, 2026
Merged

Custom EA loading into map feature #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
dad0790
Add forced map click overlay + add custom EA buttons to tabElectricity
BasDekker-Zenmo May 5, 2026
6701173
Merge branch 'main' into Custom_EA_Load_In_Map_Feature
BasDekker-Zenmo May 6, 2026
606b934
Added settings for custom added solarfarms + windfarms
BasDekker-Zenmo May 8, 2026
bb664dc
Added settings for custom added GCGridBattery
BasDekker-Zenmo May 11, 2026
2380ddf
just xml updates
BasDekker-Zenmo May 11, 2026
35c13cb
Updates
BasDekker-Zenmo May 17, 2026
ed0b34d
Merge branch 'main' into Custom_EA_Load_In_Map_Feature
BasDekker-Zenmo Jun 15, 2026
c46060c
Small updates
BasDekker-Zenmo Jun 15, 2026
96ed318
Merge branch 'main' into Custom_EA_Load_In_Map_Feature
BasDekker-Zenmo Jun 16, 2026
f3d1e22
Next feedback implementation round
BasDekker-Zenmo Jun 18, 2026
55f0b23
Slider + text rounding bug fixes
BasDekker-Zenmo Jun 18, 2026
8182d54
Contracted power only visible after activating curtailment
BasDekker-Zenmo Jun 19, 2026
4e23f70
Clean up
BasDekker-Zenmo Jun 19, 2026
50458ed
Filter + ehub appearance fixes
BasDekker-Zenmo Jun 19, 2026
8ad12d3
Updated locations on canvas
BasDekker-Zenmo Jun 19, 2026
83c2035
forcedClickScreen updates
BasDekker-Zenmo Jun 22, 2026
c50dc9c
Updated forcedClickScreen functions for filter (in combination with e…
BasDekker-Zenmo Jun 22, 2026
5a25fb1
Visual bugfixing + small cleanup
BasDekker-Zenmo Jun 23, 2026
75ce388
Check for self-intersection custom drawn polygon
BasDekker-Zenmo Jun 23, 2026
57a7d96
Removed find sliderGC owner function -> findFirst
BasDekker-Zenmo Jun 24, 2026
0885564
Small typo
BasDekker-Zenmo Jun 24, 2026
69ea6c3
forgotten ForcedClickScreen turnoff when removing customGC
BasDekker-Zenmo Jun 24, 2026
cc187cb
Merge branch 'main' into Custom_EA_Load_In_Map_Feature
BasDekker-Zenmo Jul 2, 2026
f2c6e95
small updates
BasDekker-Zenmo Jul 2, 2026
bb67d78
Small updates + fixes
BasDekker-Zenmo Jul 2, 2026
dc29b86
Deleted unnecessary f_calculateGISObjectArea
BasDekker-Zenmo Jul 2, 2026
9a02c1c
adjusted range + step sizes
BasDekker-Zenmo Jul 2, 2026
27dd14f
range fix
BasDekker-Zenmo Jul 2, 2026
26052e5
Cleanup
BasDekker-Zenmo Jul 3, 2026
f13b28a
Moving feature from zero_interface to tabElectricity
BasDekker-Zenmo Jul 3, 2026
87bd58c
Last tab fixes
BasDekker-Zenmo Jul 6, 2026
17a5be0
Updated PVOrientation dropdown + improved page navigation
BasDekker-Zenmo Jul 6, 2026
bbc02cd
Binary floating point fixes + grid battery slider unit change
BasDekker-Zenmo Jul 8, 2026
a03b2bc
Added avgc_data parameters + last fixes
BasDekker-Zenmo Jul 9, 2026
901546f
Error not needed for setting range
BasDekker-Zenmo Jul 9, 2026
6e2684d
Added f_clearSelectionAndSelectEnergyModel to f_removeCustomGC
BasDekker-Zenmo Jul 9, 2026
86ae03a
final tweaks and fixes for custom EA loadin functionality
AteZenmo Jul 10, 2026
dc5552a
Merge branch 'main' into Custom_EA_Load_In_Map_Feature
AteZenmo Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions _alp/Agents/AVGC_data/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@
dataAVGC.p_avgCompanyGasConsumption_m3pm2 = p_avgCompanyGasConsumption_m3pm2;
dataAVGC.p_avgCompanyHeatConsumption_kWhpm2 = p_avgCompanyHeatConsumption_kWhpm2;

//Gridnodes/cables
dataAVGC.p_maxNominalPowerLVCable_kW = p_maxNominalPowerLVCable_kW;
dataAVGC.p_maxNominalPowerMVCable_kW = p_maxNominalPowerMVCable_kW;
dataAVGC.p_minCapacityMVLVStation_kW = p_minCapacityMVLVStation_kW;
dataAVGC.p_maxCapacityMVLVStation_kW = p_maxCapacityMVLVStation_kW;
dataAVGC.p_maxCapacityMVMVStation_kW = p_maxCapacityMVMVStation_kW;

//Vehicles
dataAVGC.p_avgEVMaxChargePowerCar_kW = p_avgEVMaxChargePowerCar_kW;
dataAVGC.p_avgEVMaxChargePowerVan_kW = p_avgEVMaxChargePowerVan_kW;
Expand Down Expand Up @@ -110,6 +117,9 @@
dataAVGC.p_avgSolarFieldPower_kWppha = p_avgSolarFieldPower_kWppha;
dataAVGC.p_defaultPVOrientation = p_defaultPVOrientation;

dataAVGC.p_largestWindTurbine_land_MW = p_largestWindTurbine_land_MW;
dataAVGC.p_largestWindTurbine_sea_MW = p_largestWindTurbine_sea_MW;

//Thermal model parameters
dataAVGC.p_PBL_HeatingLossFactor_fr = p_PBL_HeatingLossFactor_fr;
dataAVGC.map_insulationLabel_lossfactorPerFloorSurface_WpKm2 = map_insulationLabel_lossfactorPerFloorSurface_WpKm2;
Expand Down
56 changes: 53 additions & 3 deletions _alp/Agents/AVGC_data/Levels/Level.level.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
<Id>1726584205560</Id>
<Name><![CDATA[txt_avgPV]]></Name>
<X>510</X>
<Y>825</Y>
<Y>815</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand All @@ -336,7 +336,7 @@
<Id>1726584205562</Id>
<Name><![CDATA[txt_avgBat]]></Name>
<X>510</X>
<Y>960</Y>
<Y>1010</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand Down Expand Up @@ -689,7 +689,7 @@
<Id>1768315329120</Id>
<Name><![CDATA[txt_thermalModelParameters]]></Name>
<X>510</X>
<Y>1030</Y>
<Y>1080</Y>
<Label>
<X>0</X>
<Y>-10</Y>
Expand Down Expand Up @@ -786,4 +786,54 @@
</Font>
<Alignment>LEFT</Alignment>
</Text>
<Text>
<Id>1783672835019</Id>
<Name><![CDATA[txt_avgWind]]></Name>
<X>510</X>
<Y>940</Y>
<Label>
<X>0</X>
<Y>-10</Y>
</Label>
<PublicFlag>true</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>false</ShowLabel>
<DrawMode>SHAPE_DRAW_2D</DrawMode>
<EmbeddedIcon>false</EmbeddedIcon>
<Z>0</Z>
<Rotation>0.0</Rotation>
<Color>-16777216</Color>
<Text><![CDATA[Wind turbines]]></Text>
<Font>
<Name><![CDATA[SansSerif]]></Name>
<Size>12</Size>
<Style>0</Style>
</Font>
<Alignment>LEFT</Alignment>
</Text>
<Text>
<Id>1783673719376</Id>
<Name><![CDATA[txt_avgGridNodes]]></Name>
<X>40</X>
<Y>680</Y>
<Label>
<X>0</X>
<Y>-10</Y>
</Label>
<PublicFlag>false</PublicFlag>
<PresentationFlag>true</PresentationFlag>
<ShowLabel>false</ShowLabel>
<DrawMode>SHAPE_DRAW_2D</DrawMode>
<EmbeddedIcon>false</EmbeddedIcon>
<Z>0</Z>
<Rotation>0.0</Rotation>
<Color>-16777216</Color>
<Text><![CDATA[Average values for GridNodes/Cables]]></Text>
<Font>
<Name><![CDATA[SansSerif]]></Name>
<Size>12</Size>
<Style>0</Style>
</Font>
<Alignment>LEFT</Alignment>
</Text>
</Presentation>
Loading