earth 0.12.0 → 0.12.1

data/errata/country/wri_errata.csv

@@ -1,25 +1,25 @@
 date,name,email,type,section,action,x,y,condition,notes
-1/25/2012,Ian Hough,ian@brighterplanet.com,meta,Intended use,,Country degree days import
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Bolivia,"Bolivia, Plurinational State of",,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Bosnia & Herzegovina,Bosnia and Herzegovina,,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Brunei*,Brunei Darussalam,,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,"Congo, Dem. Republic","Congo, The Democratic Republic of the",,match iso country names
-3/15/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Cote d'Ivoire,Côte d'Ivoire,,be sure to include utf8 chars
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Iran,"Iran, Islamic Republic of",,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Iraq*,Iraq,,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Korea (North),"Korea, Democratic People's Republic of ",,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Korea (South),"Korea, Republic of ",,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Laos,Lao People's Democratic Republic,,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Libya,Libyan Arab Jamahiriya,,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,"Macedonia, FYR","Macedonia, The Former Yugoslav Republic of",,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Moldova,"Moldova, Republic of",,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Saint Kitts & Nevis,Saint Kitts and Nevis,,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Sao Tome & Principe,Sao Tome and Principe,,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Serbia & Montenegro,Serbia,,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Syria,Syrian Arab Republic,,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Taiwan*,"Taiwan, Province of China",,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Tanzania,"Tanzania, United Republic of",,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Trinidad & Tobago,Trinidad and Tobago,,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,United States of America,United States,,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Venezuela,"Venezuela, Bolivarian Republic of",,match iso country names
-1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Vietnam,Viet Nam,,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,meta,Intended use,,Country degree days import,,,
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Bolivia,"Bolivia, Plurinational State of",,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Bosnia & Herzegovina,Bosnia and Herzegovina,,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Brunei*,Brunei Darussalam,,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,"Congo, Dem. Republic","Congo, The Democratic Republic of the",,match iso country names
+3/15/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Cote d'Ivoire,Côte d'Ivoire,,be sure to include utf8 chars
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Iran,"Iran, Islamic Republic of",,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Iraq*,Iraq,,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Korea (North),"Korea, Democratic People's Republic of ",,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Korea (South),"Korea, Republic of ",,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Laos,Lao People's Democratic Republic,,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Libya,Libyan Arab Jamahiriya,,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,"Macedonia, FYR","Macedonia, The Former Yugoslav Republic of",,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Moldova,"Moldova, Republic of",,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Saint Kitts & Nevis,Saint Kitts and Nevis,,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Sao Tome & Principe,Sao Tome and Principe,,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Serbia & Montenegro,Serbia,,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Syria,Syrian Arab Republic,,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Taiwan*,"Taiwan, Province of China",,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Tanzania,"Tanzania, United Republic of",,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Trinidad & Tobago,Trinidad and Tobago,,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,United States of America,United States,,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Venezuela,"Venezuela, Bolivarian Republic of",,match iso country names
+1/25/12,Ian Hough,ian@brighterplanet.com,technical,country,replace,Vietnam,Viet Nam,,match iso country names

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

@@ -18,9 +18,10 @@ AutomobileActivityYear.class_eval do
     
     process "Derive hfc emission factor from AutomobileActivityYearType" do
       find_each do |ay|
-        ay.hfc_emission_factor =  ay.activity_year_types.sum(&:hfc_emissions) / ay.activity_year_types.sum{ |ayt| ayt.activity_year_type_fuels.sum(&:distance) }
-        ay.hfc_emission_factor_units = ay.activity_year_types.first.hfc_emission_factor_units
-        ay.save!
+        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
+        )
       end
     end
   end

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

@@ -18,9 +18,10 @@ AutomobileActivityYearType.class_eval do
     
     process "Derive hfc emission factor from AutomobileActivityYearTypeFuel" do
       find_each do |ayt|
-        ayt.hfc_emission_factor = ayt.hfc_emissions / ayt.activity_year_type_fuels.sum(:distance)
-        ayt.hfc_emission_factor_units = ayt.hfc_emissions_units + '_per_' + ayt.activity_year_type_fuels.first.distance_units.singularize
-        ayt.save!
+        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
+        )
       end
     end
   end

