automobile_trip 0.1.0 → 0.2.0

data/features/support/env.rb

@@ -11,4 +11,4 @@ require 'data_miner'
 DataMiner.logger = Logger.new(nil)
 
 require 'sniff'
-Sniff.init File.join(File.dirname(__FILE__), '..', '..'), :cucumber => true, :earth => [:automobile, :fuel]
+Sniff.init File.join(File.dirname(__FILE__), '..', '..'), :cucumber => true, :earth => [:automobile, :fuel, :locality]

data/lib/automobile_trip.rb

@@ -3,6 +3,6 @@ require 'emitter'
 module BrighterPlanet
   module AutomobileTrip
     extend BrighterPlanet::Emitter
-    scope 'The automobile trip emission estimate includes CO2 emissions from non-biogenic fuel use, CH4 and N2O emissions from all fuel use, and fugitive HFC emissions from air conditioning.'
+    scope 'The automobile trip emission estimate is the total anthropogenic emissions from fuel and air conditioning used by the automobile during the trip. It includes CO2 emissions from combustion of non-biogenic fuel, CH4 and N2O emissions from combustion of all fuel, and fugitive HFC emissions from air conditioning.'
   end
 end

data/lib/automobile_trip/carbon_model.rb

@@ -30,71 +30,71 @@ module BrighterPlanet
           ### Emission calculation
           # Returns the `emission` estimate (*kg CO<sub>2</sub>e*).
           committee :emission do
-            #### Emission from co2 emission, ch4 emission, n2o emission, and hfc emission
+            #### Emission from CO<sub>2</sub> emission, CH<sub>4</sub> emission, N<sub>2</sub>O emission, and HFC emission
             quorum 'from co2 emission, ch4 emission, n2o emission, and hfc emission',
               :needs => [:co2_emission, :ch4_emission, :n2o_emission, :hfc_emission],
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # Sums the non-biogenic emissions
+                # Sums the non-biogenic emissions to give *kg CO<sub>2</sub>e*.
                 characteristics[:co2_emission] + characteristics[:ch4_emission] + characteristics[:n2o_emission] + characteristics[:hfc_emission]
             end
           end
           
           ### CO<sub>2</sub> emission calculation
-          # Returns the `co2 emission` (*kg CO<sub>2</sub>e*)
+          # Returns the `co2 emission` (*kg*).
           committee :co2_emission do
-            #### CO<sub>2</sub> emission from fuel use, co2 emission factor, date, and timeframe
+            #### CO<sub>2</sub> emission from fuel use, CO<sub>2</sub> emission factor, date, and timeframe
             quorum 'from fuel use, co2 emission factor, date, and timeframe',
               :needs => [:fuel_use, :co2_emission_factor, :date],
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics, timeframe|
-                # - Checks whether the trip `date` falls within the `timeframe`
+                # Checks whether the trip `date` falls within the `timeframe`.
                 date = characteristics[:date].is_a?(Date) ? characteristics[:date] : Date.parse(characteristics[:date].to_s)
                 if timeframe.include? date
-                  # - Multiplies `fuel use` (*l*) by the `co2 emission factor` (*kg CO<sub>2</sub>e / l*) to give *kg CO<sub>2</sub>e*
+                  # Multiplies `fuel use` (*l*) by the `co2 emission factor` (*kg / l*) to give *kg*.
                   characteristics[:fuel_use] * characteristics[:co2_emission_factor]
                 else
-                  # - If the `date` does not fall within the `timeframe`, `co2 emission` is zero
+                  # If the `date` does not fall within the `timeframe`, `co2 emission` is zero.
                   0
                 end
             end
           end
           
           ### CO<sub>2</sub> biogenic emission calculation
-          # Returns the `co2 biogenic emission` (*kg CO<sub>2</sub>e*)
+          # Returns the `co2 biogenic emission` (*kg*).
           committee :co2_biogenic_emission do
