earth 1.0.3 → 1.1.0

data/lib/earth/residence/residence_fuel_price.rb

@@ -29,5 +29,5 @@ EOS
   belongs_to :fuel, :class_name => 'ResidenceFuelType', :foreign_key => 'residence_fuel_type_name'
   belongs_to :locatable, :polymorphic => true
   
-  warn_unless_size 13741
+  warn_unless_size 13792
 end

data/lib/earth/tasks.rb

@@ -31,6 +31,11 @@ module Earth
 
     def init_bare
       Object.const_set 'Rails', Earth
+      Earth.module_eval do
+        def self.logger
+          @logger ||= Logger.new(STDOUT)
+        end
+      end
 
       require 'active_record'
       load 'active_record/railties/databases.rake'

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/spec/data_mining_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'fileutils'
 require 'earth'
 
-describe 'Data Mining', :data_miner => true do
+describe 'Data Mining', :mine_all => true do
   it 'is successful for each individual model' do
     Earth.init :all
     Earth.resource_models.each do |resource|

data/spec/earth/air/aircraft_spec.rb

@@ -4,7 +4,7 @@ require 'earth/air/aircraft'
 describe Aircraft do
   describe "Sanity check", :sanity => true do
     it "should have all the data" do
-      Aircraft.count.should == 437
+      Aircraft.count.should == 438
     end
     
     describe '.fallback' do
@@ -12,7 +12,7 @@ describe Aircraft do
       it { fallback.m3.should be_within(5e-9).of(0.00000013) }
       it { fallback.m2.should be_within(5e-6).of(-0.00024) }
       it { fallback.m1.should be_within(5e-2).of(6.2) }
-      it { fallback.b.should be_within(0.5).of(1379) }
+      it { fallback.b.should be_within(0.5).of(1377) }
     end
   end
   

data/spec/earth/air/airline_spec.rb

@@ -4,7 +4,7 @@ require 'earth/air/airline'
 describe Airline do
   describe "Sanity check", :sanity => true do
     it "should have all the data" do
-      Airline.count.should == 1524
+      Airline.count.should == 1519
     end
   end
 end

data/spec/earth/air/airport_spec.rb

@@ -5,7 +5,7 @@ require 'earth/air/airport'
 describe Airport do
   describe "Sanity check", :sanity => true do
     it "should have all the data" do
-      Airport.count.should == 5324
+      Airport.count.should == 5325
     end
     
     it "should use utf-8 encoding" do

data/spec/earth/air/bts_aircraft_spec.rb

@@ -4,7 +4,7 @@ require 'earth/air/bts_aircraft'
 describe BtsAircraft do
   describe 'Sanity check', :sanity => true do
     it 'should have all the data' do
-      BtsAircraft.count.should == 378
+      BtsAircraft.count.should == 379
     end
   end
 end

data/spec/earth/air/flight_segment_spec.rb

@@ -32,7 +32,7 @@ describe FlightSegment do
       FlightSegment.where(:year => 2009).count.should == 403_980
       FlightSegment.where(:year => 2010).count.should == 421_884
       FlightSegment.where(:year => 2011).count.should == 428_554
-      FlightSegment.where(:year => 2012).count.should >   34_074
+      FlightSegment.where(:year => 2012).count.should >   67_168
     end
     
     it "should have year from 2009 through 7 months ago" do
@@ -46,34 +46,32 @@ describe FlightSegment do
       FlightSegment.where(:year => latest.year).maximum(:month).should == latest.month
     end
     
-    it "should have origin airport in airports" do
-      FlightSegment.connection.select_values("SELECT DISTINCT origin_airport_iata_code FROM flight_segments").each do |code|
-        Airport.exists?(:iata_code => code).should == true
+    it "should have origin and destination airport in airports" do
+      %w{ origin destination }.each do |attribute|
+        missing = []
+        FlightSegment.connection.select_values("SELECT DISTINCT #{attribute}_airport_iata_code FROM flight_segments").each do |code|
+          missing << code unless Airport.exists?(:iata_code => code)
+        end
+        raise "Could not find the following #{attribute} airports:\n#{missing}" if missing.any?
       end
     end
     
-    it "should have destination airport in airports" do
-      FlightSegment.connection.select_values("SELECT DISTINCT destination_airport_iata_code FROM flight_segments").each do |code|
-        Airport.exists?(:iata_code => code).should == true
-      end
-    end
-    
-    it "should have origin country iso code in countries" do
-      FlightSegment.connection.select_values("SELECT DISTINCT origin_country_iso_3166_code FROM flight_segments").each do |code|
-        Country.exists?(:iso_3166_code => code).should == true
-      end
-    end
-    
-    it "should have destination country iso code in countries" do
-      FlightSegment.connection.select_values("SELECT DISTINCT destination_country_iso_3166_code FROM flight_segments").each do |code|
-        Country.exists?(:iso_3166_code => code).should == true
+    it "should have origin and destination country in countries" do
+      %w{ origin destination }.each do |attribute|
+        missing = []
+        FlightSegment.connection.select_values("SELECT DISTINCT #{attribute}_country_iso_3166_code FROM flight_segments").each do |code|
+          missing << code unless Country.exists?(:iso_3166_code => code)
+        end
+        raise "Could not find the following #{attribute} countries:\n#{missing}" if missing.any?
       end
     end
     
     it "should have airline name in airlines" do
+      missing = []
       FlightSegment.connection.select_values("SELECT DISTINCT airline_name FROM flight_segments").each do |name|
-        Airline.exists?(:name => name).should == true
+        missing << name unless Airline.exists?(:name => name)
       end
+      raise "Could not find the following airlines:\n#{missing}" if missing.any?
     end
     
     it "should have aircraft description" do
@@ -83,7 +81,7 @@ describe FlightSegment do
     describe '.fallback' do
       let(:fallback) { FlightSegment.fallback }
       
-      it { fallback.distance.should be_within(0.5).of(2136) }
+      it { fallback.distance.should be_within(0.5).of(2135) }
       it { fallback.seats_per_flight.should be_within(0.5).of(146) }
       it { fallback.load_factor.should be_within(5e-3).of(0.8) }
       it { fallback.freight_share.should be_within(5e-3).of(0.04) }

data/spec/earth/automobile/automobile_make_model_year_variant_spec.rb

@@ -34,7 +34,7 @@ describe AutomobileMakeModelYearVariant do
     it { ammyv.where(:year => 2009).count.should == 1092 }
     it { ammyv.where(:year => 2010).count.should == 1107 }
     it { ammyv.where(:year => 2011).count.should == 1097 }
-    it { ammyv.where(:year => 2012).count.should == 1129 }
+    it { ammyv.where(:year => 2012).count.should == 1123 }
     
     # confirm make, model, year, size class, and type aren't missing
     it { ammyv.where(:make_name => nil).count.should == 0 }

data/spec/earth/locality/climate_division_month_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'earth/locality/climate_division_month'
+
+describe ClimateDivisionMonth do
+  let(:cdm) { ClimateDivisionMonth }
+  
+  describe 'Sanity check', :sanity => true do
+    let(:total) { 344 * (((Date.today.year - 2011) * 12) + (Date.today - 7).prev_month.month) }
+    let(:test_month) { cdm.find('VT3-2012-9') }
+    
+    it { cdm.count.should == total }
+    it { cdm.where('year < 2011').count.should == 0 }
+    it { cdm.where('month < 0 OR month > 12').count.should == 0 }
+    it { cdm.where('heating_degree_days < 0').count.should == 0 }
+    it { cdm.where('cooling_degree_days < 0').count.should == 0 }
+    
+    # spot check
+    it { test_month.heating_degree_days.should be_within(5e-4).of(131.111) }
+    it { test_month.heating_degree_days_units.should == 'degrees_celsius' }
+    it { test_month.cooling_degree_days.should be_within(5e-6).of(2.77778) }
+    it { test_month.cooling_degree_days_units.should == 'degrees_celsius' }
+  end
+end

data/spec/earth/locality/direct_normal_insolation_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'earth/locality/direct_normal_insolation'
+
+describe DirectNormalInsolation do
+  describe 'Sanity check', :sanity => true do
+    it { DirectNormalInsolation.count.should == 90508 }
+  end
+end

data/spec/earth/locality/global_horizontal_insolation_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'earth/locality/global_horizontal_insolation'
+
+describe GlobalHorizontalInsolation do
+  describe 'Sanity check', :sanity => true do
+    it { GlobalHorizontalInsolation.count.should == 138970 }
+  end
+end

data/spec/earth/locality/photovoltaic_insolation_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+require 'earth/locality/photovoltaic_insolation'
+
+describe PhotovoltaicInsolation do
+  describe 'Sanity check', :sanity => true do
+    it { PhotovoltaicInsolation.count.should == 90469 }
+  end
+end

data/spec/earth/locality/zip_code_spec.rb

@@ -9,7 +9,7 @@ describe ZipCode do
       zip2 = FactoryGirl.create :zip_code, :zip2
       zip3 = FactoryGirl.create :zip_code, :zip3
       
-      ZipCode.find_within(15, :units => :kms, :origin => zip1.latitude_longitude).should == [zip1, zip2]
+      ZipCode.near(zip1, 15, :units => :km).should == [zip1, zip2]
     end
   end
   
@@ -29,15 +29,6 @@ describe ZipCode do
     end
   end
   
-  describe '#latitude_longitude' do
-    it 'returns the lat and lng as an array of strings' do
-      FactoryGirl.create(:zip_code, :zip1).latitude_longitude.should == ['50', '-75']
-    end
-    it 'returns an array of nils for missing lat/lon' do
-      ZipCode.new.latitude_longitude.should == [nil, nil]
-    end
-  end
-  
   describe 'Sanity check', :sanity => true do
     it { ZipCode.count.should == 43770 }
     it { ZipCode.where(:state_postal_abbreviation => nil).count.should == 0 }

data/spec/earth_spec.rb

@@ -16,7 +16,7 @@ describe Earth do
   describe '.resources' do
     it 'should get a list of all resource names' do
       Earth.init :all
-      Earth.resources.length.should == 99
+      Earth.resources.length.should == 104
       Earth.resources.should include('Aircraft')
       Earth.resources.should include('Industry')
     end

data/spec/spec_helper.rb

@@ -48,7 +48,7 @@ RSpec.configure do |c|
   c.filter_run_excluding(:slow => true) if ENV['SKIP_SLOW'] == 'true'
   
   # TEST_MINING=true runs spec/data_mining_spec.rb which data_mines all resources
-  c.filter_run_excluding :data_miner => true unless ENV['TEST_MINING'] == 'true'
+  c.filter_run_excluding :mine_all => true unless ENV['TEST_MINING'] == 'true'
   
   # Remember and revert any data added or removed by tests
   # (doesn't apply to data loaded with FULL_MINE=true or FAST_MINE=true)

metadata

@@ -1,477 +1,351 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: earth
-version: !ruby/object:Gem::Version
-  version: 1.0.3
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.1.0
 platform: ruby
-authors:
+authors: 
 - Seamus Abshere
 - Derek Kastner
 - Andy Rossmeissl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-11-06 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: cohort_analysis
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: conversions
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: data_miner
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: falls_back_on
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: fixed_width-multibyte
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: fuzzy_match
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: geokit
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: remote_table
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.2
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: table_warnings
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: to_regexp
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: weighted_average
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-- !ruby/object:Gem::Dependency
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: timeframe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bueller
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: geocoder
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   name: charisma
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: dbf
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
   name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: georuby
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id020
+- !ruby/object:Gem::Dependency 
   name: mysql2
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id021
+- !ruby/object:Gem::Dependency 
   name: pg
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id022
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id023
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id024
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id025
+- !ruby/object:Gem::Dependency 
   name: sandbox
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id026
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id027 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id027
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id028 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id028
+- !ruby/object:Gem::Dependency 
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id029 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id029
 description: An earth-simulation environment with ActiveRecord models and data
