earth 0.11.9 → 0.11.10

data/earth.gemspec

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

data/lib/earth/conversions_ext.rb

@@ -31,6 +31,9 @@ Conversions.register :dollars, :cents, 100.0
 # GHG
 Conversions.register :carbon, :co2, (44.0 / 12.0)
 
+# Temperature
+Conversions.register :degrees_celsius, :degrees_fahrenheit, (9.0 / 5.0) # NOTE: only for conversion between degrees NOT temperatures: 1 degree C = 9/5 degrees F but a temperature of 1 degree C = temperature of 33.8 degrees F
+
 # Complex
 Conversions.register :kilometres_per_litre,                 :miles_per_gallon,                        (1.kilometres.to(:miles) / 1.litres.to(:gallons))
 Conversions.register :litres_per_kilometre,                 :gallons_per_mile,                        (1.litres.to(:gallons) / 1.kilometres.to(:miles))

data/lib/earth/hospitality/commercial_building_energy_consumption_survey_response.rb

@@ -14,8 +14,10 @@ class CommercialBuildingEnergyConsumptionSurveyResponse < ActiveRecord::Base
   col :census_region_number,   :type => :integer
   col :census_division_number, :type => :integer
   col :climate_zone_number,    :type => :integer
-  col :heating_degree_days,    :type => :integer
-  col :cooling_degree_days,    :type => :integer
+  col :heating_degree_days,    :type => :float
+  col :heating_degree_days_units
+  col :cooling_degree_days,    :type => :float
+  col :cooling_degree_days_units
   col :construction_year,      :type => :integer
   col :area,                   :type => :float
   col :area_units

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

@@ -40,8 +40,8 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
            :skip => 1,
            :headers => ["PUBID8", "REGION8", "CENDIV8", "SQFT8", "SQFTC8", "YRCONC8", "PBA8", "ELUSED8", "NGUSED8", "FKUSED8", "PRUSED8", "STUSED8", "HWUSED8", "ADJWT8", "STRATUM8", "PAIR8", "HDD658", "CDD658", "MFUSED8", "MFBTU8", "MFEXP8", "ELCNS8", "ELBTU8", "ELEXP8", "ZELCNS8", "ZELEXP8"] do
       key 'id', :field_name => 'PUBID8'
-      store 'heating_degree_days', :field_name => 'HDD658'
-      store 'cooling_degree_days', :field_name => 'CDD658'
+      store 'heating_degree_days', :field_name => 'HDD658', :from_units => :degrees_fahrenheit, :to_units => :degrees_celsius
+      store 'cooling_degree_days', :field_name => 'CDD658', :from_units => :degrees_fahrenheit, :to_units => :degrees_celsius
       store 'electricity_use',     :synthesize => Proc.new { |row| row['ELCNS8'].to_i }, :units => :kilowatt_hours
       store 'electricity_energy',  :field_name => 'ELBTU8', :from_units => :kbtus, :to_units => :megajoules
     end

data/lib/earth/locality/climate_division.rb

@@ -7,12 +7,12 @@ class ClimateDivision < ActiveRecord::Base
   RADIUS = 750
   
   def climate_zone_number
-    if cooling_degree_days < 2000
-      if heating_degree_days > 7000
+    if cooling_degree_days < 2000.degrees_fahrenheit.to(:degrees_celsius)
+      if heating_degree_days > 7000.degrees_fahrenheit.to(:degrees_celsius)
         1
-      elsif heating_degree_days > 5499
+      elsif heating_degree_days > 5499.degrees_fahrenheit.to(:degrees_celsius)
         2
-      elsif heating_degree_days > 3999
+      elsif heating_degree_days > 3999.degrees_fahrenheit.to(:degrees_celsius)
         3
       else
         4
@@ -24,6 +24,8 @@ class ClimateDivision < ActiveRecord::Base
   
   col :name
   col :heating_degree_days, :type => :float
+  col :heating_degree_days_units
   col :cooling_degree_days, :type => :float
+  col :cooling_degree_days_units
   col :state_postal_abbreviation
 end

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

@@ -3,10 +3,9 @@ ClimateDivision.class_eval do
     import "a list of climate divisions and their average heating and cooling degree days",
            :url => 'http://static.brighterplanet.com/science/data/climate/climate_divisions/climate_divisions.csv' do
       key 'name'
-      store 'heating_degree_days'
-      store 'cooling_degree_days'
+      store 'heating_degree_days', :from_units => :degrees_fahrenheit, :to_units => :degrees_celsius
+      store 'cooling_degree_days', :from_units => :degrees_fahrenheit, :to_units => :degrees_celsius
       store 'state_postal_abbreviation'
     end
-    #associate :state, :key => :state_postal_abbreviation, :foreign_key => :postal_abbreviation
   end
 end

data/lib/earth/locality/country.rb

@@ -1,12 +1,31 @@
 require 'earth/automobile'
 require 'earth/hospitality'
 require 'earth/rail'
+
 class Country < ActiveRecord::Base
   set_primary_key :iso_3166_code
   
   has_many :rail_companies,  :foreign_key => 'country_iso_3166_code' # used to calculate rail data
   has_many :lodging_classes, :foreign_key => 'country_iso_3166_code', :class_name => 'CountryLodgingClass'
   
+  def climate_zone_number
+    if heating_degree_days and cooling_degree_days
+      if cooling_degree_days < 2000.degrees_fahrenheit.to(:degrees_celsius)
+        if heating_degree_days > 7000.degrees_fahrenheit.to(:degrees_celsius)
+          1
+        elsif heating_degree_days > 5499.degrees_fahrenheit.to(:degrees_celsius)
+          2
+        elsif heating_degree_days > 3999.degrees_fahrenheit.to(:degrees_celsius)
+          3
+        else
+          4
+        end
+      else
+        5
+      end
+    end
+  end
+  
   falls_back_on :name => 'fallback',
                 :automobile_urbanity => lambda { 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
@@ -49,6 +68,10 @@ class Country < ActiveRecord::Base
   col :iso_3166_numeric_code, :type => :integer # numeric like 826; aka UN M49 code
   col :iso_3166_alpha_3_code                    # 3-letter like GBR
   col :name
+  col :heating_degree_days, :type => :float
+  col :heating_degree_days_units
+  col :cooling_degree_days, :type => :float
+  col :cooling_degree_days_units
   col :automobile_urbanity, :type => :float # float from 0 to 1
   col :automobile_fuel_efficiency, :type => :float
   col :automobile_fuel_efficiency_units

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

@@ -18,6 +18,32 @@ Country.class_eval do
       store 'name', :field_number => 5 # romanized version
     end
     
+    import "heating degree day data from WRI CAIT",
+           :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdDN4MkRTSWtWRjdfazhRdWllTkVSMkE&output=csv',
+           :select => Proc.new { |record| record['country'] != 'European Union (27)' },
+           :errata => { :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdDNSMUtCV0h4cUF4UnBKZlNkczlNbFE&output=csv' } do
+      key 'name', :field_name => 'country'
+      store 'heating_degree_days', :units => :degrees_celsius
+    end
+    
+    import "cooling degree day data from WRI CAIT",
+           :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdDN4MkRTSWtWRjdfazhRdWllTkVSMkE&output=csv',
+           :select => Proc.new { |record| record['country'] != 'European Union (27)' },
+           :errata => { :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdDNSMUtCV0h4cUF4UnBKZlNkczlNbFE&output=csv' } do
+      key 'name', :field_name => 'country'
+      store 'cooling_degree_days', :units => :degrees_celsius
+    end
+    
+    process "set Montenegro's heating and cooling degree days to the same as Serbia's" do
+      montenegro = Country.find 'ME'
+      serbia = Country.find 'RS'
+      montenegro.heating_degree_days = serbia.heating_degree_days
+      montenegro.heating_degree_days_units = serbia.heating_degree_days_units
+      montenegro.cooling_degree_days = serbia.cooling_degree_days
+      montenegro.cooling_degree_days_units = serbia.cooling_degree_days_units
+      montenegro.save!
+    end
+    
     # AUTOMOBILE
     import "automobile-related data for the US",
            :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdDdZRm1tNjY0c2dYNG00bXJ3TXRqUVE&gid=0&output=csv' do
@@ -77,7 +103,7 @@ Country.class_eval do
           row['electricity_co2_emission_factor'].to_f +
           (row['electricity_ch4_emission_factor'].to_f * GreenhouseGas[:ch4].global_warming_potential) +
           (row['electricity_n2o_emission_factor'].to_f * GreenhouseGas[:n2o].global_warming_potential)
-        ) / (1 - row['loss_factor'].to_f) }, :units_field_name => 'kilograms_co2e_per_kilowatt_hour'
+        ) / (1 - row['loss_factor'].to_f) }, :units => 'kilograms_co2e_per_kilowatt_hour'
     end
     
     process "Ensure EgridSubregion is populated" do

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.11.9"
+  VERSION = "0.11.10"
 end

data/spec/earth/locality/country_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'earth/locality'
+require 'earth/locality/data_miner'
+
+describe Country do
+  describe 'import', :slow => true do
+    it 'should import data' do
+      Earth.init 'locality', :load_data_miner => true, :apply_schemas => true
+      Country.run_data_miner!
+      Country.all.count.should == 249
+    end
+    
+    it 'should correctly determine climate zone number' do
+      Country.find('LT').climate_zone_number.should == 1
+      Country.find('HU').climate_zone_number.should == 2
+      Country.find('HR').climate_zone_number.should == 3
+      Country.find('CY').climate_zone_number.should == 4
+      Country.find('UZ').climate_zone_number.should == 5
+      Country.where(:heating_degree_days => nil).first.climate_zone_number.should == nil
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -8,13 +8,36 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'earth'
 
+case ENV['EARTH_DB_ADAPTER']
+when 'mysql'
+  adapter = 'mysql'
+  database = 'test_earth'
+  username = 'root'
+  password = 'password'
+  
+  # system %{mysql -u #{username} -p#{password} -e "DROP DATABASE #{database}"}
+  # system %{mysql -u #{username} -p#{password} -e "CREATE DATABASE #{database}"}
+else
+  adapter = 'sqlite3'
+  database = ':memory:'
+  username = nil
+  password = nil
+end
+
+config = {
+  'encoding' => 'utf8',
+  'adapter' => adapter,
+  'database' => database,
+}
+config['username'] = username if username
+config['password'] = password if password
+
+ActiveRecord::Base.establish_connection config
+
 logger = Logger.new 'log/test.log'
 logger.level = Logger::DEBUG
 
-ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
-
 ActiveRecord::Base.logger = logger
-
 DataMiner.logger = logger
 
 RSpec.configure do |c|

data/vendor/geokit-rails/lib/geokit-rails.rb

@@ -7,10 +7,10 @@
 #
 require 'geokit'
 if defined? Geokit
-  require 'geokit-rails/defaults'
-  require 'geokit-rails/adapters/abstract'
-  require 'geokit-rails/acts_as_mappable'
-  require 'geokit-rails/ip_geocode_lookup'
+  require File.expand_path('../geokit-rails/defaults', __FILE__)
+  require File.expand_path('../geokit-rails/adapters/abstract', __FILE__)
+  require File.expand_path('../geokit-rails/acts_as_mappable', __FILE__)
+  require File.expand_path('../geokit-rails/ip_geocode_lookup', __FILE__)
   
   # Automatically mix in distance finder support into ActiveRecord classes.
   ActiveRecord::Base.send :include, GeoKit::ActsAsMappable

metadata

@@ -2,7 +2,7 @@
 name: earth
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.11.9
+  version: 0.11.10
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -12,8 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 +01:00
-default_executable: 
+date: 2012-01-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: data_miner
@@ -584,6 +583,7 @@ files:
 - spec/earth/bus/bus_fuel_year_control_spec.rb
 - spec/earth/industry/mecs_energy_spec.rb
 - spec/earth/industry/mecs_ratio_spec.rb
+- spec/earth/locality/country_spec.rb
 - spec/earth/pet/species_spec.rb
 - spec/earth_spec.rb
 - spec/spec_helper.rb
@@ -633,7 +633,6 @@ files:
 - vendor/geokit-rails/test/schema.rb
 - vendor/geokit-rails/test/tasks.rake
 - vendor/geokit-rails/test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/brighterplanet/earth
 licenses: []
 
@@ -647,7 +646,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3547937136240416644
+      hash: 1670776732781702788
       segments: 
       - 0
       version: "0"
@@ -656,14 +655,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3547937136240416644
+      hash: 1670776732781702788
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Land, sky, and sea
@@ -758,6 +757,7 @@ test_files:
 - spec/earth/bus/bus_fuel_year_control_spec.rb
 - spec/earth/industry/mecs_energy_spec.rb
 - spec/earth/industry/mecs_ratio_spec.rb
+- spec/earth/locality/country_spec.rb
 - spec/earth/pet/species_spec.rb
 - spec/earth_spec.rb
 - spec/spec_helper.rb