-            #### CO<sub>2</sub> biogenic emission from fuel use, co2 biogenic emission factor, date, and timeframe
+            #### CO<sub>2</sub> biogenic emission from fuel use, CO<sub>2</sub> biogenic emission factor, date, and timeframe
             quorum 'from fuel use, co2 biogenic emission factor, date, and timeframe',
               :needs => [:fuel_use, :co2_biogenic_emission_factor, :date],
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics, timeframe|
-                # - Checks whether the trip `date` falls within the `timeframe`
+                # Checks whether the trip `date` falls within the `timeframe`.
                 date = characteristics[:date].is_a?(Date) ? characteristics[:date] : Date.parse(characteristics[:date].to_s)
                 if timeframe.include? date
-                  # - Multiplies `fuel use` (*l*) by the `co2 biogenic emission factor` (*kg CO<sub>2</sub>e / l*) to give *kg CO<sub>2</sub>e*
+                  # Multiplies `fuel use` (*l*) by the `co2 biogenic emission factor` (*kg / l*) to give *kg*.
                   characteristics[:fuel_use] * characteristics[:co2_biogenic_emission_factor]
                 else
-                  # - If the `date` does not fall within the `timeframe`, `co2 biogenic emission` is zero
+                  # If the `date` does not fall within the `timeframe`, `co2 biogenic emission` is zero.
                   0
                 end
             end
           end
           
           ### CH<sub>4</sub> emission calculation
-          # Returns the `ch4 emission` (*kg CO<sub>2</sub>e*)
+          # Returns the `ch4 emission` (*kg CO<sub>2</sub>e*).
           committee :ch4_emission do
-            #### CH<sub>4</sub> emission from fuel use, ch4 emission factor, date, and timeframe
+            #### CH<sub>4</sub> emission from fuel use, CH<sub>4</sub> emission factor, date, and timeframe
             quorum 'from fuel use, ch4 emission factor, date, and timeframe',
               :needs => [:fuel_use, :ch4_emission_factor, :date],
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics, timeframe|
-                # - Checks whether the trip `date` falls within the `timeframe`
+                # Checks whether the trip `date` falls within the `timeframe`.
                 date = characteristics[:date].is_a?(Date) ? characteristics[:date] : Date.parse(characteristics[:date].to_s)
                 if timeframe.include? date
-                  # - Multiplies `fuel use` (*l*) by the `ch4 emission factor` (*kg CO<sub>2</sub>e / l*) to give *kg CO<sub>2</sub>e*
+                  # Multiplies `fuel use` (*l*) by the `ch4 emission factor` (*kg CO<sub>2</sub>e / l*) to give *kg CO<sub>2</sub>e*.
                   characteristics[:fuel_use] * characteristics[:ch4_emission_factor]
                 else
-                  # - If the `date` does not fall within the `timeframe`, `ch4 emission` is zero
+                  # If the `date` does not fall within the `timeframe`, `ch4 emission` is zero.
                   0
                 end
             end
@@ -103,117 +103,117 @@ module BrighterPlanet
           ### N<sub>2</sub>O emission calculation
           # Returns the `n2o emission` (*kg CO<sub>2</sub>e*)
           committee :n2o_emission do
-            #### N<sub>2</sub>O emission from fuel use, n2o emission factor, date, and timeframe
+            #### N<sub>2</sub>O emission from fuel use, N<sub>2</sub>O emission factor, date, and timeframe
             quorum 'from fuel use, n2o emission factor, date, and timeframe',
               :needs => [:fuel_use, :n2o_emission_factor, :date],
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics, timeframe|
-                # - Checks whether the trip `date` falls within the `timeframe`
+                # Checks whether the trip `date` falls within the `timeframe`.
                 date = characteristics[:date].is_a?(Date) ? characteristics[:date] : Date.parse(characteristics[:date].to_s)
                 if timeframe.include? date
-                  # - Multiplies `fuel use` (*l*) by the `n2o emission factor` (*kg CO<sub>2</sub>e / l*) to give *kg CO<sub>2</sub>e*
+                  # Multiplies `fuel use` (*l*) by the `n2o emission factor` (*kg CO<sub>2</sub>e / l*) to give *kg CO<sub>2</sub>e*.
                   characteristics[:fuel_use] * characteristics[:n2o_emission_factor]
                 else
