From aceeec7b03d47626ac3ad01475894d804afb7447 Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Fri, 28 Aug 2026 15:40:34 +0200 Subject: [PATCH 1/2] Etsource changes for new insulation charts - changed titles of 6 charts to say 'fully_detached' instead of only 'detached' to enable filtering by building type - Added 2 queries for heat demand per building (WEQ) --- .../useful_demand_buildings_future_per_building.gql | 9 +++++++++ .../useful_demand_buildings_present_per_building.gql | 9 +++++++++ ...seful_demand_fully_detached_houses_1945_1964_bar.gql} | 0 ...seful_demand_fully_detached_houses_1965_1984_bar.gql} | 0 ...seful_demand_fully_detached_houses_1985_2004_bar.gql} | 0 ...ul_demand_fully_detached_houses_2005_present_bar.gql} | 0 ...ful_demand_fully_detached_houses_before_1945_bar.gql} | 0 ...> useful_demand_fully_detached_houses_future_bar.gql} | 0 8 files changed, 18 insertions(+) create mode 100644 gqueries/general/useful_demand/buildings/buildings_future/useful_demand_buildings_future_per_building.gql create mode 100644 gqueries/general/useful_demand/buildings/buildings_present/useful_demand_buildings_present_per_building.gql rename gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/{useful_demand_detached_houses_1945_1964_bar.gql => useful_demand_fully_detached_houses_1945_1964_bar.gql} (100%) rename gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/{useful_demand_detached_houses_1965_1984_bar.gql => useful_demand_fully_detached_houses_1965_1984_bar.gql} (100%) rename gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/{useful_demand_detached_houses_1985_2004_bar.gql => useful_demand_fully_detached_houses_1985_2004_bar.gql} (100%) rename gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/{useful_demand_detached_houses_2005_present_bar.gql => useful_demand_fully_detached_houses_2005_present_bar.gql} (100%) rename gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/{useful_demand_detached_houses_before_1945_bar.gql => useful_demand_fully_detached_houses_before_1945_bar.gql} (100%) rename gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/{useful_demand_detached_houses_future_bar.gql => useful_demand_fully_detached_houses_future_bar.gql} (100%) diff --git a/gqueries/general/useful_demand/buildings/buildings_future/useful_demand_buildings_future_per_building.gql b/gqueries/general/useful_demand/buildings/buildings_future/useful_demand_buildings_future_per_building.gql new file mode 100644 index 0000000000..63be57441c --- /dev/null +++ b/gqueries/general/useful_demand/buildings/buildings_future/useful_demand_buildings_future_per_building.gql @@ -0,0 +1,9 @@ +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_buildings_future), + Q(number_of_buildings_future) + ), + MILLIONS + ) +- unit = GJ/WEQ diff --git a/gqueries/general/useful_demand/buildings/buildings_present/useful_demand_buildings_present_per_building.gql b/gqueries/general/useful_demand/buildings/buildings_present/useful_demand_buildings_present_per_building.gql new file mode 100644 index 0000000000..e209df9c97 --- /dev/null +++ b/gqueries/general/useful_demand/buildings/buildings_present/useful_demand_buildings_present_per_building.gql @@ -0,0 +1,9 @@ +- query = + PRODUCT( + DIVIDE( + Q(useful_demand_buildings_present), + Q(number_of_buildings_present) + ), + MILLIONS + ) +- unit = GJ/WEQ diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_1945_1964_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_1945_1964_bar.gql similarity index 100% rename from gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_1945_1964_bar.gql rename to gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_1945_1964_bar.gql diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_1965_1984_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_1965_1984_bar.gql similarity index 100% rename from gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_1965_1984_bar.gql rename to gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_1965_1984_bar.gql diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_1985_2004_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_1985_2004_bar.gql similarity index 100% rename from gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_1985_2004_bar.gql rename to gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_1985_2004_bar.gql diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_2005_present_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_2005_present_bar.gql similarity index 100% rename from gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_2005_present_bar.gql rename to gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_2005_present_bar.gql diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_before_1945_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_before_1945_bar.gql similarity index 100% rename from gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_before_1945_bar.gql rename to gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_before_1945_bar.gql diff --git a/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_future_bar.gql b/gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_future_bar.gql similarity index 100% rename from gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_detached_houses_future_bar.gql rename to gqueries/output_elements/output_series/vertical_stacked_bar_250_residential_heating_demand/useful_demand_fully_detached_houses_future_bar.gql From 5d65438b5eb35c8acc869393053a0fbbc735ce3a Mon Sep 17 00:00:00 2001 From: Jort Wolda Date: Fri, 28 Aug 2026 16:08:11 +0200 Subject: [PATCH 2/2] Improved indentation in queries --- .../useful_demand_buildings_future_per_building.gql | 2 +- .../useful_demand_buildings_present_per_building.gql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gqueries/general/useful_demand/buildings/buildings_future/useful_demand_buildings_future_per_building.gql b/gqueries/general/useful_demand/buildings/buildings_future/useful_demand_buildings_future_per_building.gql index 63be57441c..f6ec0972b4 100644 --- a/gqueries/general/useful_demand/buildings/buildings_future/useful_demand_buildings_future_per_building.gql +++ b/gqueries/general/useful_demand/buildings/buildings_future/useful_demand_buildings_future_per_building.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_buildings_future), Q(number_of_buildings_future) diff --git a/gqueries/general/useful_demand/buildings/buildings_present/useful_demand_buildings_present_per_building.gql b/gqueries/general/useful_demand/buildings/buildings_present/useful_demand_buildings_present_per_building.gql index e209df9c97..ae36ce7946 100644 --- a/gqueries/general/useful_demand/buildings/buildings_present/useful_demand_buildings_present_per_building.gql +++ b/gqueries/general/useful_demand/buildings/buildings_present/useful_demand_buildings_present_per_building.gql @@ -1,5 +1,5 @@ - query = - PRODUCT( + PRODUCT( DIVIDE( Q(useful_demand_buildings_present), Q(number_of_buildings_present)