earth 0.11.10 → 0.11.11

data/lib/earth/fuel/fuel_price.rb

@@ -1,5 +1,5 @@
 class FuelPrice < ActiveRecord::Base
-  set_primary_key :name
+  self.primary_key = "name"
   
   belongs_to :fuel_type, :foreign_key => 'name' # weird
   

data/lib/earth/fuel/fuel_type.rb

@@ -1,6 +1,6 @@
 # DEPRECATED but FuelPurchase still uses this
 class FuelType < ActiveRecord::Base
-  set_primary_key :name
+  self.primary_key = "name"
   
   has_many :prices, :class_name => 'FuelPrice', :foreign_key => 'name' # weird
   
@@ -24,4 +24,4 @@ class FuelType < ActiveRecord::Base
   # col :energy_content_units
   # col :carbon_content, :type => :float
   # col :carbon_content_units
-end
+end

data/lib/earth/fuel/fuel_year.rb

@@ -1,5 +1,7 @@
 class FuelYear < ActiveRecord::Base
-  set_primary_key :name
+  self.primary_key = "name"
+  
+  belongs_to :fuel, :foreign_key => 'fuel_name'
   
   col :name
   col :fuel_name
@@ -57,4 +59,4 @@ class FuelYear < ActiveRecord::Base
   # end
   # 
   # FIXME TODO verify units
-end
+end

data/lib/earth/fuel/greenhouse_gas.rb

@@ -1,5 +1,5 @@
 class GreenhouseGas < ActiveRecord::Base
-  set_primary_key :name
+  self.primary_key = "name"
     
   class << self
     def [](abbreviation)
@@ -52,4 +52,4 @@ class GreenhouseGas < ActiveRecord::Base
   #   end
   # end
   
-end
+end

data/lib/earth/hospitality/commercial_building_energy_consumption_survey_response.rb

@@ -1,13 +1,13 @@
 require 'earth/locality'
 class CommercialBuildingEnergyConsumptionSurveyResponse < ActiveRecord::Base
-  set_primary_key :id
-  set_table_name :cbecs_responses
+  self.primary_key = "id"
+  self.table_name = :cbecs_responses
   
   extend CohortScope
   self.minimum_cohort_size = 8 # CBECS doesn't report averages based on fewer than 20 samples
   
   def self.lodging_records
-    where :detailed_activity => ['Hotel', 'Motel or inn']
+    where(:detailed_activity => ['Hotel', 'Motel or inn'], :first_activity => nil)
   end
   
   col :id,                     :type => :integer
@@ -23,6 +23,7 @@ class CommercialBuildingEnergyConsumptionSurveyResponse < ActiveRecord::Base
   col :area_units
   col :floors,                 :type => :integer
   col :lodging_rooms,          :type => :integer
+  col :percent_cooled,         :type => :float
   col :principal_activity
   col :detailed_activity
   col :first_activity
@@ -45,9 +46,17 @@ class CommercialBuildingEnergyConsumptionSurveyResponse < ActiveRecord::Base
   col :fuel_oil_use_units
   col :fuel_oil_energy,        :type => :float
   col :fuel_oil_energy_units
-  col :steam_use,              :type => :float
-  col :steam_use_units
+  col :district_heat_use,      :type => :float
+  col :district_heat_use_units
   col :stratum,                :type => :integer
   col :pair,                   :type => :integer
   col :weighting,              :type => :float
+  col :electricity_per_room_night, :type => :float   # for lodging fuzzy weighting
+  col :electricity_per_room_night_units              # for lodging fuzzy weighting
+  col :natural_gas_per_room_night, :type => :float   # for lodging fuzzy weighting
+  col :natural_gas_per_room_night_units              # for lodging fuzzy weighting
+  col :fuel_oil_per_room_night, :type => :float      # for lodging fuzzy weighting
+  col :fuel_oil_per_room_night_units                 # for lodging fuzzy weighting
+  col :district_heat_per_room_night, :type => :float # for lodging fuzzy weighting
+  col :district_heat_per_room_night_units            # for lodging fuzzy weighting
 end

