Skip to content
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

[energidataservice] Add discount tariffs for Aal Elnet, Dinel, Sunds Net and Tarm Elværk Net #15737

Merged
merged 1 commit into from
Oct 12, 2023
Merged

[energidataservice] Add discount tariffs for Aal Elnet, Dinel, Sunds Net and Tarm Elværk Net #15737

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions ...n/java/org/openhab/binding/energidataservice/internal/api/DatahubTariffFilterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,13 @@ public class DatahubTariffFilterFactory {
public static DatahubTariffFilter getNetTariffByGLN(String globalLocationNumber) {
switch (globalLocationNumber) {
case GLN_AAL_ELNET:
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("AAL-NT-05")), Set.of(NOTE_NET_TARIFF_C_HOUR),
DateQueryParameter.of(DateQueryParameterType.START_OF_DAY));
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("AAL-NT-05"), ChargeTypeCode.of("AAL-NTR05")),
Set.of(NOTE_NET_TARIFF_C_HOUR), DateQueryParameter.of(DateQueryParameterType.START_OF_DAY));
case GLN_CERIUS:
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("30TR_C_ET")), Set.of(NOTE_NET_TARIFF_C_HOUR));
case GLN_DINEL:
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("TCL>100_02")), Set.of(NOTE_NET_TARIFF_C_HOUR));
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("TCL>100_02"), ChargeTypeCode.of("TCL<100_52")),
Set.of(NOTE_NET_TARIFF_C_HOUR));
case GLN_ELEKTRUS:
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("6000091")), Set.of(NOTE_NET_TARIFF_C_HOUR),
DateQueryParameter.of(DateQueryParameterType.START_OF_DAY));
Expand All @@ -99,7 +100,7 @@ public static DatahubTariffFilter getNetTariffByGLN(String globalLocationNumber)
case GLN_HURUP_ELVAERK_NET:
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("HEV-NT-01")), Set.of(NOTE_NET_TARIFF));
case GLN_IKAST_E1_NET:
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("IEV-NT-01"), ChargeTypeCode.of("IEV-NT-11")),
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("IEV-NT-11")),
Set.of(NOTE_NET_TARIFF_C_HOUR, "Transport - Overordnet net"));
case GLN_KONSTANT:
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("151-NT01T"), ChargeTypeCode.of("151-NRA04T")),
Expand Down Expand Up @@ -133,11 +134,12 @@ public static DatahubTariffFilter getNetTariffByGLN(String globalLocationNumber)
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("NT-C")), Set.of(NOTE_NET_TARIFF_C_HOUR),
DateQueryParameter.of(DateQueryParameterType.START_OF_DAY));
case GLN_SUNDS_NET:
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("SEF-NT-05")),
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("SEF-NT-05"), ChargeTypeCode.of("SEF-NT-05R")),
Set.of(NOTE_NET_TARIFF_C_FLEX_HOUR),
DateQueryParameter.of(DateQueryParameterType.START_OF_DAY));
case GLN_TARM_ELVAERK_NET:
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("TEV-NT-01")), Set.of(NOTE_NET_TARIFF_C));
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("TEV-NT-01"), ChargeTypeCode.of("TEV-NT-01R")),
Set.of(NOTE_NET_TARIFF_C));
case GLN_TREFOR_EL_NET:
return new DatahubTariffFilter(Set.of(ChargeTypeCode.of("C")), Set.of(NOTE_NET_TARIFF_C_HOUR),
DateQueryParameter.of(DateQueryParameterType.START_OF_DAY));
Expand Down