earth 0.11.7 → 0.11.8

data/lib/earth/industry/industry.rb

@@ -1,3 +1,4 @@
+require 'earth/locality'
 class Industry < ActiveRecord::Base
   set_primary_key :naics_code
   

data/lib/earth/industry/industry/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/locality/data_miner'
 Industry.class_eval do
   data_miner do
     import "the U.S. Census 2002 NAICS code list",

data/lib/earth/industry/industry_product.rb

@@ -1,3 +1,4 @@
+require 'earth/locality'
 class IndustryProduct < ActiveRecord::Base
   set_primary_key :naics_product_code
   

data/lib/earth/industry/industry_product_line.rb

@@ -1,3 +1,4 @@
+require 'earth/locality'
 class IndustryProductLine < ActiveRecord::Base
   set_primary_key :row_hash
   

data/lib/earth/industry/industry_sector.rb

@@ -1,3 +1,4 @@
+require 'earth/locality'
 class IndustrySector < ActiveRecord::Base
   set_primary_key :row_hash
   

data/lib/earth/industry/mecs_energy.rb

@@ -1,6 +1,8 @@
-require 'earth/industry/industry'
+require 'earth/locality'
 
 class MecsEnergy < ActiveRecord::Base
+  set_primary_key :name
+  
   col :name
   col :census_region
   col :naics_code
@@ -14,29 +16,6 @@ class MecsEnergy < ActiveRecord::Base
   col :coke_and_breeze, :type => :float
   col :other, :type => :float
 
-  CENSUS_REGIONS = {
-    'Total US' =>  {
-      :crop => (13..81),
-      :code => nil
-    },
-    'Northeast' => {
-      :crop => (88..156),
-      :code => 1
-    },
-    'Midwest' => {
-      :crop => (163..231),
-      :code => 2
-    },
-    'South' =>  {
-      :crop => (238..306),
-      :code => 3
-    },
-    'West' => {
-      :crop => (313..382),
-      :code => 4
-    }
-  }
-
   FUELS = [:net_electricity, :residual_fuel_oil, :distillate_fuel_oil,
            :natural_gas, :lpg_and_ngl, :coal, :coke_and_breeze, :other]
 

data/lib/earth/industry/mecs_energy/data_miner.rb

@@ -1,28 +1,51 @@
 require 'earth/eia'
-
+require 'earth/locality'
 MecsEnergy.class_eval do
+  const_set(:CENSUS_REGIONS, {
+    'Total US' =>  {
+      :crop => (15..93),
+      :code => nil
+    },
+    'Northeast' => {
+      :crop => (99..177),
+      :code => 1
+    },
+    'Midwest' => {
+      :crop => (184..262),
+      :code => 2
+    },
+    'South' =>  {
+      :crop => (267..345),
+      :code => 3
+    },
+    'West' => {
+      :crop => (351..429),
+      :code => 4
+    }
+  })
+
   data_miner do
     MecsEnergy::CENSUS_REGIONS.each do |region, data|
       import("MECS table 3.2 #{region}",
         :url => "http://205.254.135.24/emeu/mecs/mecs2006/excel/Table3_2.xls",
-        :crop => data[:crop]) do
+        :crop => data[:crop], :headers => false, :skip => 1) do
         key 'name', :synthesize => Proc.new { |row| "#{Industry.format_naics_code(row[0])}-#{data[:code]}" }
         store 'naics_code', :field_number => 0
         store :total, :field_number => 2
-        store :net_electricity, :field_number => 3
-        store :residual_fuel_oil, :field_number => 4
-        store :distillate_fuel_oil, :field_number => 5
-        store :natural_gas, :field_number => 6
-        store :lpg_and_ngl, :field_number => 7
-        store :coal, :field_number => 8
-        store :coke_and_breeze, :field_number => 9
-        store :other, :field_number => 10
+        store :net_electricity, :field_number => 4
+        store :residual_fuel_oil, :field_number => 5
+        store :distillate_fuel_oil, :field_number => 6
+        store :natural_gas, :field_number => 8
+        store :lpg_and_ngl, :field_number => 10
+        store :coal, :field_number => 12
+        store :coke_and_breeze, :field_number => 13
+        store :other, :field_number => 14
         store 'census_region', :static => data[:code]
       end
     end
 
     process :normalize_fuels do
-      Earth::EIA.normalize(MecsEnergy, FUELS)
+      Earth::EIA.normalize(MecsEnergy, MecsEnergy::FUELS)
     end
   end
 end

data/lib/earth/industry/mecs_ratio.rb

@@ -1,33 +1,15 @@
+require 'earth/locality'
+require 'earth/industry/industry'
+
 class MecsRatio < ActiveRecord::Base
-  belongs_to :industry
+  set_primary_key :name
 
   col :name
   col :census_region
   col :naics_code
   col :consumption_per_dollar_of_shipments, :type => :float
-
-  CENSUS_REGIONS = {
-    'Total US' =>  {
-      :crop => (16..94),
-      :code => nil
-    },
-    'Northeast' => {
-      :crop => (100..178),
-      :code => 1
-    },
-    'Midwest' => {
-      :crop => (184..262),
-      :code => 2
-    },
-    'South' =>  {
-      :crop => (268..346),
-      :code => 3
-    },
-    'West' => {
-      :crop => (352..430),
-      :code => 4
-    }
-  }
+  
+  belongs_to :industry
 
   def self.find_by_naics_code_and_census_region(code, census_region)
     if code.blank?

data/lib/earth/industry/mecs_ratio/data_miner.rb

@@ -1,6 +1,29 @@
 require 'earth/eia'
-
+require 'earth/locality/data_miner'
 MecsRatio.class_eval do
+  const_set(:CENSUS_REGIONS, {
+    'Total US' =>  {
+      :crop => (16..94),
+      :code => nil
+    },
+    'Northeast' => {
+      :crop => (100..178),
+      :code => 1
+    },
+    'Midwest' => {
+      :crop => (184..262),
+      :code => 2
+    },
+    'South' =>  {
+      :crop => (268..346),
+      :code => 3
+    },
+    'West' => {
+      :crop => (352..430),
+      :code => 4
+    }
+  })
+  
   data_miner do
     MecsRatio::CENSUS_REGIONS.each do |region, data|
       import( "MECS table 6.1 #{region}",

data/lib/earth/locality.rb

@@ -1,15 +1,3 @@
-require 'earth/locality/census_division'
-require 'earth/locality/census_region'
-require 'earth/locality/climate_division'
-require 'earth/locality/country'
-require 'earth/locality/egrid_country'
-require 'earth/locality/egrid_region'
-require 'earth/locality/egrid_subregion'
-require 'earth/locality/petroleum_administration_for_defense_district'
-require 'earth/locality/state'
-require 'earth/locality/zip_code'
-
-require 'earth/automobile'  # for automobile data on Country
-require 'earth/fuel'        # for GWPs for EgridSubregion
-require 'earth/hospitality' # for lodging data on Country
-require 'earth/rail'        # for rail data on Country
+# lib/earth/locality.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/locality/census_division.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class CensusDivision < ActiveRecord::Base
   set_primary_key :number
   

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

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 CensusDivision.class_eval do
   data_miner do
     process 'Define some unit conversions' do

data/lib/earth/locality/country.rb

@@ -1,3 +1,6 @@
+require 'earth/automobile'
+require 'earth/hospitality'
+require 'earth/rail'
 class Country < ActiveRecord::Base
   set_primary_key :iso_3166_code
   

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

@@ -1,3 +1,7 @@
+require 'earth/automobile/data_miner'
+require 'earth/hospitality/data_miner'
+require 'earth/rail/data_miner'
+
 Country.class_eval do
   data_miner do
     # http://www.iso.org/iso/list-en1-semic-3.txt
@@ -82,7 +86,7 @@ Country.class_eval do
     
     process "Derive average US electricity emission factor from eGRID" do
       us = united_states
-      subregion = EgridSubregion.find_by_abbreviation 'US'
+      subregion = EgridSubregion.fallback
       us.electricity_emission_factor =
         (
           subregion.electricity_co2_emission_factor +

data/lib/earth/locality/data_miner.rb

@@ -1,15 +1,3 @@
-require 'earth/locality/census_division/data_miner'
-require 'earth/locality/census_region/data_miner'
-require 'earth/locality/climate_division/data_miner'
-require 'earth/locality/country/data_miner'
-require 'earth/locality/egrid_country/data_miner'
-require 'earth/locality/egrid_region/data_miner'
-require 'earth/locality/egrid_subregion/data_miner'
-require 'earth/locality/petroleum_administration_for_defense_district/data_miner'
-require 'earth/locality/state/data_miner'
-require 'earth/locality/zip_code/data_miner'
-
-require 'earth/automobile/data_miner'  # for automobile data on Country
-require 'earth/fuel/data_miner'        # for GWPs for EgridSubregion
-require 'earth/hospitality/data_miner' # for lodging data on Country
-require 'earth/rail/data_miner'        # for rail data on Country
+# lib/earth/locality/data_miner.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/locality/egrid_subregion.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class EgridSubregion < ActiveRecord::Base
   set_primary_key :abbreviation
   

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

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 EgridSubregion.class_eval do
   data_miner do
     import "eGRID 2010 subregions and electricity emission factors",

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

@@ -1,21 +1,22 @@
 State.class_eval do
   data_miner do
-    # state names, ansi codes, and postal abbreviations
+    # state names, FIPS codes, and postal abbreviations
     import 'the U.S. Census State ANSI Code file',
            :url => 'http://www.census.gov/geo/www/ansi/state.txt',
-           :delimiter => '|' do
+           :delimiter => '|',
+           :select => lambda { |record| record['STATE'].to_i < 60 } do
       key   'postal_abbreviation', :field_name => 'STUSAB'
-      store 'fips_code', :field_name => 'STATE'
-      store 'name', :field_name => 'STATE_NAME'
+      store 'fips_code',           :field_name => 'STATE'
+      store 'name',                :field_name => 'STATE_NAME'
     end
-
+    
     # census divisions
-    import('the U.S. Census Geographic Terms and Definitions',
+    import 'state census divisions from the U.S. Census',
            :url => 'http://www.census.gov/popest/about/geo/state_geocodes_v2009.txt',
-           :skip => 6,
-           :headers => %w{ Region Division FIPS Name },
-           :select => ::Proc.new { |row| row['FIPS'].to_i > 0 }) do
-      key   'fips_code', :field_name => 'FIPS CODE STATE'
+           :skip => 8,
+           :headers => ['Region', 'Division', 'State FIPS', 'Name'],
+           :select => ::Proc.new { |row| row['State FIPS'].to_i > 0 } do
+      key   'fips_code', :field_name => 'State FIPS'
       store 'census_division_number', :field_name => 'Division'
     end
     
@@ -27,4 +28,3 @@ State.class_eval do
     end
   end
 end
-

data/lib/earth/locality/zip_code.rb

@@ -1,3 +1,5 @@
+require ::File.join(Earth.vendor_dir, 'geokit-rails', 'lib', 'geokit-rails')
+
 class ZipCode < ActiveRecord::Base
   set_primary_key :name
   
@@ -9,6 +11,10 @@ class ZipCode < ActiveRecord::Base
     Country.united_states
   end
   
+  def latitude_longitude
+    [latitude, longitude]
+  end
+  
   acts_as_mappable :default_units => :kilometres,
                    :lat_column_name => :latitude,
                    :lng_column_name => :longitude

data/lib/earth/pet.rb

@@ -1,4 +1,3 @@
-require 'earth/pet/breed'
-require 'earth/pet/breed_gender'
-require 'earth/pet/gender'
-require 'earth/pet/species'
+# lib/earth/pet.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/pet/data_miner.rb

@@ -1,4 +1,3 @@
-require 'earth/pet/breed/data_miner'
-require 'earth/pet/breed_gender/data_miner'
-require 'earth/pet/gender/data_miner'
-require 'earth/pet/species/data_miner'
+# lib/earth/pet/data_miner.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/rail.rb

@@ -1,15 +1,3 @@
-require 'earth/rail/country_rail_traction'
-require 'earth/rail/country_rail_class'
-require 'earth/rail/country_rail_traction_class'
-require 'earth/rail/rail_company'
-require 'earth/rail/rail_company_traction'
-require 'earth/rail/rail_company_traction_class'
-require 'earth/rail/rail_class'
-require 'earth/rail/rail_fuel'
-require 'earth/rail/rail_traction'
-require 'earth/rail/national_transit_database_company'
-require 'earth/rail/national_transit_database_mode'
-require 'earth/rail/national_transit_database_record'
-
-require 'earth/fuel'
-require 'earth/locality' # eGRID needed for US electricity emission factor in RailCompany import
+# lib/earth/rail.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/rail/country_rail_class.rb

@@ -1,3 +1,4 @@
+require 'earth/locality'
 class CountryRailClass < ActiveRecord::Base
   set_primary_key :name
   

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

@@ -1,3 +1,4 @@
+require 'earth/locality/data_miner'
 CountryRailClass.class_eval do
   data_miner do
     import "a list of country-specific rail classes and their pre-calculated characteristics",

data/lib/earth/rail/country_rail_traction.rb

@@ -1,3 +1,5 @@
+require 'earth/fuel'
+require 'earth/locality'
 class CountryRailTraction < ActiveRecord::Base
   set_primary_key :name
   

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

@@ -1,3 +1,5 @@
+require 'earth/fuel/data_miner'
+require 'earth/locality/data_miner'
 CountryRailTraction.class_eval do
   data_miner do
     import "european rail traction data from the UIC",

data/lib/earth/rail/country_rail_traction_class.rb

@@ -1,3 +1,5 @@
+require 'earth/fuel'
+require 'earth/locality'
 class CountryRailTractionClass < ActiveRecord::Base
   set_primary_key :name
   

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

@@ -1,3 +1,5 @@
+require 'earth/fuel/data_miner'
+require 'earth/locality/data_miner'
 CountryRailTractionClass.class_eval do
   data_miner do
     import "european rail traction class data from the UIC",

data/lib/earth/rail/data_miner.rb

@@ -1,16 +1,3 @@
-require 'earth/rail/country_rail_traction/data_miner'
-require 'earth/rail/country_rail_class/data_miner'
-require 'earth/rail/country_rail_traction_class/data_miner'
-require 'earth/rail/rail_class/data_miner'
-require 'earth/rail/rail_company/data_miner'
-require 'earth/rail/rail_company_traction/data_miner'
-require 'earth/rail/rail_company_traction_class/data_miner'
-require 'earth/rail/rail_class/data_miner'
-require 'earth/rail/rail_fuel/data_miner'
-require 'earth/rail/rail_traction/data_miner'
-require 'earth/rail/national_transit_database_company/data_miner'
-require 'earth/rail/national_transit_database_mode/data_miner'
-require 'earth/rail/national_transit_database_record/data_miner'
-
-require 'earth/fuel/data_miner'
-require 'earth/locality/data_miner' # eGRID needed for US electricity emission factor in RailCompany import
+# lib/earth/rail/data_miner.rb
+require 'earth'
+Earth.require_related __FILE__