earth 0.4.4 → 0.4.5

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

@@ -3,7 +3,7 @@ LodgingClass.class_eval do
     LodgingClass.define_schema(self)
     
     import "a list of lodging classes and pre-calculated emission factors",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGZZWmZtWEJlYzhRNXlPdWpBTldlcUE&hl=en&output=csv' do
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGZZWmZtWEJlYzhRNXlPdWpBTldlcUE&hl=en&gid=0&output=csv' do
       key   'name'
       store 'natural_gas_intensity', :units_field_name => 'natural_gas_intensity_units'
       store 'fuel_oil_intensity', :units_field_name => 'fuel_oil_intensity_units'

data/lib/earth/locality/census_division/data_miner.rb

@@ -44,7 +44,7 @@ CensusDivision.class_eval do
     end
     
     import 'meeting building fuel intensities calculated from CBECS 2003',
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGotdjgtUEk0eUU0R3lxM1hHdlF1V0E&hl=en&output=csv' do
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGotdjgtUEk0eUU0R3lxM1hHdlF1V0E&hl=en&gid=0&output=csv' do
       key   'number', :field_name => 'census_division'
       store 'meeting_building_natural_gas_intensity', :from_units => :hundred_cubic_feet_per_square_foot_hour, :to_units => :cubic_metres_per_square_metre_hour
       store 'meeting_building_fuel_oil_intensity', :from_units => :gallons_per_square_foot_hour, :to_units => :litres_per_square_metre_hour
@@ -53,7 +53,7 @@ CensusDivision.class_eval do
     end
     
     import 'lodging building fuel intensities calculated from CBECS 2003',
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHZ1QjdNTGVpbWxmZDVLbjlpTHlFVHc&hl=en&output=csv' do
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHZ1QjdNTGVpbWxmZDVLbjlpTHlFVHc&hl=en&gid=0&output=csv' do
       key   'number', :field_name => 'census_division'
       store 'lodging_building_natural_gas_intensity', :from_units => :hundred_cubic_feet_per_room_night, :to_units => :cubic_metres_per_room_night
       store 'lodging_building_fuel_oil_intensity', :from_units => :gallons_per_room_night, :to_units => :litres_per_room_night

data/lib/earth/locality/country/data_miner.rb

@@ -17,7 +17,7 @@ Country.class_eval do
     end
     
     import "country-specific flight route inefficiency factors derived from Kettunen et al. (2005)",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdEJoRVBZaGhnUmlhX240VXE3X0F3WkE&output=csv' do
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdEJoRVBZaGhnUmlhX240VXE3X0F3WkE&gid=0&output=csv' do
       key   'iso_3166_code'
       store 'flight_route_inefficiency_factor'
     end

data/lib/earth/locality/egrid_subregion/data_miner.rb

@@ -37,7 +37,7 @@ EgridSubregion.class_eval do
     # end
     
     import "eGRID subregion data",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGRORTJNSWRMQ1puRVprYlAtZHhDaFE&hl=en&single=true&gid=0&output=csv' do
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGRORTJNSWRMQ1puRVprYlAtZHhDaFE&hl=en&gid=0&output=csv' do
       key 'abbreviation'
       store 'name'
       store 'nerc_abbreviation'

data/lib/earth/locality/petroleum_administration_for_defense_district/data_miner.rb

@@ -9,7 +9,7 @@ PetroleumAdministrationForDefenseDistrict.class_eval do
     end
     
     import "a list of PADD districts and states derived from the EIA PADD definitions",
-           :url => 'http://spreadsheets.google.com/pub?key=t5HM1KbaRngmTUbntg8JwPA' do
+           :url => 'http://spreadsheets.google.com/pub?key=t5HM1KbaRngmTUbntg8JwPA&gid=0&output=csv' do
       key   'code',             :field_name => 'Code'
       store 'district_code',    :field_name => 'PAD district code'
       store 'subdistrict_code', :field_name => 'PAD subdistrict code'

data/lib/earth/locality/state/data_miner.rb

@@ -28,7 +28,7 @@ State.class_eval do
     
     # PADD
     import 'a list of state Petroleum Administration for Defense Districts',
-           :url => 'http://spreadsheets.google.com/pub?key=t5HM1KbaRngmTUbntg8JwPA' do
+           :url => 'http://spreadsheets.google.com/pub?key=t5HM1KbaRngmTUbntg8JwPA&gid=0&output=csv' do
       key   'postal_abbreviation', :field_name => 'State'
       store 'petroleum_administration_for_defense_district_code', :field_name => 'Code'
     end

