epb_view_models 1.2.3 → 2.0.0

data/lib/view_model/sap_schema_1800/common_schema.rb

@@ -161,11 +161,11 @@ module ViewModel
       end
 
       def potential_energy_rating
-        xpath(%w[Energy-Rating-Potential]).to_i
+        xpath(%w[Energy-Rating-Potential])&.to_i
       end
 
       def current_energy_rating
-        xpath(%w[Energy-Rating-Current]).to_i
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def primary_energy_use
@@ -240,19 +240,19 @@ module ViewModel
 
       def impact_of_cavity_insulation
         if xpath(%w[Impact-Of-Cavity-Insulation])
-          xpath(%w[Impact-Of-Cavity-Insulation]).to_i
+          xpath(%w[Impact-Of-Cavity-Insulation])&.to_i
         end
       end
 
       def impact_of_loft_insulation
         if xpath(%w[Impact-Of-Loft-Insulation])
-          xpath(%w[Impact-Of-Loft-Insulation]).to_i
+          xpath(%w[Impact-Of-Loft-Insulation])&.to_i
         end
       end
 
       def impact_of_solid_wall_insulation
         if xpath(%w[Impact-Of-Solid-Wall-Insulation])
-          xpath(%w[Impact-Of-Solid-Wall-Insulation]).to_i
+          xpath(%w[Impact-Of-Solid-Wall-Insulation])&.to_i
         end
       end
 
@@ -275,10 +275,6 @@ module ViewModel
         flat_level_code == "3" ? "Y" : "N"
       end
 
-      def storey_count
-        nil
-      end
-
       def building_part_number
         xpath(%w[Building-Part-Number])
       end
@@ -342,21 +338,17 @@ module ViewModel
       end
 
       def environmental_impact_current
-        xpath(%w[Environmental-Impact-Current])
+        xpath(%w[Environmental-Impact-Current])&.to_i
       end
 
       def environmental_impact_potential
-        xpath(%w[Environmental-Impact-Potential])
+        xpath(%w[Environmental-Impact-Potential])&.to_i
       end
 
       def co2_emissions_current_per_floor_area
         xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
       end
 
-      def mains_gas
-        nil
-      end
-
       def main_heating_controls
         xpath(%w[Main-Heating-Controls Description])
       end
@@ -365,32 +357,20 @@ module ViewModel
         xpath(%w[Multiple-Glazed-Percentage])
       end
 
-      def glazed_area
-        nil
-      end
-
-      def habitable_room_count
-        nil
-      end
-
-      def heated_room_count
-        nil
-      end
-
       def low_energy_lighting
         xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Percentage])
       end
 
       def fixed_lighting_outlets_count
-        xpath(%w[Fixed-Lighting-Outlets-Count])
+        xpath(%w[Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def low_energy_fixed_lighting_outlets_count
-        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])
+        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def open_fireplaces_count
-        xpath(%w[Open-Fireplaces-Count])
+        xpath(%w[Open-Fireplaces-Count])&.to_i
       end
 
       def hot_water_description
@@ -441,24 +421,12 @@ module ViewModel
         xpath(%w[Lighting Environmental-Efficiency-Rating])
       end
 
-      def photovoltaic_roof_area_percent
-        nil
-      end
-
       def built_form
         xpath(%w[Built-Form])
       end
 
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
-      end
-
-      def unheated_corridor_length
-        nil
-      end
-
-      def heat_loss_corridor
-        nil
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def all_main_heating_descriptions
@@ -509,18 +477,6 @@ module ViewModel
         @xml_doc.search("Main-Heating/Energy-Efficiency-Rating").map(&:content)
       end
 
-      def extensions_count
-        nil
-      end
-
-      def solar_water_heating_flag
-        nil
-      end
-
-      def mechanical_ventilation
-        nil
-      end
-
       def floor_height
         @xml_doc.search("Storey-Height").map(&:content)
       end
@@ -576,7 +532,7 @@ module ViewModel
       end
 
       def mech_vent_sys_index_number
