Only the historic 1990 baseline keeps its year in the key; present year is implicit

Author: louispt1

lib/atlas/dataset.rb

@@ -355,16 +355,18 @@ def central_producers
     # Expects to load a file at datasets/AREA/emissions.csv with 5 index columns:
     # etm_sector, etm_subsector, use, ghg, year.
     #
+    # Only the historic 1990 baseline keeps its year in the key; present year is implicit
+    #
     # For example:
     #   dataset.emissions.
-    #     get(:buildings, :non_specified, :energetic, :other_ghg, 2023, :value)
+    #     get(:buildings, :non_specified, :energetic, :other_ghg, :value)
     #   # => 2796620.0
     #
     # Returns a CSVDocument.
     def emissions
-      @emissions ||= CSVDocument::MultiIndex.read(
-        path_resolver.resolve('emissions.csv'), index_size: 5
-      )
+      @emissions ||= CSVDocument::MultiIndex
+        .read(path_resolver.resolve('emissions.csv'), index_size: 5)
+        .tap { |doc| doc.table.each { |row| row[:year] = nil unless row[:year] == 1990 } }
     end
 
     # Public: Retrieves demand and max demand data for the region. Expects to

lib/atlas/runtime.rb

@@ -145,14 +145,17 @@ def EFFICIENCY(file_key, direction, carrier)
     #   EMISSIONS(energy_hydrogen_production, non_energetic, other_ghg)
     #   # => 456.0
     #
-    #   EMISSIONS(energy_hydrogen_production, non_energetic, other_ghg, 2015)
+    #   EMISSIONS(energy_hydrogen_production, non_energetic, other_ghg, 1990)
     #   # => 456.0
     #
+    # The present year is implicit; only the 1990 baseline is suffixed with a
+    # year in the key.
+    #
     # Returns a Float or nil if not found.
-    def EMISSIONS(sector, use, ghg, year = dataset.analysis_year)
-      full_key = "#{sector}_#{use}_#{ghg}_#{year}".to_sym
-
-      dataset.emissions.to_hash[full_key]
+    def EMISSIONS(sector, use, ghg, year = nil)
+      dataset.emissions.to_hash[
+        [sector, use, ghg, (1990 if year.to_i == 1990)].compact.join('_').to_sym
+      ]
     end
 
     # Public: Given the key of a node, retrieves the production (energy