epb_view_models 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80efe4147a186423dd6099c2c495e7f694580511670d9ee054257ddce5e887b8
-  data.tar.gz: 51c6e4233b76f4a3959e73b9e8a2b01dd8d2ede3a363c1e292df66b2ee8c18eb
+  metadata.gz: feafa754037d1b8749e1e9b5a7308641da5870f851529cf3377078e51da48687
+  data.tar.gz: bd830849348a8cee04b84c565458211c28a50c31caf420b0cd407d6655a17602
 SHA512:
-  metadata.gz: 88e7eb835ea70699291c21118ef0cab44da3e4423dff5032f1d9804b1d55f1014b90afc01ace5ba5bb4681bee1fd0e94e49c3b7095edef5eed2bc2940029a5e2
-  data.tar.gz: a1accb23c50fab70d6404edf6f01e2ee8fb544b276b825f949df758471dd270b8887f90ff4e10fd9593373a2d0e14e0da4e719bb832e4be4550c877520db610c
+  metadata.gz: 0f1210802f8694ba26463bc14b321b4e97b242af4ea69dc8b4a1d6409568cec9383f12b36104c572d760cdf1c6f1ab3aed00e6fb89e5e7efda142fe1e9322a06
+  data.tar.gz: 51d788026927bbab0d9ad3def044e8f56b0a986fae552f2c550810ea2649f49638b144621743353daf8cf56f4a713bd23b8071c2487fbb8edc035b33c49f8db3

data/.gitignore

@@ -6,7 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
-.DS_Store
+**/.DS_Store
 dump.rdb
 
 # rspec failure tracking

data/api/schemas/xml/RdSAP-Schema-NI-19.0/RdSAP/Templates/EPC-CollectedData.xsd

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns="http://www.epbniregister.com/xsd/rdsap" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.epbniregister.com/xsd/rdsap" elementFormDefault="qualified" attributeFormDefault="unqualified" version="LIG-NI-19.0">
+<xs:schema xmlns="http://www.epbniregister.com/xsd/rdsap" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+		   targetNamespace="http://www.epbniregister.com/xsd/rdsap" elementFormDefault="qualified" attributeFormDefault="unqualified" version="LIG-NI-19.0">
 	<xs:include schemaLocation="../UDT/SAP-Domains.xsd"/>
 	<xs:element name="SAP-Data" type="SAP-Data"/>
 	<xs:complexType name="SAP-Data">
@@ -17,7 +18,7 @@
 				<xs:annotation>
 					<xs:documentation>The building type of the Property e.g. Detached, Semi-Detached, Terrace etc.
 
-Together with the Property Type, the Build Form produces a structured description of the property.</xs:documentation>
+						Together with the Property Type, the Build Form produces a structured description of the property.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="Multiple-Glazed-Proportion" type="Percentage" minOccurs="0">
@@ -48,9 +49,9 @@ Together with the Property Type, the Build Form produces a structured descriptio
 			</xs:element>
 			<xs:element name="Habitable-Room-Count" type="Count">
 				<xs:annotation>
-					<xs:documentation>Count of the number of habitable rooms within the property. 
+					<xs:documentation>Count of the number of habitable rooms within the property.
 