-                  # - If the `date` does not fall within the `timeframe`, `n2o emission` is zero
+                  # If the `date` does not fall within the `timeframe`, `n2o emission` is zero.
                   0
                 end
             end
           end
           
           ### HFC emission calculation
-          # Returns the `hfc emission` (*kg CO<sub>2</sub>e*)
+          # Returns the `hfc emission` (*kg CO<sub>2</sub>e*).
           committee :hfc_emission do
-            #### HFC emission from fuel use, hfc emission factor, date, and timeframe
+            #### HFC emission from fuel use, HFC emission factor, date, and timeframe
             quorum 'from fuel use, hfc emission factor, date, and timeframe',
               :needs => [:fuel_use, :hfc_emission_factor, :date],
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics, timeframe|
-                # - Checks whether the trip `date` falls within the `timeframe`
+                # Checks whether the trip `date` falls within the `timeframe`.
                 date = characteristics[:date].is_a?(Date) ? characteristics[:date] : Date.parse(characteristics[:date].to_s)
                 if timeframe.include? date
-                  # - Multiplies `fuel use` (*l*) by the `hfc emission factor` (*kg CO<sub>2</sub>e / l*) to give *kg CO<sub>2</sub>e*
+                  # Multiplies `fuel use` (*l*) by the `hfc emission factor` (*kg CO<sub>2</sub>e / l*) to give *kg CO<sub>2</sub>e*.
                   characteristics[:fuel_use] * characteristics[:hfc_emission_factor]
                 else
-                  # - If the `date` does not fall within the `timeframe`, `hfc emission` is zero
+                  # If the `date` does not fall within the `timeframe`, `hfc emission` is zero.
                   0
                 end
             end
           end
           
           ### CO<sub>2</sub> emission factor calculation
-          # Returns the `co2 emission factor` (*kg CO<sub>2</sub>e / l*)
+          # Returns the `co2 emission factor` (*kg / l*).
           committee :co2_emission_factor do
             #### CO<sub>2</sub> emission factor from automobile fuel
             quorum 'from automobile fuel',
               :needs => :automobile_fuel,
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # Looks up the [fuel](http://data.brighterplanet.com/fuels) `co2 emission factor` (*kg CO</sub>2</sub>e / l*)
+                # Looks up the [fuel](http://data.brighterplanet.com/fuels) `co2 emission factor` (*kg / l*).
                 characteristics[:automobile_fuel].co2_emission_factor
             end
           end
           
           ### CO<sub>2</sub> biogenic emission factor calculation
-          # Returns the `co2 biogenic emission factor` (*kg CO<sub>2</sub>e / l*)
+          # Returns the `co2 biogenic emission factor` (*kg / l*).
           committee :co2_biogenic_emission_factor do
             #### CO<sub>2</sub> biogenic emission factor from automobile fuel
             quorum 'from automobile fuel',
               :needs => :automobile_fuel,
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # Looks up the [fuel](http://data.brighterplanet.com/fuels) `co2 biogenic emission factor` (*kg CO</sub>2</sub>e / l*)
+                # Looks up the [fuel](http://data.brighterplanet.com/fuels) `co2 biogenic emission factor` (*kg / l*).
                 characteristics[:automobile_fuel].co2_biogenic_emission_factor
             end
           end
           
           ### CH<sub>4</sub> emission factor calculation
-          # Returns the `ch4 emission factor` (*kg CO<sub>2</sub>e / l*)
+          # Returns the `ch4 emission factor` (*kg CO<sub>2</sub>e / l*).
           committee :ch4_emission_factor do
             #### CH<sub>4</sub> emission factor from automobile fuel
             quorum 'from automobile fuel',
               :needs => :automobile_fuel,
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # Looks up the [fuel](http://data.brighterplanet.com/fuels) `ch4 emission factor` (*kg CO</sub>2</sub>e / l*)
+                # Looks up the [fuel](http://data.brighterplanet.com/fuels) `ch4 emission factor` (*kg CO</sub>2</sub>e / l*).
                 characteristics[:automobile_fuel].ch4_emission_factor
             end
           end
           
           ### N<sub>2</sub>O emission factor calculation
