earth 0.12.3 → 0.12.4

data/lib/earth/air/airline/data_miner.rb

@@ -20,7 +20,7 @@ Airline.class_eval do
     end
     
     import "a Brighter Planet-curated list of airlines and codes not included in our proprietary sources",
-           :url => 'https://spreadsheets.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdGJoaFpENXRqMEM2NW42am5tNURGU2c&output=csv' do
+           :url => "#{Earth::DATA_DIR}/air/airlines.csv" do
       key 'name'
       store 'secondary_name', :nullify => true
       store 'iata_code',      :nullify => true

data/lib/earth/air/airport.rb

@@ -4,7 +4,15 @@ require 'earth/locality'
 class Airport < ActiveRecord::Base
   self.primary_key = "iata_code"
   
-  belongs_to :country, :foreign_key => 'country_iso_3166_code', :primary_key => 'iso_3166_code'
+  belongs_to :country,
+    :foreign_key => 'country_iso_3166_code',
+    :primary_key => 'iso_3166_code'
+  has_many :departing_flight_segments,
+    :class_name => 'FlightSegment',
+    :foreign_key => :origin_airport_iata_code
+  has_many :arriving_flight_segments,
+    :class_name => 'FlightSegment',
+    :foreign_key => :destination_airport_iata_code
   
   acts_as_mappable :default_units => :nms,
                    :lat_column_name => :latitude,
@@ -18,5 +26,5 @@ class Airport < ActiveRecord::Base
   col :latitude, :type => :float
   col :longitude, :type => :float
 
-  warn_unless_size 5149
+  warn_unless_size 5324
 end

data/lib/earth/air/airport/data_miner.rb

@@ -37,14 +37,14 @@ Airport.class_eval do
                         :responder => "Airport::Guru" } do
       key 'iata_code'
       store 'name'
-      store 'city'
+      store 'city', :nullify => true
       store 'country_name', :synthesize => proc { |row| Airport.countries_dictionary.find(row['country_name'], :must_match_at_least_one_word => true).try(:name) }
       store 'latitude'
       store 'longitude'
     end
     
     import "airports missing from the OpenFlights.org database",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHpyR3NudEl5V21ZcEdXQXFDNU8zTWc&output=csv' do
+           :url => "#{Earth::DATA_DIR}/air/airports.csv" do
       key 'iata_code'
       store 'name'
       store 'city'
@@ -53,10 +53,16 @@ Airport.class_eval do
       store 'longitude'
     end
     
+    process "Fill in blank cities (assume airport name is city name)" do
+      t = Airport.arel_table
+      where(:city => nil).update_all(t[:city].eq(t[:name]).to_sql)
+    end
+    
     process "Fill in blank country codes" do
-      Country.find_each do |country|
-        next unless country.name.present? and country.iso_3166_code.present?
-        where(:country_name => country.name).update_all :country_iso_3166_code => country.iso_3166_code
+      Country.safe_find_each do |country|
+        if country.name.present? and country.iso_3166_code.present?
+          where(:country_name => country.name).update_all :country_iso_3166_code => country.iso_3166_code
+        end
       end
     end
   end

data/lib/earth/air/bts_aircraft.rb

@@ -3,5 +3,5 @@ class BtsAircraft < ActiveRecord::Base
   col :bts_code
   col :description
 
-  warn_unless_size 376
+  warn_unless_size 379
 end

data/lib/earth/air/flight_segment.rb

@@ -3,6 +3,19 @@ require 'fuzzy_match/cached_result'
 
 class FlightSegment < ActiveRecord::Base
   self.primary_key = "row_hash"
+
+  belongs_to :airline,
+    :primary_key => :bts_code,
+    :foreign_key => :airline_bts_code
+
+  belongs_to :origin_airport,
+    :class_name => 'Airport',
+    :primary_key => :iata_code,
+    :foreign_key => :origin_airport_iata_code
+  belongs_to :destination_airport,
+    :class_name => 'Airport',
+    :primary_key => :iata_code,
+    :foreign_key => :destination_airport_iata_code
   
   # Cutting this for now because if iata code is missing we have to look up airports using both city and country; don't know how to do this with ActiveRecord
   # - Ian 6/12/2011
@@ -84,5 +97,5 @@ class FlightSegment < ActiveRecord::Base
     :freight_share
   )
 