-This is the number of Reception Rooms (including Living Rooms, Sitting Rooms, Dining Rooms), Bedrooms, Study and similar rooms but excludes hall, stairs, kitchen, utility rooms, bathrooms, cloakrooms, en-suites and similar rooms.</xs:documentation>
+						This is the number of Reception Rooms (including Living Rooms, Sitting Rooms, Dining Rooms), Bedrooms, Study and similar rooms but excludes hall, stairs, kitchen, utility rooms, bathrooms, cloakrooms, en-suites and similar rooms.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="Heated-Room-Count" type="Count">
@@ -82,14 +83,14 @@ This is the number of Reception Rooms (including Living Rooms, Sitting Rooms, Di
 				<xs:annotation>
 					<xs:documentation>The number of Open Fireplaces in the Property.
 
-An Open Fireplace is a fireplace that still allows air to pass between the inside of the Property and the outside.</xs:documentation>
+						An Open Fireplace is a fireplace that still allows air to pass between the inside of the Property and the outside.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="Property-Type" type="PropertyTypeCode">
 				<xs:annotation>
 					<xs:documentation>Describes the type of property such as House, Flat, Mansion, Maisonette etc.
 
-This is actually the type differentiator for Property but only a limited number of property types, notably Apartment and Apartment Block, have any specific characteristics and warrant their own definition.</xs:documentation>
+						This is actually the type differentiator for Property but only a limited number of property types, notably Apartment and Apartment Block, have any specific characteristics and warrant their own definition.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="Solar-Water-Heating" type="Flag">
@@ -191,8 +192,8 @@ This is actually the type differentiator for Property but only a limited number
 		<xs:annotation>
 			<xs:documentation>Details of the significant building parts that comprise the main habitable building in the property. The main habitable area generally consists of a single main building but can over time be extended to include extensions such as new wings and additional storeys.
 
-For the purpose of calculating the overall Energy Assessment for the property details of each distinct Building Part, such as its construction, have to be gathered because different materials have different insulation ratings (obviously) which affects the overall rating.
-</xs:documentation>
+				For the purpose of calculating the overall Energy Assessment for the property details of each distinct Building Part, such as its construction, have to be gathered because different materials have different insulation ratings (obviously) which affects the overall rating.
+			</xs:documentation>
 		</xs:annotation>
 		<xs:sequence>
 			<xs:element name="SAP-Integral-Conservatory" type="SAP-Integral-Conservatory" minOccurs="0"/>
@@ -564,7 +565,7 @@ For the purpose of calculating the overall Energy Assessment for the property de
 	<xs:complexType name="SAP-Deselected-Improvements">
 		<xs:annotation>
 			<xs:documentation>There are 22 possible improvement measures, designated from A to V. This must record measures deselected by DEA
-(A to V is the full set, only E, N, U and V are considered at the moment for new build).</xs:documentation>
+				(A to V is the full set, only E, N, U and V are considered at the moment for new build).</xs:documentation>
 		</xs:annotation>
 		<xs:sequence>
 			<xs:element name="Deselected-Improvement-Measure" type="SAP-ImprovementMeasureCode" maxOccurs="unbounded"/>
@@ -674,7 +675,7 @@ For the purpose of calculating the overall Energy Assessment for the property de
 						<xs:element name="Emitter-Temperature" type="EmitterTemperatureCode" minOccurs="0">
 							<xs:annotation>
 								<xs:documentation>0, 1, 3 or 4 applicable to condensing boilers and heat pumps.
-Other systems NA.</xs:documentation>
+									Other systems NA.</xs:documentation>
 							</xs:annotation>
 						</xs:element>
 						<xs:element name="MCS-Installed-Heat-Pump" type="xs:boolean" minOccurs="0">
@@ -716,7 +717,7 @@ Other systems NA.</xs:documentation>
 			<xs:element name="Peak-Power" type="Measurement">
 				<xs:annotation>
 					<xs:documentation>Peak kW of photovoltaics (PVs) (kWp).
-If the total peak power has been apportioned between different dwellings within the same building, this is the kWp ascribed to the dwelling being assessed.</xs:documentation>
+						If the total peak power has been apportioned between different dwellings within the same building, this is the kWp ascribed to the dwelling being assessed.</xs:documentation>
 				</xs:annotation>
 			</xs:element>
 			<xs:element name="Orientation" type="SAP-CompassDirectionCode">
@@ -1032,4 +1033,4 @@ If the total peak power has been apportioned between different dwellings within
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
-</xs:schema>
+</xs:schema>

data/lib/epb_view_models.rb

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

data/lib/helper/energy_band_calculator.rb

@@ -21,7 +21,7 @@ module Helper
 
     def self.commercial(number)
       case number
-      when proc { |n| n <= 0 }
+      when proc { |n| n <= -1 }
         "a+"
       when 0..25
         "a"

data/lib/helper/xml_enums_to_output.rb

@@ -15,6 +15,7 @@ module Helper
       "4" => "Mid-Terrace",
       "5" => "Enclosed End-Terrace",
       "6" => "Enclosed Mid-Terrace",
+      "7" => "Linked Detached",
       "NR" => "Not Recorded",
     }.freeze
     SAP_ENERGY_TARIFF = {
@@ -31,109 +32,6 @@ module Helper
       "4" => "dual (24 hour)",
       "5" => "off-peak 18 hour",
     }.freeze