data/lib/earth/rail/rail_class/data_miner.rb

@@ -19,7 +19,7 @@ RailClass.class_eval do
     end
 
     import "a list of rail classes and pre-calculated trip and fuel use characteristics",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHRYaDNvRXMtZGoxNmRiOHlNWGV6b2c&hl=en&single=true&gid=0&output=csv' do
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHRYaDNvRXMtZGoxNmRiOHlNWGV6b2c&hl=en&gid=0&output=csv' do
       key   'name'
       store 'description'
       store 'passengers'

data/lib/earth/residence/air_conditioner_use/data_miner.rb

@@ -13,7 +13,7 @@ AirConditionerUse.class_eval do
       }
     end
     
-    import "Ian's precalculated fugitive emissions values", :url => 'http://spreadsheets.google.com/pub?key=ri_380yQZAqBKeqie_TECgg' do
+    import "Ian's precalculated fugitive emissions values", :url => 'http://spreadsheets.google.com/pub?key=ri_380yQZAqBKeqie_TECgg&gid=0&output=csv' do
       key 'name', :field_name => 'air_conditioner_use_name'
       store 'fugitive_emission', :units_field_name => 'unit', :to_units => :kilograms_per_square_metre
     end

data/lib/earth/residence/residence_fuel_type/data_miner.rb

@@ -9,7 +9,7 @@ ResidenceFuelType.class_eval do
     end
     
     import "a list of residential fuels and their emissions factors",
-           :url => 'http://spreadsheets.google.com/pub?key=rukxnmuhhsOsrztTrUaFCXQ' do
+           :url => 'http://spreadsheets.google.com/pub?key=rukxnmuhhsOsrztTrUaFCXQ&gid=0&output=csv' do
       key 'name'
       store 'emission_factor', :field_name => 'emission_factor', :units_field_name => 'units'
     end

data/lib/earth/shipping/carrier/data_miner.rb

@@ -11,7 +11,7 @@ Carrier.class_eval do
     end
     
     import "a list of shipping companies and their characteristics",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdG1ONU1HZDdZTFJNclFYVkRzR0k5Z2c&hl=en&single=true&gid=0&output=csv' do
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdG1ONU1HZDdZTFJNclFYVkRzR0k5Z2c&hl=en&gid=0&output=csv' do
       key   'name'
       store 'package_volume'
       store 'route_inefficiency_factor'

data/lib/earth/shipping/carrier_mode/data_miner.rb

@@ -11,7 +11,7 @@ CarrierMode.class_eval do
     end
     
     import "a list of carrier modes and their characteristics",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGRsRkJOd0NPd0FETTI0NmpYUlBsN2c&hl=en&single=true&gid=0&output=csv' do
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGRsRkJOd0NPd0FETTI0NmpYUlBsN2c&hl=en&gid=0&output=csv' do
       key   'name'
       store 'carrier_name'
       store 'mode_name'

data/lib/earth/shipping/shipment_mode/data_miner.rb

@@ -8,7 +8,7 @@ ShipmentMode.class_eval do
     end
     
     import "a list of shipment modes and their characteristics",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGR2a2RYcEg2RnRKbkRQcXc0ZkQ5U0E&hl=en&single=true&gid=0&output=csv' do
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGR2a2RYcEg2RnRKbkRQcXc0ZkQ5U0E&hl=en&gid=0&output=csv' do
       key   'name'
       store 'route_inefficiency_factor'
       store 'transport_emission_factor', :units_field_name => 'transport_emission_factor_units'

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = '0.4.2'
+  VERSION = '0.4.5'
 end

data/spec/earth_spec.rb

@@ -23,7 +23,7 @@ describe Earth do
   describe '.resources' do
     it 'should get a list of resources' do
       resources = Earth.resources
-      resources.keys.count.should == 77
+      resources.keys.count.should == 76
       resources['FuelType'][:domain].should == 'fuel'
     end
     it 'should exclude data_miner files' do
@@ -33,7 +33,7 @@ describe Earth do
 
   describe '.resource_names' do
     it 'should get a list of all resource names' do
-      Earth.resource_names.count.should == 77
+      Earth.resource_names.count.should == 76
       Earth.resource_names.should include('Aircraft')
       Earth.resource_names.should include('Industry')
     end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: earth
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,179 +16,110 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -08:00
+date: 2011-03-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: activerecord
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 3
         version: "3"