data/lib/earth/hospitality/commercial_building_energy_consumption_survey_response/data_miner.rb

@@ -35,6 +35,14 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
       store 'lodging_rooms',         :field_name => 'LODGRM8'
     end
     
+    import 'building characteristics from the 2003 EIA Commercial Building Energy Consumption Survey',
+           :url => 'http://www.eia.gov/emeu/cbecs/cbecs2003/public_use_2003/data/FILE03.csv',
+           :skip => 1,
+           :headers => ["PUBID8","REGION8","CENDIV8","SQFT8","SQFTC8","YRCONC8","PBA8","ELUSED8","NGUSED8","FKUSED8","PRUSED8","STUSED8","HWUSED8","HEATP8","HTLS508","FURNAC8","BOILER8","PKGHT8","SLFCON8","HTPMPH8","STHW8","OTHTEQ8","FURNP8","BOILP8","PKGHP8","SLFCNP8","HTPHP8","STHWP8","OTHTP8","MAINHT8","PKGHPS8","SPLHPS8","RMHPS8","AIRHPT8","GRDHPT8","WTRHPT8","NWMNHT8","RDHTNF8","HWRDHT8","COOLP8","PKGCL8","RCAC8","ACWNWL8","HTPMPC8","CHWT8","CHILLR8","EVAPCL8","OTCLEQ8","PKGCP8","RCACP8","ACWNWP8","HTPCP8","CHWTP8","CHILP8","EVAPP8","OTCLP8","MAINCL8","PKGCPS8","SPLCPS8","RMCPS8","AIRCPT8","GRDCPT8","WTRCPT8","NWMNCL8","RDCLNF8","HWRDCL8","VAV8","ECN8","MAINT8","EMCS8","ADJWT8","STRATUM8","PAIR8"] do
+      key 'id', :field_name => 'PUBID8'
+      store 'percent_cooled', :synthesize => Proc.new { |row| row['COOLP8'].to_f / 100.0 }
+    end
+    
     import 'electricity use from the 2003 EIA Commercial Building Energy Consumption Survey',
            :url => 'http://www.eia.gov/emeu/cbecs/cbecs2003/public_use_2003/data/FILE15.csv',
            :skip => 1,
@@ -55,7 +63,20 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
       store 'natural_gas_energy',   :field_name => 'NGBTU8', :from_units => :kbtus,              :to_units => :megajoules
       store 'fuel_oil_use',         :field_name => 'FKCNS8', :from_units => :gallons,            :to_units => :litres
       store 'fuel_oil_energy',      :field_name => 'FKBTU8', :from_units => :kbtus,              :to_units => :megajoules
-      store 'steam_use',            :field_name => 'DHBTU8', :from_units => :kbtus,              :to_units => :megajoules
+      store 'district_heat_use',    :field_name => 'DHBTU8', :from_units => :kbtus,              :to_units => :megajoules
+    end
+    
+    process "Derive fuel intensities per room night for lodging buildings" do
+      # days/year * weeks/day * years/month = weeks/month
+      # weeks/month * months used in a year = weeks used in a year
+      # weeks used in a year * hours/week = hours used in a year
+      # hours used in a year * days/hour = days used in a year
+      [:natural_gas, :fuel_oil, :electricity, :district_heat].each do |fuel|
+        lodging_records.update_all %{
+          #{fuel}_per_room_night = #{fuel}_use / (365.0 / 7.0 / 12.0 * months_used * weekly_hours / 24.0 * lodging_rooms),
+          #{fuel}_per_room_night_units = #{fuel}_use_units || '_per_room_night'
+        }
+      end
     end
   end
 end

data/lib/earth/hospitality/country_lodging_class.rb

@@ -1,6 +1,6 @@
 require 'earth/locality'
 class CountryLodgingClass < ActiveRecord::Base
-  set_primary_key :name
+  self.primary_key = "name"
   
   col :name
   col :country_iso_3166_code
@@ -12,7 +12,7 @@ class CountryLodgingClass < ActiveRecord::Base
   col :fuel_oil_intensity_units
   col :electricity_intensity, :type => :float
   col :electricity_intensity_units