-        xpath(%w[Mechanical-Vent-System-Index-Number])
+        xpath(%w[Mechanical-Vent-System-Index-Number])&.to_i
       end
 
       def mechanical_vent_data_source
@@ -590,14 +546,6 @@ module ViewModel
       def ventilation_type
         xpath(%w[Ventilation-Type])
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end

data/lib/view_model/sap_schema_1900/common_schema.rb

@@ -163,11 +163,11 @@ module ViewModel
       end
 
       def potential_energy_rating
-        xpath(%w[Energy-Rating-Potential]).to_i
+        xpath(%w[Energy-Rating-Potential])&.to_i
       end
 
       def current_energy_rating
-        xpath(%w[Energy-Rating-Current]).to_i
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def primary_energy_use
@@ -181,7 +181,7 @@ module ViewModel
       def estimated_energy_cost; end
 
       def total_floor_area
-        xpath(%w[Property-Summary Total-Floor-Area]).to_i
+        xpath(%w[Property-Summary Total-Floor-Area])&.to_i
       end
 
       def total_roof_area
@@ -242,19 +242,19 @@ module ViewModel
 
       def impact_of_cavity_insulation
         if xpath(%w[Impact-Of-Cavity-Insulation])
-          xpath(%w[Impact-Of-Cavity-Insulation]).to_i
+          xpath(%w[Impact-Of-Cavity-Insulation])&.to_i
         end
       end
 
       def impact_of_loft_insulation
         if xpath(%w[Impact-Of-Loft-Insulation])
-          xpath(%w[Impact-Of-Loft-Insulation]).to_i
+          xpath(%w[Impact-Of-Loft-Insulation])&.to_i
         end
       end
 
       def impact_of_solid_wall_insulation
         if xpath(%w[Impact-Of-Solid-Wall-Insulation])
-          xpath(%w[Impact-Of-Solid-Wall-Insulation]).to_i
+          xpath(%w[Impact-Of-Solid-Wall-Insulation])&.to_i
         end
       end
 
@@ -344,21 +344,17 @@ module ViewModel
       end
 
       def environmental_impact_current
-        xpath(%w[Environmental-Impact-Current])
+        xpath(%w[Environmental-Impact-Current])&.to_i
       end
 
       def environmental_impact_potential
-        xpath(%w[Environmental-Impact-Potential])
+        xpath(%w[Environmental-Impact-Potential])&.to_i
       end
 
       def co2_emissions_current_per_floor_area
         xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
       end
 
-      def mains_gas
-        nil
-      end
-
       def main_heating_controls
         xpath(%w[Main-Heating-Controls Description])
       end
@@ -367,18 +363,6 @@ module ViewModel
         xpath(%w[Multiple-Glazed-Percentage])
       end
 
-      def glazed_area
-        nil
-      end
-
-      def habitable_room_count
-        nil
-      end
-
-      def heated_room_count
-        nil
-      end
-
       def fixed_lighting_outlets_count
         @xml_doc.search("Fixed-Lights/Fixed-Light/Lighting-Outlets").map(&:content).map(&:to_i).sum
       end
@@ -427,7 +411,7 @@ module ViewModel
       end
 
       def open_fireplaces_count
-        xpath(%w[Open-Chimneys-Count])
+        xpath(%w[Open-Chimneys-Count])&.to_i
       end
 
       def hot_water_description
@@ -478,10 +462,6 @@ module ViewModel
         xpath(%w[Lighting Environmental-Efficiency-Rating])
       end
 
-      def photovoltaic_roof_area_percent
-        nil
-      end
-
       def built_form
         xpath(%w[Built-Form])
       end
@@ -490,14 +470,6 @@ module ViewModel
         @xml_doc.search("Wind-Turbines/Wind-Turbine").map(&:content).count
       end
 