-    RDSAP_MAIN_FUEL = {
-      "0" =>
-        "To be used only when there is no heating/hot-water system or data is from a community network",
-      "1" =>
-        "mains gas - this is for backwards compatibility only and should not be used",
-      "2" =>
-        "LPG - this is for backwards compatibility only and should not be used",
-      "3" => "bottled LPG",
-      "4" =>
-        "oil - this is for backwards compatibility only and should not be used",
-      "5" => "anthracite",
-      "6" => "wood logs",
-      "7" => "bulk wood pellets",
-      "8" => "wood chips",
-      "9" => "dual fuel - mineral + wood",
-      "10" =>
-        "electricity - this is for backwards compatibility only and should not be used",
-      "11" =>
-        "waste combustion - this is for backwards compatibility only and should not be used",
-      "12" =>
-        "biomass - this is for backwards compatibility only and should not be used",
-      "13" =>
-        "biogas - landfill - this is for backwards compatibility only and should not be used",
-      "14" =>
-        "house coal - this is for backwards compatibility only and should not be used",
-      "15" => "smokeless coal",
-      "16" => "wood pellets in bags for secondary heating",
-      "17" => "LPG special condition",
-      "18" => "B30K (not community)",
-      "19" => "bioethanol",
-      "20" => "mains gas (community)",
-      "21" => "LPG (community)",
-      "22" => "oil (community)",
-      "23" => "B30D (community)",
-      "24" => "coal (community)",
-      "25" => "electricity (community)",
-      "26" => "mains gas (not community)",
-      "27" => "LPG (not community)",
-      "28" => "oil (not community)",
-      "29" => "electricity (not community)",
-      "30" => "waste combustion (community)",
-      "31" => "biomass (community)",
-      "32" => "biogas (community)",
-      "33" => "house coal (not community)",
-      "34" => "biodiesel from any biomass source",
-      "35" => "biodiesel from used cooking oil only",
-      "36" => "biodiesel from vegetable oil only (not community)",
-      "37" => "appliances able to use mineral oil or liquid biofuel",
-      "51" => "biogas (not community)",
-      "56" =>
-        "heat from boilers that can use mineral oil or biodiesel (community)",
-      "57" =>
-        "heat from boilers using biodiesel from any biomass source (community)",
-      "58" => "biodiesel from vegetable oil only (community)",
-      "99" => "from heat network data (community)",
-    }.freeze
-    SAP_MAIN_FUEL = {
-      "1" => "Gas: mains gas",
-      "2" => "Gas: bulk LPG",
-      "3" => "Gas: bottled LPG",
-      "4" => "Oil: heating oil",
-      "7" => "Gas: biogas",
-      "8" => "LNG",
-      "9" => "LPG subject to Special Condition 18",
-      "10" => "Solid fuel: dual fuel appliance (mineral and wood)",
-      "11" => "Solid fuel: house coal",
-      "12" => "Solid fuel: manufactured smokeless fuel",
-      "15" => "Solid fuel: anthracite",
-      "20" => "Solid fuel: wood logs",
-      "21" => "Solid fuel: wood chips",
-      "22" => "Solid fuel: wood pellets (in bags, for secondary heating)",
-      "23" =>
-        "Solid fuel: wood pellets (bulk supply in bags, for main heating)",
-      "36" => "Electricity: electricity sold to grid",
-      "37" => "Electricity: electricity displaced from grid",
-      "39" => "Electricity: electricity, unspecified tariff",
-      "41" => "Community heating schemes: heat from electric heat pump",
-      "42" => "Community heating schemes: heat from boilers - waste combustion",
-      "43" => "Community heating schemes: heat from boilers - biomass",
-      "44" => "Community heating schemes: heat from boilers - biogas",
-      "45" => "Community heating schemes: waste heat from power stations",
-      "46" => "Community heating schemes: geothermal heat source",
-      "48" => "Community heating schemes: heat from CHP",
-      "49" => "Community heating schemes: electricity generated by CHP",
-      "50" =>
-        "Community heating schemes: electricity for pumping in distribution network",
-      "51" => "Community heating schemes: heat from mains gas",
-      "52" => "Community heating schemes: heat from LPG",
-      "53" => "Community heating schemes: heat from oil",
-      "54" => "Community heating schemes: heat from coal",
-      "55" => "Community heating schemes: heat from B30D",
-      "56" =>
-        "Community heating schemes: heat from boilers that can use mineral oil or biodiesel",
-      "57" =>
-        "Community heating schemes: heat from boilers using biodiesel from any biomass source",
-      "58" => "Community heating schemes: biodiesel from vegetable oil only",
-      "72" => "biodiesel from used cooking oil only",
-      "73" => "biodiesel from vegetable oil only",
-      "74" => "appliances able to use mineral oil or liquid biofuel",
-      "75" => "B30K",
-      "76" => "bioethanol from any biomass source",
-      "99" => "Community heating schemes: special fuel",
-    }.freeze
     RDSAP_GLAZED_TYPE = {
       "1" => "double glazing installed before 2002",
       "2" => "double glazing installed during or after 2002",
@@ -168,6 +66,7 @@ module Helper
       "4" =>
         "rental (private) - this is for backwards compatibility only and should not be used",
       "5" => "not sale or rental",
+      "ni_5" => "None of the above",
       "6" => "new dwelling",
       "7" =>
         "not recorded - this is for backwards compatibility only and should not be used",
@@ -227,8 +126,128 @@ module Helper
       "6" => "Voluntary (No legal requirement for an EPC).",
       "7" => "Not recorded.",
     }.freeze