-          # Returns the `n2o emission factor` (*kg CO<sub>2</sub>e / l*)
+          # Returns the `n2o emission factor` (*kg CO<sub>2</sub>e / l*).
           committee :n2o_emission_factor do
             #### N<sub>2</sub>O emission factor from automobile fuel
             quorum 'from automobile fuel',
               :needs => :automobile_fuel,
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # Looks up the [fuel](http://data.brighterplanet.com/fuels) `n2o emission factor` (*kg CO</sub>2</sub>e / l*)
+                # Looks up the [fuel](http://data.brighterplanet.com/fuels) `n2o emission factor` (*kg CO</sub>2</sub>e / l*).
                 characteristics[:automobile_fuel].n2o_emission_factor
             end
           end
           
           ### HFC emission factor calculation
-          # Returns the `hfc emission factor` (*kg CO<sub>2</sub>e / l*)
+          # Returns the `hfc emission factor` (*kg CO<sub>2</sub>e / l*).
           committee :hfc_emission_factor do
             #### HFC emission factor from automobile fuel
             quorum 'from automobile fuel',
               :needs => :automobile_fuel,
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # Looks up the [fuel](http://data.brighterplanet.com/fuels) `hfc emission factor` (*kg CO</sub>2</sub>e / l*)
+                # Looks up the [fuel](http://data.brighterplanet.com/fuels) `hfc emission factor` (*kg CO</sub>2</sub>e / l*).
                 characteristics[:automobile_fuel].hfc_emission_factor
             end
           end
           
-          ### Fuel calculation
-          # Returns the `fuel` used by the automobile.
+          ### Automobile fuel calculation
+          # Returns the type of `automobile fuel` used.
           committee :automobile_fuel do
-            #### Fuel from client input
+            #### Automobile fuel from client input
             # **Complies:** All
             #
             # Uses the client-input [automobile fuel](http://data.brighterplanet.com/automobile_fuels).
             
-            #### Fuel from make model year variant
+            #### Automobile fuel from make model year variant
             quorum 'from make model year variant',
               :needs => :make_model_year_variant,
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
@@ -222,10 +222,10 @@ module BrighterPlanet
                 characteristics[:make_model_year_variant].fuel
             end
             
-            #### Default fuel
+            #### Default automobile fuel
             quorum 'default',
               # **Complies:** GHG Protocol Scope 3, ISO 14064-1
-              :complies => [:ghg_protocol_scope_3, :iso] do |characteristics|
+              :complies => [:ghg_protocol_scope_3, :iso] do
                 # Looks up the default [automobile fuel](http://data.brighterplanet.com/automobile_fuels).
                 AutomobileFuel.fallback
             end
@@ -277,12 +277,13 @@ module BrighterPlanet
                 (characteristics[:duration] / 60.0) * characteristics[:speed]
             end
             
-            #### Default distance
-            quorum 'default',
+            #### Distance from country
+            quorum 'from country',
+              :needs => :country,
               # **Complies:** GHG Protocol Scope 3, ISO 14064-1
-              :complies => [:ghg_protocol_scope_3, :iso] do
-                # Uses a default `distance` of 16.33 *km*, [calculated from NHTS 2009 data](https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdFhib1FaNVp5VDkxejh4N3FWQmp2VUE&hl=en&output=html).
-                base.fallback.distance
+              :complies => [:ghg_protocol_scope_3, :iso] do |characteristics|
+                # Looks up the [country](http://data.brighterplanet.com/countries) `automobile trip distance`.
+                characteristics[:country].automobile_trip_distance
             end
           end
           
@@ -324,26 +325,25 @@ module BrighterPlanet
           # Returns the client-input `duration` (*minutes*).
           
           ### Speed calculation
-          # Returns the average `speed` at which the automobile travels (*km / hour*)
+          # Returns the average `speed` at which the automobile travels (*km / hour*).
           committee :speed do
             #### Speed from client input
             # **Complies:** All
             #
-            # Uses the client-input `speed` (*km / hour*)
+            # Uses the client-input `speed` (*km / hour*).
             