-      def unheated_corridor_length
-        nil
-      end
-
-      def heat_loss_corridor
-        nil
-      end
-
       def all_main_heating_descriptions
         @xml_doc.search("Main-Heating/Description").map(&:content)
       end
@@ -546,18 +518,6 @@ module ViewModel
         @xml_doc.search("Main-Heating/Energy-Efficiency-Rating").map(&:content)
       end
 
-      def extensions_count
-        nil
-      end
-
-      def solar_water_heating_flag
-        nil
-      end
-
-      def mechanical_ventilation
-        nil
-      end
-
       def floor_height
         @xml_doc.search("Storey-Height").map(&:content)
       end
@@ -613,7 +573,7 @@ module ViewModel
       end
 
       def mech_vent_sys_index_number
-        xpath(%w[Mechanical-Vent-System-Index-Number])
+        xpath(%w[Mechanical-Vent-System-Index-Number])&.to_i
       end
 
       def mechanical_vent_data_source

data/lib/view_model/sap_schema_1910/common_schema.rb

@@ -163,11 +163,11 @@ module ViewModel
       end
 
       def potential_energy_rating
-        xpath(%w[Energy-Rating-Potential]).to_i
+        xpath(%w[Energy-Rating-Potential])&.to_i
       end
 
       def current_energy_rating
-        xpath(%w[Energy-Rating-Current]).to_i
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def primary_energy_use
@@ -181,7 +181,7 @@ module ViewModel
       def estimated_energy_cost; end
 
       def total_floor_area
-        xpath(%w[Property-Summary Total-Floor-Area]).to_i
+        xpath(%w[Property-Summary Total-Floor-Area])&.to_i
       end
 
       def total_roof_area
@@ -242,19 +242,19 @@ module ViewModel
 
       def impact_of_cavity_insulation
         if xpath(%w[Impact-Of-Cavity-Insulation])
-          xpath(%w[Impact-Of-Cavity-Insulation]).to_i
+          xpath(%w[Impact-Of-Cavity-Insulation])&.to_i
         end
       end
 
       def impact_of_loft_insulation
         if xpath(%w[Impact-Of-Loft-Insulation])
-          xpath(%w[Impact-Of-Loft-Insulation]).to_i
+          xpath(%w[Impact-Of-Loft-Insulation])&.to_i
         end
       end
 
       def impact_of_solid_wall_insulation
         if xpath(%w[Impact-Of-Solid-Wall-Insulation])
-          xpath(%w[Impact-Of-Solid-Wall-Insulation]).to_i
+          xpath(%w[Impact-Of-Solid-Wall-Insulation])&.to_i
         end
       end
 
@@ -344,21 +344,17 @@ module ViewModel
       end
 
       def environmental_impact_current
-        xpath(%w[Environmental-Impact-Current])
+        xpath(%w[Environmental-Impact-Current])&.to_i
       end
 
       def environmental_impact_potential
-        xpath(%w[Environmental-Impact-Potential])
+        xpath(%w[Environmental-Impact-Potential])&.to_i
       end
 
       def co2_emissions_current_per_floor_area
         xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
       end
 
-      def mains_gas
-        nil
-      end
-
       def main_heating_controls
         xpath(%w[Main-Heating-Controls Description])
       end
@@ -367,18 +363,6 @@ module ViewModel
         xpath(%w[Multiple-Glazed-Percentage])
       end
 
-      def glazed_area
-        nil
-      end
-
-      def habitable_room_count
-        nil
-      end
-
-      def heated_room_count
-        nil
-      end
-
       def fixed_lighting_outlets_count
         @xml_doc.search("Fixed-Lights/Fixed-Light/Lighting-Outlets").map(&:content).map(&:to_i).sum
       end
@@ -427,7 +411,7 @@ module ViewModel
       end
 
       def open_fireplaces_count
-        xpath(%w[Open-Chimneys-Count])
+        xpath(%w[Open-Chimneys-Count])&.to_i
       end
 
       def hot_water_description
