earth 0.2.4 → 0.2.5

data/lib/earth/air/flight_segment.rb

@@ -15,9 +15,10 @@ class FlightSegment < ActiveRecord::Base
   belongs_to :service_class,                                                       :class_name => 'FlightService'
   belongs_to :domesticity,                                                         :class_name => 'FlightDomesticity'
   
-  falls_back_on :load_factor =>   lambda { weighted_average(:load_factor,   :weighted_by => :passengers) }, # 0.78222911236768
-                :freight_share => lambda { weighted_average(:freight_share, :weighted_by => :passengers) },  # 0.024017329363736
-                :seats => lambda { weighted_average :seats, :weighted_by => :passengers }
+  falls_back_on :distance          => lambda { weighted_average(:distance,      :weighted_by => :passengers) }, # 2077.1205         data1 10-12-2010
+                :seats             => lambda { weighted_average(:seats,         :weighted_by => :passengers) }, # 144.15653537046   data1 10-12-2010
+                :load_factor       => lambda { weighted_average(:load_factor,   :weighted_by => :passengers) }, # 0.78073233770097  data1 10-12-2010
+                :freight_share     => lambda { weighted_average(:freight_share, :weighted_by => :passengers) }  # 0.022567224170157 data1 10-12-2010
 
   data_miner do
     tap "Brighter Planet's sanitized T100 data", Earth.taps_server

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

@@ -181,7 +181,7 @@ FlightSegment.class_eval do
       integer  'air_time'
       float    'load_factor'
       float    'freight_share'
-      integer  'distance'
+      float    'distance'
       integer  'departures_scheduled'
       string   'airline_iata_code'
       string   'dot_airline_id_code'

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

@@ -9,6 +9,8 @@ FuelType.class_eval do
       string 'name'
       float  'emission_factor'
       string 'emission_factor_units'
+      float  'density'
+      string 'density_units'
       float  'average_purchase_volume'
       string 'average_purchase_volume_units'
       # float    'energy_content'
@@ -25,11 +27,12 @@ FuelType.class_eval do
     #   Conversions.register :carbon,                                          :carbon_dioxide,              3.66666667
     # end
     
-    import "a list of fuels and their emissions factors",
-           :url => 'http://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdDR3RjlTcWlsLTc2TzQ0cERTMElJbHc' do
+    import "a list of fuels and their emissions factors and densities",
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdDR3RjlTcWlsLTc2TzQ0cERTMElJbHc&single=true&gid=0&output=csv' do
       key 'name', :field_name => 'fuel'
       store 'emission_factor', :units_field_name => 'emission_factor_units'
       store 'average_purchase_volume', :units_field_name => 'average_purchase_volume_units'
+      store 'density', :units_field_name => 'density_units'
       # store 'energy_content', :field_name => 'energy_content', :units_field_name => 'energy_content_units', :to_units => 'FIXME' # FIXME need different conversions for different rows...
       # store 'carbon_content', :field_name => 'carbon_content', :units_field_name => 'carbon_content_units', :to_units => :kilograms_per_joule
     end

data/lib/earth/locality/country.rb

@@ -1,6 +1,8 @@
 class Country < ActiveRecord::Base
   set_primary_key :iso_3166_code
   
+  falls_back_on :flight_route_inefficiency_factor => 1.10 # for international flights - this is the larger (European) factor from Kettunen et al. (2005) http://www.atmseminar.org/seminarContent/seminar6/papers/p_055_MPM.pdf
+  
   data_miner do
     tap "Brighter Planet's sanitized countries list", Earth.taps_server
   end

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

@@ -1,8 +1,9 @@
 Country.class_eval do
   data_miner do
     schema Earth.database_options do
-      string   'iso_3166_code'
-      string   'name'
+      string 'iso_3166_code'
+      string 'name'
+      float  'flight_route_inefficiency_factor'
     end
     
     import 'the official ISO country list',
@@ -14,6 +15,11 @@ Country.class_eval do
       key   'iso_3166_code', :field_number => 1
       store 'name', :field_number => 0
     end
+    
+    import 'country-specific flight route inefficiency factors derived from Ketteunen et al. (2005)',
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdG0yc3BxYUkybWV5M3RKb2t4X0JUOFE&hl=en&single=true&gid=0&output=csv' do
+      key   'iso_3166_code'
+      store 'flight_route_inefficiency_factor'
+    end
   end
 end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: earth
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -04:00
+date: 2010-10-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency