earth 0.4.0 → 0.4.1

data/features/support/imports/automobile_fuel_bad.csv

@@ -1,3 +1,3 @@
-name,base_fuel_name,distance_key,ef_key,blend_portion
-regular gasoline
-b20,Distillate Fuel Oil No. 2,diesel,diesel,1.1
+name,co2_emission_factor,co2_emission_factor_units,co2_biogenic_emission_factor,co2_biogenic_emission_factor_units,ch4_emission_factor,ch4_emission_factor_units,n2o_emission_factor,n2o_emission_factor_units,hfc_emission_factor,hfc_emission_factor_units,base_fuel_name,distance_key,ef_key,blend_portion
+regular gasoline,-1,kilograms_per_gallon,-1,kilograms_per_gallon,0,kilograms_per_litre,0,kilograms_per_litre,0,kilograms_per_litre
+b20,-1,kilograms_per_gallon,-1,kilograms_per_gallon,0,kilograms_per_litre,0,kilograms_per_litre,0,kilograms_per_litre,Distillate Fuel Oil No. 2,diesel,diesel,1.1

data/features/support/imports/automobile_fuel_good.csv

@@ -1,3 +1,3 @@
-name,base_fuel_name,distance_key,ef_key,blend_portion
-regular gasoline,Motor Gasoline,gasoline,gasoline
-b20,Distillate Fuel Oil No. 2,diesel,diesel,0.2
+name,co2_emission_factor,co2_emission_factor_units,co2_biogenic_emission_factor,co2_biogenic_emission_factor_units,ch4_emission_factor,ch4_emission_factor_units,n2o_emission_factor,n2o_emission_factor_units,hfc_emission_factor,hfc_emission_factor_units,base_fuel_name,distance_key,ef_key,blend_portion
+regular gasoline,1,kilograms_per_litre,0,kilograms_per_litre,0.1,kilograms_co2e_per_litre,0.1,kilograms_co2e_per_litre,0.1,kilograms_co2e_per_litre,Motor Gasoline,gasoline,gasoline
+b20,0,kilograms_per_litre,1,kilograms_per_litre,0.1,kilograms_co2e_per_litre,0.1,kilograms_co2e_per_litre,0.1,kilograms_co2e_per_litre,Distillate Fuel Oil No. 2,diesel,diesel,0.2

data/features/support/imports/bus_class_bad.csv

@@ -1,3 +1,2 @@
-name,distance,distance_units,passengers,speed,speed_units,diesel_intensity,diesel_intensity_units,alternative_fuels_intensity,alternative_fuels_intensity_units,air_conditioning_emission_factor,air_conditioning_emission_factor_units
-transit,10,kilometres,15,20,kilometres_per_hour,0.5,litres_per_kilometre,0,litres_per_kilometre,0,kilograms_per_kilometre
-regional,-10,distance_units,0,,,-2,diesel_intensity_units,-2,alternative_fuels_intensity_units
+name,distance,distance_units,passengers,speed,speed_units,gasoline_intensity,gasoline_intensity_units,diesel_intensity,diesel_intensity_units,cng_intensity,cng_intensity_units,lng_intensity,lng_intensity_units,lpg_intensity,lpg_intensity_units,methanol_intensity,methanol_intensity_units,biodiesel_intensity,biodiesel_intensity_units,electricity_intensity,electricity_intensity_units,air_conditioning_emission_factor,air_conditioning_emission_factor_units,alternative_fuels_intensity,alternative_fuels_intensity_units
+city transit,0,miles,0,0,miles_per_hour,-1,gallons_per_mile,0,gallons_per_mile,-1,gallons_per_mile,-1,gallons_per_mile,-1,gallons_per_mile,-1,gallons_per_mile,-1,gallons_per_mile,-1,kilowatt_hours_per_mile,0,pounds_co2e_per_mile,-1,gallons_per_mile

data/features/support/imports/bus_class_good.csv