@@ -478,10 +462,6 @@ module ViewModel
         xpath(%w[Lighting Environmental-Efficiency-Rating])
       end
 
-      def photovoltaic_roof_area_percent
-        nil
-      end
-
       def built_form
         xpath(%w[Built-Form])
       end
@@ -490,14 +470,6 @@ module ViewModel
         @xml_doc.search("Wind-Turbines/Wind-Turbine").map(&:content).count
       end
 
-      def unheated_corridor_length
-        nil
-      end
-
-      def heat_loss_corridor
-        nil
-      end
-
       def all_main_heating_descriptions
         @xml_doc.search("Main-Heating/Description").map(&:content)
       end
@@ -546,18 +518,6 @@ module ViewModel
         @xml_doc.search("Main-Heating/Energy-Efficiency-Rating").map(&:content)
       end
 
-      def extensions_count
-        nil
-      end
-
-      def solar_water_heating_flag
-        nil
-      end
-
-      def mechanical_ventilation
-        nil
-      end
-
       def floor_height
         @xml_doc.search("Storey-Height").map(&:content)
       end
@@ -613,7 +573,7 @@ module ViewModel
       end
 
       def mech_vent_sys_index_number
-        xpath(%w[Mechanical-Vent-System-Index-Number])
+        xpath(%w[Mechanical-Vent-System-Index-Number])&.to_i
       end
 
       def mechanical_vent_data_source

data/lib/view_model/sap_schema_ni_112/common_schema.rb

@@ -89,10 +89,6 @@ module ViewModel
         xpath(%w[Related-Party-Disclosure])
       end
 
-      def related_party_disclosure_number
-        nil
-      end
-
       def improvements
         @xml_doc
           .search("Suggested-Improvements/Improvement")
@@ -149,11 +145,11 @@ module ViewModel
       end
 
       def potential_energy_rating
-        xpath(%w[Energy-Rating-Potential]).to_i
+        xpath(%w[Energy-Rating-Potential])&.to_i
       end
 
       def current_energy_rating
-        xpath(%w[Energy-Rating-Current]).to_i
+        xpath(%w[Energy-Rating-Current])&.to_i
       end
 
       def primary_energy_use
@@ -187,10 +183,6 @@ module ViewModel
         xpath(%w[Construction-Year])
       end
 
-      def tenure
-        nil
-      end
-
       def transaction_type
         xpath(%w[Transaction-Type])
       end
@@ -205,19 +197,19 @@ module ViewModel
 
       def impact_of_cavity_insulation
         if xpath(%w[Impact-Of-Cavity-Insulation])
-          xpath(%w[Impact-Of-Cavity-Insulation]).to_i
+          xpath(%w[Impact-Of-Cavity-Insulation])&.to_i
         end
       end
 
       def impact_of_loft_insulation
         if xpath(%w[Impact-Of-Loft-Insulation])
-          xpath(%w[Impact-Of-Loft-Insulation]).to_i
+          xpath(%w[Impact-Of-Loft-Insulation])&.to_i
         end
       end
 
       def impact_of_solid_wall_insulation
         if xpath(%w[Impact-Of-Solid-Wall-Insulation])
-          xpath(%w[Impact-Of-Solid-Wall-Insulation]).to_i
+          xpath(%w[Impact-Of-Solid-Wall-Insulation])&.to_i
         end
       end
 
@@ -234,7 +226,7 @@ module ViewModel
       end
 
       def type_of_assessment
-        case xpath(%w[Report-Type]).to_i
+        case xpath(%w[Report-Type])&.to_i
         when 1
           "HCR"
         when 2
@@ -245,21 +237,17 @@ module ViewModel
       end
 
       def environmental_impact_current
-        xpath(%w[Environmental-Impact-Current])
+        xpath(%w[Environmental-Impact-Current])&.to_i
       end
 
       def environmental_impact_potential
-        xpath(%w[Environmental-Impact-Potential])
+        xpath(%w[Environmental-Impact-Potential])&.to_i
       end
 
       def co2_emissions_current_per_floor_area
         xpath(%w[CO2-Emissions-Current-Per-Floor-Area])
       end
 