-email:
+email: 
 - seamus@abshere.net
 - dkastner@gmail.com
 - andy@rossmeissl.net
 - ijhough@gmail.com
-executables:
+executables: 
 - earth_tester.rb
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - CHANGELOG
 - DEVELOPERS.markdown
@@ -482,9 +356,10 @@ files:
 - README.markdown
 - Rakefile
 - TODO
+- ar17.html
 - bin/earth_tester.rb
 - certification_changelog.markdown
-- data/air/airlines.csv
+- data/air/aircraft.csv
 - data/air/airports.csv
 - data/automobile/annual_emission_controls.csv
 - data/automobile/annual_fuel_consumption.csv
@@ -652,6 +527,7 @@ files:
 - lib/earth/industry/sic_1987.rb
 - lib/earth/industry/sic_1987/data_miner.rb
 - lib/earth/inflectors.rb
+- lib/earth/insolation_scopes.rb
 - lib/earth/loader.rb
 - lib/earth/locality.rb
 - lib/earth/locality/census_division.rb
@@ -660,8 +536,12 @@ files:
 - lib/earth/locality/census_region/data_miner.rb
 - lib/earth/locality/climate_division.rb
 - lib/earth/locality/climate_division/data_miner.rb
+- lib/earth/locality/climate_division_month.rb
+- lib/earth/locality/climate_division_month/data_miner.rb
 - lib/earth/locality/country.rb
 - lib/earth/locality/country/data_miner.rb
+- lib/earth/locality/direct_normal_insolation.rb
+- lib/earth/locality/direct_normal_insolation/data_miner.rb
 - lib/earth/locality/egrid_country.rb
 - lib/earth/locality/egrid_country/data_miner.rb
 - lib/earth/locality/egrid_region.rb
@@ -670,8 +550,12 @@ files:
 - lib/earth/locality/egrid_subregion/data_miner.rb
 - lib/earth/locality/electricity_mix.rb
 - lib/earth/locality/electricity_mix/data_miner.rb
+- lib/earth/locality/global_horizontal_insolation.rb
+- lib/earth/locality/global_horizontal_insolation/data_miner.rb
 - lib/earth/locality/petroleum_administration_for_defense_district.rb
 - lib/earth/locality/petroleum_administration_for_defense_district/data_miner.rb
+- lib/earth/locality/photovoltaic_insolation.rb
+- lib/earth/locality/photovoltaic_insolation/data_miner.rb
 - lib/earth/locality/state.rb
 - lib/earth/locality/state/data_miner.rb
 - lib/earth/locality/zip_code.rb
@@ -792,13 +676,17 @@ files:
 - spec/earth/industry/sic_1987_spec.rb
 - spec/earth/locality/census_division_spec.rb
 - spec/earth/locality/census_region_spec.rb
+- spec/earth/locality/climate_division_month_spec.rb
 - spec/earth/locality/climate_division_spec.rb
 - spec/earth/locality/country_spec.rb
+- spec/earth/locality/direct_normal_insolation_spec.rb
 - spec/earth/locality/egrid_country_spec.rb
 - spec/earth/locality/egrid_region_spec.rb
 - spec/earth/locality/egrid_subregion_spec.rb
 - spec/earth/locality/electricity_mix_spec.rb
+- spec/earth/locality/global_horizontal_insolation_spec.rb
 - spec/earth/locality/padd_spec.rb
+- spec/earth/locality/photovoltaic_insolation_spec.rb
 - spec/earth/locality/state_spec.rb
 - spec/earth/locality/zip_code_spec.rb
 - spec/earth/model_spec.rb
@@ -865,81 +753,40 @@ files:
 - spec/factories/zip_code.rb
 - spec/spec_helper.rb
 - spec/support/integration.rb
