epb_view_models 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ae4bba2efbc28d42200e7a331a4111b76071399e0a1f901313c2d57035196a
-  data.tar.gz: 0e244cf4dec75c6213a3c3e8bac4aa2fea2c02f44c9958419d5bf9b9bb2f4f38
+  metadata.gz: 4c9e0148c91fdfa17b8230647b7f44630d9197877639f5f8da2948d329afb8e6
+  data.tar.gz: db0feff6c2a220fef4810e938bb53d6382df34df65355ff3946443b58ada8950
 SHA512:
-  metadata.gz: a2e9785b8c3141d8eaf2b1bf5c1cd647efe67022417b5922e94e44af3b57ce157dab168f4499d4a1b1bce1a6092d8aa87ef954a8ab09cc03335b5bc0a1417571
-  data.tar.gz: dcf95783220f96004c33f270bd844dd22de531f57136d7f9d230e7244a42b880c310088ca070b60aaedaf78dfb2f766f7f783098603302ca5cb2085b1afbc03f
+  metadata.gz: f5e51bceb16b9c4ec62cb2a724ccb58e4daf1d8699b67672a755533278b568c00c7f13ee119f7d78983f913bb13a2cd69b36a1d1372e43a4dc4f62f82b89bb03
+  data.tar.gz: 9813262b24abc17231f36b6d5b4bf0eac81f58a31d103b80172e518b228e1974b15176af4c97f6ffeee7bea8cd8ac47cd74b08286554ff57883f6ec9fb3085e3

data/.buildspec.yml

@@ -3,10 +3,10 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      ruby: 2.7
+      ruby: 3.1
   pre_build:
     commands:
-      - gem install bundler:2.2.21
+      - gem install bundler:2.3.15
       - make install
   build:
     commands:

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+3.1.2

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ruby "~> 2.7"
+ruby ">=2.7", "<3.2"
 
 source "https://rubygems.org"
 

data/Gemfile.lock

@@ -85,4 +85,4 @@ RUBY VERSION
    ruby 2.7.5p203
 
 BUNDLED WITH
-   2.2.32
+   2.3.15

data/api/schemas/xml/SAP-Schema-19.0.0/SAP/UDT/SAP-Domains.xsd

@@ -1360,7 +1360,7 @@
 			</xs:enumeration>
 		</xs:restriction>
 	</xs:simpleType>
-	<xs:simpleType name="SAP-FlatLevelCode">
+		<xs:simpleType name="SAP-FlatLevelCode">
 		<xs:annotation>
 			<xs:documentation>Codes which indicates where a flat is located within a building.</xs:documentation>
 		</xs:annotation>

data/lib/epb_view_models.rb

@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem
 loader.setup
 
 module EpbViewModels
-  VERSION = "1.0.18"
+  VERSION = "1.0.19"
 end
 
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

data/lib/presenter/export/domestic.rb

@@ -68,8 +68,8 @@ module Presenter::Export
       view[:lighting_environmental_efficiency_rating] =
         @view_model.lighting_environmental_efficiency_rating.to_i
       view[:low_energy_fixed_lighting_outlets_count] =
-        @view_model.low_energy_fixed_lighting_outlets_count.to_i
-      view[:low_energy_lighting] = @view_model.low_energy_lighting.to_i
+        @view_model.low_energy_fixed_lighting_outlets_count.nil? ? nil : @view_model.low_energy_fixed_lighting_outlets_count.to_i
+      view[:low_energy_lighting] = @view_model.low_energy_lighting.nil? ? nil : @view_model.low_energy_lighting.to_i
       view[:main_fuel_type] = @view_model.main_fuel_type
       view[:main_heating_controls_descriptions] =
         @view_model.all_main_heating_controls_descriptions

data/lib/view_model/sap_schema_1900/common_schema.rb

@@ -259,12 +259,12 @@ module ViewModel
       end
 
       def top_storey
-        flat_level_code = xpath(%w[Level])
+        flat_level_code = xpath(%w[SAP-FlatLevelCode])
         flat_level_code == "3" ? "Y" : "N"
       end
 
       def storey_count
-        nil
+        xpath(%w[Storeys])
       end
 
       def building_part_number
@@ -365,20 +365,51 @@ module ViewModel
         nil
       end
 
-      def low_energy_lighting
-        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Percentage])
+      def fixed_lighting_outlets_count
+        @xml_doc.search("Fixed-Lights/Fixed-Light/Lighting-Outlets").map(&:content).map(&:to_i).sum
       end
 
-      def fixed_lighting_outlets_count
-        xpath(%w[Fixed-Lighting-Outlets-Count])
+      def format_fixed_light_array
+        @xml_doc
+          .search("Fixed-Lights/Fixed-Light")
+          .map do |part|
+          {
+            lighting_efficacy:
+              xpath(%w[Lighting-Efficacy], part),
+            lighting_outlets:
+              xpath(%w[Lighting-Outlets], part),
+          }
+        end
+      end
+
+      def low_energy_lighting
+        total_energy_outlet_count = []
+        low_energy_outlet_count = []
+
+        format_fixed_light_array.each do |outlet|
+          if outlet[:lighting_efficacy].to_i > 65
+            low_energy_outlet_count << outlet[:lighting_outlets].to_i
+          end
+          total_energy_outlet_count << outlet[:lighting_outlets].to_f
+        end
+
+        (low_energy_outlet_count.sum / total_energy_outlet_count.sum * 100).round
       end
 
       def low_energy_fixed_lighting_outlets_count
-        xpath(%w[Low-Energy-Fixed-Lighting-Outlets-Count])
+        low_energy_outlet_count = []
+
+        format_fixed_light_array.each do |outlet|
+          if outlet[:lighting_efficacy].to_i > 65
+            low_energy_outlet_count << outlet[:lighting_outlets].to_i
+          end
+        end
+
+        low_energy_outlet_count.sum
       end
 
       def open_fireplaces_count
-        xpath(%w[Open-Fireplaces-Count])
+        xpath(%w[Open-Chimneys-Count])
       end
 
       def hot_water_description
@@ -438,7 +469,7 @@ module ViewModel
       end
 
       def wind_turbine_count
-        xpath(%w[Wind-Turbines-Count])
+        @xml_doc.search("Wind-Turbines/Wind-Turbine").map(&:content).count
       end
 
       def unheated_corridor_length

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -1870,7 +1870,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Library used to parse Energy Performance Certificates (EPC)