-  requirement: *id001
-  name: activerecord
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: cohort_scope
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
-        - 1
-        - 1
-        - 1
-        version: 1.1.1
-  requirement: *id002
-  name: data_miner
+        - 0
+        - 0
+        - 7
+        version: 0.0.7
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: data_miner
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-  name: errata
+        - 1
+        - 1
+        - 1
+        version: 1.1.1
   type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: falls_back_on
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 0
         - 3
         version: 0.0.3
-  requirement: *id004
-  name: falls_back_on
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
-        version: 1.5.0
-  requirement: *id005
-  name: geokit
   type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: geokit-rails
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-  name: geokit-rails
   type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: loose_tight_dictionary
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 0
-        - 7
-        version: 0.0.7
-  requirement: *id007
-  name: cohort_scope
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 4
-        - 5
-        version: 1.4.5
-  requirement: *id008
-  name: conversions
+        - 8
+        version: 0.0.8
   type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: weighted_average
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 0
         - 4
         version: 0.0.4
-  requirement: *id009
-  name: weighted_average
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 0
-        - 8
-        version: 0.0.8
-  requirement: *id010
-  name: loose_tight_dictionary
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
-        version: 0.6.1
-  requirement: *id011
-  name: sniff
-  type: :development
+  version_requirements: *id007
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
 executables: []
@@ -210,7 +140,6 @@ files:
 - Rakefile
 - earth.gemspec
 - features/automobile_fuel.feature
-- features/automobile_fuel_type.feature
 - features/automobile_make.feature
 - features/automobile_make_fleet_year.feature
 - features/automobile_make_model.feature
@@ -240,11 +169,10 @@ files:
 - features/server_type.feature
 - features/server_type_alias.feature
 - features/shipment_mode.feature
+- features/step_definitions/data_steps.rb
 - features/support/env.rb
 - features/support/imports/automobile_fuel_bad.csv
 - features/support/imports/automobile_fuel_good.csv
-- features/support/imports/automobile_fuel_type_bad.csv
-- features/support/imports/automobile_fuel_type_good.csv
 - features/support/imports/automobile_make_bad.csv
 - features/support/imports/automobile_make_fleet_year_bad.csv
 - features/support/imports/automobile_make_fleet_year_good.csv
@@ -329,8 +257,6 @@ files:
 - lib/earth/automobile.rb
 - lib/earth/automobile/automobile_fuel.rb
 - lib/earth/automobile/automobile_fuel/data_miner.rb
-- lib/earth/automobile/automobile_fuel_type.rb
-- lib/earth/automobile/automobile_fuel_type/data_miner.rb
 - lib/earth/automobile/automobile_make.rb
 - lib/earth/automobile/automobile_make/data_miner.rb
 - lib/earth/automobile/automobile_make_fleet_year.rb
@@ -544,7 +470,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -553,7 +478,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -566,7 +490,6 @@ specification_version: 3
 summary: Land, sky, and sea
 test_files: 
 - features/automobile_fuel.feature
-- features/automobile_fuel_type.feature
 - features/automobile_make.feature
 - features/automobile_make_fleet_year.feature
 - features/automobile_make_model.feature
@@ -596,11 +519,10 @@ test_files:
 - features/server_type.feature
 - features/server_type_alias.feature
 - features/shipment_mode.feature
+- features/step_definitions/data_steps.rb
 - features/support/env.rb
 - features/support/imports/automobile_fuel_bad.csv
 - features/support/imports/automobile_fuel_good.csv
-- features/support/imports/automobile_fuel_type_bad.csv
-- features/support/imports/automobile_fuel_type_good.csv
 - features/support/imports/automobile_make_bad.csv
 - features/support/imports/automobile_make_fleet_year_bad.csv
 - features/support/imports/automobile_make_fleet_year_good.csv

data/features/automobile_fuel_type.feature