@@ -1,3 +1,2 @@
-name,distance,distance_units,passengers,speed,speed_units,diesel_intensity,diesel_intensity_units,alternative_fuels_intensity,alternative_fuels_intensity_units,air_conditioning_emission_factor,air_conditioning_emission_factor_units
-transit,10,kilometres,15,20,kilometres_per_hour,0.5,litres_per_kilometre,0,litres_per_kilometre,0,kilograms_per_kilometre
-regional,100,kilometres,30,80,kilometres_per_hour,0.1,litres_per_kilometre,0.2,litres_per_kilometre,0.5,kilograms_per_kilometre
+name,distance,distance_units,passengers,speed,speed_units,gasoline_intensity,gasoline_intensity_units,diesel_intensity,diesel_intensity_units,cng_intensity,cng_intensity_units,lng_intensity,lng_intensity_units,lpg_intensity,lpg_intensity_units,methanol_intensity,methanol_intensity_units,biodiesel_intensity,biodiesel_intensity_units,electricity_intensity,electricity_intensity_units,air_conditioning_emission_factor,air_conditioning_emission_factor_units,alternative_fuels_intensity,alternative_fuels_intensity_units
+city transit,1,kilometres,1,1,kilometres_per_hour,0,litres_per_kilometre,1,litres_per_kilometre,0,litres_per_kilometre,0,litres_per_kilometre,0,litres_per_kilometre,0,litres_per_kilometre,0,litres_per_kilometre,0,kilowatt_hours_per_kilometre,1,kilograms_co2e_per_kilometre,0,litres_per_kilometre

data/features/support/imports/bus_fuel_bad.csv

@@ -0,0 +1,3 @@
+name,co2_emission_factor,co2_emission_factor_units,co2_biogenic_emission_factor,co2_biogenic_emission_factor_units,ch4_emission_factor,ch4_emission_factor_units,n2o_emission_factor,n2o_emission_factor_units,fuel_name,energy_content,energy_content_units
+CNG,-1,kilograms_per_gallon,-1,kilograms_per_gallon,0,kilograms_per_kilometre,0,kilograms_per_kilometre
+LNG,1,kilograms_per_litre,0,kilograms_per_litre,0.1,kilograms_co2e_per_kilometre,0.1,kilograms_co2e_per_kilometre,Pipeline Natural Gas,0,btu_per_gallon

data/features/support/imports/bus_fuel_good.csv

@@ -0,0 +1,3 @@
+name,co2_emission_factor,co2_emission_factor_units,co2_biogenic_emission_factor,co2_biogenic_emission_factor_units,ch4_emission_factor,ch4_emission_factor_units,n2o_emission_factor,n2o_emission_factor_units,fuel_name,energy_content,energy_content_units
+CNG,0,kilograms_per_litre,1,kilograms_per_litre,0.1,kilograms_co2e_per_kilometre,0.1,kilograms_co2e_per_kilometre,Pipeline Natural Gas
+LNG,1,kilograms_per_litre,0,kilograms_per_litre,0.1,kilograms_co2e_per_kilometre,0.1,kilograms_co2e_per_kilometre,Pipeline Natural Gas,10,megajoules_per_litre

data/features/support/imports/egrid_subregion_bad.csv

@@ -1,3 +1,2 @@
-name,egrid_region_name,electricity_emission_factor,electricity_emission_factor_units
-US,US,1.2,kilograms_per_kilowatt_hour
-AKGD,foo,0
+abbreviation,net_generation,net_generation_units,electricity_co2_emission_factor,electricity_co2_emission_factor_units,electricity_co2_biogenic_emission_factor,electricity_co2_biogenic_emission_factor_units,electricity_ch4_emission_factor,electricity_ch4_emission_factor_units,electricity_n2o_emission_factor,electricity_n2o_emission_factor_units,electricity_emission_factor,electricity_emission_factor_units,egrid_region_name
+NEWE,0,kilowatt_hours,0,pounds_per_megawatt_hour,-1,pounds_per_megawatt_hour,0,pounds_per_gigawatt_hour,0,pounds_per_gigawatt_hour,0,pounds_per_megawatt_hour

data/features/support/imports/egrid_subregion_good.csv

@@ -1,3 +1,2 @@
-name,egrid_region_name,electricity_emission_factor,electricity_emission_factor_units
-US,US,1.2,kilograms_co2e_per_kilowatt_hour
-AKGD,AK,0.9,kilograms_co2e_per_kilowatt_hour
+abbreviation,net_generation,net_generation_units,electricity_co2_emission_factor,electricity_co2_emission_factor_units,electricity_co2_biogenic_emission_factor,electricity_co2_biogenic_emission_factor_units,electricity_ch4_emission_factor,electricity_ch4_emission_factor_units,electricity_n2o_emission_factor,electricity_n2o_emission_factor_units,electricity_emission_factor,electricity_emission_factor_units,egrid_region_name
+NEWE,1350,megawatt_hours,0.4,kilograms_per_kilowatt_hour,0,kilograms_per_kilowatt_hour,0.001,kilograms_co2e_per_kilowatt_hour,0.002,kilograms_co2e_per_kilowatt_hour,0.4,kilograms_co2e_per_kilowatt_hour,E