-            #### Speed from urbanity
-            quorum 'from urbanity',
-              :needs => :urbanity,
+            #### Speed from urbanity and country
+            quorum 'from urbanity and country',
+              :needs => [:urbanity, :country],
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # * Takes average city and highway driving speeds from [EPA (2006)](http://www.epa.gov/fueleconomy/420r06017.pdf) and converts from *miles / hour* to *km / hour*
-                # * Calculates the harmonic mean of those speeds, weighted by `urbanity`
-                1 / (characteristics[:urbanity] / base.fallback.city_speed + (1 - characteristics[:urbanity]) / base.fallback.highway_speed)
+                # Looks up the [country](http://data.brighterplanet.com/countries) average city and highway driving speeds and calculates the harmonic mean of those speeds weighted by `urbanity`.
+                1 / (characteristics[:urbanity] / characteristics[:country].automobile_city_speed + (1 - characteristics[:urbanity]) / characteristics[:country].automobile_highway_speed)
             end
           end
           
           ### Fuel efficiency calculation
-          # Returns the `fuel efficiency` (*km / l*)
+          # Returns the `fuel efficiency` (*km / l*).
           committee :fuel_efficiency do
             #### Fuel efficiency from client input
             # **Complies:** All
@@ -355,12 +355,12 @@ module BrighterPlanet
               :needs => [:make_model_year_variant, :urbanity],
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # * Looks up the city and highway fuel efficiencies of the automobile [make model year variant](http://data.brighterplanet.com/automobile_make_model_year_variants) (*km / l*)
+                # Looks up the city and highway fuel efficiencies of the automobile [make model year variant](http://data.brighterplanet.com/automobile_make_model_year_variants) (*km / l*).
                 fuel_efficiency_city = characteristics[:make_model_year_variant].fuel_efficiency_city
                 fuel_efficiency_highway = characteristics[:make_model_year_variant].fuel_efficiency_highway
                 urbanity = characteristics[:urbanity]
                 if fuel_efficiency_city.present? and fuel_efficiency_highway.present?
-                  # * Calculates the harmonic mean of those fuel efficiencies, weighted by `urbanity`
+                  # Calculates the harmonic mean of those fuel efficiencies, weighted by `urbanity`.
                   1.0 / ((urbanity / fuel_efficiency_city) + ((1.0 - urbanity) / fuel_efficiency_highway))
                 end
             end
@@ -370,12 +370,12 @@ module BrighterPlanet
               :needs => [:make_model_year, :urbanity],
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # * Looks up the city and highway fuel efficiencies of the automobile [make model year](http://data.brighterplanet.com/automobile_make_model_years) (*km / l*)
+                # Looks up the city and highway fuel efficiencies of the automobile [make model year](http://data.brighterplanet.com/automobile_make_model_years) (*km / l*).
                 fuel_efficiency_city = characteristics[:make_model_year].fuel_efficiency_city
                 fuel_efficiency_highway = characteristics[:make_model_year].fuel_efficiency_highway
                 urbanity = characteristics[:urbanity]
                 if fuel_efficiency_city.present? and fuel_efficiency_highway.present?
-                  # * Calculates the harmonic mean of those fuel efficiencies, weighted by `urbanity`
+                  # Calculates the harmonic mean of those fuel efficiencies, weighted by `urbanity`.
                   1.0 / ((urbanity / fuel_efficiency_city) + ((1.0 - urbanity) / fuel_efficiency_highway))
                 end
             end
@@ -385,12 +385,12 @@ module BrighterPlanet
               :needs => [:make_model, :urbanity],
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # * Looks up the city and highway fuel efficiencies of the automobile [make model](http://data.brighterplanet.com/automobile_make_models) (*km / l*)
+                # Looks up the city and highway fuel efficiencies of the automobile [make model](http://data.brighterplanet.com/automobile_make_models) (*km / l*).
                 fuel_efficiency_city = characteristics[:make_model].fuel_efficiency_city
                 fuel_efficiency_highway = characteristics[:make_model].fuel_efficiency_highway
                 urbanity = characteristics[:urbanity]
                 if fuel_efficiency_city.present? and fuel_efficiency_highway.present?