-      def mains_gas
-        nil
-      end
-
       def level
         xpath(%w[Level])
       end
@@ -269,10 +257,6 @@ module ViewModel
         flat_level_code == "3" ? "Y" : "N"
       end
 
-      def storey_count
-        nil
-      end
-
       def main_heating_controls
         xpath(%w[Main-Heating-Controls Description])
       end
@@ -281,32 +265,20 @@ module ViewModel
         xpath(%w[Multiple-Glazed-Proportion])
       end
 
-      def glazed_area
-        nil
-      end
-
-      def habitable_room_count
-        nil
-      end
-
-      def heated_room_count
-        nil
-      end
-
       def low_energy_lighting
         xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Percentage])
       end
 
       def fixed_lighting_outlets_count
-        xpath(%w[Fixed-Lighting-Outlets-Count])
+        xpath(%w[Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def low_energy_fixed_lighting_outlets_count
-        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])
+        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])&.to_i
       end
 
       def open_fireplaces_count
-        xpath(%w[Open-Fireplaces-Count])
+        xpath(%w[Open-Fireplaces-Count])&.to_i
       end
 
       def hot_water_description
@@ -357,16 +329,12 @@ module ViewModel
         xpath(%w[Lighting Environmental-Efficiency-Rating])
       end
 
-      def photovoltaic_roof_area_percent
-        nil
-      end
-
       def built_form
         xpath(%w[Built-Form])
       end
 
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
+        xpath(%w[Wind-Turbines-Count])&.to_i
       end
 
       def heat_loss_corridor
@@ -382,7 +350,7 @@ module ViewModel
       end
 
       def extensions_count
-        xpath(%w[Extensions-Count])
+        xpath(%w[Extensions-Count])&.to_i
       end
 
       def all_main_heating_controls_descriptions
@@ -429,14 +397,6 @@ module ViewModel
         @xml_doc.search("Main-Heating/Energy-Efficiency-Rating").map(&:content)
       end
 
-      def solar_water_heating_flag
-        nil
-      end
-
-      def mechanical_ventilation
-        nil
-      end
-
       def main_dwelling_construction_age_band_or_year
         sap_building_parts =
           @xml_doc.xpath("//SAP-Building-Parts/SAP-Building-Part")
@@ -492,14 +452,6 @@ module ViewModel
           .search("Main-Heating-Controls/Environmental-Efficiency-Rating")
           .map(&:content)
       end
-
-      def gas_smart_meter_present
-        nil
-      end
-
-      def electricity_smart_meter_present
-        nil
-      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_112/rdsap.rb

@@ -42,11 +42,11 @@ module ViewModel
       end
 
       def habitable_room_count
-        xpath(%w[Habitable-Room-Count])
+        xpath(%w[Habitable-Room-Count])&.to_i
       end
 
       def heated_room_count
-        xpath(%w[Heated-Room-Count])
+        xpath(%w[Heated-Room-Count])&.to_i
       end
 
       def photovoltaic_roof_area_percent
@@ -62,7 +62,7 @@ module ViewModel
       end
 
       def storey_count
-        xpath(%w[Storey-Count])
+        xpath(%w[Storey-Count])&.to_i
       end
 
       def energy_tariff
@@ -89,27 +89,11 @@ module ViewModel
         xpath(%w[Cylinder-Thermostat])
       end
 
-      def mech_vent_sys_index_number
-        nil
-      end
-
-      def mechanical_vent_data_source
-        nil
-      end
-
       # DO NOT CORRECT - this typo is present in the schema XML pre 12.0
       def mechanical_ventilation
         xpath(%w[Mechanical-Ventliation])
       end
 
-      def thermal_store
-        nil
-      end
-
-      def ventilation_type
-        nil
-      end
-
       def water_heating_fuel
         xpath(%w[Water-Heating-Fuel])
       end