@@ -1,34 +0,0 @@
-Feature: Data import for AutomobileFuelType
-  As a data user
-  I want to import AutomobileFuelType data
-  So that I can perform fuel type-based calculations
-
-  Scenario: Successfully verifying that annual distance and emission factor > 0
-    Given a "AutomobileFuelType" data import fetches results listed in "automobile_fuel_type_good"
-    When a data import verifies "Annual distance and emission factor should be greater than zero"
-    Then the verification should be successful
-
-  Scenario: Successfully verifying that annual distance units are kilometres
-    Given a "AutomobileFuelType" data import fetches results listed in "automobile_fuel_type_good"
-    When a data import verifies "Annual distance units should be kilometres"
-    Then the verification should be successful
-
-  Scenario: Successfully verifying that emission factor units are never missing
-    Given a "AutomobileFuelType" data import fetches results listed in "automobile_fuel_type_good"
-    When a data import verifies "Emission factor units should never be missing"
-    Then the verification should be successful
-
-  Scenario: Failing to verify that annual distance and emission factor > 0
-    Given a "AutomobileFuelType" data import fetches results listed in "automobile_fuel_type_bad"
-    When a data import verifies "Annual distance and emission factor should be greater than zero"
-    Then the verification should not be successful
-
-  Scenario: Failing to verify that annual distance units are kilometres
-    Given a "AutomobileFuelType" data import fetches results listed in "automobile_fuel_type_bad"
-    When a data import verifies "Annual distance units should be kilometres"
-    Then the verification should not be successful
-
-  Scenario: Failing to verify that emission factor units are never missing
-    Given a "AutomobileFuelType" data import fetches results listed in "automobile_fuel_type_bad"
-    When a data import verifies "Emission factor units should never be missing"
-    Then the verification should not be successful

data/features/support/imports/automobile_fuel_type_bad.csv

@@ -1,3 +0,0 @@
-code,name,annual_distance,emission_factor,annual_distance_units,emission_factor_units
-D,diesel,1000.0,0.1,kilometres,kilograms_per_kilometre
-R,regular gasoline,0.0,-0.1

data/features/support/imports/automobile_fuel_type_good.csv

@@ -1,3 +0,0 @@
-code,name,annual_distance,emission_factor,annual_distance_units,emission_factor_units
-D,diesel,1000.0,0.1,kilometres,kilograms_per_kilometre
-R,regular gasoline,1.0,2.1,kilometres,kilograms_per_kilometre

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

@@ -1,115 +0,0 @@
-# DEPRECATED - use AutomobileFuel
-AutomobileFuelType.class_eval do
-  data_miner do
-    schema Earth.database_options do
-      string   'code'
-      string   'name'
-      string   'fuel_name_for_distance'
-      string   'fuel_name_for_efs'
-      float    'blend_portion'
-      float    'emission_factor'
-      string   'emission_factor_units'
-      float    'annual_distance'
-      string   'annual_distance_units'
-    end
-    
-    import "a list of fuel type codes and attributes",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdDlqeU9vQkVkNG1NZXV4WklKTjJkU3c&hl=en&single=true&gid=0&output=csv' do
-      key   'code'
-      store 'name'
-      store 'fuel_name_for_distance'
-      store 'fuel_name_for_efs'
-      store 'blend_portion'
-    end
-    
-    process "Calculate annual distance from AutomobileTypeFuelAge" do
-      AutomobileTypeFuelAge.run_data_miner!
-      ages = AutomobileTypeFuelAge.arel_table
-      types = AutomobileFuelType.arel_table
-      conditional_relation = ages[:fuel_common_name].eq(types[:fuel_name_for_distance])
-      update_all "annual_distance = (#{AutomobileTypeFuelAge.weighted_average_relation(:annual_distance, :weighted_by => :vehicles).where(conditional_relation).to_sql})"
-      update_all "annual_distance_units = 'kilometres'"
-    end
-    
-    process "Calculate emission factor from FuelYear, AutomobileTypeFuelYear, and GreenhouseGas" do
-      FuelYear.run_data_miner!
-      AutomobileTypeFuelYear.run_data_miner!
-      GreenhouseGas.run_data_miner!
-      
-      co2_gwp = GreenhouseGas.find_by_abbreviation("co2").global_warming_potential
-      ch4_gwp = GreenhouseGas.find_by_abbreviation("ch4").global_warming_potential
-      n2o_gwp = GreenhouseGas.find_by_abbreviation("n2o").global_warming_potential
-      
-      latest_year = FuelYear.all.collect{|x| x.year }.max
-      
-      fuel_years = FuelYear.arel_table
-      type_fuel_years = AutomobileTypeFuelYear.arel_table
-      fuel_types = AutomobileFuelType.arel_table
-      
-      AutomobileFuelType.all.each do |fuel_type|
-        current_name = fuel_type.name
-        
-        if fuel_type.fuel_name_for_efs.present?
-          co2_factor_sql = fuel_years.project(fuel_years[:co2_emission_factor]).where(fuel_years[:fuel_common_name].eq(fuel_types[:fuel_name_for_efs]).and(fuel_years[:year].eq(latest_year))).to_sql
-          ch4_factor_sql = AutomobileTypeFuelYear.weighted_average_relation(:ch4_emission_factor, :weighted_by => :total_travel).where(type_fuel_years[:fuel_common_name].eq(fuel_types[:fuel_name_for_efs]).and(type_fuel_years[:year].eq(latest_year))).to_sql
-          n2o_factor_sql = AutomobileTypeFuelYear.weighted_average_relation(:n2o_emission_factor, :weighted_by => :total_travel).where(type_fuel_years[:fuel_common_name].eq(fuel_types[:fuel_name_for_efs]).and(type_fuel_years[:year].eq(latest_year))).to_sql
-          hfc_factor_sql = AutomobileTypeFuelYear.weighted_average_relation(:hfc_emission_factor, :weighted_by => :total_travel).where(type_fuel_years[:fuel_common_name].eq(fuel_types[:fuel_name_for_efs]).and(type_fuel_years[:year].eq(latest_year))).to_sql
-          
-          connection.execute %{
-            UPDATE automobile_fuel_types
-            SET emission_factor = (((#{co2_factor_sql}) * #{co2_gwp} * (1 - blend_portion)) + ((#{ch4_factor_sql}) * #{ch4_gwp}) + ((#{n2o_factor_sql}) * #{n2o_gwp}) + (#{hfc_factor_sql}))
-            WHERE automobile_fuel_types.name = '#{current_name}'
-          }
-          connection.execute %{
-            UPDATE automobile_fuel_types
-            SET emission_factor_units = 'kilograms_co2e_per_litre'
-            WHERE automobile_fuel_types.name = '#{current_name}'
-          }
-        end
-      end
-    end
-    
-    process "Calculate emission factor for electricity from EgridSubregion and EgridRegion" do
-      EgridSubregion.run_data_miner!
-      EgridRegion.run_data_miner!
-      electricity_ef = (EgridSubregion.find_by_abbreviation("US").electricity_emission_factor / (1 - EgridRegion.find_by_name("US").loss_factor))
-      connection.execute %{
-        UPDATE automobile_fuel_types
-        SET emission_factor = #{electricity_ef}
-        WHERE automobile_fuel_types.name = 'electricity'
-      }
-      connection.execute %{
-        UPDATE automobile_fuel_types
-        SET emission_factor_units = 'kilograms_co2e_per_kilowatt_hour'
-        WHERE automobile_fuel_types.name = 'electricity'
-      }
-    end
-    
-    verify "Annual distance and emission factor should be greater than zero" do
-      AutomobileFuelType.all.each do |fuel_type|
-        %w{ annual_distance emission_factor }.each do |attribute|
-          value = fuel_type.send(:"#{attribute}")
-          unless value > 0
-            raise "Invalid #{attribute} for AutomobileFuelType #{fuel_type.name}: #{value} (should be > 0)"
-          end
-        end
-      end
-    end
-    
-    verify "Annual distance units should be kilometres" do
-      AutomobileFuelType.all.each do |fuel_type|
-        unless fuel_type.annual_distance_units == "kilometres"
-          raise "Missing annual distance units for AutomobileFuelType #{fuel_type.name}"
-        end
-      end
-    end
-    
-    verify "Emission factor units should never be missing" do
-      AutomobileFuelType.all.each do |fuel_type|
-        unless fuel_type.emission_factor_units.present?
-          raise "Missing emission factor units for AutomobileFuelType #{fuel_type.name}"
-        end
-      end
-    end
-  end
-end

data/lib/earth/automobile/automobile_fuel_type.rb

@@ -1,17 +0,0 @@
-# DEPRECATED - use AutomobileFuel
-class AutomobileFuelType < ActiveRecord::Base
-  set_primary_key :code
-  
-  scope :ordered, :order => 'name'
-  
-  falls_back_on :emission_factor => 20.781.pounds_per_gallon.to(:kilograms_per_litre) # https://brighterplanet.sifterapp.com/projects/30/issues/428
-  
-  data_miner do
-    tap "Brighter Planet's sanitized automobile fuel type data", Earth.taps_server
-  end
-  
-  CODES = {
-    :electricity => 'El',
-    :diesel => 'D'
-  }
-end