-                  # * Calculates the harmonic mean of those fuel efficiencies, weighted by `urbanity`
+                  # Calculates the harmonic mean of those fuel efficiencies, weighted by `urbanity`.
                   1.0 / ((urbanity / fuel_efficiency_city) + ((1.0 - urbanity) / fuel_efficiency_highway))
                 end
             end
@@ -400,13 +400,12 @@ module BrighterPlanet
               :needs => [:size_class, :hybridity_multiplier, :urbanity],
               # **Complies:** GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_3, :iso] do |characteristics|
-                # * Looks up the automobile [size class](http://data.brighterplanet.com/automobile_makes) city and highway fuel efficiency (*km / l*)
+                # Looks up the automobile [size class](http://data.brighterplanet.com/automobile_makes) city and highway fuel efficiency (*km / l*).
                 fuel_efficiency_city = characteristics[:size_class].fuel_efficiency_city
                 fuel_efficiency_highway = characteristics[:size_class].fuel_efficiency_highway
                 urbanity = characteristics[:urbanity]
                 if fuel_efficiency_city.present? and fuel_efficiency_highway.present?
-                  # * Calculates the harmonic mean of those fuel efficiencies, weighted by `urbanity`
-                  # * Multiplies the result by the `hybridity multiplier`
+                  # Calculates the harmonic mean of those fuel efficiencies, weighted by `urbanity`, and multiplies the result by the `hybridity multiplier`.
                   (1.0 / ((urbanity / fuel_efficiency_city) + ((1.0 - urbanity) / fuel_efficiency_highway))) * characteristics[:hybridity_multiplier]
                 end
             end
@@ -416,8 +415,7 @@ module BrighterPlanet
               :needs => [:make_year, :hybridity_multiplier],
               # **Complies:** GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_3, :iso] do |characteristics|
-                # * Looks up the automobile [make year](http://data.brighterplanet.com/automobile_make_years) combined fuel efficiency (*km / l*)
-                # * Multiplies the combined fuel efficiency by the `hybridity multiplier`
+                # Looks up the automobile [make year](http://data.brighterplanet.com/automobile_make_years) combined fuel efficiency (*km / l*) and multiplies it by the `hybridity multiplier`.
                 characteristics[:make_year].fuel_efficiency * characteristics[:hybridity_multiplier]
             end
             
@@ -426,8 +424,7 @@ module BrighterPlanet
               :needs => [:make, :hybridity_multiplier],
               # **Complies:** GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_3, :iso] do |characteristics|
-                # * Looks up the automobile [make](http://data.brighterplanet.com/automobile_makes) combined fuel efficiency (*km / l*)
-                # * Multiplies the combined fuel efficiency by the `hybridity multiplier`
+                # Looks up the automobile [make](http://data.brighterplanet.com/automobile_makes) combined fuel efficiency (*km / l*) and multiplies it by the `hybridity multiplier`.
                 if characteristics[:make].fuel_efficiency.present?
                   characteristics[:make].fuel_efficiency * characteristics[:hybridity_multiplier]
                 else
@@ -435,14 +432,13 @@ module BrighterPlanet
                 end
             end
             
-            #### Fuel efficiency from hybridity multiplier
-            quorum 'from hybridity multiplier',
-              :needs => :hybridity_multiplier,
+            #### Fuel efficiency from hybridity multiplier and country
+            quorum 'from hybridity multiplier and country',
+              :needs => [:hybridity_multiplier, :country],
               # **Complies:** GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_3, :iso] do |characteristics|
-                # * Takes a default `fuel efficiency` of 8.58 *km / l*, calculated from total US automobile vehicle miles travelled and gasoline and diesel consumption.
-                # * Multiplies the `fuel efficiency` by the `hybridity multiplier`
-                base.fallback.fuel_efficiency * characteristics[:hybridity_multiplier]
+                # Looks up the [country](http://data.brighterplanet.com/countries) `automobile fuel efficiency` and multiplies it by the `hybridity multiplier`.
+                characteristics[:country].automobile_fuel_efficiency * characteristics[:hybridity_multiplier]
             end
           end
           
@@ -455,7 +451,7 @@ module BrighterPlanet
               :needs => [:size_class, :hybridity, :urbanity],
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # * Looks up the appropriate city and highway hybridity multipliers for the automobile [size class](http://data.brighterplanet.com/automobile_size_classes)
+                # Looks up the appropriate city and highway hybridity multipliers for the automobile [size class](http://data.brighterplanet.com/automobile_size_classes).
                 drivetrain = characteristics[:hybridity] ? :hybrid : :conventional
                 urbanity = characteristics[:urbanity]
                 size_class = characteristics[:size_class]
@@ -464,7 +460,7 @@ module BrighterPlanet
                   :highway => size_class.send(:"#{drivetrain}_fuel_efficiency_highway_multiplier")
                 }
                 if fuel_efficiency_multipliers.values.any?(&:present?)
-                  # * Calculates the harmonic mean of those multipliers, weighted by `urbanity`
+                  # Calculates the harmonic mean of those multipliers, weighted by `urbanity`.
                   1.0 / ((urbanity / fuel_efficiency_multipliers[:city]) + ((1.0 - urbanity) / fuel_efficiency_multipliers[:highway]))
                 else
                   nil
@@ -476,14 +472,14 @@ module BrighterPlanet
               :needs => [:hybridity, :urbanity],
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # * Looks up the appropriate default city and highway hybridity multipliers
+                # Looks up the appropriate default city and highway hybridity multipliers.
                 drivetrain = characteristics[:hybridity] ? :hybrid : :conventional
                 urbanity = characteristics[:urbanity]
                 fuel_efficiency_multipliers = {
                   :city => AutomobileSizeClass.fallback.send(:"#{drivetrain}_fuel_efficiency_city_multiplier"),
                   :highway => AutomobileSizeClass.fallback.send(:"#{drivetrain}_fuel_efficiency_highway_multiplier")
                 }
-                # * Calculates the harmonic mean of those multipliers, weighted by `urbanity`
+                # Calculates the harmonic mean of those multipliers, weighted by `urbanity`.
                 1.0 / ((urbanity / fuel_efficiency_multipliers[:city]) + ((1.0 - urbanity) / fuel_efficiency_multipliers[:highway]))
             end
             
@@ -505,18 +501,19 @@ module BrighterPlanet
               :needs => :urbanity_estimate,
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
               :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
-                # Uses the `urbanity estimate` if it is from zero to one
+                # Uses the `urbanity estimate` if it is from zero to one.
                 if characteristics[:urbanity_estimate] >= 0 and characteristics[:urbanity_estimate] <= 1
                   characteristics[:urbanity_estimate]
                 end
             end
             
-            #### Default urbanity
-            quorum 'default',
+            #### Urbanity from country
+            quorum 'from country',
+              :needs => :country,
               # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
-              :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do
-                # Uses an `urbanity` of 0.43 after [EPA (2009) Appendix A](http://www.epa.gov/otaq/cert/mpg/fetrends/420r09014-appx-a.pdf)
-                base.fallback.urbanity_estimate
+              :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do |characteristics|
+                # Looks up the [country](http://data.brighterplanet.com/countries) `automobile urbanity`.
+                characteristics[:country].automobile_urbanity
             end
           end
           
@@ -544,6 +541,23 @@ module BrighterPlanet
           ### Make calculation
           # Returns the client-input automobile [make](http://data.brighterplanet.com/automobile_makes).
           
+          ### Country calculation
+          # Returns the `country` in which the trip occurred.
+          committee :country do
+            #### Country from client input
+            # **Complies:** All
+            #
+            # Uses the client-input `country`.
+            
+            #### Default country
+            quorum 'default',
+              # **Complies:** GHG Protocol Scope 1, GHG Protocol Scope 3, ISO 14064-1
+              :complies => [:ghg_protocol_scope_1, :ghg_protocol_scope_3, :iso] do
+                # Uses an artificial country that contains global averages.
+                Country.fallback
+            end
+          end
+          
           ### Date calculation
           # Returns the `date` on which the trip occurred.
           committee :date do