earth 0.12.0 → 0.12.1

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

@@ -1,56 +1,36 @@
 require 'earth/fuel/data_miner'
+
 EgridSubregion.class_eval do
   data_miner do
-    import "eGRID 2010 subregions and electricity emission factors",
-           :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/eGRID2010_Version1-1_xls_only.zip',
-           :filename => 'eGRID2010V1_1_year07_AGGREGATION.xls',
-           :sheet => 'SRL07',
-           :skip => 4,
-           :select => proc { |row| row['SEQSRL07'].to_i.between?(1, 26) } do
-      key   'abbreviation', :field_name => 'SUBRGN'
-      store 'name', :field_name => 'SRNAME'
+    process "Start from scratch" do
+      delete_all
+    end
+    
+    import "eGRID 2012 subregion data",
+           :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/eGRID2012V1_0_year09_DATA.xls',
+           :sheet => 'SRL09',
+           :skip => 4 do
+      key   'abbreviation',                    :field_name => 'SUBRGN'
+      store 'name',                            :field_name => 'SRNAME'
       store 'nerc_abbreviation',               :field_name => 'NERC'
       store 'net_generation',                  :field_name => 'SRNGENAN', :units => :megawatt_hours
-      store 'electricity_co2_emission_factor', :field_name => 'SRCO2RTA', :units => :pounds_per_megawatt_hour
-      store 'electricity_co2_biogenic_emission_factor', :static => '0.0', :units => :kilograms_per_kilowatt_hour
-      store 'electricity_ch4_emission_factor', :field_name => 'SRCH4RTA', :units => :pounds_per_gigawatt_hour
-      store 'electricity_n2o_emission_factor', :field_name => 'SRN2ORTA', :units => :pounds_per_gigawatt_hour
+      store 'co2_emission_factor', :field_name => 'SRCO2RTA', :units => :pounds_per_megawatt_hour
+      store 'co2_biogenic_emission_factor', :static => '0.0', :units => :kilograms_per_kilowatt_hour
+      store 'ch4_emission_factor', :field_name => 'SRCH4RTA', :units => :pounds_per_gigawatt_hour
+      store 'n2o_emission_factor', :field_name => 'SRN2ORTA', :units => :pounds_per_gigawatt_hour
     end
     
-    # FIXME TODO once 'US' subregion is no longer needed remove it from this source file
     import "eGRID subregion to region associations",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGRORTJNSWRMQ1puRVprYlAtZHhDaFE&output=csv' do
+           :url => "file://#{Earth::DATA_DIR}/locality/egrid_relationships.csv" do
       key 'abbreviation'
       store 'egrid_region_name'
     end
     
-    # DEPRECATED but don't remove until confirmed that all emitters use EgridSubregion.fallback rather than EgridSubregion.find_by_abbreviation 'US'
-    # (ElectricityUse and Meeting)
-    process "Calculate national averages" do
-      us_average = find_by_abbreviation 'US'
-      subregions = where("abbreviation != 'US'")
-      
-      us_average.name = 'United States'
-      us_average.nerc_abbreviation = 'US'
-      us_average.egrid_region_name = 'US'
-      us_average.net_generation                           = subregions.sum(:net_generation)
-      us_average.electricity_co2_emission_factor          = subregions.weighted_average(:electricity_co2_emission_factor, :weighted_by => :net_generation)
-      us_average.electricity_co2_biogenic_emission_factor = subregions.weighted_average(:electricity_co2_biogenic_emission_factor, :weighted_by => :net_generation)
-      us_average.electricity_ch4_emission_factor          = subregions.weighted_average(:electricity_ch4_emission_factor, :weighted_by => :net_generation)
-      us_average.electricity_n2o_emission_factor          = subregions.weighted_average(:electricity_n2o_emission_factor, :weighted_by => :net_generation)
-      us_average.net_generation_units                           = 'megawatt_hours'
-      us_average.electricity_co2_emission_factor_units          = 'pounds_per_megawatt_hour'
-      us_average.electricity_co2_biogenic_emission_factor_units = 'kilograms_per_kilowatt_hour'
-      us_average.electricity_ch4_emission_factor_units          = 'pounds_per_gigawatt_hour'
-      us_average.electricity_n2o_emission_factor_units          = 'pounds_per_gigawatt_hour'
-      us_average.save!
-    end
-    
-    process "Convert co2 emission factor to metric units" do
+    process "Convert co2 emission factors to metric units" do
       conversion_factor = 1.pounds.to(:kilograms) / 1_000.0 # kg / lbs * MWh / kWh