-  warn_unless_size 966913
+  warn_unless_size 1_254_412
 end

data/lib/earth/air/flight_segment/data_miner.rb

@@ -180,11 +180,12 @@ FlightSegment.class_eval do
   end
   
   data_miner do
-    process "Start from scratch" do
-      delete_all
-    end
-    FlightSegment.form_data_per_month.each do |month, form_data|
-      import "T100 flight segment data for #{month.strftime('%B %Y')}",
+    FlightSegment.form_data_per_month.each do |date, form_data|
+      process "Clear current data from #{date.strftime('%B %Y')}" do
+        where(:year => date.year, :month => date.month).delete_all
+      end
+      
+      import "T100 flight segment data for #{date.strftime('%B %Y')}",
              :url => URL,
              :form_data => form_data,
              :compression => :zip,
@@ -237,13 +238,5 @@ FlightSegment.class_eval do
     process "Data mine Aircraft because it's like a belongs-to association" do
       Aircraft.run_data_miner!
     end
-    
-    # verify origin_airport_iata_code is in airports
-    # verify destination_airport_iata_code is in airports
-    # verify origin_country_iso_3166_code is in countries
-    # verify destination_country_iso_3166_code is in countries
-    # verify airline_name is never missing
-    # verify aircraft_description is never missing
-    # verify year is never missing
   end
 end

data/lib/earth/automobile/automobile_activity_year/data_miner.rb

@@ -17,7 +17,7 @@ AutomobileActivityYear.class_eval do
     end
     
     process "Derive hfc emission factor from AutomobileActivityYearType" do