data/lib/earth/automobile/automobile_fuel.rb

@@ -18,74 +18,79 @@ class AutomobileFuel < ActiveRecord::Base
       diesel_use = AutomobileTypeFuelYear.where(:year => latest_year, :fuel_common_name => 'diesel').sum('fuel_consumption')
       diesel_use / (gas_use + diesel_use)
     end
+    
+    def fallback_co2_emission_factor
+      (Fuel.find_by_name("Motor Gasoline").co2_emission_factor * (1 - AutomobileFuel.fallback_blend_portion)) +
+      (Fuel.find_by_name("Distillate Fuel Oil No. 2").co2_emission_factor * AutomobileFuel.fallback_blend_portion)
+    end
+    
+    def fallback_co2_emission_factor_units
+      Fuel.find_by_name("Motor Gasoline").co2_emission_factor_units
+    end
+    
+    def fallback_co2_biogenic_emission_factor
+      (Fuel.find_by_name("Motor Gasoline").co2_biogenic_emission_factor * (1 - AutomobileFuel.fallback_blend_portion)) +
+      (Fuel.find_by_name("Distillate Fuel Oil No. 2").co2_biogenic_emission_factor * AutomobileFuel.fallback_blend_portion)
+    end
+    
+    def fallback_co2_biogenic_emission_factor_units
+      Fuel.find_by_name("Motor Gasoline").co2_biogenic_emission_factor_units
+    end
+    
+    def fallback_latest_type_fuel_years
+      AutomobileTypeFuelYear.where(:year => AutomobileTypeFuelYear.maximum('year'))
+    end
+    
+    def fallback_ch4_emission_factor
+      fallback_latest_type_fuel_years.weighted_average(:ch4_emission_factor, :weighted_by => :total_travel) * GreenhouseGas[:ch4].global_warming_potential
+    end
+    
+    def fallback_ch4_emission_factor_units
+      prefix = fallback_latest_type_fuel_years.first.ch4_emission_factor_units.split("_per_")[0]
+      suffix = fallback_latest_type_fuel_years.first.ch4_emission_factor_units.split("_per_")[1]
+      prefix + "_co2e_per_" + suffix
+    end
+    
+    def fallback_n2o_emission_factor
+      fallback_latest_type_fuel_years.weighted_average(:n2o_emission_factor, :weighted_by => :total_travel) * GreenhouseGas[:n2o].global_warming_potential
+    end
+    
+    def fallback_n2o_emission_factor_units
+      prefix = fallback_latest_type_fuel_years.first.n2o_emission_factor_units.split("_per_")[0]
+      suffix = fallback_latest_type_fuel_years.first.n2o_emission_factor_units.split("_per_")[1]
+      prefix + "_co2e_per_" + suffix
+    end
+    
+    def fallback_hfc_emission_factor
+      fallback_latest_type_fuel_years.map do |tfy|
+        tfy.total_travel * tfy.type_year.hfc_emission_factor
+      end.sum / fallback_latest_type_fuel_years.sum('total_travel')
+    end
+    
+    def fallback_hfc_emission_factor_units
+      fallback_latest_type_fuel_years.first.type_year.hfc_emission_factor_units
+    end
   end
   
-  falls_back_on :name => 'fallback',
-                :base_fuel_name => 'Motor Gasoline',
-                :blend_fuel_name => 'Distillate Fuel Oil No. 2',
-                :blend_portion => lambda { AutomobileFuel.fallback_blend_portion },
-                :distance_key => 'fallback',
-                :ef_key => 'fallback'
+  falls_back_on :co2_emission_factor => lambda { AutomobileFuel.fallback_co2_emission_factor },
+                :co2_emission_factor_units => lambda { AutomobileFuel.fallback_co2_emission_factor_units },
+                :co2_biogenic_emission_factor => lambda { AutomobileFuel.fallback_co2_biogenic_emission_factor },
+                :co2_biogenic_emission_factor_units => lambda { AutomobileFuel.fallback_co2_biogenic_emission_factor_units },
+                :ch4_emission_factor => lambda { AutomobileFuel.fallback_ch4_emission_factor },
+                :ch4_emission_factor_units => lambda { AutomobileFuel.fallback_ch4_emission_factor_units },
+                :n2o_emission_factor => lambda { AutomobileFuel.fallback_n2o_emission_factor },
+                :n2o_emission_factor_units => lambda { AutomobileFuel.fallback_n2o_emission_factor_units },
+                :hfc_emission_factor => lambda { AutomobileFuel.fallback_hfc_emission_factor },
+                :hfc_emission_factor_units => lambda { AutomobileFuel.fallback_hfc_emission_factor_units }
   
   data_miner do