data/lib/earth/automobile/automobile_activity_year_type_fuel.rb

@@ -9,7 +9,7 @@ class AutomobileActivityYearTypeFuel < ActiveRecord::Base
   col :name
   col :activity_year, :type => :integer
   col :type_name
-  col :fuel_common_name
+  col :fuel_group
   col :distance, :type => :float
   col :distance_units
   col :fuel_consumption, :type => :float

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

@@ -14,7 +14,7 @@ AutomobileActivityYearTypeFuel.class_eval do
         key   'name', :synthesize => proc { |row| "#{row['Year']} #{type} gasoline" }
         store 'activity_year', :field_name => 'Year'
         store 'type_name', :static => type
-        store 'fuel_common_name', :static => 'gasoline'
+        store 'fuel_group', :static => 'gasoline'
         store 'distance', :field_name => type, :from_units => :billion_miles, :to_units => :kilometres
       end
       
@@ -27,7 +27,7 @@ AutomobileActivityYearTypeFuel.class_eval do
         key   'name', :synthesize => proc { |row| "#{row['Year']} #{type} diesel" }
         store 'activity_year', :field_name => 'Year'
         store 'type_name', :static => type
-        store 'fuel_common_name', :static => 'diesel'
+        store 'fuel_group', :static => 'diesel'
         store 'distance', :field_name => type, :from_units => :billion_miles, :to_units => :kilometres
       end
       
@@ -40,7 +40,7 @@ AutomobileActivityYearTypeFuel.class_eval do
         key   'name', :synthesize => proc { |row| "#{row['Year']} #{type} alternative" }
         store 'activity_year', :field_name => 'Year'
         store 'type_name', :static => type
-        store 'fuel_common_name', :static => 'alternative'
+        store 'fuel_group', :static => 'alternative'
         store 'distance', :field_name => type, :from_units => :billion_miles, :to_units => :kilometres
       end
     end
@@ -50,7 +50,7 @@ AutomobileActivityYearTypeFuel.class_eval do
       key   'name'
       store 'activity_year'
       store 'type_name'
-      store 'fuel_common_name'
+      store 'fuel_group'
       store 'fuel_consumption', :from_units => :million_gallons, :to_units => :litres
     end
   end

data/lib/earth/automobile/automobile_fuel.rb

@@ -8,16 +8,16 @@ class AutomobileFuel < ActiveRecord::Base
   belongs_to :blend_fuel, :class_name => 'Fuel', :foreign_key => 'blend_fuel_name'
   
   # for calculating gas and diesel annual distance and ch4 + n2o efs
-  has_many :type_fuels, :foreign_key => :fuel_common_name, :primary_key => :common_name, :class_name => 'AutomobileTypeFuel'
+  has_many :type_fuels, :foreign_key => :fuel_group, :primary_key => :group, :class_name => 'AutomobileTypeFuel'
   
   # for fallback
   class << self
     def diesel
-      AutomobileFuel.find 'diesel'
+      find 'diesel'
     end
     
     def gasoline
-      AutomobileFuel.find 'gasoline'
+      find 'gasoline'
     end
     
     def fallback_blend_portion
@@ -68,7 +68,7 @@ class AutomobileFuel < ActiveRecord::Base
   
   col :name
   col :code
-  col :common_name
+  col :group
   col :distance_key
   col :base_fuel_name
   col :blend_fuel_name
@@ -89,7 +89,7 @@ class AutomobileFuel < ActiveRecord::Base
   col :total_consumption_units
   
   warn_unless_size 12
-  warn_if_blanks :code, :common_name, :distance_key
+  warn_if_blanks :code, :group, :distance_key
   warn_if do
     if exists?("name != 'electricity' AND base_fuel_name IS NULL")
       "Records missing #{col}"

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

@@ -10,7 +10,7 @@ AutomobileFuel.class_eval do
            :url => "file://#{Earth::DATA_DIR}/automobile/auto_fuel_data.csv" do
       key   'name'
       store 'code'
-      store 'common_name'
+      store 'group'
       store 'distance_key'
       store 'base_fuel_name', :nullify => true
       store 'blend_fuel_name', :nullify => true
@@ -22,10 +22,10 @@ AutomobileFuel.class_eval do
     end
     
     process "Derive energy content and co2 emission factors from Fuel" do
