epb_view_models 1.0.2 → 1.0.6

data/lib/presenter/rd_sap/report.rb

@@ -12,8 +12,206 @@ module Presenter
           .merge(report_from_additional_data)
       end
 
+      def to_hash_ni
+        report_from_ni_assessment_xml
+      end
+
     private
 
+      def report_from_ni_assessment_xml
+        {
+          address1: @view_model.address_line1,
+          address2: @view_model.address_line2,
+          address3: @view_model.address_line3,
+          built_form:
+            Helper::XmlEnumsToOutput.built_form_string(@view_model.built_form),
+          co2_emiss_curr_per_floor_area:
+            @view_model.co2_emissions_current_per_floor_area,
+          co2_emissions_current: @view_model.current_carbon_emission,
+          co2_emissions_potential: @view_model.potential_carbon_emission,
+          construction_age_band:
+            Helper::XmlEnumsToOutput.construction_age_band_lookup(
+              @view_model.property_age_band,
+              @schema_type,
+              @view_model.report_type,
+            ),
+          current_energy_efficiency: @view_model.current_energy_rating.to_s.chomp,
+          current_energy_rating:
+            Helper::EnergyBandCalculator.domestic(
+              @view_model.current_energy_rating,
+            ),
+          cylinder_insul_thickness: @view_model.cylinder_insul_thickness,
+          cylinder_insulation_type: @view_model.cylinder_insulation_type,
+          cylinder_size: @view_model.cylinder_size,
+          has_cylinder_thermostat: @view_model.has_cylinder_thermostat == "Y" ? "true" : "false",
+          energy_consumption_current: @view_model.primary_energy_use,
+          energy_consumption_potential: @view_model.energy_consumption_potential,
+          energy_tariff:
+            Helper::XmlEnumsToOutput.energy_tariff(
+              @view_model.meter_type,
+              @view_model.report_type,
+            ),
+          environment_impact_current: @view_model.environmental_impact_current,
+          environment_impact_potential:
+            @view_model.environmental_impact_potential,
+          extension_count: @view_model.extensions_count,
+          fixed_lighting_outlets_count: @view_model.fixed_lighting_outlets_count,
+          flat_top_storey: @view_model.top_storey,
+          flat_storey_count: @view_model.storey_count,
+          floor_description: @view_model.all_floor_descriptions.first,
+          floor_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_floor_energy_efficiency_rating.first,
+            ),
+          floor_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_floor_env_energy_efficiency_rating.first,
+            ),
+          floor_height: @view_model.floor_height.first,
+          floor_level: @view_model.floor_level,
+          glazed_area:
+            Helper::XmlEnumsToOutput.glazed_area_rdsap(@view_model.glazed_area),
+          glazed_type:
+            Helper::XmlEnumsToOutput.glazed_type_rdsap(
+              @view_model.multi_glazing_type,
+            ),
+          heat_loss_corridor:
+            Helper::XmlEnumsToOutput.heat_loss_corridor(
+              @view_model.heat_loss_corridor,
+            ),
+          heating_cost_current: @view_model.heating_cost_current,
+          heating_cost_potential: @view_model.heating_cost_potential,
+          hot_water_cost_current: @view_model.hot_water_cost_current,
+          hot_water_cost_potential: @view_model.hot_water_cost_potential,
+          hot_water_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.hot_water_energy_efficiency_rating,
+            ),
+          hot_water_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.hot_water_environmental_efficiency_rating,
+            ),
+          hotwater_description: @view_model.hot_water_description,
+          inspection_date: @view_model.date_of_assessment,
+          lighting_cost_current: @view_model.lighting_cost_current,
+          lighting_cost_potential: @view_model.lighting_cost_potential,
+          lighting_description: @view_model.lighting_description,
+          lighting_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.lighting_energy_efficiency_rating,
+            ),
+          lighting_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(@view_model.lighting_environmental_efficiency_rating),
+          low_energy_lighting: @view_model.low_energy_lighting,
+          low_energy_fixed_lighting_count:
+            @view_model.low_energy_fixed_lighting_outlets_count,
+          main_fuel: Helper::XmlEnumsToOutput.fuel_type(@view_model.main_fuel_type,
+                                                        @schema_type,
+                                                        @view_model.report_type),
+          mainheat_description:
+            @view_model.all_main_heating_descriptions.join(", "),
+          mainheat_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_main_heating_energy_efficiency.first,
+            ),
+          mainheat_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_main_heating_environmental_efficiency.first,
+            ),
+          mainheatc_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_main_heating_controls_energy_efficiency.first,
+            ),
+          mainheatc_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_main_heating_controls_environmental_efficiency.first,
+            ),
+          mainheatcont_description:
+            @view_model.all_main_heating_controls_descriptions.first,
+          mains_gas_flag: @view_model.mains_gas,
+          mechanical_ventilation:
+            Helper::XmlEnumsToOutput.mechanical_ventilation(
+              @view_model.mechanical_ventilation,
+              @schema_type,
+              @view_model.report_type,
+            ),
+          mech_vent_sys_index_number: nil,
+          mechanical_vent_data_source: nil,
+          multi_glaze_proportion: @view_model.multiple_glazed_proportion,
+          number_habitable_rooms: @view_model.habitable_room_count,
+          number_heated_rooms: @view_model.heated_room_count,
+          number_open_fireplaces: @view_model.open_fireplaces_count,
+          photo_supply: @view_model.photovoltaic_roof_area_percent,
+          posttown: @view_model.town,
+          postcode: @view_model.postcode,
+          potential_energy_efficiency:
+            @view_model.potential_energy_rating.to_s.chomp,
+          potential_energy_rating:
+            Helper::EnergyBandCalculator.domestic(
+              @view_model.potential_energy_rating,
+            ),
+          property_type:
+            Helper::XmlEnumsToOutput.property_type(@view_model.property_type),
+          report_type: @view_model.report_type,
+          roof_description: @view_model.all_roof_descriptions.first,
+          roof_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_roof_energy_efficiency_rating.first,
+            ),
+          roof_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_roof_env_energy_efficiency_rating.first,
+            ),
+          secondheat_description: @view_model.secondary_heating_description,
+          sheating_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.secondary_heating_energy_efficiency_rating,
+            ),
+          sheating_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.secondary_heating_environmental_efficiency_rating,
+            ),
+          solar_water_heating_flag: @view_model.solar_water_heating_flag,
+          tenure: Helper::XmlEnumsToOutput.tenure(@view_model.tenure),
+          thermal_store: nil,
+          total_floor_area: @view_model.total_floor_area,
+          transaction_type:
+            Helper::XmlEnumsToOutput.transaction_type(
+              @view_model.transaction_type,
+              @view_model.report_type,
+              @schema_type,
+            ),
+          unheated_corridor_length: @view_model.unheated_corridor_length,
+          ventilation_type: nil,
+          walls_description: @view_model.all_wall_descriptions.first,
+          walls_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_wall_energy_efficiency_rating.first,
+            ),
+          walls_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_wall_env_energy_efficiency_rating.first,
+            ),
+          water_heating_code: @view_model.water_heating_code,
+          water_heating_fuel: Helper::XmlEnumsToOutput.fuel_type(
+            @view_model.water_heating_fuel,
+            @schema_type,
+            @view_model.report_type,
+          ),
+          wind_turbine_count: @view_model.wind_turbine_count,
+          windows_description: @view_model.window_description,
+          windows_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.window_energy_efficiency_rating,
+            ),
+          windows_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.window_environmental_efficiency_rating,
+            ),
+
+        }
+      end
+
       def report_from_assessment_xml
         {
           assessment_id: Helper::RrnHelper.hash_rrn(@view_model.assessment_id),
@@ -28,6 +226,7 @@ module Presenter
             Helper::XmlEnumsToOutput.construction_age_band_lookup(
               @view_model.main_dwelling_construction_age_band_or_year,
               @schema_type,
+              @view_model.report_type,
             ),
           current_energy_rating:
             Helper::EnergyBandCalculator.domestic(
@@ -120,7 +319,7 @@ module Presenter
             ),
           photo_supply: @view_model.photovoltaic_roof_area_percent,
           built_form:
-            Helper::XmlEnumsToOutput.xml_value_to_string(@view_model.built_form),
+            Helper::XmlEnumsToOutput.built_form_string(@view_model.built_form),
           mainheat_description:
             @view_model.all_main_heating_descriptions.join(", "),
           mainheat_energy_eff:
@@ -154,17 +353,23 @@ module Presenter
               @view_model.all_wall_env_energy_efficiency_rating.first,
             ),
           energy_tariff:
-            Helper::XmlEnumsToOutput.energy_tariff(@view_model.meter_type),
+            Helper::XmlEnumsToOutput.energy_tariff(
+              @view_model.meter_type,
+              @view_model.report_type,
+            ),
           floor_level: @view_model.floor_level,
           solar_water_heating_flag: @view_model.solar_water_heating_flag,
           mechanical_ventilation:
             Helper::XmlEnumsToOutput.mechanical_ventilation(
               @view_model.mechanical_ventilation,
               @schema_type,
+              @view_model.report_type,
             ),
           floor_height: @view_model.floor_height.first,
           main_fuel:
-            Helper::XmlEnumsToOutput.main_fuel_rdsap(@view_model.main_fuel_type),
+            Helper::XmlEnumsToOutput.fuel_type(@view_model.main_fuel_type,
+                                               @schema_type,
+                                               @view_model.report_type),
           floor_description: @view_model.all_floor_descriptions.first,
           floor_energy_eff:
             Helper::XmlEnumsToOutput.energy_rating_string(

data/lib/presenter/sap/report.rb

@@ -12,8 +12,212 @@ module Presenter
           .merge(report_from_additional_data)
       end
 
+      def to_hash_ni
+        report_from_ni_assessment_xml
+      end
+
     private
 
+      def report_from_ni_assessment_xml
+        {
+          address1: @view_model.address_line1,
+          address2: @view_model.address_line2,
+          address3: @view_model.address_line3,
+          built_form:
+            Helper::XmlEnumsToOutput.built_form_string(@view_model.built_form),
+          co2_emiss_curr_per_floor_area:
+            @view_model.co2_emissions_current_per_floor_area,
+          co2_emissions_current: @view_model.current_carbon_emission,
+          co2_emissions_potential: @view_model.potential_carbon_emission,
+          construction_age_band:
+            Helper::XmlEnumsToOutput.construction_age_band_lookup(
+              @view_model.main_dwelling_construction_age_band_or_year,
+              @schema_type,
+              @view_model.report_type,
+            ),
+          current_energy_efficiency: @view_model.current_energy_rating.to_s.chomp,
+          current_energy_rating:
+            Helper::EnergyBandCalculator.domestic(
+              @view_model.current_energy_rating,
+            ),
+          cylinder_insul_thickness: @view_model.cylinder_insul_thickness,
+          cylinder_insulation_type: @view_model.cylinder_insulation_type,
+          cylinder_size: @view_model.cylinder_size,
+          has_cylinder_thermostat: @view_model.has_cylinder_thermostat,
+          energy_consumption_current: @view_model.primary_energy_use,
+          energy_consumption_potential: @view_model.energy_consumption_potential,
+          energy_tariff:
+            Helper::XmlEnumsToOutput.energy_tariff(
+              @view_model.energy_tariff,
+              @view_model.report_type,
+            ),
+          environment_impact_current: @view_model.environmental_impact_current,
+          environment_impact_potential:
+            @view_model.environmental_impact_potential,
+          extension_count: @view_model.extensions_count,
+          fixed_lighting_outlets_count: @view_model.fixed_lighting_outlets_count,
+          flat_storey_count: @view_model.storey_count,
+          flat_top_storey: @view_model.top_storey,
+          floor_description: @view_model.all_floor_descriptions.first,
+          floor_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_floor_energy_efficiency_rating.first,
+            ),
+          floor_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_floor_env_energy_efficiency_rating.first,
+            ),
+          floor_height:
+            if @view_model.respond_to?(:floor_height)
+              @view_model.floor_height.first
+            end,
+          floor_level: @view_model.floor_level,
+          glazed_area:
+            Helper::XmlEnumsToOutput.glazed_area_rdsap(@view_model.glazed_area),
+          glazed_type:
+            Helper::XmlEnumsToOutput.glazed_type_rdsap(
+              @view_model.multi_glazing_type,
+            ),
+          heat_loss_corridor:
+            Helper::XmlEnumsToOutput.heat_loss_corridor(
+              @view_model.heat_loss_corridor,
+            ),
+          heating_cost_current: @view_model.heating_cost_current,
+          heating_cost_potential: @view_model.heating_cost_potential,
+          hot_water_cost_current: @view_model.hot_water_cost_current,
+          hot_water_cost_potential: @view_model.hot_water_cost_potential,
+          hot_water_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.hot_water_energy_efficiency_rating,
+            ),
+          hot_water_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.hot_water_environmental_efficiency_rating,
+            ),
+          hotwater_description: @view_model.hot_water_description,
+          inspection_date: @view_model.date_of_assessment,
+          lighting_cost_current: @view_model.lighting_cost_current,
+          lighting_cost_potential: @view_model.lighting_cost_potential,
+          lighting_description: @view_model.lighting_description,
+          lighting_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.lighting_energy_efficiency_rating,
+            ),
+          lighting_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.lighting_environmental_efficiency_rating,
+            ),
+          low_energy_lighting: @view_model.low_energy_lighting,
+          low_energy_fixed_lighting_count:
+            @view_model.low_energy_fixed_lighting_outlets_count,
+          main_fuel:
+            Helper::XmlEnumsToOutput.fuel_type(@view_model.main_fuel_type,
+                                               @schema_type,
+                                               @view_model.report_type),
+          mainheat_description:
+            @view_model.all_main_heating_descriptions.join(", "),
+          mainheat_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_main_heating_energy_efficiency.first,
+            ),
+          mainheat_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_main_heating_environmental_efficiency.first,
+            ),
+          mainheatc_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_main_heating_controls_energy_efficiency.first,
+            ),
+          mainheatc_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_main_heating_controls_environmental_efficiency.first,
+            ),
+          mainheatcont_description:
+            @view_model.all_main_heating_controls_descriptions.first,
+          mains_gas_flag:
+            @view_model.respond_to?(:mains_gas) ? @view_model.mains_gas : nil,
+          mechanical_ventilation:
+            Helper::XmlEnumsToOutput.mechanical_ventilation(
+              @view_model.mechanical_ventilation,
+              @schema_type,
+              @view_model.report_type,
+            ),
+          mech_vent_sys_index_number: @view_model.mech_vent_sys_index_number,
+          mechanical_vent_data_source: @view_model.mechanical_vent_data_source,
+          multi_glaze_proportion: @view_model.multiple_glazed_proportion,
+          number_habitable_rooms: @view_model.habitable_room_count,
+          number_heated_rooms: @view_model.heated_room_count,
+          number_open_fireplaces: @view_model.open_fireplaces_count,
+          photo_supply: @view_model.photovoltaic_roof_area_percent,
+          postcode: @view_model.postcode,
+          posttown: @view_model.town,
+          potential_energy_efficiency:
+            @view_model.potential_energy_rating.to_s.chomp,
+          potential_energy_rating:
+            Helper::EnergyBandCalculator.domestic(
+              @view_model.potential_energy_rating,
+            ),
+          property_type:
+            Helper::XmlEnumsToOutput.property_type(@view_model.property_type),
+          report_type: @view_model.report_type,
+          roof_description: @view_model.all_roof_descriptions.first,
+          roof_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_roof_energy_efficiency_rating.first,
+            ),
+          roof_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_roof_env_energy_efficiency_rating.first,
+            ),
+          secondheat_description: @view_model.secondary_heating_description,
+          sheating_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.secondary_heating_energy_efficiency_rating,
+            ),
+          sheating_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.secondary_heating_environmental_efficiency_rating,
+            ),
+          solar_water_heating_flag: @view_model.solar_water_heating_flag,
+          thermal_store: @view_model.thermal_store,
+          tenure: Helper::XmlEnumsToOutput.tenure(@view_model.tenure),
+          total_floor_area: @view_model.total_floor_area,
+          transaction_type:
+            Helper::XmlEnumsToOutput.transaction_type(
+              @view_model.transaction_type,
+              @view_model.report_type,
+              @schema_type,
+            ),
+          ventilation_type: Helper::XmlEnumsToOutput.ventilation_type(@view_model.ventilation_type, @schema_type),
+          unheated_corridor_length: @view_model.unheated_corridor_length,
+          water_heating_code: @view_model.water_heating_code,
+          walls_description: @view_model.all_wall_descriptions.first,
+          walls_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_wall_energy_efficiency_rating.first,
+            ),
+          walls_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.all_wall_env_energy_efficiency_rating.first,
+            ),
+          water_heating_fuel: Helper::XmlEnumsToOutput.fuel_type(
+            @view_model.water_heating_fuel,
+            @schema_type,
+            @view_model.report_type,
+          ),
+          wind_turbine_count: @view_model.wind_turbine_count,
+          windows_description: @view_model.window_description,
+          windows_energy_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.window_energy_efficiency_rating,
+            ),
+          windows_env_eff:
+            Helper::XmlEnumsToOutput.energy_rating_string(
+              @view_model.window_environmental_efficiency_rating,
+            ),
+        }
+      end
+
       def report_from_assessment_xml
         {
           assessment_id: Helper::RrnHelper.hash_rrn(@view_model.assessment_id),
@@ -123,7 +327,7 @@ module Presenter
             ),
           photo_supply: @view_model.photovoltaic_roof_area_percent,
           built_form:
-            Helper::XmlEnumsToOutput.xml_value_to_string(@view_model.built_form),
+            Helper::XmlEnumsToOutput.built_form_string(@view_model.built_form),
           mainheat_description:
             @view_model.all_main_heating_descriptions.join(", "),
           report_type: @view_model.report_type,
@@ -174,7 +378,9 @@ module Presenter
               @view_model.floor_height.first
             end,
           main_fuel:
-            Helper::XmlEnumsToOutput.main_fuel_sap(@view_model.main_fuel_type),
+            Helper::XmlEnumsToOutput.fuel_type(@view_model.main_fuel_type,
+                                               @schema_type,
+                                               @view_model.report_type),
           floor_description: @view_model.all_floor_descriptions.first,
           floor_energy_eff:
             Helper::XmlEnumsToOutput.energy_rating_string(

data/lib/presenter/sap/summary.rb

@@ -150,7 +150,7 @@ module Presenter
           wind_turbine_count: @view_model.wind_turbine_count,
           unheated_corridor_length: @view_model.unheated_corridor_length,
           built_form:
-            Helper::XmlEnumsToOutput.xml_value_to_string(@view_model.built_form),
+            Helper::XmlEnumsToOutput.built_form_string(@view_model.built_form),
           mainheat_description:
             @view_model.all_main_heating_descriptions.join(", "),
           extensions_count:

data/lib/view_model/domestic_epc_view_model.rb

@@ -50,6 +50,10 @@ module ViewModel
       Time.parse(date_of_expiry) < Time.now ? "EXPIRED" : "ENTERED"
     end
 
+    def water_heating_code
+      xpath(%w[Water-Heating-Code])
+    end
+
   private
 
     def fetch_addendum_numbers

data/lib/view_model/rd_sap_schema_170/common_schema.rb

@@ -514,6 +514,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_171/common_schema.rb

@@ -514,6 +514,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_180/common_schema.rb

@@ -514,6 +514,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_190/common_schema.rb

@@ -514,6 +514,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_200/common_schema.rb

@@ -346,10 +346,6 @@ module ViewModel
         xpath(%w[Floor-Heat-Loss])
       end
 
-      def water_heating_code
-        xpath(%w[Water-Heating-Code])
-      end
-
       def immersion_heating_type
         xpath(%w[Immersion-Heating-Type])
       end
@@ -575,6 +571,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_ni_173/common_schema.rb

@@ -503,6 +503,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_ni_174/common_schema.rb

@@ -503,6 +503,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
     end
   end
 end