-      find_each do |ay|
+      safe_find_each do |ay|
         ay.update_attributes!(
           :hfc_emission_factor => ay.activity_year_types.sum(&:hfc_emissions) / ay.activity_year_types.sum{ |ayt| ayt.activity_year_type_fuels.sum(&:distance) },
           :hfc_emission_factor_units => ay.activity_year_types.first.hfc_emission_factor_units

data/lib/earth/automobile/automobile_activity_year_type/data_miner.rb

@@ -17,7 +17,7 @@ AutomobileActivityYearType.class_eval do
     end
     
     process "Derive hfc emission factor from AutomobileActivityYearTypeFuel" do
-      find_each do |ayt|
+      safe_find_each do |ayt|
         ayt.update_attributes!(
           :hfc_emission_factor => ayt.hfc_emissions / ayt.activity_year_type_fuels.sum(:distance),
           :hfc_emission_factor_units => ayt.hfc_emissions_units + '_per_' + ayt.activity_year_type_fuels.first.distance_units.singularize

data/lib/earth/automobile/automobile_fuel/data_miner.rb

@@ -36,8 +36,8 @@ AutomobileFuel.class_eval do
           end
           
           auto_fuel.update_attributes!(
-            :"#{method}" => value,
-            :"#{method}_units" => auto_fuel.base_fuel.send("#{method}_units")
+            "#{method}" => value,
+            "#{method}_units" => auto_fuel.base_fuel.send("#{method}_units")
           )
         end
       end
@@ -55,12 +55,12 @@ AutomobileFuel.class_eval do
     end
     
     process "Derive annual distance, emission factors, and total consumption from AutomobileTypeFuel" do
-      find_each do |record|
+      safe_find_each do |record|
         if (type_fuels = record.type_fuels).any?
           %w{ annual_distance ch4_emission_factor n2o_emission_factor }.each do |item|
             record.update_attributes!(
-              :"#{item}" => type_fuels.weighted_average(item, :weighted_by => :vehicles),
-              :"#{item}_units" => type_fuels.first.send("#{item}_units")
+              "#{item}" => type_fuels.weighted_average(item, :weighted_by => :vehicles),
+              "#{item}_units" => type_fuels.first.send("#{item}_units")
             )
           end
           unless record.name =~ / gasoline/

data/lib/earth/automobile/automobile_make/data_miner.rb

@@ -17,7 +17,7 @@ AutomobileMake.class_eval do
     end
     
     process "Derive fuel efficiency from AutomobileMakeYear" do
-      find_each do |make|
+      safe_find_each do |make|
         make.update_attributes!(
           :fuel_efficiency => make.make_years.weighted_average(:fuel_efficiency),
           :fuel_efficiency_units => make.make_years.first.fuel_efficiency_units

data/lib/earth/automobile/automobile_make_model/data_miner.rb

@@ -22,7 +22,7 @@ AutomobileMakeModel.class_eval do
     end
     
     process "Derive fuel codes and type name from AutomobileMakeModelYear" do
-      find_each do |amm|
+      safe_find_each do |amm|
         codes = amm.model_years.map(&:fuel_code).uniq
         if codes.count == 1
           amm.update_attributes! :fuel_code => codes.first

data/lib/earth/automobile/automobile_make_model_year/data_miner.rb

@@ -61,7 +61,7 @@ AutomobileMakeModelYear.class_eval do
     end
     
     process "Derive type name from AutomobileMakeModelYearVariant" do
-      find_each do |ammy|
+      safe_find_each do |ammy|
         type_names = AutomobileMakeModelYearVariant.where(:make_name => ammy.make_name, :model_name => ammy.model_name, :year => ammy.year).map(&:type_name).uniq
         ammy.update_attributes! :type_name => (type_names.first if type_names.one?)
       end

data/lib/earth/automobile/automobile_make_model_year_variant/data_miner.rb

@@ -2,21 +2,21 @@ AutomobileMakeModelYearVariant.class_eval do
   # For errata
   class AutomobileMakeModelYearVariant::Guru
     %w{ alpina bentley chevrolet chrysler dodge ferrari ford gmc jaguar kia lexus maybach mercedes-benz mitsubishi porsche toyota tvr volvo yugo }.each do |make|
-      method_name = :"is_a_#{make.gsub('-', '_')}?"
+      method_name = "is_a_#{make.gsub('-', '_')}?"
       define_method method_name do |row|
         row['make_name'].downcase == make
       end
     end
     
     %w{ alpina bentley marquis maybach milan mystique scion smart }.each do |model_name|
-      method_name = :"model_contains_#{model_name}?"
+      method_name = "model_contains_#{model_name}?"
       define_method method_name do |row|
         row['model_name'].to_s =~ /#{model_name}/i
       end
     end
     
     [["ford", "contour"], ["hyundai", "sonata"], ["jaguar", "xjr"], ["jaguar", "xjs convertible"], ["jaguar", "xjs coupe"], ["mercury", "mystique"], ["mitsubishi", "mirage"], ["volvo", "850"], ["volvo", "850 wagon"], ["volvo", "940"], ["volvo", "940 wagon"]].each do |make_name, model_name|
-      method_name = :"is_a_1995_#{make_name}_#{model_name.gsub(' ', '_')}_missing_fuel_efficiency?"
+      method_name = "is_a_1995_#{make_name}_#{model_name.gsub(' ', '_')}_missing_fuel_efficiency?"
       define_method method_name do |row|
         row['year'] == 1995 and row['make_name'].downcase == make_name and row['model_name'].downcase == model_name and (row['fuel_efficiency_city'] == 0 or row['fuel_efficiency_highway'] == 0)
       end
@@ -64,7 +64,7 @@ AutomobileMakeModelYearVariant.class_eval do
     end
     
     %w{ 5 hatchback justy loyale loyale_wagon odyssey pt_cruiser_convertible space_wagon stanza_wagon wagon xt }.each do |model_name|
-      method_name = :"is_a_#{model_name}?"
+      method_name = "is_a_#{model_name}?"
       define_method method_name do |row|
         row['model_name'] =~ /^#{model_name.gsub('_', ' ')}$/i
       end
@@ -399,7 +399,7 @@ AutomobileMakeModelYearVariant.class_eval do
       where(:make_name => 'Chevrolet', :model_name => 'CAVALIER DUAL-FUEL', :fuel_code => 'C').each do |cng_variant|
         gasoline_variant = where(:make_name => 'Chevrolet', :model_name => 'CAVALIER DUAL-FUEL', :fuel_code => ['R', 'P'], :alt_fuel_code => nil).find_by_year(cng_variant.year)
         %w{ fuel_code fuel_efficiency_city fuel_efficiency_city_units fuel_efficiency_highway fuel_efficiency_highway_units }.each do |attribute|
-          gasoline_variant.update_attributes! :"alt_#{attribute}" => cng_variant.send(attribute)
+          gasoline_variant.update_attributes! "alt_#{attribute}" => cng_variant.send(attribute)
         end
         cng_variant.destroy
       end
@@ -437,7 +437,7 @@ AutomobileMakeModelYearVariant.class_eval do
         
         if gasoline_variant.present?
           %w{ fuel_code fuel_efficiency_city fuel_efficiency_city_units fuel_efficiency_highway fuel_efficiency_highway_units }.each do |attribute|
-            gasoline_variant.update_attributes! :"alt_#{attribute}" => ethanol_variant.send(attribute)
+            gasoline_variant.update_attributes! "alt_#{attribute}" => ethanol_variant.send(attribute)
           end
           ethanol_variant.destroy
         end

data/lib/earth/automobile/automobile_type_fuel/data_miner.rb

@@ -26,7 +26,7 @@ AutomobileTypeFuel.class_eval do
       join_relation = type_fuel_years[:type_name].eq(type_fuels[:type_name]).and(type_fuel_years[:fuel_family].eq(type_fuels[:fuel_family]))
       
       %w{ annual_distance ch4_emission_factor n2o_emission_factor }.each do |item|
-        item_sql = AutomobileTypeFuelYear.where(join_relation).weighted_average_relation(:"#{item}", :weighted_by => :share_of_type).to_sql
+        item_sql = AutomobileTypeFuelYear.where(join_relation).weighted_average_relation("#{item}", :weighted_by => :share_of_type).to_sql
         item_units = AutomobileTypeFuelYear.first.send("#{item}_units")
         
         update_all %{
@@ -41,7 +41,7 @@ AutomobileTypeFuel.class_eval do
     end
     
     process "Derive number of vehicles and fuel consumption from AutomobileActivityYearTypeFuel" do
-      find_each do |atf|
+      safe_find_each do |atf|
         atf.update_attributes!(
           :vehicles => atf.latest_activity_year_type_fuel.distance / atf.annual_distance,
           :fuel_consumption => atf.latest_activity_year_type_fuel.fuel_consumption,

data/lib/earth/automobile/automobile_type_fuel_year/data_miner.rb

@@ -39,7 +39,7 @@ AutomobileTypeFuelYear.class_eval do
     
     # Can't use an update all here b/c efs are methods defined on ATFYC that look up the ef from ATFC
     process "Derive ch4 and n2o emission factor from AutomobileTypeFuelYearControl" do
-      find_each do |atfy|
+      safe_find_each do |atfy|
         atfy.update_attributes!(
           :ch4_emission_factor => atfy.type_fuel_year_controls.sum{ |atfyc| atfyc.total_travel_percent * atfyc.ch4_emission_factor },
           :n2o_emission_factor => atfy.type_fuel_year_controls.sum{ |atfyc| atfyc.total_travel_percent * atfyc.n2o_emission_factor },

data/lib/earth/conversions_ext.rb

@@ -20,10 +20,10 @@ Conversions.register :cubic_metres, :hundred_cubic_feet, (1.cubic_metres.to(:cub
 Conversions.register :cubic_metres, :billion_cubic_feet, (1.cubic_metres.to(:cubic_feet) / 1_000_000_000)
 
 # Mass: base unit = kilogram
-Conversions.register :kilograms, :grams,         1_000.0
-Conversions.register :kilograms, :metric_tonnes, 0.001
-Conversions.register :kilograms, :pounds,        2.20462262
-Conversions.register :kilograms, :tons,          0.00110231131
+Conversions.register :kilograms, :grams,      1_000.0
+Conversions.register :kilograms, :tonnes,     0.001
+Conversions.register :kilograms, :pounds,     2.20462262
+Conversions.register :kilograms, :short_tons, 0.00110231131
 
 # Energy: base unit = megajoule
 Conversions.register :btus,                   :megajoules, 0.00105505585
@@ -60,7 +60,8 @@ Conversions.register :million_btu_per_barrel,               :megajoules_per_litr
 Conversions.register :btus_per_cubic_foot,                  :megajoules_per_cubic_metre,              (1.btus.to(:megajoules) / 1.cubic_feet.to(:cubic_metres)) # Fuel
 Conversions.register :teragrams_per_quadrillion_btu,        :grams_per_megajoule,                     (1_000_000_000_000 / 1_000_000_000_000_000.btus.to(:megajoules)) # Fuel
 Conversions.register :kilometres_per_hour,                  :miles_per_hour,                          1.kilometres.to(:miles)
-
+Conversions.register :kilograms_per_kilowatt_hour,          :pounds_per_megawatt_hour,                1.kilograms.to(:pounds) * 1_000
+Conversions.register :kilograms_per_kilowatt_hour,          :pounds_per_gigawatt_hour,                1.kilograms.to(:pounds) * 1_000_000
 
 # Odd units for EPA fuel economy guide
 # Conversions.register :epa_gallon_gasoline_equivalents,          :kilowatt_hours,                        33.705
@@ -98,7 +99,7 @@ Conversions.register :trillion_btus_per_million_square_feet, :megajoules_per_squ
 Conversions.register :kilowatt_hours_per_square_foot, :megajoules_per_square_metre,            (1.kilowatt_hours.to(:megajoules) / 1.square_feet.to(:square_metres))
 Conversions.register :billion_cubic_feet_of_natural_gas, :megajoules,                          (1_000_000_000.cubic_feet.to(:cubic_metres) * 38.3395) # 2003 NatGas energy content MJ/m3
 Conversions.register :cubic_feet_of_natural_gas_per_square_foot, :megajoules_per_square_metre, ((1.cubic_feet.to(:cubic_metres) * 38.3395) / 1.square_feet.to(:square_metres))
-Conversions.register :million_gallons_of_fuel_oil, :megajoules,                                (1_000_000.gallons.to(:litres) * 41.9203) # Residual Fuel Oil No. 6 energy content MJ/l from Fuels
+Conversions.register :million_gallons_of_fuel_oil, :megajoules,                                (1_000_000.gallons.to(:litres) * 38.5491) # Distillate Fuel Oil No. 2 energy content MJ/l from Fuels
 Conversions.register :gallons_of_fuel_oil_per_square_foot, :megajoules_per_square_metre,       ((41.9203 * 1.gallons.to(:litres)) / 1.square_feet.to(:square_metres))
 
 # Only used in app1

data/lib/earth/fuel/fuel.rb

@@ -110,5 +110,5 @@ class Fuel < ActiveRecord::Base
     end
   end
 
-  warn_unless_size 21
+  warn_unless_size 23
 end

data/lib/earth/fuel/fuel/data_miner.rb

@@ -57,7 +57,7 @@ Fuel.class_eval do
     
     process "Create district heat" do
       natural_gas = find_by_name 'Pipeline Natural Gas'
-      fuel_oil = find_by_name 'Residual Fuel Oil No. 6'
+      fuel_oil = find_by_name 'Distillate Fuel Oil No. 2'
       district_heat = find_or_create_by_name "District Heat"
       
       # Assumptions:              half nat gas at 81.7% efficiency    half fuel oil at 84.6% efficiency      5% transmission losses
@@ -79,7 +79,5 @@ Fuel.class_eval do
         co2_biogenic_emission_factor_units = 'kilograms_per_' || physical_units
       })
     end
-    
-    # FIXME TODO verify this stuff
   end
 end

data/lib/earth/hospitality/commercial_building_energy_consumption_survey_response.rb

@@ -1,4 +1,3 @@
-require 'earth/locality'
 class CommercialBuildingEnergyConsumptionSurveyResponse < ActiveRecord::Base
   self.primary_key = "id"
   self.table_name = :cbecs_responses
@@ -21,6 +20,9 @@ class CommercialBuildingEnergyConsumptionSurveyResponse < ActiveRecord::Base
   col :floors,                 :type => :integer
   col :lodging_rooms,          :type => :integer
   col :percent_cooled,         :type => :float
+  col :food_prep_room,         :type => :boolean
+  col :laundry_onsite,         :type => :boolean
+  col :indoor_pool,            :type => :boolean
   col :principal_activity
   col :detailed_activity
   col :first_activity

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

@@ -1,10 +1,13 @@
-require 'earth/locality/data_miner'
 CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
   data_miner do
+    process "Start from scratch" do
+      delete_all
+    end
+    
     import 'building characteristics from the 2003 EIA CBECS - part 1',
            :url => 'http://www.eia.gov/emeu/cbecs/cbecs2003/public_use_2003/data/FILE01.csv',
            :skip => 1,
-           :headers => ["PUBID8", "REGION8", "CENDIV8", "SQFT8", "SQFTC8", "YRCONC8", "PBA8", "ELUSED8", "NGUSED8", "FKUSED8", "PRUSED8", "STUSED8", "HWUSED8", "CLIMATE8", "FREESTN8", "WLCNS8", "RFCNS8", "GLSSPC8", "EQGLSS8", "SUNGLS8", "BLDSHP8", "NFLOOR8", "ELEVTR8", "NELVTR8", "ESCLTR8", "NESLTR8", "YRCON8", "MONCON8", "RENOV8", "RENADD8", "RENRDC8", "RENCOS8", "RENEXT8", "RENINT8", "RENHVC8", "RENLGT8", "RENWIN8", "RENPLB8", "RENINS8", "RENOTH8", "GOVOWN8", "GOVTYP8", "OWNER8", "OWNOCC8", "NOCC8", "NOCCAT8", "MONUSE8", "PORVAC8", "OPEN248", "OPNMF8", "OPNWE8", "WKHRS8", "WKHRSC8", "NWKER8", "NWKERC8", "HT18", "HT28", "COOL8", "WATR8", "COOK8", "MANU8", "GENR8", "ADJWT8", "STRATUM8", "PAIR8"] do
+           :headers => %w{ PUBID8 REGION8 CENDIV8 SQFT8 SQFTC8 YRCONC8 PBA8 ELUSED8 NGUSED8 FKUSED8 PRUSED8 STUSED8 HWUSED8 CLIMATE8 FREESTN8 WLCNS8 RFCNS8 GLSSPC8 EQGLSS8 SUNGLS8 BLDSHP8 NFLOOR8 ELEVTR8 NELVTR8 ESCLTR8 NESLTR8 YRCON8 MONCON8 RENOV8 RENADD8 RENRDC8 RENCOS8 RENEXT8 RENINT8 RENHVC8 RENLGT8 RENWIN8 RENPLB8 RENINS8 RENOTH8 GOVOWN8 GOVTYP8 OWNER8 OWNOCC8 NOCC8 NOCCAT8 MONUSE8 PORVAC8 OPEN248 OPNMF8 OPNWE8 WKHRS8 WKHRSC8 NWKER8 NWKERC8 HT18 HT28 COOL8 WATR8 COOK8 MANU8 GENR8 ADJWT8 STRATUM8 PAIR8 } do
       key 'id', :field_name => 'PUBID8'
       store 'census_region_number',   :field_name => 'REGION8'
       store 'census_division_number', :field_name => 'CENDIV8'
@@ -23,7 +26,7 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
     import 'building characteristics from the 2003 EIA CBECS - part 2',
            :url => 'http://www.eia.gov/emeu/cbecs/cbecs2003/public_use_2003/data/FILE02.csv',
            :skip => 1,
-           :headers => ["PUBID8","REGION8","CENDIV8","SQFT8","SQFTC8","YRCONC8","PBA8","ELUSED8","NGUSED8","FKUSED8","PRUSED8","STUSED8","HWUSED8","ONEACT8","ACT18","ACT28","ACT38","ACT1PCT8","ACT2PCT8","ACT3PCT8","PBAPLUS8","VACANT8","RWSEAT8","PBSEAT8","EDSEAT8","FDSEAT8","HCBED8","NRSBED8","LODGRM8","FACIL8","FEDFAC8","FACACT8","MANIND8","PLANT8","FACDST8","FACDHW8","FACDCW8","FACELC8","BLDPLT8","ADJWT8","STRATUM8","PAIR8"] do
+           :headers => %w{ PUBID8 REGION8 CENDIV8 SQFT8 SQFTC8 YRCONC8 PBA8 ELUSED8 NGUSED8 FKUSED8 PRUSED8 STUSED8 HWUSED8 ONEACT8 ACT18 ACT28 ACT38 ACT1PCT8 ACT2PCT8 ACT3PCT8 PBAPLUS8 VACANT8 RWSEAT8 PBSEAT8 EDSEAT8 FDSEAT8 HCBED8 NRSBED8 LODGRM8 FACIL8 FEDFAC8 FACACT8 MANIND8 PLANT8 FACDST8 FACDHW8 FACDCW8 FACELC8 BLDPLT8 ADJWT8 STRATUM8 PAIR8 } do
       key 'id', :field_name => 'PUBID8'
       store 'detailed_activity',     :field_name => 'PBAPLUS8', :dictionary => { :input => 'detailed_activity_code', :output => 'detailed_activity', :url => 'https://docs.google.com/spreadsheet/pub?&key=0AoQJbWqPrREqdHRGVHczYXRoU2dFLV90aDdET0dQLUE&single=true&gid=3&output=csv' }
       store 'first_activity',        :field_name => 'ACT18',    :dictionary => { :input => 'activity_code', :output => 'activity', :url => 'https://docs.google.com/spreadsheet/pub?&key=0AoQJbWqPrREqdHRGVHczYXRoU2dFLV90aDdET0dQLUE&single=true&gid=4&output=csv' }
@@ -38,15 +41,25 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
     import 'building characteristics from the 2003 EIA CBECS - part 3',
            :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
+           :headers => %w{ 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 { |row| row['COOLP8'].to_f / 100.0 }
     end
     
+    import 'building characteristics from the 2003 EIA CBECS - part 4',
+           :url => 'http://www.eia.gov/emeu/cbecs/cbecs2003/public_use_2003/data/FILE04.csv',
+           :skip => 1,
+           :headers => %w{ PUBID8 REGION8 CENDIV8 SQFT8 SQFTC8 YRCONC8 PBA8 ELUSED8 NGUSED8 FKUSED8 PRUSED8 STUSED8 HWUSED8 WTHTEQ8 INSTWT8 FDRM8 SNACK8 FASTFD8 CAF8 FDPREP8 KITCHN8 OTFDRM8 HWTRM8 LAUNDR8 MEDEQP8 LABEQP8 MCHEQP8 POOL8 HTPOOL8 PLSRC8 RFGEQP8 RFGWI8 RFGOP8 RFGCL8 RFGRES8 RFGVEN8 RFGWIN8 RFGOPN8 RFGRSN8 RFGCLN8 RFGVNN8 PCTERM8 SERVER8 MNFRM8 SRVFRM8 TRNGRM8 STDNRM8 OTPCRM8 PCRMP8 SRVNUM8 SRVRC8 PCNUM8 PCTRMC8 FLAT8 FLATC8 PRNTRN8 PRNTYP8 RGSTRN8 COPIER8 COPRN8 FAX8 RDOFEQ8 ADJWT8 STRATUM8 PAIR8 } do
+      key 'id', :field_name => 'PUBID8'
+      store 'food_prep_room', :synthesize => proc { |row| row['FDRM8'] == '1' }
+      store 'laundry_onsite', :synthesize => proc { |row| row['LAUNDR8'] == '1' }
+      store 'indoor_pool', :synthesize => proc { |row| row['POOL8'] == '1' or row['HTPOOL8'] == '1' }
+    end
+    
     import 'electricity use from the 2003 EIA CBECS',
            :url => 'http://www.eia.gov/emeu/cbecs/cbecs2003/public_use_2003/data/FILE15.csv',
            :skip => 1,
-           :headers => ["PUBID8", "REGION8", "CENDIV8", "SQFT8", "SQFTC8", "YRCONC8", "PBA8", "ELUSED8", "NGUSED8", "FKUSED8", "PRUSED8", "STUSED8", "HWUSED8", "ADJWT8", "STRATUM8", "PAIR8", "HDD658", "CDD658", "MFUSED8", "MFBTU8", "MFEXP8", "ELCNS8", "ELBTU8", "ELEXP8", "ZELCNS8", "ZELEXP8"] do
+           :headers => %w{ PUBID8 REGION8 CENDIV8 SQFT8 SQFTC8 YRCONC8 PBA8 ELUSED8 NGUSED8 FKUSED8 PRUSED8 STUSED8 HWUSED8 ADJWT8 STRATUM8 PAIR8 HDD658 CDD658 MFUSED8 MFBTU8 MFEXP8 ELCNS8 ELBTU8 ELEXP8 ZELCNS8 ZELEXP8 } do
       key 'id', :field_name => 'PUBID8'
       store 'heating_degree_days', :field_name => 'HDD658', :from_units => :degrees_fahrenheit, :to_units => :degrees_celsius
       store 'cooling_degree_days', :field_name => 'CDD658', :from_units => :degrees_fahrenheit, :to_units => :degrees_celsius
@@ -57,7 +70,7 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
     import 'fuel use characteristics from the 2003 EIA CBECS',
            :url => 'http://www.eia.gov/emeu/cbecs/cbecs2003/public_use_2003/data/FILE16.csv',
            :skip => 1,
-           :headers => ["PUBID8", "REGION8", "CENDIV8", "SQFT8", "SQFTC8", "YRCONC8", "PBA8", "ELUSED8", "NGUSED8", "FKUSED8", "PRUSED8", "STUSED8", "HWUSED8", "ADJWT8", "STRATUM8", "PAIR8", "NGCNS8", "NGBTU8", "NGEXP8", "ZNGCNS8", "ZNGEXP8", "FKCNS8", "FKBTU8", "FKEXP8", "ZFKCNS8", "ZFKEXP8", "DHUSED8", "DHHT18", "DHHT28", "DHCOOL8", "DHWATR8", "DHCOOK8", "DHMANU8", "DHOTH8", "DHCNS8", "DHBTU8", "DHEXP8", "ZDHCNS8", "ZDHEXP8"] do
+           :headers => %w{ PUBID8 REGION8 CENDIV8 SQFT8 SQFTC8 YRCONC8 PBA8 ELUSED8 NGUSED8 FKUSED8 PRUSED8 STUSED8 HWUSED8 ADJWT8 STRATUM8 PAIR8 NGCNS8 NGBTU8 NGEXP8 ZNGCNS8 ZNGEXP8 FKCNS8 FKBTU8 FKEXP8 ZFKCNS8 ZFKEXP8 DHUSED8 DHHT18 DHHT28 DHCOOL8 DHWATR8 DHCOOK8 DHMANU8 DHOTH8 DHCNS8 DHBTU8 DHEXP8 ZDHCNS8 ZDHEXP8 } do
       key 'id', :field_name => 'PUBID8'
       store 'natural_gas_use',      :synthesize => proc { |row| row['NGCNS8'].to_i.hundred_cubic_feet.to(:cubic_metres) }, :units => :cubic_metres
       store 'fuel_oil_use',         :synthesize => proc { |row| row['FKCNS8'].to_i.gallons.to(:litres) }, :units => :litres
@@ -74,11 +87,31 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
         update_all "room_nights = (365.0 * (1 / 7.0)   * (1 / 12.0)   * months_used * weekly_hours * (1 / 24.0)  * lodging_rooms)"
     end
     
-    process "Derive fuel intensities per room night for lodging records" do
-      [:natural_gas, :fuel_oil, :electricity, :district_heat].each do |fuel|
-        lodging_records.update_all %{
-          #{fuel}_per_room_night = #{fuel}_use / room_nights,
-          #{fuel}_per_room_night_units = #{fuel}_use_units || '_per_room_night'
+    process "Derive fuel intensities (including outsourced laundry energy) per room night for lodging records" do
+      # from Hotel Carbon Measurement Initiative guidelines 1.0
+      #   5.12 kg laundry / occupied room-night
+      #   180 kWh elec / kg laundry
+      #   1560 kWh nat gas / kg laundry
+      #   111 l fuel oil / kg laundry
+      # from PWC and Smith Travel Research (http://www.pwc.com/us/en/press-releases/2012/pwc-us-lodging-industry-forecast.jhtml)
+      #   59.2% average hotel occupancy rate in 2003
+      
+      laundry_energy = {
+        'electricity' => 0.592 * 5.12.kilograms.to(:tonnes) *  180.kilowatt_hours.to(:megajoules),
+        'natural_gas' => 0.592 * 5.12.kilograms.to(:tonnes) * 1560.kilowatt_hours.to(:megajoules),
+        'fuel_oil'    => 0.592 * 5.12.kilograms.to(:tonnes) *  111 * 38.549, # 38.549 megajoules / litre distillate fuel oil
+        'district_heat' => 0
+      }
+      
+      %w{ natural_gas fuel_oil electricity district_heat }.each do |fuel|
+        lodging_records.where(:laundry_onsite => true).update_all %{
+          #{fuel}_per_room_night = #{fuel}_energy / room_nights,
+          #{fuel}_per_room_night_units = #{fuel}_energy_units || '_per_room_night'
+        }
+        
+        lodging_records.where(:laundry_onsite => false).update_all %{
+          #{fuel}_per_room_night = (#{fuel}_energy / room_nights) + #{laundry_energy[fuel]},
+          #{fuel}_per_room_night_units = #{fuel}_energy_units || '_per_room_night'
         }
       end
     end