earth 0.4.6 → 0.4.7

data/earth.gemspec

@@ -5,7 +5,7 @@ require "earth/version"
 Gem::Specification.new do |s|
   s.name        = "earth"
   s.version     = Earth::VERSION
-  s.date = "2011-03-04"
+  s.date = "2011-03-10"
   s.platform    = Gem::Platform::RUBY
   s.authors = ["Seamus Abshere", "Derek Kastner", "Andy Rossmeissl"]
   s.email = %q{andy@rossmeissl.net}

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

@@ -112,7 +112,7 @@ AutomobileTypeFuelYearAge.class_eval do
     end
     
     process "Derive type fuel year name for association with AutomobileTypeFuelYear" do
-      if ActiveRecord::Base.connection.adapter_name == 'sqlite'
+      if ActiveRecord::Base.connection.adapter_name.downcase == 'sqlite'
         update_all "type_fuel_year_name = type_name || ' ' || fuel_common_name || ' ' year"
       else
         update_all "type_fuel_year_name = CONCAT(type_name, ' ', fuel_common_name, ' ', year)"

data/lib/earth/locality/country.rb

@@ -1,7 +1,17 @@
 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
+  falls_back_on :name => 'fallback',
+                :automobile_urbanity => lambda { Country.united_states.automobile_urbanity }, # for now assume US represents world
+                :automobile_fuel_efficiency => ((22.5 + 16.2) / 2.0).miles_per_gallon.to(:kilometres_per_litre), # average of passenger car fuel unknown and light goods vehicle fuel unknown - WRI Mobile Combustion calculation tool v2.0
+                :automobile_fuel_efficiency_units => 'kilometres_per_litre',
+                :automobile_city_speed => lambda { Country.united_states.automobile_city_speed }, # for now assume US represents world
+                :automobile_city_speed_units => lambda { Country.united_states.automobile_city_speed_units }, # for now assume US represents world
+                :automobile_highway_speed => lambda { Country.united_states.automobile_highway_speed }, # for now assume US represents world
+                :automobile_highway_speed_units => lambda { Country.united_states.automobile_highway_speed_units }, # for now assume US represents world
+                :automobile_trip_distance => lambda { Country.united_states.automobile_trip_distance }, # for now assume US represents world
+                :automobile_trip_distance_units => lambda { Country.united_states.automobile_trip_distance_units }, # for now assume US represents world
+                :flight_route_inefficiency_factor => lambda { Country.maximum(:flight_route_inefficiency_factor) } # default to the largest inefficiency factor
   
   data_miner do
     tap "Brighter Planet's sanitized countries list", Earth.taps_server

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

@@ -3,6 +3,15 @@ Country.class_eval do
     schema Earth.database_options do
       string 'iso_3166_code'
       string 'name'
+      float  'automobile_urbanity'
+      float  'automobile_fuel_efficiency'
+      string 'automobile_fuel_efficiency_units'
+      float  'automobile_city_speed'
+      string 'automobile_city_speed_units'
+      float  'automobile_highway_speed'
+      string 'automobile_highway_speed_units'
+      float  'automobile_trip_distance'
+      string 'automobile_trip_distance_units'
       float  'flight_route_inefficiency_factor'
     end
     
@@ -21,5 +30,62 @@ Country.class_eval do
       key   'iso_3166_code'
       store 'flight_route_inefficiency_factor'
     end