-- vendor/geokit-rails/.gitignore
-- vendor/geokit-rails/CHANGELOG.rdoc
-- vendor/geokit-rails/MIT-LICENSE
-- vendor/geokit-rails/README.markdown
-- vendor/geokit-rails/Rakefile
-- vendor/geokit-rails/about.yml
-- vendor/geokit-rails/assets/api_keys_template
-- vendor/geokit-rails/init.rb
-- vendor/geokit-rails/install.rb
-- vendor/geokit-rails/lib/geokit-rails.rb
-- vendor/geokit-rails/lib/geokit-rails/acts_as_mappable.rb
-- vendor/geokit-rails/lib/geokit-rails/adapters/abstract.rb
-- vendor/geokit-rails/lib/geokit-rails/adapters/mysql.rb
-- vendor/geokit-rails/lib/geokit-rails/adapters/mysql2.rb
-- vendor/geokit-rails/lib/geokit-rails/adapters/postgresql.rb
-- vendor/geokit-rails/lib/geokit-rails/adapters/sqlserver.rb
-- vendor/geokit-rails/lib/geokit-rails/defaults.rb
-- vendor/geokit-rails/lib/geokit-rails/geocoder_control.rb
-- vendor/geokit-rails/lib/geokit-rails/ip_geocode_lookup.rb
-- vendor/geokit-rails/test/acts_as_mappable_test.rb
-- vendor/geokit-rails/test/boot.rb
-- vendor/geokit-rails/test/database.yml
-- vendor/geokit-rails/test/fixtures/companies.yml
-- vendor/geokit-rails/test/fixtures/custom_locations.yml
-- vendor/geokit-rails/test/fixtures/locations.yml
-- vendor/geokit-rails/test/fixtures/mock_addresses.yml
-- vendor/geokit-rails/test/fixtures/mock_families.yml
-- vendor/geokit-rails/test/fixtures/mock_houses.yml
-- vendor/geokit-rails/test/fixtures/mock_organizations.yml
-- vendor/geokit-rails/test/fixtures/mock_people.yml
-- vendor/geokit-rails/test/fixtures/stores.yml
-- vendor/geokit-rails/test/ip_geocode_lookup_test.rb
-- vendor/geokit-rails/test/models/company.rb
-- vendor/geokit-rails/test/models/custom_location.rb
-- vendor/geokit-rails/test/models/location.rb
-- vendor/geokit-rails/test/models/mock_address.rb
-- vendor/geokit-rails/test/models/mock_family.rb
-- vendor/geokit-rails/test/models/mock_house.rb
-- vendor/geokit-rails/test/models/mock_organization.rb
-- vendor/geokit-rails/test/models/mock_person.rb
-- vendor/geokit-rails/test/models/store.rb
-- vendor/geokit-rails/test/schema.rb
-- vendor/geokit-rails/test/tasks.rake
-- vendor/geokit-rails/test/test_helper.rb
 homepage: https://github.com/brighterplanet/earth
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -1769596959788236667
+      segments: 
       - 0
-      hash: -3219293687154146877
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -1769596959788236667
+      segments: 
       - 0
-      hash: -3219293687154146877
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Land, sky, and sea
-test_files:
+test_files: 
 - spec/data_mining_spec.rb
 - spec/earth/air/aircraft_spec.rb
 - spec/earth/air/airline_spec.rb
@@ -995,13 +842,17 @@ test_files:
 - spec/earth/industry/sic_1987_spec.rb
 - spec/earth/locality/census_division_spec.rb
 - spec/earth/locality/census_region_spec.rb
+- spec/earth/locality/climate_division_month_spec.rb
 - spec/earth/locality/climate_division_spec.rb
 - spec/earth/locality/country_spec.rb
+- spec/earth/locality/direct_normal_insolation_spec.rb
 - spec/earth/locality/egrid_country_spec.rb
 - spec/earth/locality/egrid_region_spec.rb
 - spec/earth/locality/egrid_subregion_spec.rb
 - spec/earth/locality/electricity_mix_spec.rb
+- spec/earth/locality/global_horizontal_insolation_spec.rb
 - spec/earth/locality/padd_spec.rb
+- spec/earth/locality/photovoltaic_insolation_spec.rb
 - spec/earth/locality/state_spec.rb
 - spec/earth/locality/zip_code_spec.rb
 - spec/earth/model_spec.rb