data_miner.rb in earth-0.4.0

- old
+ new

@@ -20,19 +20,19 @@
       float   'lodging_building_electricity_intensity'
       string  'lodging_building_electricity_intensity_units'
       float   'lodging_building_district_heat_intensity'
       string  'lodging_building_district_heat_intensity_units'
     end
-
+    
     process 'Define some unit conversions' do
       Conversions.register :hundred_cubic_feet_per_square_foot_hour, :cubic_metres_per_square_metre_hour,   30.48
-      Conversions.register :gallons_per_square_foot_hour,            :litres_per_square_metre_hour,         40.745833
-      Conversions.register :kilowatt_hours_per_square_foot_hour,     :kilowatt_hours_per_square_metre_hour, 10.76391
-      Conversions.register :thousand_btu_per_square_foot_hour,       :joules_per_square_metre_hour,         11_356_527
-      Conversions.register :hundred_cubic_feet_per_room_night,       :cubic_metres_per_room_night,          2.8317
-      Conversions.register :gallons_per_room_night,                  :litres_per_room_night,                3.7854
-      Conversions.register :thousand_btu_per_room_night,             :joules_per_room_night,                1_055_056
+      Conversions.register :gallons_per_square_foot_hour,            :litres_per_square_metre_hour,         40.7458333
+      Conversions.register :kilowatt_hours_per_square_foot_hour,     :kilowatt_hours_per_square_metre_hour, 10.7639104
+      Conversions.register :thousand_btu_per_square_foot_hour,       :megajoules_per_square_metre_hour,     11.3565267
+      Conversions.register :hundred_cubic_feet_per_room_night,       :cubic_metres_per_room_night,          2.83168466
+      Conversions.register :gallons_per_room_night,                  :litres_per_room_night,                3.78541178
+      Conversions.register :thousand_btu_per_room_night,             :megajoules_per_room_night,            1.05505585
     end
     
     import 'the U.S. Census Geographic Terms and Definitions',
            :url => 'http://www.census.gov/popest/geographic/codes02.csv',
            :skip => 9,
@@ -47,18 +47,18 @@
            :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGotdjgtUEk0eUU0R3lxM1hHdlF1V0E&hl=en&output=csv' do
       key   'number', :field_name => 'census_division'
       store 'meeting_building_natural_gas_intensity', :from_units => :hundred_cubic_feet_per_square_foot_hour, :to_units => :cubic_metres_per_square_metre_hour
       store 'meeting_building_fuel_oil_intensity', :from_units => :gallons_per_square_foot_hour, :to_units => :litres_per_square_metre_hour
       store 'meeting_building_electricity_intensity', :from_units => :kilowatt_hours_per_square_foot_hour, :to_units => :kilowatt_hours_per_square_metre_hour
-      store 'meeting_building_district_heat_intensity', :from_units => :thousand_btu_per_square_foot_hour, :to_units => :joules_per_square_metre_hour
+      store 'meeting_building_district_heat_intensity', :from_units => :thousand_btu_per_square_foot_hour, :to_units => :megajoules_per_square_metre_hour
     end
     
     import 'lodging building fuel intensities calculated from CBECS 2003',
            :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHZ1QjdNTGVpbWxmZDVLbjlpTHlFVHc&hl=en&output=csv' do
       key   'number', :field_name => 'census_division'
       store 'lodging_building_natural_gas_intensity', :from_units => :hundred_cubic_feet_per_room_night, :to_units => :cubic_metres_per_room_night
       store 'lodging_building_fuel_oil_intensity', :from_units => :gallons_per_room_night, :to_units => :litres_per_room_night
       store 'lodging_building_electricity_intensity', :units_field_name => 'lodging_building_electricity_intensity_units'
-      store 'lodging_building_district_heat_intensity', :from_units => :thousand_btu_per_room_night, :to_units => :joules_per_room_night
+      store 'lodging_building_district_heat_intensity', :from_units => :thousand_btu_per_room_night, :to_units => :megajoules_per_room_night
     end
   end
 end