+    VENTILATION_TYPE = {
+      "1" => "natural with intermittent extract fans",
+      "2" => "natural with passive vents",
+      "3" => "positive input from loft",
+      "4" => "positive input from outside",
+      "5" => "mechanical extract, centralised (MEV c)",
+      "6" => "mechanical extract, decentralised (MEV dc)",
+      "7" => "balanced without heat recovery (MV)",
+      "8" => "balanced with heat recovery (MVHR)",
+      "9" => "natural with intermittent extract fans and/or passive vents.  For backwards compatibility only, do not use.",
+      "10" => "natural with intermittent extract fans and passive vents",
+    }.freeze
+    CYLINDER_INSULATION_THICKNESS = {
+      "12" => "12 mm",
+      "25" => "25 mm",
+      "38" => "38 mm",
+      "50" => "50 mm",
+      "80" => "80 mm",
+      "120" => "120 mm",
+      "160" => "160 mm",
+    }.freeze
+    RDSAP_FUEL_TYPE = {
+      "0" => "To be used only when there is no heating/hot-water system or data is from a community network",
+      "1" => "mains gas - this is for backwards compatibility only and should not be used",
+      "2" => "LPG - this is for backwards compatibility only and should not be used",
+      "3" => "bottled LPG",
+      "4" => "oil - this is for backwards compatibility only and should not be used",
+      "5" => "anthracite",
+      "6" => "wood logs",
+      "7" => "bulk wood pellets",
+      "8" => "wood chips",
+      "9" => "dual fuel - mineral + wood",
+      "10" => "electricity - this is for backwards compatibility only and should not be used",
+      "11" => "waste combustion - this is for backwards compatibility only and should not be used",
+      "12" => "biomass - this is for backwards compatibility only and should not be used",
+      "13" => "biogas - landfill - this is for backwards compatibility only and should not be used",
+      "14" => "house coal - this is for backwards compatibility only and should not be used",
+      "15" => "smokeless coal",
+      "16" => "wood pellets in bags for secondary heating",
+      "17" => "LPG special condition",
+      "18" => "B30K (not community)",
+      "19" => "bioethanol",
+      "20" => "mains gas (community)",
+      "21" => "LPG (community)",
+      "22" => "oil (community)",
+      "23" => "B30D (community)",
+      "24" => "coal (community)",
+      "25" => "electricity (community)",
+      "26" => "mains gas (not community)",
+      "27" => "LPG (not community)",
+      "28" => "oil (not community)",
+      "29" => "electricity (not community)",
+      "30" => "waste combustion (community)",
+      "31" => "biomass (community)",
+      "32" => "biogas (community)",
+      "33" => "house coal (not community)",
+      "34" => "biodiesel from any biomass source",
+      "35" => "biodiesel from used cooking oil only",
+      "36" => "biodiesel from vegetable oil only (not community)",
+      "36-rapeseed-oil" => "rapeseed oil",
+      "37" => "appliances able to use mineral oil or liquid biofuel",
+      "51" => "biogas (not community)",
+      "56" => "heat from boilers that can use mineral oil or biodiesel (community)",
+      "57" => "heat from boilers using biodiesel from any biomass source (community)",
+      "58" => "biodiesel from vegetable oil only (community)",
+      "99" => "from heat network data (community)",
+    }.freeze
+    RDSAP_FUEL_TYPE_PRE_143 = {
+      "1-pre14.3-sap" => "mains gas",
+      "4-pre14.3-sap" => "oil",
+      "10-pre14.3-sap" => "electricity",
+      "11-pre14.3-sap" => "waste combustion",
+      "12-pre14.3-sap" => "biomass",
+      "13-pre14.3-sap" => "biogas - landfill",
+      "14-pre14.3-sap" => "house coal",
+    }.freeze
+    SAP_FUEL_TYPE = {
+      "1" => "Gas: mains gas",
+      "2" => "Gas: bulk LPG",
+      "3" => "Gas: bottled LPG",
+      "4" => "Oil: heating oil",
+      "7" => "Gas: biogas",
+      "8" => "LNG",
+      "9" => "LPG subject to Special Condition 18",
+      "10" => "Solid fuel: dual fuel appliance (mineral and wood)",
+      "11" => "Solid fuel: house coal",
+      "12" => "Solid fuel: manufactured smokeless fuel",
+      "15" => "Solid fuel: anthracite",
+      "20" => "Solid fuel: wood logs",
+      "21" => "Solid fuel: wood chips",
+      "22" => "Solid fuel: wood pellets (in bags, for secondary heating)",
+      "23" => "Solid fuel: wood pellets (bulk supply in bags, for main heating)",
+      "36" => "Electricity: electricity sold to grid",
+      "37" => "Electricity: electricity displaced from grid",
+      "39" => "Electricity: electricity, unspecified tariff",
+      "41" => "Community heating schemes: heat from electric heat pump",
+      "42" => "Community heating schemes: heat from boilers - waste combustion",
+      "43" => "Community heating schemes: heat from boilers - biomass",
+      "44" => "Community heating schemes: heat from boilers - biogas",
+      "45" => "Community heating schemes: waste heat from power stations",
+      "46" => "Community heating schemes: geothermal heat source",
+      "48" => "Community heating schemes: heat from CHP",
+      "49" => "Community heating schemes: electricity generated by CHP",
+      "50" => "Community heating schemes: electricity for pumping in distribution network",
+      "51" => "Community heating schemes: heat from mains gas",
+      "52" => "Community heating schemes: heat from LPG",
+      "53" => "Community heating schemes: heat from oil",
+      "54" => "Community heating schemes: heat from coal",
+      "55" => "Community heating schemes: heat from B30D",
+      "56" => "Community heating schemes: heat from boilers that can use mineral oil or biodiesel",
+      "57" => "Community heating schemes: heat from boilers using biodiesel from any biomass source",
+      "58" => "Community heating schemes: biodiesel from vegetable oil only",
+      "71" => "biodiesel from any biomass source",
+      "72" => "biodiesel from used cooking oil only",
+      "73" => "biodiesel from vegetable oil only",
+      "74" => "appliances able to use mineral oil or liquid biofuel",
+      "75" => "B30K",
+      "76" => "bioethanol from any biomass source",
+      "99" => "Community heating schemes: special fuel",
+    }.freeze
 