-      elec = AutomobileFuel.find 'electricity'
-      elec.energy_content = 1.kilowatt_hours.to(:megajoules)
-      elec.energy_content_units = 'megajoules_per_kilowatt_hour'
-      elec.save!
+      AutomobileFuel.find('electricity').update_attributes!(
+        :energy_content => 1.kilowatt_hours.to(:megajoules),
+        :energy_content_units => 'megajoules_per_kilowatt_hour'
+      )
       
       where("name != 'electricity'").each do |auto_fuel|
         %w{ energy_content co2_emission_factor co2_biogenic_emission_factor }.each do |method|
@@ -34,10 +34,12 @@ AutomobileFuel.class_eval do
           else
             auto_fuel.base_fuel.send method
           end
-          auto_fuel.send("#{method}=", value)
-          auto_fuel.send("#{method}_units=", auto_fuel.base_fuel.send("#{method}_units"))
+          
+          auto_fuel.update_attributes!(
+            :"#{method}" => value,
+            :"#{method}_units" => auto_fuel.base_fuel.send("#{method}_units")
+          )
         end
-        auto_fuel.save!
       end
     end
     
@@ -56,14 +58,17 @@ AutomobileFuel.class_eval do
       find_each do |record|
         if (type_fuels = record.type_fuels).any?
           %w{ annual_distance ch4_emission_factor n2o_emission_factor }.each do |item|
-            record.send("#{item}=", type_fuels.weighted_average(item, :weighted_by => :vehicles))
-            record.send("#{item}_units=", type_fuels.first.send("#{item}_units"))
+            record.update_attributes!(
+              :"#{item}" => type_fuels.weighted_average(item, :weighted_by => :vehicles),
+              :"#{item}_units" => type_fuels.first.send("#{item}_units")
+            )
           end
           unless record.name =~ / gasoline/
-            record.total_consumption = record.type_fuels.sum(:fuel_consumption)
-            record.total_consumption_units = record.type_fuels.first.fuel_consumption_units
+            record.update_attributes!(
+              :total_consumption => record.type_fuels.sum(:fuel_consumption),
+              :total_consumption_units => record.type_fuels.first.fuel_consumption_units
+            )
           end
-          record.save!
         end
       end
     end

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

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

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

@@ -25,18 +25,17 @@ AutomobileMakeModel.class_eval do
       find_each do |amm|
         codes = amm.model_years.map(&:fuel_code).uniq
         if codes.count == 1
-          amm.fuel_code = codes.first
+          amm.update_attributes! :fuel_code => codes.first
         elsif codes.all?{ |code| ['R', 'P', 'G'].include? code }
-          amm.fuel_code = 'G'
+          amm.update_attributes! :fuel_code => 'G'
         end
         
         alt_codes = amm.model_years.map(&:alt_fuel_code).uniq
-        amm.alt_fuel_code = (alt_codes.first if alt_codes.count == 1)
-        
         type_names = amm.model_years.map(&:type_name).uniq
-        amm.type_name = (type_names.one? ? type_names.first : nil)
-        
-        amm.save!
+        amm.update_attributes!(
+          :alt_fuel_code => (alt_codes.first if alt_codes.count == 1),
+          :type_name => (type_names.first if type_names.one?)
+        )
       end
     end
     

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

@@ -63,8 +63,7 @@ AutomobileMakeModelYear.class_eval do
     process "Derive type name from AutomobileMakeModelYearVariant" do
       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.type_name = (type_names.one? ? type_names.first : nil)
-        ammy.save!
+        ammy.update_attributes! :type_name => (type_names.first if type_names.one?)
       end
     end
     

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

@@ -391,8 +391,7 @@ AutomobileMakeModelYearVariant.class_eval do
         hybrids << where(:make_name => 'Buick', :model_name => 'REGAL', :year => 2012, :alt_fuel_code => nil).sort_by!(&:fuel_efficiency_city).last
       end
       hybrids.each do |hybrid|
-        hybrid.model_name += ' HYBRID'
-        hybrid.save!
+        hybrid.update_attributes! :model_name => hybrid.model_name + ' HYBRID'
       end
     end
     