-  col :steam_intensity, :type => :float
-  col :steam_intensity_units
+  col :district_heat_intensity, :type => :float
+  col :district_heat_intensity_units
   col :weighting, :type => :float
 end

data/lib/earth/hospitality/country_lodging_class/data_miner.rb

@@ -9,17 +9,19 @@ CountryLodgingClass.class_eval do
       store 'cbecs_detailed_activity'
     end
     
-    process "Ensure CommercialBuildingEnergyConsumptionSurveyResponse is populated" do
+    process "Ensure CommercialBuildingEnergyConsumptionSurveyResponse and Country are populated" do
       CommercialBuildingEnergyConsumptionSurveyResponse.run_data_miner!
+      Country.run_data_miner!
     end
     
     process "Calculate US lodging class fuel intensities from CommercialBuildingEnergyConsumptionSurveyResponse" do
+      occupancy_rate = Country.united_states.lodging_occupancy_rate
       connection.select_values("SELECT DISTINCT cbecs_detailed_activity FROM #{CountryLodgingClass.quoted_table_name}").each do |cbecs_activity|
-        [:natural_gas, :fuel_oil, :electricity, :steam].each do |fuel|
+        [:natural_gas, :fuel_oil, :electricity, :district_heat].each do |fuel|
           where(:cbecs_detailed_activity => cbecs_activity).update_all(%{
             #{fuel}_intensity = (
               SELECT SUM(
-                weighting * #{fuel}_use / (365.0 / 7.0 / 12.0 * months_used * weekly_hours / 24.0 * lodging_rooms * 0.59)
+                weighting * #{fuel}_use / (365.0 / 7.0 / 12.0 * months_used * weekly_hours / 24.0 * lodging_rooms * #{occupancy_rate})
               ) / SUM(weighting)
               FROM #{CommercialBuildingEnergyConsumptionSurveyResponse.quoted_table_name}
               WHERE detailed_activity = '#{cbecs_activity}'
@@ -29,9 +31,9 @@ CountryLodgingClass.class_eval do
         
         where(:cbecs_detailed_activity => cbecs_activity).update_all(%{
           natural_gas_intensity_units = 'cubic_metres_per_room_night',
-          fuel_oil_intensity_units    = 'litrs_per_room_night',
+          fuel_oil_intensity_units    = 'litres_per_room_night',
           electricity_intensity_units = 'kilowatt_hours_per_room_night',
-          steam_intensity_units       = 'megajoules_per_room_night',
+          district_heat_intensity_units = 'megajoules_per_room_night',
           weighting = (
             SELECT SUM(weighting)
             FROM #{CommercialBuildingEnergyConsumptionSurveyResponse.quoted_table_name}

data/lib/earth/hospitality/lodging_class.rb

@@ -1,6 +1,6 @@
 require 'earth/locality'
 class LodgingClass < ActiveRecord::Base
-  set_primary_key :name
+  self.primary_key = "name"
   
   col :name
 end

data/lib/earth/hospitality/lodging_property.rb

@@ -1,7 +1,7 @@
 require 'earth/locality'
 # Copyright 2011 Brighter Planet, Inc.
 class LodgingProperty < ActiveRecord::Base
-  set_primary_key :northstar_id
+  self.primary_key = "northstar_id"
   
   # So Lodging can look up LodgingClass from LodgingProperty
   belongs_to :lodging_class, :foreign_key => 'lodging_class_name'
@@ -18,12 +18,12 @@ class LodgingProperty < ActiveRecord::Base
   col :construction_year, :type => :integer
   col :renovation_year,   :type => :integer
   col :lodging_class_name
-  col :restaurant
-  col :air_conditioning
-  col :mini_bar
-  col :refrigerator
-  col :hot_tub
-  col :pools_indoor,  :type => :integer
-  col :pools_outdoor, :type => :integer
+  col :restaurants,       :type => :integer
+  col :ac_coverage,       :type => :float
+  col :mini_bar_coverage, :type => :float
+  col :fridge_coverage,   :type => :float
+  col :hot_tubs,          :type => :float # float b/c fallback needs to be a float
+  col :pools_indoor,      :type => :float # float b/c fallback needs to be a float
+  col :pools_outdoor,     :type => :float # float b/c fallback needs to be a float
   col :update_date
 end

data/lib/earth/industry/cbecs_energy_intensity.rb

@@ -1,11 +1,64 @@
 require 'earth/locality'
+
 class CbecsEnergyIntensity < ActiveRecord::Base
-  set_primary_key :name
+  self.primary_key = "name"
   
-  col :name
-  col :naics_code
-  col :census_division_number, :type => :integer
-  col :total_electricity_consumption, :type => :float
-  col :total_floorspace, :type => :float
+  col :name, :index => true
+  col :principal_building_activity
+  col :naics_code, :index => true
+  col :census_region_number, :type => :integer, :index => true
+  col :census_division_number, :type => :integer, :index => true
+
+  col :electricity, :type => :float
+  col :electricity_units
+  col :electricity_floorspace, :type => :float
+  col :electricity_floorspace_units
   col :electricity_intensity, :type => :float
+  col :electricity_intensity_units
+
+  col :natural_gas, :type => :float
+  col :natural_gas_units
+  col :natural_gas_floorspace, :type => :float
+  col :natural_gas_floorspace_units
+  col :natural_gas_intensity, :type => :float
+  col :natural_gas_intensity_units
+
+  col :fuel_oil, :type => :float
+  col :fuel_oil_units
+  col :fuel_oil_floorspace, :type => :float
+  col :fuel_oil_floorspace_units
+  col :fuel_oil_intensity, :type => :float
+  col :fuel_oil_intensity_units
+
+  col :district_heat, :type => :float
+  col :district_heat_units
+  col :district_heat_floorspace, :type => :float
+  col :district_heat_floorspace_units
+  col :district_heat_intensity, :type => :float
+  col :district_heat_intensity_units
+
+  scope :divisional, where('census_region_number IS NOT NULL AND census_division_number IS NOT NULL')
+  scope :regional, where('census_region_number IS NOT NULL AND census_division_number IS NULL')
+  scope :national, where(:census_region_number => nil, :census_division_number => nil)
+
+  # Find the first record whose census_division_number matches number and whose naics_code matches code.
+  # If no record found chop off the last character of code and try again, and so on.
+  def self.find_by_naics_code_and_census_division_number(code, number)
+    if code.blank?
+      record = nil
+    else
+      record = where('census_division_number = ? AND naics_code = ?', number, code).first
+      record ||= find_by_naics_code_and_census_division_number(code[0..-2], number)
+    end
+    record
+  end
+
+  def fuel_ratios
+    energy = 0
+    FUELS.keys.each { |fuel| energy += send(fuel).to_f }
+    FUELS.keys.inject({}) do |ratios, fuel|
+      ratios[fuel] = send(fuel).to_f / energy.to_f
+      ratios
+    end
+  end
 end

data/lib/earth/industry/cbecs_energy_intensity/data_miner.rb

@@ -1,109 +1,306 @@
 require 'earth/eia'
+require 'earth/industry'
 require 'earth/locality/data_miner'
+
 CbecsEnergyIntensity.class_eval do
-  const_set(:CENSUS_DIVISIONS, {
-    'New England Division' => {
-      :column => 0,
-      :code => 1,
-      :table => 'c17'
-    },
-    'Middle Atlantic Division' => {
-      :column => 1,
-      :code => 2,
-      :table => 'c17'
-    },
-    'East North Central Division' => {
-      :column => 2,
-      :code => 3,
-      :table => 'c17'
+  const_set :FUELS, {
+    :electricity => { 
+      :consumption => :billion_kilowatt_hours,
+      :intensity => :kilowatt_hours_per_square_foot,
+      :set => 10
     },
-    'West North Central Division' => {
-      :column => 0,
-      :code => 4,
-      :table => 'c18'
+    :natural_gas => { 
+      :consumption => :billion_cubic_feet_of_natural_gas,
+      :intensity => :cubic_feet_of_natural_gas_per_square_foot,
+      :set => 11
     },
-    'South Atlantic Division' => {
-      :column => 1,
-      :code => 5,
-      :table => 'c18'
+    :fuel_oil => { 
+      :consumption => :million_gallons_of_fuel_oil,
+      :intensity => :gallons_of_fuel_oil_per_square_foot,
+      :set => 12
     },
-    'East South Central Division' => {
-      :column => 2,
-      :code => 6,
-      :table => 'c18'
-    },
-    'West South Central Division' => {
-      :column => 0,
-      :code => 7,
-      :table => 'c19'
-    },
-    'Mountain Division' => {
-      :column => 1,
-      :code => 8,
-      :table => 'c19'
+    :district_heat => { 
+      :consumption => :trillion_btu,
+      :intensity => :trillion_btu_per_million_square_feet,
+      :set => 13
+    }
+  }
+
+  const_set(:CBECS, {
+    :region_tables => {
+      :electricity => 'c15',
+      :natural_gas => 'c25',
+      :fuel_oil => 'c35'
     },
-    'Pacific Division' => {
-      :column => 2,
-      :code => 9,
-      :table => 'c19'
+    :regions => {
+      'North-east' => {
+        :census_region => 1,
+        :column => 1,
+
+        :divisions => {
+          'New England Division' => {
+            :column => 0,
+            :census_division => 1,
+            :table => {
+              :electricity => 'c17',
+              :natural_gas => 'c27'
+            }
+          },
+          'Middle Atlantic Division' => {
+            :column => 1,
+            :census_division => 2,
+            :table => {
+              :electricity => 'c17',
+              :natural_gas => 'c27'
+            }
+          }
+        }
+      },
+      'Mid-west' => {
+        :census_region => 2,
+        :column => 2,
+        :table => {
+          :electricity => 'c16',
+          :natural_gas => 'c26',
+          :fuel_oil => 'c36'
+        },
+
+        :divisions => {
+          'East North Central Division' => {
+            :column => 2,
+            :census_division => 3,
+            :table => {
+              :electricity => 'c17',
+              :natural_gas => 'c27'
+            }
+          },
+          'West North Central Division' => {
+            :column => 0,
+            :census_division => 4,
+            :table => {
+              :electricity => 'c18',
+              :natural_gas => 'c28'
+            }
+          }
+        }
+      },
+      'South' => {
+        :census_region => 3,
+        :column => 3,
+        :table => {
+          :electricity => 'c16',
+          :natural_gas => 'c26',
+          :fuel_oil => 'c36'
+        },
+
+        :divisions => {
+          'South Atlantic Division' => {
+            :column => 1,
+            :census_division => 5,
+            :table => {
+              :electricity => 'c18',
+              :natural_gas => 'c28'
+            }
+          },
+          'East South Central Division' => {
+            :column => 2,
+            :census_division => 6,
+            :table => {
+              :electricity => 'c18',
+              :natural_gas => 'c28'
+            }
+          },
+          'West South Central Division' => {
+            :column => 0,
+            :census_division => 7,
+            :table => {
+              :electricity => 'c19',
+              :natural_gas => 'c29'
+            }
+          }
+        }
+      },
+      'West' => {
+        :census_region => 4,
+        :column => 4,
+        :table => {
+          :electricity => 'c16',
+          :natural_gas => 'c26',
+          :fuel_oil => 'c36'
+        },
+
+        :divisions => {
+          'Mountain Division' => {
+            :column => 1,
+            :census_division => 8,
+            :table => {
+              :electricity => 'c19',
+              :natural_gas => 'c29'
+            }
+          },
+          'Pacific Division' => {
+            :column => 2,
+            :census_division => 9,
+            :table => {
+              :electricity => 'c19',
+              :natural_gas => 'c29'
+            }
+          }
+        }
+      }
     }
   })
-  
+
   const_set(:NAICS_CODE_SYNTHESIZER, lambda { |row|
     case row[0].to_s
     when /Education/
-      611110
+      61
     when /Food Sales/
       445
     when /Food Service/
       722
     when /Health Care/
-      622110
+      62 # FIXME TODO should only be 621 and 622
     when /Inpatient/
-      622110
+      622
     when /Outpatient/
-      622111
+      621
     when /Lodging/
-      721
-    when /Retail (Other Than Mall)/
-      44
+      721 # FIXME TODO should really be 623, 62422, 721, maybe 8131
+    when /Retail \(Other Than Mall\)/
+      44 # FIXME TODO should really be 44 and 45 excluding 445 and 454
     when /Office/
-      #TODO
+      55 # Management of Companies and Enterprises FIXME TODO should be all NAICS codes that identify an office
     when /Public Assembly/
       #TODO
     when /Public Order and Safety/
-      922120
+      922
     when /Religious Worship/
-      813110
+      8131
     when /Service/
-      #TODO
+      81 # other services (except public administration) FIXME TODO exclude 8131 and include all NAICS codes that are services
     when /Warehouse and Storage/
-      493110
+      493
     when /Other/
       #TODO
     when /Vacant/
       #TODO
     end
   })
-  
+
   data_miner do
-    CbecsEnergyIntensity::CENSUS_DIVISIONS.each do |division, data|
-      import "2003 CBECS #{data[:table].upcase} - Electricity Consumption and Intensity - #{division}",
-        :url => "http://www.eia.gov/emeu/cbecs/cbecs2003/detailed_tables_2003/2003set10/2003excel/#{data[:table]}.xls",
-        :headers => false,
-        :select => ::Proc.new { |row| CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row) },
-        :crop => (21..37) do
-        key :name, :synthesize => ::Proc.new { |row| "#{Industry.format_naics_code(CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row))}-#{data[:code]}" }
-        store :naics_code, :synthesize => CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER
-        store :census_division_number, :static => data[:code]
-        store :total_electricity_consumption, :field_number => data[:column] + 1
-        store :total_floorspace, :field_number => data[:column] + 4
-        store :electricity_intensity, :field_number => data[:column] + 7
+    CbecsEnergyIntensity::CBECS[:regions].each do |region_name, region_data|
+      region_number = region_data[:census_region]
+      
+      # By Census Division
+      #
+      region_data[:divisions].each do |division, division_data|
+        division_data[:table].each do |energy_source, table|
+          import "2003 CBECS #{table.upcase} - Electricity Consumption and Intensity - #{division}",
+            :url => "http://www.eia.gov/emeu/cbecs/cbecs2003/detailed_tables_2003/2003set#{CbecsEnergyIntensity::FUELS[energy_source][:set]}/2003excel/#{table}.xls",
+            :headers => false,
+            :select => Proc.new { |row| CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row) }, # only select rows where we can translate activity to a NAICS code
+            :crop => (21..37) do
+            key :name, :synthesize => Proc.new { |row|
+              "#{Industry.format_naics_code(CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row))}-#{region_number}-#{division_data[:census_division]}"
+            }
+
+            store :principal_building_activity, :synthesize => Proc.new { |row| row[0].gsub(/[\.\(\)]/,'').strip }
+            store :naics_code, :synthesize => CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER
+            store :census_region_number, :static => region_number
+            store :census_division_number, :static => division_data[:census_division]
+
+            fuel_data = CbecsEnergyIntensity::FUELS[energy_source]
+            store energy_source, :units => :megajoules, :synthesize => Proc.new { |row|
+              Earth::EIA.convert_value(row[division_data[:column] + 1], :from => fuel_data[:consumption], :to => :megajoules)
+            }
+            store "#{energy_source}_floorspace", :units => :square_metres, :synthesize => Proc.new { |row|
+              Earth::EIA.convert_value(row[division_data[:column] + 4], :from => :million_square_feet, :to => :square_metres)
+            }
+            store "#{energy_source}_intensity", :units => :megajoules_per_square_metre, :synthesize => Proc.new { |row|
+              Earth::EIA.convert_value(row[division_data[:column] + 7], :from => fuel_data[:intensity], :to => :megajoules_per_square_metre)
+            }
+          end
+        end
+      end
+    end
+
+    ## By Census Region
+    ##
+    CbecsEnergyIntensity::CBECS[:region_tables].each do |energy_source, table|
+      CbecsEnergyIntensity::CBECS[:regions].each do |region, region_data|
+        import "2003 CBECS #{table.upcase} - #{energy_source.to_s.titleize} Consumption and Intensity - #{region.capitalize} Region",
+          :url => "http://www.eia.gov/emeu/cbecs/cbecs2003/detailed_tables_2003/2003set#{CbecsEnergyIntensity::FUELS[energy_source][:set]}/2003excel/#{table}.xls",
+          :select => Proc.new { |row| CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row) }, # only select rows where we can translate activity to a NAICS code
+          :headers => false,
+          :crop => (energy_source == :fuel_oil ? (16..19) : (21..37)) do
+          
+          key :name, :synthesize => Proc.new { |row|
+            "#{Industry.format_naics_code(CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row))}-#{region_data[:census_region]}"
+          }
+
+          store :census_region_number, :static => region_data[:census_region]
+          store :principal_building_activity, :synthesize => Proc.new { |row| row[0].gsub(/[\.\(\)]/,'').strip }
+          store :naics_code, :synthesize => CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER
+
+          store energy_source, :units => :megajoules, :synthesize => Proc.new { |row|
+            Earth::EIA.convert_value(row[region_data[:column]], :from => CbecsEnergyIntensity::FUELS[energy_source][:consumption],
+                                                                :to => :megajoules)
+          }
+          store "#{energy_source}_floorspace", :units => :square_metres, :synthesize => Proc.new { |row|
+            Earth::EIA.convert_value(row[region_data[:column] + 4], :from => :million_square_feet, :to => :square_metres)
+          }
+          store "#{energy_source}_intensity", :units => :megajoules_per_square_metre, :synthesize => Proc.new { |row|
+            Earth::EIA.convert_value(row[region_data[:column] + 8], :from => CbecsEnergyIntensity::FUELS[energy_source][:intensity],
+                                                                :to => :megajoules_per_square_metre)
+          }
+        end
       end
     end
 
-    process :normalize_fuels do
-      Earth::EIA.normalize(CbecsEnergyIntensity, [:total_electricity_consumption, :total_floorspace, :electricity_intensity])
+    # National
+    import "2003 CBECS C1 - District Heat Consumption and Intensity - US Total",
+      :url => "http://www.eia.gov/emeu/cbecs/cbecs2003/detailed_tables_2003/2003set9/2003excel/c1.xls",
+      :headers => false,
+      :select => Proc.new { |row| CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row) }, # only select rows where we can translate activity to a NAICS code
+      :crop => (21..37) do
+      key :name, :synthesize => Proc.new { |row|
+        Industry.format_naics_code(CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER.call(row))
+      }
+      store :principal_building_activity, :synthesize => Proc.new { |row| row[0].gsub(/[\.\(\)]/,'').strip }
+      store :naics_code, :synthesize => CbecsEnergyIntensity::NAICS_CODE_SYNTHESIZER
+
+      {:electricity => [4,5], :natural_gas => [6], :fuel_oil => [7], :district_heat => [8]}.each do |energy_source, columns|
+        store energy_source, :units => :megajoules, :synthesize => Proc.new { |row|
+          total_energy = nil
+          columns.each do |column|
+            value = Earth::EIA.convert_value(row[column], :from => :trillion_btus, :to => :megajoules)
+            if value
+              total_energy ||= 0
+              total_energy += value
+            end
+          end
+          total_energy
+        }
+        store "#{energy_source}_floorspace", :units => :square_metres, :synthesize => Proc.new { |row|
+          Earth::EIA.convert_value(row[2], :from => :million_square_feet, :to => :square_metres)
+        }
+        store "#{energy_source}_intensity", :units => :megajoules_per_square_metre, :synthesize => Proc.new { |row|
+          total_energy = nil
+          columns.each do |column|
+            value = Earth::EIA.convert_value(row[column])
+            if value
+              total_energy ||= 0
+              total_energy += value
+            end
+          end
+          if total_energy
+            intensity = total_energy / row[2].to_f
+            Earth::EIA.convert_value(intensity, :from => :trillion_btus_per_million_square_feet,
+                                                  :to => :megajoules_per_square_metre)
+          end
+        }
+      end
     end
   end
 end