Updated Friends of the Earth pathway (addressing the symptom of issue #4

but not the cause)
decc · Jun 12, 2012 · cb02e76 · cb02e76
1 parent 7da7942
commit cb02e76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/assets/javascripts/costs_common_methods.js.coffee b/app/assets/javascripts/costs_common_methods.js.coffee
@@ -3,7 +3,7 @@ comparator_pathways = [
   "e0d3jrg221ci12110222112004423220444404202304440420141"
   "r013ce1111111111042233B002322220233302202102330220121"
   "f023df111111111f0322123003223220333203102303430310221"
-  "10113333312223110243111004424440343304202304430420141"
+  "10h4nn4431w23y110243111004424440343304202304430420441"
   "10h2pdppp12332130233122004414430343304102304430410231"
   "20222144411341110343321003422440423404203203340420141"
   "h0h2gg1211cj1j110322222003313230234102102203440320121"

diff --git a/app/assets/javascripts/pathways.js.coffee b/app/assets/javascripts/pathways.js.coffee
@@ -227,7 +227,7 @@ pathway_names =
   "10111111111111110111111001111110111101101101110110111": "Doesn't tackle climate change (All level 1)",
   "10111111111111110111111004444440444404203304440420111": "Maximum demand"
   "40444444444444440443444001111110111101101101110110111": "Maximum supply"
-  "10113333312223110243111004424440343304202304430420141": "Friends of the Earth"
+  "10h4nn4431w23y110243111004424440343304202304430420441": "Friends of the Earth"
   "10h2pdppp12332130233122004414430343304102304430410231": "Campaign to Protect Rural England"
   "20222144411341110343321003422440423404203203340420141": "Mark Brinkley"
   "h0h2gg1211cj1j110322222003313230234102102203440320121": "National Grid"
@@ -243,7 +243,7 @@ pathway_wiki_pages =
   "r013ce1111111111042233B002322220233302202102330220121": "110"
   "f023df111111111f0322123003223220333203102303430310221": "111"
   "i0g2dd2pp1121f1i032211p004314110433304202304320420121": "112" # Markal
-  "10113333312223110243111004424440343304202304430420141": "95" # FOTE
+  "10h4nn4431w23y110243111004424440343304202304430420441": "95" # FOTE
   "10h2pdppp12332130233122004414430343304102304430410231": "96" # CPRE
   "20222144411341110343321003422440423404203203340420141": "94" # Mark Brinkley
   "h0h2gg1211cj1j110322222003313230234102102203440320121": "97" # National Grid
@@ -254,7 +254,7 @@ pathway_descriptions =
   "10111111111111110111111004444440444404203304440420111": "Maximum demand"
   "40444444444444440443444001111110111101101101110110111": "Maximum supply"
   "i0g2dd2pp1121f1i032211p004314110433304202304320420121": "Cost-optimising model based. Mix of supply\nsources. Ambitious demand reduction." # Markal
-  "10113333312223110243111004424440343304202304430420141": "Generation from wind, marine renewables and\nhydro. Ambitious demand reduction" #FOTE
+  "10h4nn4431w23y110243111004424440343304202304430420441": "Generation from wind, marine renewables and\nhydro. Ambitious demand reduction" #FOTE
   "10h2pdppp12332130233122004414430343304102304430410231": "Offshore renewables, solar, geothermal and\nelectricity imports. Ambitious demand reduction." #CPRE
   "20222144411341110343321003422440423404203203340420141": "Marine renewable, geothermal and algae\nsupply. Some nuclear and CCS." # Mark Brinkley
   "h0h2gg1211cj1j110322222003313230234102102203440320121": "Wide range of generation sources. Moderate\ndemand reduction. Considerable bioenergy." # National Grid

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -38,7 +38,7 @@ def saved_pathways
     "Higher renewables, more energy efficiency"   => "e0d3jrg221ci12110222112004423220444404202304440420141",
     "Higher nuclear, less energy efficiency"      => "r013ce1111111111042233B002322220233302202102330220121",
     "Higher CCS, more bioenergy"                  => "f023df111111111f0322123003223220333203102303430310221",
-    "Friends of the Earth"                        => "10113333312223110243111004424440343304202304430420141",
+    "Friends of the Earth"                        => "10h4nn4431w23y110243111004424440343304202304430420441",
     "Campaign to Protect Rural England"           => "10h2pdppp12332130233122004414430343304102304430410231",
     "Mark Brinkley"                               => "20222144411341110343321003422440423404203203340420141",
     "National Grid"                               => "h0h2gg1211cj1j110322222003313230234102102203440320121",