@@ -400,9 +399,8 @@ 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.send("alt_#{attribute}=", cng_variant.send(attribute))
+          gasoline_variant.update_attributes! :"alt_#{attribute}" => cng_variant.send(attribute)
         end
-        gasoline_variant.save!
         cng_variant.destroy
       end
     end
@@ -439,9 +437,8 @@ 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.send("alt_#{attribute}=", ethanol_variant.send(attribute))
+            gasoline_variant.update_attributes! :"alt_#{attribute}" => ethanol_variant.send(attribute)
           end
-          gasoline_variant.save!
           ethanol_variant.destroy
         end
       end
@@ -450,8 +447,7 @@ AutomobileMakeModelYearVariant.class_eval do
     process "Update model name to indicate flex-fuel variants of models where variants in some years are not flex-fuel" do
       where("alt_fuel_code = 'E' AND model_name NOT LIKE '% FFV'").each do |variant|
         if where(:make_name => variant.make_name, :model_name => variant.model_name, :alt_fuel_code => nil).any?
-          variant.model_name += ' FFV'
-          variant.save!
+          variant.update_attributes! :model_name => variant.model_name + ' FFV'
         end
       end
     end
@@ -459,8 +455,7 @@ AutomobileMakeModelYearVariant.class_eval do
     process "Update model name to indicate diesel variants of models where variants in some years are not diesel" do
       where("fuel_code = 'D' AND model_name NOT LIKE '% DIESEL'").each do |variant|
         if where("make_name = ? AND model_name = ? AND fuel_code != 'D'", variant.make_name, variant.model_name).any?
-          variant.model_name += ' DIESEL'
-          variant.save!
+          variant.update_attributes! :model_name => variant.model_name + ' DIESEL'
         end
       end
     end

data/lib/earth/automobile/automobile_type_fuel.rb

@@ -3,12 +3,12 @@ class AutomobileTypeFuel < ActiveRecord::Base
   
   # for calculating vehicles
   def latest_activity_year_type_fuel
-    AutomobileActivityYearTypeFuel.latest.where(:type_name => type_name, :fuel_common_name => fuel_common_name).first
+    AutomobileActivityYearTypeFuel.latest.where(:type_name => type_name, :fuel_group => fuel_group).first
   end
   
   col :name
   col :type_name
-  col :fuel_common_name
+  col :fuel_group
   col :annual_distance, :type => :float
   col :annual_distance_units
   col :fuel_consumption, :type => :float

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

@@ -13,9 +13,9 @@ AutomobileTypeFuel.class_eval do
         :src => AutomobileTypeFuelYear,
         :dest => AutomobileTypeFuel,
         :cols => {
-          [:type_name, :fuel_common_name] => :name,
+          [:type_name, :fuel_group] => :name,
           :type_name => :type_name,
-          :fuel_common_name => :fuel_common_name
+          :fuel_group => :fuel_group
         }
       )
     end
@@ -23,7 +23,7 @@ AutomobileTypeFuel.class_eval do
     process "Derive annual distance and emission factors from AutomobileTypeFuelYear" do
       type_fuels = arel_table
       type_fuel_years = AutomobileTypeFuelYear.arel_table
-      join_relation = type_fuel_years[:type_name].eq(type_fuels[:type_name]).and(type_fuel_years[:fuel_common_name].eq(type_fuels[:fuel_common_name]))
+      join_relation = type_fuel_years[:type_name].eq(type_fuels[:type_name]).and(type_fuel_years[:fuel_group].eq(type_fuels[:fuel_group]))
       
       %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
@@ -42,10 +42,11 @@ AutomobileTypeFuel.class_eval do
     
     process "Derive number of vehicles and fuel consumption from AutomobileActivityYearTypeFuel" do
       find_each do |atf|
-        atf.vehicles = atf.latest_activity_year_type_fuel.distance / atf.annual_distance
-        atf.fuel_consumption = atf.latest_activity_year_type_fuel.fuel_consumption
-        atf.fuel_consumption_units = atf.latest_activity_year_type_fuel.fuel_consumption_units
-        atf.save!
+        atf.update_attributes!(
+          :vehicles => atf.latest_activity_year_type_fuel.distance / atf.annual_distance,
+          :fuel_consumption => atf.latest_activity_year_type_fuel.fuel_consumption,
+          :fuel_consumption_units => atf.latest_activity_year_type_fuel.fuel_consumption_units
+        )
       end
     end
   end