-    tap "Brighter Planet's sanitized automobile fuel type data", Earth.taps_server
+    tap "Brighter Planet's sanitized automobile fuel data", Earth.taps_server
     
     process "pull dependencies" do
       run_data_miner_on_belongs_to_associations
     end
   end
   
-  # FIXME TODO should I run data miner on has_many associations?
-  # AutomobileTypeFuelYearAge
-  # => AutomobileTypeFuelYearControl
-  # => AutomobileTypeFuelControl
-  # AutomobileTypeYear
-  
-  # FIXME TODO should I run data miner on other classes we need?
-  # Fuel
-  # => FuelYear
-  # GreenhouseGas
-  
-  def annual_distance # returns km
-    scope = type_fuel_year_ages.any? ? type_fuel_year_ages : AutomobileTypeFuelYearAge
-    scope.where(:year => scope.maximum('year')).weighted_average(:annual_distance, :weighted_by => :vehicles)
-  end
-  
-  def co2_emission_factor # returns kg co2 / litre
-    if blend_fuel.present?
-      (base_fuel.co2_emission_factor * (1 - blend_portion)) + (blend_fuel.co2_emission_factor * blend_portion)
-    else
-      base_fuel.co2_emission_factor
-    end
-  end
-  
-  def co2_biogenic_emission_factor # returns kg co2 / litre
-    if blend_fuel.present?
-      (base_fuel.co2_biogenic_emission_factor * (1 - blend_portion)) + (blend_fuel.co2_biogenic_emission_factor * blend_portion)
-    else
-      base_fuel.co2_biogenic_emission_factor
-    end
-  end
-  
-  def latest_type_fuel_years
-    scope = type_fuel_years.any? ? type_fuel_years : AutomobileTypeFuelYear
-    scope.where(:year => scope.maximum('year'))
-  end
-  
-  def ch4_emission_factor # returns kg co2e / litre
-    latest_type_fuel_years.weighted_average(:ch4_emission_factor, :weighted_by => :total_travel) * GreenhouseGas[:ch4].global_warming_potential
-  end
-  
-  def n2o_emission_factor # returns kg co2e / litre
-    latest_type_fuel_years.weighted_average(:n2o_emission_factor, :weighted_by => :total_travel) * GreenhouseGas[:n2o].global_warming_potential
-  end
-  
-  def hfc_emission_factor # returns kg co2e / litre (hfc emission factor is already in co2e)
-    latest_type_fuel_years.map do |type_fuel_year|
-      type_fuel_year.total_travel * type_fuel_year.type_year.hfc_emission_factor
-    end.sum / latest_type_fuel_years.sum('total_travel')
-  end
-  
   CODES = {
     :electricity => 'El',
     :diesel => 'D'

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

@@ -8,6 +8,18 @@ AutomobileFuel.class_eval do
       float  'blend_portion' # the portion of the blend that is the blend fuel
       string 'distance_key' # used to look up annual distance from AutomobileTypeFuelYear
       string 'ef_key' # used to look up ch4 n2o and hfc emission factors from AutomobileTypeFuelYear
+      float  'annual_distance'
+      string 'annual_distance_units'
+      float  'co2_emission_factor'
+      string 'co2_emission_factor_units'
+      float  'co2_biogenic_emission_factor'
+      string 'co2_biogenic_emission_factor_units'
+      float  'ch4_emission_factor'
+      string 'ch4_emission_factor_units'
+      float  'n2o_emission_factor'
+      string 'n2o_emission_factor_units'
+      float  'hfc_emission_factor'
+      string 'hfc_emission_factor_units'
     end
     
     import "a list of pure automobile fuels",
@@ -30,6 +42,60 @@ AutomobileFuel.class_eval do
       store 'ef_key'
     end
     
+    process "Ensure necessary datasets are imported" do
+      AutomobileTypeFuelYearAge.run_data_miner!
+      AutomobileTypeYear.run_data_miner!
+      Fuel.run_data_miner!
+      GreenhouseGas.run_data_miner!
+    end
+    
+    process "Derive annual distance" do
+      AutomobileFuel.all.each do |record|
+        scope = record.type_fuel_year_ages.where(:year => record.type_fuel_year_ages.maximum('year'))
+        record.annual_distance = scope.weighted_average(:annual_distance, :weighted_by => :vehicles)
+        record.annual_distance_units = scope.first.annual_distance_units
+        record.save
+      end
+    end
+    
+    process "Derive co2 emission factor and co2 biogenic emission factors" do
+      AutomobileFuel.all.each do |record|
+        if record.blend_fuel.present?
+          record.co2_emission_factor = (record.base_fuel.co2_emission_factor * (1 - record.blend_portion)) + (record.blend_fuel.co2_emission_factor * record.blend_portion)
+          record.co2_biogenic_emission_factor = (record.base_fuel.co2_biogenic_emission_factor * (1 - record.blend_portion)) + (record.blend_fuel.co2_biogenic_emission_factor * record.blend_portion)
+        else
+          record.co2_emission_factor = record.base_fuel.co2_emission_factor
+          record.co2_biogenic_emission_factor = record.base_fuel.co2_biogenic_emission_factor
+        end
+        record.co2_emission_factor_units = record.base_fuel.co2_emission_factor_units
+        record.co2_biogenic_emission_factor_units = record.base_fuel.co2_biogenic_emission_factor_units
+        record.save
+      end
+    end
+    
+    process "Derive ch4, n2o, and hfc emission factors" do
+      AutomobileFuel.all.each do |record|
+        scope = record.type_fuel_years.where(:year => record.type_fuel_years.maximum('year'))
+        
+        record.ch4_emission_factor = scope.weighted_average(:ch4_emission_factor, :weighted_by => :total_travel) * GreenhouseGas[:ch4].global_warming_potential
+        ch4_prefix = scope.first.ch4_emission_factor_units.split("_per_")[0]
+        ch4_suffix = scope.first.ch4_emission_factor_units.split("_per_")[1]
+        record.ch4_emission_factor_units = ch4_prefix + "_co2e_per_" + ch4_suffix
+        
+        record.n2o_emission_factor = scope.weighted_average(:n2o_emission_factor, :weighted_by => :total_travel) * GreenhouseGas[:n2o].global_warming_potential
+        n2o_prefix = scope.first.n2o_emission_factor_units.split("_per_")[0]
+        n2o_suffix = scope.first.n2o_emission_factor_units.split("_per_")[1]
+        record.n2o_emission_factor_units = n2o_prefix + "_co2e_per_" + n2o_suffix
+        
+        record.hfc_emission_factor = scope.map do |tfy|
+          tfy.total_travel * tfy.type_year.hfc_emission_factor
+        end.sum / scope.sum('total_travel')
+        record.hfc_emission_factor_units = scope.first.type_year.hfc_emission_factor_units
+        
+        record.save
+      end
+    end
+    
     # FIXME TODO verify code somehow
     
     %w{ base_fuel_name distance_key ef_key }.each do |attribute|
@@ -37,6 +103,7 @@ AutomobileFuel.class_eval do
         AutomobileFuel.all.each do |fuel|
           value = fuel.send(:"#{attribute}")
           unless value.present?
+            puts "Missing #{attribute.humanize.downcase} for AutomobileFuel #{fuel.name}"
             raise "Missing #{attribute.humanize.downcase} for AutomobileFuel #{fuel.name}"
           end
         end
@@ -51,10 +118,53 @@ AutomobileFuel.class_eval do
       AutomobileFuel.all.each do |fuel|
         if fuel.blend_portion.present?
           unless fuel.blend_portion >=0 and fuel.blend_portion <= 1
+            puts "Invalid blend portion for AutomobileFuel #{fuel.name}: #{fuel.blend_portion} (should be from 0 to 1)"
             raise "Invalid blend portion for AutomobileFuel #{fuel.name}: #{fuel.blend_portion} (should be from 0 to 1)"
           end
         end
       end
     end
+    
+    ["co2_emission_factor", "co2_biogenic_emission_factor"].each do |attribute|
+      verify "#{attribute.humanize} should be 0 or more" do
+        AutomobileFuel.all.each do |fuel|
+          value = fuel.send(attribute)
+          unless value >= 0
+            puts "Invalid #{attribute.humanize.downcase} for AutomobileFuel #{fuel.name}: #{value} (should be 0 or more)"
+            raise "Invalid #{attribute.humanize.downcase} for AutomobileFuel #{fuel.name}: #{value} (should be 0 or more)"
+          end
+        end
+      end
+    end
+    
+    ["ch4_emission_factor", "n2o_emission_factor", "hfc_emission_factor"].each do |attribute|
+      verify "#{attribute.humanize} should be > 0" do
+        AutomobileFuel.all.each do |fuel|
+          value = fuel.send(attribute)
+          unless value > 0
+            puts "Invalid #{attribute.humanize.downcase} for AutomobileFuel #{fuel.name}: #{value} (should be > 0)"
+            raise "Invalid #{attribute.humanize.downcase} for AutomobileFuel #{fuel.name}: #{value} (should be > 0)"
+          end
+        end
+      end
+    end
+    
+    [["co2_emission_factor_units", "kilograms_per_litre"],
+     ["co2_biogenic_emission_factor_units", "kilograms_per_litre"],
+     ["ch4_emission_factor_units", "kilograms_co2e_per_litre"],
+     ["n2o_emission_factor_units", "kilograms_co2e_per_litre"],
+     ["hfc_emission_factor_units", "kilograms_co2e_per_litre"]].each do |pair|
+      attribute = pair[0]
+      proper_units = pair[1]
+      verify "#{attribute.humanize} should be #{proper_units.humanize.downcase}" do
+        AutomobileFuel.all.each do |fuel|
+          units = fuel.send(attribute)
+          unless units == proper_units
+            puts "Invalid #{attribute.humanize.downcase} for AutomobileFuel #{fuel.name}: #{units} (should be #{proper_units})"
+            fail
+          end
+        end
+      end
+    end
   end
 end

data/lib/earth/bus.rb

@@ -1 +1,4 @@
 require 'earth/bus/bus_class'
+require 'earth/bus/bus_fuel'
+require 'earth/bus/bus_fuel_control'
+require 'earth/bus/bus_fuel_year_control'

data/lib/earth/bus/bus_class.rb

@@ -4,10 +4,29 @@ class BusClass < ActiveRecord::Base
   # https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHY0R0hjZnhRaTIxTnpvRk1HNThwUmc&hl=en&output=html
   falls_back_on :passengers => 7.485,
                 :distance => 4.9726.miles.to(:kilometres),
+                :distance_units => 'kilometres',
                 :speed => 19.849.miles.to(:kilometres),
+                :speed_units => 'kilometres_per_hour',
+                :gasoline_intensity => 0.00064134.gallons_per_mile.to(:litres_per_kilometre),
+                :gasoline_intensity_units => 'litres_per_kilometre',
                 :diesel_intensity => 0.13836.gallons_per_mile.to(:litres_per_kilometre),
-                :alternative_fuels_intensity => 0.04632038.gallons_per_mile.to(:litres_per_kilometre),
-                :air_conditioning_emission_factor => 0.04779 / 1.miles.to(:kilometres)
+                :diesel_intensity_units => 'litres_per_kilometre',
+                :cng_intensity => 0.03175.gallons_per_mile.to(:litres_per_kilometre),
+                :cng_intensity_units => 'litres_per_kilometre',
+                :lng_intensity => 0.00419.gallons_per_mile.to(:litres_per_kilometre),
+                :lng_intensity_units => 'litres_per_kilometre',
+                :lpg_intensity => 0.00037.gallons_per_mile.to(:litres_per_kilometre),
+                :lpg_intensity_units => 'litres_per_kilometre',
+                :methanol_intensity => 0.00021.gallons_per_mile.to(:litres_per_kilometre),
+                :methanol_intensity_units => 'litres_per_kilometre',
+                :biodiesel_intensity => 0.00979.gallons_per_mile.to(:litres_per_kilometre),
+                :biodiesel_intensity_units => 'litres_per_kilometre',
+                :electricity_intensity => 0.00001804 / 1.miles.to(:kilometres),
+                :electricity_intensity_units => 'kilowatt_hours_per_kilometre',
+                :air_conditioning_emission_factor => 0.04779 / 1.miles.to(:kilometres),
+                :air_conditioning_emission_factor_units => 'kilograms_co2e_per_kilometre',
+                :alternative_fuels_intensity => 0.04632038.gallons_per_mile.to(:litres_per_kilometre), # deprecated
+                :alternative_fuels_intensity_units => 'litres_per_kilometre' # deprecated
   
   data_miner do
     tap "Brighter Planet's sanitized bus class data", Earth.taps_server

data/lib/earth/bus/bus_class/data_miner.rb

@@ -7,94 +7,130 @@ BusClass.class_eval do
       float  'passengers'
       float  'speed'
       string 'speed_units'
+      float  'gasoline_intensity'
+      string 'gasoline_intensity_units'
       float  'diesel_intensity'
       string 'diesel_intensity_units'
-      float  'alternative_fuels_intensity'
-      string 'alternative_fuels_intensity_units'
+      float  'cng_intensity'
+      string 'cng_intensity_units'
+      float  'lng_intensity'
+      string 'lng_intensity_units'
+      float  'lpg_intensity'
+      string 'lpg_intensity_units'
+      float  'methanol_intensity'
+      string 'methanol_intensity_units'
+      float  'biodiesel_intensity'
+      string 'biodiesel_intensity_units'
+      float  'electricity_intensity'
+      string 'electricity_intensity_units'
       float  'air_conditioning_emission_factor'
       string 'air_conditioning_emission_factor_units'
+      float  'alternative_fuels_intensity'
+      string 'alternative_fuels_intensity_units'
     end
     
     import "a list of bus classes and pre-calculated trip and fuel use characteristics",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGRsSnJoS1hraGJvR012cDROWXFPbVE&hl=en&single=true&gid=0&output=csv' do
+           :url => 'https://spreadsheets.google.com/pub?hl=en&hl=en&key=0AoQJbWqPrREqdGRsSnJoS1hraGJvR012cDROWXFPbVE&output=csv' do
       key   'name'
       store 'distance', :units_field_name => 'distance_units'
       store 'passengers'
       store 'speed', :units_field_name => 'speed_units'
+      store 'gasoline_intensity', :units_field_name => 'gasoline_intensity_units'
       store 'diesel_intensity', :units_field_name => 'diesel_intensity_units'
-      store 'alternative_fuels_intensity', :units_field_name => 'alternative_fuels_intensity_units'
+      store 'cng_intensity', :units_field_name => 'cng_intensity_units'
+      store 'lng_intensity', :units_field_name => 'lng_intensity_units'
+      store 'lpg_intensity', :units_field_name => 'lpg_intensity_units'
+      store 'methanol_intensity', :units_field_name => 'methanol_intensity_units'
+      store 'biodiesel_intensity', :units_field_name => 'biodiesel_intensity_units'
+      store 'electricity_intensity', :units_field_name => 'electricity_intensity_units'
       store 'air_conditioning_emission_factor', :units_field_name => 'air_conditioning_emission_factor_units'
+      store 'alternative_fuels_intensity', :units_field_name => 'alternative_fuels_intensity_units'
     end
     
-    verify "Distance, passengers, speed, and diesel intensity should be greater than zero" do
+    verify "Some attributes should be greater than zero" do
       BusClass.all.each do |bus_class|
-        %w{ distance passengers speed diesel_intensity }.each do |attribute|
+        %w{ distance passengers speed diesel_intensity air_conditioning_emission_factor }.each do |attribute|
           value = bus_class.send(:"#{attribute}")
           unless value > 0
-            raise "Invalid #{attribute} for BusClass #{bus_class.name}: #{value} (should be > 0)"
+            puts "Invalid #{attribute.humanize.downcase} for BusClass #{bus_class.name}: #{value} (should be > 0)"
+            fail
           end
         end
       end
     end
     
-    verify "Alternative fuels intensity and air conditioning emission factor should be zero or more" do
+    verify "Some attributes should be zero or more" do
       BusClass.all.each do |bus_class|
-        %w{ alternative_fuels_intensity air_conditioning_emission_factor }.each do |attribute|
+        %w{ gasoline_intensity cng_intensity lng_intensity lpg_intensity methanol_intensity biodiesel_intensity electricity_intensity alternative_fuels_intensity }.each do |attribute|
           value = bus_class.send(:"#{attribute}")
           unless value >= 0
-            raise "Invalid #{attribute} for BusClass #{bus_class.name}: #{value} (should be >= 0)"
+            puts "Invalid #{attribute.humanize.downcase} for BusClass #{bus_class.name}: #{value} (should be >= 0)"
+            fail
           end
         end
       end
     end
     
-    verify "Distance units should be kilometres" do
-      BusClass.all.each do |bus_class|
-        unless bus_class.distance_units == "kilometres"
-          raise "Invalid distance units for BusClass #{bus_class.name}: #{bus_class.distance_units} (should be kilometres)"
-        end
-      end
-    end
-    
-    verify "Speed units should be kilometres per hour" do
-      BusClass.all.each do |bus_class|
-        unless bus_class.speed_units == "kilometres_per_hour"
-          raise "Invalid speed units for BusClass #{bus_class.name}: #{bus_class.speed_units} (should be kilometres_per_hour)"
-        end
-      end
-    end
-    
-    verify "Diesel intensity and alternative fuel intensity units should be litres per kilometre" do
+    verify "Units should be correct" do
       BusClass.all.each do |bus_class|
-        %w{ diesel_intensity alternative_fuels_intensity }.each do |attribute|
-          units = bus_class.send(:"#{attribute}_units")
-          unless units == "litres_per_kilometre"
-            raise "Invalid #{attribute}_units for BusClass #{bus_class.name}: #{units} (should be litres_per_kilometre)"
+        [["distance_units", "kilometres"],
+         ["speed_units", "kilometres_per_hour"],
+         ["diesel_intensity_units", "litres_per_kilometre"],
+         ["gasoline_intensity_units", "litres_per_kilometre"],
+         ["cng_intensity_units", "litres_per_kilometre"],
+         ["lng_intensity_units", "litres_per_kilometre"],
+         ["lpg_intensity_units", "litres_per_kilometre"],
+         ["methanol_intensity_units", "litres_per_kilometre"],
+         ["biodiesel_intensity_units", "litres_per_kilometre"],
+         ["electricity_intensity_units", "kilowatt_hours_per_kilometre"],
+         ["air_conditioning_emission_factor_units", "kilograms_co2e_per_kilometre"],
+         ["alternative_fuels_intensity_units", "litres_per_kilometre"]].each do |pair|
+          attribute = pair[0]
+          proper_units = pair[1]
+          units = bus_class.send(:"#{attribute}")
+          unless units == proper_units
+            puts "Invalid #{attribute.humanize.downcase} for BusClass #{bus_class.name}: #{units} (should be #{proper_units})"
+            fail
           end
         end
       end
     end
     
-    verify "Air conditioning emission factor units should be kilograms per kilometre" do
-      BusClass.all.each do |bus_class|
-        unless bus_class.air_conditioning_emission_factor_units == "kilograms_per_kilometre"
-          raise "Invalid air conditioning emission factor units for BusClass #{bus_class.name}: #{bus_class.air_conditioning_emission_factor_units} (should be kilograms_per_kilometre)"
-        end
-      end
-    end
-    
     verify "Fallbacks should satisfy same constraints as data" do
-      %w{ distance passengers speed diesel_intensity }.each do |attribute|
+      %w{ distance passengers speed diesel_intensity air_conditioning_emission_factor }.each do |attribute|
         value = BusClass.fallback.send(:"#{attribute}")
         unless value > 0
-          raise "Invalid BusClass fallback #{attribute}: #{value} (should be > 0)"
+          puts "Invalid #{attribute.humanize.downcase} for fallback BusClass: #{value} (should be > 0)"
+          fail
         end
       end
       
-      %w{ alternative_fuels_intensity air_conditioning_emission_factor }.each do |attribute|
+      %w{ gasoline_intensity cng_intensity lng_intensity lpg_intensity methanol_intensity biodiesel_intensity electricity_intensity alternative_fuels_intensity }.each do |attribute|
         value = BusClass.fallback.send(:"#{attribute}")
         unless value >= 0
-          raise "Invalid BusClass fallback #{attribute}: #{value} (should be >= 0)"
+          puts "Invalid #{attribute.humanize.downcase} for fallback BusClass: #{value} (should be >= 0)"
+          fail
+        end
+      end
+      
+      [["distance_units", "kilometres"],
+       ["speed_units", "kilometres_per_hour"],
+       ["diesel_intensity_units", "litres_per_kilometre"],
+       ["gasoline_intensity_units", "litres_per_kilometre"],
+       ["cng_intensity_units", "litres_per_kilometre"],
+       ["lng_intensity_units", "litres_per_kilometre"],
+       ["lpg_intensity_units", "litres_per_kilometre"],
+       ["methanol_intensity_units", "litres_per_kilometre"],
+       ["biodiesel_intensity_units", "litres_per_kilometre"],
+       ["electricity_intensity_units", "kilowatt_hours_per_kilometre"],
+       ["air_conditioning_emission_factor_units", "kilograms_co2e_per_kilometre"],
+       ["alternative_fuels_intensity_units", "litres_per_kilometre"]].each do |pair|
+        attribute = pair[0]
+        proper_units = pair[1]
+        units = BusClass.fallback.send(:"#{attribute}")
+        unless units == proper_units
+          puts "Invalid #{attribute.humanize.downcase} for fallback BusClass: #{units} (should be #{proper_units})"
+          fail
         end
       end
     end