+    
+    import "automobile trip fallbacks",
+           :url => 'https://spreadsheets.google.com/pub?hl=en&hl=en&key=0AoQJbWqPrREqdDdZRm1tNjY0c2dYNG00bXJ3TXRqUVE&gid=0&output=csv' do
+      key 'iso_3166_code'
+      store 'automobile_urbanity'
+      store 'automobile_city_speed', :units_field_name => 'automobile_city_speed_units'
+      store 'automobile_highway_speed', :units_field_name => 'automobile_highway_speed_units'
+      store 'automobile_trip_distance', :units_field_name => 'automobile_trip_distance_units'
+    end
+    
+    # FIXME TODO eventually need to do this for all countries
+    process "Derive US average automobile fuel efficiency from AutomobileTypeFuelYear" do
+      # AutomobileTypeFuelYear.run_data_miner!
+      
+      scope = AutomobileTypeFuelYear.where(:year => AutomobileTypeFuelYear.maximum(:year))
+      fe = scope.sum(:total_travel) / scope.sum(:fuel_consumption)
+      units = scope.first.total_travel_units + '_per_' + scope.first.fuel_consumption_units.singularize
+      
+      connection.execute %{
+        UPDATE countries
+        SET automobile_fuel_efficiency = #{fe},
+            automobile_fuel_efficiency_units = '#{units}'
+        WHERE iso_3166_code = 'US'
+      }
+    end
+    
+    process "Convert automobile city speed from miles per hour to kilometres per hour" do
+      conversion_factor = 1.miles.to(:kilometres)
+      connection.execute %{
+        UPDATE countries
+        SET automobile_city_speed = automobile_city_speed * #{conversion_factor},
+            automobile_city_speed_units = 'kilometres_per_hour'
+        WHERE automobile_city_speed_units = 'miles_per_hour'
+      }
+    end
+    
+    process "Convert automobile highway speed from miles per hour to kilometres per hour" do
+      conversion_factor = 1.miles.to(:kilometres)
+      connection.execute %{
+        UPDATE countries
+        SET automobile_highway_speed = automobile_highway_speed * #{conversion_factor},
+            automobile_highway_speed_units = 'kilometres_per_hour'
+        WHERE automobile_highway_speed_units = 'miles_per_hour'
+      }
+    end
+    
+    process "Convert automobile trip distance from miles to kilometres" do
+      conversion_factor = 1.miles.to(:kilometres)
+      connection.execute %{
+        UPDATE countries
+        SET automobile_trip_distance = automobile_trip_distance * #{conversion_factor},
+            automobile_trip_distance_units = 'kilometres'
+        WHERE automobile_trip_distance_units = 'miles'
+      }
+    end
+    
+    # FIXME TODO verify this
   end
 end

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

@@ -27,10 +27,12 @@ ZipCode.class_eval do
       store 'longitude'
     end
     
-    import 'a Brighter Planet-created list of zipcode eGRID Subregions',
-           :url => 'http://static.brighterplanet.com/science/data/electricity/egrid/models_export/zip_subregions.csv' do
-      key   'name', :field_name => 'zip', :sprintf => '%05d'
-      store 'egrid_subregion_abbreviation', :field_name => 'primary_subregion'
+    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-0.xls',
+           :sheet => 'Zip-subregion' do
+      key   'name', :field_name => 'ZIP (character)'
+      store 'state_postal_abbreviation', :field_name => 'State'
+      store 'egrid_subregion_abbreviation', :field_name => 'Primary eGRID Subregion'
     end
     
     import 'a Brighter Planet-created list of zipcode Climate Divisions',
@@ -38,5 +40,7 @@ ZipCode.class_eval do
       key   'name', :field_name => 'zip_code_name', :sprintf => '%05d'
       store 'climate_division_name'
     end
+    
+    # FIXME TODO verify this
   end
 end

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -16,11 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -05:00
+date: 2011-03-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cohort_scope
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,10 +33,10 @@ dependencies:
         - 5
         version: 0.1.5
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: data_miner
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,10 +48,10 @@ dependencies:
         - 4
         version: 1.1.4
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: falls_back_on
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,10 +63,10 @@ dependencies:
         - 3
         version: 0.1.3
   type: :runtime
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: geokit-rails
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,10 +76,10 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: loose_tight_dictionary
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -90,10 +91,10 @@ dependencies:
         - 10
         version: 0.0.10
   type: :runtime
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: weighted_average
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -105,10 +106,10 @@ dependencies:
         - 6
         version: 0.0.6
   type: :runtime
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: bundler
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -118,10 +119,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: bueller
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -131,10 +132,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: cucumber
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -144,10 +145,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rake
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -157,10 +158,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rdoc
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -170,10 +171,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rdoc
+  prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -183,10 +184,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -196,10 +197,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
+  prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -209,7 +210,6 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id014
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
@@ -561,7 +561,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1235371352071113730
       segments: 
       - 0
       version: "0"
@@ -570,7 +569,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1235371352071113730
       segments: 
       - 0
       version: "0"