-      where(:electricity_co2_emission_factor_units => 'pounds_per_megawatt_hour').update_all(%{
-        electricity_co2_emission_factor = 1.0 * electricity_co2_emission_factor * #{conversion_factor},
-        electricity_co2_emission_factor_units = 'kilograms_per_kilowatt_hour'
+      where(:co2_emission_factor_units => 'pounds_per_megawatt_hour').update_all(%{
+        co2_emission_factor = co2_emission_factor * #{conversion_factor},
+        co2_emission_factor_units = 'kilograms_per_kilowatt_hour'
       })
     end
     
@@ -61,24 +41,24 @@ EgridSubregion.class_eval do
     process "Convert ch4 emission factor to metric units and co2e" do
       conversion_factor = 1.pounds.to(:kilograms) / 1_000_000.0 # kg / lbs * GWh / kWh
       gwp = GreenhouseGas[:ch4].global_warming_potential
-      where(:electricity_ch4_emission_factor_units => 'pounds_per_gigawatt_hour').update_all(%{
-        electricity_ch4_emission_factor = 1.0 * electricity_ch4_emission_factor * #{conversion_factor} * #{gwp},
-        electricity_ch4_emission_factor_units = 'kilograms_co2e_per_kilowatt_hour'
+      where(:ch4_emission_factor_units => 'pounds_per_gigawatt_hour').update_all(%{
+        ch4_emission_factor = ch4_emission_factor * #{conversion_factor} * #{gwp},
+        ch4_emission_factor_units = 'kilograms_co2e_per_kilowatt_hour'
       })
     end
     
     process "Convert n2o emission factor to metric units and co2e" do
       conversion_factor = 1.pounds.to(:kilograms) / 1_000_000.0 # kg / lbs * GWh / kWh
       gwp = GreenhouseGas[:n2o].global_warming_potential
-      where(:electricity_n2o_emission_factor_units => 'pounds_per_gigawatt_hour').update_all(%{
-        electricity_n2o_emission_factor = 1.0 * electricity_n2o_emission_factor * #{conversion_factor} * #{gwp},
-        electricity_n2o_emission_factor_units = 'kilograms_co2e_per_kilowatt_hour'
+      where(:n2o_emission_factor_units => 'pounds_per_gigawatt_hour').update_all(%{
+        n2o_emission_factor = n2o_emission_factor * #{conversion_factor} * #{gwp},
+        n2o_emission_factor_units = 'kilograms_co2e_per_kilowatt_hour'
       })
     end
     
     process "Calculate combined emission factor" do
       update_all(%{
-        electricity_emission_factor = 1.0 * electricity_co2_emission_factor + electricity_ch4_emission_factor + electricity_n2o_emission_factor,
+        electricity_emission_factor = co2_emission_factor + ch4_emission_factor + n2o_emission_factor,
         electricity_emission_factor_units = 'kilograms_co2e_per_kilowatt_hour'
       })
     end

data/lib/earth/locality/zip_code.rb

@@ -1,4 +1,4 @@
-require ::File.join(Earth::VENDOR_DIR, 'geokit-rails', 'lib', 'geokit-rails')
+require ::File.join(Earth::VENDOR_DIR, 'geokit-rails', 'lib', 'geokit-rails') # for acts_as_mappable
 
 class ZipCode < ActiveRecord::Base
   self.primary_key = "name"
@@ -13,10 +13,12 @@ class ZipCode < ActiveRecord::Base
     Country.united_states
   end
   
+  # Used by LodgingProperty custom find to find properties near to a zip code
   def latitude_longitude
     [latitude, longitude]
   end
   
+  # Used by LodgingProperty custom find to find properties near to a zip code
   acts_as_mappable :default_units => :kilometres,
                    :lat_column_name => :latitude,
                    :lng_column_name => :longitude
@@ -29,8 +31,7 @@ class ZipCode < ActiveRecord::Base
   col :egrid_subregion_abbreviation
   col :climate_division_name
   col :population, :type => :integer
-
-  warn_if_nonexistent_owner_except :egrid_subregion
-
+  
   warn_unless_size 43770
+  warn_if_nonexistent_owner_except :egrid_subregion
 end

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

@@ -1,15 +1,11 @@
-# FIXME TODO try to clean up this data
 ZipCode.class_eval do
-  # sabshere 9/20/10 this isn't called anywhere
-  # def set_latitude_and_longitude
-  #   return if latitude.present? and longitude.present?
-  #   a = Geokit::Geocoders::YahooGeocoder.geocode name
-  #   update_attributes! :latitude => a.lat, :longitude => a.lng
-  # end
-  
   data_miner do
+    process "Start from scratch" do
+      delete_all
+    end
+    
     import 'the Mapping Hacks zipcode database',
-           :url => 'http://archive.data.brighterplanet.com/zipcode.zip', # http://mappinghacks.com/data/zipcode.zip'
+           :url => 'http://mappinghacks.com/data/zipcode.zip', # http://archive.data.brighterplanet.com/zipcode.zip
            :filename => 'zipcode.csv' do
       key   'name', :field_name => 'zip', :sprintf => '%05d'
       store 'state_postal_abbreviation', :field_name => 'state'
@@ -19,7 +15,7 @@ ZipCode.class_eval do
     end
     
     import 'a list of zipcode states and eGRID Subregions from the US EPA',
-           :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/Power_Profiler_Zipcode_Tool_v3-2.xlsx',
+           :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/Power_Profiler_Zipcode_Tool_v4-0.xlsx',
            :sheet => 'Zip-subregion' do
       key   'name', :field_name => 'ZIP (character)'
       store 'state_postal_abbreviation', :field_name => 'State'
@@ -27,7 +23,7 @@ ZipCode.class_eval do
     end
     
     import 'a Brighter Planet-created list of zipcode Climate Divisions',
-           :url => 'http://static.brighterplanet.com/science/data/geography/zip_code_name-climate_division_name.csv' do
+           :url => "file://#{Earth::DATA_DIR}/locality/zip_climate_divisions.csv" do
       key   'name', :field_name => 'zip_code_name', :sprintf => '%05d'
       store 'climate_division_name'
     end
@@ -40,10 +36,25 @@ ZipCode.class_eval do
     end
     
     import 'misc zip code data not included in other sources',
-           :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdHFYaUE1cEdHTzZCcTFQOEZOTGVUemc&output=csv' do
+           :url => "file://#{Earth::DATA_DIR}/locality/misc_zip_data.csv" do
       key 'name', :sprintf => '%05d'
-      store 'state_postal_abbreviation'
-      store 'egrid_subregion_abbreviation'
+      store 'state_postal_abbreviation', :nullify => true
+      store 'egrid_subregion_abbreviation', :nullify => true
     end
+    
+    process "Derive missing state postal abbreviations from climate division name" do
+      where("state_postal_abbreviation IS NULL AND climate_division_name IS NOT NULL").update_all %{
+        state_postal_abbreviation = LEFT(climate_division_name, 2)
+      }
+    end
+    
+    # FIXME TODO figure out how to speed this up then re-enable it
+    # process "Look up missing latitude and longitude" do
+    #   where("latitude IS NULL OR longitude IS NULL").each do |zip|
+    #     if (location = Geokit::Geocoders::MultiGeocoder.geocode zip.name).success
+    #       zip.update_attributes! :latitude => location.lat, :longitude => location.lng
+    #     end
+    #   end
+    # end
   end
 end

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

@@ -90,7 +90,7 @@ RailCompany.class_eval do
         end
         
         if company.electricity_intensity.present?
-          company.co2_emission_factor += company.electricity_intensity * (EgridSubregion.fallback.electricity_co2_emission_factor / (1 - EgridRegion.fallback.loss_factor))
+          company.co2_emission_factor += company.electricity_intensity * (EgridSubregion.fallback.co2_emission_factor / (1 - EgridRegion.fallback.loss_factor))
         end
         
         company.co2_emission_factor_units = 'kilograms_per_passenger_kilometre'

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/spec/earth/automobile/automobile_activity_year_type_fuel_spec.rb

@@ -16,7 +16,7 @@ describe AutomobileActivityYearTypeFuel do
   describe 'verify', :sanity => true do
     it { AAYTF.count.should == 120 }
     it { AAYTF.where(:distance => nil).count.should == 0 }
-    it { AAYTF.where("fuel_common_name != 'alternative' AND fuel_consumption IS NULL").count.should == 0 }
+    it { AAYTF.where("fuel_group != 'alternative' AND fuel_consumption IS NULL").count.should == 0 }
   end
   
   describe '.latest' do

data/spec/earth/automobile/automobile_fuel_spec.rb

@@ -54,7 +54,7 @@ describe AutomobileFuel do
     
     it "all grades of gasoline should have same annual distance and emission factors" do
       AutomobileFuel.where("name LIKE '%gasoline'").each do |fuel|
-        fuel.common_name.should == 'gasoline'
+        fuel.group.should == 'gasoline'
         fuel.annual_distance.should == AutomobileFuel.gasoline.annual_distance
         fuel.co2_emission_factor.should == AutomobileFuel.gasoline.co2_emission_factor
         fuel.ch4_emission_factor.should == AutomobileFuel.gasoline.ch4_emission_factor

data/spec/earth/automobile/automobile_type_fuel_spec.rb

@@ -37,7 +37,7 @@ describe AutomobileTypeFuel do
     it 'should always be a match from 2009' do
       AutomobileTypeFuel.find_each do |atf|
         atf.latest_activity_year_type_fuel.type_name.should == atf.type_name
-        atf.latest_activity_year_type_fuel.fuel_common_name.should == atf.fuel_common_name
+        atf.latest_activity_year_type_fuel.fuel_group.should == atf.fuel_group
         atf.latest_activity_year_type_fuel.activity_year.should == 2009
       end
     end

data/spec/earth/automobile/automobile_type_fuel_year_control_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'earth/automobile/automobile_type_fuel_year_control'
 
 describe AutomobileTypeFuelYearControl do
-  let(:test_year_control) { ATFYC.where(:type_name => 'Passenger cars', :fuel_common_name => 'gasoline', :year => 2005).first }
+  let(:test_year_control) { ATFYC.where(:type_name => 'Passenger cars', :fuel_group => 'gasoline', :year => 2005).first }
   
   before :all do
     Earth.init :automobile, :load_data_miner => true
@@ -19,7 +19,7 @@ describe AutomobileTypeFuelYearControl do
     it { ATFYC.count.should == 142 }
     
     it 'total travel percent should sum to 1' do
-      ATFYC.group([:type_name, :fuel_common_name, :year]).sum(:total_travel_percent).each do |grouping_criteria, total|
+      ATFYC.group([:type_name, :fuel_group, :year]).sum(:total_travel_percent).each do |grouping_criteria, total|
         total.should be_within(1e-5).of(1.0)
       end
     end
@@ -27,10 +27,10 @@ describe AutomobileTypeFuelYearControl do
     it { ATFYC.where(:type_fuel_control_name => nil).count.should == 0 }
   end
   
-  describe '.find_all_by_type_name_and_fuel_common_name_and_closest_year' do
-    it { ATFYC.find_all_by_type_name_and_fuel_common_name_and_closest_year('Passenger cars', 'gasoline', 1980).should == ATFYC.find_all_by_type_name_and_fuel_common_name_and_year('Passenger cars', 'gasoline', 1985) }
-    it { ATFYC.find_all_by_type_name_and_fuel_common_name_and_closest_year('Passenger cars', 'gasoline', 2005).should == ATFYC.find_all_by_type_name_and_fuel_common_name_and_year('Passenger cars', 'gasoline', 2005) }
-    it { ATFYC.find_all_by_type_name_and_fuel_common_name_and_closest_year('Passenger cars', 'gasoline', 2012).should == ATFYC.find_all_by_type_name_and_fuel_common_name_and_year('Passenger cars', 'gasoline', 2010) }
+  describe '.find_all_by_type_name_and_fuel_group_and_closest_year' do
+    it { ATFYC.find_all_by_type_name_and_fuel_group_and_closest_year('Passenger cars', 'gasoline', 1980).should == ATFYC.find_all_by_type_name_and_fuel_group_and_year('Passenger cars', 'gasoline', 1985) }
+    it { ATFYC.find_all_by_type_name_and_fuel_group_and_closest_year('Passenger cars', 'gasoline', 2005).should == ATFYC.find_all_by_type_name_and_fuel_group_and_year('Passenger cars', 'gasoline', 2005) }
+    it { ATFYC.find_all_by_type_name_and_fuel_group_and_closest_year('Passenger cars', 'gasoline', 2012).should == ATFYC.find_all_by_type_name_and_fuel_group_and_year('Passenger cars', 'gasoline', 2010) }
   end
   
   describe '#ch4_emission_factor' do

data/spec/earth/automobile/automobile_type_fuel_year_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'earth/automobile/automobile_type_fuel_year'
 
 describe AutomobileTypeFuelYear do
-  let(:test_atfy) { ATFY.where(:type_name => 'Passenger cars', :fuel_common_name => 'gasoline', :year => 2005).first }
+  let(:test_atfy) { ATFY.where(:type_name => 'Passenger cars', :fuel_group => 'gasoline', :year => 2005).first }
   
   before :all do
     Earth.init :automobile, :load_data_miner => true
@@ -19,7 +19,7 @@ describe AutomobileTypeFuelYear do
     it { ATFY.count.should == 124 }
     
     it 'shares should sum to 1' do
-      ATFY.sum(:share_of_type, :group => [:type_name, :fuel_common_name]).each do |groupers, total|
+      ATFY.sum(:share_of_type, :group => [:type_name, :fuel_group]).each do |groupers, total|
         total.should be_within(1e-2).of(1.0)
       end
     end
@@ -37,10 +37,10 @@ describe AutomobileTypeFuelYear do
     it { test_atfy.n2o_emission_factor_units.should == 'kilograms_co2e_per_kilometre' }
   end
   
-  describe '.find_by_type_name_and_fuel_common_name_and_closest_year' do
-    it { ATFY.find_by_type_name_and_fuel_common_name_and_closest_year('Passenger cars', 'gasoline', 1970).should == ATFY.find_by_type_name_and_fuel_common_name_and_year('Passenger cars', 'gasoline', 1979) }
-    it { ATFY.find_by_type_name_and_fuel_common_name_and_closest_year('Passenger cars', 'gasoline', 2005).should == ATFY.find_by_type_name_and_fuel_common_name_and_year('Passenger cars', 'gasoline', 2005) }
-    it { ATFY.find_by_type_name_and_fuel_common_name_and_closest_year('Passenger cars', 'gasoline', 2012).should == ATFY.find_by_type_name_and_fuel_common_name_and_year('Passenger cars', 'gasoline', 2009) }
+  describe '.find_by_type_name_and_fuel_group_and_closest_year' do
+    it { ATFY.find_by_type_name_and_fuel_group_and_closest_year('Passenger cars', 'gasoline', 1970).should == ATFY.find_by_type_name_and_fuel_group_and_year('Passenger cars', 'gasoline', 1979) }
+    it { ATFY.find_by_type_name_and_fuel_group_and_closest_year('Passenger cars', 'gasoline', 2005).should == ATFY.find_by_type_name_and_fuel_group_and_year('Passenger cars', 'gasoline', 2005) }
+    it { ATFY.find_by_type_name_and_fuel_group_and_closest_year('Passenger cars', 'gasoline', 2012).should == ATFY.find_by_type_name_and_fuel_group_and_year('Passenger cars', 'gasoline', 2009) }
   end
   
   describe '#type_fuel_year_controls' do

data/spec/earth/industry/industry_spec.rb

@@ -13,9 +13,7 @@ describe Industry do
   end
   
   describe "verify imported data", :sanity => true do
-    it "should have all the data" do
-      Industry.count.should == 2341
-    end
+    it { Industry.count.should == 2341 }
   end
   
   describe "methods" do

data/spec/earth/locality/country_spec.rb

@@ -10,55 +10,79 @@ describe Country do
     end
     
     it 'should import data' do
+      Country.delete_all if Country.table_exists?
       Country.run_data_miner!
     end
   end
   
   describe 'verify imported data', :sanity => true do
-    it 'should have all the data' do
-      Country.count.should == 249
-    end
-    it 'uses UTF-8 encoding' do
-      Country.find('AX').name.should == "Åland Islands"
-      Country.find('CI').name.should == "Côte d'Ivoire"
+    let(:us) { Country.united_states }
+    let(:uk) { Country.find 'GB' }
+    
+    it { Country.count.should == 249 }
+    
+    describe 'uses UTF-8 encoding' do
+      it { Country.find('AX').name.should == "Åland Islands" }
+      it { Country.find('CI').name.should == "Côte d'Ivoire" }
     end
     
-    it 'has degree day data for 175 countries' do
-      Country.where('heating_degree_days IS NOT NULL AND cooling_degree_days IS NOT NULL').count.should == 173
+    it { Country.where('heating_degree_days >= 0 AND cooling_degree_days > 0').count.should == 173 }
+    
+    describe 'US automobile data' do
+      it { us.automobile_urbanity.should == 0.43 }
+      it { us.automobile_city_speed.should be_within(5e-5).of(32.0259) }
+      it { us.automobile_highway_speed.should be_within(5e-5).of(91.8935) }
+      it { us.automobile_trip_distance.should be_within(5e-5).of(16.3348) }
     end
     
-    it 'has valid electricity emission factor and electricity loss factor for most countries' do
-      Country.where('electricity_emission_factor IS NOT NULL').count.should == 136
-      Country.where(:electricity_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour').count.should == 136
-      Country.where('electricity_loss_factor IS NOT NULL').count.should == 136
-      
-      Country.minimum(:electricity_emission_factor).should >= 0.0
-      Country.minimum(:electricity_loss_factor).should >= 0.0
-      Country.maximum(:electricity_loss_factor).should < 0.3
+    describe 'electricity data' do
+      it { Country.where('electricity_emission_factor >= 0').count.should == 136 }
+      it { Country.where(:electricity_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour').count.should == 136 }
+      it { Country.where('electricity_loss_factor >= 0').count.should == 136 }
+      it { Country.maximum(:electricity_loss_factor).should < 0.3 }
       
-      us = Country.united_states
-      us.electricity_emission_factor.should be_within(0.00001).of(0.58946)
-      us.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour'
-      us.electricity_loss_factor.should be_within(0.001).of(0.062)
+      # spot checks
+      it { us.electricity_emission_factor.should be_within(5e-6).of(0.55437) }
+      it { us.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
+      it { us.electricity_loss_factor.should be_within(5e-6).of(0.06503) }
       
-      uk = Country.find 'GB'
-      uk.electricity_emission_factor.should be_within(0.00001).of(0.51020)
-      uk.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour'
-      uk.electricity_loss_factor.should be_within(0.001).of(0.073)
+      it { uk.electricity_emission_factor.should be_within(1e-5).of(0.51020) }
+      it { uk.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
+      it { uk.electricity_loss_factor.should be_within(1e-3).of(0.073) }
     end
     
-    it 'has fallback electricity emission factor and electricity loss factor' do
-      fallback = Country.fallback
-      fallback.electricity_emission_factor.should be_within(0.00001).of(0.62609)
-      fallback.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour'
-      fallback.electricity_loss_factor.should be_within(0.001).of(0.096)
+    describe 'flight data' do
+      it { Country.where("flight_route_inefficiency_factor > 0").count.should == 17 }
+      it { us.flight_route_inefficiency_factor.should == 1.07 }
+      it { uk.flight_route_inefficiency_factor.should == 1.1 }
+    end
+    
+    describe 'lodging data' do
+      it { us.lodging_occupancy_rate.should be_within(0.001).of(0.601) }
+      it { us.lodging_natural_gas_intensity.should be_within(0.00001).of(1.93316) }
+      it { us.lodging_natural_gas_intensity_units.should == 'cubic_metres_per_occupied_room_night' }
     end
     
-    it 'has lodging data for the US' do
-      us = Country.united_states
-      us.lodging_occupancy_rate.should be_within(0.001).of(0.601)
-      us.lodging_natural_gas_intensity.should be_within(0.00001).of(1.93316)
-      us.lodging_natural_gas_intensity_units.should == 'cubic_metres_per_occupied_room_night'
+    describe 'rail data' do
+      it { Country.where("rail_passengers > 0").count.should == 26 }
+      it { Country.where("rail_trip_distance > 0").count.should == 26 }
+      it { Country.where("rail_trip_electricity_intensity > 0").count.should == 26 }
+      it { Country.where("rail_trip_diesel_intensity > 0").count.should == 26 }
+      it { Country.where("rail_trip_co2_emission_factor > 0").count.should == 26 }
+      
+      # spot checks
+      it { us.rail_passengers.should == 4467000000 }
+      it { us.rail_trip_distance.should be_within(5e-5).of(12.9952) }
+      it { us.rail_speed.should be_within(5e-5).of(32.4972) }
+      it { us.rail_trip_electricity_intensity.should be_within(5e-5).of(0.140512) }
+      it { us.rail_trip_diesel_intensity.should be_within(5e-5).of(0.0194) }
+      it { us.rail_trip_co2_emission_factor.should be_within(5e-5).of(0.0958) }
+      
+      it { uk.rail_passengers.should == 1352150000 }
+      it { uk.rail_trip_distance.should be_within(5e-5).of(40.6904) }
+      it { uk.rail_trip_electricity_intensity.should be_within(5e-5).of(0.09) }
+      it { uk.rail_trip_diesel_intensity.should be_within(5e-5).of(0.0028) }
+      it { uk.rail_trip_co2_emission_factor.should be_within(5e-5).of(0.0458) }
     end
   end
   
@@ -67,4 +91,13 @@ describe Country do
       Country.united_states.should == Country.find('US')
     end
   end
+  
+  describe '.fallback' do
+    it 'has fallback electricity emission factor and electricity loss factor' do
+      fallback = Country.fallback
+      fallback.electricity_emission_factor.should be_within(0.00001).of(0.62609)
+      fallback.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour'
+      fallback.electricity_loss_factor.should be_within(0.001).of(0.096)
+    end
+  end
 end