-    def self.xml_value_to_string(number)
+    def self.built_form_string(number)
       BUILT_FORM[number]
     end
 
@@ -246,14 +265,6 @@ module Helper
       end
     end
 
-    def self.main_fuel_rdsap(value)
-      RDSAP_MAIN_FUEL[value]
-    end
-
-    def self.main_fuel_sap(value)
-      SAP_MAIN_FUEL[value]
-    end
-
     def self.glazed_area_rdsap(value)
       RDSAP_GLAZED_AREA[value]
     end
@@ -266,9 +277,26 @@ module Helper
       TENURE[value] || value
     end
 
-    def self.transaction_type(value, report_type = "2")
+    def self.transaction_type(value, report_type = "2", schema_type = "")
+      types_of_ni = %w[
+        RdSAP-Schema-NI-20.0.0
+        RdSAP-Schema-NI-19.0
+        RdSAP-Schema-NI-18.0
+        RdSAP-Schema-NI-17.4
+        RdSAP-Schema-NI-17.3
+        SAP-Schema-NI-16.1
+        SAP-Schema-NI-17.0
+        SAP-Schema-NI-17.1
+        SAP-Schema-NI-17.2
+        SAP-Schema-NI-17.3
+        SAP-Schema-NI-17.4
+        SAP-Schema-NI-18.0.0
+      ]
+
       if is_rdsap(report_type) && value.to_i >= 12
         TRANSACTION_TYPE["#{value}RdSAP"]