data/lib/earth/automobile/automobile_type_fuel_control.rb

@@ -3,7 +3,7 @@ class AutomobileTypeFuelControl < ActiveRecord::Base
 
   col :name
   col :type_name
-  col :fuel_common_name
+  col :fuel_group
   col :control_name
   col :ch4_emission_factor, :type => :float
   col :ch4_emission_factor_units

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

@@ -7,7 +7,7 @@ AutomobileTypeFuelControl.class_eval do
            :url => "file://#{Earth::DATA_DIR}/automobile/emission_control_techs.csv" do
       key   'name'
       store 'type_name'
-      store 'fuel_common_name'
+      store 'fuel_group'
       store 'control_name'
       store 'ch4_emission_factor', :from_units => :grams_per_mile, :to_units => :kilograms_per_kilometre
       store 'n2o_emission_factor', :from_units => :grams_per_mile, :to_units => :kilograms_per_kilometre

data/lib/earth/automobile/automobile_type_fuel_year.rb

@@ -2,22 +2,22 @@ class AutomobileTypeFuelYear < ActiveRecord::Base
   self.primary_key = "name"
   
   # Used by Automobile and AutomobileTrip
-  def self.find_by_type_name_and_fuel_common_name_and_closest_year(type_name, fuel_common_name, year)
+  def self.find_by_type_name_and_fuel_group_and_closest_year(type_name, fuel_group, year)
     if year > maximum(:year)
-      where(:type_name => type_name, :fuel_common_name => fuel_common_name, :year => maximum(:year)).first
+      where(:type_name => type_name, :fuel_group => fuel_group, :year => maximum(:year)).first
     else
-      where(:type_name => type_name, :fuel_common_name => fuel_common_name, :year => [year, minimum(:year)].max).first
+      where(:type_name => type_name, :fuel_group => fuel_group, :year => [year, minimum(:year)].max).first
     end
   end
   
   # for calculating ch4 and n2o ef
   def type_fuel_year_controls
-    AutomobileTypeFuelYearControl.find_all_by_type_name_and_fuel_common_name_and_closest_year(type_name, fuel_common_name, year)
+    AutomobileTypeFuelYearControl.find_all_by_type_name_and_fuel_group_and_closest_year(type_name, fuel_group, year)
   end
   
   col :name
   col :type_name
-  col :fuel_common_name
+  col :fuel_group
   col :year, :type => :integer
   col :share_of_type, :type => :float
   col :annual_distance, :type => :float

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

@@ -16,7 +16,7 @@ AutomobileTypeFuelYear.class_eval do
                :select => proc { |row| row['age'].to_i.to_s == row['age'] } do
           key 'name', :synthesize => proc { |row| "#{type} #{fuel} #{2009 - row['age'].to_i}" }
           store 'type_name', :static => type
-          store 'fuel_common_name', :static => fuel
+          store 'fuel_group', :static => fuel
           store 'year', :synthesize => proc { |row| 2009 - row['age'].to_i }
           store 'share_of_type', :synthesize => proc { |row| row[code].to_f / (code == 'LDDV' ? 57.5 : 100) } # total percent only sums to 57.5 for diesel cars
         end
@@ -40,11 +40,12 @@ 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|
-        atfy.ch4_emission_factor = atfy.type_fuel_year_controls.sum{ |atfyc| atfyc.total_travel_percent * atfyc.ch4_emission_factor }
-        atfy.n2o_emission_factor = atfy.type_fuel_year_controls.sum{ |atfyc| atfyc.total_travel_percent * atfyc.n2o_emission_factor }
-        atfy.ch4_emission_factor_units = atfy.type_fuel_year_controls.first.ch4_emission_factor_units
-        atfy.n2o_emission_factor_units = atfy.type_fuel_year_controls.first.n2o_emission_factor_units
-        atfy.save!
+        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 },
+          :ch4_emission_factor_units => atfy.type_fuel_year_controls.first.ch4_emission_factor_units,
+          :n2o_emission_factor_units => atfy.type_fuel_year_controls.first.n2o_emission_factor_units
+        )
       end
     end
   end