+      elsif types_of_ni.include?(schema_type) && value.to_i == 5
+        TRANSACTION_TYPE["ni_5"]
       else
         TRANSACTION_TYPE[value] || value
       end
@@ -381,9 +409,10 @@ module Helper
         SAP-Schema-11.2
         SAP-Schema-11.0
         SAP-Schema-10.2
+        SAP-Schema-NI-11.2
       ].freeze
 
-      if types_of_sap_pre12.include?(schema_type) && is_rdsap(report_type)
+      if types_of_sap_pre12.include?(schema_type.to_s) && is_rdsap(report_type)
         return MECHANICAL_VENTILATION["#{value}-pre12.0"]
       end
 
@@ -394,6 +423,14 @@ module Helper
       CEPC_TRANSACTION_TYPE[value] || value
     end
 
+    def self.cylinder_insulation_thickness(value, report_type = "2")
+      if is_rdsap(report_type)
+        CYLINDER_INSULATION_THICKNESS[value]
+      else
+        value
+      end
+    end
+
     def self.is_rdsap(report_type)
       report_type == "2"
     end
@@ -402,6 +439,119 @@ module Helper
       report_type == "3"
     end
 
+    def self.ventilation_type(value, schema_type = "")
+      ni_sap = %w[
+        SAP-Schema-NI-16.1
+        SAP-Schema-NI-16.0
+        SAP-Schema-NI-15.0
+        SAP-Schema-NI-14.2
+        SAP-Schema-NI-14.1
+        SAP-Schema-NI-14.0
+        SAP-Schema-NI-13.0
+      ].freeze
+
+      if ni_sap.include?(schema_type) && value == "9"
+        VENTILATION_TYPE[value].split(".").first
+      else
+        VENTILATION_TYPE[value]
+      end
+    end
+
+    def self.fuel_type(value, schema_type = "", report_type = "2")
+      rdsap = %i[
+        RdSAP-Schema-20.0.0
+        RdSAP-Schema-19.0
+        RdSAP-Schema-18.0
+        RdSAP-Schema-17.1
+        RdSAP-Schema-17.0
+        RdSAP-Schema-NI-20.0.0
+        RdSAP-Schema-NI-19.0
+        RdSAP-Schema-NI-18.0
+        RdSAP-Schema-NI-17.4
+        RdSAP-Schema-NI-17.3
+      ]
+
+      pre143_sap = %i[
+        SAP-Schema-14.2
+        SAP-Schema-14.1
+        SAP-Schema-14.0
+        SAP-Schema-13.0
+        SAP-Schema-12.0
+        SAP-Schema-11.2
+        SAP-Schema-11.0
+        SAP-Schema-10.2
+        SAP-Schema-NI-14.2
+        SAP-Schema-NI-14.1
+        SAP-Schema-NI-14.0
+        SAP-Schema-NI-13.0
+        SAP-Schema-NI-12.0
+        SAP-Schema-NI-11.2
+      ]
+
+      includes_rapeseed_oil = %i[
+        SAP-Schema-16.3
+        SAP-Schema-16.2
+        SAP-Schema-16.1
+        SAP-Schema-16.0
+        SAP-Schema-15.0
+        SAP-Schema-NI-17.2
+        SAP-Schema-NI-17.1
+        SAP-Schema-NI-17.0
+        SAP-Schema-NI-16.1
+        SAP-Schema-NI-16.0
+        SAP-Schema-NI-15.0
+      ]
+
+      sap = %i[
+        SAP-Schema-18.0.0
+        SAP-Schema-17.1
+        SAP-Schema-17.0
+        SAP-Schema-16.3
+        SAP-Schema-16.2
+        SAP-Schema-16.1
+        SAP-Schema-16.0
+        SAP-Schema-15.0
+        SAP-Schema-14.2
+        SAP-Schema-14.1
+        SAP-Schema-14.0
+        SAP-Schema-13.0
+        SAP-Schema-12.0
+        SAP-Schema-11.2
+        SAP-Schema-11.0
+        SAP-Schema-10.2
+        SAP-Schema-NI-18.0.0
+        SAP-Schema-NI-17.4
+        SAP-Schema-NI-17.3
+        SAP-Schema-NI-17.2
+        SAP-Schema-NI-17.1
+        SAP-Schema-NI-17.0
+        SAP-Schema-NI-16.1
+        SAP-Schema-NI-16.0
+        SAP-Schema-NI-15.0
+        SAP-Schema-NI-14.2
+        SAP-Schema-NI-14.1
+        SAP-Schema-NI-14.0
+        SAP-Schema-NI-13.0
+        SAP-Schema-NI-12.0
+        SAP-Schema-NI-11.2
+      ]
+
+      if rdsap.include?(schema_type)
+        RDSAP_FUEL_TYPE[value]
+      elsif sap.include?(schema_type) && is_sap(report_type)
+         SAP_FUEL_TYPE[value]
+      elsif sap.include?(schema_type) && is_rdsap(report_type)
+        if includes_rapeseed_oil.include?(schema_type) && value == "36"
+          return RDSAP_FUEL_TYPE["#{value}-rapeseed-oil"]
+        end
+        if pre143_sap.include?(schema_type)
+          return RDSAP_FUEL_TYPE_PRE_143["#{value}-pre14.3-sap"] || RDSAP_FUEL_TYPE[value]
+        else
+          RDSAP_FUEL_TYPE[value]
+        end
+      end
+    end
+
     private_class_method :is_rdsap, :is_sap
   end
 end